diff --git a/App.vue b/App.vue index 309dbc4..d06c90b 100644 --- a/App.vue +++ b/App.vue @@ -75,6 +75,7 @@ }, onShareAppMessage() { wx.onAppRoute(() => { + let white = ['BagStation/pages/stationDetail/stationDetail'] // console.log('当前页面路由发生变化 触发该事件onShareAppMessage') const pages = getCurrentPages() //获取加载的页面 const view = pages[pages.length - 1] //获取当前页面的对象 @@ -94,11 +95,14 @@ console.log(view.route) clearTimeout(loginTimer) clearTimeout(onlineTimer) + if (view.route != 'pages/index/startPage/startPage' && view.route.indexOf('BagAuth') == -1) { const token = uni.getStorageSync('Authorization') const openid = uni.getStorageSync('openid') if (token && openid) { - this.getAmount() + if(!white.includes(view.route)){ + this.getAmount() + } onlineTimer = setTimeout(() => { if (this.loginStatus == 'offline') { uni.clearStorageSync() diff --git a/BagStation/pages/stationDetail/stationDetail.vue b/BagStation/pages/stationDetail/stationDetail.vue index c0be0a3..9975373 100644 --- a/BagStation/pages/stationDetail/stationDetail.vue +++ b/BagStation/pages/stationDetail/stationDetail.vue @@ -189,9 +189,9 @@ onLoad(option) { if(!option.item){ let siteInfos = uni.getStorageSync('siteInfo') - var oilItem = JSON.parse(siteInfos) + var oilItem = JSON.parse(decodeURIComponent(siteInfos)) }else{ - var oilItem = JSON.parse(option.item) + var oilItem = JSON.parse(decodeURIComponent(option.item)) } uni.setStorageSync('oilItem',oilItem) this.getSiteInfo(oilItem.siteId) diff --git a/pages/tabbar/home/home.vue b/pages/tabbar/home/home.vue index 8fa1dd6..6244aa4 100644 --- a/pages/tabbar/home/home.vue +++ b/pages/tabbar/home/home.vue @@ -550,7 +550,7 @@ } }, toDetail(item) { - let itemS = JSON.stringify(item) + let itemS = encodeURIComponent(JSON.stringify(item)) console.log(itemS) if (uni.getStorageSync('user')) { uni.navigateTo({ diff --git a/pages/tabbar/station/stationList.vue b/pages/tabbar/station/stationList.vue index ae05760..46c6f71 100644 --- a/pages/tabbar/station/stationList.vue +++ b/pages/tabbar/station/stationList.vue @@ -388,7 +388,7 @@ }, toDetail(item) { - let itemS = JSON.stringify(item) + let itemS = encodeURIComponent(JSON.stringify(item)) if (uni.getStorageSync('user')) { uni.navigateTo({ url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`, diff --git a/utils/request.js b/utils/request.js index cfd7047..f204573 100644 --- a/utils/request.js +++ b/utils/request.js @@ -4,7 +4,7 @@ import utils from '@/utils/encode' // const env = process.env.NODE_ENV const env = 'production'/* */ // const env = 'test' -const testUrl = 'http://192.168.0.65:38080' +const testUrl = 'http://192.168.0.45:38080' // const productUrl = 'http://121.196.213.68/adminapi' //预生产 const productUrl = 'https://www.xingoil.com/adminapi' // 生产,加密 new