update

.hbuilderx/launch.json

@@ -20,7 +20,7 @@
             "type" : "uni-app:app-android"
         },
         {
-            "playground" : "standard",
+            "playground" : "custom",
             "type" : "uni-app:app-ios"
         }
     ]

components/chargeBoxStyle.vue

@@ -129,7 +129,7 @@
         <uni-popup ref="popup" :show="isShow" :safe-area="false" :mask-click="false" :is-mask-click="false">
             <view class="popupBigBox" @touchmove.stop.prevent>
                 <div class="popupDetailBox" :style="{
-                    height: comeForm === 'home' ? '80vh' : '95vh',
+                    height: comeForm === 'home' || pageType === 'mapList' ? '80vh' : '95vh'
                 }">
                     <div class="popupTitle">
                         <div class="closeIcon" @click="handleClosePopup">

pages/homeFn/payfor/index.vue

@@ -208,7 +208,7 @@ export default {
       let vuexObj = {}
       if (vuex) {
         vuexObj = JSON.parse(vuex)
-        console.log('vuexObjvuexObjvuexObj', vuexObj);
+        console.log('vuexObjvuexObjvuexObj', JSON.parse(JSON.stringify(vuexObj)));
       }
 
       const data = await _this.$api
@@ -217,11 +217,12 @@ export default {
           // 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.WechatUserId = _data.Data.WechatUserId || "";
         _this.user.MEMBERSHIP_NAME = _data.Data.MEMBERSHIP_NAME || "";
         _this.user.MEMBERSHIP_LEVEL_TEXT =
           _data.Data.MEMBERSHIP_LEVEL_TEXT || "";
@@ -252,7 +253,7 @@ export default {
         _this.showAvatar = true
       } else {
         // _this.setUser({});
-        _this.$store.commit("setUser", user);
+        // _this.$store.commit("setUser", user);
       }
       // });
     },

pages/serviceDetail/index.vue

@@ -1150,6 +1150,7 @@ export default {
       } else {
         let seatInfo = uni.getStorageSync("seatInfo");
 
+        console.log('11111', obj);
 
         let req = {
           start: {
@@ -1161,8 +1162,8 @@ export default {
           },
           end: {
             coordinate: {
-              latitude: obj.latitude,
-              longitude: obj.longitude
+              latitude: obj.SERVERPART_Y,
+              longitude: obj.SERVERPART_X
             },
             name: obj.SERVERPART_NAME,
           },

pages/shopPages/settlement/index.vue

@@ -857,6 +857,18 @@ export default {
         }
       } else {
 
+        // 因为当有些商品整数 有些商品小数 接口那边会将小数点部分直接去掉 所以我们这边处理一下 把价钱字段转为字符串
+        let newShopList = JSON.parse(JSON.stringify(_this.shopOrder));
+        newShopList.forEach((item) => {
+          item.AVERAGE_PRICE = item.AVERAGE_PRICE.toString();
+          item.COMMODITY_CURRPRICE = item.COMMODITY_CURRPRICE.toString();
+          item.ORDER_AMOUNT = item.ORDER_AMOUNT.toString();
+          item.ORDER_COUNT = item.ORDER_COUNT.toString();
+        });
+
+
+        console.log('newShopListnewShopList', newShopList);
+
         _this.$api
           .postCoop({
             action_type: "ScanOrder",
@@ -872,7 +884,8 @@ export default {
             reservationDate: _this.type === 2000 ? _this.radio : "",
             orderPersonTel: _this.phoneNumber ? _this.phoneNumber : "",
             couponCode: _this.couponAmount ? _this.couponPrice.CouponCode : "",
-            t_saleorderdetail: JSON.stringify(_this.shopOrder),
+            // t_saleorderdetail: JSON.stringify(_this.shopOrder),
+            t_saleorderdetail: JSON.stringify(newShopList),
             requestType: "application/x-www-form-urlencoded",
           })
           .then((res) => {

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -1119,8 +1119,8 @@ function populateParameters(result) {
   var parameters = {
     appId: "__UNI__F870657",
     appName: "驿佳",
-    appVersion: "1.0.32",
-    appVersionCode: "1032",
+    appVersion: "1.0.33",
+    appVersionCode: "1033",
     appLanguage: getAppLanguage(hostLanguage),
     uniCompileVersion: "4.45",
     uniCompilerVersion: "4.45",
@@ -1220,8 +1220,8 @@ var getAppBaseInfo = {
     result = sortObject(Object.assign(result, {
       appId: "__UNI__F870657",
       appName: "驿佳",
-      appVersion: "1.0.32",
-      appVersionCode: "1032",
+      appVersion: "1.0.33",
+      appVersionCode: "1033",
       appLanguage: getAppLanguage(hostLanguage),
       hostVersion: version,
       hostLanguage: hostLanguage,

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

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

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

@@ -383,7 +383,7 @@ var _default = {
                 vuexObj = {};
                 if (vuex) {
                   vuexObj = JSON.parse(vuex);
-                  console.log('vuexObjvuexObjvuexObj', vuexObj);
+                  console.log('vuexObjvuexObjvuexObj', JSON.parse(JSON.stringify(vuexObj)));
                 }
                 _context.next = 6;
                 return _this.$api.getCoop({
@@ -396,8 +396,8 @@ var _default = {
                 // .then(function (data) {
                 if (data.ResultCode === "100") {
                   _data = data;
-                  console.log("_data", _data);
                   _this.user.MEMBERSHIP_ID = _data.Data.MEMBERSHIP_ID || "";
+                  _this.user.WechatUserId = _data.Data.WechatUserId || "";
                   _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 || "";
@@ -425,7 +425,7 @@ var _default = {
                   _this.showAvatar = true;
                 } else {
                   // _this.setUser({});
-                  _this.$store.commit("setUser", user);
+                  // _this.$store.commit("setUser", user);
                 }
                 // });
               case 8:

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

@@ -873,6 +873,15 @@ var _default = {
       //  _this.orderInternal
       // eslint-disable-next-line no-constant-condition
       if (false) {} else {
+        // 因为当有些商品整数 有些商品小数 接口那边会将小数点部分直接去掉 所以我们这边处理一下 把价钱字段转为字符串
+        var newShopList = JSON.parse(JSON.stringify(_this.shopOrder));
+        newShopList.forEach(function (item) {
+          item.AVERAGE_PRICE = item.AVERAGE_PRICE.toString();
+          item.COMMODITY_CURRPRICE = item.COMMODITY_CURRPRICE.toString();
+          item.ORDER_AMOUNT = item.ORDER_AMOUNT.toString();
+          item.ORDER_COUNT = item.ORDER_COUNT.toString();
+        });
+        console.log('newShopListnewShopList', newShopList);
         _this.$api.postCoop({
           action_type: "ScanOrder",
           salebillType: 6000,
@@ -888,7 +897,8 @@ var _default = {
           reservationDate: _this.type === 2000 ? _this.radio : "",
           orderPersonTel: _this.phoneNumber ? _this.phoneNumber : "",
           couponCode: _this.couponAmount ? _this.couponPrice.CouponCode : "",
-          t_saleorderdetail: JSON.stringify(_this.shopOrder),
+          // t_saleorderdetail: JSON.stringify(_this.shopOrder),
+          t_saleorderdetail: JSON.stringify(newShopList),
           requestType: "application/x-www-form-urlencoded"
         }).then(function (res) {
           console.log("res", res);

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

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