修改部分代码

充电中主动结算，订单关闭界面跳转

pages/charging/charging.js

@@ -371,7 +371,14 @@ Page({
               console.log(orderid_r);
               that.delOrder(orderid_r);
             }
-          } else {
+          } else if (data && data.code == 500) {
+            clearInterval(chargingStatus);
+            log.info('[充电中]', '[充电轮训]', '[chargPileStatus状态3跳转到订单支付界面]', data);
+            let url = `/pages/order/order?orderid=${orderid}&userId=${userId}&chargPileId=${chargPileId}`;
+            wx.redirectTo({
+              url
+            });
+          }else{
             console.log(res);
           }
         }

pages/order/order.js

@@ -211,7 +211,7 @@ Page({
                 wx.hideLoading();
                 clearInterval(timeoutflag);
                 log.info('[订单支付]', '[轮训获取订单]', '[订单transstatus状态3]可手动支付');
-              }
+              
               // if (order.chargallmoney && order.chargpower) {
               //   wx.hideLoading();
               //   clearInterval(timeoutflag);
@@ -220,21 +220,21 @@ Page({
               //showCancel: false,
               //content: '获取订单成功'
               //});
-              var startDate = new Date(order.chargstarttime);
-              var endDate = new Date(order.chargendtime);
-              var totalTime = Math.floor((endDate.getTime() - startDate.getTime()) / 60000);
-              var totalTimeHour = Math.floor(totalTime / 60);
-              var totalTimeMinute = totalTime % 60;
-              var startTime = Util.formatNumber(startDate.getMonth() + 1) + '月' + Util.formatNumber(startDate.getDate()) + '日  ' + Util.formatNumber(startDate.getHours()) + ':' + Util.formatNumber(startDate.getMinutes()) + ':' + Util.formatNumber(startDate.getSeconds());
-              var endTime = Util.formatNumber(endDate.getMonth() + 1) + '月' + Util.formatNumber(endDate.getDate()) + '日  ' + Util.formatNumber(endDate.getHours()) + ':' + Util.formatNumber(endDate.getMinutes()) + ':' + Util.formatNumber(endDate.getSeconds());
-              totalTime = Util.formatNumber(totalTimeHour) + "时" + Util.formatNumber(totalTimeMinute) + "分";
-              that.setData({
-                order,
-                startTime,
-                endTime,
-                totalTime
-              });
-
+                var startDate = new Date(order.chargstarttime);
+                var endDate = new Date(order.chargendtime);
+                var totalTime = Math.floor((endDate.getTime() - startDate.getTime()) / 60000);
+                var totalTimeHour = Math.floor(totalTime / 60);
+                var totalTimeMinute = totalTime % 60;
+                var startTime = Util.formatNumber(startDate.getMonth() + 1) + '月' + Util.formatNumber(startDate.getDate()) + '日  ' + Util.formatNumber(startDate.getHours()) + ':' + Util.formatNumber(startDate.getMinutes()) + ':' + Util.formatNumber(startDate.getSeconds());
+                var endTime = Util.formatNumber(endDate.getMonth() + 1) + '月' + Util.formatNumber(endDate.getDate()) + '日  ' + Util.formatNumber(endDate.getHours()) + ':' + Util.formatNumber(endDate.getMinutes()) + ':' + Util.formatNumber(endDate.getSeconds());
+                totalTime = Util.formatNumber(totalTimeHour) + "时" + Util.formatNumber(totalTimeMinute) + "分";
+                that.setData({
+                  order,
+                  startTime,
+                  endTime,
+                  totalTime
+                });
+              }
               //console.log(that.data.result);
 
             } else {
@@ -265,7 +265,7 @@ Page({
   },
   closeView:function(){
     let url = `/pages/index/index`;
-    wx.redirectTo({
+    wx.reLaunch({
       url
     });
   },

pages/order/order.wxml

@@ -65,5 +65,5 @@
     </view>
   </view>-->
 </view>
-<button class='{{orderFlag?"pay_button1":"pay_button"}}' wx:if="{{order.paystatus==0}}" bindtap="{{orderFlag?'':'payOrder'}}">去支付</button>
-<button class='pay_button' wx:if="{{order.paystatus==1}}" bindtap="closeView">已余额扣款,请关闭</button>
+<button class='{{orderFlag?"pay_button1":"pay_button"}}' wx:if="{{order&&order.paystatus==0}}" bindtap="{{orderFlag?'':'payOrder'}}">去支付</button>
+<button class='pay_button' wx:if="{{order&&order.paystatus==1}}" bindtap="closeView">已余额扣款,请关闭</button>