update

pages/shopMallPage/index/index.vue

@@ -1295,7 +1295,7 @@ export default {
         ownerUnitId: 911, // 业主单位 写死
         COMMODITYNATURE: 5070, // 一个商城的大类 也写死
         priceStart: this.minPrice, // 价钱的最小值
-        priceEnd: this.maxPrice, // 价钱的最大值
+        priceEnd: this.maxPrice, // 价钱的最大值 
         payMethod: "1000,3000", // 写死的
         commodityNature: 5070, // 一个商城的大类 也写死
         commodityName: this.searchShopName,// 类型名称的搜索
@@ -1305,10 +1305,7 @@ export default {
         justCommodity: 1, // 写死
         // sortStr: `${this.sortTypeList[this.sortType]} ${new Date().getTime % 2 > 0 ? "" : "desc"
         //   }`, // 排序
-
         sortStr: `${this.selectShopSort === 0 ? 'COMMODITY_BARCODE' : this.selectShopSort === 1 ? 'COMMODITY_MEMBERPRICE' : this.selectShopSort === 2 ? 'COMMODITY_EN' : this.selectShopSort === 3 ? 'OPERATE_DATE' : ''} ${this.selectSortType === 0 ? 'asc' : 'desc'}`
-
-
       });
       console.log("handleGetSpecialOffers", data);
       let list = data.Data && data.Data.List ? data.Data.List : [];

pages/user/index.vue

@@ -81,8 +81,8 @@
                   :
                   (userInfo.Membership_NickName || userInfo.NICK_NAME || userInfo.MEMBERSHIP_NAME || "未填写名称") }}
                 </view>
-                <view class="userLevelBox" style="width: 100%;">
-                  <view class="userLevel">
+                <view class="userLevelBox" style="width: 100%;min-height: 40rpx;">
+                  <view class="userLevel" v-if="user.MEMBERSHIP_LEVEL_TEXT">
                     <image class="userLevelIcon" src="https://eshangtech.com/caiyunyiImg/levelIcon2.png" />
                     <view class="userLevelName">{{ user.MEMBERSHIP_LEVEL_TEXT || "" }}</view>
                   </view>
@@ -444,6 +444,10 @@ export default {
     // }
 
 
+    // 请求一下云南那边的积分信息
+    this.handleGetYNUserInfo()
+
+
     // 拿到订单信息
     // await this.handleGetOrderDetail()
     // 拿车牌号
@@ -641,6 +645,77 @@ export default {
     this.handleRefresh()
   },
   methods: {
+    // 请求云南那边的积分信息
+    async handleGetYNUserInfo() {
+      let params = {
+        // mobile: this.user.MEMBERSHIP_MOBILEPHONE,
+        mobile: "13508703001",
+        // out_user_id: this.user.MEMBERSHIP_ID,
+        outUserId: "20251121161700",
+      };
+      let time = Math.ceil(new Date().getTime() / 1000);
+      let req = {
+        app_id: "530000801",
+        biz_content: JSON.stringify(params),
+        charset: "UTF-8",
+        pid: "530000801",
+        service: "trawe.eats.etc",
+        utc_timestamp: time,
+        version: "1.0",
+        sign_type: "RSA2",
+      }
+
+      let signText = `app_id=${req.app_id}&biz_content=${req.biz_content}&charset=UTF-8&pid=${req.app_id}&service=trawe.eats.etc&utc_timestamp=${req.utc_timestamp}&version=1.0`;
+
+      // 签名
+      const sign = await new Promise((resolve, reject) => {
+        uni.request({
+          // url: "https://java.es.eshangtech.com:443/api/sign",
+          url: "http://111.229.213.193:18071/api/sign",
+          method: "POST",
+          data: signText,
+          header: {
+            "content-type": "text/plain",
+          },
+          success(res) {
+            console.log('res2112', res);
+
+            resolve(res.data.Result_Data);
+          },
+        });
+      });
+
+      console.log('signsignsignsignsignsignsignsign', sign);
+
+      // console.log('signTextsignTextsignTextsignText', signText);
+      req.sign = sign.sign
+
+      const tweetsData = await new Promise((resolve, reject) => {
+        uni.request({
+          url: `https://sxgzh.etclife.cn/etc/api/v1/gzh/point/balance`,
+          method: "POST",
+          data: req,
+          header: {
+            "content-type": "application/x-www-form-urlencoded",
+          },
+          success(res) {
+            console.log('res', res);
+            if (res.data.response.data) {
+              resolve(res.data.response.data);
+            } else {
+              resolve([])
+            }
+          },
+          reject(res) {
+            console.log('res', res);
+
+          }
+        });
+      });
+
+      console.log('tweetsDatatweetsDatatweetsData', tweetsData);
+
+    },
     onContact(e) {
       // e.detail.path / query 等可用于透传会话来源
     },

unpackage/dist/dev/mp-weixin/pages/evaluateList/components/orderItem.json

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

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

@@ -1105,7 +1105,7 @@ var _default = {
                   priceStart: _this5.minPrice,
                   // 价钱的最小值
                   priceEnd: _this5.maxPrice,
-                  // 价钱的最大值
+                  // 价钱的最大值 
                   payMethod: "1000,3000",
                   // 写死的
                   commodityNature: 5070,
@@ -1122,7 +1122,6 @@ var _default = {
                   // 写死
                   // sortStr: `${this.sortTypeList[this.sortType]} ${new Date().getTime % 2 > 0 ? "" : "desc"
                   //   }`, // 排序
-
                   sortStr: "".concat(_this5.selectShopSort === 0 ? 'COMMODITY_BARCODE' : _this5.selectShopSort === 1 ? 'COMMODITY_MEMBERPRICE' : _this5.selectShopSort === 2 ? 'COMMODITY_EN' : _this5.selectShopSort === 3 ? 'OPERATE_DATE' : '', " ").concat(_this5.selectSortType === 0 ? 'asc' : 'desc')
                 });
               case 3:

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

@@ -301,6 +301,9 @@ var _default = {
             case 13:
               // }
 
+              // 请求一下云南那边的积分信息
+              _this2.handleGetYNUserInfo();
+
               // 拿到订单信息
               // await this.handleGetOrderDetail()
               // 拿车牌号
@@ -337,7 +340,7 @@ var _default = {
               _this2.$utils.addUserBehaviorNew({
                 behaviorRecordDesc: "进入了我的页面"
               });
-            case 15:
+            case 16:
             case "end":
               return _context2.stop();
           }
@@ -522,28 +525,109 @@ var _default = {
     this.handleRefresh();
   },
   methods: {
+    // 请求云南那边的积分信息
+    handleGetYNUserInfo: function handleGetYNUserInfo() {
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
+        var params, time, req, signText, sign, tweetsData;
+        return _regenerator.default.wrap(function _callee4$(_context4) {
+          while (1) {
+            switch (_context4.prev = _context4.next) {
+              case 0:
+                params = {
+                  // mobile: this.user.MEMBERSHIP_MOBILEPHONE,
+                  mobile: "13508703001",
+                  // out_user_id: this.user.MEMBERSHIP_ID,
+                  outUserId: "20251121161700"
+                };
+                time = Math.ceil(new Date().getTime() / 1000);
+                req = {
+                  app_id: "530000801",
+                  biz_content: JSON.stringify(params),
+                  charset: "UTF-8",
+                  pid: "530000801",
+                  service: "trawe.eats.etc",
+                  utc_timestamp: time,
+                  version: "1.0",
+                  sign_type: "RSA2"
+                };
+                signText = "app_id=".concat(req.app_id, "&biz_content=").concat(req.biz_content, "&charset=UTF-8&pid=").concat(req.app_id, "&service=trawe.eats.etc&utc_timestamp=").concat(req.utc_timestamp, "&version=1.0"); // 签名
+                _context4.next = 6;
+                return new Promise(function (resolve, reject) {
+                  uni.request({
+                    // url: "https://java.es.eshangtech.com:443/api/sign",
+                    url: "http://111.229.213.193:18071/api/sign",
+                    method: "POST",
+                    data: signText,
+                    header: {
+                      "content-type": "text/plain"
+                    },
+                    success: function success(res) {
+                      console.log('res2112', res);
+                      resolve(res.data.Result_Data);
+                    }
+                  });
+                });
+              case 6:
+                sign = _context4.sent;
+                console.log('signsignsignsignsignsignsignsign', sign);
+
+                // console.log('signTextsignTextsignTextsignText', signText);
+                req.sign = sign.sign;
+                _context4.next = 11;
+                return new Promise(function (resolve, reject) {
+                  uni.request({
+                    url: "https://sxgzh.etclife.cn/etc/api/v1/gzh/point/balance",
+                    method: "POST",
+                    data: req,
+                    header: {
+                      "content-type": "application/x-www-form-urlencoded"
+                    },
+                    success: function success(res) {
+                      console.log('res', res);
+                      if (res.data.response.data) {
+                        resolve(res.data.response.data);
+                      } else {
+                        resolve([]);
+                      }
+                    },
+                    reject: function reject(res) {
+                      console.log('res', res);
+                    }
+                  });
+                });
+              case 11:
+                tweetsData = _context4.sent;
+                console.log('tweetsDatatweetsDatatweetsData', tweetsData);
+              case 13:
+              case "end":
+                return _context4.stop();
+            }
+          }
+        }, _callee4);
+      }))();
+    },
     onContact: function onContact(e) {
       // e.detail.path / query 等可用于透传会话来源
     },
     // 下拉刷新处理
     handleRefresh: function handleRefresh() {
       var _this4 = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
         var userData;
-        return _regenerator.default.wrap(function _callee4$(_context4) {
+        return _regenerator.default.wrap(function _callee5$(_context5) {
           while (1) {
-            switch (_context4.prev = _context4.next) {
+            switch (_context5.prev = _context5.next) {
               case 0:
-                _context4.prev = 0;
-                _context4.next = 3;
+                _context5.prev = 0;
+                _context5.next = 3;
                 return new Promise(function (resolve) {
                   return setTimeout(resolve, 300);
                 });
               case 3:
-                _context4.next = 5;
+                _context5.next = 5;
                 return _this4.handleGetUserDetail();
               case 5:
-                _context4.next = 7;
+                _context5.next = 7;
                 return _this4.handleGetOrderDetail();
               case 7:
                 // 更新缓存数据
@@ -553,29 +637,29 @@ var _default = {
                   _this4.cards = userData.LicencePlate.List && userData.LicencePlate.List.length > 0 ? userData.LicencePlate.List[0].License_Plate : "";
                 }
                 _this4.$forceUpdate();
-                _context4.next = 16;
+                _context5.next = 16;
                 break;
               case 12:
-                _context4.prev = 12;
-                _context4.t0 = _context4["catch"](0);
-                console.error('刷新失败:', _context4.t0);
+                _context5.prev = 12;
+                _context5.t0 = _context5["catch"](0);
+                console.error('刷新失败:', _context5.t0);
                 uni.showToast({
                   title: '刷新失败',
                   icon: 'none',
                   duration: 2000
                 });
               case 16:
-                _context4.prev = 16;
+                _context5.prev = 16;
                 // 停止下拉刷新
                 _this4.isRefreshing = false;
                 uni.stopPullDownRefresh();
-                return _context4.finish(16);
+                return _context5.finish(16);
               case 20:
               case "end":
-                return _context4.stop();
+                return _context5.stop();
             }
           }
-        }, _callee4, null, [[0, 12, 16, 20]]);
+        }, _callee5, null, [[0, 12, 16, 20]]);
       }))();
     },
     // 跳转客服帮助
@@ -626,36 +710,36 @@ var _default = {
     // 拿到服务区详情
     handleGetServiceDetail: function handleGetServiceDetail(id) {
       var _this5 = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6() {
         var req, data, obj;
-        return _regenerator.default.wrap(function _callee5$(_context5) {
+        return _regenerator.default.wrap(function _callee6$(_context6) {
           while (1) {
-            switch (_context5.prev = _context5.next) {
+            switch (_context6.prev = _context6.next) {
               case 0:
                 if (id) {
-                  _context5.next = 2;
+                  _context6.next = 2;
                   break;
                 }
-                return _context5.abrupt("return");
+                return _context6.abrupt("return");
               case 2:
                 req = {
                   ServerpartId: id,
                   latitude: _this5.seat.latitude,
                   longitude: _this5.seat.longitude
                 };
-                _context5.next = 5;
+                _context6.next = 5;
                 return _this5.$api.$get("/CommercialApi/BaseInfo/GetServerpartInfo", req);
               case 5:
-                data = _context5.sent;
+                data = _context6.sent;
                 obj = data.Result_Data;
                 _this5.serviceDetail = obj;
                 _this5.serviceDetail.sumDetail = _this5.handleMergeDetail(obj);
               case 9:
               case "end":
-                return _context5.stop();
+                return _context6.stop();
             }
           }
-        }, _callee5);
+        }, _callee6);
       }))();
     },
     // 合并服务区数据
@@ -800,11 +884,11 @@ var _default = {
     // 查询现在的充电桩
     handleGetChargingStation: function handleGetChargingStation(obj) {
       var _this6 = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6() {
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7() {
         var _this;
-        return _regenerator.default.wrap(function _callee6$(_context6) {
+        return _regenerator.default.wrap(function _callee7$(_context7) {
           while (1) {
-            switch (_context6.prev = _context6.next) {
+            switch (_context7.prev = _context7.next) {
               case 0:
                 _this = _this6;
                 uni.request({
@@ -860,10 +944,10 @@ var _default = {
                 });
               case 2:
               case "end":
-                return _context6.stop();
+                return _context7.stop();
             }
           }
-        }, _callee6);
+        }, _callee7);
       }))();
     },
     // 跳转会员设置
@@ -932,14 +1016,14 @@ var _default = {
     // 用户上传头像
     onChooseAvatar: function onChooseAvatar(e) {
       var _this7 = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8() {
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9() {
         var _this8, _this;
-        return _regenerator.default.wrap(function _callee8$(_context8) {
+        return _regenerator.default.wrap(function _callee9$(_context9) {
           while (1) {
-            switch (_context8.prev = _context8.next) {
+            switch (_context9.prev = _context9.next) {
               case 0:
                 if (!(_this7.user && !_this7.user.MEMBERSHIP_ID || !_this7.user && !_this7.user.MEMBERSHIP_ID)) {
-                  _context8.next = 4;
+                  _context9.next = 4;
                   break;
                 }
                 _this8 = _this7;
@@ -954,7 +1038,7 @@ var _default = {
                     }
                   }
                 });
-                return _context8.abrupt("return");
+                return _context9.abrupt("return");
               case 4:
                 _this = _this7;
                 _this.showErrorText = 1;
@@ -969,16 +1053,16 @@ var _default = {
                   },
 
                   success: function () {
-                    var _success = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(uploadRes) {
+                    var _success = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8(uploadRes) {
                       var data, url, req, userInfoData;
-                      return _regenerator.default.wrap(function _callee7$(_context7) {
+                      return _regenerator.default.wrap(function _callee8$(_context8) {
                         while (1) {
-                          switch (_context7.prev = _context7.next) {
+                          switch (_context8.prev = _context8.next) {
                             case 0:
                               data = uploadRes.data ? JSON.parse(uploadRes.data) : "";
                               url = data.Result_Data.ImageUrl;
                               if (!url) {
-                                _context7.next = 10;
+                                _context8.next = 10;
                                 break;
                               }
                               req = {
@@ -987,19 +1071,19 @@ var _default = {
                               };
                               _this.WXProfile = url;
                               _this.showErrorText = _this.WXProfile;
-                              _context7.next = 8;
+                              _context8.next = 8;
                               return _this.$api.$get("/WeChat/UpdateMemberInfo", req);
                             case 8:
-                              userInfoData = _context7.sent;
+                              userInfoData = _context8.sent;
                               if (userInfoData.Result_Code === 100) {
                                 _this.handleGetUserDetail();
                               }
                             case 10:
                             case "end":
-                              return _context7.stop();
+                              return _context8.stop();
                           }
                         }
-                      }, _callee7);
+                      }, _callee8);
                     }));
                     function success(_x) {
                       return _success.apply(this, arguments);
@@ -1012,20 +1096,20 @@ var _default = {
                 });
               case 7:
               case "end":
-                return _context8.stop();
+                return _context9.stop();
             }
           }
-        }, _callee8);
+        }, _callee9);
       }))();
     },
     // 拿到用户详情
     handleGetUserDetail: function handleGetUserDetail() {
       var _this9 = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9() {
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee10() {
         var _this;
-        return _regenerator.default.wrap(function _callee9$(_context9) {
+        return _regenerator.default.wrap(function _callee10$(_context10) {
           while (1) {
-            switch (_context9.prev = _context9.next) {
+            switch (_context10.prev = _context10.next) {
               case 0:
                 _this = _this9;
                 _this.$api.getCoop({
@@ -1061,10 +1145,10 @@ var _default = {
                 });
               case 2:
               case "end":
-                return _context9.stop();
+                return _context10.stop();
             }
           }
-        }, _callee9);
+        }, _callee10);
       }))();
     },
     // 跳转去售后 即已完成的列表
@@ -1133,22 +1217,22 @@ var _default = {
     // 拿到车牌号
     handleGetCarCode: function handleGetCarCode() {
       var _this10 = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee10() {
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee11() {
         var _this, res, list;
-        return _regenerator.default.wrap(function _callee10$(_context10) {
+        return _regenerator.default.wrap(function _callee11$(_context11) {
           while (1) {
-            switch (_context10.prev = _context10.next) {
+            switch (_context11.prev = _context11.next) {
               case 0:
                 _this = _this10;
                 uni.showLoading({
                   title: "加载中"
                 });
-                _context10.next = 4;
+                _context11.next = 4;
                 return _this10.$api.getCoop({
                   action_type: "GetVehicleList"
                 });
               case 4:
-                res = _context10.sent;
+                res = _context11.sent;
                 list = res.Result_Data.List;
                 if (list && list.length > 0) {
                   _this.cards = list[0].License_Plate;
@@ -1156,10 +1240,10 @@ var _default = {
                 uni.hideLoading();
               case 8:
               case "end":
-                return _context10.stop();
+                return _context11.stop();
             }
           }
-        }, _callee10);
+        }, _callee11);
       }))();
     },
     // 常用功能的跳转
@@ -1186,11 +1270,11 @@ var _default = {
     // // 调起付款码
     handleShowPayCode: function handleShowPayCode() {
       var _this11 = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee11() {
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee12() {
         var timeStamp, nonceStr, req, reqSign, data;
-        return _regenerator.default.wrap(function _callee11$(_context11) {
+        return _regenerator.default.wrap(function _callee12$(_context12) {
           while (1) {
-            switch (_context11.prev = _context11.next) {
+            switch (_context12.prev = _context12.next) {
               case 0:
                 timeStamp = Math.ceil(new Date().getTime() / 1000);
                 nonceStr = Math.random().toString(36).substring(2, 8);
@@ -1211,10 +1295,10 @@ var _default = {
                   // req.package +
                   // "\n",
                 };
-                _context11.next = 6;
+                _context12.next = 6;
                 return _this11.$api.$get("/WeChat/GenerateSign", reqSign);
               case 6:
-                data = _context11.sent;
+                data = _context12.sent;
                 wx.openOfflinePayView({
                   appId: "wxee018fb96955552a",
                   timeStamp: timeStamp,
@@ -1226,10 +1310,10 @@ var _default = {
                 });
               case 8:
               case "end":
-                return _context11.stop();
+                return _context12.stop();
             }
           }
-        }, _callee11);
+        }, _callee12);
       }))();
     },
     // 最底下的两个点击事件
@@ -1333,17 +1417,17 @@ var _default = {
     },
     handleGetOrderDetail: function handleGetOrderDetail() {
       var _this12 = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee12() {
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee13() {
         var req, data, list, obligation, pendingShipment, pendingReceiptOfGoods, mallOrderCountList, reqFood, dataFood, _list, _obligation, _pendingShipment, _pendingReceiptOfGoods, foodOrderCountList, foodTab;
-        return _regenerator.default.wrap(function _callee12$(_context12) {
+        return _regenerator.default.wrap(function _callee13$(_context13) {
           while (1) {
-            switch (_context12.prev = _context12.next) {
+            switch (_context13.prev = _context13.next) {
               case 0:
                 if (!(_this12.user && !_this12.user.MEMBERSHIP_ID || !_this12.user && !_this12.user.MEMBERSHIP_ID)) {
-                  _context12.next = 2;
+                  _context13.next = 2;
                   break;
                 }
-                return _context12.abrupt("return");
+                return _context13.abrupt("return");
               case 2:
                 // 商城订单数据
                 req = {
@@ -1356,10 +1440,10 @@ var _default = {
                   requestType: "application/x-www-form-urlencoded",
                   noLoading: true
                 };
-                _context12.next = 5;
+                _context13.next = 5;
                 return _this12.$api.postCoop(req);
               case 5:
-                data = _context12.sent;
+                data = _context13.sent;
                 if (data.ResultCode === "100") {
                   list = data.Data.List; // 待付款
                   obligation = []; // 待发货
@@ -1393,10 +1477,10 @@ var _default = {
                   requestType: "application/x-www-form-urlencoded",
                   noLoading: true
                 };
-                _context12.next = 12;
+                _context13.next = 12;
                 return _this12.$api.postCoop(reqFood);
               case 12:
-                dataFood = _context12.sent;
+                dataFood = _context13.sent;
                 if (dataFood.ResultCode === "100") {
                   _list = dataFood.Data.List; // 待付款
                   _obligation = []; // 待接单
@@ -1448,10 +1532,10 @@ var _default = {
                 _this12.$forceUpdate();
               case 15:
               case "end":
-                return _context12.stop();
+                return _context13.stop();
             }
           }
-        }, _callee12);
+        }, _callee13);
       }))();
     }
   }