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

9.19

Browse Source
This commit is contained in:
cun-nan 2024-09-19 10:41:11 +08:00
parent f4c56dddd1
commit cffc29c555
13 changed files with 75 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
View File

@ -478,8 +478,11 @@
<img src="../../../assets/images/xz.png" v-if="ruleForm.productLimit == 2" style="width: 20px;height: 20px;">
<div>自定义</div>
<el-select v-if="ruleForm.productLimit == 2" v-model="ruleForm.productIds" placeholder="请选择商品名称（可多选）" style="margin-left: 10px">
<el-option label="区域一" value="shanghai"></el-option>
<el-option label="区域二" value="beijing"></el-option>
<el-option
v-for="item in goodsList"
:key="item.id+''"
:label="item.name"
:value="item.id+''"></el-option>
</el-select>
</div>
</div>
@ -512,7 +515,7 @@ import {
} from "@/api/EventMarketing/SaveBlock";
import {oilNumberList1} from "@/api/order/oilnumgun";
import {getActiveConsumption, listExchange, listFavorable} from "@/api/EventMarketing/activeConsumption";
import {delLJGoods} from "@/api/convenienceStore/ljgoods";
import {delLJGoods, listLJGoods} from "@/api/convenienceStore/ljgoods";
export default {
name: 'index',
dicts: ['CardCoupon_type', 'putType_type', 'oilNumber_type'],
@ -666,7 +669,9 @@ import {
pageSize:5,
value: '',
tableData: [ ],
vipname:[]
vipname:[],
// 商品列表
goodsList:[]
}
},
created() {
@ -674,11 +679,17 @@ import {
if (this.type){
this.dialog = true
}
this.getGoodsList()
},
mounted() {
},
methods:{
getGoodsList(){
listLJGoods({page:1,pageSize:10000,status:'qy',isRecovery:0}).then(response => {
this.goodsList = response.data.records;
});
},
addCrule(){
this.Crule =! this.Crule
cardValueRule({type:'0'}).then(res=>{

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

@ -128,7 +128,7 @@
</el-form-item>
<el-form-item label="活动奖品" prop="activeGift">
<el-checkbox-group v-model="ruleForm.activeGift" @change="changes">
<div style="display: flex;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>
<div style="margin-left: 10px">按</div>
<el-select v-model="pointOrderType" style="margin: 0 10px" placeholder="请选择">
@ -138,11 +138,11 @@
</el-select>
<div>赠送积分</div>
<img src="@/assets/images/tjb.png"
style="width: 20px;height: 20px;cursor: pointer;margin-top: 7px;margin-left: 10px"
style="width: 20px;height: 20px;cursor: pointer;margin-left: 10px"
@click="addPoints(pointOrderType)">
</div>
<div v-for="(item,index) in pointList" :key="index" style="font-size: 14px;margin: 15px 0;margin-left: 11%">
<div v-for="(item,index) in pointList" :key="index" style="display:flex;align-items: center;font-size: 14px;margin: 15px 0;margin-left: 11%">
<span>消费满</span>
<el-input placeholder="请输入" style="width: 39%;margin: 0 10px" v-model="item.consumeAmount">
<template slot="append" v-if="pointOrderType==2">L</template>
@ -156,7 +156,7 @@
@click="deletePoints(index)">
</div>
<div style="display: flex;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>
<div style="margin-left: 10px">按</div>
<el-select v-model="growthValueOrderType" style="margin: 0 10px" placeholder="请选择">
@ -166,11 +166,11 @@
</el-select>
<div>赠送成长值</div>
<img src="@/assets/images/tjb.png"
style="width: 20px;height: 20px;cursor: pointer;margin-top: 7px;margin-left: 10px"
style="width: 20px;height: 20px;cursor: pointer;margin-left: 10px"
@click="addGrowthValues(growthValueOrderType)">
</div>
<div v-for="(item,index) in growthValueList" :key="index" style="font-size: 14px;margin: 15px 0;margin-left: 11%">
<div v-for="(item,index) in growthValueList" :key="index" style="display:flex;align-items: center;font-size: 14px;margin: 15px 0;margin-left: 11%">
<span>消费满</span>
<el-input placeholder="请输入" style="width: 39%;margin: 0 10px" v-model="item.consumeAmount">
<template slot="append" v-if="growthValueOrderType==2">L</template>
@ -185,7 +185,7 @@
@click="deleteGrowthValues(index)">
</div>
<div style="display: flex;font-size: 14px;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>
<div style="margin-left: 10px">按</div>
<el-select v-model="couponOrderType" style="margin: 0 10px" placeholder="请选择">
@ -195,11 +195,11 @@
</el-select>
<div>赠送优惠券</div>
<img src="@/assets/images/tjb.png"
style="width: 20px;height: 20px;cursor: pointer;margin-top: 7px;margin-left: 10px"
style="width: 20px;height: 20px;cursor: pointer;margin-left: 10px"
@click="addCoupons(couponOrderType)">
</div>
<div v-for="(item,index) in couponList" :key="index" style="font-size: 14px;margin: 15px 0;margin-left: 11%">
<div v-for="(item,index) in couponList" :key="index" style="font-size: 14px;margin: 15px 0;margin-left: 11%;display:flex;align-items: center;">
<span>消费满</span>
<el-input placeholder="请输入" style="width: 30%;margin: 0 10px" v-model="item.consumeAmount">
<template slot="append" v-if="couponOrderType==2">L</template>

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

@ -50,10 +50,10 @@
<div style="margin: 10px 0">
<el-checkbox label="2" name="type">赠送成长值</el-checkbox>
</div>
<div style="display: flex;font-size: 14px;margin: 15px 0">
<div style="display: flex;font-size: 14px;margin: 15px 0;align-items: center">
<el-checkbox label="0" name="type">赠送优惠券</el-checkbox>
<img src="@/assets/images/tjb.png"
style="width: 20px;height: 20px;cursor: pointer;margin-top: 7px;margin-left: 10px"
style="width: 20px;height: 20px;cursor: pointer;margin-left: 10px;"
@click="addCoupons()">
</div>
</el-checkbox-group>
@ -75,7 +75,7 @@
</el-input>
</div>
<div v-for="(item,index) in couponList" :key="index" style="display: flex;font-size: 14px;margin: 20px 0">
<div v-for="(item,index) in couponList" :key="index" style="display: flex;font-size: 14px;align-items: center;margin: 20px 0">
<div style="width: 9.5%;">赠送</div>
<el-select v-model="item.vouchersId" style="width: 45%" placeholder="请选择">
<el-option
@ -87,7 +87,7 @@
<el-input style="width: 45%;margin-left: 10px" v-model="item.giftCardTotal">
<template slot="append">张</template>
</el-input>
<img src="@/assets/images/ljt.png" style="width: 25px;height: 25px;margin-left: 10px"
<img src="@/assets/images/ljt.png" style="width: 25px;height: 25px;margin-left: 10px;"
@click="deleteCoupons(index)">
</div>
</div>

12
fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
View File

@ -309,13 +309,11 @@
:value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="密码形式" prop="name">
<el-form-item label="密码形式" prop="pwdType">
<div class="d-s">
<el-radio-group v-model="ruleForm.pwdType">
<el-radio :label="0">免密</el-radio>
<el-radio :label="1">加密</el-radio>
<el-radio :label="'0'">免密</el-radio>
<el-radio :label="'1'">加密</el-radio>
</el-radio-group>
</div>
</el-form-item>
@ -703,7 +701,7 @@ export default {
if (valid) {
//密码形式 字段单独添加 因为涉及到图片样式
this.ruleForm.pwdType = this.tindex
// this.ruleForm.pwdType = this.tindex
//开始时间 结束时间分割
this.ruleForm.effectiveTimeStart = this.ruleForm.value1[0]
this.ruleForm.effectiveTimeEnd = this.ruleForm.value1[1]
@ -716,6 +714,7 @@ export default {
(res) => {
if (res.code == 200) {
this.$message.success('修改成功');
this.getlist()
} else {
this.$message.error('修改失败');
}
@ -727,6 +726,7 @@ export default {
add(this.ruleForm).then(res => {
if (res.code == 200) {
this.$message.success('添加成功');
this.getlist()
} else {
this.$message.error('添加失败');
}

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

@ -163,15 +163,15 @@
</el-form-item>
<el-form-item label="活动方式" prop="activeManner">
<el-checkbox-group v-model="ruleForm.activeManner">
<div style="display: flex;font-size: 14px;margin: 15px 0">
<div style="display: flex;font-size: 14px;margin: 15px 0;align-items: center">
<el-checkbox label="0" name="type">按订单金额</el-checkbox>
<img src="@/assets/images/tjb.png"
style="width: 20px;height: 20px;cursor: pointer;margin-top: 7px;margin-left: 10px"
style="width: 20px;height: 20px;cursor: pointer;margin-left: 10px"
@click="addPoints(0)">
</div>
<div v-if="ruleForm.offerType == 0 && ruleForm.activeType == 0">
<div v-for="(item,index) in orderList" :key="index" style="font-size: 14px;margin: 15px 0">
<div v-for="(item,index) in orderList" :key="index" style="font-size: 14px;margin: 15px 0;display: flex;align-items: center">
<span>订单金额满</span>
<el-input placeholder="请输入" style="width: 30%;margin: 0 10px" v-model="item.full">
<template slot="append">元</template>
@ -185,7 +185,7 @@
</div>
</div>
<div v-if="ruleForm.offerType == 0 && ruleForm.activeType == 1">
<div v-for="(item,index) in orderList" :key="index" style="font-size: 14px;margin: 15px 0">
<div v-for="(item,index) in orderList" :key="index" style="font-size: 14px;margin: 15px 0;display: flex;align-items: center">
<span>订单金额满</span>
<el-input placeholder="请输入" style="width: 20%;margin: 0 10px" v-model="item.full">
<template slot="append">元</template>
@ -203,7 +203,7 @@
</div>
</div>
<div v-if="ruleForm.offerType == 0 && ruleForm.activeType == 2">
<div v-for="(item,index) in orderList" :key="index" style="font-size: 14px;margin: 15px 0">
<div v-for="(item,index) in orderList" :key="index" style="font-size: 14px;margin: 15px 0;display: flex;align-items: center">
<span>订单金额每满</span>
<el-input placeholder="请输入" style="width: 19%;margin: 0 10px" v-model="item.full">
<template slot="append">元</template>
@ -221,7 +221,7 @@
</div>
</div>
<div v-if="ruleForm.offerType == 1 && ruleForm.activeType == 0">
<div v-for="(item,index) in orderList" :key="index" style="font-size: 14px;margin: 15px 0">
<div v-for="(item,index) in orderList" :key="index" style="font-size: 14px;margin: 15px 0;display: flex;align-items: center">
<span>订单金额满</span>
<el-input placeholder="请输入" style="width: 20%;margin: 0 10px" v-model="item.full">
<template slot="append">元</template>
@ -239,15 +239,15 @@
</div>
</div>
<div style="display: flex;font-size: 14px;margin: 15px 0">
<div style="display: flex;font-size: 14px;margin: 15px 0;align-items: center">
<el-checkbox label="1" name="type">按加油升数</el-checkbox>
<img src="@/assets/images/tjb.png"
style="width: 20px;height: 20px;cursor: pointer;margin-top: 7px;margin-left: 10px"
style="width: 20px;height: 20px;cursor: pointer;margin-left: 10px"
@click="addGrowthValues(1)">
</div>
<div v-if="ruleForm.offerType == 0 && ruleForm.activeType == 0">
<div v-for="(item,index) in refuelList" :key="index" style="font-size: 14px;margin: 15px 0">
<div v-for="(item,index) in refuelList" :key="index" style="font-size: 14px;margin: 15px 0;display: flex;align-items: center">
<span>加油升数满</span>
<el-input placeholder="请输入" style="width: 30%;margin: 0 10px" v-model="item.full">
<template slot="append">L</template>
@ -262,7 +262,7 @@
</div>
</div>
<div v-if="ruleForm.offerType == 0 && ruleForm.activeType == 1">
<div v-for="(item,index) in refuelList" :key="index" style="font-size: 14px;margin: 15px 0">
<div v-for="(item,index) in refuelList" :key="index" style="font-size: 14px;margin: 15px 0;display: flex;align-items: center">
<span>加油升数满</span>
<el-input placeholder="请输入" style="width: 20%;margin: 0 10px" v-model="item.full">
<template slot="append">L</template>
@ -282,7 +282,7 @@
</div>
</div>
<div v-if="ruleForm.offerType == 0 && ruleForm.activeType == 2">
<div v-for="(item,index) in refuelList" :key="index" style="font-size: 14px;margin: 15px 0">
<div v-for="(item,index) in refuelList" :key="index" style="font-size: 14px;margin: 15px 0;display: flex;align-items: center">
<span>加油升数每满</span>
<el-input placeholder="请输入" style="width: 19%;margin: 0 10px" v-model="item.full">
<template slot="append">L</template>
@ -302,7 +302,7 @@
</div>
</div>
<div v-if="ruleForm.offerType == 1 && ruleForm.activeType == 0">
<div v-for="(item,index) in refuelList" :key="index" style="font-size: 14px;margin: 15px 0">
<div v-for="(item,index) in refuelList" :key="index" style="font-size: 14px;margin: 15px 0;display: flex;align-items: center">
<span>加油升数满</span>
<el-input placeholder="请输入" style="width: 20%;margin: 0 10px" v-model="item.full">
<template slot="append">L</template>

22
fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
View File

@ -116,7 +116,7 @@
</div>
</el-drawer>
<el-dialog title="新增/编辑优惠券" :visible.sync="centerDialogVisible" width="80%">
<el-dialog title="新增/编辑优惠券" :visible.sync="centerDialogVisible" width="90%">
<!-- 表-->
<el-form :model="ruleForm" :rules="rules" :label-position="labelPosition" ref="ruleForm" label-width="120px"
class="demo-ruleForm">
@ -182,16 +182,16 @@
<el-option label="油品立减券" value="5"/>
<el-option label="单品代金券" value="6"/>
</el-select>
<div style="width: 60px;text-align: center">范围</div>
<el-input placeholder="" v-model="ruleForm.zkStartAmount" :disabled="ruleForm.id" style="width: 110px">
<div style="width: 50px;text-align: center">范围</div>
<el-input placeholder="" v-model="ruleForm.zkStartAmount" :disabled="ruleForm.id" style="width: 130px">
<template slot="append">元</template>
</el-input>
<div style="margin: 0px 5px;">~</div>
<el-input placeholder="" v-model="ruleForm.zkEndAmount" :disabled="ruleForm.id" style="width: 110px">
<el-input placeholder="" v-model="ruleForm.zkEndAmount" :disabled="ruleForm.id" style="width: 130px">
<template slot="append">元</template>
</el-input>
<div style="width: 60px;text-align: center">优惠</div>
<el-input placeholder="" v-model="ruleForm.zkData" :disabled="ruleForm.id" style="width: 110px">
<div style="width: 50px;text-align: center">优惠</div>
<el-input placeholder="" v-model="ruleForm.zkData" :disabled="ruleForm.id" style="width: 130px">
<template slot="append">折</template>
</el-input>
</div>
@ -208,15 +208,15 @@
<el-option label="单品代金券" value="6"/>
</el-select>
<div style="margin: 0px 5px;">满</div>
<el-input placeholder="" v-model="ruleForm.reachAmount" :disabled="ruleForm.id" style="width: 140px">
<el-input placeholder="" v-model="ruleForm.reachAmount" :disabled="ruleForm.id" style="width: 160px">
<template slot="append">元</template>
</el-input>
<div style="width: 60px;text-align: center">每</div>
<el-input placeholder="" v-model="ruleForm.ljOilNum" :disabled="ruleForm.id" style="width: 140px">
<div style="width: 40px;text-align: center">每</div>
<el-input placeholder="" v-model="ruleForm.ljOilNum" :disabled="ruleForm.id" style="width: 160px">
<template slot="append">L</template>
</el-input>
<div style="width: 60px;text-align: center">减</div>
<el-input placeholder="" v-model="ruleForm.ljOilAmount" :disabled="ruleForm.id" style="width: 140px">
<div style="width: 40px;text-align: center">减</div>
<el-input placeholder="" v-model="ruleForm.ljOilAmount" :disabled="ruleForm.id" style="width: 160px">
<template slot="append">元</template>
</el-input>
</div>

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

@ -66,10 +66,10 @@
<div style="margin: 10px 0">
<el-checkbox label="2" name="type">赠送成长值</el-checkbox>
</div>
<div style="display: flex;font-size: 14px;margin: 15px 0">
<div style="display: flex;font-size: 14px;margin: 15px 0;align-items: center">
<el-checkbox label="0" name="type">赠送优惠券</el-checkbox>
<img src="@/assets/images/tjb.png"
style="width: 20px;height: 20px;cursor: pointer;margin-top: 7px;margin-left: 10px"
style="width: 20px;height: 20px;cursor: pointer;margin-left: 10px"
@click="addCoupons()">
</div>
</el-checkbox-group>
@ -91,7 +91,7 @@
</el-input>
</div>
<div v-for="(item,index) in couponList" :key="index" style="font-size: 14px;margin: 15px 0;display: flex">
<div v-for="(item,index) in couponList" :key="index" style="font-size: 14px;margin: 20px 0;display: flex;align-items: center">
<div style="width: 5%;">赠送</div>
<el-select v-model="item.vouchersId" style="margin-left: 10px;width: 45%" placeholder="请选择">
<el-option

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

@ -51,10 +51,10 @@
<div style="margin: 10px 0">
<el-checkbox label="2" name="type">赠送成长值</el-checkbox>
</div>
<div style="display: flex;font-size: 14px;margin: 15px 0">
<div style="display: flex;font-size: 14px;margin: 15px 0;align-items: center">
<el-checkbox label="0" name="type">赠送优惠券</el-checkbox>
<img src="@/assets/images/tjb.png"
style="width: 20px;height: 20px;cursor: pointer;margin-top: 7px;margin-left: 10px"
style="width: 20px;height: 20px;cursor: pointer;margin-left: 10px"
@click="addCoupons()">
</div>
</el-checkbox-group>
@ -76,7 +76,7 @@
</el-input>
</div>
<div v-for="(item,index) in couponList" :key="index" style="font-size: 14px;margin: 15px 0;display: flex">
<div v-for="(item,index) in couponList" :key="index" style="font-size: 14px;margin: 20px 0;display: flex;align-items: center">
<div style="width: 5%;">赠送</div>
<el-select v-model="item.vouchersId" style="margin-left: 10px;width: 45%" placeholder="请选择">
<el-option

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

@ -87,17 +87,17 @@
<div style="width: 20%">
<el-checkbox-group v-model="ruleForm.courtesyReward">
<div style="display: flex;font-size: 14px;margin: 15px 0">
<div style="display: flex;font-size: 14px;margin: 15px 0;align-items: center">
<el-checkbox label="0" name="type">赠送优惠券</el-checkbox>
<img src="@/assets/images/tjb.png"
style="width: 20px;height: 20px;cursor: pointer;margin-top: 7px;margin-left: 10px"
style="width: 20px;height: 20px;cursor: pointer;margin-left: 10px"
@click="addCoupons()">
</div>
</el-checkbox-group>
</div>
<div style="width: 80%">
<div v-for="(item,index) in couponList" :key="index" style="font-size: 14px;margin: 15px 0;display: flex">
<div v-for="(item,index) in couponList" :key="index" style="font-size: 14px;margin: 15px 0;display: flex;align-items: center">
<div style="width: 5%">赠送</div>
<el-select v-model="item.vouchersId" style="margin-left: 10px;width: 45%" placeholder="请选择">
<el-option

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

@ -470,7 +470,7 @@
</div>
</div>
<div style="margin-top: 20px">
<el-form-item label="时间段" prop="timeApplyStart">
<el-form-item label="时间段" prop="timeApplyStart" label-width="60px">
<el-time-picker
v-model="ruleForm1.dayStartTime"
format="HH:mm"

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

@ -78,10 +78,10 @@
<div style="margin: 10px 0">
<el-checkbox label="2" name="type">赠送成长值</el-checkbox>
</div>
<div style="display: flex;font-size: 14px;margin: 15px 0">
<div style="display: flex;font-size: 14px;margin: 15px 0;align-items: center">
<el-checkbox label="0" name="type">赠送优惠券</el-checkbox>
<img src="@/assets/images/tjb.png"
style="width: 20px;height: 20px;cursor: pointer;margin-top: 7px;margin-left: 10px"
style="width: 20px;height: 20px;cursor: pointer;margin-left: 10px"
@click="addCoupons()">
</div>
</el-checkbox-group>
@ -103,7 +103,7 @@
</el-input>
</div>
<div v-for="(item,index) in couponList" :key="index" style="font-size: 14px;margin: 15px 0;display: flex">
<div v-for="(item,index) in couponList" :key="index" style="font-size: 14px;margin: 20px 0;display: flex;align-items: center">
<div style="width: 5%;">赠送</div>
<el-select v-model="item.vouchersId" style="margin-left: 10px;width: 45%" placeholder="请选择">
<el-option

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

@ -65,10 +65,10 @@
<div style="margin: 10px 0">
<el-checkbox label="2" name="type">赠送成长值</el-checkbox>
</div>
<div style="display: flex;font-size: 14px;margin: 15px 0">
<div style="display: flex;font-size: 14px;margin: 15px 0;align-items: center">
<el-checkbox label="0" name="type">赠送优惠券</el-checkbox>
<img src="@/assets/images/tjb.png"
style="width: 20px;height: 20px;cursor: pointer;margin-top: 7px;margin-left: 10px"
style="width: 20px;height: 20px;cursor: pointer;margin-left: 10px"
@click="addCoupons()">
</div>
</el-checkbox-group>
@ -90,7 +90,7 @@
</el-input>
</div>
<div v-for="(item,index) in couponList" :key="index" style="font-size: 14px;margin: 15px 0;display: flex">
<div v-for="(item,index) in couponList" :key="index" style="font-size: 14px;margin: 20px 0;display: flex;align-items: center">
<div style="width: 5%;">赠送</div>
<el-select v-model="item.vouchersId" style="margin-left: 10px;width: 45%" placeholder="请选择">
<el-option

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

@ -732,7 +732,7 @@
</div>
</div>
<div style="margin-top: 20px">
<el-form-item label="时间段" prop="suitTimeSlotFront">
<el-form-item label="时间段" prop="suitTimeSlotFront" label-width="70px">
<el-time-picker
v-model="form2.suitTimeSlotFront"
format="HH:mm"
@ -773,7 +773,7 @@
</div>
</div>
<div style="margin-top: 20px">
<el-form-item label="时间段" prop="noUseTimeFront">
<el-form-item label="时间段" prop="noUseTimeFront" label-width="70px">
<el-time-picker
v-model="form2.noUseTimeFront"
format="HH:mm"