|
|
|
@ -67,7 +67,7 @@ |
|
|
|
|
const updateManager = uni.getUpdateManager(); |
|
|
|
|
updateManager.onCheckForUpdate(function(res) { |
|
|
|
|
// 请求完新版本信息的回调 |
|
|
|
|
console.log('请求完新版本信息的回调', res.hasUpdate); |
|
|
|
|
// console.log('请求完新版本信息的回调', res.hasUpdate); |
|
|
|
|
if (!res.hasUpdate) { |
|
|
|
|
that.initFn(that.option) |
|
|
|
|
} |
|
|
|
@ -95,20 +95,20 @@ |
|
|
|
|
async initFn(option) { |
|
|
|
|
const token = uni.getStorageSync('Authorization') |
|
|
|
|
const openid = uni.getStorageSync('openid') |
|
|
|
|
this.key = ''; |
|
|
|
|
let isOnline = false; |
|
|
|
|
if(token){ |
|
|
|
|
await oilSiteApi.isLoginSuccess().then(res=>{ |
|
|
|
|
if(res.code==20000) isOnline = true |
|
|
|
|
}).catch(err=>{}) |
|
|
|
|
} |
|
|
|
|
// this.key = ''; |
|
|
|
|
let isOnline = false; |
|
|
|
|
if (token) { |
|
|
|
|
await oilSiteApi.isLoginSuccess().then(res => { |
|
|
|
|
if (res.code == 20000) isOnline = true |
|
|
|
|
}).catch(err => {}) |
|
|
|
|
} |
|
|
|
|
// console.log(isOnline,'isOnline') |
|
|
|
|
// if (isOnline) { |
|
|
|
|
// this.key = '在线' |
|
|
|
|
// } else { |
|
|
|
|
// this.key = '离线' |
|
|
|
|
// } |
|
|
|
|
if (isOnline) { |
|
|
|
|
this.key = '在线' |
|
|
|
|
} else { |
|
|
|
|
this.key = '离线' |
|
|
|
|
} |
|
|
|
|
if (this.key == '在线') { |
|
|
|
|
if (!uni.getStorageSync('filterData')) { |
|
|
|
|
this.getFilterData() |
|
|
|
|
} else if (uni.getStorageSync('filterData')[0].detailList.length < 2) { |
|
|
|
@ -130,24 +130,18 @@ |
|
|
|
|
disposable: true |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
if (this.key == '在线') { |
|
|
|
|
// console.log(type, 'typetypetypetype'); |
|
|
|
|
|
|
|
|
|
uni.switchTab({ |
|
|
|
|
url: `/pages/tabbar/home/home`, |
|
|
|
|
success() {}, |
|
|
|
|
fail: (err) => { |
|
|
|
|
console.log(err) |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
} else { |
|
|
|
|
uni.redirectTo({ |
|
|
|
|
url: '/BagAuth/pages/login/login' |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
uni.switchTab({ |
|
|
|
|
url: `/pages/tabbar/home/home` |
|
|
|
|
}) |
|
|
|
|
// if (this.key == '在线') { |
|
|
|
|
// } else { |
|
|
|
|
// uni.redirectTo({ |
|
|
|
|
// url: '/BagAuth/pages/login/login' |
|
|
|
|
// }) |
|
|
|
|
// } |
|
|
|
|
}, |
|
|
|
|
Interceptor(id) { |
|
|
|
|
let taht = this |
|
|
|
|
// let taht = this |
|
|
|
|
// console.log(`%c 检测到参数拦截器启动`, 'color:red;font-size:50px'); |
|
|
|
|
// this.tools.overallInterceptor((opentype) => { |
|
|
|
|
// uni.removeInterceptor(opentype); |
|
|
|
|