caoliancun/MP_XOIL_company_new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

中秋更新

Browse Source
This commit is contained in:
caolc
2022-09-09 14:53:48 +08:00
parent a59bf23fd7
commit 26b9d6fe85
18 changed files with 388 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
BagStation/pages/makeOrder/makeOrder.vue
View File

@@ -56,7 +56,7 @@
</view>
<!-- 价格 -->
<price-select-tab @onChangePayQr="onChangePayQr" @onChangePay="onChangePay" :active-cur="activeCur" :site-name="siteInfo.siteName"
<price-select-tab v-if="siteInfo" :siteId='siteInfo.siteId' @onChangePayQr="onChangePayQr" @onChangePay="onChangePay" :active-cur="activeCur" :site-name="siteInfo.siteName"
:channel-list="siteInfo.oilSiteChannelDetailsVos" :channelJuli="siteInfo.juli"></price-select-tab>
</view>
@@ -77,9 +77,7 @@
imgURL: this.global.imgURL,
active: 0,
ColorList: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
siteInfo: {
},
siteInfo: null,
activeCur:0,
activePay: null,
qrcodePay: null,
@@ -115,7 +113,8 @@
oilSiteApi.getSiteDetails(data2).then(res => {
console.log('这里是获取油站siteinfo 处',res)
if (res.code == 20000) {
this.siteInfo = res.data
this.siteInfo = res.data;
this.siteInfo = Object.assign(this.siteInfo,{siteId:id})
}else if(res.code == 40000){
this.errMsg = res.msg
}

7
BagStation/pages/makeOrder/orderPaying.vue
View File

@@ -155,7 +155,7 @@
<view class="padding-tb-xs text-left">
油品油枪：
<text
class="fr nowrap">{{order.oilsCode?order.oilsCode+' ':''}}&{{order.oilsBar != null ?order.oilsBar+'号枪':'未选择油枪'}}</text>
class="fr nowrap">{{order.oilsCode?order.oilsCode+' ':''}}&{{ order.gunName?order.gunName+'号枪': order.oilsBar?order.oilsBar+'号枪':'未选择油枪'}}</text>
</view>
<view class="padding-tb-xs text-left">
加油升数：
@@ -166,13 +166,14 @@
加油金额：
<!-- <text
class="fr">{{order.oilDiscountAmount>0?order.realAmount+order.oilDiscountAmount:order.realAmount|moneyFormat}}</text> -->
<text class="fr">{{order.xoilAmountGun |moneyFormat}}</text>
<text class="fr">{{ moneyIntercept(order.xoilAmountGun )}}</text>
</view>
</view>
<view class="padding-tb-xs text-left">
星油优惠：
<!-- order.oilDiscountAmount>0?order.oilDiscountAmount:'xxx.x'|moneyFormat -->
<text
class="text-red fr">{{order.oilDiscountAmount>0?order.oilDiscountAmount:'xxx.x'|moneyFormat}}</text>
class="text-red fr">{{ moneyIntercept(order.oilDiscountAmount)}}</text>
</view>
<view class="padding-tb-xs text-left">
优惠券：

2
BagStation/pages/makeOrder/payResult.vue
View File

@@ -63,7 +63,7 @@
<view class="padding-tb-xs text-left">
油品油枪：
<text class="fr nowrap">
{{order.oilsCode?order.oilsCode+' ':''}}&{{order.oilsBar?order.oilsBar+'号枪':'未选择油枪'}} </text>
{{order.oilsCode?order.oilsCode+' ':''}}&{{ order.gunName?order.gunName+'号枪': order.oilsBar?order.oilsBar+'号枪':'未选择油枪'}} </text>
</view>
<view class="padding-tb-xs text-left">
加油升数：