xvying 3 jaren geleden
bovenliggende
commit
6893de6af4
4 gewijzigde bestanden met toevoegingen van 7 en 7 verwijderingen
  1. 2 2
      app.js
  2. 1 1
      pages/index/index.js
  3. 3 3
      pages/pay/pay.js
  4. 1 1
      pages/use_bike/use_bike.js

+ 2 - 2
app.js

@@ -98,7 +98,7 @@ App({
               'url': api,
               'data': params,
               'merchant-id': this.globalData.merchant_id,
-              'authorization': wx.getStorageSync('token'),
+              'authorization':my.getStorageSync({ 'key': 'token' }).data,
               type: 'success',
               user: my.getStorageSync({ 'key': 'userInfo' }).data ? my.getStorageSync({ 'key': 'userInfo' }).data.user : '',
               version: '1.2.2'
@@ -181,7 +181,7 @@ App({
             'url': api,
             'data': params,
             'merchant-id': this.globalData.merchant_id,
-            'authorization': wx.getStorageSync('token'),
+            'authorization': my.getStorageSync({'key':'token'}).data,
             type: 'success',
             user: my.getStorageSync({ 'key': 'userInfo' }).data ? my.getStorageSync({ 'key': 'userInfo' }).data.user : '',
             version: '1.2.2'

+ 1 - 1
pages/index/index.js

@@ -395,7 +395,7 @@ Page({
               })
           }
           if (res.status == 423) {
-            wx.getLocation({
+            my.getLocation({
               success: function (res) {
                 my.alert({
                   title: '提示',

+ 3 - 3
pages/pay/pay.js

@@ -120,7 +120,7 @@ Page({
         content: '订单号有误,请重试~',
         showCancel: false,
         success: function (res) {
-          wx.reLaunch({
+          my.reLaunch({
             url: '/pages/index/index',
           })
         }
@@ -151,10 +151,10 @@ Page({
         disable: true
       })
       if (that.data.date.orders.pay_status == 1) {
-        wx.reLaunch({
+        my.reLaunch({
           url: '/pages/index/index',
         })
-        wx.hideLoading()
+        my.hideLoading()
         return
       }
       app.request(url + '/pay', data, 'POST').then(res => {

+ 1 - 1
pages/use_bike/use_bike.js

@@ -1285,7 +1285,7 @@ Page({
         icon: 'none',
         duration: 5000,
       })
-      wx.hideLoading()
+      my.hideLoading()
     })
   }, 1000),