XWookey 3 年之前
父節點
當前提交
84febb1d52
共有 2 個文件被更改,包括 32 次插入5 次删除
  1. 24 5
      pages/charging/charging.js
  2. 8 0
      pages/order/order.js

+ 24 - 5
pages/charging/charging.js

@@ -116,9 +116,13 @@ Page({
           //});
           log.info('[充电中]', '[结束充电]', '[成功跳转订单支付界面]', data);
           let url = `/pages/order/order?orderid=${orderid}&userId=${userId}&chargPileId=${chargPileId}`;
-          wx.redirectTo({
-            url
-          });
+          setTimeout(()=>{
+            wx.redirectTo({
+              url
+            });
+          },3000)
+
+
         } else {
           log.info('[充电中]', '[结束充电]', '[失败data null||data.code<>200]', data);
           wx.showModal({
@@ -272,6 +276,7 @@ Page({
               yczds
             });
             that.showChargingPng();
+
           } else if (chargingOrder.chargPileStatus == 3) { //充电完成,适用于主动拔枪
             clearInterval(chargingStatus);
             log.info('[充电中]', '[初次订单状态判定]', '[chargPileStatus状态3跳转到订单支付界面]', data);
@@ -357,6 +362,9 @@ Page({
     }
     let that = this;
     chargingStatus = setInterval(function() {
+      let chargPileIdCache = chargPileId;
+      let userIdCache = userId;
+      let orderidCache = orderid;
       wx.request({
         url: getApp().globalData.postHeadAgreement + '/restapi/pileLog/wechatchargstatus',
         data: {
@@ -403,18 +411,24 @@ Page({
               var cdscdy = parseFloat(chargingOrder.cdscdy).toFixed(2);
               var totalMoney = (parseFloat(chargingOrder.ycdfje) + parseFloat(chargingOrder.ycfwfje)).toFixed(2);
               var yczds = parseFloat(chargingOrder.yczds).toFixed(2);
+              // var orderid = orderid_r;
               that.setData({
                 chargingOrder,
                 chargPileId,
                 chargingTime,
                 chargingRate,
-                orderid: orderid_r,
+                orderid:orderid_r,
                 cdscdl,
                 cdscdy,
                 totalMoney,
                 yczds
               });
               that.drawCircle(chargingRate);
+              console.info("-----------")
+              console.info(that.data.orderid)
+              console.info(orderid)
+              console.info(orderid_r)
+              console.info("-----------")
             } else if (chargingOrder.chargPileStatus == 3) { //充电完成,适用于主动拔枪
               clearInterval(chargingStatus);
               log.info('[充电中]', '[充电轮训]', '[chargPileStatus状态3跳转到订单支付界面]', data);
@@ -438,9 +452,14 @@ Page({
               that.delOrder(orderid_r);
             }
           } else if (data && data.code == 500) {
+            console.info("ddddddddddddddddddddddddddd")
+            console.info(that.data.orderid)
+            console.info(userIdCache)
+            console.info(chargPileIdCache)
+            console.info("ddddddddddddddddddddddddddd")
             clearInterval(chargingStatus);
             log.info('[充电中]', '[充电轮训]', '[chargPileStatus状态3跳转到订单支付界面]', data);
-            let url = `/pages/order/order?orderid=${orderid}&userId=${userId}&chargPileId=${chargPileId}`;
+            let url = `/pages/order/order?orderid=${that.data.orderid}&userId=${userIdCache}&chargPileId=${chargPileIdCache}`;
             wx.redirectTo({
               url
             });

+ 8 - 0
pages/order/order.js

@@ -170,6 +170,14 @@ Page({
       userId,
       chargPileId
     });
+
+    console.info("ooooooooooooooooooooooooooooo")
+    console.info(orderid)
+    console.info(userId)
+    console.info(chargPileId)
+    console.info("ooooooooooooooooooooooooooooo")
+
+
     this.setData({
       orderid,
       userId,