更新
This commit is contained in:
4
App.vue
4
App.vue
@@ -117,10 +117,10 @@
|
|||||||
imageUrl: 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/login-bg.png',
|
imageUrl: 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/login-bg.png',
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
let white = ['pages/index/startPage/startPage']
|
||||||
// 是否跳过登陆
|
// 是否跳过登陆
|
||||||
let isRefuseLogin = uni.getStorageSync('refuseLogin')
|
let isRefuseLogin = uni.getStorageSync('refuseLogin')
|
||||||
console.log('isRefuseLogin',isRefuseLogin,typeof isRefuseLogin)
|
if(isRefuseLogin || white.includes(view.route) || view.route.includes('BagAuth')) return
|
||||||
if(isRefuseLogin || view.route === 'pages/index/startPage/startPage' || view.route.includes('BagAuth')) return
|
|
||||||
this.getAmount()
|
this.getAmount()
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -454,11 +454,7 @@
|
|||||||
} else if (index == 8) {
|
} else if (index == 8) {
|
||||||
this.goToPage('/BagAuth/pages/agreeMent/OperationGuide')
|
this.goToPage('/BagAuth/pages/agreeMent/OperationGuide')
|
||||||
}
|
}
|
||||||
// else if(index==8){
|
|
||||||
// uni.navigateTo({
|
|
||||||
// url: '/BagStation/myCars/myCars'
|
|
||||||
// })
|
|
||||||
// }
|
|
||||||
else {
|
else {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
title: '功能暂无',
|
title: '功能暂无',
|
||||||
@@ -468,9 +464,6 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
showQr() {
|
showQr() {
|
||||||
// uni.navigateTo({
|
|
||||||
// url: '/BagStation/pages/stationDetail/stieQr'
|
|
||||||
// })
|
|
||||||
this.showThreeSites = true
|
this.showThreeSites = true
|
||||||
},
|
},
|
||||||
toCards() {
|
toCards() {
|
||||||
@@ -492,16 +485,11 @@
|
|||||||
let params = {
|
let params = {
|
||||||
currentPage: 1,
|
currentPage: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
params: { //类型:Object 必有字段 备注:// 筛选对象
|
params: {
|
||||||
// longitude: 117.157817, // 必有字段 备注:// 当前位置经度
|
|
||||||
// latitude: 31.802472, // 必有字段 备注:// 当前位置维度
|
|
||||||
// siteBrand: "", // 备注:// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 )
|
|
||||||
// channelCode: "", // 备注:// 渠道编码 ( OIL:星油 WJY:万金油 LV:老吕(找油网) TY:团油 YDJY:一点加油(壳牌))
|
|
||||||
// oilProductCode: "0#" // 备注:// 油号选择 ( 0# 92# 92#)
|
|
||||||
clientBelong:'ZHONGPIN',
|
clientBelong:'ZHONGPIN',
|
||||||
comprehensiveSort:1,
|
comprehensiveSort:1,
|
||||||
zpDisable:'ENABLE',
|
zpDisable:'ENABLE',
|
||||||
sort: "juli", //类型:String 必有字段 备注:// 智能排序 ( price:价格最低 juli:距离最近 ) 默认距离排序
|
sort: "juli", // price:价格最低 juli:距离最近
|
||||||
...uni.getStorageSync('location'),
|
...uni.getStorageSync('location'),
|
||||||
...this.filterData,
|
...this.filterData,
|
||||||
}
|
}
|
||||||
@@ -511,7 +499,6 @@
|
|||||||
oilSiteApi.readOnlySites(params).then(res => {
|
oilSiteApi.readOnlySites(params).then(res => {
|
||||||
this.getCount++
|
this.getCount++
|
||||||
if (res.code == 20000) {
|
if (res.code == 20000) {
|
||||||
// console.log(res.data.list)
|
|
||||||
this.siteList = res.data.list
|
this.siteList = res.data.list
|
||||||
} else {
|
} else {
|
||||||
if (this.getCount == 1) {
|
if (this.getCount == 1) {
|
||||||
@@ -552,8 +539,7 @@
|
|||||||
},
|
},
|
||||||
toDetail(item) {
|
toDetail(item) {
|
||||||
let itemS = encodeURIComponent(JSON.stringify(item))
|
let itemS = encodeURIComponent(JSON.stringify(item))
|
||||||
// console.log(uni.getStorageSync('user'))
|
|
||||||
// return
|
|
||||||
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}`,
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ service.interceptors.request.use(
|
|||||||
} else {
|
} else {
|
||||||
url = config.url
|
url = config.url
|
||||||
}
|
}
|
||||||
|
// uni.hideLoading()
|
||||||
return config
|
return config
|
||||||
},
|
},
|
||||||
error => {
|
error => {
|
||||||
@@ -68,15 +68,15 @@ service.interceptors.response.use(
|
|||||||
}
|
}
|
||||||
|
|
||||||
uni.hideLoading()
|
uni.hideLoading()
|
||||||
|
let dontTipTextArr = ['令牌为空,不允许操作','您的ip已经更改,请重新登录','登录与操作设备不同']
|
||||||
|
let dontTipCodeArr = [20000,42011]
|
||||||
if(response.config.url.indexOf('/oil-site/oilSiteOrderInfo/getOrderQrCode') === -1){
|
if(response.config.url.indexOf('/oil-site/oilSiteOrderInfo/getOrderQrCode') === -1){
|
||||||
if (res.code != 20000 && res.msg != '令牌为空,不允许操作' && res.msg != '您的ip已经更改,请重新登录' && res.msg != '登录与操作设备不同') {
|
if (!dontTipCodeArr.includes(res.code) && !dontTipTextArr.includes(res.msg)) {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
title: res.msg,
|
title: res.msg,
|
||||||
icon: "none"
|
icon: "none"
|
||||||
})
|
})
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
return res
|
return res
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user