dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

9.29

Browse Source
This commit is contained in:
cun-nan 2024-09-29 16:40:07 +08:00
parent 298fa3037b
commit 584f15ded9
8 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
View File

@ -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"></el-checkbox>
:label="dict.value"
:value="dict.value">{{dict.label}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="每人每天参与上限" prop="everyDayCeiling">

4
fuintAdmin/src/views/EventMarketing/liJianMarketing/index.vue
View File

@ -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"></el-checkbox>
:label="dict.value"
:value="dict.value">{{dict.label}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="活动方式" prop="activeManner">

4
fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue
View File

@ -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"></el-checkbox>
:label="dict.value"
:value="dict.value">{{dict.label}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label=" 会员标签" >

4
fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue
View File

@ -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"></el-checkbox>
:label="dict.value"
:value="dict.value">{{dict.label}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label=" 会员标签">

4
fuintAdmin/src/views/EventMarketing/openCardGift/userConsume.vue
View File

@ -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"></el-checkbox>
:label="dict.value"
:value="dict.value">{{dict.label}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="适用会员等级" prop="userGradeIds">

4
fuintAdmin/src/views/EventMarketing/openCardGift/userRecharge.vue
View File

@ -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"></el-checkbox>
:label="dict.value"
:value="dict.value">{{dict.label}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="适用会员等级" prop="userGradeIds">

4
fuintAdmin/src/views/userGrade/index.vue
View File

@ -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"></el-checkbox>
:label="dict.value"
:value="dict.value">{{dict.label}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="折扣" prop="discount">

20
gasStation-uni/pages/refuel/refuel.vue
View File

@ -2,6 +2,7 @@
<view class="content">
<view class="container">
<view class="top">
<!-- 店铺信息 -->
<view class="dis">
<view class="top-img">
<image v-if="!store.logo" src="../../static/logo.png" mode="aspectFit"></image>
@ -14,12 +15,13 @@
</view>
</view>
<!-- 油品信息 -->
<view class="pkuang">
<view class="title_">
选择油品油枪
</view>
<view class="input_kuang">
<view class="leftIput" @click="selectShow = true">{{oilTypeName || '--'}}{{oilGunName || '--'}}
<view class="leftIput" @click="selectShow = true">{{oilTypeName || '--'}}{{oilGunName || ''}}
</view>
<view class="rr_box" @click="Selectemployees = true">{{staffName || '--'}}</view>
</view>
@ -43,6 +45,7 @@
</view>
</view>
<view class="b_"></view>
<!-- 支付方式 -->
<view class="pkuang">
<view class="title_">
支付方式
@ -80,6 +83,7 @@
优惠信息
</view>
</view>
<!-- 优惠券信息 -->
<view class="d-bs" style="box-sizing: border-box; padding: 20px;" @click="selectCoupon = true">
<view class="">优惠券</view>
<view class="d-s">
@ -87,6 +91,7 @@
<u-icon name="arrow-right"></u-icon>
</view>
</view>
<!-- 消费有礼信息 -->
<view class="new-box" style="padding-top: 0px;">
<view class="title_">
消费有礼
@ -100,10 +105,11 @@
<view class="">+3</view>
</view>
</view>
<!-- 支付信息 -->
<view class="bs-box">
<view class="">
<view class="onetitle">¥245.88</view>
<view class="orsize">共优惠¥10.00</view>
<view class="onetitle">¥{{oilOrder.payAmount}}</view>
<view class="orsize">共优惠¥{{oilOrder.discountAmount || 0}}</view>
</view>
<view class="d-s">
<view class="d-s" style="color: #999999;font-size: 12px; margin-right: 10px;"
@ -125,6 +131,7 @@
</uni-popup>
</view>
<view>
<!-- 优惠券 -->
<u-popup :show="selectCoupon" closeable="true" mode="bottom" :round="10" @close="Couponclose">
<view class="popup-box">
<view class="p_title">选择优惠券</view>
@ -185,6 +192,7 @@
</view>
</view>
</u-popup>
<!-- 会员卡 -->
<u-popup :show="cardType" closeable="true" mode="bottom" :round="10" @close="cardTypeclose">
<view class="popup-box">
<view class="p_title">选择会员卡类型</view>
@ -210,6 +218,7 @@
</view>
</view>
</u-popup>
<!-- 选择员工 -->
<u-popup :show="Selectemployees" closeable="true" mode="bottom" :round="10" @close="Selectclose">
<view class="popup-box">
<view class="p_title">选择员工</view>
@ -222,6 +231,7 @@
</view>
</view>
</u-popup>
<!-- 选择油品油枪 -->
<u-popup :show="selectShow" closeable="true" mode="bottom" :round="10" @close="ypClose">
<view class="popup-box">
<view class="p_title">选择油品油枪</view>
@ -242,6 +252,7 @@
</view>
</u-popup>
<!-- 应支付 -->
<u-popup :show="ConfirmPayment" closeable="true" mode="bottom" :round="10" @close="Confirmclose">
<view class="popup-box">
<view class="p_title">确认支付</view>
@ -260,13 +271,14 @@
<view class="annius">立即支付245.99元</view>
</view>
</u-popup>
<!-- 订单明细 -->
<u-popup :show="PaymentDetails" closeable="true" mode="bottom" :round="10" @close="close">
<view class="popup-box">
<view class="p_title">待支付明细</view>
<view class="">商品信息</view>
<view class="p_bs">
<view class="">油品油枪</view>
<view class="">汽油92#1号枪</view>
<view class="">{{oilTypeName || '--'}}{{oilGunName || ''}}</view>
</view>
<view class="p_bs">
<view class="">员工</view>