update

manifest.json

@@ -2,8 +2,8 @@
     "name" : "驿佳",
     "appid" : "__UNI__F870657",
     "description" : "",
-    "versionName" : "1.0.32",
+    "versionName" : "1.0.33",
-    "versionCode" : 1032,
+    "versionCode" : 1033,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/homeFn/payfor/index.vue

@@ -179,10 +179,12 @@ export default {
       barcodeImg: "", // 条码转的图片路径
       qrcodeImg: "", // 二维码图片转的路径
       isLoading: false,
+      WXProfile: "",
+      user: {}
     };
   },
   computed: {
-    ...mapGetters(["user"]),
+    // ...mapGetters(["user"]),
 
     barcodeHeight() {
       return (120 / 750) * uni.getSystemInfoSync().windowWidth;
@@ -198,6 +200,63 @@ export default {
     UniPopup,
   },
   methods: {
+
+    // 拿用户最新的user信息
+    async handleGetUserInfo() {
+      let _this = this;
+      let vuex = uni.getStorageSync('vuex')
+      let vuexObj = {}
+      if (vuex) {
+        vuexObj = JSON.parse(vuex)
+        console.log('vuexObjvuexObjvuexObj', vuexObj);
+      }
+
+      const data = await _this.$api
+        .getCoop({
+          action_type: "GetMembershipInfo",
+          // WechatUserId: _this.user.WechatUserId,
+          WechatUserId: vuexObj.user.WechatUserId,
+        })
+      // .then(function (data) {
+      if (data.ResultCode === "100") {
+        let _data = data;
+        console.log("_data", _data);
+        _this.user.MEMBERSHIP_ID = _data.Data.MEMBERSHIP_ID || "";
+        _this.user.MEMBERSHIP_NAME = _data.Data.MEMBERSHIP_NAME || "";
+        _this.user.MEMBERSHIP_LEVEL_TEXT =
+          _data.Data.MEMBERSHIP_LEVEL_TEXT || "";
+        _this.user.COUPON_COUNT = _data.Data.COUPON_COUNT || "";
+        _this.user.PENDORDER_COUNT = _data.Data.PENDORDER_COUNT || "";
+        _this.user.RESERVATION_COUNT = _data.Data.RESERVATION_COUNT || "";
+        _this.user.ACCOUNT_BALANCE = _data.Data.ACCOUNT_BALANCE || "";
+        _this.user.ISPLUS = _data.Data.ISPLUS || "";
+        _this.user.INDUSTRY_MEMBERSHIP_ID =
+          _data.Data.INDUSTRY_MEMBERSHIP_ID || "";
+        _this.user.MEMBERSHIP_TYPE = _data.Data.MEMBERSHIP_TYPE || "";
+        _this.user.MEMBERSHIP_LEVEL = _data.Data.MEMBERSHIP_LEVEL || "";
+        _this.user.InviteCode = _data.Data.InviteCode || "";
+        _this.user.MEMBERSHIP_POINT = _data.Data.MEMBERSHIP_POINT || "";
+        _this.user.MEMBERSHIP_MOBILEPHONE =
+          _data.Data.MEMBERSHIP_MOBILEPHONE || "";
+        _this.WXProfile = _data.Data.MEMBERSHIP_HEADIMAGEURL;
+        // _this.setUser(user);
+        _this.$store.commit("setUser", _this.user);
+
+        if (_data.Data.MEMBERSHIP_HEADIMAGEURL) {
+          _this.displayedAvatarUrl = _data.Data.MEMBERSHIP_HEADIMAGEURL + '?t=' + Date.now();
+        } else {
+          _this.displayedAvatarUrl = ''; // 或者设置为默认头像 URL
+        }
+        console.log('_this.displayedAvatarUrl_this.displayedAvatarUrl_this.displayedAvatarUrl', _this.displayedAvatarUrl);
+        _this.$forceUpdate()
+        _this.showAvatar = true
+      } else {
+        // _this.setUser({});
+        _this.$store.commit("setUser", user);
+      }
+      // });
+    },
+
     // 快捷支付
     handleRealGoPay(payType) {
       uni.showToast({
@@ -343,6 +402,8 @@ export default {
     //   })
     // },
     getCode() {
+      console.log('1111');
+
       let _this = this;
 
       this.isLoading = true;
@@ -419,7 +480,7 @@ export default {
     //   _this.payMent()
     // }, 5000)
   },
-  onLoad(option) {
+  async onLoad(option) {
     let type = uni.getStorageSync("loginType");
     this.loginType = type;
     console.log("option", option);
@@ -429,6 +490,10 @@ export default {
       this.cid = "";
       this.choeseCouponIndex = null;
     }
+
+    await this.handleGetUserInfo()
+
+
     this.getCouponLsit();
     this.getCode();
     this.$utils.addUserBehaviorNew();

pages/newMap/index/index.vue

@@ -41,7 +41,7 @@
         :style="{ height: isMoveUp ? `calc(100vh - 130px)` : 'calc(60vh - 74px)' }">
         <div style="height: 100%">
           <!-- <charge-box :serviceAreaList="chaegeBoxList" :pageType="'newMap'" :comeForm="comeForm" :noLoading="true" /> -->
-          <ChargeBoxStyle :dataList="serviceList" :pageType="'newMap'" :comeForm="comeForm" />
+          <ChargeBoxStyle :dataList="serviceList" :pageType="'newMap'" :comeForm="comeForm" :noChargeDetail="loginType !== 'min'"/>
         </div>
       </scroll-view>
     </div>

pages/orders/orderdetail/index.vue

@@ -463,14 +463,17 @@ export default {
     // 获取订单状态
     getOrderType() {
       let _this = this;
+      console.log('fkdsakfsldfj');
+
       _this.$api
         .getCoop({
           action_type: "GetOrderDetail",
           salebillId: _this.orderInternal,
           saleBillChildId: _this.sellchildid ? _this.sellchildid : "",
+          WeChat_AppId: "wx4c497eddcec4a0e7"
         })
         .then((res) => {
-          // console.log(res)
+          console.log('fdsjsaidojoi', res)
           if (res.ResultCode === "100") {
             let _data = res.Data;
             console.log("订单详情", _data);
@@ -817,14 +820,14 @@ export default {
   onLoad(option) {
     console.log("option", option);
 
-    uni.setNavigationBarColor({
+    // uni.setNavigationBarColor({
-      frontColor: "#ffffff",
+    //   frontColor: "#ffffff",
-      backgroundColor: "#2fa4ff",
+    //   backgroundColor: "#2fa4ff",
-      animation: {
+    //   animation: {
-        duration: 30,
+    //     duration: 30,
-        timingFunc: "linear",
+    //     timingFunc: "linear",
-      },
+    //   },
-    });
+    // });
     if (option.type) {
       this.pageMsg.type = 1;
     }
@@ -837,7 +840,11 @@ export default {
 
     this.orderNumber = option.orderNumber;
     this.orderInternal = option.orderInternal;
+
+
     this.getOrderType();
+
+
     if (this.status < 3000) {
       this.pollingTimer = setInterval(() => {
         this.getOrderType();

pages/shopPages/shop/index.vue

@@ -985,6 +985,7 @@ export default {
         console.log("o", o);
         // eslint-disable-next-line eqeqeq
         uni.setStorageSync('noShopCar', null);
+        // this.shopCart = []
 
         if (this.tableNum !== 0) {
           uni.navigateTo({
@@ -1160,13 +1161,13 @@ export default {
       this.goodsH = goodsHeight;
     }
 
-    let noShopCar = uni.getStorageSync('noShopCar');
+    // let noShopCar = uni.getStorageSync('noShopCar');
 
-    if (noShopCar) {
+    // if (noShopCar) {
-      this.shopCart = JSON.parse(noShopCar)
+    //   this.shopCart = JSON.parse(noShopCar)
-      console.log('this.shopCartthis.shopCart', this.shopCart);
+    //   console.log('this.shopCartthis.shopCart', this.shopCart);
-      this._resetTotalNum();
+    //   this._resetTotalNum();
-    }
+    // }
 
 
     this.$utils.addUserBehaviorNew();
@@ -1176,7 +1177,7 @@ export default {
   },
   onUnload() {
     // 没有下单的购物车数据
-    uni.setStorageSync('noShopCar', this.shopCart && this.shopCart.length > 0 ? JSON.stringify(this.shopCart) : null);
+    // uni.setStorageSync('noShopCar', this.shopCart && this.shopCart.length > 0 ? JSON.stringify(this.shopCart) : null);
 
     this.$store.commit("couponPrice", "");
     this.$store.commit("orderRemark", "");

pages/userCenter/index.vue

@@ -139,7 +139,8 @@
           <view class="orderItem" v-for="(item, index) in orderList" :key="index" @click="handleGoOrder(item)">
             <image class="orderIcon" :src="item.url" />
             <text class="orderText">{{ item.label || "" }}</text>
-            <text class="orderCount" v-if="item.orderCount > 0">{{ item.orderCount }}</text>
+            <text class="orderCount" v-if="item.orderCount > 0 && user && user.MEMBERSHIP_ID">{{ item.orderCount
+            }}</text>
           </view>
         </view>
       </view>
@@ -1231,37 +1232,60 @@ export default {
       };
       const res = await this.$api.postCoop(req);
       console.log('resresresresresres', res);
-      let list = res.Data.List
-      // 待付款
-      let obligation = []
-      // 待制作
-      let toBeProduced = []
-      // 待取餐
-      let waitingHave = []
 
-      if (list && list.length > 0) {
+      if (res.ResultCode === "100") {
-        list.forEach((item) => {
+        let list = res.Data.List
-          if (item.SALEBILL_STATE === 1005) {
+        // 待付款
-            obligation.push(item)
+        let obligation = []
-          } else if (item.SALEBILL_STATE === 1010) {
+        // 待制作
-            toBeProduced.push(item)
+        let toBeProduced = []
-          } else if (item.SALEBILL_STATE === 2000) {
+        // 待取餐
-            waitingHave.push(item)
+        let waitingHave = []
+
+        if (list && list.length > 0) {
+          list.forEach((item) => {
+            if (item.SALEBILL_STATE === 1005) {
+              obligation.push(item)
+            } else if (item.SALEBILL_STATE === 1010) {
+              toBeProduced.push(item)
+            } else if (item.SALEBILL_STATE === 2000) {
+              waitingHave.push(item)
+            }
+          })
+        }
+
+        let orderList = JSON.parse(JSON.stringify(this.orderList))
+        orderList.forEach((item) => {
+          if (item.value === 1) {
+            item.orderCount = obligation && obligation.length > 0 ? obligation.length : 0
+          } else if (item.value === 2) {
+            item.orderCount = toBeProduced && toBeProduced.length > 0 ? toBeProduced.length : 0
+          } else if (item.value === 3) {
+            item.orderCount = waitingHave && waitingHave.length > 0 ? waitingHave.length : 0
           }
         })
-      }
 
-      let orderList = JSON.parse(JSON.stringify(this.orderList))
+        console.log('obligation', obligation);
-      orderList.forEach((item) => {
+
-        if (item.value === 1) {
+        this.orderList = orderList
-          item.orderCount = obligation && obligation.length > 0 ? obligation.length : 0
+      } else {
-        } else if (item.value === 2) {
+        let orderList = JSON.parse(JSON.stringify(this.orderList))
-          item.orderCount = toBeProduced && toBeProduced.length > 0 ? toBeProduced.length : 0
+        orderList.forEach((item) => {
-        } else if (item.value === 3) {
+          if (item.value === 1) {
-          item.orderCount = waitingHave && waitingHave.length > 0 ? waitingHave.length : 0
+            item.orderCount = 0
-        }
+          } else if (item.value === 2) {
-      })
+            item.orderCount = 0
-      this.orderList = orderList
+          } else if (item.value === 3) {
+            item.orderCount = 0
+          }
+        })
+
+        console.log('orderListorderListorderList2', orderList);
+
+        this.orderList = orderList
+      }
+      this.$forceUpdate()
+
     }
   },
 };

unpackage/dist/dev/mp-weixin/components/keyboard.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
+  "usingComponents": {},
-  "usingComponents": {}
+  "component": true
 }

unpackage/dist/dev/mp-weixin/pages/homeFn/payfor/index.js

@@ -162,10 +162,165 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ 11));
+var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 30));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 32));
 var _vuex = __webpack_require__(/*! vuex */ 33);
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+//
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+// let barcode = require('../../common/js/JsBarcode.all.js')
 var UniPopup = function UniPopup() {
   __webpack_require__.e(/*! require.ensure | uni_modules/uni-popup/components/uni-popup/uni-popup */ "uni_modules/uni-popup/components/uni-popup/uni-popup").then((function () {
     return resolve(__webpack_require__(/*! @/uni_modules/uni-popup/components/uni-popup/uni-popup.vue */ 622));
@@ -193,10 +348,13 @@ var _default = {
       // 条码转的图片路径
       qrcodeImg: "",
       // 二维码图片转的路径
-      isLoading: false
+      isLoading: false,
+      WXProfile: "",
+      user: {}
     };
   },
-  computed: _objectSpread(_objectSpread({}, (0, _vuex.mapGetters)(["user"])), {}, {
+  computed: {
+    // ...mapGetters(["user"]),
     barcodeHeight: function barcodeHeight() {
       return 120 / 750 * uni.getSystemInfoSync().windowWidth;
     },
@@ -206,11 +364,78 @@ var _default = {
     qrcodeHeight: function qrcodeHeight() {
       return 360 / 750 * uni.getSystemInfoSync().windowWidth;
     }
-  }),
+  },
   components: {
     UniPopup: UniPopup
   },
   methods: {
+    // 拿用户最新的user信息
+    handleGetUserInfo: function handleGetUserInfo() {
+      var _this2 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        var _this, vuex, vuexObj, data, _data;
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _this = _this2;
+                vuex = uni.getStorageSync('vuex');
+                vuexObj = {};
+                if (vuex) {
+                  vuexObj = JSON.parse(vuex);
+                  console.log('vuexObjvuexObjvuexObj', vuexObj);
+                }
+                _context.next = 6;
+                return _this.$api.getCoop({
+                  action_type: "GetMembershipInfo",
+                  // WechatUserId: _this.user.WechatUserId,
+                  WechatUserId: vuexObj.user.WechatUserId
+                });
+              case 6:
+                data = _context.sent;
+                // .then(function (data) {
+                if (data.ResultCode === "100") {
+                  _data = data;
+                  console.log("_data", _data);
+                  _this.user.MEMBERSHIP_ID = _data.Data.MEMBERSHIP_ID || "";
+                  _this.user.MEMBERSHIP_NAME = _data.Data.MEMBERSHIP_NAME || "";
+                  _this.user.MEMBERSHIP_LEVEL_TEXT = _data.Data.MEMBERSHIP_LEVEL_TEXT || "";
+                  _this.user.COUPON_COUNT = _data.Data.COUPON_COUNT || "";
+                  _this.user.PENDORDER_COUNT = _data.Data.PENDORDER_COUNT || "";
+                  _this.user.RESERVATION_COUNT = _data.Data.RESERVATION_COUNT || "";
+                  _this.user.ACCOUNT_BALANCE = _data.Data.ACCOUNT_BALANCE || "";
+                  _this.user.ISPLUS = _data.Data.ISPLUS || "";
+                  _this.user.INDUSTRY_MEMBERSHIP_ID = _data.Data.INDUSTRY_MEMBERSHIP_ID || "";
+                  _this.user.MEMBERSHIP_TYPE = _data.Data.MEMBERSHIP_TYPE || "";
+                  _this.user.MEMBERSHIP_LEVEL = _data.Data.MEMBERSHIP_LEVEL || "";
+                  _this.user.InviteCode = _data.Data.InviteCode || "";
+                  _this.user.MEMBERSHIP_POINT = _data.Data.MEMBERSHIP_POINT || "";
+                  _this.user.MEMBERSHIP_MOBILEPHONE = _data.Data.MEMBERSHIP_MOBILEPHONE || "";
+                  _this.WXProfile = _data.Data.MEMBERSHIP_HEADIMAGEURL;
+                  // _this.setUser(user);
+                  _this.$store.commit("setUser", _this.user);
+                  if (_data.Data.MEMBERSHIP_HEADIMAGEURL) {
+                    _this.displayedAvatarUrl = _data.Data.MEMBERSHIP_HEADIMAGEURL + '?t=' + Date.now();
+                  } else {
+                    _this.displayedAvatarUrl = ''; // 或者设置为默认头像 URL
+                  }
+
+                  console.log('_this.displayedAvatarUrl_this.displayedAvatarUrl_this.displayedAvatarUrl', _this.displayedAvatarUrl);
+                  _this.$forceUpdate();
+                  _this.showAvatar = true;
+                } else {
+                  // _this.setUser({});
+                  _this.$store.commit("setUser", user);
+                }
+                // });
+              case 8:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }))();
+    },
     // 快捷支付
     handleRealGoPay: function handleRealGoPay(payType) {
       uni.showToast({
@@ -337,6 +562,7 @@ var _default = {
     //   })
     // },
     getCode: function getCode() {
+      console.log('1111');
       var _this = this;
       this.isLoading = true;
       if (!_this.user.MEMBERSHIP_ID) {
@@ -359,7 +585,7 @@ var _default = {
       });
     },
     getCouponLsit: function getCouponLsit() {
-      var _this2 = this;
+      var _this3 = this;
       var _this = this;
       this.isLoading = true;
       this.$api.$get("/WeChat/GetMemberCouponList", {
@@ -383,7 +609,7 @@ var _default = {
 
           console.log('_this.choeseCouponIndex_this.choeseCouponIndex_this.choeseCouponIndex_this.choeseCouponIndex', _this.choeseCouponIndex);
         }
-        _this2.isLoading = false;
+        _this3.isLoading = false;
       });
     },
     // payEnd () {
@@ -408,18 +634,35 @@ var _default = {
     // }, 5000)
   },
   onLoad: function onLoad(option) {
-    var type = uni.getStorageSync("loginType");
+    var _this4 = this;
-    this.loginType = type;
+    return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-    console.log("option", option);
+      var type;
-    if (option.cid) {
+      return _regenerator.default.wrap(function _callee2$(_context2) {
-      this.cid = option.cid;
+        while (1) {
-    } else {
+          switch (_context2.prev = _context2.next) {
-      this.cid = "";
+            case 0:
-      this.choeseCouponIndex = null;
+              type = uni.getStorageSync("loginType");
-    }
+              _this4.loginType = type;
-    this.getCouponLsit();
+              console.log("option", option);
-    this.getCode();
+              if (option.cid) {
-    this.$utils.addUserBehaviorNew();
+                _this4.cid = option.cid;
+              } else {
+                _this4.cid = "";
+                _this4.choeseCouponIndex = null;
+              }
+              _context2.next = 6;
+              return _this4.handleGetUserInfo();
+            case 6:
+              _this4.getCouponLsit();
+              _this4.getCode();
+              _this4.$utils.addUserBehaviorNew();
+            case 9:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2);
+    }))();
   },
   onHide: function onHide() {
     clearInterval(this.timer);

unpackage/dist/dev/mp-weixin/pages/newMap/index/index.wxml

@@ -1 +1 @@
-<view class="main _div data-v-55aaaa9b"><block wx:if="{{isShowMap}}"><view class="mapBox data-v-55aaaa9b"><map class="map data-v-55aaaa9b" id="myMap" longitude="{{longitude}}" latitude="{{latitude}}" markers="{{markers}}" show-location="{{true}}"></map></view></block><view class="list _div data-v-55aaaa9b" style="{{'transform:'+(isMoveUp?'translateY(calc(-40vh + 40px))':'')+';'+('background:'+('#EEF1F9')+';')}}"><view class="top _div data-v-55aaaa9b"><view class="topImg _div data-v-55aaaa9b"><image class="packUp data-v-55aaaa9b" style="{{'transform:'+(isMoveUp?'rotate(180deg)':'')+';'}}" src="https://eshangtech.com/ShopICO/ahyd-BID/service/packUp.svg" data-event-opts="{{[['tap',[['handleClickShowMoveUp',['$event']]]]]}}" bindtap="__e"></image></view><view class="search _div data-v-55aaaa9b"><view class="right _div data-v-55aaaa9b"><input class="searchText data-v-55aaaa9b" confirm-type="search" placeholder="搜索服务区" placeholder-style="font-size: 14px;color: #A69E9F;" data-event-opts="{{[['confirm',[['handleSearch',['$event']]]],['input',[['__set_model',['','searchText','$event',[]]]]]]}}" value="{{searchText}}" bindconfirm="__e" bindinput="__e"/></view></view></view><scroll-view class="serviceList data-v-55aaaa9b" style="{{'height:'+(isMoveUp?'calc(100vh - 130px)':'calc(60vh - 74px)')+';'}}" scroll-y="{{true}}" data-event-opts="{{[['scrolltolower',[['handleScrollBottom',['$event']]]]]}}" bindscrolltolower="__e"><view style="height:100%;" class="_div data-v-55aaaa9b"><charge-box-style vue-id="5fab29cb-1" dataList="{{serviceList}}" pageType="newMap" comeForm="{{comeForm}}" class="data-v-55aaaa9b" bind:__l="__l"></charge-box-style></view></scroll-view></view><block wx:if="{{isLoading}}"><custom-loading vue-id="5fab29cb-2" visible="{{isLoading}}" data-event-opts="{{[['^updateVisible',[['e0']]]]}}" bind:updateVisible="__e" class="data-v-55aaaa9b" bind:__l="__l"></custom-loading></block></view>
+<view class="main _div data-v-55aaaa9b"><block wx:if="{{isShowMap}}"><view class="mapBox data-v-55aaaa9b"><map class="map data-v-55aaaa9b" id="myMap" longitude="{{longitude}}" latitude="{{latitude}}" markers="{{markers}}" show-location="{{true}}"></map></view></block><view class="list _div data-v-55aaaa9b" style="{{'transform:'+(isMoveUp?'translateY(calc(-40vh + 40px))':'')+';'+('background:'+('#EEF1F9')+';')}}"><view class="top _div data-v-55aaaa9b"><view class="topImg _div data-v-55aaaa9b"><image class="packUp data-v-55aaaa9b" style="{{'transform:'+(isMoveUp?'rotate(180deg)':'')+';'}}" src="https://eshangtech.com/ShopICO/ahyd-BID/service/packUp.svg" data-event-opts="{{[['tap',[['handleClickShowMoveUp',['$event']]]]]}}" bindtap="__e"></image></view><view class="search _div data-v-55aaaa9b"><view class="right _div data-v-55aaaa9b"><input class="searchText data-v-55aaaa9b" confirm-type="search" placeholder="搜索服务区" placeholder-style="font-size: 14px;color: #A69E9F;" data-event-opts="{{[['confirm',[['handleSearch',['$event']]]],['input',[['__set_model',['','searchText','$event',[]]]]]]}}" value="{{searchText}}" bindconfirm="__e" bindinput="__e"/></view></view></view><scroll-view class="serviceList data-v-55aaaa9b" style="{{'height:'+(isMoveUp?'calc(100vh - 130px)':'calc(60vh - 74px)')+';'}}" scroll-y="{{true}}" data-event-opts="{{[['scrolltolower',[['handleScrollBottom',['$event']]]]]}}" bindscrolltolower="__e"><view style="height:100%;" class="_div data-v-55aaaa9b"><charge-box-style vue-id="5fab29cb-1" dataList="{{serviceList}}" pageType="newMap" comeForm="{{comeForm}}" noChargeDetail="{{loginType!=='min'}}" class="data-v-55aaaa9b" bind:__l="__l"></charge-box-style></view></scroll-view></view><block wx:if="{{isLoading}}"><custom-loading vue-id="5fab29cb-2" visible="{{isLoading}}" data-event-opts="{{[['^updateVisible',[['e0']]]]}}" bind:updateVisible="__e" class="data-v-55aaaa9b" bind:__l="__l"></custom-loading></block></view>

unpackage/dist/dev/mp-weixin/pages/orders/orderdetail/index.js

@@ -474,12 +474,14 @@ var _default = {
     // 获取订单状态
     getOrderType: function getOrderType() {
       var _this = this;
+      console.log('fkdsakfsldfj');
       _this.$api.getCoop({
         action_type: "GetOrderDetail",
         salebillId: _this.orderInternal,
-        saleBillChildId: _this.sellchildid ? _this.sellchildid : ""
+        saleBillChildId: _this.sellchildid ? _this.sellchildid : "",
+        WeChat_AppId: "wx4c497eddcec4a0e7"
       }).then(function (res) {
-        // console.log(res)
+        console.log('fdsjsaidojoi', res);
         if (res.ResultCode === "100") {
           var _data = res.Data;
           console.log("订单详情", _data);
@@ -831,14 +833,15 @@ var _default = {
   onLoad: function onLoad(option) {
     var _this4 = this;
     console.log("option", option);
-    uni.setNavigationBarColor({
+
-      frontColor: "#ffffff",
+    // uni.setNavigationBarColor({
-      backgroundColor: "#2fa4ff",
+    //   frontColor: "#ffffff",
-      animation: {
+    //   backgroundColor: "#2fa4ff",
-        duration: 30,
+    //   animation: {
-        timingFunc: "linear"
+    //     duration: 30,
-      }
+    //     timingFunc: "linear",
-    });
+    //   },
+    // });
     if (option.type) {
       this.pageMsg.type = 1;
     }

unpackage/dist/dev/mp-weixin/pages/shopPages/shop/index.js

@@ -720,6 +720,8 @@ var _default = {
         console.log("o", o);
         // eslint-disable-next-line eqeqeq
         uni.setStorageSync('noShopCar', null);
+        // this.shopCart = []
+
         if (this.tableNum !== 0) {
           uni.navigateTo({
             url: "/pages/shopPages/settlement/index?tableNum=".concat(this.tableNum, "&id=").concat(id, "&sid=").concat(this.stroreId, "&province=").concat(this.merchatsMsg.PROVINCE_CODE, "&SERVERPART_ID=").concat(this.merchatsMsg.SERVERPART_ID)
@@ -880,7 +882,7 @@ var _default = {
   onLoad: function onLoad(options) {
     var _this5 = this;
     return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
-      var type, systemInfo, goodsHeight, noShopCar;
+      var type, systemInfo, goodsHeight;
       return _regenerator.default.wrap(function _callee3$(_context3) {
         while (1) {
           switch (_context3.prev = _context3.next) {
@@ -913,14 +915,17 @@ var _default = {
               } else {
                 _this5.goodsH = goodsHeight;
               }
-              noShopCar = uni.getStorageSync('noShopCar');
+
-              if (noShopCar) {
+              // let noShopCar = uni.getStorageSync('noShopCar');
-                _this5.shopCart = JSON.parse(noShopCar);
+
-                console.log('this.shopCartthis.shopCart', _this5.shopCart);
+              // if (noShopCar) {
-                _this5._resetTotalNum();
+              //   this.shopCart = JSON.parse(noShopCar)
-              }
+              //   console.log('this.shopCartthis.shopCart', this.shopCart);
+              //   this._resetTotalNum();
+              // }
+
               _this5.$utils.addUserBehaviorNew();
-            case 19:
+            case 17:
             case "end":
               return _context3.stop();
           }
@@ -930,7 +935,8 @@ var _default = {
   },
   onUnload: function onUnload() {
     // 没有下单的购物车数据
-    uni.setStorageSync('noShopCar', this.shopCart && this.shopCart.length > 0 ? JSON.stringify(this.shopCart) : null);
+    // uni.setStorageSync('noShopCar', this.shopCart && this.shopCart.length > 0 ? JSON.stringify(this.shopCart) : null);
+
     this.$store.commit("couponPrice", "");
     this.$store.commit("orderRemark", "");
     this.totalNum = 0;

unpackage/dist/dev/mp-weixin/pages/userCenter/index.js

@@ -1142,7 +1142,7 @@ var _default = {
     handleGetUserAllOrder: function handleGetUserAllOrder() {
       var _this6 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7() {
-        var req, res, list, obligation, toBeProduced, waitingHave, orderList;
+        var req, res, list, obligation, toBeProduced, waitingHave, orderList, _orderList;
         return _regenerator.default.wrap(function _callee7$(_context7) {
           while (1) {
             switch (_context7.prev = _context7.next) {
@@ -1161,33 +1161,50 @@ var _default = {
               case 3:
                 res = _context7.sent;
                 console.log('resresresresresres', res);
-                list = res.Data.List; // 待付款
+                if (res.ResultCode === "100") {
-                obligation = []; // 待制作
+                  list = res.Data.List; // 待付款
-                toBeProduced = []; // 待取餐
+                  obligation = []; // 待制作
-                waitingHave = [];
+                  toBeProduced = []; // 待取餐
-                if (list && list.length > 0) {
+                  waitingHave = [];
-                  list.forEach(function (item) {
+                  if (list && list.length > 0) {
-                    if (item.SALEBILL_STATE === 1005) {
+                    list.forEach(function (item) {
-                      obligation.push(item);
+                      if (item.SALEBILL_STATE === 1005) {
-                    } else if (item.SALEBILL_STATE === 1010) {
+                        obligation.push(item);
-                      toBeProduced.push(item);
+                      } else if (item.SALEBILL_STATE === 1010) {
-                    } else if (item.SALEBILL_STATE === 2000) {
+                        toBeProduced.push(item);
-                      waitingHave.push(item);
+                      } else if (item.SALEBILL_STATE === 2000) {
+                        waitingHave.push(item);
+                      }
+                    });
+                  }
+                  orderList = JSON.parse(JSON.stringify(_this6.orderList));
+                  orderList.forEach(function (item) {
+                    if (item.value === 1) {
+                      item.orderCount = obligation && obligation.length > 0 ? obligation.length : 0;
+                    } else if (item.value === 2) {
+                      item.orderCount = toBeProduced && toBeProduced.length > 0 ? toBeProduced.length : 0;
+                    } else if (item.value === 3) {
+                      item.orderCount = waitingHave && waitingHave.length > 0 ? waitingHave.length : 0;
                     }
                   });
+                  console.log('obligation', obligation);
+                  _this6.orderList = orderList;
+                } else {
+                  _orderList = JSON.parse(JSON.stringify(_this6.orderList));
+                  _orderList.forEach(function (item) {
+                    if (item.value === 1) {
+                      item.orderCount = 0;
+                    } else if (item.value === 2) {
+                      item.orderCount = 0;
+                    } else if (item.value === 3) {
+                      item.orderCount = 0;
+                    }
+                  });
+                  console.log('orderListorderListorderList2', _orderList);
+                  _this6.orderList = _orderList;
                 }
-                orderList = JSON.parse(JSON.stringify(_this6.orderList));
+                _this6.$forceUpdate();
-                orderList.forEach(function (item) {
+              case 7:
-                  if (item.value === 1) {
-                    item.orderCount = obligation && obligation.length > 0 ? obligation.length : 0;
-                  } else if (item.value === 2) {
-                    item.orderCount = toBeProduced && toBeProduced.length > 0 ? toBeProduced.length : 0;
-                  } else if (item.value === 3) {
-                    item.orderCount = waitingHave && waitingHave.length > 0 ? waitingHave.length : 0;
-                  }
-                });
-                _this6.orderList = orderList;
-              case 13:
               case "end":
                 return _context7.stop();
             }

unpackage/dist/dev/mp-weixin/project.config.json

@@ -1,8 +1,7 @@
 {
   "description": "项目配置文件。",
   "packOptions": {
-    "ignore": [],
+    "ignore": []
-    "include": []
   },
   "setting": {
     "urlCheck": false,
@@ -10,16 +9,10 @@
     "postcss": false,
     "minified": false,
     "newFeature": true,
-    "bigPackageSizeSupport": true,
+    "bigPackageSizeSupport": true
-    "ignoreUploadUnusedFiles": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    }
   },
   "compileType": "miniprogram",
-  "libVersion": "3.8.7",
+  "libVersion": "",
   "appid": "wx4c497eddcec4a0e7",
   "projectname": "驿佳",
   "condition": {
@@ -39,9 +32,5 @@
       "current": -1,
       "list": []
     }
-  },
-  "editorSetting": {
-    "tabIndent": "insertSpaces",
-    "tabSize": 2
   }
 }