add

2020-03-16 01:40:52 +08:00
parent 397082cdaf
commit e215701560
216 changed files with 11659 additions and 13905 deletions
@@ -109,5 +109,7 @@
      }
    ]
  },
-  "usingComponents": {}
+  "permission": {},
+  "usingComponents": {},
+  "sitemapLocation": "sitemap79.json"
 }
@@ -22,9 +22,9 @@ var _cookie = _interopRequireDefault(__webpack_require__(/*! @/utils/store/cooki
 __webpack_require__(/*! @/assets/iconfont/iconfont.css */ 31);


-__webpack_require__(/*! @/assets/css/base.css */ 32);
-__webpack_require__(/*! @/assets/css/reset.css */ 33);
-__webpack_require__(/*! @/assets/css/style.css */ 34);
+__webpack_require__(/*! @/assets/css/base.less */ 32);
+__webpack_require__(/*! @/assets/css/reset.less */ 33);
+__webpack_require__(/*! @/assets/css/style.less */ 34);

 var _utils = __webpack_require__(/*! @/utils */ 18);

@@ -86,19 +86,29 @@ Object.defineProperty(_vue.default.prototype, '$yroute', {
  } });


-Object.defineProperty(_vue.default.prototype, '$VUE_APP_RESOURCES_URL', {
-  get: function get() {
-    return _config.VUE_APP_RESOURCES_URL;
-  } });
+_vue.default.prototype.$VUE_APP_RESOURCES_URL = _config.VUE_APP_RESOURCES_URL;
+_vue.default.prototype.$VUE_APP_API_URL = _config.VUE_APP_API_URL;


-Object.defineProperty(_vue.default.prototype, '$VUE_APP_API_URL', {
-  get: function get() {
-    return _config.VUE_APP_API_URL;
-  } });



+
+
+
+// H5编译的代码
+_vue.default.prototype.$deviceType = 'H5';
+
+
+
+// 微信小程序编译的代码
+_vue.default.prototype.$deviceType = 'Weixin';
+
+
+if (wx) {
+  _vue.default.prototype.$deviceType = 'Weixin';
+}
+
 createApp(app).$mount();
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["createApp"]))

@@ -189,7 +189,7 @@ var _user = __webpack_require__(/*! @/api/user */ 19); //
 //
 //
 //
-var _default = { name: "AddressWindow", props: { value: Boolean, checked: Number }, data: function data() {return { addressList: [], current: 0, cartId: 0, pinkId: 0, couponId: 0 };}, mounted: function mounted() {}, methods: { getAddressList: function getAddressList() {var that = this;(0, _user.getAddressList)().then(function (res) {that.addressList = res.data;});}, closeAddress: function closeAddress() {this.$emit("input", false);}, goAddressPages: function goAddressPages() {this.$yrouter.push({ path: "/pages/user/address/AddAddress/main" });this.$emit("redirect");}, tapAddress: function tapAddress(index) {this.$emit("checked", this.addressList[index]);this.$emit("input", false);} } };exports.default = _default;
+var _default = { name: "AddressWindow", props: { value: Boolean, checked: Number }, data: function data() {return { addressList: [], current: 0, cartId: 0, pinkId: 0, couponId: 0 };}, mounted: function mounted() {}, methods: { getAddressList: function getAddressList() {var that = this;(0, _user.getAddressList)().then(function (res) {that.addressList = res.data;});}, closeAddress: function closeAddress() {this.$emit("input", false);}, goAddressPages: function goAddressPages() {this.$yrouter.push({ path: "/pages/user/address/AddAddress/index" });this.$emit("redirect");}, tapAddress: function tapAddress(index) {this.$emit("checked", this.addressList[index]);this.$emit("input", false);} } };exports.default = _default;

 /***/ })

@@ -147,25 +147,25 @@ var _vuex = __webpack_require__(/*! vuex */ 16);function _objectSpread(target) {
        name: "首页",
        icon1: "icon-shouye-xianxing",
        icon2: "icon-shouye",
-        url: "/pages/home/main" },
+        url: "/pages/home/index" },

      {
        name: "分类",
        icon1: "icon-yingyongchengxu-xianxing",
        icon2: "icon-yingyongchengxu",
-        url: "/pages/shop/GoodsClass/main" },
+        url: "/pages/shop/GoodsClass/index" },

      {
        name: "购物车",
        icon1: "icon-caigou-xianxing",
        icon2: "icon-caigou",
-        url: "/pages/shop/ShoppingCart/main" },
+        url: "/pages/shop/ShoppingCart/index" },

      {
        name: "我的",
        icon1: "icon-yonghu-xianxing",
        icon2: "icon-yonghu",
-        url: "/pages/user/User/main" }],
+        url: "/pages/user/User/index" }],


      isIpx: false };
@@ -81,16 +81,6 @@ var render = function() {
  var _vm = this
  var _h = _vm.$createElement
  var _c = _vm._self._c || _h
-  if (!_vm._isMounted) {
-    _vm.e0 = function($event) {
-      return _vm.$yrouter.push({
-        path: "/pages/shop/GoodsCon/index",
-        query: {
-          id: _vm.item.id
-        }
-      })
-    }
-  }
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -150,14 +140,6 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 //
 //
 //
-//
-//
-//
-//
-//
-//
-//
-//
 var _default2 =
 {
  name: "GoodList",
@@ -173,7 +155,11 @@ var _default2 =

  data: function data() {
    return {};
-  } };exports.default = _default2;
+  },
+  methods: {
+    routerGo: function routerGo(item) {
+      this.$yrouter.push({ path: '/pages/shop/GoodsCon/index', query: { id: item.id } });
+    } } };exports.default = _default2;

 /***/ })

@@ -1 +1 @@
-<view class="goodList _div"><block wx:for="{{goodList}}" wx:for-item="item" wx:for-index="goodlistIndex" wx:key="goodlistIndex"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="item acea-row row-between-wrapper _div" bindtap="__e"><view class="pictrue _div"><image class="image _img" src="{{item.image}}"></image><block wx:if="{{isSort===true&&index===0}}"><image class="numPic _img" src="{{$VUE_APP_RESOURCES_URL+'/images/one.png'}}"></image></block><block wx:if="{{isSort===true&&index===1}}"><image class="numPic _img" src="{{$VUE_APP_RESOURCES_URL+'/images/two.png'}}"></image></block><block wx:if="{{isSort===true&&index===2}}"><image class="numPic _img" src="{{$VUE_APP_RESOURCES_URL+'/images/three.png'}}"></image></block></view><view class="underline _div"><view class="text _div"><view class="line1 _div">{{item.storeName}}</view><view class="money font-color-red _div">￥<label class="num _span">{{item.price}}</label></view><view class="vip-money acea-row row-middle _div"><view class="vip _div">{{'￥'+(item.otPrice||0)+''}}</view><label class="num _span">{{"已售"+item.sales+item.unitName}}</label></view></view></view><view class="iconfont icon-gouwuche cart-color acea-row row-center-wrapper _div"></view></view></block></view>
+<view class="goodList _div"><block wx:for="{{goodList}}" wx:for-item="item" wx:for-index="goodlistIndex" wx:key="goodlistIndex"><view data-event-opts="{{[['tap',[['routerGo',['$0'],[[['goodList','',goodlistIndex]]]]]]]}}" class="item acea-row row-between-wrapper _div" bindtap="__e"><view class="pictrue _div"><image class="image _img" src="{{item.image}}"></image><block wx:if="{{isSort===true&&index===0}}"><image class="numPic _img" src="{{$VUE_APP_RESOURCES_URL+'/images/one.png'}}"></image></block><block wx:if="{{isSort===true&&index===1}}"><image class="numPic _img" src="{{$VUE_APP_RESOURCES_URL+'/images/two.png'}}"></image></block><block wx:if="{{isSort===true&&index===2}}"><image class="numPic _img" src="{{$VUE_APP_RESOURCES_URL+'/images/three.png'}}"></image></block></view><view class="underline _div"><view class="text _div"><view class="line1 _div">{{item.storeName}}</view><view class="money font-color-red _div">￥<label class="num _span">{{item.price}}</label></view><view class="vip-money acea-row row-middle _div"><view class="vip _div">{{"￥"+(item.otPrice||0)}}</view><label class="num _span">{{"已售"+item.sales+item.unitName}}</label></view></view></view><view class="iconfont icon-gouwuche cart-color acea-row row-center-wrapper _div"></view></view></block></view>
@@ -81,16 +81,6 @@ var render = function() {
  var _vm = this
  var _h = _vm.$createElement
  var _c = _vm._self._c || _h
-  if (!_vm._isMounted) {
-    _vm.e0 = function($event) {
-      return _vm.$yrouter.push({
-        path: "/pages/shop/GoodsEvaluate/index",
-        query: {
-          id: _vm.cart.unique
-        }
-      })
-    }
-  }
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -166,7 +156,10 @@ var _default2 =
    return {};
  },
  mounted: function mounted() {},
-  methods: {} };exports.default = _default2;
+  methods: {
+    routerGo: function routerGo(item) {
+      this.$yrouter.push({ path: '/pages/shop/GoodsEvaluate/index', query: { id: cart.unique } });
+    } } };exports.default = _default2;

 /***/ })

@@ -1 +1 @@
-<view class="orderGoods _div"><view class="total _div">{{"共"+cartInfo.length+"件商品"}}</view><view class="goodWrapper _div"><block wx:for="{{cartInfo}}" wx:for-item="cart" wx:for-index="__i0__" wx:key="id"><view class="item acea-row row-between-wrapper _div"><view class="pictrue _div"><image class="image _img" src="{{cart.productInfo.image}}"></image></view><view class="text _div"><view class="acea-row row-between-wrapper _div"><view class="name line1 _div">{{cart.productInfo.storeName}}</view><view class="num _div">{{"x "+cart.cartNum}}</view></view><block wx:if="{{cart.productInfo.attrInfo}}"><view class="attr line1 _div">{{cart.productInfo.attrInfo.suk}}</view></block><view class="money font-color-red _div">{{"￥"+cart.truePrice}}</view><block wx:if="{{evaluate==3}}"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="evaluate _div" bindtap="__e">评价</view></block></view></view></block></view></view>
+<view class="orderGoods _div"><view class="total _div">{{"共"+cartInfo.length+"件商品"}}</view><view class="goodWrapper _div"><block wx:for="{{cartInfo}}" wx:for-item="cart" wx:for-index="__i0__" wx:key="id"><view class="item acea-row row-between-wrapper _div"><view class="pictrue _div"><image class="image _img" src="{{cart.productInfo.image}}"></image></view><view class="text _div"><view class="acea-row row-between-wrapper _div"><view class="name line1 _div">{{cart.productInfo.storeName}}</view><view class="num _div">{{"x "+cart.cartNum}}</view></view><block wx:if="{{cart.productInfo.attrInfo}}"><view class="attr line1 _div">{{cart.productInfo.attrInfo.suk}}</view></block><view class="money font-color-red _div">{{"￥"+cart.truePrice}}</view><block wx:if="{{evaluate==3}}"><view data-event-opts="{{[['tap',[['routerGo',['$0'],[[['cartInfo','id',cart.id]]]]]]]}}" class="evaluate _div" bindtap="__e">评价</view></block></view></view></block></view></view>
@@ -81,16 +81,6 @@ var render = function() {
  var _vm = this
  var _h = _vm.$createElement
  var _c = _vm._self._c || _h
-  if (!_vm._isMounted) {
-    _vm.e0 = function($event) {
-      return _vm.$yrouter.push({
-        path: "/pages/shop/GoodsCon/index",
-        query: {
-          id: _vm.item.id
-        }
-      })
-    }
-  }
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -144,25 +134,21 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 //
 //
 //
-//
-//
-//
-//
-//
-//
-//
-var _default2 =
+var _default =
 {
-  name: "PromotionGood",
-  props: {
-    benefit: {
-      type: Array,
-      default: function _default() {return [];} } },
-
-
+  name: 'PromotionGood',
+  props: ['benefit'],
  data: function data() {
    return {};
-  } };exports.default = _default2;
+  },
+  methods: {
+    routerGo: function routerGo(item) {
+      this.$yrouter.push({ path: '/pages/shop/GoodsCon/index', query: { id: item.id } });
+    } },
+
+  mounted: function mounted() {
+    console.log(this, 999);
+  } };exports.default = _default;

 /***/ })

@@ -1 +1 @@
-<block wx:if="{{benefit.length>0}}"><view class="promotionGood _div"><block wx:for="{{benefit}}" wx:for-item="item" wx:for-index="promotionGoodIndex" wx:key="promotionGoodIndex"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="item acea-row row-between-wrapper _div" bindtap="__e"><view class="pictrue _div"><image class="image _img" src="{{item.image}}"></image></view><view class="text _div"><view class="name line1 _div">{{item.storeName}}</view><view class="sp-money acea-row _div"><view class="moneyCon _div">促销价: ￥<label class="num _span">{{item.price}}</label></view></view><view class="acea-row row-between-wrapper _div"><view class="money _div">{{"日常价：￥"+item.otPrice}}</view><view class="_div">{{"仅剩："+item.stock+item.unitName}}</view></view></view></view></block></view></block>
+<block wx:if="{{benefit.length>0}}"><view class="promotionGood _div"><block wx:for="{{benefit}}" wx:for-item="item" wx:for-index="promotionGoodIndex" wx:key="promotionGoodIndex"><view data-event-opts="{{[['tap',[['routerGo',['$0'],[[['benefit','',promotionGoodIndex]]]]]]]}}" class="item acea-row row-between-wrapper _div" bindtap="__e"><view class="pictrue _div"><image class="image _img" src="{{item.image}}"></image></view><view class="text _div"><view class="name line1 _div">{{item.storeName}}</view><view class="sp-money acea-row _div"><view class="moneyCon _div">促销价: ￥<label class="num _span">{{item.price}}</label></view></view><view class="acea-row row-between-wrapper _div"><view class="money _div">{{"日常价：￥"+item.otPrice}}</view><view class="_div">{{"仅剩："+item.stock+item.unitName}}</view></view></view></view></block></view></block>
@@ -81,16 +81,6 @@ var render = function() {
  var _vm = this
  var _h = _vm.$createElement
  var _c = _vm._self._c || _h
-  if (!_vm._isMounted) {
-    _vm.e0 = function($event) {
-      return _vm.$yrouter.push({
-        path: "/pages/shop/GoodsCon/index",
-        query: {
-          id: _vm.item.id
-        }
-      })
-    }
-  }
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -147,8 +137,6 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =



-
-



@@ -177,11 +165,14 @@ var _store = __webpack_require__(/*! @/api/store */ 97); //
 //
 //
 //
-//
-//
-var Loading = function Loading() {return __webpack_require__.e(/*! import() | components/Loading */ "components/Loading").then(__webpack_require__.bind(null, /*! @/components/Loading */ 494));};var _default = { name: "Recommend", props: {}, components: { Loading: Loading }, data: function data() {return { hostProduct: [], page: 1, limit: 20, loadTitle: "", loading: false, loadend: false };}, mounted: function mounted() {this.hostProducts();}, methods: { hostProducts: function hostProducts() {var that = this;if (that.loading) return; //阻止下次请求（false可以进行请求）；
+var Loading = function Loading() {return __webpack_require__.e(/*! import() | components/Loading */ "components/Loading").then(__webpack_require__.bind(null, /*! @/components/Loading */ 494));};var _default = { name: 'Recommend', props: {}, components: { Loading: Loading }, data: function data() {return { hostProduct: [], page: 1, limit: 20, loadTitle: '', loading: false, loadend: false };}, mounted: function mounted() {this.hostProducts();}, methods: { routerGo: function routerGo(item) {this.$yrouter.push({ path: '/pages/shop/GoodsCon/index', query: { id: item.id } });}, hostProducts: function hostProducts() {
+      var that = this;
+      if (that.loading) return; //阻止下次请求（false可以进行请求）；
      if (that.loadend) return; //阻止结束当前请求（false可以进行请求）；
-      that.loading = true;(0, _store.getHostProducts)(that.page, that.limit).then(function (res) {that.loading = false; //apply();js将一个数组插入另一个数组;
+      that.loading = true;
+      (0, _store.getHostProducts)(that.page, that.limit).then(function (res) {
+        that.loading = false;
+        //apply();js将一个数组插入另一个数组;
        that.hostProduct.push.apply(that.hostProduct, res.data);
        that.loadend = res.data.length < that.limit; //判断所有数据是否加载完成；
        that.page = that.page + 1;
@@ -1 +1 @@
-<view data-ref="container" class="recommend _div vue-ref"><view class="title acea-row row-center-wrapper _div"><label class="iconfont icon-zhuangshixian _span"></label><label class="name _span">为你推荐</label><label class="iconfont icon-zhuangshixian lefticon _span"></label></view><view class="recommendList acea-row row-between-wrapper _div"><block wx:for="{{hostProduct}}" wx:for-item="item" wx:for-index="recommendIndex" wx:key="recommendIndex"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="item _div" bindtap="__e"><view class="pictrue _div"><image class="image _img" src="{{item.image}}"></image></view><view class="name line1 _div">{{item.storeName}}</view><view class="money font-color-red _div">￥<label class="num _span">{{item.price}}</label></view></view></block></view><loading vue-id="b67b5196-1" loaded="{{loadend}}" loading="{{loading}}" bind:__l="__l"></loading></view>
+<view data-ref="container" class="recommend _div vue-ref"><view class="title acea-row row-center-wrapper _div"><label class="iconfont icon-zhuangshixian _span"></label><label class="name _span">为你推荐</label><label class="iconfont icon-zhuangshixian lefticon _span"></label></view><view class="recommendList acea-row row-between-wrapper _div"><block wx:for="{{hostProduct}}" wx:for-item="item" wx:for-index="recommendIndex" wx:key="recommendIndex"><view data-event-opts="{{[['tap',[['routerGo',['$0'],[[['hostProduct','',recommendIndex]]]]]]]}}" class="item _div" bindtap="__e"><view class="pictrue _div"><image class="image _img" src="{{item.image}}"></image></view><view class="name line1 _div">{{item.storeName}}</view><view class="money font-color-red _div">￥<label class="num _span">{{item.price}}</label></view></view></block></view><loading vue-id="b67b5196-1" loaded="{{loadend}}" loading="{{loading}}" bind:__l="__l"></loading></view>
@@ -116,7 +116,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {

 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;



@@ -307,7 +307,8 @@ var _dayjs = _interopRequireDefault(__webpack_require__(/*! dayjs */ 24));functi
 //
 //
 var _default = { name: "SwitchWindow", props: { switchActive: { type: Boolean, default: false }, login_type: { type: String, default: "" } }, data: function data() {return {};}, mounted: function mounted() {}, methods: { switchClose: function switchClose() {this.$emit("changeswitch", false); //$emit():注册事件；
-    }, switchH5: function switchH5() {var _this = this;var that = this;wx.showLoading({ title: '正在切换中' });if (that.login_type === "h5") {_cookie.default.set("loginType", "wechat", 60);wx.hideLoading();this.$store.commit("LOGOUT");this.$emit("changeswitch", false);location.reload();} else {(0, _user.switchH5Login)().then(function (_ref) {var data = _ref.data;wx.hideLoading();var expires_time = (0, _dayjs.default)(data.expires_time);_store.default.commit("LOGIN", data.token, expires_time);_this.$emit("changeswitch", false);location.reload();}).catch(function (err) {wx.hideLoading();return that.$dialog.toast({ mes: err });});}} } };exports.default = _default;
+    }, switchH5: function switchH5() {var _this = this;var that = this;uni.showLoading({ title: '正在切换中' });if (that.login_type === "h5") {_cookie.default.set("loginType", "wechat", 60);uni.hideLoading();this.$store.commit("LOGOUT");this.$emit("changeswitch", false);location.reload();} else {(0, _user.switchH5Login)().then(function (_ref) {var data = _ref.data;uni.hideLoading();var expires_time = (0, _dayjs.default)(data.expires_time);_store.default.commit("LOGIN", data.token, expires_time);_this.$emit("changeswitch", false);location.reload();}).catch(function (err) {uni.hideLoading();return that.$dialog.toast({ mes: err });});}} } };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))

 /***/ }),

@@ -163,7 +163,7 @@ var _utils = __webpack_require__(/*! @/utils */ 18);function _interopRequireDefa
  data: function data() {
    return {};
  },
-  mounted: function mounted() {
+  mounted: function mounted() {var _this = this;
    var url = (0, _utils.handleQrCode)();
    // 判断是否是分销
    if (url) {
@@ -175,12 +175,12 @@ var _utils = __webpack_require__(/*! @/utils */ 18);function _interopRequireDefa
        _cookie.default.set('spread', urlSpread || 0);
      }
    }
-    this.toLaunch();
-    // login({
-    // 	fail: () => {
-    // 		this.toLaunch();
-    // 	}
-    // });
+    // this.toLaunch();
+    (0, _utils.login)({
+      fail: function fail() {
+        _this.toLaunch();
+      } });
+
  },
  methods: _objectSpread({},
  (0, _vuex.mapActions)(['changeAuthorization', 'changeUserInfo']), {
@@ -100,13 +100,6 @@ var render = function() {
  var _vm = this
  var _h = _vm.$createElement
  var _c = _vm._self._c || _h
-  if (!_vm._isMounted) {
-    _vm.e0 = function($event) {
-      return _vm.$yrouter.replace({
-        path: "/"
-      })
-    }
-  }
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -159,7 +152,11 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 //
 var _default =
 {
-  name: "NotDefined" };exports.default = _default;
+  name: "NotDefined",
+  methods: {
+    homeGo: function homeGo() {
+      this.$yrouter.switchTab('/pages/home/index');
+    } } };exports.default = _default;

 /***/ }),

@@ -1 +1 @@
-<view class="not-defined _div data-v-0eb3294f"><image src="{{$VUE_APP_RESOURCES_URL+'/images/404.png'}}" class="_img data-v-0eb3294f"></image><view class="content _div data-v-0eb3294f"><view class="title _h3 data-v-0eb3294f">页面未找到</view><label class="_span data-v-0eb3294f">抱歉！您访问的页面不存在，请返回上一级或点击下方按钮返回首页...</label></view><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="btn _div data-v-0eb3294f" bindtap="__e">返回首页</view></view>
+<view class="not-defined _div data-v-0eb3294f"><image src="{{$VUE_APP_RESOURCES_URL+'/images/404.png'}}" class="_img data-v-0eb3294f"></image><view class="content _div data-v-0eb3294f"><view class="title _h3 data-v-0eb3294f">页面未找到</view><label class="_span data-v-0eb3294f">抱歉！您访问的页面不存在，请返回上一级或点击下方按钮返回首页...</label></view><view data-event-opts="{{[['tap',[['homeGo']]]]}}" class="btn _div data-v-0eb3294f" bindtap="__e">返回首页</view></view>
@@ -131,7 +131,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {

 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;



@@ -208,13 +208,13 @@ var _activity = __webpack_require__(/*! @/api/activity */ 443);var CountDown = f
  methods: {
    goDetail: function goDetail(id) {
      this.$yrouter.push({
-        path: "/pages/activity/DargainDetails/main",
+        path: "/pages/activity/DargainDetails/index",
        query: { id: id, partake: 0 } });

    },
    goList: function goList() {
      this.$yrouter.push({
-        path: "/pages/activity/GoodsBargain/main" });
+        path: "/pages/activity/GoodsBargain/index" });

    },
    getBargainUserList: function getBargainUserList() {
@@ -229,7 +229,7 @@ var _activity = __webpack_require__(/*! @/api/activity */ 443);var CountDown = f
        that.loadingList = false;
      }).
      catch(function (res) {
-        wx.showToast({
+        uni.showToast({
          title: res.msg,
          icon: "none",
          duration: 2000 });
@@ -240,7 +240,7 @@ var _activity = __webpack_require__(/*! @/api/activity */ 443);var CountDown = f
      var that = this;
      (0, _activity.getBargainUserCancel)({ bargainId: bargainId }).
      then(function (res) {
-        wx.showToast({
+        uni.showToast({
          title: res.msg,
          icon: "success",
          duration: 2000 });
@@ -252,13 +252,14 @@ var _activity = __webpack_require__(/*! @/api/activity */ 443);var CountDown = f
        that.getBargainUserList();
      }).
      catch(function (res) {
-        wx.showToast({
+        uni.showToast({
          title: res.msg,
          icon: "none",
          duration: 2000 });

      });
    } } };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))

 /***/ })

@@ -133,7 +133,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {

 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;



@@ -383,7 +383,7 @@ var NAME = "DargainDetails";var _default =
      {
        that.bargainPartake = that.userInfo.uid;
        // that.$yrouter.push({
-        //   path: "/pages/activity/DargainDetails/main",
+        //   path: "/pages/activity/DargainDetails/index",
        //   query: { id: that.bargainId, partake: that.bargainPartake }
        // });
      } else {
@@ -409,7 +409,7 @@ var NAME = "DargainDetails";var _default =
      (0, _store.postCartAdd)(data).
      then(function (res) {
        that.$yrouter.push({
-          path: "/pages/order/OrderSubmission/main",
+          path: "/pages/order/OrderSubmission/index",
          query: { id: res.data.cartId } });

      }).
@@ -421,13 +421,13 @@ var NAME = "DargainDetails";var _default =
      var that = this;
      that.getBargainShare(that.bargainId);
      this.$yrouter.push({
-        path: "/pages/activity/Poster/main",
+        path: "/pages/activity/Poster/index",
        query: { id: that.bargainId, type: 2 } });

    },
    goList: function goList() {
      this.$yrouter.push({
-        path: "/pages/activity/GoodsBargain/main" });
+        path: "/pages/activity/GoodsBargain/index" });

    },
    //砍价分享
@@ -452,7 +452,7 @@ var NAME = "DargainDetails";var _default =
        that.getBargainHelpCount();
      }).
      catch(function (res) {
-        wx.showToast({
+        uni.showToast({
          title: res.msg,
          icon: "none",
          duration: 2000 });
@@ -468,7 +468,7 @@ var NAME = "DargainDetails";var _default =
        that.getBargainHelp();
      }).
      catch(function (res) {
-        wx.showToast({
+        uni.showToast({
          title: res.msg,
          icon: "none",
          duration: 2000 });
@@ -482,7 +482,7 @@ var NAME = "DargainDetails";var _default =
      that.surplusPrice === 0 &&
      that.bargainPartake !== that.userInfo.uid)
      {
-        return wx.showToast({
+        return uni.showToast({
          title: "好友已经砍价成功",
          icon: "success",
          duration: 2000 });
@@ -507,7 +507,7 @@ var NAME = "DargainDetails";var _default =
        that.getBargainHelpPrice();
      }).
      catch(function (res) {
-        wx.showToast({
+        uni.showToast({
          title: res.msg,
          icon: "none",
          duration: 2000 });
@@ -534,7 +534,7 @@ var NAME = "DargainDetails";var _default =

      }).
      catch(function (res) {
-        wx.showToast({
+        uni.showToast({
          title: res.msg,
          icon: "none",
          duration: 2000 });
@@ -560,7 +560,7 @@ var NAME = "DargainDetails";var _default =
        that.bargainHelpList.push.apply(that.bargainHelpList, res.data);
      }).
      catch(function (res) {
-        wx.showToast({
+        uni.showToast({
          title: res.msg,
          icon: "none",
          duration: 2000 });
@@ -576,7 +576,7 @@ var NAME = "DargainDetails";var _default =
      then(function () {}).
      catch(function () {
        // that.$yrouter.push({
-        //   path: "/pages/activity/DargainDetails/main",
+        //   path: "/pages/activity/DargainDetails/index",
        //   query: { id: that.bargainId, partake: that.userInfo.uid }
        // });
      });
@@ -598,7 +598,7 @@ var NAME = "DargainDetails";var _default =
      catch(function () {
        that.bargainPartake = that.userInfo.uid;
        // that.$yrouter.push({
-        //   path: "/pages/activity/DargainDetails/main",
+        //   path: "/pages/activity/DargainDetails/index",
        //   query: { id: that.bargainId, partake: that.userInfo.uid }
        // });
      });
@@ -614,7 +614,7 @@ var NAME = "DargainDetails";var _default =
        that.getBargainHelpList();
      }).
      catch(function (res) {
-        wx.showToast({
+        uni.showToast({
          title: res.msg,
          icon: "none",
          duration: 2000 });
@@ -627,11 +627,12 @@ var NAME = "DargainDetails";var _default =

  onShareAppMessage: function onShareAppMessage() {
    return {
-      path: "/pages/activity/DargainDetails/main/?id=".concat(
+      path: "/pages/activity/DargainDetails/index/?id=".concat(
      this.$yroute.query.id, "&partake=").concat(
      this.userInfo.uid) };

  } };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))

 /***/ }),

@@ -213,7 +213,7 @@ var _default = { name: "GoodsBargain", components: {}, props: {}, data: function
      loading: false, //当前接口是否请求完成 false 完成 true 未完成
      page: 1, //页码
      limit: 20 //数量
-    };}, mounted: function mounted() {this.getBargainList();}, methods: { getBargainList: function getBargainList() {var that = this;if (that.loading) return;if (that.status) return;that.loading = true;(0, _activity.getBargainList)({ page: that.page, limit: that.limit }).then(function (res) {that.status = res.data.length < that.limit;that.bargainLis.push.apply(that.bargainLis, res.data);that.page++;that.loading = false;});}, goDetail: function goDetail(id) {this.$yrouter.push({ path: "/pages/activity/DargainDetails/main", query: { id: id, partake: 0 } });} } };exports.default = _default;
+    };}, mounted: function mounted() {this.getBargainList();}, methods: { getBargainList: function getBargainList() {var that = this;if (that.loading) return;if (that.status) return;that.loading = true;(0, _activity.getBargainList)({ page: that.page, limit: that.limit }).then(function (res) {that.status = res.data.length < that.limit;that.bargainLis.push.apply(that.bargainLis, res.data);that.page++;that.loading = false;});}, goDetail: function goDetail(id) {this.$yrouter.push({ path: "/pages/activity/DargainDetails/index", query: { id: id, partake: 0 } });} } };exports.default = _default;

 /***/ })

@@ -227,7 +227,7 @@ var Loading = function Loading() {return __webpack_require__.e(/*! import() | co
      page: 1, //页码
      limit: 20, //数量
      loadingList: false };}, mounted: function mounted() {// document.querySelector('body').setAttribute('style', 'background-color:#73CBB6');
-    this.getCombinationList();}, onReachBottom: function onReachBottom() {!this.loadingList && this.getCombinationList();}, methods: { getCombinationList: function getCombinationList() {var that = this;if (that.loading) return;if (that.status) return;(0, _activity.getCombinationList)({ page: that.page, limit: that.limit }).then(function (res) {that.status = res.data.length < that.limit;that.combinationList.push.apply(that.combinationList, res.data);that.page++;that.loading = false;});}, link: function link(id) {this.$yrouter.push({ path: "/pages/activity/GroupDetails/main", query: { id: id } });} } };exports.default = _default;
+    this.getCombinationList();}, onReachBottom: function onReachBottom() {!this.loadingList && this.getCombinationList();}, methods: { getCombinationList: function getCombinationList() {var that = this;if (that.loading) return;if (that.status) return;(0, _activity.getCombinationList)({ page: that.page, limit: that.limit }).then(function (res) {that.status = res.data.length < that.limit;that.combinationList.push.apply(that.combinationList, res.data);that.page++;that.loading = false;});}, link: function link(id) {this.$yrouter.push({ path: "/pages/activity/GroupDetails/index", query: { id: id } });} } };exports.default = _default;

 /***/ })

@@ -133,7 +133,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {

 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;



@@ -301,7 +301,7 @@ var CountDown = function CountDown() {return __webpack_require__.e(/*! import()
      loadingList: false, //当前接口是否请求完成 false 完成 true 未完成
      page: 1, //页码
      limit: 5, //数量
-      title: [] };}, mounted: function mounted() {this.mountedStart();}, onReachBottom: function onReachBottom() {!this.loadingList && this.getSeckillList();}, methods: { mountedStart: function mountedStart() {var that = this;wx.showLoading();(0, _activity.getSeckillConfig)().then(function (res) {that.$set(that, "headerImg", res.data.lovely);that.$set(that, "timeList", res.data.seckillTime);that.$set(that, "active", res.data.seckillTimeIndex);var title = [];title = res.data.seckillTime.map(function (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;wx.hideLoading();});});}, setTime: function setTime(event) {var that = this;
+      title: [] };}, mounted: function mounted() {this.mountedStart();}, onReachBottom: function onReachBottom() {!this.loadingList && this.getSeckillList();}, methods: { mountedStart: function mountedStart() {var that = this;uni.showLoading();(0, _activity.getSeckillConfig)().then(function (res) {that.$set(that, "headerImg", res.data.lovely);that.$set(that, "timeList", res.data.seckillTime);that.$set(that, "active", res.data.seckillTimeIndex);var title = [];title = res.data.seckillTime.map(function (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 setTime(event) {var that = this;
      that.active = event.mp.detail.index;
      that.datatime = that.timeList[that.active].stop;
      that.getSeckillList();
@@ -315,17 +315,18 @@ var CountDown = function CountDown() {return __webpack_require__.e(/*! import()
        that.status = res.data.length < that.limit;
        that.seckillList.push.apply(that.seckillList, res.data);
        that.page++;
-        wx.hideLoading();
+        uni.hideLoading();
      });
    },
    goDetail: function goDetail(id) {
      var that = this;
      var time = that.timeList[that.active].stop;
      this.$yrouter.push({
-        path: "/pages/activity/SeckillDetails/main",
+        path: "/pages/activity/SeckillDetails/index",
        query: { id: id, time: time } });

    } } };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))

 /***/ }),

@@ -393,14 +393,14 @@ var NAME = "GroupDetails";var _default =
    groupRule: function groupRule(id) {
      var that = this;
      that.$yrouter.push({
-        path: "/pages/activity/GroupRule/main",
+        path: "/pages/activity/GroupRule/index",
        query: { id: id } });

    },
    goReply: function goReply() {
      var that = this;
      that.$yrouter.push({
-        path: "/pages/shop/EvaluateList/main",
+        path: "/pages/shop/EvaluateList/index",
        query: { id: that.storeInfo.product_id } });

    },
@@ -448,7 +448,7 @@ var NAME = "GroupDetails";var _default =
        (0, _store.postCartAdd)(data).
        then(function (res) {
          that.$yrouter.push({
-            path: "/pages/order/OrderSubmission/main",
+            path: "/pages/order/OrderSubmission/index",
            query: { id: res.data.cartId } });

        }).
@@ -131,7 +131,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {

 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;



@@ -281,7 +281,7 @@ var NAME = "GroupRule";var _default =
      (0, _store.postCartAdd)(data).
      then(function (res) {
        that.$yrouter.push({
-          path: "/pages/order/OrderSubmission/main",
+          path: "/pages/order/OrderSubmission/index",
          query: { id: res.data.cartId, pinkid: that.pinkId } });

      }).
@@ -292,27 +292,27 @@ var NAME = "GroupRule";var _default =
    goPoster: function goPoster() {
      var that = this;
      this.$yrouter.push({
-        path: "/pages/activity/Poster/main",
+        path: "/pages/activity/Poster/index",
        query: { id: that.pinkId, type: 1 } });

    },
    goOrder: function goOrder() {
      var that = this;
      this.$yrouter.push({
-        path: "/pages/order/OrderDetails/main",
+        path: "/pages/order/OrderDetails/index",
        query: { id: that.currentPinkOrder } });

    },
    //拼团列表
    goList: function goList() {
      this.$yrouter.push({
-        path: "/pages/activity/GoodsGroup/main" });
+        path: "/pages/activity/GoodsGroup/index" });

    },
    //拼团详情
    goDetail: function goDetail(id) {
      this.$yrouter.push({
-        path: "/pages/activity/GroupDetails/main",
+        path: "/pages/activity/GroupDetails/index",
        query: { id: id } });

    },
@@ -335,14 +335,14 @@ var NAME = "GroupRule";var _default =
      var that = this;
      (0, _activity.getCombinationRemove)({ id: that.pinkId, cid: that.storeCombination.id }).
      then(function (res) {
-        wx.showToast({
+        uni.showToast({
          title: res.msg,
          icon: "none",
          duration: 2000 });

      }).
      catch(function (res) {
-        wx.showToast({
+        uni.showToast({
          title: res.msg,
          icon: "none",
          duration: 2000 });
@@ -352,6 +352,7 @@ var NAME = "GroupRule";var _default =
    lookAll: function lookAll() {
      this.iShidden = !this.iShidden;
    } } };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))

 /***/ })

@@ -133,7 +133,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {

 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;



@@ -183,7 +183,7 @@ var _default = { name: "Poster", components: {}, props: {}, data: function data(
        that.status = false;
      }).
      catch(function (res) {
-        wx.showToast({
+        uni.showToast({
          title: res.msg,
          icon: "none",
          duration: 2000 });
@@ -199,13 +199,14 @@ var _default = { name: "Poster", components: {}, props: {}, data: function data(
        that.status = false;
      }).
      catch(function (res) {
-        wx.showToast({
+        uni.showToast({
          title: res.msg,
          icon: "none",
          duration: 2000 });

      });
    } } };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))

 /***/ }),

@@ -102,13 +102,6 @@ var render = function() {
  var _vm = this
  var _h = _vm.$createElement
  var _c = _vm._self._c || _h
-  if (!_vm._isMounted) {
-    _vm.e0 = function($event) {
-      return _vm.$yrouter.push({
-        path: "/pages/user/CustomerList/index"
-      })
-    }
-  }
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -267,6 +260,9 @@ var NAME = "SeckillDetails";var _default =
    this.mountedStart();
  },
  methods: {
+    routerGo: function routerGo(item) {
+      this.$yrouter.push({ path: '/pages/user/CustomerList/index' });
+    },
    mountedStart: function mountedStart() {
      var that = this;
      var id = that.$yroute.query.id;
@@ -351,7 +347,7 @@ var NAME = "SeckillDetails";var _default =
        then(function (res) {
          console.log(res);
          that.$yrouter.push({
-            path: "/pages/order/OrderSubmission/main",
+            path: "/pages/order/OrderSubmission/index",
            query: { id: res.data.cartId } });

        }).
@@ -1 +1 @@
-<view hidden="{{!(domStatus)}}" class="{{['_div data-v-69b60570',posterImageStatus?'noscroll product-con':'product-con']}}"><product-con-swiper vue-id="4a3c0059-1" imgUrls="{{imgUrls}}" class="data-v-69b60570" bind:__l="__l"></product-con-swiper><view class="nav acea-row row-between-wrapper _div data-v-69b60570"><view class="money _div data-v-69b60570">￥<label class="num _span data-v-69b60570">{{storeInfo.price}}</label><label class="y-money _span data-v-69b60570">{{'￥'+storeInfo.price}}</label></view><view class="acea-row row-middle _div data-v-69b60570"><view class="times _div data-v-69b60570"><view class="_div data-v-69b60570">距秒杀结束仅剩</view><count-down vue-id="4a3c0059-2" is-day="{{false}}" tip-text day-text hour-text=" : " minute-text=" : " second-text datatime="{{datatime}}" class="data-v-69b60570" bind:__l="__l"></count-down></view><view class="iconfont icon-jiantou _div data-v-69b60570"></view></view></view><view class="wrapperRush _div data-v-69b60570"><view class="introduce acea-row row-between _div data-v-69b60570"><view class="infor _div data-v-69b60570">{{storeInfo.title}}</view><view data-event-opts="{{[['tap',[['setPosterImageStatus',['$event']]]]]}}" class="iconfont icon-fenxiang _div data-v-69b60570" bindtap="__e"></view></view><view class="label acea-row row-middle _div data-v-69b60570"><view class="stock _div data-v-69b60570">{{'库存:'+storeInfo.stock+'件'}}</view><view class="_div data-v-69b60570">{{'销量:'+storeInfo.sales+'件'}}</view></view></view><view class="product-intro _div data-v-69b60570"><view class="title _div data-v-69b60570">产品介绍</view><view class="conter _div data-v-69b60570"><rich-text nodes="{{storeInfo.description}}"></rich-text></view></view><view style="height:100rpx;" class="_div data-v-69b60570"></view><view class="footerRush acea-row row-between-wrapper _div data-v-69b60570"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="customerSer acea-row row-center-wrapper row-column _div data-v-69b60570" bindtap="__e"><view class="iconfont icon-kefu _div data-v-69b60570"></view><view class="_div data-v-69b60570">客服</view></view><view data-event-opts="{{[['tap',[['tapBuy',['$event']]]]]}}" class="bnt bg-color-red _div data-v-69b60570" bindtap="__e">立即购买</view></view><product-window vue-id="4a3c0059-3" attr="{{attr}}" cartNum="{{cartNum}}" data-event-opts="{{[['^changeFun',[['changeFun']]]]}}" bind:changeFun="__e" class="data-v-69b60570" bind:__l="__l"></product-window><store-poster vue-id="4a3c0059-4" posterImageStatus="{{posterImageStatus}}" posterData="{{posterData}}" data-event-opts="{{[['^setPosterImageStatus',[['setPosterImageStatus']]]]}}" bind:setPosterImageStatus="__e" class="data-v-69b60570" bind:__l="__l"></store-poster></view>
+<view hidden="{{!(domStatus)}}" class="{{['_div data-v-69b60570',posterImageStatus?'noscroll product-con':'product-con']}}"><product-con-swiper vue-id="4a3c0059-1" imgUrls="{{imgUrls}}" class="data-v-69b60570" bind:__l="__l"></product-con-swiper><view class="nav acea-row row-between-wrapper _div data-v-69b60570"><view class="money _div data-v-69b60570">￥<label class="num _span data-v-69b60570">{{storeInfo.price}}</label><label class="y-money _span data-v-69b60570">{{'￥'+storeInfo.price}}</label></view><view class="acea-row row-middle _div data-v-69b60570"><view class="times _div data-v-69b60570"><view class="_div data-v-69b60570">距秒杀结束仅剩</view><count-down vue-id="4a3c0059-2" is-day="{{false}}" tip-text day-text hour-text=" : " minute-text=" : " second-text datatime="{{datatime}}" class="data-v-69b60570" bind:__l="__l"></count-down></view><view class="iconfont icon-jiantou _div data-v-69b60570"></view></view></view><view class="wrapperRush _div data-v-69b60570"><view class="introduce acea-row row-between _div data-v-69b60570"><view class="infor _div data-v-69b60570">{{storeInfo.title}}</view><view data-event-opts="{{[['tap',[['setPosterImageStatus',['$event']]]]]}}" class="iconfont icon-fenxiang _div data-v-69b60570" bindtap="__e"></view></view><view class="label acea-row row-middle _div data-v-69b60570"><view class="stock _div data-v-69b60570">{{'库存:'+storeInfo.stock+'件'}}</view><view class="_div data-v-69b60570">{{'销量:'+storeInfo.sales+'件'}}</view></view></view><view class="product-intro _div data-v-69b60570"><view class="title _div data-v-69b60570">产品介绍</view><view class="conter _div data-v-69b60570"><rich-text nodes="{{storeInfo.description}}"></rich-text></view></view><view style="height:100rpx;" class="_div data-v-69b60570"></view><view class="footerRush acea-row row-between-wrapper _div data-v-69b60570"><view data-event-opts="{{[['tap',[['routerGo']]]]}}" class="customerSer acea-row row-center-wrapper row-column _div data-v-69b60570" bindtap="__e"><view class="iconfont icon-kefu _div data-v-69b60570"></view><view class="_div data-v-69b60570">客服</view></view><view data-event-opts="{{[['tap',[['tapBuy',['$event']]]]]}}" class="bnt bg-color-red _div data-v-69b60570" bindtap="__e">立即购买</view></view><product-window vue-id="4a3c0059-3" attr="{{attr}}" cartNum="{{cartNum}}" data-event-opts="{{[['^changeFun',[['changeFun']]]]}}" bind:changeFun="__e" class="data-v-69b60570" bind:__l="__l"></product-window><store-poster vue-id="4a3c0059-4" posterImageStatus="{{posterImageStatus}}" posterData="{{posterData}}" data-event-opts="{{[['^setPosterImageStatus',[['setPosterImageStatus']]]]}}" bind:setPosterImageStatus="__e" class="data-v-69b60570" bind:__l="__l"></store-poster></view>
@@ -133,7 +133,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {

 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;



@@ -181,18 +181,18 @@ var _utils = __webpack_require__(/*! @/utils */ 18);var _data$computed$onShow;fu
      //   });
      // } else {
      //   this.$yrouter.replace({
-      //     path: "/pages/launch/main",
+      //     path: "/pages/launch/index",
      //     query: { type: 0 }
      //   });
      // }
      this.CHANGE_TABTAR(0);
      this.$yrouter.replace({
-        path: "/pages/launch/main",
+        path: "/pages/home/index",
        query: { type: 0 } });

    },
    getUserInfo: function getUserInfo(data) {
-      wx.showLoading({
+      uni.showLoading({
        title: "登录中" });

      (0, _utils.login)();
@@ -200,6 +200,7 @@ var _utils = __webpack_require__(/*! @/utils */ 18);var _data$computed$onShow;fu

 {}), _defineProperty(_data$computed$onShow, "mounted", function mounted()
 {}), _data$computed$onShow);exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))

 /***/ }),

@@ -104,68 +104,11 @@ var render = function() {

  if (!_vm._isMounted) {
    _vm.e0 = function($event) {
-      return _vm.$yrouter.push("/pages/shop/GoodSearch/index")
-    }
-
-    _vm.e1 = function($event) {
      _vm.item.url ? _vm.$yrouter.push("/" + _vm.item.url) : ""
    }

-    _vm.e2 = function($event) {
-      _vm.item.wxapp_url ? _vm.$yrouter.push(_vm.item.wxapp_url) : ""
-    }
-
-    _vm.e3 = function($event) {
-      return _vm.$yrouter.push(_vm.item.wxapp_url)
-    }
-
-    _vm.e4 = function($event) {
-      return _vm.$yrouter.push({
-        path: "/pages/shop/HotNewGoods/index",
-        query: {
-          type: 2
-        }
-      })
-    }
-
-    _vm.e5 = function($event) {
-      return _vm.$yrouter.push({
-        path: "/pages/shop/GoodsCon/index",
-        query: {
-          id: _vm.item.id
-        }
-      })
-    }
-
-    _vm.e6 = function($event) {
-      return _vm.$yrouter.push({
-        path: "/pages/shop/HotNewGoods/index",
-        query: {
-          type: 1
-        }
-      })
-    }
-
-    _vm.e7 = function($event) {
-      return _vm.$yrouter.push({
-        path: "/pages/shop/HotNewGoods/index",
-        query: {
-          type: 3
-        }
-      })
-    }
-
-    _vm.e8 = function($event) {
-      return _vm.$yrouter.push({
-        path: "/pages/shop/GoodsCon/index",
-        query: {
-          id: _vm.item.id
-        }
-      })
-    }
-
-    _vm.e9 = function($event) {
-      return _vm.$yrouter.push("/pages/shop/GoodsPromotion/index")
+    _vm.e1 = function($event) {
+      _vm.item.uniapp_url ? _vm.$yrouter.push(_vm.item.uniapp_url) : ""
    }
  }

@@ -361,16 +304,6 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =



-
-
-
-
-
-
-
-
-
-



@@ -495,6 +428,27 @@ var HAS_COUPON_WINDOW = "has_coupon_window";var _default =
    });
  },
  methods: {
+    goGoodSearch: function goGoodSearch() {
+      this.$yrouter.push("/pages/shop/GoodSearch/index");
+    },
+    goWxappUrl: function goWxappUrl(item) {
+      this.$yrouter.push(item.uniapp_url);
+    },
+    goHotNewGoods: function goHotNewGoods(type) {
+      this.$yrouter.push({
+        path: "/pages/shop/HotNewGoods/index",
+        query: { type: type } });
+
+    },
+    goGoodsCon: function goGoodsCon(item) {
+      this.$yrouter.push({
+        path: "/pages/shop/GoodsCon/index",
+        query: { id: item.id } });
+
+    },
+    goGoodsPromotion: function goGoodsPromotion() {
+      this.$yrouter.push("/pages/shop/GoodsPromotion/index");
+    },
    setOpenShare: function setOpenShare() {} } };exports.default = _default;

 /***/ }),
@@ -276,68 +276,11 @@ var render = function() {

  if (!_vm._isMounted) {
    _vm.e0 = function($event) {
-      return _vm.$yrouter.push("/pages/shop/GoodSearch/index")
-    }
-
-    _vm.e1 = function($event) {
      _vm.item.url ? _vm.$yrouter.push("/" + _vm.item.url) : ""
    }

-    _vm.e2 = function($event) {
-      _vm.item.wxapp_url ? _vm.$yrouter.push(_vm.item.wxapp_url) : ""
-    }
-
-    _vm.e3 = function($event) {
-      return _vm.$yrouter.push(_vm.item.wxapp_url)
-    }
-
-    _vm.e4 = function($event) {
-      return _vm.$yrouter.push({
-        path: "/pages/shop/HotNewGoods/index",
-        query: {
-          type: 2
-        }
-      })
-    }
-
-    _vm.e5 = function($event) {
-      return _vm.$yrouter.push({
-        path: "/pages/shop/GoodsCon/index",
-        query: {
-          id: _vm.item.id
-        }
-      })
-    }
-
-    _vm.e6 = function($event) {
-      return _vm.$yrouter.push({
-        path: "/pages/shop/HotNewGoods/index",
-        query: {
-          type: 1
-        }
-      })
-    }
-
-    _vm.e7 = function($event) {
-      return _vm.$yrouter.push({
-        path: "/pages/shop/HotNewGoods/index",
-        query: {
-          type: 3
-        }
-      })
-    }
-
-    _vm.e8 = function($event) {
-      return _vm.$yrouter.push({
-        path: "/pages/shop/GoodsCon/index",
-        query: {
-          id: _vm.item.id
-        }
-      })
-    }
-
-    _vm.e9 = function($event) {
-      return _vm.$yrouter.push("/pages/shop/GoodsPromotion/index")
+    _vm.e1 = function($event) {
+      _vm.item.uniapp_url ? _vm.$yrouter.push(_vm.item.uniapp_url) : ""
    }
  }

@@ -532,16 +475,6 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =



-
-
-
-
-
-
-
-
-
-



@@ -666,6 +599,27 @@ var HAS_COUPON_WINDOW = "has_coupon_window";var _default =
    });
  },
  methods: {
+    goGoodSearch: function goGoodSearch() {
+      this.$yrouter.push("/pages/shop/GoodSearch/index");
+    },
+    goWxappUrl: function goWxappUrl(item) {
+      this.$yrouter.push(item.uniapp_url);
+    },
+    goHotNewGoods: function goHotNewGoods(type) {
+      this.$yrouter.push({
+        path: "/pages/shop/HotNewGoods/index",
+        query: { type: type } });
+
+    },
+    goGoodsCon: function goGoodsCon(item) {
+      this.$yrouter.push({
+        path: "/pages/shop/GoodsCon/index",
+        query: { id: item.id } });
+
+    },
+    goGoodsPromotion: function goGoodsPromotion() {
+      this.$yrouter.push("/pages/shop/GoodsPromotion/index");
+    },
    setOpenShare: function setOpenShare() {} } };exports.default = _default;

 /***/ }),
@@ -776,17 +730,6 @@ var render = function() {
  var _vm = this
  var _h = _vm.$createElement
  var _c = _vm._self._c || _h
-  if (!_vm._isMounted) {
-    _vm.e0 = function($event) {
-      return _vm.$yrouter.push({
-        path: "/pages/shop/GoodsList/index",
-        query: {
-          id: _vm.child.id,
-          title: _vm.child.cateName
-        }
-      })
-    }
-  }
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -918,10 +861,16 @@ var _utils = __webpack_require__(/*! @/utils */ 18);function _interopRequireDefa
 //
 //
 var _default = { name: "GoodsClass", components: {}, props: {}, data: function data() {return { category: [], navActive: 0, search: "", lock: false };}, watch: { "$yroute.query.id": function $yrouteQueryId(n) {if (n) {this.activeCateId(n);}} }, mounted: function mounted() {// document.addEventListener("scroll", this.onScroll, false);
-    this.loadCategoryData();}, methods: { activeCateId: function activeCateId(n) {var index = 0;n = parseInt(n);if (!n) return;this.category.forEach(function (cate, i) {if (cate.id === n) index = i;});if (index !== this.navActive) {this.asideTap(index);}}, loadCategoryData: function loadCategoryData() {var _this = this;(0, _store.getCategory)().then(function (res) {_this.category = res.data;_this.$nextTick(function () {if (_this.$yroute.query.id) {_this.activeCateId(_this.$yroute.query.id);}});});}, submitForm: function submitForm() {var _this2 = this;var val = (0, _utils.trim)(this.search);
+    this.loadCategoryData();}, methods: { goGoodsList: function goGoodsList(child) {this.$yrouter.push({ path: "/pages/shop/GoodsList/index", query: { id: child.id, title: child.cateName } });}, activeCateId: function activeCateId(n) {var index = 0;n = parseInt(n);if (!n) return;this.category.forEach(function (cate, i) {if (cate.id === n) index = i;});if (index !== this.navActive) {this.asideTap(index);}}, loadCategoryData: function loadCategoryData() {var _this = this;(0, _store.getCategory)().then(function (res) {_this.category = res.data;_this.$nextTick(function () {if (_this.$yroute.query.id) {_this.activeCateId(_this.$yroute.query.id);
+          }
+        });
+      });
+    },
+    submitForm: function submitForm() {var _this2 = this;
+      var val = (0, _utils.trim)(this.search);
      if (val) {
        this.$yrouter.push({
-          path: "/pages/shop/GoodsList/main",
+          path: "/pages/shop/GoodsList/index",
          query: { s: val } });

        setTimeout(function () {return _this2.search = "";}, 500);
@@ -1042,25 +991,6 @@ var render = function() {
  var _vm = this
  var _h = _vm.$createElement
  var _c = _vm._self._c || _h
-  if (!_vm._isMounted) {
-    _vm.e0 = function($event) {
-      return _vm.$yrouter.push({
-        path: "/pages/shop/GoodsCon/index",
-        query: {
-          id: _vm.item.productId
-        }
-      })
-    }
-
-    _vm.e1 = function($event) {
-      return _vm.$yrouter.push({
-        path: "/pages/shop/GoodsCon/index",
-        query: {
-          id: _vm.item.productId
-        }
-      })
-    }
-  }
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -1092,10 +1022,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {

 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
-
-
-
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;



@@ -1334,6 +1261,12 @@ var CHECKED_IDS = "cart_checked";var _default =

  },
  methods: {
+    goGoodsCon: function goGoodsCon(item) {
+      this.$yrouter.push({
+        path: "/pages/shop/GoodsCon/index",
+        query: { id: item.productId } });
+
+    },
    getCartList: function getCartList() {var _this = this;
      var that = this;
      (0, _store.getCartList)().then(function (res) {
@@ -1435,7 +1368,7 @@ var CHECKED_IDS = "cart_checked";var _default =
      }
      console.log(id);
      this.$yrouter.push({
-        path: "/pages/order/OrderSubmission/main",
+        path: "/pages/order/OrderSubmission/index",
        query: { id: id.join(",") } });

    },
@@ -1488,7 +1421,7 @@ var CHECKED_IDS = "cart_checked";var _default =
          _this2.getCartList();
        }).
        catch(function (error) {
-          wx.showToast({
+          uni.showToast({
            title: error.response.data.msg,
            icon: "none",
            duration: 2000 });
@@ -1574,6 +1507,7 @@ var CHECKED_IDS = "cart_checked";var _default =
      }
      that.countmoney = carmoney;
    } } };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))

 /***/ }),
 /* 105 */,
@@ -1658,79 +1592,6 @@ var render = function() {
  var _vm = this
  var _h = _vm.$createElement
  var _c = _vm._self._c || _h
-  if (!_vm._isMounted) {
-    _vm.e0 = function($event) {
-      return _vm.$yrouter.push("/pages/user/PersonalData/index")
-    }
-
-    _vm.e1 = function($event) {
-      return _vm.$yrouter.push({
-        path: "/pages/user/PersonalData/index"
-      })
-    }
-
-    _vm.e2 = function($event) {
-      return _vm.$yrouter.push({
-        path: "/pages/user/UserAccount/index"
-      })
-    }
-
-    _vm.e3 = function($event) {
-      return _vm.$yrouter.push("/pages/user/promotion/UserPromotion/index")
-    }
-
-    _vm.e4 = function($event) {
-      return _vm.$yrouter.push("/pages/user/signIn/Integral/index")
-    }
-
-    _vm.e5 = function($event) {
-      return _vm.$yrouter.push("/pages/user/coupon/UserCoupon/index")
-    }
-
-    _vm.e6 = function($event) {
-      return _vm.$yrouter.push("/pages/order/MyOrder/index")
-    }
-
-    _vm.e7 = function($event) {
-      return _vm.$yrouter.push({
-        path: "/pages/order/MyOrder/index",
-        query: {
-          type: 0
-        }
-      })
-    }
-
-    _vm.e8 = function($event) {
-      return _vm.$yrouter.push({
-        path: "/pages/order/MyOrder/index",
-        query: {
-          type: 1
-        }
-      })
-    }
-
-    _vm.e9 = function($event) {
-      return _vm.$yrouter.push({
-        path: "/pages/order/MyOrder/index",
-        query: {
-          type: 2
-        }
-      })
-    }
-
-    _vm.e10 = function($event) {
-      return _vm.$yrouter.push({
-        path: "/pages/order/MyOrder/index",
-        query: {
-          type: 3
-        }
-      })
-    }
-
-    _vm.e11 = function($event) {
-      return _vm.$yrouter.push("/pages/order/ReturnList/index")
-    }
-  }
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -1762,27 +1623,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {

 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;



@@ -2078,27 +1919,8 @@ var _vuex = __webpack_require__(/*! vuex */ 16); //
 //
 //
 //
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-var SwitchWindow = function SwitchWindow() {return __webpack_require__.e(/*! import() | components/SwitchWindow */ "components/SwitchWindow").then(__webpack_require__.bind(null, /*! @/components/SwitchWindow */ 536));};var NAME = "User";var _default = { name: NAME, components: { SwitchWindow: SwitchWindow }, props: {}, data: function data() {return { userInfo: {}, MyMenus: [], orderStatusNum: {}, switchActive: false, isWeixin: false };}, computed: (0, _vuex.mapGetters)(["wxCode"]), watch: { $yroute: function $yroute(n) {if (n.name === NAME) this.User();} }, mounted: function mounted() {console.log('这个是个人中心');this.User();this.MenuUser();this.isWeixin = (0, _utils.isWeixin)();}, methods: { getPhoneNumber: function getPhoneNumber(e) {var _this = this;console.log(e.mp.detail);if (e.mp.detail.errMsg == "getPhoneNumber:ok") {wx.showLoading({ title: "绑定中" });wx.login({ success: function success(loginRes) {(0, _user.bindingPhone)({ code: loginRes.code, encryptedData: e.mp.detail.encryptedData, iv: e.mp.detail.iv }).then(function (res) {_this.User();wx.hideLoading();wx.showToast({ title: res.msg, icon: "success", duration: 2000 });}).catch(function (error) {wx.showToast({ title: error.msg || error.response.data.msg, icon: "none", duration: 2000 });});} });} else {wx.showToast({ title: "已拒绝授权", icon: "none", duration: 2000 });}}, changeswitch: function changeswitch(data) {this.switchActive = data;}, User: function User() {var that = this;(0, _user.getUser)().then(function (res) {that.userInfo = res.data;that.orderStatusNum = res.data.orderStatusNum;});}, MenuUser: function MenuUser() {var that = this;(0, _user.getMenuUser)().then(function (res) {that.MyMenus = res.data.routine_my_menus;});}, goPages: function goPages(index) {var url = this.MyMenus[index].wxapp_url;if (url === "/pages/user/promotion/UserPromotion/main" && this.userInfo.statu === 1) {if (!this.userInfo.isPromoter) return this.$dialog.toast({ mes: "您还没有推广权限！！" });}if (url === "/pages/orderAdmin/OrderIndex/main" && !this.userInfo.adminid) {return this.$dialog.toast({ mes: "您还不是管理员！！" });}this.$yrouter.push({ path: this.MyMenus[index].wxapp_url });} }, onShow: function onShow() {this.User();this.MenuUser();this.isWeixin = (0, _utils.isWeixin)();} };exports.default = _default;
+var SwitchWindow = function SwitchWindow() {return __webpack_require__.e(/*! import() | components/SwitchWindow */ "components/SwitchWindow").then(__webpack_require__.bind(null, /*! @/components/SwitchWindow */ 536));};var NAME = "User";var _default = { name: NAME, components: { SwitchWindow: SwitchWindow }, props: {}, data: function data() {return { userInfo: {}, MyMenus: [], orderStatusNum: {}, switchActive: false, isWeixin: false };}, computed: (0, _vuex.mapGetters)(["wxCode"]), watch: { $yroute: function $yroute(n) {if (n.name === NAME) this.User();} }, mounted: function mounted() {console.log("这个是个人中心");this.User();this.MenuUser();this.isWeixin = (0, _utils.isWeixin)();}, methods: { goReturnList: function goReturnList() {this.$yrouter.push("/pages/order/ReturnList/index");}, goMyOrder: function goMyOrder(type) {this.$yrouter.push({ path: "/pages/order/MyOrder/index", query: { type: type } });}, goUserCoupon: function goUserCoupon() {this.$yrouter.push("/pages/user/coupon/UserCoupon/index");}, goIntegral: function goIntegral() {this.$yrouter.push("/pages/user/signIn/Integral/index");}, goUserPromotion: function goUserPromotion() {this.$yrouter.push("/pages/user/promotion/UserPromotion/index");}, goUserAccount: function goUserAccount() {this.$yrouter.push({ path: "/pages/user/UserAccount/index" });}, goPersonalData: function goPersonalData() {this.$yrouter.push("/pages/user/PersonalData/index");}, getPhoneNumber: function getPhoneNumber(e) {var _this = this;console.log(e.mp.detail);if (e.mp.detail.errMsg == "getPhoneNumber:ok") {uni.showLoading({ title: "绑定中" });wx.login({ success: function success(loginRes) {(0, _user.bindingPhone)({ code: loginRes.code, encryptedData: e.mp.detail.encryptedData, iv: e.mp.detail.iv }).then(function (res) {_this.User();uni.hideLoading();uni.showToast({ title: res.msg, icon: "success", duration: 2000 });}).catch(function (error) {uni.showToast({ title: error.msg || error.response.data.msg, icon: "none", duration: 2000 });});} });} else {uni.showToast({ title: "已拒绝授权", icon: "none", duration: 2000 });}}, changeswitch: function changeswitch(data) {this.switchActive = data;}, User: function User() {var that = this;(0, _user.getUser)().then(function (res) {that.userInfo = res.data;that.orderStatusNum = res.data.orderStatusNum;});}, MenuUser: function MenuUser() {var that = this;(0, _user.getMenuUser)().then(function (res) {that.MyMenus = res.data.routine_my_menus;});}, goPages: function goPages(index) {var url = this.MyMenus[index].uniapp_url;if (url === "/pages/user/promotion/UserPromotion/index" && this.userInfo.statu === 1) {if (!this.userInfo.isPromoter) return this.$dialog.toast({ mes: "您还没有推广权限！！" });}if (url === "/pages/orderAdmin/OrderIndex/index" && !this.userInfo.adminid) {return this.$dialog.toast({ mes: "您还不是管理员！！" });}this.$yrouter.push({ path: this.MyMenus[index].uniapp_url });} }, onShow: function onShow() {this.User();this.MenuUser();this.isWeixin = (0, _utils.isWeixin)();} };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))

 /***/ }),
 /* 111 */
@@ -7,9 +7,9 @@
 }


-.productSort{
-  height:100%
-}
+.productSort {
+  height: 100%;
+}


 .footer-line-height {
@@ -131,7 +131,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {

 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;



@@ -234,7 +234,7 @@ var _default = { name: "goodsReturn", components: {// VueCoreImageUpload
        refund_reason_wap_explain: refund_reason_wap_explain }).

      then(function (res) {
-        wx.showToast({
+        uni.showToast({
          title: res.msg,
          icon: "success",
          duration: 2000 });
@@ -253,6 +253,7 @@ var _default = { name: "goodsReturn", components: {// VueCoreImageUpload
    this.getOrderDetail();
    this.getRefundReason();
  } };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))

 /***/ })

@@ -110,15 +110,6 @@ var render = function() {

  if (!_vm._isMounted) {
    _vm.e0 = function($event) {
-      return _vm.$yrouter.push({
-        path: "/pages/order/OrderDetails/index",
-        query: {
-          id: _vm.order.orderId
-        }
-      })
-    }
-
-    _vm.e1 = function($event) {
      $event.stopPropagation()
      return _vm.$yrouter.push({
        path: "/pages/shop/GoodsCon/index",
@@ -128,7 +119,7 @@ var render = function() {
      })
    }

-    _vm.e2 = function($event) {
+    _vm.e1 = function($event) {
      $event.stopPropagation()
      return _vm.$yrouter.push({
        path: "/pages/activity/GroupDetails/index",
@@ -138,7 +129,7 @@ var render = function() {
      })
    }

-    _vm.e3 = function($event) {
+    _vm.e2 = function($event) {
      $event.stopPropagation()
      return _vm.$yrouter.push({
        path: "/pages/activity/DargainDetails/index",
@@ -148,7 +139,7 @@ var render = function() {
      })
    }

-    _vm.e4 = function($event) {
+    _vm.e3 = function($event) {
      $event.stopPropagation()
      return _vm.$yrouter.push({
        path: "/pages/activity/SeckillDetails/index",
@@ -158,25 +149,7 @@ var render = function() {
      })
    }

-    _vm.e5 = function($event) {
-      return _vm.$yrouter.push({
-        path: "/pages/order/OrderDetails/index",
-        query: {
-          id: _vm.order.orderId
-        }
-      })
-    }
-
-    _vm.e6 = function($event) {
-      return _vm.$yrouter.push({
-        path: "/pages/order/OrderDetails/index",
-        query: {
-          id: _vm.order.orderId
-        }
-      })
-    }
-
-    _vm.e7 = function($event) {
+    _vm.e4 = function($event) {
      return _vm.$yrouter.push({
        path: "/pages/order/Logistics/index",
        query: {
@@ -184,24 +157,6 @@ var render = function() {
        }
      })
    }
-
-    _vm.e8 = function($event) {
-      return _vm.$yrouter.push({
-        path: "/pages/order/OrderDetails/index",
-        query: {
-          id: _vm.order.orderId
-        }
-      })
-    }
-
-    _vm.e9 = function($event) {
-      return _vm.$yrouter.push({
-        path: "/pages/order/OrderDetails/index",
-        query: {
-          id: _vm.order.orderId
-        }
-      })
-    }
  }

  _vm.$mp.data = Object.assign(
@@ -412,8 +367,6 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =



-
-



@@ -596,9 +549,7 @@ var _utils = __webpack_require__(/*! @/utils */ 18); //
 //
 //
 //
-//
-//
-var Loading = function Loading() {return __webpack_require__.e(/*! import() | components/Loading */ "components/Loading").then(__webpack_require__.bind(null, /*! @/components/Loading */ 494));};var Payment = function Payment() {return __webpack_require__.e(/*! import() | components/Payment */ "components/Payment").then(__webpack_require__.bind(null, /*! @/components/Payment */ 587));};var DataFormat = function DataFormat() {return __webpack_require__.e(/*! import() | components/DataFormat */ "components/DataFormat").then(__webpack_require__.bind(null, /*! @/components/DataFormat */ 577));};var STATUS = ["待付款", "待发货", "待收货", "待评价", "已完成", "", "", "", "", "待付款"];var NAME = "MyOrder";var _default = { name: NAME, data: function data() {return { offlinePayStatus: 2, orderData: {}, type: "", page: 1, limit: 20, loaded: false, loading: false, orderList: [], pay: false, payType: ["yue", "weixin"], from: (0, _utils.isWeixin)() ? "weixin" : "weixinh5" };}, components: { Loading: Loading, Payment: Payment, DataFormat: DataFormat }, computed: (0, _vuex.mapGetters)(["userInfo"]), watch: { $yroute: function $yroute(n) {if (n.name === NAME) {var type = parseInt(this.$yroute.query.type) || 0;if (this.type !== type) {this.changeType(type);}this.getOrderData();}}, type: function type() {} }, methods: { dataFormat: _utils.dataFormat, setOfflinePayStatus: function setOfflinePayStatus(status) {var that = this;that.offlinePayStatus = status;if (status === 1) {if (that.payType.indexOf("offline") < 0) {that.payType.push("offline");}}}, getOrderData: function getOrderData() {var _this = this;(0, _order.getOrderData)().then(function (res) {_this.orderData = res.data;});}, takeOrder: function takeOrder(order) {var _this2 = this;(0, _order2.takeOrderHandle)(order.orderId).finally(function () {_this2.reload();_this2.getOrderData();});}, reload: function reload() {this.changeType(this.type);}, changeType: function changeType(type) {this.type = type;this.orderList = [];this.page = 1;this.loaded = false;this.loading = false;this.getOrderList();}, getOrderList: function getOrderList() {var _this3 = this;if (this.loading || this.loaded) return;this.loading = true;var page = this.page,limit = this.limit,type = this.type;(0, _order.getOrderList)({ page: page, limit: limit, type: type }).then(function (res) {_this3.orderList = _this3.orderList.concat(res.data);_this3.page++;_this3.loaded = res.data.length < _this3.limit;_this3.loading = false;});}, getStatus: function getStatus(order) {return STATUS[order._status._type];}, cancelOrder: function cancelOrder(order) {var _this4 = this;(0, _order2.cancelOrderHandle)(order.orderId).then(function () {_this4.getOrderData();_this4.orderList.splice(_this4.orderList.indexOf(order), 1);}).catch(function () {_this4.reload();});}, paymentTap: function paymentTap(order) {var _this5 = this;var that = this;if (!(order.combinationId > 0 || order.bargainId > 0 || order.seckillId > 0)) {that.setOfflinePayStatus(order.offlinePayStatus);}this.pay = true;this.toPay = function (type) {(0, _order2.payOrderHandle)(order.orderId, type, that.from).then(function () {var type = parseInt(_this5.$yroute.query.type) || 0;that.changeType(type);that.getOrderData();}).catch(function () {var type = parseInt(that.$yroute.query.type) || 0;that.changeType(type);that.getOrderData();});};}, toPay: function toPay() {} }, mounted: function mounted() {this.type = parseInt(this.$yroute.query.type) || 0;this.getOrderData();this.getOrderList();}, onReachBottom: function onReachBottom() {!this.loading && this.getOrderList();} };exports.default = _default;
+var Loading = function Loading() {return __webpack_require__.e(/*! import() | components/Loading */ "components/Loading").then(__webpack_require__.bind(null, /*! @/components/Loading */ 494));};var Payment = function Payment() {return __webpack_require__.e(/*! import() | components/Payment */ "components/Payment").then(__webpack_require__.bind(null, /*! @/components/Payment */ 587));};var DataFormat = function DataFormat() {return __webpack_require__.e(/*! import() | components/DataFormat */ "components/DataFormat").then(__webpack_require__.bind(null, /*! @/components/DataFormat */ 577));};var STATUS = ["待付款", "待发货", "待收货", "待评价", "已完成", "", "", "", "", "待付款"];var NAME = "MyOrder";var _default = { name: NAME, data: function data() {return { offlinePayStatus: 2, orderData: {}, type: "", page: 1, limit: 20, loaded: false, loading: false, orderList: [], pay: false, payType: ["yue", "weixin"], from: (0, _utils.isWeixin)() ? "weixin" : "weixinh5" };}, components: { Loading: Loading, Payment: Payment, DataFormat: DataFormat }, computed: (0, _vuex.mapGetters)(["userInfo"]), watch: { $yroute: function $yroute(n) {if (n.name === NAME) {var type = parseInt(this.$yroute.query.type) || 0;if (this.type !== type) {this.changeType(type);}this.getOrderData();}}, type: function type() {} }, methods: { goOrderDetails: function goOrderDetails(order) {this.$yrouter.push({ path: "/pages/order/OrderDetails/index", query: { id: order.orderId } });}, dataFormat: _utils.dataFormat, setOfflinePayStatus: function setOfflinePayStatus(status) {var that = this;that.offlinePayStatus = status;if (status === 1) {if (that.payType.indexOf("offline") < 0) {that.payType.push("offline");}}}, getOrderData: function getOrderData() {var _this = this;(0, _order.getOrderData)().then(function (res) {_this.orderData = res.data;});}, takeOrder: function takeOrder(order) {var _this2 = this;(0, _order2.takeOrderHandle)(order.orderId).finally(function () {_this2.reload();_this2.getOrderData();});}, reload: function reload() {this.changeType(this.type);}, changeType: function changeType(type) {this.type = type;this.orderList = [];this.page = 1;this.loaded = false;this.loading = false;this.getOrderList();}, getOrderList: function getOrderList() {var _this3 = this;if (this.loading || this.loaded) return;this.loading = true;var page = this.page,limit = this.limit,type = this.type;(0, _order.getOrderList)({ page: page, limit: limit, type: type }).then(function (res) {_this3.orderList = _this3.orderList.concat(res.data);_this3.page++;_this3.loaded = res.data.length < _this3.limit;_this3.loading = false;});}, getStatus: function getStatus(order) {return STATUS[order._status._type];}, cancelOrder: function cancelOrder(order) {var _this4 = this;(0, _order2.cancelOrderHandle)(order.orderId).then(function () {_this4.getOrderData();_this4.orderList.splice(_this4.orderList.indexOf(order), 1);}).catch(function () {_this4.reload();});}, paymentTap: function paymentTap(order) {var _this5 = this;var that = this;if (!(order.combinationId > 0 || order.bargainId > 0 || order.seckillId > 0)) {that.setOfflinePayStatus(order.offlinePayStatus);}this.pay = true;this.toPay = function (type) {(0, _order2.payOrderHandle)(order.orderId, type, that.from).then(function () {var type = parseInt(_this5.$yroute.query.type) || 0;that.changeType(type);that.getOrderData();}).catch(function () {var type = parseInt(that.$yroute.query.type) || 0;that.changeType(type);that.getOrderData();});};}, toPay: function toPay() {} }, mounted: function mounted() {this.type = parseInt(this.$yroute.query.type) || 0;this.getOrderData();this.getOrderList();}, onReachBottom: function onReachBottom() {!this.loading && this.getOrderList();} };exports.default = _default;

 /***/ }),

@@ -107,7 +107,7 @@ var render = function() {

    _vm.e1 = function($event) {
      return _vm.$yrouter.push({
-        path: "/pages/order/GoodsReturn/index",
+        path: "/pages/order/Logistics/index",
        query: {
          id: _vm.orderInfo.orderId
        }
@@ -131,24 +131,6 @@ var render = function() {
        }
      })
    }
-
-    _vm.e4 = function($event) {
-      return _vm.$yrouter.push({
-        path: "/pages/order/Logistics/index",
-        query: {
-          id: _vm.orderInfo.orderId
-        }
-      })
-    }
-
-    _vm.e5 = function($event) {
-      return _vm.$yrouter.push({
-        path: "/pages/activity/GroupRule/index",
-        query: {
-          id: _vm.orderInfo.pinkId
-        }
-      })
-    }
  }
 }
 var recyclableRender = false
@@ -183,7 +165,17 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {

 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _regenerator = _interopRequireDefault(__webpack_require__(/*! ./node_modules/@babel/runtime/regenerator */ 59));
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _regenerator = _interopRequireDefault(__webpack_require__(/*! ./node_modules/@babel/runtime/regenerator */ 59));
+
+
+
+
+
+
+
+
+
+



@@ -797,7 +789,7 @@ var NAME = "OrderDetails";var _default =
        _this4.setOfflinePayStatus(_this4.orderInfo.offlinePayStatus);
      }).
      catch(function (err) {
-        wx.showToast({
+        uni.showToast({
          title: err.response.data.msg,
          icon: "none",
          duration: 2000 });
@@ -808,6 +800,7 @@ var NAME = "OrderDetails";var _default =
                that = this;_context.next = 3;return (
                  (0, _order2.payOrderHandle)(this.orderInfo.orderId, type, that.from));case 3:
                that.getDetail();case 4:case "end":return _context.stop();}}}, _callee, this);}));function toPay(_x) {return _toPay.apply(this, arguments);}return toPay;}() } };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))

 /***/ }),

@@ -133,7 +133,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {

 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;



@@ -501,7 +501,7 @@ _isWeixin = (0, _utils.isWeixin)();var _default =
        var data = res.data;
        if (data.status === "EXTEND_ORDER") {
          _this.$yrouter.replace({
-            path: "/pages/order/OrderDetails/main",
+            path: "/pages/order/OrderDetails/index",
            query: { id: data.result.orderId } });

        } else {
@@ -577,7 +577,7 @@ _isWeixin = (0, _utils.isWeixin)();var _default =
        }
      }

-      wx.showLoading({ title: "生成订单中" });
+      uni.showLoading({ title: "生成订单中" });
      (0, _order.createOrder)(this.orderGroupInfo.orderKey, {
        realName: this.contacts,
        phone: this.contactsTel,
@@ -594,7 +594,7 @@ _isWeixin = (0, _utils.isWeixin)();var _default =
        shippingType: parseInt(shipping_type) + 1 }).

      then(function (res) {
-        wx.hideLoading();
+        uni.hideLoading();
        var data = res.data;
        switch (data.status) {
          case "ORDER_EXIST":
@@ -603,24 +603,24 @@ _isWeixin = (0, _utils.isWeixin)();var _default =
          case "PAY_ERROR":
            _this3.$dialog.toast({ mes: res.msg });
            _this3.$yrouter.replace({
-              path: "/pages/order/OrderDetails/main",
+              path: "/pages/order/OrderDetails/index",
              query: { id: data.result.orderId } });

            break;
          case "SUCCESS":
-            wx.showToast({
+            uni.showToast({
              title: res.msg,
              icon: "none",
              duration: 2000 });

            _this3.$yrouter.replace({
-              path: "/pages/order/OrderDetails/main",
+              path: "/pages/order/OrderDetails/index",
              query: { id: data.result.orderId } });

            break;
          case "WECHAT_H5_PAY":
            _this3.$yrouter.replace({
-              path: "/pages/order/OrderDetails/main",
+              path: "/pages/order/OrderDetails/index",
              query: { id: data.result.orderId } });

            setTimeout(function () {
@@ -630,7 +630,7 @@ _isWeixin = (0, _utils.isWeixin)();var _default =
          case "WECHAT_PAY":
            (0, _wechat.weappPay)(data.result.jsConfig).then(function (res) {
              _this3.$yrouter.replace({
-                path: "/pages/order/OrderDetails/main",
+                path: "/pages/order/OrderDetails/index",
                query: { id: data.result.orderId } });

            });
@@ -638,16 +638,17 @@ _isWeixin = (0, _utils.isWeixin)();var _default =
          // 下面为原先微信支付方式，
          // pay(data.result.jsConfig).finally(() => {
          //   this.$yrouter.replace({
-          //     path: "/pages/order/OrderDetails/main" ,query: { id: data.result.orderId}
+          //     path: "/pages/order/OrderDetails/index" ,query: { id: data.result.orderId}
          //   });
          // });
        }
      }).
      catch(function (err) {
-        wx.hideLoading();
+        uni.hideLoading();
        _this3.$dialog.error(err.response.data.msg || "创建订单失败");
      });
    } } };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))

 /***/ }),

@@ -1,4 +1,3 @@
 {
-  "navigationBarTitleText": "PaymentStatus",
-  "usingComponents": {}
+  "navigationBarTitleText": "PaymentStatus"
 }
@@ -98,26 +98,6 @@ var render = function() {
  var _vm = this
  var _h = _vm.$createElement
  var _c = _vm._self._c || _h
-  if (!_vm._isMounted) {
-    _vm.e0 = function($event) {
-      return _vm.$yrouter.push({
-        path: "/pages/order/OrderDetails/index",
-        query: {
-          id: _vm.order.orderId
-        }
-      })
-    }
-
-    _vm.e1 = function($event) {
-      $event.stopPropagation()
-      return _vm.$yrouter.push({
-        path: "/pages/shop/GoodsCon/index",
-        query: {
-          id: _vm.cart.productInfo.id
-        }
-      })
-    }
-  }
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -189,12 +169,6 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =



-
-
-
-
-
-



@@ -246,13 +220,14 @@ var _order = __webpack_require__(/*! @/api/order */ 352); //
 //
 //
 //
-//
-//
-//
-//
-//
-//
-var Loading = function Loading() {return __webpack_require__.e(/*! import() | components/Loading */ "components/Loading").then(__webpack_require__.bind(null, /*! @/components/Loading */ 494));};var _default = { name: "ReturnList", components: { Loading: Loading }, data: function data() {return { orderList: [], page: 1, limit: 20, loading: false, loaded: false };}, methods: { getOrderList: function getOrderList() {var _this = this;var page = this.page,limit = this.limit;if (this.loading || this.loaded) return;this.loading = true;(0, _order.getOrderList)({ page: page, limit: limit, type: -3 }).then(function (res) {_this.orderList = _this.orderList.concat(res.data);_this.loading = false;_this.loaded = res.data.length < limit;_this.page++;});} }, mounted: function mounted() {this.getOrderList();}, onReachBottom: function onReachBottom() {!this.loading && this.getOrderList();} };exports.default = _default;
+var Loading = function Loading() {return __webpack_require__.e(/*! import() | components/Loading */ "components/Loading").then(__webpack_require__.bind(null, /*! @/components/Loading */ 494));};var _default = { name: "ReturnList", components: { Loading: Loading }, data: function data() {return { orderList: [], page: 1, limit: 20, loading: false, loaded: false };}, methods: { goGoodsCon: function goGoodsCon(cart) {this.$yrouter.push({ path: "/pages/shop/GoodsCon/index", query: { id: cart.productInfo.id } });}, goOrderDetails: function goOrderDetails(order) {this.$yrouter.push({ path: "/pages/order/OrderDetails/index", query: { id: order.orderId } });}, getOrderList: function getOrderList() {var _this = this;var page = this.page,limit = this.limit;if (this.loading || this.loaded) return;this.loading = true;(0, _order.getOrderList)({ page: page, limit: limit, type: -3 }).then(function (res) {_this.orderList = _this.orderList.concat(res.data);_this.loading = false;_this.loaded = res.data.length < limit;_this.page++;});} },
+
+  mounted: function mounted() {
+    this.getOrderList();
+  },
+  onReachBottom: function onReachBottom() {
+    !this.loading && this.getOrderList();
+  } };exports.default = _default;

 /***/ })

@@ -1 +1 @@
-<view data-ref="container" class="return-list _div vue-ref"><block wx:for="{{orderList}}" wx:for-item="order" wx:for-index="orderListIndex" wx:key="orderListIndex"><view class="goodWrapper _div"><block wx:if="{{order._status._type===-1}}"><view class="iconfont icon-tuikuanzhong powder _div"></view></block><block wx:if="{{order._status._type===-2}}"><view class="iconfont icon-yituikuan _div"></view></block><view class="orderNum _div">{{"订单号："+order.orderId}}</view><block wx:for="{{order.cartInfo}}" wx:for-item="cart" wx:for-index="cartInfoIndex" wx:key="cartInfoIndex"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="item acea-row row-between-wrapper _div" bindtap="__e"><view class="pictrue _div"><image class="image _img" src="{{cart.productInfo.image}}" data-event-opts="{{[['tap',[['e1',['$event']]]]]}}" catchtap="__e"></image></view><view class="text _div"><view class="acea-row row-between-wrapper _div"><view class="name line1 _div">{{cart.productInfo.storeName}}</view><view class="num _div">{{"x "+cart.cartNum}}</view></view><block wx:if="{{cart.productInfo.attrInfo}}"><view class="attr line1 _div">{{cart.productInfo.attrInfo.suk}}</view></block><block wx:else><view class="attr line1 _div">{{cart.productInfo.storeName}}</view></block><view class="money _div">{{"￥"+cart.productInfo.price}}</view></view></view></block><view class="totalSum _div">{{'共'+(order.cartInfo.length||0)+'件商品，总金额'}}<label class="font-color-red price _span">{{"￥"+order.payPrice}}</label></view></view></block><block wx:if="{{orderList.length===0&&page>1}}"><view class="noCart _div"><view class="pictrue _div"><image src="{{$VUE_APP_RESOURCES_URL+'/images/noOrder.png'}}" class="_img"></image></view></view></block><loading vue-id="2035e57b-1" loaded="{{loaded}}" loading="{{loading}}" bind:__l="__l"></loading></view>
+<view data-ref="container" class="return-list _div vue-ref"><block wx:for="{{orderList}}" wx:for-item="order" wx:for-index="orderListIndex" wx:key="orderListIndex"><view class="goodWrapper _div"><block wx:if="{{order._status._type===-1}}"><view class="iconfont icon-tuikuanzhong powder _div"></view></block><block wx:if="{{order._status._type===-2}}"><view class="iconfont icon-yituikuan _div"></view></block><view class="orderNum _div">{{"订单号："+order.orderId}}</view><block wx:for="{{order.cartInfo}}" wx:for-item="cart" wx:for-index="cartInfoIndex" wx:key="cartInfoIndex"><view data-event-opts="{{[['tap',[['goOrderDetails',['$0'],[[['orderList','',orderListIndex]]]]]]]}}" class="item acea-row row-between-wrapper _div" bindtap="__e"><view class="pictrue _div"><image class="image _img" src="{{cart.productInfo.image}}" data-event-opts="{{[['tap',[['goGoodsCon',['$0'],[[['orderList','',orderListIndex],['cartInfo','',cartInfoIndex]]]]]]]}}" catchtap="__e"></image></view><view class="text _div"><view class="acea-row row-between-wrapper _div"><view class="name line1 _div">{{cart.productInfo.storeName}}</view><view class="num _div">{{"x "+cart.cartNum}}</view></view><block wx:if="{{cart.productInfo.attrInfo}}"><view class="attr line1 _div">{{cart.productInfo.attrInfo.suk}}</view></block><block wx:else><view class="attr line1 _div">{{cart.productInfo.storeName}}</view></block><view class="money _div">{{"￥"+cart.productInfo.price}}</view></view></view></block><view class="totalSum _div">{{'共'+(order.cartInfo.length||0)+'件商品，总金额'}}<label class="font-color-red price _span">{{"￥"+order.payPrice}}</label></view></view></block><block wx:if="{{orderList.length===0&&page>1}}"><view class="noCart _div"><view class="pictrue _div"><image src="{{$VUE_APP_RESOURCES_URL+'/images/noOrder.png'}}" class="_img"></image></view></view></block><loading vue-id="2035e57b-1" loaded="{{loaded}}" loading="{{loading}}" bind:__l="__l"></loading></view>
@@ -98,16 +98,6 @@ var render = function() {
  var _vm = this
  var _h = _vm.$createElement
  var _c = _vm._self._c || _h
-  if (!_vm._isMounted) {
-    _vm.e0 = function($event) {
-      return _vm.$yrouter.push({
-        path: "/pages/orderAdmin/GoodsDeliver/index",
-        query: {
-          id: _vm.orderInfo.orderId
-        }
-      })
-    }
-  }
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -141,11 +131,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {

 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _regenerator = _interopRequireDefault(__webpack_require__(/*! ./node_modules/@babel/runtime/regenerator */ 59));
-
-
-
-
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _regenerator = _interopRequireDefault(__webpack_require__(/*! ./node_modules/@babel/runtime/regenerator */ 59));



@@ -341,6 +327,12 @@ var _utils = __webpack_require__(/*! @/utils */ 18);function _interopRequireDefa
    this.getIndex();
  },
  methods: {
+    goGoodsDeliver: function goGoodsDeliver(orderInfo) {
+      this.$yrouter.push({
+        path: "/pages/orderAdmin/GoodsDeliver/index",
+        query: { id: orderInfo.orderId } });
+
+    },
    copyClipboard: _utils.copyClipboard,
    more: function more() {
      this.order = !this.order;
@@ -362,7 +354,7 @@ var _utils = __webpack_require__(/*! @/utils */ 18);function _interopRequireDefa
        that.payType = res.data._status._payType;
      },
      function (err) {
-        wx.showToast({
+        uni.showToast({
          title: res.msg,
          icon: "none",
          duration: 2000 });
@@ -392,7 +384,7 @@ var _utils = __webpack_require__(/*! @/utils */ 18);function _interopRequireDefa
                (0, _admin.setAdminOrderPrice)(data).then(
                function () {
                  that.change = false;
-                  wx.showToast({
+                  uni.showToast({
                    title: "改价成功",
                    icon: "success",
                    duration: 2000 });
@@ -401,7 +393,7 @@ var _utils = __webpack_require__(/*! @/utils */ 18);function _interopRequireDefa
                },
                function () {
                  that.change = false;
-                  wx.showToast({
+                  uni.showToast({
                    title: "改价失败",
                    icon: "none",
                    duration: 2000 });
@@ -424,7 +416,7 @@ var _utils = __webpack_require__(/*! @/utils */ 18);function _interopRequireDefa
                (0, _admin.setOrderRefund)(data).then(
                function (res) {
                  that.change = false;
-                  wx.showToast({
+                  uni.showToast({
                    title: res.msg,
                    icon: "none",
                    duration: 2000 });
@@ -433,7 +425,7 @@ var _utils = __webpack_require__(/*! @/utils */ 18);function _interopRequireDefa
                },
                function (err) {
                  that.change = false;
-                  wx.showToast({
+                  uni.showToast({
                    title: res.msg,
                    icon: "none",
                    duration: 2000 });
@@ -453,7 +445,7 @@ var _utils = __webpack_require__(/*! @/utils */ 18);function _interopRequireDefa
                (0, _admin.setAdminOrderRemark)(data).then(
                function (res) {
                  that.change = false;
-                  wx.showToast({
+                  uni.showToast({
                    title: res.msg,
                    icon: "none",
                    duration: 2000 });
@@ -462,7 +454,7 @@ var _utils = __webpack_require__(/*! @/utils */ 18);function _interopRequireDefa
                },
                function (err) {
                  that.change = false;
-                  wx.showToast({
+                  uni.showToast({
                    title: res.msg,
                    icon: "none",
                    duration: 2000 });
@@ -474,7 +466,7 @@ var _utils = __webpack_require__(/*! @/utils */ 18);function _interopRequireDefa
    offlinePay: function offlinePay() {var _this = this;
      (0, _admin.setOfflinePay)({ order_id: this.orderInfo.order_id }).then(
      function (res) {
-        wx.showToast({
+        uni.showToast({
          title: res.msg,
          icon: "none",
          duration: 2000 });
@@ -482,7 +474,7 @@ var _utils = __webpack_require__(/*! @/utils */ 18);function _interopRequireDefa
        _this.getIndex();
      },
      function (err) {
-        wx.showToast({
+        uni.showToast({
          title: err.msg,
          icon: "none",
          duration: 2000 });
@@ -490,6 +482,7 @@ var _utils = __webpack_require__(/*! @/utils */ 18);function _interopRequireDefa
      });

    } } };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))

 /***/ })

--- a/Show More
+++ b/Show More