jishiqi

pages/mine/mine.axml

@@ -42,7 +42,7 @@
   </view>
   <view class="mine-list">
     <!--<view class="list-item"><text class="zhifufen">开通微信支付分，享免充值用车</text><text class="iconfont icon-iconfontjiantou2 right-arrow"></text><text class="right-text">去开通</text></view> -->
-    <view class="list-item" a:if="{{userInfo.user.is_deposit == 1 &&  userInfo.user.deposit_money==1}}" onTap="backDeposit">
+    <view class="list-item" a:if="{{userInfo.user.is_deposit == 1 &&  userInfo.user.deposit_money>0}}" onTap="backDeposit">
       <text class="iconfont icon-tongqian list-icon"></text>
       <text>退还押金</text>
       <text class="iconfont icon-iconfontjiantou2 right-arrow"></text>

pages/use_bike/use_bike.js

@@ -68,6 +68,7 @@ Page({
     dispatch_money: 0,//调度费
     area_id: '',//区域id
     mapHeight: 'calc(100vh - 300px)',
+    isHour: false,//及时判断是否含有小时
 
   },
   onShow: function () {
@@ -487,6 +488,7 @@ Page({
     my.showLoading()
     var that = this;
     var date = Date.parse(new Date()) / 1000;
+     var setting =  my.getStorageSync({ 'key': 'setting' }).data;
     app.request('/pages/ride-order?no=' + that.data.order, '', 'GET').then(res => {
       console.log(res, ',---------')
       if (res.status == 200) {
@@ -498,9 +500,46 @@ Page({
             minute: 0
           })
         } else {
-          that.setData({
-            minute: date - res.data.start_use_bike_time
-          })
+          let cha = date - res.data.start_use_bike_time
+          console.log(Math.round(cha / 60), 'ppppp')
+          var time = parseInt(cha / 60) - setting.starting_price_time;
+          var per_money = setting.per_money;
+          var per_minute = setting.per_minute;
+          // console.log('测试1',times)
+          //页面进来时初始化金额
+
+          // let money = parseFloat(parseFloat(time / per_minute * per_money + parseFloat(setting.starting_price)).toFixed(2));
+          let money = parseInt(time / per_minute) * per_money + parseFloat(setting.starting_price)
+          var hour = Math.floor(cha / 3600 % 24);
+          // 分钟
+          var minute = Math.floor(cha / 60 % 60);
+          // let hour = parseInt(cha / 3600)
+          console.log(hour, 'hour')
+          console.log(minute, 'hour')
+          hour = hour < 10 ? '0' + hour : hour
+          minute = minute < 10 && hour > 0 ? '0' + minute : minute
+          if (hour > 0) {
+            // let minute=
+
+            that.setData({
+              minute: date - res.data.start_use_bike_time,
+              times: hour + ":" + minute,
+              estimate_money: money,
+              isHour: true
+            })
+          } else {
+            // let minute = parseInt(cha / 60)
+            that.setData({
+              minute: date - res.data.start_use_bike_time,
+              times: minute,
+              estimate_money: money,
+              isHour: false
+            })
+          }
+
+          // that.setData({
+          //   minute: date - res.data.start_use_bike_time
+          // })
         }
         that.terval()
         my.showToast({
@@ -639,36 +678,13 @@ Page({
     clearInterval(interval)
     clearInterval(huancheTime)
     var times = ''; //秒数
-    var minute = 0; //分钟
+    var minute = Math.round(that.data.minute / 60); //分钟
     var minute1 = '0'; //分钟
     var hour = 0; //小时
     var hour1 = '0'; //小时
     var time = that.data.minute //获取当前已骑行的秒数
-    console.log(time)
     var setting = my.getStorageSync({ 'key': 'setting' }).data;
-    var no_money_time = time;
-    var close_bike_time = setting.close_bike_time;
-    if (no_money_time < close_bike_time) {
-      that.setData({
-        huanche_timeout: close_bike_time - no_money_time
-      })
-      huancheTime = setInterval(() => {
-        var no_money_time1 = that.data.huanche_timeout - 1
-        that.setData({
-          huanche_timeout: no_money_time1
-        })
-        if (no_money_time1 == 0) {
-          that.setData({
-            huanche_timeout: -1
-          })
-          clearInterval(huancheTime)
-        }
-      }, 1000);
-    } else {
-      that.setData({
-        huanche_timeout: -1
-      })
-    }
+
     if (time > 60) { //秒数大于60 分钟= 秒数/60  秒数=  -1*60  40
       minute = parseInt(time / 60);
       times = time - minute * 60;
@@ -679,15 +695,8 @@ Page({
     }
     interval = setInterval(function () {
       //定时器 秒数一秒加1
-      times++
-      if (times > 59) { //如果秒数大于59 让分钟加1 秒数归0
-        minute = minute + 1
-        times = 0
-      }
-      if (times < 10) { //如果秒数小于10 加一个0
-        times = '0' + times
-      }
-      if (minute < 10) { //如果分钟小于10 加一个0
+      minute++
+      if (minute < 10 && hour>0) { //如果分钟小于10 加一个0
         minute1 = '0' + minute
       } else {
         minute1 = minute
@@ -708,19 +717,21 @@ Page({
         minute1 = minute1
       }
       if (hour > 0) {
-        //如果小时大于0 显示 时分
+        // //如果小时大于0 显示 时分
         that.setData({
-          times: hour1 + ':' + minute1 + ':' + times
+          times: hour1 + ':' + minute1,
+          isHour: true
         })
       } else {
-        //else 显示 分秒
+        // //else 显示 分秒
         that.setData({
-          times: minute1 + ':' + times
+          times: minute1,
+          isHour: false
         })
       }
       // that.setData({ times: minute1 + ':' + times})
       //计算钱   分钟除以5*5   判断秒数>30  minute = minute+1
-      //不满12分钟按12分钟算   并且大于30秒
+      //不满12分钟按12分钟算   并且大于30秒   
       var per_money = setting.per_money;
       var per_minute = setting.per_minute;
       // console.log(minute)
@@ -733,23 +744,17 @@ Page({
 
         //起步价+（分钟数-起步时长）/ 一块钱可骑多少分钟 * 钱数
         var time = minute - setting.starting_price_time;
-        let money = parseFloat(parseFloat(time / per_minute * per_money + parseFloat(setting.starting_price)).toFixed(2));
-        // if (money == NaN) {
-        //   money = parseFloat(parseFloat(time / per_minute * per_money + parseFloat(setting.starting_price)).toFixed(2));
-        // }
-        // if (minute > 0) {
+        // console.log('测试1',times)
+        //页面进来时初始化金额
+
+        // let money = Math.round(time / per_minute) * per_money + parseFloat(setting.starting_price)
+        let money = parseInt(time / per_minute) * per_money + parseFloat(setting.starting_price)
         that.setData({
-          estimate_money: money
+          estimate_money: money,
+          onload: true
         })
-        // } else {
-        //   if (times >= 30) {
-        //     that.setData({
-        //       estimate_money: Math.ceil(1 / per_minute * Number(per_money))
-        //     })
-        //   }
-        // }
       }
-    }, 1000)
+    }, 60000)
   },
 
   //获取车辆信息