stanley-king 4 年 前
コミット
c9de3f3098

+ 6 - 0
app.js

@@ -54,4 +54,10 @@ App({
     clearRecord() {
     clearRecord() {
         this.globalData.record = null
         this.globalData.record = null
     },
     },
+    navigateto(page) 
+    {
+        wx.navigateTo({
+            url: page,
+        })
+    }
 })
 })

+ 65 - 64
app.json

@@ -1,66 +1,67 @@
 {
 {
-  "pages": [
-    "pages/postage/postage",
-    "pages/postageManage/postageManage",
-    "pages/postageDetail/postageDetail",
-    "pages/index/index",
-    "pages/myhome/myhome",
-    "pages/address/address",
-    "pages/phoneCharges/phoneCharges",
-    "pages/discover/discover",
-    "pages/shopCart/shopCart",
-    "pages/person/person",
-    "pages/details/details",
-    "pages/webView/webView",
-    "pages/special/special",
-    "pages/brand/brand",
-    "pages/comments/comments",
-    "pages/search/search",
-    "pages/confirmOrder/confirmOrder",
-    "pages/confirmVOrder/confirmVOrder",
-    "pages/order_tabs/orderTabs",
-    "pages/addAddress/addAddress",
-    "pages/orderPaySn/orderPaySn",
-    "pages/fcode/fcode",
-    "pages/login/login",
-    "pages/shareBonus/shareBonus",
-    "pages/handOutBonus/handOutBonus",
-    "pages/auth/auth"
-  ],
-  "window": {
-    "backgroundTextStyle": "dark",
-    "navigationBarBackgroundColor": "#fff",
-    "navigationBarTitleText": "椰子充值",
-    "navigationBarTextStyle": "black",
-    "onReachBottomDistance": 200
-  },
-  "tabBar": {
-    "selectedColor": "#2B2B2B",
-    "backgroundColor": "#ffffff",
-    "borderStyle": "black",
-    "list": [
-      {
-        "iconPath": "./image/tabbar/index.png",
-        "selectedIconPath": "./image/tabbar/indexed.png",
-        "pagePath": "pages/index/index",
-        "text": "首页"
-      },
-      {
-        "iconPath": "./image/tabbar/phone.png",
-        "selectedIconPath": "./image/tabbar/phoned.png",
-        "pagePath": "pages/postage/postage",
-        "text": "加油"
-      },
-      {
-        "iconPath": "./image/tabbar/me.png",
-        "selectedIconPath": "./image/tabbar/med.png",
-        "pagePath": "pages/myhome/myhome",
-        "text": "我的"
-      }
-    ]
-  },
-  "networkTimeout": {
-    "request": 20000
-  },
-  "sitemapLocation": "sitemap.json"
+	"pages": [
+		"pages/postage/postage",
+		"pages/postageManage/postageManage",
+		"pages/postageDetail/postageDetail",
+		"pages/index/index",
+		"pages/myhome/myhome",
+		"pages/address/address",
+		"pages/phoneCharges/phoneCharges",
+		"pages/discover/discover",
+		"pages/shopCart/shopCart",
+		"pages/person/person",
+		"pages/details/details",
+		"pages/webView/webView",
+		"pages/special/special",
+		"pages/brand/brand",
+		"pages/comments/comments",
+		"pages/search/search",
+		"pages/confirmOrder/confirmOrder",
+		"pages/confirmVOrder/confirmVOrder",
+		"pages/order_tabs/orderTabs",
+		"pages/addAddress/addAddress",
+		"pages/orderPaySn/orderPaySn",
+		"pages/fcode/fcode",
+		"pages/login/login",
+		"pages/shareBonus/shareBonus",
+		"pages/handOutBonus/handOutBonus",
+		"pages/auth/auth",
+		"pages/authmobile/authmobile"
+	],
+	"window": {
+		"backgroundTextStyle": "dark",
+		"navigationBarBackgroundColor": "#fff",
+		"navigationBarTitleText": "椰子充值",
+		"navigationBarTextStyle": "black",
+		"onReachBottomDistance": 200
+	},
+	"tabBar": {
+		"selectedColor": "#2B2B2B",
+		"backgroundColor": "#ffffff",
+		"borderStyle": "black",
+		"list": [
+			{
+				"iconPath": "./image/tabbar/index.png",
+				"selectedIconPath": "./image/tabbar/indexed.png",
+				"pagePath": "pages/index/index",
+				"text": "首页"
+			},
+			{
+				"iconPath": "./image/tabbar/phone.png",
+				"selectedIconPath": "./image/tabbar/phoned.png",
+				"pagePath": "pages/postage/postage",
+				"text": "加油"
+			},
+			{
+				"iconPath": "./image/tabbar/me.png",
+				"selectedIconPath": "./image/tabbar/med.png",
+				"pagePath": "pages/myhome/myhome",
+				"text": "我的"
+			}
+		]
+	},
+	"networkTimeout": {
+		"request": 20000
+	},
+	"sitemapLocation": "sitemap.json"
 }
 }

+ 29 - 8
config.js

@@ -3,11 +3,14 @@
 // let api = "http://192.168.1.200/mobile/index.php";
 // let api = "http://192.168.1.200/mobile/index.php";
 let api = "https://www.xyzshops.cn/mobile/index.php";
 let api = "https://www.xyzshops.cn/mobile/index.php";
 
 
+let app = getApp();
+
 function getReq(data, callback, method)
 function getReq(data, callback, method)
 {
 {
   let options = { 
   let options = { 
     client_type: 'mini'
     client_type: 'mini'
   }
   }
+
   data = Object.assign({}, options, data);
   data = Object.assign({}, options, data);
   let session_id = wx.getStorageSync('session_id');
   let session_id = wx.getStorageSync('session_id');
   if (!session_id && data['op'] != 'ministart') {
   if (!session_id && data['op'] != 'ministart') {
@@ -16,6 +19,22 @@ function getReq(data, callback, method)
     }, 0);
     }, 0);
     return;
     return;
   }
   }
+  let act = data['act'];
+  if(act.indexOf('member_') == 0)
+  {
+    console.log(act + ' must check login status.')
+    // wx.navigateTo({
+    //   url: '/pages/auth/auth',
+    // })
+    // if(!app.globalData.userInfo) {
+    //   wx.navigateTo({
+    //     url: '/pages/auth/auth',
+    //   })
+    // }
+  } 
+  else {
+    console.log('act = ' + act);
+  }
 
 
   let header = {
   let header = {
     'content-type': 'application/json', // 默认值
     'content-type': 'application/json', // 默认值
@@ -36,14 +55,16 @@ function getReq(data, callback, method)
     header,
     header,
     success(res) 
     success(res) 
     {
     {
-      if(res.data.code == 10014) {
-        wx.navigateTo({
-          url: '/pages/auth/auth',
-        })
-      }
-      else {
-        callback(res.data)
-      }
+      callback(res.data)
+      
+      // if(res.data.code == 10014) {
+      //   wx.navigateTo({
+      //     url: '/pages/auth/auth',
+      //   })
+      // }
+      // else {
+      //   callback(res.data)
+      // }
     },
     },
     fail() 
     fail() 
     {
     {

+ 2 - 2
pages/addAddress/addAddress.js

@@ -1,7 +1,7 @@
 // pages/addAddress/addAddress.js
 // pages/addAddress/addAddress.js
 const getReq = require('../../config.js').getReq
 const getReq = require('../../config.js').getReq
 import trees from '../../areas.js'
 import trees from '../../areas.js'
-const appInstance = getApp()
+const app = getApp()
 Page({
 Page({
 
 
   /**
   /**
@@ -251,7 +251,7 @@ Page({
     let is_default = self.data.checked ? 1 : 0
     let is_default = self.data.checked ? 1 : 0
     if (is_default) {
     if (is_default) {
       let area_info = self.data.area_info
       let area_info = self.data.area_info
-      appInstance.checkDefaultAddress({
+      app.checkDefaultAddress({
         true_name,
         true_name,
         mob_phone,
         mob_phone,
         area_info,
         area_info,

+ 5 - 6
pages/address/address.js

@@ -1,6 +1,6 @@
 // pages/address/address.js
 // pages/address/address.js
 const getReq = require('../../config.js').getReq
 const getReq = require('../../config.js').getReq
-const appInstance = getApp()
+const app = getApp()
 Page({
 Page({
 
 
   /**
   /**
@@ -38,7 +38,7 @@ Page({
       if (res.code == 200) {
       if (res.code == 200) {
         let address_list = res.datas.address_list
         let address_list = res.datas.address_list
         if(!address_list.length) {
         if(!address_list.length) {
-          appInstance.clearAddress()
+          app.clearAddress()
         }
         }
         self.setData({
         self.setData({
           address_list,
           address_list,
@@ -66,7 +66,7 @@ Page({
     let area_id = dataset.areaid
     let area_id = dataset.areaid
     let city_id = dataset.cityid
     let city_id = dataset.cityid
     
     
-    appInstance.checkDefaultAddress({
+    app.checkDefaultAddress({
       true_name,
       true_name,
       mob_phone,
       mob_phone,
       area_info,
       area_info,
@@ -87,9 +87,8 @@ Page({
     let address_id = dataset.addressid
     let address_id = dataset.addressid
     let area_id = dataset.areaid
     let area_id = dataset.areaid
     let city_id = dataset.cityid
     let city_id = dataset.cityid
-    wx.navigateTo({
-      url: `/pages/addAddress/addAddress?true_name=${true_name}&mob_phone=${mob_phone}&area_info=${area_info}&address=${address}&area_id=${area_id}&address_id=${address_id}&city_id=${city_id}`
-    })
+    let page = `/pages/addAddress/addAddress?true_name=${true_name}&mob_phone=${mob_phone}&area_info=${area_info}&address=${address}&area_id=${area_id}&address_id=${address_id}&city_id=${city_id}`
+    app.navigateto(page)
   },
   },
   del_address(e) {
   del_address(e) {
     let self = this;
     let self = this;

+ 15 - 43
pages/components/blockItem/blockItem.js

@@ -2,7 +2,7 @@
 const getTypeSn    = require('../../../utils/util.js').getTypeSn;
 const getTypeSn    = require('../../../utils/util.js').getTypeSn;
 const parseAppjump = require('../../../utils/util.js').parseAppjump;
 const parseAppjump = require('../../../utils/util.js').parseAppjump;
 const buyVGoods = require('../../../config.js').buyVGoods;
 const buyVGoods = require('../../../config.js').buyVGoods;
-
+let app = getApp()
 Component({
 Component({
   /**
   /**
    * 组件的属性列表
    * 组件的属性列表
@@ -103,64 +103,37 @@ Component({
       const target_data = e.target.dataset.target || e.currentTarget.dataset.target;
       const target_data = e.target.dataset.target || e.currentTarget.dataset.target;
       const title = e.target.dataset.title || e.currentTarget.dataset.title;
       const title = e.target.dataset.title || e.currentTarget.dataset.title;
       if (!type) return;
       if (!type) return;
-      switch (type) {
+      switch (type) 
+      {
         case "url": {
         case "url": {
           let attr = encodeURIComponent(`${target_data}`);
           let attr = encodeURIComponent(`${target_data}`);
-          // let type_sn = ''
-          // if (target_data.indexOf('type_sn') != -1) {
-          //   let arr = target_data.split('&')
-
-          //   arr.some(item => {
-          //     if (item.indexOf('type_sn') != -1) {
-          //       type_sn = item.split('=')[1]
-          //       return true
-          //     }
-          //   })
-          //   if (type_sn) {
-          //     wx.navigateTo({
-          //       url: `/pages/shareBonus/shareBonus?type_sn=${type_sn}`
-          //     })
-          //     break;
-          //   }
-          // }
-
           let type_sn = getTypeSn(target_data)
           let type_sn = getTypeSn(target_data)
           if (type_sn) {
           if (type_sn) {
-            wx.navigateTo({
-              url: `/pages/shareBonus/shareBonus?type_sn=${type_sn}`
-            })
+            app.navigateto(`/pages/shareBonus/shareBonus?type_sn=${type_sn}`)
             break;
             break;
           }
           }
-          wx.navigateTo({
-            url: '/pages/webView/webView?url=' + attr
-          })
+          app.navigateto('/pages/webView/webView?url=' + attr)
           break;
           break;
         }
         }
         case "special": {
         case "special": {
-          wx.navigateTo({
-            url: `/pages/special/special?special_id=${target_data}&title=${title}`
-          })
+          app.navigateto(`/pages/special/special?special_id=${target_data}&title=${title}`)
           break;
           break;
         }
         }
         case "goods": {
         case "goods": {
-          wx.navigateTo({
-            url: `/pages/details/details?goods_id=${target_data}&title=商品详情`
-          })
+          let page = `/pages/details/details?goods_id=${target_data}&title=商品详情`
+          app.navigateto(page)
           break;
           break;
         }
         }
         case "brand": {
         case "brand": {
-          wx.navigateTo({
-            url: `/pages/brand/brand?brand_id=${target_data}&title=${title}`
-          })
+          app.navigateto(`/pages/brand/brand?brand_id=${target_data}&title=${title}`)
           break;
           break;
         }
         }
         case "keyword": {
         case "keyword": {
-          wx.navigateTo({
-            url: `/pages/brand/brand?keyword=${target_data}&title=${title}`
-          })
+          app.navigateto(`/pages/brand/brand?keyword=${target_data}&title=${title}`)
           break;
           break;
         }
         }
-        case "appjump": {
+        case "appjump": 
+        {
           //let url = 'xyzshop://www.xyzshops.com/DirectBuyVGoods?goods_id=6217&num=1';
           //let url = 'xyzshop://www.xyzshops.com/DirectBuyVGoods?goods_id=6217&num=1';
           let url = target_data;
           let url = target_data;
           const [prefix, params] = parseAppjump(url);
           const [prefix, params] = parseAppjump(url);
@@ -169,7 +142,8 @@ Component({
             let goods_id = params['goods_id'];
             let goods_id = params['goods_id'];
             let num = params['num'];
             let num = params['num'];
             buyVGoods(goods_id,num);
             buyVGoods(goods_id,num);
-          }else if(prefix == 'xyzshop://www.xyzshops.com/NavigatePage')
+          }
+          else if(prefix == 'xyzshop://www.xyzshops.com/NavigatePage')
             switch(params.page){
             switch(params.page){
               case "oil" : 
               case "oil" : 
                 wx.switchTab({
                 wx.switchTab({
@@ -177,9 +151,7 @@ Component({
                 })
                 })
                 break;
                 break;
               case "phone" : 
               case "phone" : 
-                wx.navigateTo({
-                  url: '/pages/phoneCharges/phoneCharges'
-                })
+                app.navigateto('/pages/phoneCharges/phoneCharges') 
                 break;
                 break;
               default: 
               default: 
               console.log(params.page + 'page找不到');
               console.log(params.page + 'page找不到');

+ 3 - 3
pages/components/blocks/home_words/homeWords.js

@@ -1,4 +1,5 @@
 // pages/components/blocks/home_words/homeWords.js
 // pages/components/blocks/home_words/homeWords.js
+let app = getApp()
 Component({
 Component({
   /**
   /**
    * 组件的属性列表
    * 组件的属性列表
@@ -25,9 +26,8 @@ Component({
   methods: {
   methods: {
     navigator(e){
     navigator(e){
       const title = e.target.dataset.title;
       const title = e.target.dataset.title;
-      wx.navigateTo({
-        url: `/pages/brand/brand?keyword=${title}&title=${title}`,
-      })
+      let page = `/pages/brand/brand?keyword=${title}&title=${title}`
+      app.navigateto(page)
     }
     }
   }
   }
 })
 })

+ 2 - 3
pages/components/blocks/search/search.js

@@ -1,4 +1,5 @@
 // pages/components/blocks/search/search.js
 // pages/components/blocks/search/search.js
+let app = getApp()
 Component({
 Component({
   /**
   /**
    * 组件的属性列表
    * 组件的属性列表
@@ -19,9 +20,7 @@ Component({
    */
    */
   methods: {
   methods: {
     skipSearch(){
     skipSearch(){
-      wx.navigateTo({
-        url: '/pages/search/search',
-      })
+      app.navigateto('/pages/search/search')
     }
     }
   }
   }
 })
 })

+ 3 - 6
pages/components/blocks/search_box/search_box.js

@@ -1,5 +1,6 @@
 // pages/components/blocks/search_box/search_box.js
 // pages/components/blocks/search_box/search_box.js
 const getReq = require('../../../../config.js').getReq;
 const getReq = require('../../../../config.js').getReq;
+let app = getApp()
 Component({
 Component({
   /**
   /**
    * 组件的属性列表
    * 组件的属性列表
@@ -22,18 +23,14 @@ Component({
   methods: {
   methods: {
     skip_target(e){
     skip_target(e){
       let word = e.target.dataset.word;
       let word = e.target.dataset.word;
-      wx.navigateTo({
-        url: `/pages/brand/brand?keyword=${word}&title=${word}`,
-      })
+      app.navigateto(`/pages/brand/brand?keyword=${word}&title=${word}`)
     },
     },
     search_btn(){
     search_btn(){
       let inputVal = this.data.inputVal;
       let inputVal = this.data.inputVal;
       if (!inputVal) {
       if (!inputVal) {
         return;
         return;
       } 
       } 
-      wx.navigateTo({
-        url: `/pages/brand/brand?keyword=${inputVal}&title=${inputVal}`,
-      })
+      app.navigateto(`/pages/brand/brand?keyword=${inputVal}&title=${inputVal}`)
     },
     },
     input(e){
     input(e){
       let self = this;
       let self = this;

+ 4 - 8
pages/components/bonusTips/bonusTips.js

@@ -1,4 +1,5 @@
 // pages/components/bonusTips/bonusTips.js
 // pages/components/bonusTips/bonusTips.js
+let app = getApp()
 Component({
 Component({
   /**
   /**
    * 组件的属性列表
    * 组件的属性列表
@@ -28,17 +29,12 @@ Component({
       let { btn_type } = this.properties.tipsDatas
       let { btn_type } = this.properties.tipsDatas
       if (btn_type == 'detail') {
       if (btn_type == 'detail') {
         let { type_sn } = this.properties.tipsDatas
         let { type_sn } = this.properties.tipsDatas
-        wx.navigateTo({
-          url: `/pages/shareBonus/shareBonus?type_sn=${type_sn}`
-        })
+        app.navigateto(`/pages/shareBonus/shareBonus?type_sn=${type_sn}`)
       }
       }
       else if (btn_type == 'send') {
       else if (btn_type == 'send') {
-        wx.navigateTo({
-          url: `/pages/handOutBonus/handOutBonus`
-        })
+        app.navigateto(`/pages/handOutBonus/handOutBonus`)  
       }
       }
-
-      
+         
       
       
     },
     },
     close() {
     close() {

+ 5 - 15
pages/details/details.js

@@ -223,9 +223,7 @@ Page({
   },
   },
   checkSubmit() {
   checkSubmit() {
     if (!app.globalData.userInfo) {
     if (!app.globalData.userInfo) {
-      wx.navigateTo({
-        url: '/pages/login/login'
-      });
+      app.navigateto('/pages/login/login')
       return;
       return;
     }
     }
     let cartOrBuy = this.data.cartOrBuy
     let cartOrBuy = this.data.cartOrBuy
@@ -280,9 +278,7 @@ Page({
         })
         })
         return
         return
       }
       }
-      wx.navigateTo({
-        url: `/pages/confirmOrder/confirmOrder?goods_id=${this.data.getOneSummary.goods_id}&iscart=0&num=${this.data.goodsNumber}`
-      })
+      app.navigateto(`/pages/confirmOrder/confirmOrder?goods_id=${this.data.getOneSummary.goods_id}&iscart=0&num=${this.data.goodsNumber}`)
     }
     }
     else {
     else {
       return
       return
@@ -370,9 +366,7 @@ Page({
     })
     })
   },
   },
   allComments() {
   allComments() {
-    wx.navigateTo({
-      url: `/pages/comments/comments?common_id=${this.data.datas.comment.common_id}`
-    });
+    app.navigateto(`/pages/comments/comments?common_id=${this.data.datas.comment.common_id}`)
     return;
     return;
   },
   },
   showCarousel(e) {
   showCarousel(e) {
@@ -402,15 +396,11 @@ Page({
   bundleDetail(e) {
   bundleDetail(e) {
     let { id } = e.currentTarget.dataset
     let { id } = e.currentTarget.dataset
     if (id == this.data.options_goods_id) return;
     if (id == this.data.options_goods_id) return;
-    wx.navigateTo({
-      url: `/pages/details/details?goods_id=${id}&title=商品详情`
-    })
+    app.navigateto(`/pages/details/details?goods_id=${id}&title=商品详情`)
   },
   },
   addBundleCart(e) {
   addBundleCart(e) {
     if (!app.globalData.userInfo) {
     if (!app.globalData.userInfo) {
-      wx.navigateTo({
-        url: '/pages/login/login'
-      });
+      app.navigateto('/pages/login/login')
       return;
       return;
     }
     }
     let bl_id =  e.currentTarget.dataset.blid
     let bl_id =  e.currentTarget.dataset.blid

+ 1 - 3
pages/index/index.js

@@ -46,9 +46,7 @@ Page({
     if (this.data.daliy_bonus) {
     if (this.data.daliy_bonus) {
       let type_sn = getTypeSn(this.data.daliy_bonus)
       let type_sn = getTypeSn(this.data.daliy_bonus)
       if (type_sn) {
       if (type_sn) {
-        wx.navigateTo({
-          url: `/pages/shareBonus/shareBonus?type_sn=${type_sn}`
-        })
+        app.navigateto(`/pages/shareBonus/shareBonus?type_sn=${type_sn}`)
         return
         return
       }
       }
     }
     }

+ 2 - 3
pages/myhome/myhome.js

@@ -1,4 +1,5 @@
 // pages/myhome/myhome.js
 // pages/myhome/myhome.js
+const app = getApp();
 Page({
 Page({
 
 
   /**
   /**
@@ -12,9 +13,7 @@ Page({
 
 
   handleMore(e) {
   handleMore(e) {
     const { cardtype } = e.currentTarget.dataset
     const { cardtype } = e.currentTarget.dataset
-    wx.navigateTo({
-      url: `/pages/postageManage/postageManage?card_type=${cardtype}`,
-    })
+    app.navigateto(`/pages/postageManage/postageManage?card_type=${cardtype}`)
   },
   },
 
 
   /**
   /**

+ 2 - 6
pages/order_tabs/orderTabs.js

@@ -298,9 +298,7 @@ Page({
       }
       }
       case "if_deliver": {
       case "if_deliver": {
         let url = encodeURIComponent("https://passport.lrlz.com/mobile/index.php?act=member_order&op=search_deliver&order_id=");
         let url = encodeURIComponent("https://passport.lrlz.com/mobile/index.php?act=member_order&op=search_deliver&order_id=");
-        wx.navigateTo({
-          url: `/pages/webView/webView?url=${url}${order_id}`
-        })
+        app.navigateto(`/pages/webView/webView?url=${url}${order_id}`)
         break;
         break;
       }
       }
       case "if_cancel": {
       case "if_cancel": {
@@ -334,9 +332,7 @@ Page({
         break;
         break;
       }
       }
       case "if_payment": {
       case "if_payment": {
-        wx.navigateTo({
-          url: `/pages/orderPaySn/orderPaySn?pay_sn=${pay_sn}`
-        })
+        app.navigateto(`/pages/orderPaySn/orderPaySn?pay_sn=${pay_sn}`)
       }
       }
 
 
     }
     }

+ 5 - 15
pages/person/person.js

@@ -48,9 +48,7 @@ Page({
    * 生命周期函数--监听页面显示
    * 生命周期函数--监听页面显示
    */
    */
   handOutBonus() {
   handOutBonus() {
-    wx.navigateTo({
-      url: '/pages/handOutBonus/handOutBonus'
-    });
+    app.navigateto('/pages/handOutBonus/handOutBonus')
     return;
     return;
   },
   },
   getAuth(e) {
   getAuth(e) {
@@ -178,9 +176,7 @@ Page({
     })
     })
   },
   },
   shareBonus() {
   shareBonus() {
-    wx.navigateTo({
-      url: `/pages/shareBonus/shareBonus?type_sn=58841537878020836581`
-    })
+    app.navigateto(`/pages/shareBonus/shareBonus?type_sn=58841537878020836581`)
   },
   },
   closeTips() {
   closeTips() {
     this.setData({
     this.setData({
@@ -213,19 +209,13 @@ Page({
     })
     })
   },
   },
   skip_help() {
   skip_help() {
-    wx.navigateTo({
-      url: '/pages/webView/webView?url=https://passport.lrlz.com/hfive/feed_back/question_answer.html'
-    })
+    app.navigateto('/pages/webView/webView?url=https://passport.lrlz.com/hfive/feed_back/question_answer.html')
   },
   },
   skip_bonus_rule() {
   skip_bonus_rule() {
-    wx.navigateTo({
-      url: '/pages/webView/webView?url=https://passport.lrlz.com/hfive/panda_bonus_rule/index.html'
-    })
+    app.navigateto('/pages/webView/webView?url=https://passport.lrlz.com/hfive/panda_bonus_rule/index.html')
   },
   },
   skip_all_order() {
   skip_all_order() {
-    wx.navigateTo({
-      url: '/pages/order_tabs/orderTabs'
-    })
+    app.navigateto('/pages/order_tabs/orderTabs')
   },
   },
   refund() {
   refund() {
     wx.showToast({
     wx.showToast({

+ 1 - 3
pages/phoneCharges/phoneCharges.js

@@ -40,9 +40,7 @@ Page({
 
 
   //跳转到油卡管理页面
   //跳转到油卡管理页面
   handlerAddCard(e){
   handlerAddCard(e){
-    wx.navigateTo({
-      url: '/pages/postageManage/postageManage?card_type=phone',
-    })
+    app.navigateto('/pages/postageManage/postageManage?card_type=phone')
   },
   },
 
 
 
 

+ 2 - 4
pages/postage/postage.js

@@ -53,16 +53,14 @@ Page({
   //跳转到油卡管理页面
   //跳转到油卡管理页面
   handlerAddCard(e){
   handlerAddCard(e){
     const { cardtype } = e.currentTarget.dataset
     const { cardtype } = e.currentTarget.dataset
-    wx.navigateTo({
-      url: `/pages/postageManage/postageManage?card_type=${cardtype}`,
-    })
+    app.navigateto(`/pages/postageManage/postageManage?card_type=${cardtype}`)
   },
   },
 
 
   /**
   /**
    * 生命周期函数--监听页面加载
    * 生命周期函数--监听页面加载
    */
    */
   onLoad: function (options) 
   onLoad: function (options) 
-  {    
+  {
     let fromSource = recordSource(app, `act=index&op=card_goods`)
     let fromSource = recordSource(app, `act=index&op=card_goods`)
     this.setData({
     this.setData({
       fromSource: app.globalData.fromSource,
       fromSource: app.globalData.fromSource,

+ 9 - 8
pages/postageDetail/postageDetail.js

@@ -1,6 +1,6 @@
 // pages/addAddress/addAddress.js
 // pages/addAddress/addAddress.js
 const getReq = require('../../config.js').getReq
 const getReq = require('../../config.js').getReq
-const appInstance = getApp()
+const app = getApp()
 Page({
 Page({
 
 
   /**
   /**
@@ -19,21 +19,21 @@ Page({
   formSubmit(e) {
   formSubmit(e) {
     const { card_type , card_no, confirm_card_no } = e.detail.value
     const { card_type , card_no, confirm_card_no } = e.detail.value
     if(!card_type) {
     if(!card_type) {
-      appInstance.showToast('请选择卡类型')
+      app.showToast('请选择卡类型')
       return
       return
     }
     }
     if(!card_no) {
     if(!card_no) {
-      appInstance.showToast('卡号不能为空')
+      app.showToast('卡号不能为空')
       return
       return
     }else if(card_type ==='phone' && !this.checkPhone(card_no)){
     }else if(card_type ==='phone' && !this.checkPhone(card_no)){
-      appInstance.showToast('请输入正确的手机号码')
+      app.showToast('请输入正确的手机号码')
       return
       return
     }
     }
     if(!confirm_card_no) {
     if(!confirm_card_no) {
-      appInstance.showToast('请再次输入卡号')
+      app.showToast('请再次输入卡号')
       return
       return
     }else if(card_no !== confirm_card_no) {
     }else if(card_no !== confirm_card_no) {
-      appInstance.showToast('两次密码不一致')
+      app.showToast('两次密码不一致')
       return
       return
     }
     }
    
    
@@ -60,7 +60,7 @@ Page({
         wx.navigateBack()
         wx.navigateBack()
       }
       }
       else {
       else {
-        appInstance.showToast(res.message)
+        app.showToast(res.message)
       }
       }
     })
     })
   },
   },
@@ -69,7 +69,8 @@ Page({
     // console.log('e',e)
     // console.log('e',e)
   },
   },
 
 
- checkPhone(phone){ 
+ checkPhone(phone)
+ { 
     if(!(/^[1]([3-9])[0-9]{9}$/.test(phone))){
     if(!(/^[1]([3-9])[0-9]{9}$/.test(phone))){
     return false;
     return false;
   }
   }

+ 7 - 9
pages/postageManage/postageManage.js

@@ -1,6 +1,6 @@
 // pages/address/address.js
 // pages/address/address.js
 const getReq = require('../../config.js').getReq
 const getReq = require('../../config.js').getReq
-let appInstance = getApp()
+let app = getApp()
 Page({
 Page({
 
 
   /**
   /**
@@ -19,7 +19,7 @@ Page({
   onLoad: function (options) {
   onLoad: function (options) {
     const { card_type } = options
     const { card_type } = options
     // wx.setNavigationBarTitle({ title })
     // wx.setNavigationBarTitle({ title })
-    appInstance.setCardType(card_type)
+    app.setCardType(card_type)
     this.setData({ card_type })
     this.setData({ card_type })
     this.getDatas()
     this.getDatas()
     let len = getCurrentPages().length
     let len = getCurrentPages().length
@@ -46,7 +46,7 @@ Page({
       if (res.code == 200) {
       if (res.code == 200) {
         let list = res.datas.card_list
         let list = res.datas.card_list
         if(!list.length) {
         if(!list.length) {
-          appInstance.clearRecord()
+          app.clearRecord()
         }
         }
         this.setData({
         this.setData({
           list,
           list,
@@ -54,7 +54,7 @@ Page({
         })
         })
       }
       }
       else {
       else {
-        appInstance.showToast(res.message)
+        app.showToast(res.message)
       }
       }
     })
     })
   },
   },
@@ -62,16 +62,14 @@ Page({
     if(this.data.fromPerson) return;
     if(this.data.fromPerson) return;
     const dataset = e.currentTarget.dataset
     const dataset = e.currentTarget.dataset
     const { record } = dataset
     const { record } = dataset
-    appInstance.checkCurrentRecord(record)
+    app.checkCurrentRecord(record)
     wx.navigateBack()
     wx.navigateBack()
   },
   },
   modify_address(e) {
   modify_address(e) {
     const dataset = e.currentTarget.dataset
     const dataset = e.currentTarget.dataset
     const { record } = dataset
     const { record } = dataset
     const { card_no, card_type, topcard_id } = record
     const { card_no, card_type, topcard_id } = record
-    wx.navigateTo({
-      url: `/pages/postageDetail/postageDetail?card_no=${card_no}&card_type=${card_type}&topcard_id=${topcard_id}`
-    })
+    app.navigateto(`/pages/postageDetail/postageDetail?card_no=${card_no}&card_type=${card_type}&topcard_id=${topcard_id}`)
   },
   },
   del_address(e) {
   del_address(e) {
     const dataset = e.currentTarget.dataset
     const dataset = e.currentTarget.dataset
@@ -109,7 +107,7 @@ Page({
    */
    */
   onShow: function () {
   onShow: function () {
     if (!this.data.firstLoad) {
     if (!this.data.firstLoad) {
-      this.setData({ card_type: appInstance.globalData.card_type })
+      this.setData({ card_type: app.globalData.card_type })
       this.getDatas()
       this.getDatas()
     }
     }
   },
   },

+ 2 - 6
pages/shopCart/shopCart.js

@@ -355,9 +355,7 @@ Page({
       return;
       return;
     }
     }
     let cart_list = cart_id_list.join(',');
     let cart_list = cart_id_list.join(',');
-    wx.navigateTo({
-      url: `/pages/confirmOrder/confirmOrder?iscart=1&cart_id=${cart_list}`
-    })
+    app.navigateto(`/pages/confirmOrder/confirmOrder?iscart=1&cart_id=${cart_list}`)
   },
   },
   skip_index() {
   skip_index() {
     wx.switchTab({
     wx.switchTab({
@@ -366,9 +364,7 @@ Page({
   },
   },
   toDetails(e) {
   toDetails(e) {
     let goods_id = e.currentTarget.dataset.goodsid
     let goods_id = e.currentTarget.dataset.goodsid
-    wx.navigateTo({
-      url: `/pages/details/details?goods_id=${goods_id}&title=商品详情`
-    })
+    app.navigateto(`/pages/details/details?goods_id=${goods_id}&title=商品详情`)
   },
   },
   closeTips() {
   closeTips() {
     this.setData({
     this.setData({