二维码生成页面中心icon没了的bug
一次大型分包更新生产了 合作企业路由 /packageQr/pages/partnership/partnership 员工管理路由 /packageStaff/pages/staff/List/List 油站二维码路由 /packageQr/pages/qrsite/QrCode_xy 加油订单路由改成 /packageOrders/pages/orderList/orderList
This commit is contained in:
@@ -49,7 +49,8 @@
|
||||
<text class="strong padding-right-xs font-16">{{insertResult.oilName}}</text>
|
||||
<text class="padding-right-xs">
|
||||
星油价格:
|
||||
<text class="text-blod oil-main-color">¥{{insertResult.realPrice|numberFilter}}</text>
|
||||
<text class="text-blod oil-main-color" v-if="(insertResult.realPrice-1+1)>0">¥{{insertResult.realPrice|numberFilter}}</text>
|
||||
<text class="text-blod oil-main-color" v-else>无价格</text>
|
||||
</text>
|
||||
<text class="s-rich">市场价¥{{insertResult.standardPrice|numberFilter}}/L</text>
|
||||
</view>
|
||||
@@ -349,60 +350,67 @@
|
||||
console.log(this.plateNo)
|
||||
console.log(this.carNumber)
|
||||
console.log(this.testResult)
|
||||
if (this.testResult) {
|
||||
const data6 = {
|
||||
...this.driverMsg,
|
||||
siteCode: this.stationMsg.oilSiteCode,
|
||||
oilPrice: this.insertResult.realPrice,
|
||||
volume: this.insertResult.vol,
|
||||
standardAmount: this.insertResult.vMoney,
|
||||
oilAmount: this.insertResult.vDoMoney,
|
||||
oilCode: this.insertResult.oilCode,
|
||||
oilName: this.insertResult.oilName,
|
||||
oilGun: this.insertResult.bar,
|
||||
standardPrice: this.insertResult.standardPrice,
|
||||
orderKey: this.orderKey,
|
||||
plateNumber: this.carNumber
|
||||
}
|
||||
if (!data6.oilCode) {
|
||||
uni.showToast({
|
||||
title: '请选择油品',
|
||||
icon: 'none'
|
||||
});
|
||||
return false
|
||||
}
|
||||
if (!data6.volume) {
|
||||
uni.showToast({
|
||||
title: '请输入加油体积',
|
||||
icon: 'none'
|
||||
});
|
||||
return false
|
||||
}
|
||||
cloudSiteApi.saveOrder(data6).then(res => {
|
||||
if (res.code === 20000) {
|
||||
uni.showToast({
|
||||
title: '下单成功!'
|
||||
});
|
||||
uni.setStorageSync('formQr', true)
|
||||
uni.setStorageSync('tempOrderInfo', res.data)
|
||||
if (!this.isG7) {
|
||||
setTimeout(() => {
|
||||
this.toDetails(res.data.payOrderId)
|
||||
}, 400)
|
||||
} else {
|
||||
this.beforePay = false
|
||||
setTimeout(() => {
|
||||
this.orderId = res.data.orderId
|
||||
this.queryTimer()
|
||||
this.getPayStatus(this.orderId)
|
||||
}, 400)
|
||||
}
|
||||
|
||||
if ((this.insertResult.realPrice - 1 + 1) > 0) {
|
||||
if (this.testResult) {
|
||||
const data6 = {
|
||||
...this.driverMsg,
|
||||
siteCode: this.stationMsg.oilSiteCode,
|
||||
oilPrice: this.insertResult.realPrice,
|
||||
volume: this.insertResult.vol,
|
||||
standardAmount: this.insertResult.vMoney,
|
||||
oilAmount: this.insertResult.vDoMoney,
|
||||
oilCode: this.insertResult.oilCode,
|
||||
oilName: this.insertResult.oilName,
|
||||
oilGun: this.insertResult.bar,
|
||||
standardPrice: this.insertResult.standardPrice,
|
||||
orderKey: this.orderKey,
|
||||
plateNumber: this.carNumber
|
||||
}
|
||||
})
|
||||
if (!data6.oilCode) {
|
||||
uni.showToast({
|
||||
title: '请选择油品',
|
||||
icon: 'none'
|
||||
});
|
||||
return false
|
||||
}
|
||||
if (!data6.volume) {
|
||||
uni.showToast({
|
||||
title: '请输入加油体积',
|
||||
icon: 'none'
|
||||
});
|
||||
return false
|
||||
}
|
||||
cloudSiteApi.saveOrder(data6).then(res => {
|
||||
if (res.code === 20000) {
|
||||
uni.showToast({
|
||||
title: '下单成功!'
|
||||
});
|
||||
uni.setStorageSync('formQr', true)
|
||||
uni.setStorageSync('tempOrderInfo', res.data)
|
||||
if (!this.isG7) {
|
||||
setTimeout(() => {
|
||||
this.toDetails(res.data.payOrderId)
|
||||
}, 400)
|
||||
} else {
|
||||
this.beforePay = false
|
||||
setTimeout(() => {
|
||||
this.orderId = res.data.orderId
|
||||
this.queryTimer()
|
||||
this.getPayStatus(this.orderId)
|
||||
}, 400)
|
||||
}
|
||||
|
||||
}
|
||||
})
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: '车牌号校验不通过',
|
||||
icon: 'none'
|
||||
});
|
||||
}
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: '车牌号校验不通过',
|
||||
title: '您选择的油品没有油价,不能加油',
|
||||
icon: 'none'
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user