From 584f15ded9aef192a7d3aa7c84286af23e945394 Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Sun, 29 Sep 2024 16:40:07 +0800 Subject: [PATCH] 9.29 --- .../activeConsumption/index.vue | 4 ++-- .../EventMarketing/liJianMarketing/index.vue | 4 ++-- .../openCardGift/TimeLimited.vue | 4 ++-- .../EventMarketing/openCardGift/separate.vue | 4 ++-- .../openCardGift/userConsume.vue | 4 ++-- .../openCardGift/userRecharge.vue | 4 ++-- fuintAdmin/src/views/userGrade/index.vue | 4 ++-- gasStation-uni/pages/refuel/refuel.vue | 20 +++++++++++++++---- 8 files changed, 30 insertions(+), 18 deletions(-) diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue index 3756e0bbb..e625016d5 100644 --- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue @@ -98,8 +98,8 @@ v-for="dict in dict.type.payment_type" v-if="dict.value!='APPLET_CODE'" :key="dict.value" - :label="dict.label" - :value="dict.value"> + :label="dict.value" + :value="dict.value">{{dict.label}} diff --git a/fuintAdmin/src/views/EventMarketing/liJianMarketing/index.vue b/fuintAdmin/src/views/EventMarketing/liJianMarketing/index.vue index a12cc9d25..ffb14fb10 100644 --- a/fuintAdmin/src/views/EventMarketing/liJianMarketing/index.vue +++ b/fuintAdmin/src/views/EventMarketing/liJianMarketing/index.vue @@ -152,8 +152,8 @@ v-for="dict in dict.type.payment_type" v-if="dict.value!='APPLET_CODE'" :key="dict.value" - :label="dict.label" - :value="dict.value"> + :label="dict.value" + :value="dict.value">{{dict.label}} diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue index 7161e21a2..052e5e007 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue @@ -321,8 +321,8 @@ v-for="dict in dict.type.payment_type" v-if="dict.value!='APPLET_CODE'" :key="dict.value" - :label="dict.label" - :value="dict.value"> + :label="dict.value" + :value="dict.value">{{dict.label}} diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue index bafd8b6d1..78d09c155 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue @@ -321,8 +321,8 @@ v-for="dict in dict.type.payment_type" v-if="dict.value!='APPLET_CODE'" :key="dict.value" - :label="dict.label" - :value="dict.value"> + :label="dict.value" + :value="dict.value">{{dict.label}} diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/userConsume.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/userConsume.vue index 59dd0350f..3e9651057 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/userConsume.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/userConsume.vue @@ -55,8 +55,8 @@ v-for="dict in dict.type.payment_type" v-if="dict.value!='APPLET_CODE'" :key="dict.value" - :label="dict.label" - :value="dict.value"> + :label="dict.value" + :value="dict.value">{{dict.label}} diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/userRecharge.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/userRecharge.vue index 945004944..388751037 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/userRecharge.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/userRecharge.vue @@ -42,8 +42,8 @@ v-for="dict in dict.type.payment_type" v-if="dict.value!='APPLET_CODE'" :key="dict.value" - :label="dict.label" - :value="dict.value"> + :label="dict.value" + :value="dict.value">{{dict.label}} diff --git a/fuintAdmin/src/views/userGrade/index.vue b/fuintAdmin/src/views/userGrade/index.vue index 3a0c1eb7c..62dab7352 100644 --- a/fuintAdmin/src/views/userGrade/index.vue +++ b/fuintAdmin/src/views/userGrade/index.vue @@ -661,8 +661,8 @@ v-for="dict in dict.type.payment_type" v-if="dict.value!='APPLET_CODE'" :key="dict.value" - :label="dict.label" - :value="dict.value"> + :label="dict.value" + :value="dict.value">{{dict.label}} diff --git a/gasStation-uni/pages/refuel/refuel.vue b/gasStation-uni/pages/refuel/refuel.vue index 46aef0448..18e92b353 100644 --- a/gasStation-uni/pages/refuel/refuel.vue +++ b/gasStation-uni/pages/refuel/refuel.vue @@ -2,6 +2,7 @@ + @@ -14,12 +15,13 @@ + 选择油品油枪 - {{oilTypeName || '--'}}{{oilGunName || '--'}} + {{oilTypeName || '--'}}{{oilGunName || ''}} {{staffName || '--'}} @@ -43,6 +45,7 @@ + 支付方式 @@ -80,6 +83,7 @@ 优惠信息 + 优惠券 @@ -87,6 +91,7 @@ + 消费有礼 @@ -100,10 +105,11 @@ +3 + - ¥245.88 - 共优惠¥10.00 + ¥{{oilOrder.payAmount}} + 共优惠¥{{oilOrder.discountAmount || 0}} + 选择优惠券 @@ -185,6 +192,7 @@ + 选择会员卡类型 @@ -210,6 +218,7 @@ + 选择员工 @@ -222,6 +231,7 @@ + 选择油品油枪 @@ -242,6 +252,7 @@ + 确认支付 @@ -260,13 +271,14 @@ 立即支付245.99元 + 待支付明细 商品信息 油品油枪 - 汽油92#1号枪 + {{oilTypeName || '--'}}{{oilGunName || ''}} 员工