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

11.29

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-11-19 08:41:30 +08:00
parent 46627228f6
commit 2e2a71c064
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,7 +129,7 @@
<el-form-item label="活动奖品" prop="activeGift"> <el-form-item label="活动奖品" prop="activeGift">
<el-checkbox-group v-model="ruleForm.activeGift" @change="changes"> <el-checkbox-group v-model="ruleForm.activeGift" @change="changes">
<div style="display: flex;align-items: center;font-size: 14px;margin: 15px 0"> <div style="display: flex;align-items: center;font-size: 14px;margin: 15px 0">
<el-checkbox label="选项一" key="0" name="type"><!--积分--></el-checkbox> <el-checkbox label="" key="0" name="type"><!--积分--></el-checkbox>
<div style="margin-left: 10px">按</div> <div style="margin-left: 10px">按</div>
<el-select v-model="pointOrderType" style="margin: 0 10px" placeholder="请选择"> <el-select v-model="pointOrderType" style="margin: 0 10px" placeholder="请选择">
<el-option label="订单金额" value="0"></el-option> <el-option label="订单金额" value="0"></el-option>
@ -157,7 +157,7 @@
</div> </div>
<div style="display: flex;align-items: center;font-size: 14px;margin: 15px 0"> <div style="display: flex;align-items: center;font-size: 14px;margin: 15px 0">
<el-checkbox label="选项二" key="3" name="type"><!--成长值--></el-checkbox> <el-checkbox label="" key="3" name="type"><!--成长值--></el-checkbox>
<div style="margin-left: 10px">按</div> <div style="margin-left: 10px">按</div>
<el-select v-model="growthValueOrderType" style="margin: 0 10px" placeholder="请选择"> <el-select v-model="growthValueOrderType" style="margin: 0 10px" placeholder="请选择">
<el-option label="订单金额" value="0"></el-option> <el-option label="订单金额" value="0"></el-option>
@ -186,7 +186,7 @@
</div> </div>
<div style="display: flex;font-size: 14px;align-items: center;margin: 15px 0"> <div style="display: flex;font-size: 14px;align-items: center;margin: 15px 0">
<el-checkbox label="选项三" key="1" name="type"><!--优惠券--></el-checkbox> <el-checkbox label="" key="1" name="type"><!--优惠券--></el-checkbox>
<div style="margin-left: 10px">按</div> <div style="margin-left: 10px">按</div>
<el-select v-model="couponOrderType" style="margin: 0 10px" placeholder="请选择"> <el-select v-model="couponOrderType" style="margin: 0 10px" placeholder="请选择">
<el-option label="订单金额" value="0"></el-option> <el-option label="订单金额" value="0"></el-option>
@ -213,7 +213,7 @@
:label="item1.name" :label="item1.name"
:value="item1.id"></el-option> :value="item1.id"></el-option>
</el-select> </el-select>
<el-input-number style="width: 45%; margin-left: 10px;" <el-input-number style="width: 25%; margin-left: 10px;"
v-model.number="item.giftCardTotal" v-model.number="item.giftCardTotal"
:min="1" :min="1"
:max="item.max" :max="item.max"

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

@ -717,6 +717,7 @@ export default {
.d-s { .d-s {
display: flex; display: flex;
align-items: center; align-items: center;
padding-top:10px;
} }
.icon-type { .icon-type {

6
fuintAdmin/src/views/EventMarketing/openCardGift/index.vue
View File

@ -6,6 +6,7 @@
-- --
{{ title }} {{ title }}
</div> </div>
<div style="width: 100%;height: 40px"></div>
<!----> <!---->
<activeNewlyweds v-if="id == 1" :activeId="activeId"></activeNewlyweds> <activeNewlyweds v-if="id == 1" :activeId="activeId"></activeNewlyweds>
<activeConsumption v-if="id == 3" :activeId="activeId"></activeConsumption> <activeConsumption v-if="id == 3" :activeId="activeId"></activeConsumption>
@ -157,6 +158,11 @@ export default {
background: #fff; background: #fff;
font-size: 12px; font-size: 12px;
color: #666666; color: #666666;
position: fixed;
top: 60px;
left: 200px;
border-top: 1px solid #eceff1;
z-index: 999;
} }
.cot-box { .cot-box {

2
fuintAdmin/src/views/EventMarketing/openCardGift/popUp.vue
View File

@ -97,7 +97,7 @@
</div> </div>
<div style="width: 80%"> <div style="width: 80%">
<div v-for="(item,index) in couponList" :key="index" style="font-size: 14px;margin: 15px 0;display: flex;align-items: center"> <div v-for="(item,index) in couponList" :key="index" style="font-size: 14px;margin: 15px 0;display: flex;align-items: center;margin-top: 0px">
<div style="width: 5%">赠送</div> <div style="width: 5%">赠送</div>
<el-select v-model="item.vouchersId" style="margin-left: 10px;width: 45%" placeholder="请选择" @change="updateMax(item)"> <el-select v-model="item.vouchersId" style="margin-left: 10px;width: 45%" placeholder="请选择" @change="updateMax(item)">
<el-option <el-option