From 195035f7ba29fc58628475e8406d459b67c7e70e Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Sat, 30 Mar 2024 13:32:16 +0800
Subject: [PATCH] =?UTF-8?q?Chore:=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E6=97=A0=E7=94=A8=E6=96=87=E4=BB=B6=E5=A4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                   |  90 ---
 pages/activity/BargainRecord/index.vue       | 131 ----
 pages/activity/DargainDetails/index.vue      | 617 -------------------
 pages/activity/GoodsBargain/index.vue        |  84 ---
 pages/activity/GoodsGroup/index.vue          |  91 ---
 pages/activity/GoodsSeckill/index.vue        | 261 --------
 pages/activity/GroupDetails/index.vue        | 375 -----------
 pages/activity/GroupRule/index.vue           | 248 --------
 pages/activity/Poster/index.vue              |  79 ---
 pages/activity/SeckillDetails/index.vue      | 235 -------
 pages/orderAdmin/AdminOrder/index.vue        | 354 -----------
 pages/orderAdmin/AdminOrderList/index.vue    | 330 ----------
 pages/orderAdmin/GoodsDeliver/index.vue      | 231 -------
 pages/orderAdmin/OrderCancellation/index.vue | 184 ------
 pages/orderAdmin/OrderIndex/index.vue        | 167 -----
 pages/orderAdmin/Statistics/index.vue        | 446 --------------
 16 files changed, 3923 deletions(-)
 delete mode 100644 pages/activity/BargainRecord/index.vue
 delete mode 100644 pages/activity/DargainDetails/index.vue
 delete mode 100644 pages/activity/GoodsBargain/index.vue
 delete mode 100644 pages/activity/GoodsGroup/index.vue
 delete mode 100644 pages/activity/GoodsSeckill/index.vue
 delete mode 100644 pages/activity/GroupDetails/index.vue
 delete mode 100644 pages/activity/GroupRule/index.vue
 delete mode 100644 pages/activity/Poster/index.vue
 delete mode 100644 pages/activity/SeckillDetails/index.vue
 delete mode 100644 pages/orderAdmin/AdminOrder/index.vue
 delete mode 100644 pages/orderAdmin/AdminOrderList/index.vue
 delete mode 100644 pages/orderAdmin/GoodsDeliver/index.vue
 delete mode 100644 pages/orderAdmin/OrderCancellation/index.vue
 delete mode 100644 pages/orderAdmin/OrderIndex/index.vue
 delete mode 100644 pages/orderAdmin/Statistics/index.vue

diff --git a/pages.json b/pages.json
index c62bafb..17c2787 100644
--- a/pages.json
+++ b/pages.json
@@ -287,96 +287,6 @@
         "navigationBarTitleText": "退货列表"
       }
     },
-    {
-      "path": "pages/orderAdmin/OrderIndex/index",
-      "style": {
-        "navigationBarTitleText": "商家订单统计"
-      }
-    },
-    {
-      "path": "pages/orderAdmin/AdminOrderList/index",
-      "style": {
-        "navigationBarTitleText": "订单"
-      }
-    },
-    {
-      "path": "pages/orderAdmin/GoodsDeliver/index",
-      "style": {
-        "navigationBarTitleText": "发货"
-      }
-    },
-    {
-      "path": "pages/orderAdmin/AdminOrder/index",
-      "style": {
-        "navigationBarTitleText": "商家订单列表"
-      }
-    },
-    {
-      "path": "pages/orderAdmin/Statistics/index",
-      "style": {
-        "navigationBarTitleText": "商家统计数据"
-      }
-    },
-    {
-      "path": "pages/orderAdmin/OrderCancellation/index",
-      "style": {
-        "navigationBarTitleText": "商家取消订单"
-      }
-    },
-    {
-      "path": "pages/activity/Poster/index",
-      "style": {
-        "navigationBarTitleText": "推广海报"
-      }
-    },
-    {
-      "path": "pages/activity/DargainDetails/index",
-      "style": {
-        "navigationBarTitleText": "帮砍价"
-      }
-    },
-    {
-      "path": "pages/activity/GoodsBargain/index",
-      "style": {
-        "navigationBarTitleText": "砍价列表"
-      }
-    },
-    {
-      "path": "pages/activity/BargainRecord/index",
-      "style": {
-        "navigationBarTitleText": "砍价记录"
-      }
-    },
-    {
-      "path": "pages/activity/GoodsGroup/index",
-      "style": {
-        "navigationBarTitleText": "团购商品列表"
-      }
-    },
-    {
-      "path": "pages/activity/GroupDetails/index",
-      "style": {
-        "navigationBarTitleText": "团购商品详情"
-      }
-    },
-    {
-      "path": "pages/activity/GroupRule/index",
-      "style": {
-        "navigationBarTitleText": "团购规则"
-      }
-    },
-    {
-      "path": "pages/activity/GoodsSeckill/index",
-      "style": {
-        "navigationBarTitleText": "秒杀"
-      }
-    },
-    {
-      "path": "pages/activity/SeckillDetails/index",
-      "style": {
-        "navigationBarTitleText": "秒杀详情"
-      }
-    },
     {
       "path": "pages/map/index",
       "style": {
diff --git a/pages/activity/BargainRecord/index.vue b/pages/activity/BargainRecord/index.vue
deleted file mode 100644
index d90ece3..0000000
--- a/pages/activity/BargainRecord/index.vue
+++ /dev/null
@@ -1,131 +0,0 @@
-<template>
-  <view class="bargain-record" ref="container">
-    <view class="item" v-for="(item, bargainrecordIndex) in bargain" :key="bargainrecordIndex">
-      <view class="picTxt acea-row row-between-wrapper">
-        <view class="pictrue">
-          <image :src="item.image" />
-        </view>
-        <view class="text acea-row row-column-around">
-          <view class="line1">{{ item.title }}</view>
-          <count-down
-            :isDay="true"
-            :tipText="'倒计时 '"
-            :dayText="' 天 '"
-            :hourText="' 时 '"
-            :minuteText="' 分 '"
-            :secondText="' 秒'"
-            :datatime="item.datatime"
-          ></count-down>
-          <view class="money font-color-red">
-            已砍至
-            <text class="symbol">￥</text>
-            <text class="num">{{ item.residuePrice }}</text>
-          </view>
-        </view>
-      </view>
-      <view class="bottom acea-row row-between-wrapper">
-        <view class="purple" v-if="item.status === 1">活动进行中</view>
-        <view class="success" v-else-if="item.status === 3">砍价成功</view>
-        <view class="end" v-else>活动已结束</view>
-        <view class="acea-row row-middle row-right">
-          <view
-            class="bnt cancel"
-            v-if="item.status === 1"
-            @click="getBargainUserCancel(item.bargainId)"
-          >取消活动</view>
-          <view
-            class="bnt bg-color-red"
-            v-if="item.status === 1"
-            @click="goDetail(item.bargainId)"
-          >继续砍价</view>
-          <view class="bnt bg-color-red" v-else @click="goList">重开一个</view>
-        </view>
-      </view>
-    </view>
-    <Loading :loaded="status" :loading="loadingList"></Loading>
-  </view>
-</template>
-<script>
-import CountDown from "@/components/CountDown";
-import { getBargainUserList, getBargainUserCancel } from "@/api/activity";
-import Loading from "@/components/Loading";
-
-export default {
-  name: "BargainRecord",
-  components: {
-    CountDown,
-    Loading
-  },
-  props: {},
-  data: function() {
-    return {
-      bargain: [],
-      status: false, //砍价列表是否获取完成 false 未完成 true 完成
-      loadingList: false, //当前接口是否请求完成 false 完成 true 未完成
-      page: 1, //页码
-      limit: 20 //数量
-    };
-  },
-  mounted: function() {
-    this.getBargainUserList();
-  },
-  onReachBottom() {
-    !this.loadingList && this.getBargainUserList();
-  },
-  methods: {
-    goDetail: function(id) {
-      this.$yrouter.push({
-        path: "/pages/activity/DargainDetails/index",
-        query: { id, partake: 0 }
-      });
-    },
-    goList: function() {
-      this.$yrouter.push({
-        path: "/pages/activity/GoodsBargain/index"
-      });
-    },
-    getBargainUserList: function() {
-      var that = this;
-      if (that.loadingList) return;
-      if (that.status) return;
-      getBargainUserList({ page: that.page, limit: that.limit })
-        .then(res => {
-          that.status = res.data.length < that.limit;
-          that.bargain.push.apply(that.bargain, res.data);
-          that.page++;
-          that.loadingList = false;
-        })
-        .catch(res => {
-           uni.showToast({
-                          title: res.msg,
-                          icon: "none",
-                          duration: 2000
-                        });
-        });
-    },
-    getBargainUserCancel: function(bargainId) {
-      var that = this;
-      getBargainUserCancel({ bargainId: bargainId })
-        .then(res => {
-          uni.showToast({
-            title: res.msg,
-            icon: "success",
-            duration: 2000
-          });
-          that.status = false;
-          that.loadingList = false;
-          that.page = 1;
-          that.bargain = [];
-          that.getBargainUserList();
-        })
-        .catch(res => {
-           uni.showToast({
-                          title: res.msg,
-                          icon: "none",
-                          duration: 2000
-                        });
-        });
-    }
-  }
-};
-</script>
diff --git a/pages/activity/DargainDetails/index.vue b/pages/activity/DargainDetails/index.vue
deleted file mode 100644
index 65f6343..0000000
--- a/pages/activity/DargainDetails/index.vue
+++ /dev/null
@@ -1,617 +0,0 @@
-<template>
-  <view class="bargain">
-    <!-- 在header上加 on 为请求支援 -->
-    <view :class="[bargainPartake != userInfo.uid ? 'header on' : 'header']">
-      <view class="people">{{ lookCount }}人查看 丨 {{ shareCount }}人分享 丨 {{ userCount }}人参与</view>
-      <!-- 帮助砍价、帮砍成功：-->
-      <view class="pictxt acea-row row-center-wrapper" v-if="bargainPartake != userInfo.uid">
-        <view class="pictrue">
-          <image :src="bargainUserInfo.avatar" />
-        </view>
-        <view class="text">
-          {{ bargainUserInfo.nickname }}
-          <text>邀请您帮忙砍价</text>
-        </view>
-      </view>
-      <count-down
-        :isDay="true"
-        :tipText="'倒计时 '"
-        :dayText="' 天 '"
-        :hourText="' 时 '"
-        :minuteText="' 分 '"
-        :secondText="' 秒'"
-        :datatime="datatime"
-      ></count-down>
-    </view>
-    <view class="wrapper">
-      <view class="pictxt acea-row row-between-wrapper" @click="openAlone">
-        <view class="pictrue">
-          <image :src="bargain.image" />
-          <view class="bargain_view">
-            查看商品
-            <view class="iconfont icon-jiantou iconfonts"></view>
-          </view>
-        </view>
-        <view class="text acea-row row-column-around">
-          <view class="line2" v-text="bargain.title"></view>
-          <view class="money font-color-red">
-            已砍至: ￥
-            <text class="num" v-text="price"></text>
-          </view>
-          <view class="acea-row row-middle">
-            <view class="successNum" v-text="'原价' + bargain.price"></view>
-            <view class="successNum" v-text="'已有' + bargainSumCount + '人砍价成功'"></view>
-          </view>
-        </view>
-      </view>
-      <view class="cu-progress acea-row row-middle round margin-top">
-        <view
-          class="acea-row row-middle bg-red"
-          :style="{ width: loading ? pricePercent + '%' : '' }"
-        ></view>
-      </view>
-      <view class="balance acea-row row-between-wrapper">
-        <view v-text="'已砍' + alreadyPrice + '元'"></view>
-        <view v-if="surplusPrice === 0">砍价成功</view>
-        <view v-else v-text="'还剩' + surplusPrice + '元'"></view>
-      </view>
-      <!-- 帮助砍价、帮砍成功：-->
-      <view
-        class="bargainSuccess"
-        v-if="bargainPartake != userInfo.uid && !statusUser && !helpListLoading"
-      >
-        <span class="iconfont icon-xiaolian"></span>已成功帮助好友砍价
-      </view>
-      <!-- 砍价成功：-->
-      <view
-        class="bargainSuccess"
-        v-if="
-          surplusPrice === 0 &&
-            bargainPartake === userInfo.uid &&
-            userBargainStatus === 1 &&
-            !helpListLoading
-        "
-      >
-        <span class="iconfont icon-xiaolian"></span>恭喜您砍价成功，快去支付吧~
-      </view>
-      <view
-        v-if="userBargainStatus == 0 && bargainPartake === userInfo.uid"
-        class="bargainBnt"
-        @click="goParticipate"
-      >立即参与砍价</view>
-      <view
-        class="bargainBnt"
-        @click="goPoster"
-        v-if="
-          surplusPrice > 0 &&
-            bargainPartake === userInfo.uid &&
-            userBargainStatus === 1 &&
-            !helpListLoading
-        "
-      >邀请好友帮砍价</view>
-      <view
-        class="bargainBnt"
-        @click="getBargainHelp"
-        v-else-if="
-          bargainPartake != userInfo.uid &&
-            userBargainStatus == 1 &&
-            statusUser &&
-            !helpListLoading
-        "
-      >帮好友砍一刀</view>
-      <view
-        class="bargainBnt"
-        @click="getBargainStart"
-        v-if="bargainPartake != userInfo.uid && !statusUser && !helpListLoading"
-      >我也要参与</view>
-      <view
-        class="bargainBnt"
-        @click="goPay"
-        v-if="
-          surplusPrice === 0 &&
-            bargainPartake === userInfo.uid &&
-            userBargainStatus === 1
-        "
-      >立即支付</view>
-      <view class="bargainBnt on" @click="goList">抢更多商品</view>
-      <view class="tip">
-        已有
-        <span class="font-color-red" v-text="helpCount"></span>
-        位好友成功帮您砍价
-      </view>
-      <view class="lock"></view>
-    </view>
-    <view class="bargainGang">
-      <view class="title font-color-red acea-row row-center-wrapper">
-        <view class="pictrue">
-          <image :src="webUrl+'/20230304134450627525.png'" />
-        </view>
-        <view class="titleCon">砍价帮</view>
-        <view class="pictrue on">
-          <image :src="webUrl+'/20230304134450627525.png'" />
-        </view>
-      </view>
-      <view class="list">
-        <view
-          class="item acea-row row-between-wrapper"
-          v-for="(item, bargainHelpListIndex) in bargainHelpList"
-          :key="bargainHelpListIndex"
-        >
-          <view class="pictxt acea-row row-between-wrapper">
-            <view class="pictrue">
-              <image :src="item.avatar" />
-            </view>
-            <view class="text">
-              <view class="name line1" v-text="item.nickname"></view>
-              <view class="line1" v-text="item.add_time"></view>
-            </view>
-          </view>
-          <view class="money font-color-red">
-            <text class="iconfont icon-kanjia"></text>
-            砍掉{{ item.price }}元
-          </view>
-        </view>
-      </view>
-      <view
-        class="load font-color-red"
-        v-if="!helpListStatus && !helpListLoading"
-        @click="getBargainHelpList"
-      >点击加载更多</view>
-      <view class="lock"></view>
-    </view>
-    <view class="goodsDetails">
-      <view class="title font-color-red acea-row row-center-wrapper">
-        <view class="pictrue">
-          <image :src="webUrl+'/20230304134450627525.png'" />
-        </view>
-        <view class="titleCon">商品详情</view>
-        <view class="pictrue on">
-          <image :src="webUrl+'/20230304134450627525.png'" />
-        </view>
-      </view>
-      <view class="conter" v-html="bargain.description"></view>
-      <view class="lock"></view>
-    </view>
-    <view class="goodsDetails">
-      <view class="title font-color-red acea-row row-center-wrapper">
-        <view class="pictrue">
-          <image :src="webUrl+'/20230304134450627525.png'" />
-        </view>
-        <view class="titleCon">活动规则</view>
-        <view class="pictrue on">
-          <image :src="webUrl+'/20230304134450627525.png'" />
-        </view>
-      </view>
-      <view class="conter" v-html="bargain.rule"></view>
-    </view>
-    <view class="bargainTip" :class="active === true ? 'on' : ''">
-      <!-- <view class="pictrue">
-        <image src="@/static/images/bargainBg.jpg" />
-        <view class="iconfont icon-guanbi" @click="close"></view>
-      </view>-->
-      <view class="cutOff" v-if="bargainPartake === userInfo.uid">
-        您已砍掉
-        <text class="font-color-red" v-text="bargainHelpPrice"></text>元，听说分享次数越多砍价成功的机会越大哦！
-      </view>
-      <view class="cutOff on" v-else>
-        <view class="help font-color-red" v-text="'成功帮砍' + bargainHelpPrice + '元'"></view>，您也可以砍价低价拿哦，快去挑选心仪的商品吧~
-      </view>
-      <view class="tipBnt" @click="goPoster" v-if="bargainPartake === userInfo.uid">邀请好友帮砍价</view>
-      <view class="tipBnt" @click="getBargainStart" v-else>我也要参与</view>
-    </view>
-    <view class="mask" @touchmove.prevent :hidden="active === false" @click="close"></view>
-  </view>
-</template>
-<script>
-import CountDown from "@/components/CountDown";
-import {
-  getBargainDetail,
-  getBargainShare,
-  getBargainStart,
-  getBargainHelp,
-  getBargainHelpPrice,
-  getBargainHelpList,
-  getBargainHelpCount,
-  getBargainStartUser
-} from "@/api/activity";
-import { postCartAdd } from "@/api/store";
-import { mapGetters } from "vuex";
-import {} from "@/libs/wechat";
-import { isWeixin, parseQuery, handleQrCode } from "@/utils/index";
-
-const NAME = "DargainDetails";
-
-export default {
-  name: "DargainDetails",
-  components: {
-    CountDown
-  },
-  props: {},
-  data: function() {
-    return {
-      webUrl: this.$VUE_APP_RESOURCES_URL,
-      price: 0,
-      bargainId: 0, //砍价编号
-      bargainPartake: 0, //参与砍价
-      bargain: [], //砍价产品信息
-      partake: null,
-      bargainSumCount: 0, //砍价成功人数
-      activeMsg: "",
-      active: false,
-      loading: false,
-      datatime: 0,
-      lookCount: 0, //查看人数
-      shareCount: 0, //分享人数
-      userCount: 0, //参与人数
-      bargainHelpPrice: 0, //砍掉金额
-      bargainHelpList: [],
-      helpListStatus: false, //砍价列表是否获取完成 false 未完成 true 完成
-      helpListLoading: false, //当前接口是否请求完成 false 完成 true 未完成
-      page: 1, //页码
-      limit: 2, //数量
-      helpCount: 0, //砍价帮总人数
-      surplusPrice: 0, //剩余金额
-      alreadyPrice: 0, //已砍掉价格
-      pricePercent: 0, //砍价进度条
-      bargainUserInfo: [], //砍价 开启砍价用户信息
-      userBargainStatus: 2, //砍价状态
-      statusUser: false ,// 是否帮别人砍,没砍是true，砍了false
-	  share:{
-	  	title:'',
-	  	path: `/pages/activity/DargainDetails/index/?id=${this.$yroute.query.id}&partake=${this.userInfo.uid}`,
-	  	imageUrl:'',
-	  	desc:'',
-	  	content:''
-	  }
-    };
-  },
-  computed: mapGetters(["userInfo", "isLogin"]),
-  // watch: {
-  //   $yroute: function(n) {
-  //     var that = this;
-  //     if (n.name === NAME) {
-  //       that.mountedStart();
-  //     }
-  //   }
-  // },
-  mounted: function() {
-    var that = this;
-    that.mountedStart();
-    setTimeout(function() {
-      that.loading = true;
-    }, 500);
-  },
-  methods: {
-    //参与砍价
-    goParticipate() {
-      if (this.bargainPartake === this.userInfo.uid) this.getBargainStart();
-      else this.getBargainStartUser();
-      this.getBargainHelpCount();
-    },
-    openAlone: function() {
-      this.$yrouter.push({ path: "/detail/" + this.bargain.productId });
-    },
-    mountedStart: function() {
-      var that = this;
-      let url = handleQrCode();
-      if (url) {
-        that.bargainId = url.bargainId;
-        that.partake = url.uid;
-      } else {
-        that.bargainId = that.$yroute.query.id;
-        that.partake = parseInt(that.$yroute.query.partake);
-      }
-      if (
-        this.partake === undefined ||
-        this.partake <= 0 ||
-        isNaN(this.partake)
-      ) {
-        that.bargainPartake = that.userInfo.uid;
-        // that.$yrouter.push({
-        //   path: "/pages/activity/DargainDetails/index",
-        //   query: { id: that.bargainId, partake: that.bargainPartake }
-        // });
-      } else {
-        that.bargainPartake = parseInt(this.partake);
-      }
-      that.getBargainHelpCountStart();
-      that.getBargainDetail();
-      that.getBargainShare(0);
-      // if (that.bargainPartake !== that.userInfo.uid) that.getBargainStartUser();
-      if (that.bargainPartake === that.userInfo.uid) {
-        // that.getBargainStart();
-      } else {
-        that.getBargainStartUser();
-      }
-    },
-    goPay: function() {
-      var data = {};
-      var that = this;
-      data.productId = that.bargain.productId;
-      data.cartNum = that.bargain.num;
-      data.uniqueId = "";
-      data.bargainId = that.bargainId;
-      data.new = 1;
-      postCartAdd(data)
-        .then(res => {
-          that.$yrouter.push({
-            path: "/pages/order/OrderSubmission/index",
-            query: { id: res.data.cartId }
-          });
-        })
-        .catch(err => {
-          uni.showToast({
-            title:
-              err.msg || err.response.data.msg || err.response.data.message,
-            icon: "none",
-            duration: 2000
-          });
-        });
-    },
-    goPoster: function() {
-      var that = this;
-      that.getBargainShare(that.bargainId);
-      this.$yrouter.push({
-        path: "/pages/activity/Poster/index",
-        query: { id: that.bargainId, type: 2 }
-      });
-    },
-    goList: function() {
-      this.$yrouter.push({
-        path: "/pages/activity/GoodsBargain/index"
-      });
-    },
-    //砍价分享
-    //bargainId 0  获取 查看人数 分享人数 参与人数
-    //bargainId 砍价产品编号 添加分享次数  获取 查看人数 分享人数 参与人数
-    getBargainShare: function(bargainId) {
-      var that = this;
-      getBargainShare({ bargainId: bargainId }).then(res => {
-        that.lookCount = res.data.lookCount;
-        that.shareCount = res.data.shareCount;
-        that.userCount = res.data.userCount;
-      });
-    },
-    // 获取产品详情
-    getBargainDetail: function() {
-      var that = this;
-      getBargainDetail(that.bargainId)
-        .then(res => {
-          res.data.bargain = res.data.bargain.replace(
-            /\<img/gi,
-            '<img style="max-width:100%;height:auto;"'
-          );
-          that.bargain = res.data.bargain;
-          that.datatime = that.bargain.stopTime / 1000;
-          that.getBargainHelpCount();
-        })
-        .catch(res => {
-          uni.showToast({
-            title: res.msg,
-            icon: "none",
-            duration: 2000
-          });
-        });
-    },
-    //开启砍价
-    getBargainStart: function() {
-      var that = this;
-      getBargainStart({ bargainId: that.bargainId })
-        .then(() => {
-          that.bargainPartake = that.userInfo.uid;
-          that.getBargainHelp();
-        })
-        .catch(res => {
-          uni.showToast({
-            title: res.msg,
-            icon: "none",
-            duration: 2000
-          });
-        });
-    },
-    //参与砍价
-    getBargainHelp: function() {
-      var that = this;
-      if (
-        that.surplusPrice === 0 &&
-        that.bargainPartake !== that.userInfo.uid
-      ) {
-        return uni.showToast({
-          title: "好友已经砍价成功",
-          icon: "success",
-          duration: 2000
-        });
-      }
-      var data = {
-        bargainId: that.bargainId,
-        bargainUserUid: that.bargainPartake
-      };
-      getBargainHelp(data)
-        .then(res => {
-          that.activeMsg = res.data.status;
-          if (
-            res.data.status === "SUCCESSFUL" &&
-            that.bargainPartake !== that.userInfo.uid
-          ) {
-            uni.showToast({
-              title: "您已经砍过了",
-              icon: "none",
-              duration: 2000
-            });
-            return;
-          }
-          that.helpListStatus = false;
-          that.page = 1;
-          that.bargainHelpList = [];
-          that.getBargainHelpPrice();
-        })
-        .catch(res => {
-          uni.showToast({
-            title: res.msg,
-            icon: "none",
-            duration: 2000
-          });
-        });
-    },
-    //获取砍掉的金额
-    getBargainHelpPrice: function() {
-      var that = this;
-      getBargainHelpPrice({
-        bargainId: that.bargainId,
-        bargainUserUid: that.bargainPartake
-      })
-        .then(res => {
-          that.bargainHelpPrice = res.data.price;
-          that.getBargainHelpCount();
-          that.getBargainHelpList();
-          switch (that.activeMsg) {
-            case "SUCCESSFUL":
-              break;
-            case "SUCCESS":
-              that.active = true;
-              break;
-          }
-        })
-        .catch(res => {
-          uni.showToast({
-            title: res.msg,
-            icon: "none",
-            duration: 2000
-          });
-        });
-    },
-    //砍价帮
-    getBargainHelpList: function() {
-      var that = this;
-      if (that.helpListLoading === true) return;
-      if (that.helpListStatus === true) return;
-      that.helpListLoading = true;
-      getBargainHelpList({
-        bargainId: that.bargainId,
-        bargainUserUid: that.bargainPartake,
-        page: that.page,
-        limit: that.limit
-      })
-        .then(res => {
-          that.helpListStatus = res.data.length < that.limit;
-          that.helpListLoading = false;
-          that.page++;
-          that.bargainHelpList.push.apply(that.bargainHelpList, res.data);
-        })
-        .catch(res => {
-          uni.showToast({
-            title: res.msg,
-            icon: "none",
-            duration: 2000
-          });
-        });
-    },
-    getBargainHelpCountStart: function() {
-      var that = this;
-      getBargainHelpCount({
-        bargainId: that.bargainId,
-        bargainUserUid: that.bargainPartake
-      })
-        .then(() => {})
-        .catch(() => {
-          this.$yrouter.push({
-            path: "/pages/activity/DargainDetails/index",
-            query: { id: that.bargainId, partake: that.userInfo.uid }
-          });
-          // that.$router.push({
-          //   path:
-          //     "/activity/dargain_detail/" +
-          //     that.bargainId +
-          //     "/" +
-          //     that.userInfo.uid
-          // });
-        });
-    },
-    getBargainHelpCount: function() {
-      var that = this;
-      getBargainHelpCount({
-        bargainId: that.bargainId,
-        bargainUserUid: that.bargainPartake
-      })
-        .then(res => {
-          that.userBargainStatus = res.data.status;
-          that.helpCount = res.data.count;
-          that.surplusPrice = res.data.price;
-          that.alreadyPrice = res.data.alreadyPrice;
-          that.pricePercent = res.data.pricePercent;
-          that.price = (that.bargain.price - that.alreadyPrice).toFixed(2);
-          console.log(that);
-        })
-        .catch(() => {
-          that.bargainPartake = that.userInfo.uid;
-          // that.$yrouter.push({
-          //   path: "/pages/activity/DargainDetails/index",
-          //   query: { id: that.bargainId, partake: that.userInfo.uid }
-          // });
-        });
-    },
-    getBargainStartUser: function() {
-      var that = this;
-      getBargainStartUser({
-        bargainId: that.bargainId,
-        bargainUserUid: that.bargainPartake
-      })
-        .then(res => {
-          that.bargainUserInfo = res.data;
-          that.getBargainHelpList();
-        })
-        .catch(res => {
-          uni.showToast({
-            title: res.msg,
-            icon: "none",
-            duration: 2000
-          });
-        });
-    },
-    close: function() {
-      this.active = false;
-    }
-  }
-  // ,
-  // onShareAppMessage() {
-  //   return {
-  //     path: `/pages/activity/DargainDetails/index/?id=${this.$yroute.query.id}&partake=${this.userInfo.uid}`
-  //   };
-  // }
-};
-</script>
-
-<style lang="less">
-page {
-  background-color: #eb3729;
-}
-.bargainBnt_hui {
-  font-size: 0.3 * 100rpx;
-  font-weight: bold;
-  color: #fff;
-  width: 6 * 100rpx;
-  height: 0.8 * 100rpx;
-  border-radius: 0.4 * 100rpx;
-  background: #bbb;
-  text-align: center;
-  line-height: 0.8 * 100rpx;
-  margin-top: 0.32 * 100rpx;
-}
-.bargain_view {
-  left: 0;
-  right: 0;
-  height: 0.48 * 100rpx;
-  background: rgba(0, 0, 0, 0.5);
-  opacity: 1;
-  border-radius: 0 0 0.06 * 100rpx 0.06 * 100rpx;
-  position: absolute;
-  bottom: 0;
-  font-size: 0.22 * 100rpx;
-  color: #fff;
-  text-align: center;
-  line-height: 0.48 * 100rpx;
-}
-.iconfonts {
-  font-size: 0.22 * 100rpx;
-}
-</style>
diff --git a/pages/activity/GoodsBargain/index.vue b/pages/activity/GoodsBargain/index.vue
deleted file mode 100644
index 8a7bf1c..0000000
--- a/pages/activity/GoodsBargain/index.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<template>
-  <view class="bargain-list">
-    <!-- <view class="header">
-      <image src="@/static/images/cut-bg.png" alt="">
-    </view>-->
-    <view class="list" v-if="bargainLis.length > 0">
-      <view class="item acea-row row-between-wrapper" v-for="(item, bargainLisIndex) in bargainLis"
-        :key="bargainLisIndex">
-        <view class="pictrue">
-          <image :src="item.image" />
-        </view>
-        <view class="text acea-row row-column-around">
-          <view class="line1" v-text="item.title"></view>
-          <view class="num">
-            <text class="iconfont icon-pintuan"></text>
-            {{ item.people }}人正在参与
-          </view>
-          <view class="money font-color-red">
-            可砍至: ￥
-            <text class="price">{{item.minPrice}}</text>
-          </view>
-        </view>
-        <view class="cutBnt bg-color-red" @click="goDetail(item.id)">
-          <text class="iconfont icon-kanjia"></text>参与砍价
-        </view>
-      </view>
-      <view class="load font-color-red" v-if="!status" @click="getBargainList">点击加载更多</view>
-    </view>
-  </view>
-</template>
-<script>
-  import {
-    getBargainList
-  } from "@/api/activity";
-  export default {
-    name: "GoodsBargain",
-    components: {},
-    props: {},
-    data: function() {
-      return {
-        bargainLis: [], //砍价列表
-        status: false, //砍价列表是否获取完成 false 未完成 true 完成
-        loading: false, //当前接口是否请求完成 false 完成 true 未完成
-        page: 1, //页码
-        limit: 20 //数量
-      };
-    },
-    mounted: function() {
-      this.getBargainList();
-    },
-    methods: {
-      getBargainList: function() {
-        var that = this;
-        if (that.loading) return;
-        if (that.status) return;
-        that.loading = true;
-        getBargainList({
-          page: that.page,
-          limit: that.limit
-        }).then(res => {
-          that.status = res.data.length < that.limit;
-          that.bargainLis.push.apply(that.bargainLis, res.data);
-          that.page++;
-          that.loading = false;
-        });
-      },
-      goDetail: function(id) {
-        this.$yrouter.push({
-          path: "/pages/activity/DargainDetails/index",
-          query: {
-            id,
-            partake: 0
-          }
-        });
-      }
-    }
-  };
-</script>
-
-<style>
-  page {
-    background-color: rgb(245, 245, 245);
-  }
-</style>
diff --git a/pages/activity/GoodsGroup/index.vue b/pages/activity/GoodsGroup/index.vue
deleted file mode 100644
index 191b4ea..0000000
--- a/pages/activity/GoodsGroup/index.vue
+++ /dev/null
@@ -1,91 +0,0 @@
-<template>
-  <view class="group-list" ref="container">
-    <view class="list" v-if="combinationList.length>0">
-      <view
-        class="item acea-row row-between-wrapper"
-        v-for="(item, combinationListIndex) in combinationList"
-        :key="combinationListIndex"
-        @click="link(item.id)"
-      >
-        <view class="pictrue">
-          <image :src="item.image" />
-        </view>
-        <view class="text">
-          <view class="line1" v-text="item.title"></view>
-          <view class="acea-row">
-            <view class="team acea-row row-middle cart-color">
-              <view class="iconfont icon-pintuan"></view>
-              <view class="num" v-text="item.people + '人团'"></view>
-            </view>
-          </view>
-          <view class="bottom acea-row row-between-wrapper">
-            <view class="money">
-              ￥
-              <text class="num" v-text="item.price"></text>
-              <text class="y-money" v-text="'￥' + item.productPrice"></text>
-            </view>
-            <view class="groupBnt bg-color-red">
-              去拼团
-              <text class="iconfont icon-jiantou"></text>
-            </view>
-          </view>
-        </view>
-      </view>
-      <Loading :loaded="status" :loading="loadingList"></Loading>
-    </view>
-    <view class="noCommodity" style="background-color: #fff;" v-if="combinationList.length === 0">
-      <view class="noPictrue">
-        <image :src="webUrl+'/20210203153900181449.png'" class="image" />
-      </view>
-    </view>
-  </view>
-</template>
-<script>
-import { getCombinationList } from "@/api/activity";
-import Loading from "@/components/Loading";
-
-export default {
-  name: "GoodsGroup",
-  components: {
-    Loading
-  },
-  props: {},
-  data: function() {
-    return {
-	  webUrl:this.$VUE_APP_RESOURCES_URL,
-      combinationList: [],
-      status: false, //砍价列表是否获取完成 false 未完成 true 完成
-      loading: false, //当前接口是否请求完成 false 完成 true 未完成
-      page: 1, //页码
-      limit: 20, //数量
-      loadingList: false
-    };
-  },
-  mounted: function() {
-    // document.querySelector('body').setAttribute('style', 'background-color:#eb3729');
-    this.getCombinationList();
-  },
-  onReachBottom() {
-    !this.loadingList && this.getCombinationList();
-  },
-  methods: {
-    getCombinationList: function() {
-      var that = this;
-      if (that.loading) return;
-      if (that.status) return;
-      getCombinationList({ page: that.page, limit: that.limit }).then(res => {
-        that.status = res.data.length < that.limit;
-        that.combinationList.push.apply(that.combinationList, res.data);
-        that.page++;
-        that.loading = false;
-      });
-    },
-    link: function(id) {
-      this.$yrouter.push({
-        path: "/pages/activity/GroupDetails/index",
-        query: { id }
-      });
-    }
-  }
-};
-</script>
diff --git a/pages/activity/GoodsSeckill/index.vue b/pages/activity/GoodsSeckill/index.vue
deleted file mode 100644
index beb0950..0000000
--- a/pages/activity/GoodsSeckill/index.vue
+++ /dev/null
@@ -1,261 +0,0 @@
-<template>
-  <view class="flash-sale" ref="container">
-    <view class="header" v-if="headerImg">
-      <image :src="headerImg"/>
-    </view>
-    <scroll-view scroll-y="false" scroll-x="true">
-      <view class="timeScroll">
-        <view v-for="(item, index) in timeList" :key="index">
-          <view v-if="active==index" class="timeItem active" @click="setTime(index)">
-            <view class="time">{{ item.time }}</view>
-            <view class="state">{{ item.state }}</view>
-          </view>
-          <view v-if="active!=index" class="timeItem" @click="setTime(index)">
-            <view class="time">{{ item.time }}</view>
-            <view class="state">{{ item.state }}</view>
-          </view>
-        </view>
-      </view>
-    </scroll-view>
-    <view v-for="(item, index) in timeList" :key="index">
-      <view v-if="active == index">
-        <view class="countDown font-color-red acea-row row-center-wrapper">
-          <view v-if="item.status === 0" class="activity">活动已结束</view>
-          <count-down
-              :isDay="false"
-              :tipText="'距结束仅剩 '"
-              :dayText="false"
-              :hourText="' : '"
-              :minuteText="' : '"
-              :secondText="false"
-              :datatime="datatime"
-              v-if="item.status === 1"
-          ></count-down>
-          <view v-if="item.status === 2" class="activity">活动即将开始</view>
-        </view>
-        <view class="list">
-          <view
-              class="item acea-row row-between-wrapper"
-              v-for="(itemSeckill, indexSeckill) in seckillList"
-              :key="indexSeckill"
-          >
-            <view class="pictrue">
-              <image :src="itemSeckill.image"/>
-            </view>
-            <view class="text acea-row row-column-around">
-              <view class="line1" v-text="itemSeckill.title"></view>
-              <view class="money">
-                限时价
-                <text class="num font-color-red" v-text="'￥' + itemSeckill.price"></text>
-              </view>
-              <view class="progress cart-color">
-                <view class="bg-red" :style="{ width: loading ? itemSeckill.percent + '%' : '' }"></view>
-                <view class="piece font-color-red" v-text="'仅剩' + itemSeckill.stock + '件'"></view>
-              </view>
-            </view>
-            <view
-                class="grab bg-color-red"
-                v-if="item.status === 1 && itemSeckill.stock > 0"
-                @click="goDetail(itemSeckill.id)"
-            >马上抢
-            </view>
-            <view class="grab" v-if="item.status === 1 && itemSeckill.stock <= 0">已售磬</view>
-            <view class="grab bg-color-red" v-if="item.status === 2">即将开始</view>
-            <view class="grab bg-color-red" v-if="item.status === 0">已结束</view>
-          </view>
-        </view>
-        <view
-            class="noCommodity"
-            style="background-color: #fff;"
-            v-if="seckillList.length === 0 && page > 1"
-        >
-          <view class="noPictrue">
-            <image :src="webUrl+'/20210203153900181449.png'" class="image"/>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-<script>
-import {getSeckillConfig, getSeckillList} from "@/api/activity";
-import CountDown from "@/components/CountDown";
-
-export default {
-  name: "GoodsSeckill",
-  components: {
-    CountDown
-  },
-  props: {},
-  data: function () {
-    return {
-      webUrl: this.$VUE_APP_RESOURCES_URL,
-      headerImg: "",
-      timeList: [],
-      sticky: false,
-      loading: false,
-      datatime: 0,
-      active: 0,
-      seckillList: [],
-      status: false, //砍价列表是否获取完成 false 未完成 true 完成
-      loadingList: false, //当前接口是否请求完成 false 完成 true 未完成
-      page: 1, //页码
-      limit: 5, //数量
-      title: []
-    };
-  },
-  mounted: function () {
-    this.mountedStart();
-  },
-  onReachBottom() {
-    !this.loadingList && this.getSeckillList();
-  },
-  methods: {
-    changeTime: function (index) {
-      this.active = index;
-      this.getSeckillList();
-    },
-    mountedStart: function () {
-      var that = this;
-      uni.showLoading();
-      getSeckillConfig().then(res => {
-        that.$set(that, "headerImg", res.data.lovely);
-        that.$set(that, "timeList", res.data.seckillTime);
-        that.$set(that, "active", res.data.seckillTimeIndex);
-
-        let title = [];
-        title = res.data.seckillTime.map((item, index) => {
-          return {
-            name: "div",
-            attrs: {
-              class: "timeItem"
-            },
-            children: [
-              {
-                name: "div",
-                attrs: {
-                  class: "time"
-                },
-                children: [
-                  {
-                    type: "text",
-                    text: item.time
-                  }
-                ]
-              },
-              {
-                name: "div",
-                attrs: {
-                  class: "state"
-                },
-                children: [
-                  {
-                    type: "text",
-                    text: item.state
-                  }
-                ]
-              }
-            ]
-          };
-        });
-        that.$set(that, "title", title);
-        that.datatime = that.timeList[that.active].stop;
-        that.getSeckillList();
-        that.$nextTick(function () {
-          that.sticky = true;
-          uni.hideLoading();
-        });
-      });
-    },
-    setTime: function (index) {
-      var that = this;
-      that.page = 1;
-      that.loadingList = false;
-      that.status = false;
-      that.active = index;
-      that.datatime = that.timeList[that.active].stop;
-      this.seckillList = [];
-      that.getSeckillList();
-    },
-    getSeckillList: function () {
-      var that = this;
-      if (that.loadingList) return;
-      if (that.status) return;
-      var time = that.timeList[that.active].id;
-      getSeckillList(time, {
-        page: that.page,
-        limit: that.limit
-      }).then(res => {
-        that.status = res.data.length < that.limit;
-        that.seckillList.push.apply(that.seckillList, res.data);
-        that.page++;
-        uni.hideLoading();
-      });
-    },
-    goDetail: function (id) {
-      var that = this;
-      var time = that.timeList[that.active].stop;
-      this.$yrouter.push({
-        path: "/pages/activity/SeckillDetails/index",
-        query: {
-          id,
-          time
-        }
-      });
-    }
-  }
-};
-</script>
-<style scoped lang="less">
-.timeScroll {
-  display: flex;
-  align-items: center;
-  flex-direction: row;
-}
-
-.timeItem {
-  font-size: 0.22 * 100rpx;
-  color: #282828;
-  width: 150rpx;
-  text-align: center;
-  padding: 0.11 * 100rpx 0;
-  background-color: none;
-
-  &.active {
-    .time {
-      color: #eb3729;
-    }
-
-    .state {
-      background-color: #eb3729;
-      color: #fff;
-      opacity: 1;
-      border-radius: 30rpx;
-      padding: 0 0.2 * 100rpx;
-      font-weight: 800;
-      height: 0.37 * 100rpx;
-      line-height: 0.37 * 100rpx;
-    }
-  }
-}
-
-.timeItem .time {
-  font-size: 0.32 * 100rpx;
-  font-weight: bold;
-  height: 0.37 * 100rpx;
-  line-height: 0.37 * 100rpx;
-}
-
-.timeItem .state {
-  height: 0.37 * 100rpx;
-  line-height: 0.37 * 100rpx;
-}
-
-.activity {
-  color: #333;
-}
-
-.flash-sale .list .item .grab {
-  background-color: #999;
-}
-</style>
diff --git a/pages/activity/GroupDetails/index.vue b/pages/activity/GroupDetails/index.vue
deleted file mode 100644
index 03e9788..0000000
--- a/pages/activity/GroupDetails/index.vue
+++ /dev/null
@@ -1,375 +0,0 @@
-<template>
-  <view :class="[posterImageStatus ? 'noscroll product-con' : 'product-con']" v-show="domStatus">
-    <product-con-swiper :imgUrls="imgUrls"></product-con-swiper>
-    <view class="wrapper">
-      <view class="share acea-row row-between row-bottom">
-        <view class="money font-color-red">
-          ￥
-          <text class="num" v-text="storeInfo.price"></text>
-          <text class="y-money" v-text="'￥' + storeInfo.productPrice"></text>
-        </view>
-      </view>
-      <view class="introduce" v-text="storeInfo.title"></view>
-      <view class="label acea-row row-between-wrapper">
-        <view v-text="'类型:' + storeInfo.people + '人团'"></view>
-        <view v-text="'库存:' + storeInfo.stock + storeInfo.unitName"></view>
-        <view v-text="'已拼:' + storeInfo.sales + storeInfo.unitName"></view>
-      </view>
-    </view>
-    <view class="notice acea-row row-middle">
-      <view class="num font-color-red">
-        <text class="iconfont icon-laba"></text>
-        已拼{{ storeInfo.sales
-        }}{{ storeInfo.unitName }}
-        <text class="line">|</text>
-      </view>
-      <view class="swiper-no-swiping swiper">
-        <swiper class="swiper-wrapper" :options="swiperTip" :autoplay="true" :interval="3000">
-          <block v-for="(item, itemNewIndex) in itemNew" :key="itemNewIndex">
-            <swiper-item>
-              <view class="line1">{{ item }}</view>
-            </swiper-item>
-          </block>
-        </swiper>
-      </view>
-    </view>
-    <view class="assemble">
-      <view v-for="(item, groupListindex) in groupList" :key="groupListindex">
-        <view class="item acea-row row-between-wrapper" v-if="groupListindex < groupListCount">
-          <view class="pictxt acea-row row-between-wrapper">
-            <view class="pictrue">
-              <image :src="item.avatar" class="image" />
-            </view>
-            <view class="text line1" v-text="item.nickname"></view>
-          </view>
-          <view class="right acea-row row-middle">
-            <view>
-              <view class="lack">
-                <text>还差</text>
-                <text class="font-color-red" v-text="item.count"></text>
-                <text>人成团</text>
-              </view>
-              <count-down
-                :isDay="false"
-                :tipText="'剩余 '"
-                :dayText="false"
-                :hourText="':'"
-                :minuteText="':'"
-                :secondText="false"
-                :datatime="item.stopTime/1000"
-              ></count-down>
-            </view>
-            <view class="spellBnt" @click="groupRule(item.id)">
-              去拼单
-              <text class="iconfont icon-jiantou"></text>
-            </view>
-          </view>
-        </view>
-      </view>
-      <view class="more" v-if="groupList.length > groupListCount" @click="setGroupListCount">
-        查看更多
-        <text class="iconfont icon-xiangxia"></text>
-      </view>
-    </view>
-    <view class="playWay">
-      <view class="title acea-row row-between-wrapper">
-        <view>拼团玩法</view>
-      </view>
-      <view class="way acea-row row-middle">
-        <view class="item">
-          <text class="num">①</text>开团/参团
-        </view>
-        <view class="iconfont icon-arrow"></view>
-        <view class="item">
-          <text class="num">②</text>邀请好友
-        </view>
-        <view class="iconfont icon-arrow"></view>
-        <view class="item">
-          <view>
-            <text class="num">③</text>满员发货
-          </view>
-        </view>
-      </view>
-    </view>
-    <view class="userEvaluation">
-      <view class="title acea-row row-between-wrapper">
-        <view v-text="'用户评价(' + replyCount + ')'"></view>
-        <view class="praise" @click="goReply">
-          <text class="font-color-red" v-text="replyChance + '%'"></text>好评率
-          <text class="iconfont icon-jiantou"></text>
-        </view>
-      </view>
-      <UserEvaluation :reply="reply"></UserEvaluation>
-    </view>
-    <view class="product-intro">
-      <view class="title">产品介绍</view>
-      <view class="conter" v-html="storeInfo.description"></view>
-      <!-- <view class="conter" v-html=""></view> -->
-    </view>
-    <view style="height:100rpx;"></view>
-    <view class="footer-group acea-row row-between-wrapper">
-      <!-- <view class="customerSer acea-row row-center-wrapper row-column">
-        <view class="iconfont icon-kefu"></view>
-        <view>客服</view>
-      </view>-->
-      <view class="customerSer acea-row row-center-wrapper row-column" @click="setCollect">
-        <view class="iconfont" :class="userCollect ? 'icon-shoucang1' : 'icon-shoucang'"></view>
-        <text>收藏</text>
-      </view>
-      <view class="bnt bg-color-violet" @click="openAlone">单独购买</view>
-      <view class="bnt bg-color-red" @click="openTeam">立即开团</view>
-    </view>
-    <ProductWindow v-if="cartNum" v-on:changeFun="changeFun" :attr="attr" :cartNum="cartNum"></ProductWindow>
-    <StorePoster
-      v-on:setPosterImageStatus="setPosterImageStatus"
-      :posterImageStatus="posterImageStatus"
-      :posterData="posterData"
-    ></StorePoster>
-  </view>
-</template>
-
-<script>
-// import { swiper, swiperSlide } from "vue-awesome-swiper";
-
-import ProductConSwiper from "@/components/ProductConSwiper";
-import CountDown from "@/components/CountDown";
-import UserEvaluation from "@/components/UserEvaluation";
-import ProductWindow from "@/components/ProductWindow";
-import StorePoster from "@/components/StorePoster";
-import { getCombinationDetail } from "@/api/activity";
-import { postCartAdd } from "@/api/store";
-import { imageBase64 } from "@/api/public";
-import {
-  getCoupon,
-  getCollectAdd,
-  getCollectDel,
-  getUserInfo
-} from "@/api/user";
-const NAME = "GroupDetails";
-
-export default {
-  name: "GroupDetails",
-  components: {
-    ProductConSwiper,
-    CountDown,
-    UserEvaluation,
-    // swiper,
-    // swiperSlide,
-    ProductWindow,
-    StorePoster
-  },
-  props: {},
-  data: function() {
-    return {
-      domStatus: false,
-      posterData: {
-        image: "",
-        title: "",
-        price: "",
-        code: ""
-      },
-      posterImageStatus: false,
-      reply: [],
-      replyCount: 0,
-      replyChance: 0,
-      imgUrls: [],
-      storeInfo: {},
-      itemNew: {},
-      groupListCount: 2,
-      groupList: {},
-      swiperTip: {
-        direction: "vertical",
-        autoplay: {
-          disableOnInteraction: false,
-          delay: 2000
-        },
-        loop: true,
-        speed: 1000,
-        observer: true,
-        observeParents: true
-      },
-      attr: {
-        cartAttr: false,
-        productSelect: {
-          image: "",
-          store_name: "",
-          price: "",
-          stock: "",
-          unique: "",
-          cart_num: 1
-        }
-      },
-      cartNum: 1,
-      userCollect: false
-    };
-  },
-  watch: {
-    $yroute: function(n) {
-      var that = this;
-      if (n.name === NAME) {
-        that.mountedStart();
-      }
-    }
-  },
-  onShow: function() {
-    this.mountedStart();
-  },
-  methods: {
-    openAlone: function() {
-      this.$yrouter.push({
-        path: "/pages/shop/GoodsCon/index",
-        query: { id: this.storeInfo.productId }
-      });
-      // this.$yrouter.replace({ path: "/detail/" + this.storeInfo.productId });
-    },
-    //收藏商品
-    setCollect: function() {
-      let that = this,
-        id = that.storeInfo.id,
-        category = "product";
-      if (that.userCollect) {
-        getCollectDel(id, category).then(function() {
-          that.userCollect = !that.userCollect;
-        });
-      } else {
-        getCollectAdd(id, category).then(function() {
-          that.userCollect = !that.userCollect;
-        });
-      }
-    },
-    mountedStart: function() {
-      var that = this;
-      let id = that.$yroute.query.id;
-      getCombinationDetail(id).then(res => {
-        that.userCollect = res.data.userCollect;
-        res.data.storeInfo.description = res.data.storeInfo.description.replace(
-          /\<img/gi,
-          '<img style="max-width:100%;height:auto;"'
-        );
-        that.$set(that, "storeInfo", res.data.storeInfo);
-        that.$set(that, "imgUrls", res.data.storeInfo.sliderImageArr);
-        that.$set(that, "itemNew", res.data.pinkOkList);
-        that.$set(that, "groupList", res.data.pink);
-        that.$set(that, "reply", [res.data.reply]);
-        that.$set(that, "replyCount", res.data.replyCount);
-        that.$set(that, "replyChance", res.data.replyChance);
-        that.setProductSelect();
-        that.posterData.image = that.storeInfo.image;
-        if (that.storeInfo.title.length > 30) {
-          that.posterData.title = that.storeInfo.title.substring(0, 30) + "...";
-        } else {
-          that.posterData.title = that.storeInfo.title;
-        }
-        that.posterData.price = that.storeInfo.price;
-        that.posterData.code = that.storeInfo.code_base;
-        that.domStatus = true;
-        //that.getImageBase64();
-      });
-    },
-    getImageBase64: function() {
-      let that = this;
-      imageBase64(this.posterData.image, that.posterData.code).then(res => {
-        that.posterData.image = res.data.image;
-        that.posterData.code = res.data.code;
-      });
-    },
-    setPosterImageStatus: function() {
-      // var sTop = document.body || document.documentElement;
-      // sTop.scrollTop = 0;
-      this.posterImageStatus = !this.posterImageStatus;
-    },
-    groupRule: function(id) {
-      var that = this;
-      that.$yrouter.push({
-        path: "/pages/activity/GroupRule/index",
-        query: { id }
-      });
-    },
-    goReply: function() {
-      var that = this;
-      that.$yrouter.push({
-        path: "/pages/shop/EvaluateList/index",
-        query: { id: that.storeInfo.product_id }
-      });
-    },
-    setGroupListCount: function() {
-      this.groupListCount = this.groupListCount + 2;
-    },
-    //将父级向子集多次传送的函数合二为一；
-    changeFun: function(opt) {
-      if (typeof opt !== "object") opt = {};
-      let action = opt.action || "";
-      let value = opt.value === undefined ? "" : opt.value;
-      this[action] && this[action](value);
-    },
-    changeattr: function(res) {
-      var that = this;
-      that.attr.cartAttr = res;
-    },
-    ChangeCartNum: function(res) {
-      var that = this;
-      that.attr.productSelect.cart_num = 1;
-      that.cartNum = 1;
-      uni.showToast({
-        title: "每人每次限购1" + that.storeInfo.unitName,
-        icon: "none",
-        duration: 2000
-      });
-    },
-    setProductSelect: function() {
-      var that = this;
-      var attr = that.attr;
-      attr.productSelect.image = that.storeInfo.image;
-      attr.productSelect.store_name = that.storeInfo.title;
-      attr.productSelect.price = that.storeInfo.price;
-      attr.productSelect.stock = that.storeInfo.stock;
-      attr.cartAttr = false;
-      that.$set(that, "attr", attr);
-    },
-    openTeam: function() {
-      var that = this;
-      if (that.attr.cartAttr == false) {
-        that.attr.cartAttr = !this.attr.cartAttr;
-      } else {
-        var data = {};
-        data.productId = that.storeInfo.productId;
-        data.cartNum = that.attr.productSelect.cart_num;
-        data.uniqueId = that.attr.productSelect.unique;
-        data.combinationId = that.storeInfo.id;
-        data.new = 1;
-        postCartAdd(data)
-          .then(res => {
-            that.$yrouter.push({
-              path: "/pages/order/OrderSubmission/index",
-              query: { id: res.data.cartId }
-            });
-          })
-          .catch(err => {
-            uni.showToast({
-              title:
-                err.msg || err.response.data.msg || err.response.data.message,
-              icon: "none",
-              duration: 2000
-            });
-          });
-      }
-    }
-  }
-};
-</script>
-<style scoped lang="less">
-.product-con .wrapper {
-  padding-bottom: 0.26 * 100rpx;
-}
-.noscroll {
-  height: 100%;
-  overflow: hidden;
-}
-.product-con .footer-group .bnt {
-  // flex:1;
-  width: 43%;
-}
-.product-con .footer-group .bnt.bg-color-violet {
-  background-color: #fa8013;
-}
-</style>
diff --git a/pages/activity/GroupRule/index.vue b/pages/activity/GroupRule/index.vue
deleted file mode 100644
index 58ddb8f..0000000
--- a/pages/activity/GroupRule/index.vue
+++ /dev/null
@@ -1,248 +0,0 @@
-<template>
-  <view class="group-con">
-    <view class="header acea-row row-between-wrapper">
-      <view class="pictrue">
-        <image :src="storeCombination.image" />
-      </view>
-      <view class="text">
-        <view class="line1" v-text="storeCombination.title"></view>
-        <view class="money">
-          <text>￥</text>
-          <text class="num" v-text="storeCombination.price"></text>
-          <text class="team cart-color" v-text="storeCombination.people + '人拼'"></text>
-        </view>
-      </view>
-      <view v-if="pinkBool === -1" class="iconfont icon-pintuanshibai"></view>
-      <view v-else-if="pinkBool === 1" class="iconfont icon-pintuanchenggong font-color-red"></view>
-    </view>
-    <view class="wrapper">
-      <view class="title acea-row row-center-wrapper">
-        <view class="line"></view>
-        <view class="name acea-row row-center-wrapper">
-          <text>剩余</text>
-          <count-down
-            :isDay="false"
-            :tipText="false"
-            :dayText="false"
-            :hourText="' : '"
-            :minuteText="' : '"
-            :secondText="false"
-            :datatime="pinkT.stopTime/1000"
-          ></count-down>
-          <text>结束</text>
-        </view>
-        <view class="line"></view>
-      </view>
-      <view class="tips-warp">
-        <text class="tips font-color-red" v-if="pinkBool === 1">恭喜您拼团成功</text>
-        <text class="tips" v-else-if="pinkBool === -1">还差{{ count }}人，拼团失败</text>
-        <text class="tips font-color-red" v-else-if="pinkBool === 0">拼团中，还差{{ count }}人拼团成功</text>
-      </view>
-      <view
-        class="list acea-row row-middle"
-        :class="[pinkBool === 1 || pinkBool === -1 ? 'result' : '',iShidden ? 'on' : '']"
-      >
-        <view class="pictrue">
-          <image :src="pinkT.avatar" />
-        </view>
-        <view class="acea-row row-middle" v-if="pinkAll.length > 0">
-          <view class="pictrue" v-for="(item, pinkAllIndex) in pinkAll" :key="pinkAllIndex">
-            <image :src="item.avatar" />
-          </view>
-        </view>
-        <view class="pictrue" v-for="countIndex in count" :key="countIndex">
-          <image class="img-none" :src="webUrl+'/20230304204903336964.png'" />
-        </view>
-      </view>
-      <view
-        v-if="(pinkBool === 1 || pinkBool === -1) && count > 9"
-        class="lookAll acea-row row-center-wrapper"
-        @click="lookAll"
-      >
-        {{ iShidden ? "收起" : "查看全部" }}
-        <text class="iconfont" :class="iShidden ? 'icon-xiangshang' : 'icon-xiangxia'"></text>
-      </view>
-      <view
-        class="teamBnt bg-color-red"
-        v-if="userBool === 1 && isOk == 0 && pinkBool === 0"
-        @click="goPoster"
-      >邀请好友参团</view>
-      <view
-        class="teamBnt bg-color-red"
-        v-else-if="userBool === 0 && pinkBool === 0 && count > 0"
-        @click="pay"
-      >我要参团</view>
-      <view
-        class="teamBnt bg-color-red"
-        v-if="pinkBool === 1 || pinkBool === -1"
-        @click="goDetail(storeCombination.id)"
-      >再次开团</view>
-      <view class="cancel" @click="getCombinationRemove" v-if="pinkBool === 0 && userBool === 1">
-        <text class="iconfont icon-guanbi3"></text>
-        <text>取消开团</text>
-      </view>
-      <view class="lookOrder" v-if="pinkBool === 1" @click="goOrder">
-        <text>查看订单信息</text>
-        <text class="iconfont icon-xiangyou"></text>
-      </view>
-    </view>
-  </view>
-</template>
-<script>
-import CountDown from "@/components/CountDown";
-import { getCombinationPink, getCombinationRemove } from "@/api/activity";
-import { postCartAdd } from "@/api/store";
-import { isWeixin, parseQuery, handleQrCode } from "@/utils/index";
-
-const NAME = "GroupRule";
-export default {
-  name: NAME,
-  components: {
-    CountDown
-  },
-  props: {},
-  data: function() {
-    return {
-      webUrl: this.$VUE_APP_RESOURCES_URL,
-      currentPinkOrder: "", //当前拼团订单
-      isOk: 0, //判断拼团是否完成
-      pinkBool: 0, //判断拼团是否成功|0=失败,1=成功
-      userBool: 0, //判断当前用户是否在团内|0=未在,1=在
-      pinkAll: [], //团员
-      pinkT: [], //团长信息
-      storeCombination: [], //拼团产品
-      pinkId: 0,
-      count: 0, //拼团剩余人数
-      iShidden: false
-    };
-  },
-  watch: {
-    $yroute(n) {
-      var that = this;
-      if (n.name === NAME) {
-        that.pinkId = that.$yroute.query.id;
-        that.getCombinationPink();
-      }
-    }
-  },
-  mounted: function() {
-    var that = this;
-    let url = handleQrCode();
-    if (url) {
-      that.pinkId = url.pinkId;
-    } else {
-      that.pinkId = that.$yroute.query.id;
-    }
-    that.getCombinationPink();
-  },
-  methods: {
-    pay: function() {
-      var that = this;
-      var data = {};
-      data.productId = that.storeCombination.productId;
-      data.cartNum = that.pinkT.totalNum;
-      data.uniqueId = "";
-      data.combinationId = that.storeCombination.id;
-      data.new = 1;
-      postCartAdd(data)
-        .then(res => {
-          that.$yrouter.push({
-            path: "/pages/order/OrderSubmission/index",
-            query: {
-              id: res.data.cartId,
-              pinkid: that.pinkId
-            }
-          });
-        })
-        .catch(err => {
-          uni.showToast({
-            title:
-              err.msg || err.response.data.msg || err.response.data.message,
-            icon: "none",
-            duration: 2000
-          });
-        });
-    },
-    goPoster: function() {
-      var that = this;
-      this.$yrouter.push({
-        path: "/pages/activity/Poster/index",
-        query: {
-          id: that.pinkId,
-          type: 1
-        }
-      });
-    },
-    goOrder: function() {
-      var that = this;
-      this.$yrouter.push({
-        path: "/pages/order/OrderDetails/index",
-        query: {
-          id: that.currentPinkOrder
-        }
-      });
-    },
-    //拼团列表
-    goList: function() {
-      this.$yrouter.push({
-        path: "/pages/activity/GoodsGroup/index"
-      });
-    },
-    //拼团详情
-    goDetail: function(id) {
-      this.$yrouter.push({
-        path: "/pages/activity/GroupDetails/index",
-        query: {
-          id
-        }
-      });
-    },
-    //拼团信息
-    getCombinationPink: function() {
-      var that = this;
-      getCombinationPink(that.pinkId).then(res => {
-        that.$set(that, "storeCombination", res.data.storeCombination);
-        that.$set(that, "pinkT", res.data.pinkT);
-        that.$set(that, "pinkAll", res.data.pinkAll);
-        that.$set(that, "count", res.data.count);
-        that.$set(that, "userBool", res.data.userBool);
-        that.$set(that, "pinkBool", res.data.pinkBool);
-        that.$set(that, "isOk", res.data.isOk);
-        that.$set(that, "currentPinkOrder", res.data.currentPinkOrder);
-      });
-    },
-    //拼团取消
-    getCombinationRemove: function() {
-      var that = this;
-      getCombinationRemove({
-        id: that.pinkId,
-        cid: that.storeCombination.id
-      })
-        .then(res => {
-          uni.showToast({
-            title: res.msg,
-            icon: "none",
-            duration: 2000
-          });
-        })
-        .catch(res => {
-          uni.showToast({
-            title: res.msg,
-            icon: "none",
-            duration: 2000
-          });
-        });
-    },
-    lookAll: function() {
-      this.iShidden = !this.iShidden;
-    }
-  }
-};
-</script>
-
-<style lang="less">
-.tips-warp {
-  text-align: center;
-  margin-top: 20rpx;
-}
-</style>
diff --git a/pages/activity/Poster/index.vue b/pages/activity/Poster/index.vue
deleted file mode 100644
index d1e01cb..0000000
--- a/pages/activity/Poster/index.vue
+++ /dev/null
@@ -1,79 +0,0 @@
-<template>
-  <view class="poster-poster" v-if="status === false">
-    <view class="tip">
-      <text class="iconfont icon-shuoming"></text>提示：长按图片保存至手机相册
-    </view>
-    <view class="poster">
-      <image :src="image" mode="widthFix" show-menu-by-longpress />
-    </view>
-  </view>
-</template>
-<script>
-import { getBargainPoster, getCombinationPoster } from "@/api/activity";
-
-export default {
-  name: "Poster",
-  components: {},
-  props: {},
-  data: function() {
-    return {
-      status: true,
-      id: 0,
-      image: ""
-    };
-  },
-  mounted: function() {
-    var that = this;
-    var id = that.$yroute.query.id;
-    var type = that.$yroute.query.type;
-    that.id = id;
-    if (type == 2) {
-      that.getBargainPoster();
-    } else {
-      that.getCombinationPoster();
-    }
-  },
-  methods: {
-    getBargainPoster: function() {
-      var that = this;
-      getBargainPoster({ bargainId: that.id, from: "wechat" })
-        .then(res => {
-          that.image = res.data.url;
-          that.status = false;
-        })
-        .catch(res => {
-          uni.showToast({
-            title: res.msg,
-            icon: "none",
-            duration: 2000
-          });
-        });
-    },
-    // 拼团海报
-    getCombinationPoster: function() {
-      var that = this;
-      getCombinationPoster({ id: that.id, from: "wechat" })
-        .then(res => {
-          that.image = res.data.url;
-          that.status = false;
-        })
-        .catch(res => {
-          uni.showToast({
-            title: res.msg,
-            icon: "none",
-            duration: 2000
-          });
-        });
-    }
-  }
-};
-</script>
-
-<style scoped lang="less">
-page {
-  background-color: #eb3729;
-}
-.poster-poster {
-  height: unset !important;
-}
-</style>
diff --git a/pages/activity/SeckillDetails/index.vue b/pages/activity/SeckillDetails/index.vue
deleted file mode 100644
index 10e84f4..0000000
--- a/pages/activity/SeckillDetails/index.vue
+++ /dev/null
@@ -1,235 +0,0 @@
-<template>
-  <view :class="[posterImageStatus ? 'noscroll product-con' : 'product-con']" v-show="domStatus">
-    <product-con-swiper :imgUrls="imgUrls"></product-con-swiper>
-    <view class="nav acea-row row-between-wrapper">
-      <view class="money">
-        ￥
-        <text class="num" v-text="storeInfo.price"></text>
-        <text class="y-money" v-text="'￥' + storeInfo.price"></text>
-      </view>
-      <view class="acea-row row-middle">
-        <view class="times">
-          <view>距秒杀结束仅剩</view>
-          <count-down
-            :isDay="false"
-            :tipText="false"
-            :dayText="false"
-            :hourText="' : '"
-            :minuteText="' : '"
-            :secondText="false"
-            :datatime="datatime"
-          ></count-down>
-        </view>
-        <view class="iconfont icon-jiantou"></view>
-      </view>
-    </view>
-    <view class="wrapperRush">
-      <view class="introduce acea-row row-between">
-        <view class="infor" v-text="storeInfo.title"></view>
-        <!-- <view class="iconfont icon-fenxiang" @click="setPosterImageStatus"></view> -->
-      </view>
-      <view class="label acea-row row-middle">
-        <view class="stock" v-text="'库存:' + storeInfo.stock + '件'"></view>
-        <view v-text="'销量:' + storeInfo.sales + '件'"></view>
-      </view>
-    </view>
-    <view class="product-intro">
-      <view class="title">产品介绍</view>
-      <view class="conter" v-html="storeInfo.description"></view>
-    </view>
-    <view style="height:100rpx;"></view>
-    <view class="footerRush acea-row row-between-wrapper">
-      <!-- <view
-        class="customerSer acea-row row-center-wrapper row-column"
-        @click="routerGo()"
-      >
-        <view class="iconfont icon-kefu"></view>
-        <view>客服</view>
-      </view> -->
-      <view class="bnt bg-color-red" @click="tapBuy">立即购买</view>
-    </view>
-    <ProductWindow v-on:changeFun="changeFun" :attr="attr" :cartNum="cartNum"></ProductWindow>
-    <StorePoster
-      v-on:setPosterImageStatus="setPosterImageStatus"
-      :posterImageStatus="posterImageStatus"
-      :posterData="posterData"
-    ></StorePoster>
-  </view>
-</template>
-<style scoped lang="less">
-.noscroll {
-  height: 100%;
-  overflow: hidden;
-}
-</style>
-<script>
-import ProductConSwiper from "@/components/ProductConSwiper";
-import CountDown from "@/components/CountDown";
-import ProductWindow from "@/components/ProductWindow";
-import StorePoster from "@/components/StorePoster";
-import { getSeckillDetail } from "@/api/activity";
-import { postCartAdd } from "@/api/store";
-import { imageBase64 } from "@/api/public";
-const NAME = "SeckillDetails";
-
-export default {
-  name: "SeckillDetails",
-  components: {
-    ProductConSwiper,
-    CountDown,
-    ProductWindow,
-    StorePoster
-  },
-  props: {},
-  data: function() {
-    return {
-      domStatus: false,
-      posterData: {
-        image: "",
-        title: "",
-        price: "",
-        code: ""
-      },
-      posterImageStatus: false,
-      action: "",
-      imgUrls: [],
-      storeInfo: [],
-      replyCount: 0,
-      reply: [],
-      cartNum: 1,
-      attr: {
-        cartAttr: false,
-        productSelect: {
-          image: "",
-          store_name: "",
-          price: "",
-          stock: "",
-          unique: "",
-          cart_num: 1
-        }
-      },
-      datatime: 0
-    };
-  },
-  watch: {
-    $yroute: function(n) {
-      var that = this;
-      if (n.name === NAME) {
-        that.mountedStart();
-      }
-    }
-  },
-  mounted: function() {
-    this.mountedStart();
-  },
-  methods: {
-    routerGo(item) {
-      this.$yrouter.push({ path: '/pages/user/CustomerList/index' })
-    },
-    mountedStart: function() {
-      var that = this;
-      let id = that.$yroute.query.id;
-      that.datatime = parseInt(that.$yroute.query.time);
-      getSeckillDetail(id).then(res => {
-         res.data.storeInfo.description = res.data.storeInfo.description.replace(
-          /\<img/gi,
-          '<img style="max-width:100%;height:auto;"'
-        );
-        that.$set(that, "storeInfo", res.data.storeInfo);
-        that.$set(that, "imgUrls", res.data.storeInfo.sliderImageArr);
-        that.$set(that, "replyCount", res.data.replyCount);
-        that.$set(that, "reply", res.data.reply);
-        that.posterData.image = that.storeInfo.image_base;
-        that.updateTitle();
-        if (that.storeInfo.title.length > 30) {
-          that.posterData.title = that.storeInfo.title.substring(0, 30) + "...";
-        } else {
-          that.posterData.title = that.storeInfo.title;
-        }
-        that.posterData.price = that.storeInfo.price;
-        that.posterData.code = that.storeInfo.code_base;
-        that.setProductSelect();
-        that.domStatus = true;
-      });
-    },
-    updateTitle() {
-      // document.title = this.storeInfo.title || this.$yroute.meta.title;
-    },
-    setPosterImageStatus: function() {
-      // var sTop = document.body || document.documentElement;
-      // sTop.scrollTop = 0;
-      this.posterImageStatus = !this.posterImageStatus;
-    },
-    //将父级向子集多次传送的函数合二为一；
-    changeFun: function(opt) {
-      if (typeof opt !== "object") opt = {};
-      let action = opt.action || "";
-      let value = opt.value === undefined ? "" : opt.value;
-      this[action] && this[action](value);
-    },
-    changeattr: function(res) {
-      var that = this;
-      that.attr.cartAttr = res;
-    },
-    ChangeCartNum: function(res) {
-      var that = this;
-      if (res) {
-        if (that.attr.productSelect.cart_num < that.storeInfo.stock) {
-          that.attr.productSelect.cart_num++;
-          this.cartNum++;
-        }
-      } else {
-        if (that.attr.productSelect.cart_num > 1) {
-          that.attr.productSelect.cart_num--;
-          this.cartNum--;
-        }
-      }
-    },
-    setProductSelect: function() {
-      var that = this;
-      var attr = that.attr;
-      attr.productSelect.image = that.storeInfo.image;
-      attr.productSelect.store_name = that.storeInfo.title;
-      attr.productSelect.price = that.storeInfo.price;
-      attr.productSelect.stock = that.storeInfo.stock;
-      attr.cartAttr = false;
-      that.$set(that, "attr", attr);
-    },
-    selecAttrTap: function() {
-      this.cartAttr = true;
-    },
-    tapBuy: function() {
-      var that = this;
-      if (that.attr.cartAttr == false) {
-        that.attr.cartAttr = !this.attr.attrcartAttr;
-      } else {
-        var data = {};
-        data.productId = that.storeInfo.productId;
-        data.cartNum = that.attr.productSelect.cart_num;
-        data.uniqueId = that.attr.productSelect.unique;
-        data.secKillId = that.storeInfo.id;
-        data.new = 1;
-        postCartAdd(data)
-          .then(res => {
-            that.$yrouter.push({
-              path: "/pages/order/OrderSubmission/index",
-              query: { id: res.data.cartId }
-            });
-          })
-          .catch(err => {
-            uni.showToast({
-            	title: err.msg || err.response.data.msg|| err.response.data.message,
-            	icon: 'none',
-            	duration: 2000
-            });
-          });
-      }
-    }
-  }
-};
-</script>
-<style scoped lang="less">
-.product-con .nav {
-  padding: 0 0.2*100rpx;
-}
-</style>
diff --git a/pages/orderAdmin/AdminOrder/index.vue b/pages/orderAdmin/AdminOrder/index.vue
deleted file mode 100644
index f0f2c0d..0000000
--- a/pages/orderAdmin/AdminOrder/index.vue
+++ /dev/null
@@ -1,354 +0,0 @@
-<template>
-  <view class="order-details pos-order-details">
-    <view class="header acea-row row-middle">
-      <view class="state">{{ title }}</view>
-      <view class="data">
-        <view class="order-num">订单：{{ orderInfo.orderId }}</view>
-        <view>
-          <text class="time">
-            <data-format :date="orderInfo.addTime"></data-format>
-          </text>
-        </view>
-      </view>
-    </view>
-    <view class="orderingUser acea-row row-middle">{{ orderInfo.nickname }}</view>
-    <view class="address">
-      <view class="name">
-        {{ orderInfo.realName}}
-        <text class="phone">{{ orderInfo.userPhone }}</text>
-      </view>
-      <view>{{ orderInfo.userAddress }}</view>
-    </view>
-    <view class="line">
-      <image :src="webUrl+'/20230304135025917856.png'" />
-    </view>
-    <view class="pos-order-goods">
-      <view
-        class="goods acea-row row-between-wrapper"
-        v-for="(item, orderInfoIndex) in orderInfo.cartInfo"
-        :key="orderInfoIndex"
-      >
-        <view class="picTxt acea-row row-between-wrapper">
-          <view class="pictrue">
-            <image :src="item.productInfo.image" />
-          </view>
-          <view class="text acea-row row-between row-column">
-            <view class="info line2">{{ item.productInfo.storeName }}</view>
-            <view class="attr">{{ item.productInfo.sku }}</view>
-          </view>
-        </view>
-        <view class="money">
-          <view class="x-money">￥{{ item.productInfo.price }}</view>
-          <view class="num">x{{ item.cartNum }}</view>
-          <view class="y-money">￥{{ item.productInfo.otPrice ? item.productInfo.otPrice : 0 }}</view>
-        </view>
-      </view>
-    </view>
-    <view class="public-total">
-      共{{ orderInfo.totalNum }}件商品，应支付
-      <text class="money">￥{{ orderInfo.payPrice }}</text>
-      ( 邮费 ¥{{
-      orderInfo.payPostage
-      }}
-      )
-    </view>
-    <view class="wrapper">
-      <view class="item acea-row row-between">
-        <view>订单编号：</view>
-        <view class="conter acea-row row-middle row-right">
-          {{ orderInfo.orderId
-          }}
-          <text
-            class="copy copy-data"
-            @click="copyClipboard(orderInfo.orderId)"
-          >复制</text>
-        </view>
-      </view>
-      <view class="item acea-row row-between">
-        <view>下单时间：</view>
-        <view class="conter">
-          <data-format :date="orderInfo.addTime"></data-format>
-        </view>
-      </view>
-      <view class="item acea-row row-between">
-        <view>支付状态：</view>
-        <view class="conter">{{ orderInfo.paid == 1 ? "已支付" : "未支付" }}</view>
-      </view>
-      <view class="item acea-row row-between">
-        <view>支付方式：</view>
-        <view class="conter">{{ payType }}</view>
-      </view>
-      <view class="item acea-row row-between">
-        <view>买家留言：</view>
-        <view class="conter">{{ orderInfo.mark }}</view>
-      </view>
-    </view>
-    <view class="wrapper">
-      <view class="item acea-row row-between">
-        <view>支付金额：</view>
-        <view class="conter">￥{{ orderInfo.totalPrice }}</view>
-      </view>
-      <view class="item acea-row row-between">
-        <view>优惠券抵扣：</view>
-        <view class="conter">-￥{{ orderInfo.couponPrice }}</view>
-      </view>
-      <view class="actualPay acea-row row-right">
-        实付款：
-        <text class="money font-color-red">￥{{ orderInfo.payPrice }}</text>
-      </view>
-    </view>
-    <view
-      class="wrapper"
-      v-if="orderInfo.delivery_type != 'fictitious' && orderInfo._status._type === 2"
-    >
-      <view class="item acea-row row-between">
-        <view>配送方式：</view>
-        <view class="conter" v-if="orderInfo.delivery_type === 'express'">快递</view>
-        <view class="conter" v-if="orderInfo.delivery_type === 'send'">送货</view>
-      </view>
-      <view class="item acea-row row-between">
-        <view v-if="orderInfo.delivery_type === 'express'">快递公司：</view>
-        <view v-if="orderInfo.delivery_type === 'send'">送货人：</view>
-        <view class="conter">{{ orderInfo.delivery_name }}</view>
-      </view>
-      <view class="item acea-row row-between">
-        <view v-if="orderInfo.delivery_type === 'express'">快递单号：</view>
-        <view v-if="orderInfo.delivery_type === 'send'">送货人电话：</view>
-        <view class="conter">
-          {{ orderInfo.delivery_id
-          }}
-          <text
-            class="copy copy-data"
-            @click="copyClipboard(orderInfo.delivery_id)"
-          >复制</text>
-        </view>
-      </view>
-    </view>
-    <view style="height:100rpx;"></view>
-    <view class="footer acea-row row-right row-middle">
-      <view class="more"></view>
-      <view class="bnt cancel" @click="modify(0)" v-if="types == 0">一键改价</view>
-      <view class="bnt cancel" @click="modify(0)" v-if="types == -1">立即退款</view>
-      <view
-        class="bnt cancel"
-        v-if="orderInfo.pay_type === 'offline' && orderInfo.paid === 0"
-        @click="offlinePay"
-      >确认付款</view>
-      <view class="bnt delivery" v-if="types == 1" @click="goGoodsDeliver(orderInfo)">去发货</view>
-    </view>
-    <PriceChange
-      :change="change"
-      :orderInfo="orderInfo"
-      v-on:closechange="changeclose($event)"
-      v-on:savePrice="savePrice"
-      :status="status"
-    ></PriceChange>
-  </view>
-</template>
-<script>
-import PriceChange from "@/components/PriceChange";
-import DataFormat from "@/components/DataFormat";
-import {
-  getAdminOrderDetail,
-  setAdminOrderPrice,
-  setAdminOrderRemark,
-  setOfflinePay,
-  setOrderRefund
-} from "@/api/admin";
-import { required, num } from "@/utils/validate";
-import { validatorDefaultCatch } from "@/utils/dialog";
-import { copyClipboard } from "@/utils";
-
-export default {
-  name: "AdminOrder",
-  components: {
-    PriceChange,
-    DataFormat
-  },
-  props: {},
-  data: function() {
-    return {
-      order: false,
-      change: false,
-      order_id: "",
-      orderInfo: {
-        _status: {}
-      },
-      status: "",
-      title: "",
-      payType: "",
-      types: ""
-    };
-  },
-  watch: {
-    "$yroute.query.oid": function(newVal) {
-      let that = this;
-      if (newVal != undefined) {
-        that.order_id = newVal;
-        that.getIndex();
-      }
-    }
-  },
-  mounted: function() {
-    this.order_id = this.$yroute.query.oid;
-    this.getIndex();
-  },
-  methods: {
-    goGoodsDeliver(orderInfo) {
-      this.$yrouter.push({
-        path: "/pages/orderAdmin/GoodsDeliver/index",
-        query: { oid: orderInfo.orderId }
-      });
-    },
-    copyClipboard,
-    more: function() {
-      this.order = !this.order;
-    },
-    modify: function(status) {
-      this.change = true;
-      this.status = status;
-    },
-    changeclose: function(msg) {
-      this.change = msg;
-    },
-    getIndex: function() {
-      let that = this;
-      getAdminOrderDetail(that.order_id).then(
-        res => {
-          that.orderInfo = res.data;
-          that.types = res.data._status._type;
-          that.title = res.data._status._title;
-          that.payType = res.data._status._payType;
-        },
-        err => {
-          uni.showToast({
-            title: res.msg,
-            icon: "none",
-            duration: 2000
-          });
-        }
-      );
-    },
-    async savePrice(opt) {
-      let that = this,
-        data = {},
-        price = opt.price,
-        remark = opt.remark,
-        refund_price = opt.refund_price.toString();
-      data.orderId = that.orderInfo.orderId;
-      if (that.status == 0 && that.orderInfo.refundStatus === 0) {
-        try {
-          await this.$validator({
-            price: [
-              required(required.message("金额")),
-              num(num.message("金额"))
-            ]
-          }).validate({ price });
-        } catch (e) {
-          return validatorDefaultCatch(e);
-        }
-        data.price = price;
-        setAdminOrderPrice(data).then(
-          function() {
-            that.change = false;
-            uni.showToast({
-              title: "改价成功",
-              icon: "success",
-              duration: 2000
-            });
-            that.getIndex();
-          },
-          function() {
-            that.change = false;
-            uni.showToast({
-              title: "改价失败",
-              icon: "none",
-              duration: 2000
-            });
-          }
-        );
-      } else if (that.status == 0 && that.orderInfo.refundStatus === 1) {
-        try {
-          await this.$validator({
-            refund_price: [
-              required(required.message("金额")),
-              num(num.message("金额"))
-            ]
-          }).validate({ refund_price });
-        } catch (e) {
-          return validatorDefaultCatch(e);
-        }
-        data.price = refund_price;
-        data.type = opt.type;
-        setOrderRefund(data).then(
-          res => {
-            that.change = false;
-            uni.showToast({
-              title: res.msg,
-              icon: "none",
-              duration: 2000
-            });
-            that.getIndex();
-          },
-          err => {
-            that.change = false;
-            uni.showToast({
-              title: res.msg,
-              icon: "none",
-              duration: 2000
-            });
-            that.getIndex();
-          }
-        );
-      } else {
-        try {
-          await this.$validator({
-            remark: [required(required.message("备注"))]
-          }).validate({ remark });
-        } catch (e) {
-          return validatorDefaultCatch(e);
-        }
-        data.remark = remark;
-        setAdminOrderRemark(data).then(
-          res => {
-            that.change = false;
-            uni.showToast({
-              title: res.msg,
-              icon: "none",
-              duration: 2000
-            });
-            that.getIndex();
-          },
-          err => {
-            that.change = false;
-            uni.showToast({
-              title: res.msg,
-              icon: "none",
-              duration: 2000
-            });
-          }
-        );
-      }
-    },
-    offlinePay: function() {
-      setOfflinePay({ order_id: this.orderInfo.order_id }).then(
-        res => {
-          uni.showToast({
-            title: res.msg,
-            icon: "none",
-            duration: 2000
-          });
-          this.getIndex();
-        },
-        err => {
-          uni.showToast({
-            title: err.msg,
-            icon: "none",
-            duration: 2000
-          });
-        }
-      );
-    }
-  }
-};
-</script>
diff --git a/pages/orderAdmin/AdminOrderList/index.vue b/pages/orderAdmin/AdminOrderList/index.vue
deleted file mode 100644
index f069b1a..0000000
--- a/pages/orderAdmin/AdminOrderList/index.vue
+++ /dev/null
@@ -1,330 +0,0 @@
-<template>
-	<view class="pos-order-list" ref="container">
-		<view class="nav acea-row row-around row-middle">
-			<view class="item" :class="where.status == 0 ? 'on' : ''" @click="changeStatus(0)">待付款</view>
-			<view class="item" :class="where.status == 1 ? 'on' : ''" @click="changeStatus(1)">待发货</view>
-			<view class="item" :class="where.status == 2 ? 'on' : ''" @click="changeStatus(2)">待收货</view>
-			<view class="item" :class="where.status == 3 ? 'on' : ''" @click="changeStatus(3)">待评价</view>
-			<view class="item" :class="where.status == 4 ? 'on' : ''" @click="changeStatus(4)">已完成</view>
-			<view class="item" :class="where.status == -3 ? 'on' : ''" @click="changeStatus(-3)">退款</view>
-		</view>
-		<view class="list">
-			<view class="item" v-for="(item, listIndex) in list" :key="listIndex">
-				<view class="order-num acea-row row-middle" @click="toDetail(item)">
-					<text>订单号：{{ item.orderId }}</text>
-					<text class="time">
-						<text>下单时间：</text>
-						<data-format :date="item.addTime"></data-format>
-					</text>
-				</view>
-				<view class="pos-order-goods" v-for="(val, key) in item.cartInfo" :key="key">
-					<view class="goods acea-row row-between-wrapper" @click="toDetail(item)">
-						<view class="picTxt acea-row row-between-wrapper">
-							<view class="pictrue">
-								<image :src="val.productInfo.image" />
-							</view>
-							<view class="text acea-row row-between row-column">
-								<view class="info line2">{{ val.productInfo.storeName }}</view>
-								<view class="attr" v-if="val.productInfo.sku">{{ val.productInfo.sku }}</view>
-							</view>
-						</view>
-						<view class="money">
-							<view class="x-money">￥{{ val.productInfo.price }}</view>
-							<view class="num">x{{ val.cartNum }}</view>
-							<view class="y-money">￥{{ val.productInfo.otPrice }}</view>
-						</view>
-					</view>
-				</view>
-				<view class="public-total">
-					共{{ item.totalNum }}件商品，应支付
-					<text class="money">￥{{ item.payPrice }}</text>
-					( 邮费 ¥{{
-          item.totalPostage
-          }}
-					)
-				</view>
-				<view class="operation acea-row row-between-wrapper">
-					<view class="more">
-						<!--            <view class="iconfont icon-gengduo" @click="more(index)"></view>-->
-						<!--            <view class="order" v-show="current === index">-->
-						<!--              <view class="items">-->
-						<!--                {{ where.status > 0 ? "删除" : "取消" }}订单-->
-						<!--              </view>-->
-						<!--              <view class="arrow"></view>-->
-						<!--            </view>-->
-					</view>
-					<view class="acea-row row-middle">
-						<view class="bnt" @click="modify(item, 0)" v-if="where.status == 0">一键改价</view>
-						<view class="bnt" @click="modify(item, 0)" v-if="where.status == -3 && item.refundStatus === 1">立即退款</view>
-						<view class="bnt cancel" v-if="item.pay_type === 'offline' && item.paid === 0" @click="offlinePay(item)">确认付款</view>
-						<view class="bnt" v-if="where.status == 1" @click="goGoodsDeliver(item)">去发货</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<Loading :loaded="loaded" :loading="loading"></Loading>
-		<PriceChange :change="change" :orderInfo="orderInfo" v-on:closechange="changeclose($event)" v-on:savePrice="savePrice"
-		 :status="status"></PriceChange>
-	</view>
-</template>
-<script>
-	import PriceChange from "@/components/PriceChange";
-	import Loading from "@/components/Loading";
-	import DataFormat from "@/components/DataFormat";
-	import {
-		getAdminOrderList,
-		setAdminOrderPrice,
-		setAdminOrderRemark,
-		setOfflinePay,
-		setOrderRefund
-	} from "@/api/admin";
-	import {
-		required,
-		num
-	} from "@/utils/validate";
-	import {
-		validatorDefaultCatch
-	} from "@/utils/dialog";
-	export default {
-		name: "AdminOrderList",
-		components: {
-			PriceChange,
-			Loading,
-			DataFormat
-		},
-		props: {},
-		data: function() {
-			return {
-				current: "",
-				change: false,
-				types: 0,
-				where: {
-					page: 1,
-					limit: 5,
-					status: 0
-				},
-				list: [],
-				loaded: false,
-				loading: false,
-				orderInfo: {},
-				status: ""
-			};
-		},
-		watch: {
-			"$yroute.query.types": function(newVal) {
-				let that = this;
-				if (newVal != undefined) {
-					that.where.status = newVal;
-					that.init();
-				}
-			},
-			types: function() {
-				this.getIndex();
-			}
-		},
-		mounted: function() {
-			let that = this;
-			that.where.status = that.$yroute.query.types;
-			that.current = "";
-			that.getIndex();
-		},
-		onReachBottom() {
-			!this.loading && this.getIndex();
-		},
-		methods: {
-			goGoodsDeliver(item) {
-				this.$yrouter.push({
-					path: "/pages/orderAdmin/GoodsDeliver/index",
-					query: {
-						oid: item.orderId
-					}
-				});
-			},
-			more: function(index) {
-				if (this.current === index) this.current = "";
-				else this.current = index;
-			},
-			modify: function(item, status) {
-				this.change = true;
-				this.orderInfo = item;
-				this.status = status;
-			},
-			changeclose: function(msg) {
-				this.change = msg;
-			},
-			async savePrice(opt) {
-				let that = this,
-					data = {},
-					price = opt.price.toString(),
-					refund_price = opt.refund_price.toString(),
-					refund_status = that.orderInfo.refundStatus,
-					remark = opt.remark;
-				data.orderId = that.orderInfo.orderId;
-				if (that.status == 0 && refund_status === 0) {
-					try {
-						await this.$validator({
-							price: [
-								required(required.message("金额")),
-								num(num.message("金额"))
-							]
-						}).validate({
-							price
-						});
-					} catch (e) {
-						return validatorDefaultCatch(e);
-					}
-					data.price = price;
-					setAdminOrderPrice(data).then(
-						function() {
-							that.change = false;
-							uni.showToast({
-								title: "改价成功",
-								icon: "success",
-								duration: 2000
-							});
-							that.init();
-						},
-						function() {
-							that.change = false;
-							uni.showToast({
-								title: "改价失败",
-								icon: "none",
-								duration: 2000
-							});
-						}
-					);
-				} else if (that.status == 0 && refund_status === 1) {
-					try {
-						await this.$validator({
-							refund_price: [
-								required(required.message("金额")),
-								num(num.message("金额"))
-							]
-						}).validate({
-							refund_price
-						});
-					} catch (e) {
-						return validatorDefaultCatch(e);
-					}
-					data.price = refund_price;
-					data.type = opt.type;
-					setOrderRefund(data).then(
-						res => {
-							that.change = false;
-							uni.showToast({
-								title: res.msg,
-								icon: "none",
-								duration: 2000
-							});
-							that.init();
-						},
-						err => {
-							that.change = false;
-							uni.showToast({
-								title: res.msg,
-								icon: "none",
-								duration: 2000
-							});
-						}
-					);
-				} else {
-					try {
-						await this.$validator({
-							remark: [required(required.message("备注"))]
-						}).validate({
-							remark
-						});
-					} catch (e) {
-						return validatorDefaultCatch(e);
-					}
-					data.remark = remark;
-					setAdminOrderRemark(data).then(
-						res => {
-							that.change = false;
-							uni.showToast({
-								title: res.msg,
-								icon: "none",
-								duration: 2000
-							});
-							that.init();
-						},
-						err => {
-							that.change = false;
-							uni.showToast({
-								title: res.msg,
-								icon: "none",
-								duration: 2000
-							});
-						}
-					);
-				}
-			},
-			init: function() {
-				this.list = [];
-				this.where.page = 1;
-				this.loaded = false;
-				this.loading = false;
-				this.getIndex();
-				this.current = "";
-			},
-			getIndex: function() {
-				let that = this;
-				if (that.loading || that.loaded) return;
-				that.loading = true;
-				getAdminOrderList(that.where).then(
-					res => {
-						that.loading = false;
-						that.loaded = res.data.length < that.where.limit;
-						that.list.push.apply(that.list, res.data);
-						that.where.page = that.where.page + 1;
-					},
-					err => {
-						uni.showToast({
-							title: res.msg,
-							icon: "none",
-							duration: 2000
-						});
-					}
-				);
-			},
-			changeStatus: function(val) {
-				if (this.where.status != val) {
-					this.where.status = val;
-					this.init();
-				}
-			},
-			toDetail: function(item) {
-				this.$yrouter.push({
-					path: "/pages/orderAdmin/AdminOrder/index",
-					query: {
-						oid: item.orderId
-					}
-				});
-			},
-			offlinePay: function(item) {
-				setOfflinePay({
-					order_id: item.order_id
-				}).then(
-					res => {
-						uni.showToast({
-							title: res.msg,
-							icon: "none",
-							duration: 2000
-						});
-						this.init();
-					},
-					error => {
-						uni.showToast({
-							title: error.msg,
-							icon: 'none',
-							duration: 2000
-						});
-					}
-				);
-			}
-		}
-	};
-</script>
-
-<style lang="less">
-</style>
diff --git a/pages/orderAdmin/GoodsDeliver/index.vue b/pages/orderAdmin/GoodsDeliver/index.vue
deleted file mode 100644
index 8b65932..0000000
--- a/pages/orderAdmin/GoodsDeliver/index.vue
+++ /dev/null
@@ -1,231 +0,0 @@
-<template>
-  <view class="deliver-goods">
-    <header>
-      <view class="order-num acea-row row-between-wrapper">
-        <view class="num line1">订单号：{{ delivery.orderId }}</view>
-        <view class="name line1">{{ delivery.nickname }}</view>
-      </view>
-      <view class="address">
-        <view class="name">
-          {{ delivery.realName }}
-          <text class="phone">{{ delivery.userPhone }}</text>
-        </view>
-        <view>{{ delivery.userAddress }}</view>
-      </view>
-      <view class="line">
-        <image :src="webUrl+'/20230304135025917856.png'" />
-      </view>
-    </header>
-    <view class="wrapper">
-      <view class="item acea-row row-between-wrapper">
-        <view>发货方式</view>
-        <view class="mode acea-row row-middle row-right">
-          <view
-            class="goods"
-            :class="active === typesIndex ? 'on' : ''"
-            v-for="(item, typesIndex) in types"
-            :key="typesIndex"
-            @click="changeType(item, typesIndex)"
-          >
-            {{ item.title }}
-            <text class="iconfont icon-xuanzhong2"></text>
-          </view>
-        </view>
-      </view>
-      <view class="list" v-show="active === 0">
-        <picker
-          mode="selector"
-          :range="logistics"
-          class="mode"
-          range-key="name"
-          @change="changeLog"
-        >
-          <view class="item acea-row row-between-wrapper">
-            <view>快递公司</view>
-            <input
-              type="text"
-              placeholder="填写快递公司"
-              disabled="disabled"
-              v-model="deliveryNames"
-              class="mode"
-            />
-            <!-- <input type="text" placeholder="填写快递公司" v-model="deliveryName" class="mode" /> -->
-          </view>
-        </picker>
-        <view class="item acea-row row-between-wrapper">
-          <view>快递单号</view>
-          <input type="text" placeholder="填写快递单号" v-model="deliveryId" class="mode" />
-        </view>
-      </view>
-      <view class="list" v-show="active === 1">
-        <view class="item acea-row row-between-wrapper">
-          <view>送货人</view>
-          <input type="text" placeholder="填写送货人" v-model="deliveryName" class="mode" />
-        </view>
-        <view class="item acea-row row-between-wrapper">
-          <view>送货电话</view>
-          <input type="text" placeholder="填写送货电话" v-model="deliveryId" class="mode" />
-        </view>
-      </view>
-    </view>
-    <view style="height:100rpx;"></view>
-    <view class="confirm" @click="saveInfo">确认提交</view>
-  </view>
-</template>
-<script>
-import { getAdminOrderDelivery, setAdminOrderDelivery } from "@/api/admin";
-import { getLogistics } from "@/api/public";
-import { required } from "@/utils/validate";
-import { validatorDefaultCatch } from "@/utils/dialog";
-
-export default {
-  name: "GoodsDeliver",
-  components: {},
-  props: {},
-  data: function() {
-    return {
-      webUrl: this.$VUE_APP_RESOURCES_URL,
-      types: [
-        {
-          type: "express",
-          title: "发货"
-        }
-        // {
-        //   type: "send",
-        //   title: "送货"
-        // },
-        // {
-        //   type: "fictitious",
-        //   title: "无需发货"
-        // }
-      ],
-      active: 0,
-      order_id: "",
-      delivery: [],
-      logistics: [],
-      delivery_type: "express",
-      deliveryName: "",
-      deliveryId: "",
-      deliveryNames: "请选择"
-    };
-  },
-  watch: {
-    "$yroute.query.oid": function(newVal) {
-      let that = this;
-      if (newVal != undefined) {
-        that.order_id = newVal;
-        that.getIndex();
-      }
-    }
-  },
-  mounted: function() {
-    this.order_id = this.$yroute.query.oid;
-    this.getIndex();
-    this.getLogistics();
-  },
-  methods: {
-    changeLog: function(value) {
-      this.deliveryNames = this.logistics[value.detail.value].name;
-      this.deliveryName = this.logistics[value.detail.value].id;
-    },
-    changeType: function(item, index) {
-      this.active = index;
-      this.delivery_type = item.type;
-      this.deliveryName = "";
-      this.deliveryId = "";
-    },
-    getIndex: function() {
-      let that = this;
-      getAdminOrderDelivery(that.order_id).then(
-        res => {
-          that.delivery = res.data;
-        },
-        error => {
-          uni.showToast({
-            title: error.msg,
-            icon: "none",
-            duration: 2000
-          });
-        }
-      );
-    },
-    getLogistics: function() {
-      let that = this;
-      getLogistics().then(
-        res => {
-          console.log(res.data);
-          that.logistics = res.data;
-        },
-        error => {
-          uni.showToast({
-            title: error.msg,
-            icon: "none",
-            duration: 2000
-          });
-        }
-      );
-    },
-    async saveInfo() {
-      let that = this,
-        delivery_type = that.delivery_type,
-        deliveryName = that.deliveryName.toString(),
-        deliveryId = that.deliveryId,
-        save = {};
-      console.log(deliveryName);
-      save.orderId = that.order_id;
-      save.deliveryType = that.delivery_type;
-      switch (delivery_type) {
-        case "express":
-          try {
-            await this.$validator({
-              deliveryName: [required(required.message("快递公司"))],
-              deliveryId: [required(required.message("快递单号"))]
-            }).validate({ deliveryName, deliveryId });
-          } catch (e) {
-            return validatorDefaultCatch(e);
-		  }
-          save.deliveryName = deliveryName;
-          save.deliveryId = deliveryId;
-          that.setInfo(save);
-          break;
-        case "send":
-          try {
-            await this.$validator({
-              deliveryName: [required(required.message("发货人姓名"))],
-              deliveryId: [required(required.message("发货人电话"))]
-            }).validate({ deliveryName, deliveryId });
-          } catch (e) {
-            return validatorDefaultCatch(e);
-          }
-          save.deliveryName = deliveryName;
-          save.deliveryId = deliveryId;
-          that.setInfo(save);
-          break;
-      }
-    },
-    setInfo: function(item) {
-      let that = this;
-      console.log(item);
-      setAdminOrderDelivery(item)
-        .then(res => {
-          console.log(res);
-          uni.showToast({
-            title: res.msg,
-            icon: "none",
-            duration: 2000
-          });
-          that.$yrouter.go(-1);
-        })
-        .catch(err => {
-          console.log(err);
-          uni.showToast({
-            title:
-              err.msg || err.response.data.msg || err.response.data.message,
-            icon: "none",
-            duration: 2000
-          });
-        });
-    }
-  }
-};
-</script>
diff --git a/pages/orderAdmin/OrderCancellation/index.vue b/pages/orderAdmin/OrderCancellation/index.vue
deleted file mode 100644
index 5cd553e..0000000
--- a/pages/orderAdmin/OrderCancellation/index.vue
+++ /dev/null
@@ -1,184 +0,0 @@
-<template>
-  <view class="OrderCancellation">
-    <view class="header">
-      <image mode="aspectFit" :src="`${staticUrl}/writeOffBg.jpg`" @click="openQRCode" />
-    </view>
-    <view class="whiteBg">
-      <view class="input">
-        <input type="number" placeholder="0" v-model="verify_code" />
-      </view>
-      <view class="bnt" @click="storeCancellation">立即核销</view>
-    </view>
-    <view class="scan" v-if="iswechat">
-      <image :src="webUrl+'/20200729154546061002.gif'" @click="openQRCode" />
-    </view>
-    <WriteOff :iShidden="iShidden" :orderInfo="orderInfo" @cancel="cancel" @confirm="confirm"></WriteOff>
-  </view>
-</template>
-
-<script>
-  import WriteOff from "@/components/WriteOff";
-  import {
-    isWeixin
-  } from "@/utils";
-  // import { wechatEvevt } from "@/libs/wechat";
-  import {
-    orderVerific
-  } from "@/api/order";
-  const NAME = "OrderCancellation";
-
-  export default {
-    name: NAME,
-    components: {
-      WriteOff
-    },
-    props: {},
-    data: function() {
-      return {
-        staticUrl:this.$STATIC_RESOURCE_URL,
-        webUrl: VUE_APP_RESOURCES_URL,
-        iShidden: true,
-        iswechat: isWeixin(),
-        orderInfo: {},
-        verify_code: ""
-      };
-    },
-    mounted: function() {},
-    methods: {
-      cancel: function(res) {
-        this.iShidden = res;
-      },
-      confirm: function() {
-        orderVerific(this.verify_code, 1)
-          .then(res => {
-            this.iShidden = true;
-            this.verify_code = "";
-            uni.showToast({
-              title: res.msg,
-              icon: "none",
-              duration: 2000
-            });
-          })
-          .catch(err => {
-            uni.showToast({
-              title: err.msg || err.response.data.msg || err.response.data.message,
-              icon: "none",
-              duration: 2000
-            });
-          });
-      },
-      storeCancellation: function() {
-        let ref = /[0-9]{12}/;
-        if (!this.verify_code) {
-          uni.showToast({
-            title: "请输入核销码",
-            icon: "none",
-            duration: 2000
-          });
-          return;
-        }
-        if (!ref.test(this.verify_code)) {
-          uni.showToast({
-            title: "请输入正确的核销码",
-            icon: "none",
-            duration: 2000
-          });
-          return;
-        }
-        uni.showLoading({
-          title: "查询中"
-        });
-        orderVerific(this.verify_code, 0)
-          .then(res => {
-            uni.hideLoading();
-            this.orderInfo = res.data;
-            this.iShidden = false;
-            uni.showToast({
-              title: res.msg,
-              icon: "success",
-              duration: 2000
-            });
-          })
-          .catch(error => {
-            uni.hideLoading();
-            uni.showToast({
-              title: error.msg ||
-                error.response.data.msg ||
-                error.response.data.message,
-              icon: "none",
-              duration: 2000
-            });
-          });
-      },
-      openQRCode: function() {
-        let that = this;
-        // 这里需要调用扫码功能
-      }
-    }
-  };
-</script>
-
-<style scoped lang="less">
-  .OrderCancellation .header {
-    width: 100%;
-    height: 3 * 100rpx;
-    background-size: 100% 100%;
-
-    image {
-      width: 100%;
-      height: 3 * 100rpx;
-    }
-  }
-
-  .OrderCancellation .whiteBg {
-    width: 6.9 * 100rpx;
-    background-color: #fff;
-    margin: -0.93 * 100rpx auto 0 auto;
-    padding-top: 0.8 * 100rpx;
-    padding-bottom: 30rpx;
-    z-index: 99;
-    position: relative;
-    border-radius: 0.06 * 100rpx 0.06 * 100rpx 0 0;
-  }
-
-  .OrderCancellation .whiteBg .input {
-    width: 5.8 * 100rpx;
-    margin: 0 auto;
-    border-bottom: 0.01 * 100rpx solid #eee;
-  }
-
-  .OrderCancellation .whiteBg .input input {
-    padding-bottom: 0.25 * 100rpx;
-    font-size: 0.6 * 100rpx;
-    height: auto;
-    color: #282828;
-    width: 100%;
-    text-align: center;
-  }
-
-  .OrderCancellation .whiteBg .bnt {
-    font-size: 0.32 * 100rpx;
-    color: #fff;
-    width: 5.8 * 100rpx;
-    height: 0.86 * 100rpx;
-    border-radius: 0.43 * 100rpx;
-    background-image: linear-gradient(to right, #eb3729 0%, #eb3729 100%);
-    background-image: -webkit-linear-gradient(to right, #eb3729 0%, #eb3729 100%);
-    background-image: -moz-linear-gradient(to right, #eb3729 0%, #eb3729 100%);
-    text-align: center;
-    line-height: 0.86 * 100rpx;
-    margin: 0.55 * 100rpx auto 0 auto;
-  }
-
-  .OrderCancellation .scan {
-    width: 3 * 100rpx;
-    height: 3 * 100rpx;
-    margin: 1.1 * 100rpx auto 0 auto;
-  }
-
-  .OrderCancellation .scan image {
-    width: 100%;
-    height: 100%;
-    display: block;
-  }
-</style>
diff --git a/pages/orderAdmin/OrderIndex/index.vue b/pages/orderAdmin/OrderIndex/index.vue
deleted file mode 100644
index be5faaa..0000000
--- a/pages/orderAdmin/OrderIndex/index.vue
+++ /dev/null
@@ -1,167 +0,0 @@
-<template>
-  <view class="order-index" ref="container">
-    <image :src="webUrl+'/20230304202119869348.png'" mode="widthFix" class="image" />
-    <view class="header acea-row">
-      <view class="item" @click="goAdminOrderList(0)">
-        <view class="num">{{ census.orderCount.unpaidCount }}</view>
-        <view>待付款</view>
-      </view>
-      <view class="item" @click="goAdminOrderList(1)">
-        <view class="num">{{ census.orderCount.unshippedCount }}</view>
-        <view>待发货</view>
-      </view>
-      <view class="item" @click="goAdminOrderList(2)">
-        <view class="num">{{ census.orderCount.receivedCount }}</view>
-        <view>待收货</view>
-      </view>
-      <view class="item" @click="goAdminOrderList(3)">
-        <view class="num">{{ census.orderCount.evaluatedCount }}</view>
-        <view>待评价</view>
-      </view>
-      <view class="item" @click="goAdminOrderList(4)">
-        <view class="num">{{ census.orderCount.refundCount }}</view>
-        <view>退款</view>
-      </view>
-    </view>
-    <view class="wrapper">
-      <view class="title">
-        <text class="iconfont icon-shujutongji"></text>数据统计
-      </view>
-      <view class="list acea-row">
-        <view class="item" @click="goStatistics({type:'price',time:'today'})">
-          <view class="num">{{ census.orderTimeCount.todayPrice }}</view>
-          <view>今日成交额</view>
-        </view>
-        <view class="item" @click="goStatistics({type:'price',time:'yesterday'})">
-          <view class="num">{{ census.orderTimeCount.proPrice }}</view>
-          <view>昨日成交额</view>
-        </view>
-        <view class="item" @click="goStatistics({type:'price',time:'month'})">
-          <view class="num">{{ census.orderTimeCount.monthPrice }}</view>
-          <view>本月成交额</view>
-        </view>
-        <view class="item" @click="goStatistics({type:'order',time:'today'})">
-          <view class="num">{{ census.orderTimeCount.todayCount }}</view>
-          <view>今日订单数</view>
-        </view>
-        <view class="item" @click="goStatistics({type:'order',time:'yesterday'})">
-          <view class="num">{{ census.orderTimeCount.proCount }}</view>
-          <view>昨日订单数</view>
-        </view>
-        <view class="item" @click="goStatistics({type:'order',time:'month'})">
-          <view class="num">{{ census.orderTimeCount.monthCount }}</view>
-          <view>本月订单数</view>
-        </view>
-      </view>
-    </view>
-    <view class="public-wrapper">
-      <view class="title">
-        <text class="iconfont icon-xiangxishuju"></text>详细数据
-      </view>
-      <view class="nav acea-row row-between-wrapper">
-        <view class="data">日期</view>
-        <view class="browse">订单数</view>
-        <view class="turnover">成交额</view>
-      </view>
-      <view class="conter">
-        <view
-          class="item acea-row row-between-wrapper"
-          v-for="(item, orderListIndex) in list"
-          :key="orderListIndex"
-        >
-          <view class="data">{{ item.time }}</view>
-          <view class="browse">{{ item.count }}</view>
-          <view class="turnover">{{ item.price }}</view>
-        </view>
-      </view>
-    </view>
-    <Loading :loaded="loaded" :loading="loading"></Loading>
-  </view>
-</template>
-<script>
-import { getStatisticsInfo, getStatisticsMonth } from "@/api/admin";
-import Loading from "@/components/Loading";
-export default {
-  name: "OrderIndex",
-  components: {
-    Loading
-  },
-  props: {},
-  data: function() {
-    return {
-      webUrl: this.$VUE_APP_RESOURCES_URL,
-      census: {
-        orderCount: {},
-        orderTimeCount: {}
-      },
-      list: [],
-      where: {
-        page: 1,
-        limit: 15
-      },
-      loaded: false,
-      loading: false
-    };
-  },
-  mounted: function() {
-    this.getIndex();
-    this.getList();
-  },
-  onReachBottom() {
-    !this.loading && this.getList();
-  },
-  methods: {
-    goStatistics(query) {
-      this.$yrouter.push({
-        path: "/pages/orderAdmin/Statistics/index",
-        query
-      });
-    },
-    goAdminOrderList(types) {
-      this.$yrouter.push({
-        path: "/pages/orderAdmin/AdminOrderList/index",
-        query: { types }
-      });
-    },
-    getIndex: function() {
-      var that = this;
-      getStatisticsInfo().then(
-        res => {
-          that.census = res.data;
-          that.census.unpaidCount = that.census.orderCount.unpaidCount;
-        },
-        err => {
-          uni.showToast({
-            title:
-              err.msg || err.response.data.msg || err.response.data.message,
-            icon: "none",
-            duration: 2000
-          });
-        }
-      );
-    },
-    getList: function() {
-      var that = this;
-      if (that.loading || that.loaded) return;
-      that.loading = true;
-      getStatisticsMonth(that.where).then(
-        res => {
-          that.loading = false;
-          that.loaded = res.data.length < that.where.limit;
-          that.list.push.apply(that.list, res.data);
-          that.where.page = that.where.page + 1;
-        },
-        err => {
-          uni.showToast({
-            title:
-              err.msg || err.response.data.msg || err.response.data.message,
-            icon: "none",
-            duration: 2000
-          });
-        },
-        300
-      );
-    }
-  }
-};
-</script>
diff --git a/pages/orderAdmin/Statistics/index.vue b/pages/orderAdmin/Statistics/index.vue
deleted file mode 100644
index c51f9fe..0000000
--- a/pages/orderAdmin/Statistics/index.vue
+++ /dev/null
@@ -1,446 +0,0 @@
-<template>
-  <view class="statistical-page" ref="container">
-    <view class="navs">
-      <view class="list">
-        <view class="item" :class="time == 'today' ? 'on' : ''" @click="setTime('today')">今天</view>
-        <view class="item" :class="time == 'yesterday' ? 'on' : ''" @click="setTime('yesterday')">昨天</view>
-        <view class="item" :class="time == 'seven' ? 'on' : ''" @click="setTime('seven')">最近7天</view>
-        <view class="item" :class="time == 'month' ? 'on' : ''" @click="setTime('month')">本月</view>
-      </view>
-    </view>
-    <view class="wrapper">
-      <view class="title">{{ title }}{{ this.where.type == 1 ? "营业额（元）" : "订单量（份）" }}</view>
-      <view class="money">{{ time_price }}</view>
-    </view>
-    <!-- <view class="chart">
-      <view class="company">{{ where.type === 1 ? "单位（元）" : "单位（份）" }}</view>
-      <ECharts :options="polar"></ECharts>
-    </view>-->
-    <view class="public-wrapper">
-      <view class="title">
-        <text class="iconfont icon-xiangxishuju"></text>详细数据
-      </view>
-      <view class="nav acea-row row-between-wrapper">
-        <view class="data">日期</view>
-        <view class="browse">订单量</view>
-        <view class="turnover">成交额</view>
-      </view>
-      <view class="conter">
-        <view
-          class="item acea-row row-between-wrapper"
-          v-for="(item, statisticalIndex) in list"
-          :key="statisticalIndex"
-        >
-          <view class="data">{{ item.time }}</view>
-          <view class="browse">{{ item.count }}</view>
-          <view class="turnover">{{ item.price }}</view>
-        </view>
-      </view>
-    </view>
-    <!-- <view class="calendar-wrapper" :class="current === true ? 'on' : ''">
-      <view class="calendar">
-        <Calendar
-          :clean="clean"
-          :lunar="lunar"
-          ref="calendar"
-          :range="isrange"
-          :multi="ismulti"
-          @select="select"
-          @next="next"
-          @prev="prev"
-          :value="value"
-          :weekSwitch="weekSwitch"
-          :monthRange="monthRange"
-          rangeMonthFormat="yyyy年MM月"
-          monFirst
-          responsive
-          :begin="[1992, 5, 20]"
-          :end="[2049, 5, 20]"
-        />
-      </view>
-    </view>-->
-    <view class="mask" @touchmove.prevent v-show="current === true" @click="close"></view>
-    <Loading :loaded="loaded" :loading="loading"></Loading>
-  </view>
-</template>
-<script>
-// import ECharts from "vue-echarts";
-// import "echarts/lib/chart/line";
-// import "echarts/lib/component/polar";
-// import Calendar from "mpvue-calendar";
-// import "mpvue-calendar/src/browser-style.css";
-import { getStatisticsMonth, getStatisticsTime } from "@/api/admin";
-import Loading from "@/components/Loading";
-const year = new Date().getFullYear();
-const month = new Date().getMonth() + 1;
-const day = new Date().getDate();
-export default {
-  name: "Statistics",
-  components: {
-    // ECharts,
-    // Calendar,
-    Loading
-  },
-  props: {},
-  data: function() {
-    return {
-      polar: {
-        tooltip: {
-          trigger: "axis"
-        },
-        legend: {
-          data: [""]
-        },
-        toolbox: {
-          show: false,
-          feature: {
-            mark: { show: true },
-            dataView: { show: true, readOnly: false },
-            magicType: { show: true, type: ["line"] },
-            restore: { show: true },
-            saveAsImage: { show: true }
-          }
-        },
-        calculable: true,
-        xAxis: [
-          {
-            type: "category",
-            boundaryGap: false,
-            data: ["周一", "周二", "周三", "周四", "周五", "周六", "周日"],
-            splitLine: {
-              show: false
-            },
-            axisLine: {
-              lineStyle: {
-                color: "#999",
-                width: 1 //这里是为了突出显示加上的
-              }
-            }
-          }
-        ],
-        yAxis: [
-          {
-            type: "value",
-            splitLine: {
-              show: true,
-              lineStyle: {
-                color: ["#f5f5f5"],
-                width: 1,
-                type: "solid"
-              }
-            },
-            axisLine: {
-              lineStyle: {
-                color: "#999",
-                width: 1 //这里是为了突出显示加上的
-              }
-            }
-          }
-        ],
-        series: [
-          {
-            name: "邮件营销",
-            type: "line",
-            stack: "总量",
-            itemStyle: {
-              normal: {
-                color: "#2291f8", //折点颜色
-                lineStyle: {
-                  color: "#2291f8" //折线颜色
-                }
-              }
-            },
-            data: [120, 132.5, 101, 134, 90, 150, 30]
-          }
-        ],
-        grid: {
-          x: 30,
-          x2: 10,
-          y: 20,
-          y2: 110
-        },
-        animationDuration: 2000
-      },
-      value: [
-        [year, month, day - 1],
-        [year, month, day]
-      ],
-      isrange: true,
-      weekSwitch: false,
-      ismulti: false,
-      monFirst: true,
-      clean: false, //简洁模式
-      lunar: false, //显示农历
-      renderValues: [],
-      monthRange: [],
-      current: false,
-      where: {
-        start: "",
-        stop: "",
-        type: "",
-        cate: 1
-      },
-      types: "", //类型|order=订单数|price=营业额
-      time: "", //时间|today=今天|yesterday=昨天|month=本月
-      title: "", //时间|today=今天|yesterday=昨天|month=本月
-      growth_rate: "", //增长率
-      increase_time: "", //增长率
-      increase_time_status: "", //增长率
-      time_price: "", //增长率
-      loaded: false,
-      loading: false,
-      filter: {
-        page: 1,
-        limit: 10
-      },
-      list: []
-    };
-  },
-  watch: {
-    "$yroute.params": function(newVal) {
-      var that = this;
-      if (newVal != undefined) {
-        that.setType(newVal.type);
-        that.setTime(newVal.time);
-        that.getIndex();
-      }
-    }
-  },
-  mounted: function() {
-    this.handelRenderValues();
-    this.setTime(this.$yroute.query.time);
-    this.setType(this.$yroute.query.type);
-    // this.getIndex();
-    this.getInfo();
-  },
-  onReachBottom() {
-    !this.loading && this.getInfo();
-  },
-  computed: {
-    monthRangeText() {
-      return this.monthRange.length ? "固定" : "指定范围";
-    }
-  },
-  methods: {
-    getIndex: function() {
-      var that = this;
-      getStatisticsTime(that.where).then(
-        res => {
-          var _info = res.data.chart,
-            day = [],
-            num = [];
-          _info.forEach(function(item) {
-            day.push(item.time);
-            num.push(item.num);
-          });
-          that.polar.xAxis[0].data = day;
-          that.polar.series[0].data = num;
-          that.growth_rate = res.data.growth_rate;
-          that.increase_time = res.data.increase_time;
-          that.increase_time_status = res.data.increase_time_status;
-          that.time_price = res.data.time;
-        },
-        error => {
-          uni.showToast({
-            title: error.msg,
-            icon: "none",
-            duration: 2000
-          });
-        }
-      );
-    },
-    setTime: function(time) {
-      this.time = time;
-      var year = new Date().getFullYear(),
-        month = new Date().getMonth() + 1,
-        day = new Date().getDate();
-      switch (time) {
-        case "today":
-          this.where.cate = 1;
-          this.title = "今日";
-          this.getIndex();
-          break;
-        case "yesterday":
-          this.where.cate = 2;
-          this.title = "昨日";
-          this.getIndex();
-          break;
-        case "month":
-          this.where.cate = 4;
-          this.title = "本月";
-          this.getIndex();
-          break;
-        case "seven":
-          this.where.cate = 3;
-          this.title = "七日";
-          this.getIndex();
-          break;
-      }
-    },
-    setType: function(type) {
-      switch (type) {
-        case "price":
-          this.where.type = 1;
-          break;
-        case "order":
-          this.where.type = 2;
-          break;
-      }
-    },
-    clickSomeThing(data) {
-      this.value = [
-        [2019, 4, 1],
-        [2019, 4, 8]
-      ];
-    },
-    setMonthRange() {
-      this.monthRange = this.monthRange.length ? [] : ["2019-4", "2020-1"];
-    },
-    switchMode() {
-      this.weekSwitch = !this.weekSwitch;
-      setTimeout(() => {
-        // this.$refs.calendar.renderer(2019, 1); //渲染2018年8月份
-      }, 0);
-    },
-    handelRenderValues(data) {
-      if (this.ismulti) {
-        this.renderValues = this.value.map(v => v.join("-"));
-      } else if (this.isrange) {
-        const values = [];
-        data || this.value;
-        this.value.forEach((v, i) => {
-          values.push(v.join("-"));
-          if (!i) {
-            values.push("~");
-          }
-        });
-        this.renderValues = values;
-      } else {
-        this.renderValues = [this.value.join("-")];
-      }
-    },
-    multiMode() {
-      this.ismulti = true;
-      this.isrange = false;
-      this.value = [
-        [year, month, 16],
-        [year, month, 18]
-      ];
-      this.handelRenderValues();
-      // this.$refs.calendar.renderer(year, month);
-    },
-    rangeMode() {
-      this.ismulti = false;
-      this.isrange = true;
-      this.value = [
-        [year, month, 16],
-        [year, month, 22]
-      ];
-      this.handelRenderValues();
-      // this.$refs.calendar.renderer(year, month);
-    },
-    valueMode() {
-      this.ismulti = false;
-      this.isrange = false;
-      this.value = [year, month, 16];
-      this.handelRenderValues();
-      // this.$refs.calendar.renderer(year, month);
-    },
-    selectMonth(month, year) {},
-    prev(y, m, w) {},
-    next(year, month, week) {},
-    selectYear(year) {},
-    setToday() {
-      // this.$refs.calendar.setToday();
-    },
-    dateInfo() {
-      // const info = this.$refs.calendar.dateInfo(2018, 8, 23);
-    },
-    renderer() {
-      if (this.monthRange.length) {
-        this.monthRange = ["2018-8", "2018-8"];
-      }
-      // this.$refs.calendar.renderer(2018, 8); //渲染2018年8月份
-    },
-    select(val, val2) {
-      if (this.isrange) {
-        this.handelRenderValues([val, val2]);
-      } else if (this.ismulti) {
-        this.handelRenderValues(val);
-      } else {
-        this.handelRenderValues([val]);
-      }
-      if (
-        this.where.start != new Date(val) / 1000 ||
-        this.where.stop != new Date(val2) / 1000 + 24 * 60 * 60 - 1
-      ) {
-        this.time = "date";
-        this.title = "";
-        this.where.start =
-          new Date(Date.parse(val[0] + "/" + val[1] + "/" + val[2])).getTime() /
-          1000;
-        this.where.stop =
-          new Date(
-            Date.parse(val2[0] + "/" + val2[1] + "/" + val2[2])
-          ).getTime() /
-            1000 +
-          24 * 60 * 60 -
-          1;
-        this.getIndex();
-      }
-    },
-    dateTitle: function() {
-      this.current = true;
-    },
-    close: function() {
-      this.current = false;
-    },
-    getInfo: function() {
-      var that = this;
-      if (that.loading || that.loaded) return;
-      that.loading = true;
-      getStatisticsMonth(that.filter).then(
-        res => {
-          that.loading = false;
-          that.loaded = res.data.length < that.filter.limit;
-          // that.list.push.apply(that.list, res.data);
-          that.list = res.data;
-          that.filter.page = that.filter.page + 1;
-        },
-        err => {
-          uni.showToast({
-            title:
-              err.msg || err.response.data.msg || err.response.data.message,
-            icon: "none",
-            duration: 2000
-          });
-        }
-      );
-    }
-  }
-};
-</script>
-<style scoped lang="less">
-.echarts {
-  width: 100%;
-  height: 5.5 * 100rpx;
-}
-.calendar-wrapper {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  width: 100%;
-  z-index: 66;
-  transform: translate3d(0, 100%, 0);
-  transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-}
-.calendar-wrapper.on {
-  transform: translate3d(0, 0, 0);
-}
-.statistical-page .wrapper .increase {
-  font-size: 0.26 * 100rpx;
-}
-.statistical-page .wrapper .increase .iconfont {
-  margin-left: 0;
-}
-</style>