07-05

.kaitian/compileMode.json

@@ -1,5 +1,5 @@
 {
-  "current": 0,
+  "current": null,
   "modes": [
     {
       "title": "二维码编译",

.tea/entryFiles-development/index$.web.js

@@ -4,10 +4,10 @@ require('./config$');
 require('../../components/foottip/foottip?hash=ec7c5687c7f2ffa836caf3a93e877914426baff6');
 require('../../pages/index/index?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/test/test?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
+require('../../pages/pay/pay?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/inputcode/inputcode?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/use_bike/use_bike?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/authorization/authorization?hash=55a54d58d54db023cdd93414867929a95382a8fa');
-require('../../pages/pay/pay?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/buy-card/buy-card?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/pay_success/pay_success?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/depoSuce/depoSuce?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');

.tea/entryFiles-development/index$.worker.js

@@ -35,10 +35,10 @@ require('../../app');
 require('../../components/foottip/foottip?hash=ec7c5687c7f2ffa836caf3a93e877914426baff6');
 require('../../pages/index/index?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/test/test?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
+require('../../pages/pay/pay?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/inputcode/inputcode?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/use_bike/use_bike?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/authorization/authorization?hash=55a54d58d54db023cdd93414867929a95382a8fa');
-require('../../pages/pay/pay?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/buy-card/buy-card?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/pay_success/pay_success?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/depoSuce/depoSuce?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');

.tea/entryFiles-production/index$.web.js

@@ -5,13 +5,13 @@ require('../../components/foottip/foottip?hash=ec7c5687c7f2ffa836caf3a93e8779144
 require('../../pages/index/index?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/test/test?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/inputcode/inputcode?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
+require('../../pages/use_bike/use_bike?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/authorization/authorization?hash=55a54d58d54db023cdd93414867929a95382a8fa');
 require('../../pages/pay/pay?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/buy-card/buy-card?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/pay_success/pay_success?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/depoSuce/depoSuce?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/charge_rule/charge_rule?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
-require('../../pages/use_bike/use_bike?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/balance/balance?hash=55a54d58d54db023cdd93414867929a95382a8fa');
 require('../../pages/change_mobile/change_mobile?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/trip/trip?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');

.tea/entryFiles-production/index$.worker.js

@@ -34,13 +34,13 @@ require('../../components/foottip/foottip?hash=ec7c5687c7f2ffa836caf3a93e8779144
 require('../../pages/index/index?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/test/test?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/inputcode/inputcode?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
+require('../../pages/use_bike/use_bike?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/authorization/authorization?hash=55a54d58d54db023cdd93414867929a95382a8fa');
 require('../../pages/pay/pay?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/buy-card/buy-card?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/pay_success/pay_success?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/depoSuce/depoSuce?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/charge_rule/charge_rule?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
-require('../../pages/use_bike/use_bike?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/balance/balance?hash=55a54d58d54db023cdd93414867929a95382a8fa');
 require('../../pages/change_mobile/change_mobile?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 require('../../pages/trip/trip?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');

app.json

@@ -2,10 +2,10 @@
   "pages": [
     "pages/index/index",
     "pages/test/test",
+    "pages/pay/pay",
     "pages/inputcode/inputcode",
     "pages/use_bike/use_bike",
     "pages/authorization/authorization",
-    "pages/pay/pay",
     "pages/buy-card/buy-card",
     "pages/pay_success/pay_success",
     "pages/depoSuce/depoSuce",

pages/pay/pay.axml

@@ -8,7 +8,10 @@
 	</view>
 	<view class="list" style="  margin-top: -100rpx;">
 		<view class="title">费用详情</view>
-
+    <view>
+			<text>订单编号</text>
+			<text>{{date.orders.no||'--'}}</text>
+		</view>
 		<view>
 			<text>时长费用</text>
 			<text>￥{{date.orders.time_money||'--'}}</text>

pages/pay/pay.js

@@ -99,10 +99,12 @@ Page({
   },
   onLoad: function (options) {
     console.log(options)
+
     var that = this;
     this.setData({
       screenHeight: app.globalData.screenHeight
     })
+    console.log(this.data.disable, '返回首页')
     if (options.rent == 'rent') {
 
     } else {
@@ -387,40 +389,45 @@ Page({
         console.log(res)
         //获取支付参数
         if (res.status == 200) {
-          if (that.data.index == 1) {
-            my.tradePay({
-              tradeNO: res.data.tradeNo,
-              success(resp) {
-                console.log(resp, 'zhifubao')
-                if (resp.resultCode == 9000) {
-                  my.reLaunch({
-                    url: '/pages/pay_success/pay_success',
-                  })
-                } else {
-                  return
-                }
+          if (res.data.pay_order_status == true) {
+            my.reLaunch({
+              url: '/pages/pay_success/pay_success',
+            })
+          } else
+            if (that.data.index == 1) {
+              my.tradePay({
+                tradeNO: res.data.tradeNo,
+                success(resp) {
+                  console.log(resp, 'zhifubao')
+                  if (resp.resultCode == 9000) {
+                    my.reLaunch({
+                      url: '/pages/pay_success/pay_success',
+                    })
+                  } else {
+                    return
+                  }
 
-              },
-              fail(err) {
-                // console.log(err)
-                // my.showToast({
-                //   content: '支付失败',
-                //   icon: 'none'
-                // })
-                // if (res.data.order_no != that.data.order) {
+                },
+                fail(err) {
+                  // console.log(err)
+                  // my.showToast({
+                  //   content: '支付失败',
+                  //   icon: 'none'
+                  // })
+                  // if (res.data.order_no != that.data.order) {
 
-                //   that.setData({
-                //     order: res.data.order_no
-                //   })
-                // }
-              }
-            })
-            that.setData({
-              disable: false
-            })
-          } else {
+                  //   that.setData({
+                  //     order: res.data.order_no
+                  //   })
+                  // }
+                }
+              })
+              that.setData({
+                disable: false
+              })
+            } else {
 
-          }
+            }
         } else {
           that.setData({
             disable: false
@@ -469,7 +476,9 @@ Page({
       mask: true
     })
     app.request(url + '/pay-show?order_no=' + that.data.order + '&is_first=true', '', 'GET').then(res => {
-      console.log(res)
+      console.log(res, '支付页面数据')
+      console.log(this.data.disable, '支付页面数据')
+
       if (res.status == 200) {
 
         that.setData({

pages/pay/pay.json

@@ -1,6 +1,7 @@
-{
-  "usingComponents": {},
-  "defaultTitle": "订单支付",
-  "navigationStyle":"custom",
-  "enablePullDownRefresh": true
+{
+  "usingComponents": {},
+  "defaultTitle": "订单支付",
+  "navigationStyle":"custom",
+  "pullRefresh": true
+  
 }

pages/use_bike/use_bike.axml

@@ -58,7 +58,7 @@
       <swiper-item class="swiper-item">
         <view class="ad-item">车辆静止三十分钟后将自动还车~</view>
       </swiper-item>
-      <swiper-item class="swiper-item">
+      <swiper-item class="swiper-item" a:if="{{bikeMessage.activity}}">
         <view class="ad-item">{{bikeMessage.activity}}</view>
       </swiper-item>
     </swiper>

pages/use_bike/use_bike.js

@@ -684,6 +684,16 @@ Page({
           })
         }
       })
+    } else if (userStatus.is_pay_order != false && userStatus.is_pay_order != undefined) {
+      my.alert({
+        title: '提示',
+        content: '您有一个待支付订单，请先支付',
+        success: function (res) {
+          my.reLaunch({
+            url: '/pages/index/index',
+          })
+        }
+      })
     }
     else {
       that.setData({
@@ -913,16 +923,17 @@ Page({
       content: '找车中...',
       mask: true
     })
-    //蓝牙寻铃找车
-    operateType = 'bell'
-    bluetoothOperate.start(operateType, machineNO, key, (flag) => {
-      //flag == true 操作成功
-      //flag == false 操作失败
-      //end
-    });
+
     app.request('/order/retry-bell-lock?order_no=' + that.data.order + '&bike_no=' + that.data.code, '', 'GET').then(res => {
       console.log(res)
       if (res.status == 200) {
+        //蓝牙寻铃找车
+        operateType = 'bell'
+        bluetoothOperate.start(operateType, machineNO, key, (flag) => {
+          //flag == true 操作成功
+          //flag == false 操作失败
+          //end
+        });
         res.data.is_ok == true && my.showToast({
           content: '找车成功',
           icon: 'none',
@@ -1004,17 +1015,18 @@ Page({
       lng: that.data.longitude
     }
     // clearInterval(inter1)
-    // 蓝牙临时开车
-    operateType = 'temporaryOpen'
-    bluetoothOperate.start(operateType, machineNO, key, (flag) => {
-      //flag == true 操作成功
-      //flag == false 操作失败
-      //end
-    });
+
     app.request('/bike/temporary-open-lock', data, 'POST').then(res => {
       // that.inter1()
       if (res.status == 200) {
         my.hideLoading()
+        // 蓝牙临时开车
+        operateType = 'temporaryOpen'
+        bluetoothOperate.start(operateType, machineNO, key, (flag) => {
+          //flag == true 操作成功
+          //flag == false 操作失败
+          //end
+        });
         my.showToast({
           content: '开车成功',
           icon: 'none'
@@ -1110,13 +1122,6 @@ Page({
         console.log('锁车成功')
         clearInterval(interval);
         clearInterval(linshiStop);
-        my.setStorageSync({ 'key': 'stopMiao', data: 0 })
-        my.setStorageSync({ 'key': 'stopmMinute', data: 30 })
-        my.hideLoading()
-
-        my.reLaunch({
-          url: '../pay/pay?order=' + res.data.no
-        })
         //蓝牙锁车操作 确定结束用车
         operateType = 'close'
         bluetoothOperate.start(operateType, machineNO, key, (flag) => {
@@ -1124,6 +1129,14 @@ Page({
           //flag == false 操作失败
           //end
         });
+        my.setStorageSync({ 'key': 'stopMiao', data: 0 })
+        my.setStorageSync({ 'key': 'stopmMinute', data: 30 })
+        my.hideLoading()
+
+        my.reLaunch({
+          url: '../pay/pay?order=' + res.data.no
+        })
+
       } else if (res.status == 450) {
         //运动中不能锁车请5s后重试
         my.showToast({