caolc #3

Merged
caoliancun merged 2 commits from caolc into master 2022-12-07 17:41:50 +08:00
5 changed files with 10 additions and 6 deletions

View File

@@ -75,6 +75,7 @@
}, },
onShareAppMessage() { onShareAppMessage() {
wx.onAppRoute(() => { wx.onAppRoute(() => {
let white = ['BagStation/pages/stationDetail/stationDetail']
// console.log('当前页面路由发生变化 触发该事件onShareAppMessage') // console.log('当前页面路由发生变化 触发该事件onShareAppMessage')
const pages = getCurrentPages() //获取加载的页面 const pages = getCurrentPages() //获取加载的页面
const view = pages[pages.length - 1] //获取当前页面的对象 const view = pages[pages.length - 1] //获取当前页面的对象
@@ -94,11 +95,14 @@
console.log(view.route) console.log(view.route)
clearTimeout(loginTimer) clearTimeout(loginTimer)
clearTimeout(onlineTimer) clearTimeout(onlineTimer)
if (view.route != 'pages/index/startPage/startPage' && view.route.indexOf('BagAuth') == -1) { if (view.route != 'pages/index/startPage/startPage' && view.route.indexOf('BagAuth') == -1) {
const token = uni.getStorageSync('Authorization') const token = uni.getStorageSync('Authorization')
const openid = uni.getStorageSync('openid') const openid = uni.getStorageSync('openid')
if (token && openid) { if (token && openid) {
if(!white.includes(view.route)){
this.getAmount() this.getAmount()
}
onlineTimer = setTimeout(() => { onlineTimer = setTimeout(() => {
if (this.loginStatus == 'offline') { if (this.loginStatus == 'offline') {
uni.clearStorageSync() uni.clearStorageSync()

View File

@@ -189,9 +189,9 @@
onLoad(option) { onLoad(option) {
if(!option.item){ if(!option.item){
let siteInfos = uni.getStorageSync('siteInfo') let siteInfos = uni.getStorageSync('siteInfo')
var oilItem = JSON.parse(siteInfos) var oilItem = JSON.parse(decodeURIComponent(siteInfos))
}else{ }else{
var oilItem = JSON.parse(option.item) var oilItem = JSON.parse(decodeURIComponent(option.item))
} }
uni.setStorageSync('oilItem',oilItem) uni.setStorageSync('oilItem',oilItem)
this.getSiteInfo(oilItem.siteId) this.getSiteInfo(oilItem.siteId)

View File

@@ -550,7 +550,7 @@
} }
}, },
toDetail(item) { toDetail(item) {
let itemS = JSON.stringify(item) let itemS = encodeURIComponent(JSON.stringify(item))
console.log(itemS) console.log(itemS)
if (uni.getStorageSync('user')) { if (uni.getStorageSync('user')) {
uni.navigateTo({ uni.navigateTo({

View File

@@ -388,7 +388,7 @@
}, },
toDetail(item) { toDetail(item) {
let itemS = JSON.stringify(item) let itemS = encodeURIComponent(JSON.stringify(item))
if (uni.getStorageSync('user')) { if (uni.getStorageSync('user')) {
uni.navigateTo({ uni.navigateTo({
url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`, url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`,

View File

@@ -4,7 +4,7 @@ import utils from '@/utils/encode'
// const env = process.env.NODE_ENV // const env = process.env.NODE_ENV
const env = 'production'/* */ const env = 'production'/* */
// const env = 'test' // 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 = 'http://121.196.213.68/adminapi' //预生产
const productUrl = 'https://www.xingoil.com/adminapi' // 生产,加密 new const productUrl = 'https://www.xingoil.com/adminapi' // 生产,加密 new