caoliancun
/
MP-XiaoXing
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Labels Milestones
New Pull Request

123 #5

Merged
caoliancun merged 1 commits from caolc into master 2 years ago
Conversation 0 Commits 1 Files Changed 2
2 changed files with 39 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 50
      BagStation/pages/components/price-select-tab.vue
  2. 4
      utils/request.js

50
BagStation/pages/components/price-select-tab.vue
Unescape View File

@ -89,7 +89,7 @@
</form> </form>
</view> </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=" menu cu-list ">
<view class="cu-item nowrap"> <view class="cu-item nowrap">
<view class="text-bold "> <view class="text-bold ">
@ -117,7 +117,7 @@
</view> </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=" menu cu-list ">
<view class="cu-item nowrap"> <view class="cu-item nowrap">
<view class="text-bold "> <view class="text-bold ">
@ -144,7 +144,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="bg-white padding"> <view v-if="radio!==null" class="bg-white padding">
<view class=""> <view class="">
<text class="text-bold">优惠</text> <text class="text-bold">优惠</text>
</view> </view>
@ -355,7 +355,6 @@
oilBarTy: '', oilBarTy: '',
ty: { ty: {
realMoney: "" realMoney: ""
}, },
tyRes: { tyRes: {
liter: '', liter: '',
@ -377,7 +376,7 @@
plateNumbers: [], plateNumbers: [],
showPlate: "", showPlate: "",
showOrder: '', showOrder: '',
radio: '', radio: null,
imgURL: this.global.imgURL, imgURL: this.global.imgURL,
scrollLeft: 0, scrollLeft: 0,
checkVol: [{ checkVol: [{
@ -407,7 +406,6 @@
hot: false, hot: false,
}], }],
plateNumber: '', plateNumber: '',
checkMoney:[{ checkMoney:[{
value: 100, value: 100,
name: '100 ', name: '100 ',
@ -503,6 +501,15 @@
}, 2) }, 2)
} }
}, },
radio:{
handler(n,o) {
console.log(n,o,'handler');
this.checkBar.forEach(item=>{
item.checked = false
});
this.oilBar = ''
}
}
}, },
computed: { computed: {
priceId() { priceId() {
@ -639,6 +646,7 @@
}) })
}, },
checkInfo(){ checkInfo(){
console.log(this.radio)
this.tsetPlate(this.plateNumber ? this.plateNumber : this.plateNumberSel) this.tsetPlate(this.plateNumber ? this.plateNumber : this.plateNumberSel)
if (!this.testPlateResult) { if (!this.testPlateResult) {
this.plateNumber='' this.plateNumber=''
@ -648,10 +656,10 @@
}) })
// return false // return false
} }
if (!this.oilSitePriceDetailsVo[this.radio].priceId) { if (this.radio==null||!this.oilSitePriceDetailsVo[this.radio].priceId) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: '未选择油品' title: '请选择油品'
}) })
return false return false
} }
@ -797,7 +805,7 @@
} }
}, },
beforeMake() { beforeMake() {
console.log(this.radio,'beforeMake')
this.tsetPlate(this.plateNumber ? this.plateNumber : this.plateNumberSel) this.tsetPlate(this.plateNumber ? this.plateNumber : this.plateNumberSel)
if (!this.testPlateResult) { if (!this.testPlateResult) {
this.plateNumber='' this.plateNumber=''
@ -807,10 +815,10 @@
}) })
// return false // return false
} }
if (!this.oilSitePriceDetailsVo[this.radio].priceId) { if (this.radio==null||!this.oilSitePriceDetailsVo[this.radio].priceId) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: '未选择油品' title: '请选择油品'
}) })
return false return false
} }
@ -912,11 +920,14 @@
this.oilSitePriceDetailsVo = [] this.oilSitePriceDetailsVo = []
oilSiteApi.getNewSitePrice(channelId).then(res => { oilSiteApi.getNewSitePrice(channelId).then(res => {
if (res.code == 20000) { if (res.code == 20000) {
this.radio = 0
this.plateNumbers = res.data.plateNumbers this.plateNumbers = res.data.plateNumbers
this.oilSitePriceDetailsVo = res.data.oilSitePriceDetailsVo 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 this.activeSitePrice = res.data.oilSitePriceDetailsVo[0].priceId
this.siteUserNames = res.data.siteUserNames }
} }
}) })
}, },
@ -957,11 +968,18 @@
}, },
changePrice(e) { changePrice(e) {
this.radio = e.detail.value this.radio = e.detail.value
console.log(e) console.log(e,'changePrice')
this.vol ='' this.vol =''
this.activeSitePrice = this.oilSitePriceDetailsVo[this.radio].priceId this.activeSitePrice = this.oilSitePriceDetailsVo[this.radio].priceId
this.realMoney ='--' 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.radio)
console.log(this.oilSitePriceDetailsVo[this.radio]) console.log(this.oilSitePriceDetailsVo[this.radio])
}, },

4
utils/request.js
Unescape View File

@ -7,8 +7,8 @@ const env = 'production'/* */
const testUrl = 'http://192.168.0.45:38080' const testUrl = 'http://192.168.0.45:38080'
// const productUrl = 'http://121.196.213.68/adminapi' //预生产 // const productUrl = 'http://121.196.213.68/adminapi' //预生产
const productUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new // const productUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new
// const productUrl = 'http://uat.xingoil.com/adminapi' // 生产，加密 new const productUrl = 'http://uat.xingoil.com/adminapi' // 生产，加密 new
const service = axios.create({ const service = axios.create({
baseURL: env == 'production' ? productUrl : testUrl, baseURL: env == 'production' ? productUrl : testUrl,
// baseURL: testUrl, // baseURL: testUrl,

Write Preview
Loading…
Cancel
Save