07-04-pm

.kaitian/compileMode.json

@@ -0,0 +1,10 @@
+{
+  "current": 0,
+  "modes": [
+    {
+      "title": "二维码编译",
+      "page": "pages/use_bike/use_bike",
+      "query": "qrCode=https%3A%2F%2Fcode.mtu.ximengnaikang.com%3Fp%3D1%26no%3D410100100"
+    }
+  ]
+}

.tea/entryFiles-development/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-development/index$.worker.js

@@ -36,13 +36,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.js

@@ -1,5 +1,15 @@
 App({
-  onLaunch: function () {
+  onLaunch: function (options) {
+  if (options.query) {
+      console.log('扫码加载')
+      var code1 = decodeURIComponent(options.query.qrCode)
+      var index = code1.lastIndexOf("\=");
+      let code = code1.substring(index + 1, code1.length);
+      this.globalData.scanCode=code
+    console.log(code,'ceode-------------------------------------')
+    }
+    
+
     if (my.canIUse('getUpdateManager')) {
       const updateManager = my.getUpdateManager()
       updateManager.onCheckForUpdate(function (res) {
@@ -38,6 +48,7 @@ App({
     imgUrl: 'http://resource.bike.hanyiyun.com/',
     screenHeight: '',
     login: false,
+    scanCode:'',//扫描普通二维码跳转小程序解析出的车牌号码
     platform: '',
     version: '',
     req: true,
@@ -157,14 +168,10 @@ App({
     let data = Math.round(new Date() / 1000);
     let tokenTime = my.getStorageSync({ 'key': 'token_time' }).data;
     let cha = data - tokenTime
-    let data1 = 60 * 60 * 24
+    let data1 = 60 * 60 * 12
     return new Promise((resolve, reject) => {
       if (token && cha < data1) {
         console.log(Math.round(new Date() / 1000), 'test--------')
-
-        console.log(cha, 'test--------')
-        console.log(data1, 'test-data1-------')
-
         return resolve();
 
       } else {

app.json

@@ -3,14 +3,13 @@
     "pages/index/index",
     "pages/test/test",
     "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/charge_rule/charge_rule",
-    "pages/use_bike/use_bike",
     "pages/balance/balance",
     "pages/change_mobile/change_mobile",
     "pages/trip/trip",

pages/authorization/authorization.js

@@ -19,85 +19,6 @@ Page({
     this.setData({
       logoUrl: app.globalData.logoUrl
     })
-    my.removeStorageSync({key:'token'});
-    my.getAuthCode({
-      success: function (res) {
-        my.getSystemInfo({
-          success(res) {
-            console.log(arr)
-            arr = [{
-              label: '品牌',
-              type: 'brand',
-              value: res.brand
-            },
-            {
-              label: '型号',
-              type: 'model',
-              value: res.model
-            },
-            {
-              label: '系统平台',
-              type: 'platform',
-              value: res.platform
-            },
-            {
-              label: '系统版本',
-              type: 'system',
-              value: res.system
-            },
-            {
-              label: '支付宝版本',
-              type: 'version',
-              value: res.version
-            },
-            {
-              label: '小程序版本',
-              type: 'SDKVersion',
-              value: res.SDKVersion
-            },
-            {
-              label: '定位状态',
-              type: 'locationEnabled',
-              value: res.locationEnabled ? '开' : '关'
-            },
-            {
-              label: '定位授权',
-              type: 'locationAuthorized',
-              value: res.locationAuthorized ? '已授权' : '未授权'
-            }
-            ]
-          }
-        })
-        // 发送 res.code 到后台换取 openId, sessionKey, unionId
-
-        console.log(app.globalData.appid, 'appid')
-
-        var data = {
-          'code': res.authCode,
-          'appid': app.globalData.appid,
-          'type': 1
-        };
-        app.request("/auth/weapp-login", data, "POST").then(res => {
-          console.log(res, '登录')
-          my.setStorageSync({ 'key': 'token', data: res.data.token });
-          my.setStorageSync({ 'key': 'session_key', data: res.data.session_key });
-          my.setStorageSync({ 'key': 'token_time', data: res.data.exp });
-          my.setStorageSync({ 'key': 'user_ID', data: res.data.user.id });
-          that.setData({
-            token: res.data.token,
-            session_key: res.data.session_key
-          })
-          app.request("/user/status", '', "GET").then(res => {
-            console.log(res)
-            if (res.status == 200) {
-              that.setData({
-                bind_mobile: res.data.is_bind_mobile
-              })
-            }
-          })
-        })
-      }
-    })
   },
     skipXieyi:function(){
     my.navigateTo({

pages/mine/mine.axml

@@ -43,6 +43,11 @@
       <text class="right-text">去开通</text>
 
     </view> -->
+    <view class="list-item" a:if="{{userInfo.user.is_deposit == 1 &&  userInfo.user.deposit_type==1}}" onTap="backDeposit"> 
+      <text class="iconfont icon-tongqian list-icon"></text>
+      <text>退还押金</text>
+      <text class="iconfont icon-iconfontjiantou2 right-arrow"></text>
+    </view>
     <view class="list-item" onTap="trip"> 
       <text class="iconfont icon-weizhi list-icon"></text>
       <text>行程</text>

pages/mine/mine.js

@@ -49,15 +49,15 @@ Page({
   },
   //同步用户信息
   userInfo: function (data) {
-    let that=this
+    let that = this
     app.request("/auth/weapp-userinfo-sync", data, "POST").then(res => {
-      console.log(res,'shouquan yonghuxinxi')
+      console.log(res, 'shouquan yonghuxinxi')
       if (res.status == 200) {
         // my.showToast({
         //   content: '授权成功',
         //   icon: 'none'
         // })
-        my.setStorageSync({'key':'userInfo',data:res.data.user})
+        my.setStorageSync({ 'key': 'userInfo', data: res.data.user })
         // wx.navigateBack()
         that.setData({ userInfo: res.data })
       } else {
@@ -73,7 +73,7 @@ Page({
     if (token != '') {
       app.request("/me", '', "GET").then(res => {
         console.log(res)
-        200 == res.status && my.setStorageSync({ 'key': "userInfo", data: res.data})
+        200 == res.status && my.setStorageSync({ 'key': "userInfo", data: res.data })
         this.setData({
           userInfo: res.data,
           deposit: my.getStorageSync({ 'key': 'userState' }).data,
@@ -172,5 +172,11 @@ Page({
       // url: '/pages/ride_zige/ride_zige',
       url: '/pages/buy-card/buy-card'
     })
-  }
+  },
+  //退还押金
+  backDeposit: function () {
+    my.navigateTo({
+      url: '/pages/ride_zige/ride_zige',
+    })
+  },
 })

pages/parking/parking.acss

@@ -178,7 +178,7 @@ map{
   width: 24px;
   height: 28px;
   border:  #e67674 2rpx solid;
-  background: #C0D2EF;
+  background: #fee0e0;
   box-sizing: border-box;
 }
 .parkBorder{

pages/ride_zige/ride_zige.axml

@@ -31,7 +31,7 @@
   </view>
   <view class="card-list">
     <view class="list-title">交押金用车</view>
-    <view class="card-item" class="{{currentItem==0 ? 'active' :'card-item'}}"   onTap="changeCard" data-id="0" >
+    <view class="card-item" class="{{currentItem==0 ? 'active' :'card-item'}}"   onTap="changeCard" data-id='0' >
       <view class="item-left">
         <view class="card-title">押金</view>
         <view class="card-text">随时可退 | 极速到账</view>

pages/ride_zige/ride_zige.js

@@ -119,7 +119,7 @@ Page({
                     duration: 1000,
                     success: function () {
                       my.reLaunch({
-                        url: '/pages/depochenSuce/depoSuce',
+                        url: '/pages/pay_success/pay_success',
                       })
                     }
                   })

pages/use_bike/use_bike.js

@@ -114,14 +114,17 @@ Page({
     })
   },
   onLoad: function (options) {
+    console.log(options, '--------------------------')
     let that = this
-    if (options.query) {
-      console.log('扫码加载')
-      var code1 = decodeURIComponent(options.query.qrCode)
-      var index = code1.lastIndexOf("\=");
-      let code = code1.substring(index + 1, code1.length);
+
+    if (app.globalData.scanCode) {
+      // console.log('扫码加载')
+      // var code1 = decodeURIComponent(options.query.qrCode)
+      // var index = code1.lastIndexOf("\=");
+      // let code = code1.substring(index + 1, code1.length);
       that.setData({
-        code: code
+        code: app.globalData.scanCode
+        // code: '410100100'
       })
     } else if (options.order != undefined) {
       that.setData({
@@ -656,18 +659,17 @@ Page({
     let that = this
     var userStatus = my.getStorageSync({ 'key': 'userState' }).data;
     var setting = my.getStorageSync({ 'key': 'setting' }).data;
-    if (userStatus.is_card_certified == 0 && setting.is_card == 1) {
-      if (userStatus.is_bind_mobile == 0) {
-        wx.navigateTo({
-          url: '/pages/authorization/authorization',
-        })
-        //未实名认证
-      } else
-        my.navigateTo({
-          url: '/pages/real_name/real_name',
-        })
-    }//是否缴纳押金
-    else if (userStatus.is_deposit == 0 && setting.is_deposit != 0 && userStatus.is_coupon_deposit_free == false) {
+    //未绑定手机号
+    if (userStatus.is_bind_mobile == 0) {
+      my.navigateTo({
+        url: '/pages/authorization/authorization',
+      })
+      //未实名认证
+    } else if (userStatus.is_card_certified == 0 && setting.is_card == 1) {
+      my.navigateTo({
+        url: '/pages/real_name/real_name',
+      })
+    } else if (userStatus.is_deposit == 0 && setting.is_deposit != 0 && userStatus.is_coupon_deposit_free == false) {
       my.navigateTo({
         url: '/pages/ride_zige/ride_zige',
       })