|
@@ -285,6 +285,10 @@ const methods = ay.initMethods(
|
|
|
})
|
|
})
|
|
|
},
|
|
},
|
|
|
truckManage() {
|
|
truckManage() {
|
|
|
|
|
+ if (store.common.data.mockScenes === config.common.mockScenes.examine) {
|
|
|
|
|
+ return
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
if (data.truckInfo.length) {
|
|
if (data.truckInfo.length) {
|
|
|
ay.goPage(config.pages.truckInfo_index)
|
|
ay.goPage(config.pages.truckInfo_index)
|
|
|
} else {
|
|
} else {
|
|
@@ -307,6 +311,9 @@ const methods = ay.initMethods(
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
goPerson() {
|
|
goPerson() {
|
|
|
|
|
+ if (store.common.data.mockScenes === config.common.mockScenes.examine) {
|
|
|
|
|
+ return
|
|
|
|
|
+ }
|
|
|
ay.goPage(config.pages.personCenter_index)
|
|
ay.goPage(config.pages.personCenter_index)
|
|
|
},
|
|
},
|
|
|
goPage(menu) {
|
|
goPage(menu) {
|
|
@@ -484,8 +491,11 @@ const methods = ay.initMethods(
|
|
|
(price.qrcode === 2 && ret.gasstationId === ret.cashierId) // 设置的收银员
|
|
(price.qrcode === 2 && ret.gasstationId === ret.cashierId) // 设置的收银员
|
|
|
) {
|
|
) {
|
|
|
func.native.showModal({
|
|
func.native.showModal({
|
|
|
- title: '错误提示',
|
|
|
|
|
- content: '加气站收款码已禁用,请选择收银员收款码扫码。',
|
|
|
|
|
|
|
+ title: '温馨提示',
|
|
|
|
|
+ content:
|
|
|
|
|
+ price.qrcode === 2
|
|
|
|
|
+ ? '加气站收款码已禁用,请选择收银员收款码扫码。'
|
|
|
|
|
+ : '收银员收款码已禁用,请选择加气站收款码扫码。',
|
|
|
})
|
|
})
|
|
|
} else {
|
|
} else {
|
|
|
const gasJudge = await webapi.strategy.driver_gas_judge({
|
|
const gasJudge = await webapi.strategy.driver_gas_judge({
|
|
@@ -497,14 +507,14 @@ const methods = ay.initMethods(
|
|
|
ay.goPage(config.pages.order_createOrder, { params: ret })
|
|
ay.goPage(config.pages.order_createOrder, { params: ret })
|
|
|
} else if (gasJudge === 2) {
|
|
} else if (gasJudge === 2) {
|
|
|
func.native.showModal({
|
|
func.native.showModal({
|
|
|
- title: '错误提示',
|
|
|
|
|
|
|
+ title: '温馨提示',
|
|
|
content: `该加气站未及时补充平台气源,已无法通过大象平台为您提供优质气源,给您带来的不便深感其歉意,如有疑问可以与加气站沟通,亦可拨打大象加气平台客服电话:"${store.common.data.phone}"`,
|
|
content: `该加气站未及时补充平台气源,已无法通过大象平台为您提供优质气源,给您带来的不便深感其歉意,如有疑问可以与加气站沟通,亦可拨打大象加气平台客服电话:"${store.common.data.phone}"`,
|
|
|
})
|
|
})
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
func.native.showModal({
|
|
func.native.showModal({
|
|
|
- title: '错误提示',
|
|
|
|
|
|
|
+ title: '温馨提示',
|
|
|
content: '当前收银员所属企业和二维码对应的企业不一致,请联系加气站管理员。',
|
|
content: '当前收银员所属企业和二维码对应的企业不一致,请联系加气站管理员。',
|
|
|
})
|
|
})
|
|
|
}
|
|
}
|
|
@@ -552,10 +562,8 @@ const methods = ay.initMethods(
|
|
|
async getListApp({
|
|
async getListApp({
|
|
|
cras = config.common.defAyContainerRefreshArgs,
|
|
cras = config.common.defAyContainerRefreshArgs,
|
|
|
activation = false,
|
|
activation = false,
|
|
|
- checkScope = false,
|
|
|
|
|
|
|
+ // checkScope = false,
|
|
|
} = {}) {
|
|
} = {}) {
|
|
|
- if (checkScope) {
|
|
|
|
|
- }
|
|
|
|
|
// 非激活 && 未授权
|
|
// 非激活 && 未授权
|
|
|
if (!activation && !data.userLocation) {
|
|
if (!activation && !data.userLocation) {
|
|
|
// 取消加载中效果
|
|
// 取消加载中效果
|
|
@@ -583,7 +591,7 @@ const methods = ay.initMethods(
|
|
|
latitude: location.latitude.toString(),
|
|
latitude: location.latitude.toString(),
|
|
|
},
|
|
},
|
|
|
},
|
|
},
|
|
|
- { showLoading: activation }, // || !cras.isAdd },
|
|
|
|
|
|
|
+ // { showLoading: activation }, // || !cras.isAdd },
|
|
|
)
|
|
)
|
|
|
.then((res) => {
|
|
.then((res) => {
|
|
|
if (cras.isAdd) {
|
|
if (cras.isAdd) {
|
|
@@ -639,7 +647,7 @@ ay.entrance(
|
|
|
methods.initWS()
|
|
methods.initWS()
|
|
|
methods.getCityList()
|
|
methods.getCityList()
|
|
|
data.station.curCity = uni.getStorageSync(staticData.cctkn) || staticData.defCity
|
|
data.station.curCity = uni.getStorageSync(staticData.cctkn) || staticData.defCity
|
|
|
- methods.getListApp({ cras: args.cras, checkScope: true })
|
|
|
|
|
|
|
+ methods.getListApp({ cras: args.cras })
|
|
|
await init()
|
|
await init()
|
|
|
// 无未支付订单
|
|
// 无未支付订单
|
|
|
if (!data.hasnopayfordriver) {
|
|
if (!data.hasnopayfordriver) {
|