修复若干bug

pages/index/index.vue

@@ -42,7 +42,8 @@
 					<view id="roller" class="base">
 						<!-- 快捷栏 -->
 						<view class="shortcut-bar">
-							<view class="buy-charge-coupon" @click="$app.url.goto('/subPackages/coupon/coupon-buy/coupon-buy')">
+							<view class="buy-charge-coupon"
+								@click="$app.url.goto('/subPackages/coupon/coupon-buy/coupon-buy')">
 								<view class="coupon-tag">限时</view>
 								<view class="charge-title">
 									<image class="title-coupon-text" src="@/static/img/goumaicdq.png" mode=""></image>
@@ -139,7 +140,7 @@
 												<view class="icon">
 													<image src="@/static/img/distance.svg" mode="widthFix"></image>
 												</view>
-												<text>{{ item.distance }}km</text>
+												<text>{{ item.distance || '0' }}km</text>
 											</view>
 										</view>
 									</view>
@@ -601,7 +602,7 @@ export default {
 		},
 		getStations(lng, lat) {
 			this.$api.base("post", "/applet/v1/homePage/getStationInfoPage", {
-				pageNum: this.pageNum, pageSize: 10, sortType: this.sorts.index + 1, longitude: lng, latitude: lat, userId: parseInt(this.$app.storage.get('USER_INFO').appletUserId)
+				pageNum: this.pageNum, pageSize: 10, sortType: this.sorts.index + 1, longitude: lng, latitude: lat, userId: this.$app.storage.get('USER_INFO') ? parseInt(this.$app.storage.get('USER_INFO').appletUserId) : 0
 			}, {}).then(res => {
 				if (this.pageNum == 1) {
 					this.list.data = res.data.list

pages/login/login.css

@@ -56,7 +56,7 @@
 	height: 50px;
 	font-size: inherit;
 	border-radius: 100pc;
-	background-color: #04C262;
+	background-color: #47aeff;
 	color: #fff;
 }
 .submit::after{

pages/login/login.vue

@@ -15,8 +15,8 @@
 			<view class="footer" style="padding-left: 0;padding-right: 0;">
 				<button @getphonenumber="onGetPhoneNumber" open-type="getPhoneNumber" class="submit"
 					:disabled="!agreement" style="margin-left: 35px;width: calc(100% - 70px);">
-					<text class="ax ax-iconblock i-weixin"></text>
-					<text>微信用户一键登录</text>
+					<!-- <text class="ax ax-iconblock i-weixin"></text> -->
+					<text>手机号一键登录</text>
 				</button>
 				<view class="cancel" @click="cancelLogin">取消登录</view>
 				<view @click="agreement = !agreement" class="agreement" style="font-size: 17px;">

pages/my/my.vue

@@ -18,7 +18,7 @@
 							</view>
 						</view>
 						<view class="user-phone" v-if="userinfo.appletUserId">{{ userinfo.phone ? userinfo.phone :
-							'未获取手机' }}
+							'未获取手机号' }}
 						</view>
 						<button v-if="!userinfo.appletUserId" @getphonenumber="onGetPhoneNumber"
 							open-type="getPhoneNumber" class="get-phone-number">授权并登录</button>
@@ -134,7 +134,6 @@ export default {
 	data() {
 		return {
 			userinfo: {},
-			playbil_img: 'https://hyxhsh.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/XVsEVGuCCbNv4aee36cc2f76e7050f62ebad3080ad88.jpg/1.jpg',
 			banners: [],
 		}
 	},

static/js/api.js

@@ -151,20 +151,29 @@ api.base = function (method, url, data, opts) {
               }
             } else {
               // 刷新失败，执行登录
-              if (!isLoginPromptShown) {
-                isLoginPromptShown = true;
-                // 清除登录缓存
-                $app.popup
-                  .confirm(`${err.data.msg},点击确定去登录`, "提示", {
-                    showCancel: true,
-                  })
-                  .then((confirmed) => {
-                    isLoginPromptShown = false;
-                    if (confirmed) {
-                      uni.clearStorage();
-                      uni.navigateTo({ url: "/pages/login/login" });
-                    }
-                  });
+              const currentPage = getCurrentPages().pop();
+              const currentRoute = currentPage ? currentPage.route : "";
+
+              if (currentRoute === "pages/index/index") {
+                // 在首页时只显示弱提示
+                $app.popup.toast(`${err.data.msg}`);
+              } else {
+                // 非首页时显示登录确认框
+                if (!isLoginPromptShown) {
+                  isLoginPromptShown = true;
+                  // 清除登录缓存
+                  $app.popup
+                    .confirm(`${err.data.msg},点击确定去登录`, "提示", {
+                      showCancel: true,
+                    })
+                    .then((confirmed) => {
+                      isLoginPromptShown = false;
+                      if (confirmed) {
+                        uni.clearStorage();
+                        uni.navigateTo({ url: "/pages/login/login" });
+                      }
+                    });
+                }
               }
             }
           } catch (err) {

subPackages/charging/new-site/new-site.vue

@@ -1,7 +1,7 @@
 <template>
 	<ax-body :blank="0">
 		<view class="site-body">
-			<view class="top-banner" v-if="stationDetail.pictures">
+			<view class="top-banner" v-if="stationDetail.pictures && stationDetail.pictures.length > 0">
 				<swiper class="banner-swiper" circular :autoplay="true" interval="3000" duration="500"
 					@change="swiperChange">
 					<swiper-item class="banner-swiper-item" v-for="item in stationDetail.pictures">
@@ -10,12 +10,13 @@
 				</swiper>
 				<view class="swiper-current">{{ bannerIndex }}/{{ stationDetail.pictures.length }}</view>
 			</view>
-			<view class="site-content" :style="{ top: `${stationDetail.pictures ? '320rpx' : '0'}` }">
+			<view class="site-content"
+				:style="{ top: `${stationDetail.pictures && stationDetail.pictures.length > 0 ? '320rpx' : '0'}` }">
 				<view class="top-site-info">
 					<view class="site-title">{{ stationDetail.stationName }}</view>
 					<view class="site-text">
 						<image src="@/static/img/site-icon03.png" class="icon"></image>
-						<view class="item-text">{{ stationDetail.tips }}</view>
+						<view class="item-text">{{ stationDetail.tips || '--' }}</view>
 					</view>
 				</view>
 				<view class="site-location">
@@ -123,7 +124,7 @@
 						<view v-if="filteredConnectorList.length === 0" class="not-data">暂无设备</view>
 					</view>
 				</view>
-				<view class="site-list-card">
+				<view class="site-list-card" v-if="stationDetail.customerServiceHotline">
 					<view class="cost-info-title">
 						<view class="title-name">电站信息</view>
 						<view class="check-info">
@@ -247,7 +248,13 @@ export default {
 				longitude: location.split(",")[0] || 0,
 				latitude: location.split(",")[1] || 0
 			}, {}).then(res => {
-				res.data.pictures = JSON.parse(res.data.pictures)
+				let pictures = res.data.pictures;
+				if (typeof pictures === 'string') {
+					pictures = JSON.parse(pictures) || [];
+				} else if (!Array.isArray(pictures)) {
+					pictures = [];
+				}
+				res.data.pictures = pictures;
 				const countMapping = {
 					'空闲': res.data.idleCount,
 					'占用': res.data.occupiedCount,
@@ -257,6 +264,7 @@ export default {
 					item.total = countMapping[item.text] || 0;
 				});
 				this.stationDetail = res.data
+				console.log(this.stationDetail.pictures, '数据');
 				// 初始化默认显示空闲状态的前3个设备
 				this.siteSelectIndex = 0;
 				this.filteredConnectorList = this.stationDetail.connectorList

subPackages/coupon/coupon-buy/coupon-buy.vue

@@ -99,7 +99,6 @@ export default {
 			select_num: null,
 			payment: null,
 			order_info: null,
-			order_status: [],
 			coupons: {
 				index: -1,
 				data: []
@@ -133,21 +132,12 @@ export default {
 			this.select_num = item.levelMoney
 		},
 		pay() {
-			if (!this.userinfo.phone) {
+			if (!this.userinfo.appletUserId) {
 				this.$app.url.goto('/pages/login/login')
 				return;
 			}
-			if (this.order_status.length > 0) {
-				this.$app.popup.confirm('您当前有正在进行中的订单，请结束订单后再进行充值并重新发起操作', '提示', {
-					showCancel: true,
-					confirmText: "查看订单"
-				}).then((res) => {
-					if (res) {
-						this.$app.url.goto('/subPackages/order/order/order?index=' + 1);
-					}
-				})
-				return
-			}
+			// this.$app.popup.toast('充值入口正在维护，敬请期待！')
+			// return
 			this.$api.base("post", "/applet/v1/wft/order/createOrder", {
 				levelId: this.coupons.data[this.coupons.index].id
 			}, {}).then(addRes => {
@@ -204,13 +194,6 @@ export default {
 			})
 
 		},
-		select_orderstatus() {
-			this.$api.base("post", "/chargeApi/queryOrderList", {
-				type: 1
-			}, {}).then(res => {
-				this.order_status = res.table.rows
-			})
-		},
 		get_orderPayment() {
 			// maspStatus（1:待补缴，2：已补缴）realPredictServiceCost平台；maspAmount第三方
 			this.$api.base("post", "/chargeApi/queryOrderList-arrearage", {}, {}).then(res => {

subPackages/coupon/recharge-log/recharge-log.vue

@@ -21,8 +21,8 @@
 						<view v-if="item.backTaxAmount && item.backTax === 0">可抵扣余量：{{ item.orderMoney -
 							item.backTaxAmount }}元
 						</view>
-						<view v-if="item.orderStatus != 2">退款时间：{{ item.refundTime }}</view>
-						<view v-if="item.orderStatus != 2">退款金额：{{ item.refundMoney }}元</view>
+						<view v-if="item.orderStatus == 4">退款时间：{{ item.refundTime }}</view>
+						<view v-if="item.orderStatus == 4">退款金额：{{ item.refundMoney }}元</view>
 					</view>
 				</view>
 				<view v-if="logs.total > logs.data.length" @click="loadData(true)" class="loadmore">
@@ -75,6 +75,7 @@ export default {
 			} else {
 				this.search_data.pageNum = 1;
 			}
+			// 订单状态 1 待支付 2 已支付 3 已取消 4 已退款
 			this.$api.base("post", "/applet/v1/order/getTicketRecords", this.search_data, {})
 				.then(res => {
 					if (!append || currentPage + 1 === this.search_data.pageNum) {

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

@@ -12559,13 +12559,13 @@ api.base = function (method, url, data, opts) {
                 };
               }()).catch( /*#__PURE__*/function () {
                 var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(err) {
-                  var refreshResult, db;
+                  var refreshResult, db, currentPage, currentRoute;
                   return _regenerator.default.wrap(function _callee2$(_context2) {
                     while (1) {
                       switch (_context2.prev = _context2.next) {
                         case 0:
                           if (!(err.data.code == "A0230")) {
-                            _context2.next = 27;
+                            _context2.next = 29;
                             break;
                           }
                           _context2.prev = 1;
@@ -12592,46 +12592,54 @@ api.base = function (method, url, data, opts) {
                           _context2.t0 = _context2["catch"](7);
                           reject(_context2.t0);
                         case 17:
-                          _context2.next = 20;
+                          _context2.next = 22;
                           break;
                         case 19:
                           // 刷新失败，执行登录
-                          if (!isLoginPromptShown) {
-                            isLoginPromptShown = true;
-                            // 清除登录缓存
-                            _app.default.popup.confirm("".concat(err.data.msg, ",\u70B9\u51FB\u786E\u5B9A\u53BB\u767B\u5F55"), "提示", {
-                              showCancel: true
-                            }).then(function (confirmed) {
-                              isLoginPromptShown = false;
-                              if (confirmed) {
-                                uni.clearStorage();
-                                uni.navigateTo({
-                                  url: "/pages/login/login"
-                                });
-                              }
-                            });
+                          currentPage = getCurrentPages().pop();
+                          currentRoute = currentPage ? currentPage.route : "";
+                          if (currentRoute === "pages/index/index") {
+                            // 在首页时只显示弱提示
+                            _app.default.popup.toast("".concat(err.data.msg));
+                          } else {
+                            // 非首页时显示登录确认框
+                            if (!isLoginPromptShown) {
+                              isLoginPromptShown = true;
+                              // 清除登录缓存
+                              _app.default.popup.confirm("".concat(err.data.msg, ",\u70B9\u51FB\u786E\u5B9A\u53BB\u767B\u5F55"), "提示", {
+                                showCancel: true
+                              }).then(function (confirmed) {
+                                isLoginPromptShown = false;
+                                if (confirmed) {
+                                  uni.clearStorage();
+                                  uni.navigateTo({
+                                    url: "/pages/login/login"
+                                  });
+                                }
+                              });
+                            }
                           }
-                        case 20:
-                          _context2.next = 25;
-                          break;
                         case 22:
-                          _context2.prev = 22;
+                          _context2.next = 27;
+                          break;
+                        case 24:
+                          _context2.prev = 24;
                           _context2.t1 = _context2["catch"](1);
                           reject(_context2.t1);
-                        case 25:
-                          _context2.next = 28;
-                          break;
                         case 27:
+                          _context2.next = 30;
+                          break;
+                        case 29:
                           _app.default.popup.alert("\u670D\u52A1\u5668\u54CD\u5E94\u5931\u8D25\r\n".concat(err.data.msg), "数据请求");
-                        case 28:
+                        case 30:
                           /*失败处理，此处为非200状态码引起的错误*/
                           options.hideLoading();
-                        case 29:
+                        case 31:
                         case "end":
                           return _context2.stop();
                       }
                     }
-                  }, _callee2, null, [[1, 22], [7, 14]]);
+                  }, _callee2, null, [[1, 24], [7, 14]]);
                 }));
                 return function (_x4) {
                   return _ref3.apply(this, arguments);

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

@@ -408,6 +408,7 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/r
 //
 //
 //
+//
 
 var bmap = __webpack_require__(/*! static/js/bmap-wx.js */ 49);
 var _default = {
@@ -801,7 +802,7 @@ var _default = {
         sortType: this.sorts.index + 1,
         longitude: lng,
         latitude: lat,
-        userId: parseInt(this.$app.storage.get('USER_INFO').appletUserId)
+        userId: this.$app.storage.get('USER_INFO') ? parseInt(this.$app.storage.get('USER_INFO').appletUserId) : 0
       }, {}).then(function (res) {
         if (_this10.pageNum == 1) {
           _this10.list.data = res.data.list;

unpackage/dist/dev/mp-weixin/pages/login/login.wxml

@@ -1 +1 @@
-<ax-body vue-id="35a7246c-1" blank="0" hideIndicatorArea="{{true}}" class="data-v-b237504c" bind:__l="__l" vue-slots="{{['default']}}"><image class="page-background data-v-b237504c" src="/static/img/page-bg01.png"></image><view class="body data-v-b237504c"><view class="title data-v-b237504c"><view class="data-v-b237504c"><view class="h1 data-v-b237504c">您好!</view><view class="h2 data-v-b237504c">欢迎使用中数电动</view></view><image class="logo data-v-b237504c" src="/static/img/logo.svg" mode="widthFix"></image></view><view class="logo-wrap data-v-b237504c"><image class="bg data-v-b237504c" src="/static/img/login-bg.svg" mode="widthFix"></image></view><view class="footer data-v-b237504c" style="padding-left:0;padding-right:0;"><button class="submit data-v-b237504c" style="margin-left:35px;width:calc(100% - 70px);" open-type="getPhoneNumber" disabled="{{!agreement}}" data-event-opts="{{[['getphonenumber',[['onGetPhoneNumber',['$event']]]]]}}" bindgetphonenumber="__e"><text class="ax ax-iconblock i-weixin data-v-b237504c"></text><text class="data-v-b237504c">微信用户一键登录</text></button><view data-event-opts="{{[['tap',[['cancelLogin',['$event']]]]]}}" class="cancel data-v-b237504c" bindtap="__e">取消登录</view><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="agreement data-v-b237504c" style="font-size:17px;" bindtap="__e"><view class="{{['mask','data-v-b237504c',(agreement)?'active':'']}}"><text class="ax ax-iconline i-select data-v-b237504c"></text></view><text class="data-v-b237504c">我已阅读并理解和同意</text><text data-event-opts="{{[['tap',[['checkPrivacy']]]]}}" class="em data-v-b237504c" catchtap="__e">《隐私政策协议》</text></view></view></view></ax-body>
+<ax-body vue-id="35a7246c-1" blank="0" hideIndicatorArea="{{true}}" class="data-v-b237504c" bind:__l="__l" vue-slots="{{['default']}}"><image class="page-background data-v-b237504c" src="/static/img/page-bg01.png"></image><view class="body data-v-b237504c"><view class="title data-v-b237504c"><view class="data-v-b237504c"><view class="h1 data-v-b237504c">您好!</view><view class="h2 data-v-b237504c">欢迎使用中数电动</view></view><image class="logo data-v-b237504c" src="/static/img/logo.svg" mode="widthFix"></image></view><view class="logo-wrap data-v-b237504c"><image class="bg data-v-b237504c" src="/static/img/login-bg.svg" mode="widthFix"></image></view><view class="footer data-v-b237504c" style="padding-left:0;padding-right:0;"><button class="submit data-v-b237504c" style="margin-left:35px;width:calc(100% - 70px);" open-type="getPhoneNumber" disabled="{{!agreement}}" data-event-opts="{{[['getphonenumber',[['onGetPhoneNumber',['$event']]]]]}}" bindgetphonenumber="__e"><text class="data-v-b237504c">手机号一键登录</text></button><view data-event-opts="{{[['tap',[['cancelLogin',['$event']]]]]}}" class="cancel data-v-b237504c" bindtap="__e">取消登录</view><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="agreement data-v-b237504c" style="font-size:17px;" bindtap="__e"><view class="{{['mask','data-v-b237504c',(agreement)?'active':'']}}"><text class="ax ax-iconline i-select data-v-b237504c"></text></view><text class="data-v-b237504c">我已阅读并理解和同意</text><text data-event-opts="{{[['tap',[['checkPrivacy']]]]}}" class="em data-v-b237504c" catchtap="__e">《隐私政策协议》</text></view></view></view></ax-body>

unpackage/dist/dev/mp-weixin/pages/login/login.wxss

@@ -53,7 +53,7 @@
 	height: 50px;
 	font-size: inherit;
 	border-radius: 100pc;
-	background-color: #04C262;
+	background-color: #47aeff;
 	color: #fff;
 }
 .submit.data-v-b237504c::after{

unpackage/dist/dev/mp-weixin/pages/my/my.js

@@ -357,7 +357,6 @@ var _default = {
   data: function data() {
     return {
       userinfo: {},
-      playbil_img: 'https://hyxhsh.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/XVsEVGuCCbNv4aee36cc2f76e7050f62ebad3080ad88.jpg/1.jpg',
       banners: []
     };
   },

unpackage/dist/dev/mp-weixin/static/js/api.js

@@ -151,20 +151,29 @@ api.base = function (method, url, data, opts) {
               }
             } else {
               // 刷新失败，执行登录
-              if (!isLoginPromptShown) {
-                isLoginPromptShown = true;
-                // 清除登录缓存
-                $app.popup
-                  .confirm(`${err.data.msg},点击确定去登录`, "提示", {
-                    showCancel: true,
-                  })
-                  .then((confirmed) => {
-                    isLoginPromptShown = false;
-                    if (confirmed) {
-                      uni.clearStorage();
-                      uni.navigateTo({ url: "/pages/login/login" });
-                    }
-                  });
+              const currentPage = getCurrentPages().pop();
+              const currentRoute = currentPage ? currentPage.route : "";
+
+              if (currentRoute === "pages/index/index") {
+                // 在首页时只显示弱提示
+                $app.popup.toast(`${err.data.msg}`);
+              } else {
+                // 非首页时显示登录确认框
+                if (!isLoginPromptShown) {
+                  isLoginPromptShown = true;
+                  // 清除登录缓存
+                  $app.popup
+                    .confirm(`${err.data.msg},点击确定去登录`, "提示", {
+                      showCancel: true,
+                    })
+                    .then((confirmed) => {
+                      isLoginPromptShown = false;
+                      if (confirmed) {
+                        uni.clearStorage();
+                        uni.navigateTo({ url: "/pages/login/login" });
+                      }
+                    });
+                }
               }
             }
           } catch (err) {

unpackage/dist/dev/mp-weixin/subPackages/charging/new-site/new-site.js

@@ -125,7 +125,9 @@ var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
-  var g0 = _vm.stationDetail.pictures ? _vm.stationDetail.pictures.length : null
+  var g0 = _vm.stationDetail.pictures && _vm.stationDetail.pictures.length > 0
+  var g1 = g0 ? _vm.stationDetail.pictures.length : null
+  var g2 = _vm.stationDetail.pictures && _vm.stationDetail.pictures.length > 0
   var l0 = _vm.__map(_vm.filteredConnectorList, function (item, index) {
     var $orig = _vm.__get_orig(item)
     var m0 = _vm.getSatesObj(item)
@@ -136,14 +138,16 @@ var render = function () {
       m1: m1,
     }
   })
-  var g1 = _vm.filteredConnectorList.length
+  var g3 = _vm.filteredConnectorList.length
   _vm.$mp.data = Object.assign(
     {},
     {
       $root: {
         g0: g0,
-        l0: l0,
         g1: g1,
+        g2: g2,
+        l0: l0,
+        g3: g3,
       },
     }
   )
@@ -365,6 +369,7 @@ exports.default = void 0;
 //
 //
 //
+//
 var _default = {
   onLoad: function onLoad(option) {
     console.log(option); //打印出上个页面传递的参数。
@@ -440,7 +445,13 @@ var _default = {
         longitude: location.split(",")[0] || 0,
         latitude: location.split(",")[1] || 0
       }, {}).then(function (res) {
-        res.data.pictures = JSON.parse(res.data.pictures);
+        var pictures = res.data.pictures;
+        if (typeof pictures === 'string') {
+          pictures = JSON.parse(pictures) || [];
+        } else if (!Array.isArray(pictures)) {
+          pictures = [];
+        }
+        res.data.pictures = pictures;
         var countMapping = {
           '空闲': res.data.idleCount,
           '占用': res.data.occupiedCount,
@@ -450,6 +461,7 @@ var _default = {
           item.total = countMapping[item.text] || 0;
         });
         _this2.stationDetail = res.data;
+        console.log(_this2.stationDetail.pictures, '数据');
         // 初始化默认显示空闲状态的前3个设备
         _this2.siteSelectIndex = 0;
         _this2.filteredConnectorList = _this2.stationDetail.connectorList.filter(function (connector) {

unpackage/dist/dev/mp-weixin/subPackages/coupon/coupon-buy/coupon-buy.js

@@ -310,7 +310,6 @@ var _default = {
       select_num: null,
       payment: null,
       order_info: null,
-      order_status: [],
       coupons: {
         index: -1,
         data: []
@@ -346,21 +345,12 @@ var _default = {
     },
     pay: function pay() {
       var _this2 = this;
-      if (!this.userinfo.phone) {
+      if (!this.userinfo.appletUserId) {
         this.$app.url.goto('/pages/login/login');
         return;
       }
-      if (this.order_status.length > 0) {
-        this.$app.popup.confirm('您当前有正在进行中的订单，请结束订单后再进行充值并重新发起操作', '提示', {
-          showCancel: true,
-          confirmText: "查看订单"
-        }).then(function (res) {
-          if (res) {
-            _this2.$app.url.goto('/subPackages/order/order/order?index=' + 1);
-          }
-        });
-        return;
-      }
+      // this.$app.popup.toast('充值入口正在维护，敬请期待！')
+      // return
       this.$api.base("post", "/applet/v1/wft/order/createOrder", {
         levelId: this.coupons.data[this.coupons.index].id
       }, {}).then(function (addRes) {
@@ -415,28 +405,20 @@ var _default = {
         }
       });
     },
-    select_orderstatus: function select_orderstatus() {
-      var _this3 = this;
-      this.$api.base("post", "/chargeApi/queryOrderList", {
-        type: 1
-      }, {}).then(function (res) {
-        _this3.order_status = res.table.rows;
-      });
-    },
     get_orderPayment: function get_orderPayment() {
-      var _this4 = this;
+      var _this3 = this;
       // maspStatus（1:待补缴，2：已补缴）realPredictServiceCost平台；maspAmount第三方
       this.$api.base("post", "/chargeApi/queryOrderList-arrearage", {}, {}).then(function (res) {
-        _this4.order_info = res.data;
+        _this3.order_info = res.data;
       });
     },
     topage_order: function topage_order() {
       this.$app.url.goto('/subPackages/order/order-detail/order-detail?orderId=' + this.order_info.id);
     },
     getMyAccount: function getMyAccount() {
-      var _this5 = this;
+      var _this4 = this;
       this.$api.base("get", "/applet/v1/user/getUserInfo", {}, {}).then(function (res) {
-        _this5.userinfo = res.data;
+        _this4.userinfo = res.data;
       });
     }
   }

unpackage/dist/dev/mp-weixin/subPackages/coupon/recharge-log/recharge-log.js

@@ -263,6 +263,7 @@ var _default = {
       } else {
         this.search_data.pageNum = 1;
       }
+      // 订单状态 1 待支付 2 已支付 3 已取消 4 已退款
       this.$api.base("post", "/applet/v1/order/getTicketRecords", this.search_data, {}).then(function (res) {
         if (!append || currentPage + 1 === _this.search_data.pageNum) {
           if (append) {