|
|
|
|
@@ -20,7 +20,7 @@
|
|
|
|
|
<view class="cu-list menu text-left">
|
|
|
|
|
<view class="cu-item" v-for="(itemx,index) in oilSitePriceDetailsVo" :key="index" v-if="itemx.sitePrice>0">
|
|
|
|
|
<label class="flex justify-between align-center flex-sub">
|
|
|
|
|
<radio class="round red" :class="radio=='radio' + index?'checked':''" :checked="radio==index?true:false" :value="index"></radio>
|
|
|
|
|
<radio class="round red" :class="radio=='radio' + index?'checked':''" :checked= " radio ==index?true : false" :value="index"></radio>
|
|
|
|
|
<text class="cu-tag my-tag line-red text-lg">
|
|
|
|
|
惠
|
|
|
|
|
</text>
|
|
|
|
|
@@ -89,7 +89,7 @@
|
|
|
|
|
</form>
|
|
|
|
|
</view>
|
|
|
|
|
<!-- 非团油加油输入框 -->
|
|
|
|
|
<view class="margin solid radius" v-if="activeChannelCode!='TY'">
|
|
|
|
|
<view class="margin solid radius" v-if="activeChannelCode!='TY'&&radio!==null">
|
|
|
|
|
<view class=" menu cu-list ">
|
|
|
|
|
<view class="cu-item nowrap">
|
|
|
|
|
<view class="text-bold ">
|
|
|
|
|
@@ -117,7 +117,7 @@
|
|
|
|
|
</view>
|
|
|
|
|
|
|
|
|
|
<!-- 团油金额输入框 -->
|
|
|
|
|
<view class="margin solid radius" v-if="activeChannelCode=='TY'">
|
|
|
|
|
<view class="margin solid radius" v-if="activeChannelCode=='TY' && radio!==null">
|
|
|
|
|
<view class=" menu cu-list ">
|
|
|
|
|
<view class="cu-item nowrap">
|
|
|
|
|
<view class="text-bold ">
|
|
|
|
|
@@ -144,7 +144,7 @@
|
|
|
|
|
</view>
|
|
|
|
|
</view>
|
|
|
|
|
</view>
|
|
|
|
|
<view class="bg-white padding">
|
|
|
|
|
<view v-if="radio!==null" class="bg-white padding">
|
|
|
|
|
<view class="">
|
|
|
|
|
<text class="text-bold">优惠</text>
|
|
|
|
|
</view>
|
|
|
|
|
@@ -160,7 +160,7 @@
|
|
|
|
|
优惠券 <text class="fr">{{'----'}}</text>
|
|
|
|
|
</view>
|
|
|
|
|
</view>
|
|
|
|
|
<view class="placeholder-hidden">
|
|
|
|
|
<view class="placeholder-hidden">
|
|
|
|
|
<view class="margin cu-list pay-bar menu radius solid-top solid-bottom solid-left">
|
|
|
|
|
<view class="cu-item ">
|
|
|
|
|
<view class="">
|
|
|
|
|
@@ -355,7 +355,6 @@
|
|
|
|
|
oilBarTy: '',
|
|
|
|
|
ty: {
|
|
|
|
|
realMoney: ""
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
|
tyRes: {
|
|
|
|
|
liter: '',
|
|
|
|
|
@@ -377,7 +376,7 @@
|
|
|
|
|
plateNumbers: [],
|
|
|
|
|
showPlate: "",
|
|
|
|
|
showOrder: '',
|
|
|
|
|
radio: '',
|
|
|
|
|
radio: null,
|
|
|
|
|
imgURL: this.global.imgURL,
|
|
|
|
|
scrollLeft: 0,
|
|
|
|
|
checkVol: [{
|
|
|
|
|
@@ -407,7 +406,6 @@
|
|
|
|
|
hot: false,
|
|
|
|
|
}],
|
|
|
|
|
plateNumber: '',
|
|
|
|
|
|
|
|
|
|
checkMoney:[{
|
|
|
|
|
value: 100,
|
|
|
|
|
name: '100 ',
|
|
|
|
|
@@ -503,6 +501,15 @@
|
|
|
|
|
}, 2)
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
radio:{
|
|
|
|
|
handler(n,o) {
|
|
|
|
|
console.log(n,o,'handler');
|
|
|
|
|
this.checkBar.forEach(item=>{
|
|
|
|
|
item.checked = false
|
|
|
|
|
});
|
|
|
|
|
this.oilBar = ''
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
computed: {
|
|
|
|
|
priceId() {
|
|
|
|
|
@@ -639,6 +646,7 @@
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|
checkInfo(){
|
|
|
|
|
console.log(this.radio)
|
|
|
|
|
this.tsetPlate(this.plateNumber ? this.plateNumber : this.plateNumberSel)
|
|
|
|
|
if (!this.testPlateResult) {
|
|
|
|
|
this.plateNumber=''
|
|
|
|
|
@@ -648,10 +656,10 @@
|
|
|
|
|
})
|
|
|
|
|
// return false
|
|
|
|
|
}
|
|
|
|
|
if (!this.oilSitePriceDetailsVo[this.radio].priceId) {
|
|
|
|
|
if (this.radio==null||!this.oilSitePriceDetailsVo[this.radio].priceId) {
|
|
|
|
|
uni.showToast({
|
|
|
|
|
icon: 'none',
|
|
|
|
|
title: '未选择油品'
|
|
|
|
|
title: '请选择油品'
|
|
|
|
|
})
|
|
|
|
|
return false
|
|
|
|
|
}
|
|
|
|
|
@@ -797,7 +805,7 @@
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
beforeMake() {
|
|
|
|
|
|
|
|
|
|
console.log(this.radio,'beforeMake')
|
|
|
|
|
this.tsetPlate(this.plateNumber ? this.plateNumber : this.plateNumberSel)
|
|
|
|
|
if (!this.testPlateResult) {
|
|
|
|
|
this.plateNumber=''
|
|
|
|
|
@@ -807,10 +815,10 @@
|
|
|
|
|
})
|
|
|
|
|
// return false
|
|
|
|
|
}
|
|
|
|
|
if (!this.oilSitePriceDetailsVo[this.radio].priceId) {
|
|
|
|
|
if (this.radio==null||!this.oilSitePriceDetailsVo[this.radio].priceId) {
|
|
|
|
|
uni.showToast({
|
|
|
|
|
icon: 'none',
|
|
|
|
|
title: '未选择油品'
|
|
|
|
|
title: '请选择油品'
|
|
|
|
|
})
|
|
|
|
|
return false
|
|
|
|
|
}
|
|
|
|
|
@@ -912,11 +920,14 @@
|
|
|
|
|
this.oilSitePriceDetailsVo = []
|
|
|
|
|
oilSiteApi.getNewSitePrice(channelId).then(res => {
|
|
|
|
|
if (res.code == 20000) {
|
|
|
|
|
this.radio = 0
|
|
|
|
|
this.plateNumbers = res.data.plateNumbers
|
|
|
|
|
this.oilSitePriceDetailsVo = res.data.oilSitePriceDetailsVo
|
|
|
|
|
this.activeSitePrice = res.data.oilSitePriceDetailsVo[0].priceId
|
|
|
|
|
this.siteUserNames = res.data.siteUserNames
|
|
|
|
|
this.oilSitePriceDetailsVo = res.data.oilSitePriceDetailsVo;
|
|
|
|
|
this.siteUserNames = res.data.siteUserNames;
|
|
|
|
|
if(this.oilSitePriceDetailsVo.length==1){
|
|
|
|
|
this.radio = 0
|
|
|
|
|
this.activeSitePrice = res.data.oilSitePriceDetailsVo[0].priceId
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|
@@ -957,11 +968,18 @@
|
|
|
|
|
},
|
|
|
|
|
changePrice(e) {
|
|
|
|
|
this.radio = e.detail.value
|
|
|
|
|
console.log(e)
|
|
|
|
|
console.log(e,'changePrice')
|
|
|
|
|
this.vol =''
|
|
|
|
|
this.activeSitePrice = this.oilSitePriceDetailsVo[this.radio].priceId
|
|
|
|
|
this.realMoney ='--'
|
|
|
|
|
this.xoilAmountGun = ''
|
|
|
|
|
this.xoilAmountGun = '';
|
|
|
|
|
Object.keys(this.tyRes).forEach(key=>{
|
|
|
|
|
this.tyRes[key]=''
|
|
|
|
|
})
|
|
|
|
|
Object.keys(this.ty).forEach(key=>{
|
|
|
|
|
this.ty[key]=''
|
|
|
|
|
})
|
|
|
|
|
this.vlom = ''
|
|
|
|
|
// // console.log(this.radio)
|
|
|
|
|
console.log(this.oilSitePriceDetailsVo[this.radio])
|
|
|
|
|
},
|
|
|
|
|
|
