소스 검색

修复bug

XWookey 3 년 전
부모
커밋
08e8e75e33
5개의 변경된 파일25개의 추가작업 그리고 12개의 파일을 삭제
  1. 1 0
      app.json
  2. 1 1
      pages/chargemoney/chargemoney.js
  3. 17 6
      pages/charging/charging.js
  4. 4 3
      pages/scan_result/scan_result.wxml
  5. 2 2
      pages/ucenter/index/index.wxml

+ 1 - 0
app.json

@@ -48,6 +48,7 @@
     "request": 300000,
     "request": 300000,
     "connectSocket": 300000
     "connectSocket": 300000
   },
   },
+  
   "debug": false,
   "debug": false,
   "sitemapLocation": "sitemap.json"
   "sitemapLocation": "sitemap.json"
 }
 }

+ 1 - 1
pages/chargemoney/chargemoney.js

@@ -61,7 +61,7 @@ Page({
               method: 'POST',
               method: 'POST',
               success(res1) {
               success(res1) {
                 log.info('[充值]', '[服务端微信充值]', '[响应]', res1.data);
                 log.info('[充值]', '[服务端微信充值]', '[响应]', res1.data);
-                //console.log(res1);
+                console.log(res1);
                 log.info('[充值]', '[微信支付]', '[请求]', {
                 log.info('[充值]', '[微信支付]', '[请求]', {
                   timeStamp: res1.data.timeStamp,
                   timeStamp: res1.data.timeStamp,
                   nonceStr: res1.data.nonceStr,
                   nonceStr: res1.data.nonceStr,

+ 17 - 6
pages/charging/charging.js

@@ -257,8 +257,8 @@ Page({
               var chargingTime = chargingTimeHour + ":" + chargingTimeMinute + ":00";
               var chargingTime = chargingTimeHour + ":" + chargingTimeMinute + ":00";
             }
             }
             var totalMoney = (parseFloat(chargingOrder.ycdfje) + parseFloat(chargingOrder.ycfwfje)).toFixed(2);
             var totalMoney = (parseFloat(chargingOrder.ycdfje) + parseFloat(chargingOrder.ycfwfje)).toFixed(2);
-            var cdscdl = chargingOrder.cdscdl;
-            var cdscdy = chargingOrder.cdscdy;
+            var cdscdl = parseFloat(chargingOrder.cdscdl).toFixed(2);
+            var cdscdy = parseFloat(chargingOrder.cdscdy).toFixed(2);
             var yczds = parseFloat(chargingOrder.yczds).toFixed(2);
             var yczds = parseFloat(chargingOrder.yczds).toFixed(2);
             that.setData({
             that.setData({
               chargingOrder,
               chargingOrder,
@@ -293,7 +293,18 @@ Page({
             that.delOrder(orderid_r);
             that.delOrder(orderid_r);
             console.log(orderid_r);
             console.log(orderid_r);
           }
           }
-        } else {
+        // } else if(data && data.code == 500){
+        //   clearInterval(chargingStatus);
+        //   console.info("xxxxxxxxxxxxxxxxxxxxxxx")
+        //   console.info(orderid)
+        //   console.info(userId)
+        //   console.info(chargPileId)
+        //   log.info('[充电中]', '[结束充电]', '[成功跳转订单支付界面]', data);
+        //   let url = `/pages/order/order?orderid=${orderid}&userId=${userId}&chargPileId=${chargPileId}`;
+        //   wx.redirectTo({
+        //     url
+        //   });
+        } else{
           console.log(res);
           console.log(res);
         }
         }
       },
       },
@@ -386,8 +397,8 @@ Page({
                 }
                 }
                 var chargingTime = chargingTimeHour + ":" + chargingTimeMinute + ":00";
                 var chargingTime = chargingTimeHour + ":" + chargingTimeMinute + ":00";
               }
               }
-              var cdscdl = chargingOrder.cdscdl;
-              var cdscdy = chargingOrder.cdscdy;
+              var cdscdl = parseFloat(chargingOrder.cdscdl).toFixed(2);
+              var cdscdy = parseFloat(chargingOrder.cdscdy).toFixed(2);
               var totalMoney = (parseFloat(chargingOrder.ycdfje) + parseFloat(chargingOrder.ycfwfje)).toFixed(2);
               var totalMoney = (parseFloat(chargingOrder.ycdfje) + parseFloat(chargingOrder.ycfwfje)).toFixed(2);
               var yczds = parseFloat(chargingOrder.yczds).toFixed(2);
               var yczds = parseFloat(chargingOrder.yczds).toFixed(2);
               that.setData({
               that.setData({
@@ -429,7 +440,7 @@ Page({
           }
           }
         }
         }
       });
       });
-    }, 20000);
+    }, 5000);
   },
   },
 
 
   /**
   /**

+ 4 - 3
pages/scan_result/scan_result.wxml

@@ -18,7 +18,7 @@
     <text class='slow' wx:if="{{chargPile.pileType=='慢充'}}">慢桩:2小时</text> -->
     <text class='slow' wx:if="{{chargPile.pileType=='慢充'}}">慢桩:2小时</text> -->
     <text class="inline">实时参考费用:</text>
     <text class="inline">实时参考费用:</text>
     <view style='line-height:0;'>
     <view style='line-height:0;'>
-      <text decode='true' style='color:red;font-size:24rpx;margin-bottom:10rpx;'>电&nbsp;&nbsp;&nbsp;费:{{chargPile.chargprice}}元&nbsp;&nbsp;服务费:{{chargPile.serviceprice}}元&nbsp;&nbsp;总费用:{{chargPile.totalprice}}元</text>
+      <text decode='true' style='font-size:24rpx;margin-bottom:10rpx;'>电&nbsp;&nbsp;&nbsp;费:{{chargPile.chargprice}}元&nbsp;&nbsp;服务费:{{chargPile.serviceprice}}元&nbsp;&nbsp;总费用:{{chargPile.totalprice}}元</text>
     </view>
     </view>
     <text class="inline">参考价格:</text>
     <text class="inline">参考价格:</text>
     <view style='line-height:0;'>
     <view style='line-height:0;'>
@@ -62,8 +62,9 @@
   <view>
   <view>
     <rich-text style='line-height:48rpx;color:red;font-size:32rpx;word-break:break-all;'>您当前余额为:{{repaidbalance}}元。建议参考充电总费用(元/度电)与您爱车的电池容量(度),避免因费用不足导致充电量不足的情况发生。</rich-text>
     <rich-text style='line-height:48rpx;color:red;font-size:32rpx;word-break:break-all;'>您当前余额为:{{repaidbalance}}元。建议参考充电总费用(元/度电)与您爱车的电池容量(度),避免因费用不足导致充电量不足的情况发生。</rich-text>
   </view>
   </view>
-  <view wx:if="{{chargPile.showinfo}}">
+  <!-- <view wx:if="{{chargPile.showinfo}}"> -->
+  信息展示:
     <rich-text style='line-height:48rpx;color:red;font-size:32rpx;word-break:break-all;'>{{chargPile.showinfo}}</rich-text>
     <rich-text style='line-height:48rpx;color:red;font-size:32rpx;word-break:break-all;'>{{chargPile.showinfo}}</rich-text>
-  </view>
+  <!-- </view> -->
   <button wx:if="{{chargPile}}" class='charg_button' bindtap="beginCharge" >开始充电</button>
   <button wx:if="{{chargPile}}" class='charg_button' bindtap="beginCharge" >开始充电</button>
 
 

+ 2 - 2
pages/ucenter/index/index.wxml

@@ -144,7 +144,7 @@
   <text class="h1">客服电话:18211188302</text>
   <text class="h1">客服电话:18211188302</text>
   <text class="h1">工作时间:工作日 08:00-17:00</text>
   <text class="h1">工作时间:工作日 08:00-17:00</text>
 </view> -->
 </view> -->
-<view class='footer'>
+<!-- <view class='footer'>
   <view class='footer_1' bindtap="toindex">
   <view class='footer_1' bindtap="toindex">
     <image src='/images/index.png'></image>
     <image src='/images/index.png'></image>
     <text>首页</text>
     <text>首页</text>
@@ -156,4 +156,4 @@
     <image src='/images/ucenter_selected.png'></image>
     <image src='/images/ucenter_selected.png'></image>
     <text class='selected'>我的</text>
     <text class='selected'>我的</text>
   </view>
   </view>
-</view>
+</view> -->