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

9.18

Browse Source
This commit is contained in:
cun-nan 2024-09-18 17:24:03 +08:00
parent 369060486a
commit 941f32aeac
12 changed files with 119 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
fuintAdmin/src/layout/components/Navbar.vue
View File

@ -51,7 +51,7 @@
<i class="el-icon-caret-bottom"/> <i class="el-icon-caret-bottom"/>
</div> </div>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item @click.native="prsswrod"> <el-dropdown-item @click.native="prsswrod()">
<span>修改密码</span> <span>修改密码</span>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item divided @click.native="logout"> <el-dropdown-item divided @click.native="logout">
@ -66,15 +66,17 @@
<el-dialog <el-dialog
title="修改密码" title="修改密码"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
width="30%" :before-close="handleClose"> width="30%"
:modal="false"
:before-close="handleClose">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="80px" class="demo-ruleForm"> <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="80px" class="demo-ruleForm">
<el-form-item label="新密码" prop="password"> <el-form-item label="新密码" prop="password">
<el-input v-model="ruleForm.password" show-password></el-input> <el-input v-model="ruleForm.password" show-password></el-input>
</el-form-item> </el-form-item>
<el-form-item label="重复密码" prop="passwords"> <el-form-item label="重复密码" prop="passwords">
<el-input show-password v-model="ruleForm.passwords"></el-input> <el-input show-password v-model="ruleForm.passwords"></el-input>
</el-form-item> </el-form-item>
<el-form-item > <el-form-item>
<el-button @click="resetForm('ruleForm')">取消</el-button> <el-button @click="resetForm('ruleForm')">取消</el-button>
<el-button type="primary" @click="submitForm('ruleForm')">保存</el-button> <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button>
</el-form-item> </el-form-item>
@ -155,19 +157,19 @@ export default {
day: -1, day: -1,
storeName: "", storeName: "",
isFullscreen: false, isFullscreen: false,
dialogVisible:false, dialogVisible: false,
accountId:"", accountId: "",
ruleForm:{}, ruleForm: {},
rules: { rules: {
password: [ password: [
{ required: true, message: '请输入新密码', trigger: 'blur' }, {required: true, message: '请输入新密码', trigger: 'blur'},
{ min: 3, max: 15, message: '长度在 3 到 15 个字符', trigger: 'blur' }, {min: 3, max: 15, message: '长度在 3 到 15 个字符', trigger: 'blur'},
{ validator: validatePass, trigger: 'blur' } {validator: validatePass, trigger: 'blur'}
], ],
passwords: [ passwords: [
{ required: true, message: '请输入密码', trigger: 'blur' }, {required: true, message: '请输入密码', trigger: 'blur'},
{ min: 3, max: 15, message: '长度在 3 到 15 个字符', trigger: 'blur' }, {min: 3, max: 15, message: '长度在 3 到 15 个字符', trigger: 'blur'},
{ validator: validatePass2, trigger: 'blur' } {validator: validatePass2, trigger: 'blur'}
], ],
} }
} }
@ -216,11 +218,12 @@ export default {
.then(_ => { .then(_ => {
done(); done();
}) })
.catch(_ => {}); .catch(_ => {
});
}, },
prsswrod(){ prsswrod() {
this.dialogVisible =! this.dialogVisible this.dialogVisible = !this.dialogVisible
getAccountInfo().then(res=>{ getAccountInfo().then(res => {
this.accountId = res.data.accountId this.accountId = res.data.accountId
}) })
}, },
@ -235,12 +238,12 @@ export default {
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
let data = { let data = {
acctId : this.accountId, acctId: this.accountId,
password: this.ruleForm.password, password: this.ruleForm.password,
} }
resetPwd(data).then(res=>{ resetPwd(data).then(res => {
console.log(res) console.log(res)
if(res.code == 200){ if (res.code == 200) {
this.dialogVisible = false this.dialogVisible = false
this.$store.dispatch('LogOut').then(() => { this.$store.dispatch('LogOut').then(() => {
location.href = '/'; location.href = '/';

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

@ -57,7 +57,7 @@
</div> </div>
</div> </div>
<div style="margin-top: 20px"> <div style="margin-top: 20px">
<el-form-item label="时间段" prop="suitTimeSlotFront"> <el-form-item label="时间段" prop="suitTimeSlotFront" label-width="70px" >
<el-time-picker <el-time-picker
v-model="ruleForm.suitTimeSlotFront" v-model="ruleForm.suitTimeSlotFront"
format="HH:mm" format="HH:mm"
@ -75,7 +75,7 @@
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="适用会员等级" prop="dieselUserLevel"> <el-form-item label="适用会员等级" prop="dieselUserLevel">
<el-select v-model="ruleForm.dieselUserLevel" multiple clearable placeholder="请选择会员等级（多选）"> <el-select v-model="ruleForm.dieselUserLevel" multiple clearable placeholder="请选择会员等级（多选）" style="width: 100%">
<el-option <el-option
v-for="(item,index) in userGradeList" v-for="(item,index) in userGradeList"
:label="item.name" :label="item.name"
@ -84,7 +84,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="会员标签" prop="userLabelIds"> <el-form-item label="会员标签" prop="userLabelIds">
<el-select v-model="ruleForm.userLabelIds" multiple clearable placeholder="请选择会员标签（多选）"> <el-select v-model="ruleForm.userLabelIds" multiple clearable placeholder="请选择会员标签（多选）" style="width: 100%">
<el-option <el-option
v-for="item in userLabelList" v-for="item in userLabelList"
:key="item.id+''" :key="item.id+''"
@ -142,13 +142,14 @@
@click="addPoints(pointOrderType)"> @click="addPoints(pointOrderType)">
</div> </div>
<div v-for="(item,index) in pointList" :key="index" style="font-size: 14px;margin: 15px 0"> <div v-for="(item,index) in pointList" :key="index" style="font-size: 14px;margin: 15px 0;margin-left: 11%">
<span>消费满</span> <span>消费满</span>
<el-input placeholder="请输入消费金额" style="width: 30%;margin: 0 10px" v-model="item.consumeAmount"> <el-input placeholder="请输入" style="width: 39%;margin: 0 10px" v-model="item.consumeAmount">
<template slot="append">元</template> <template slot="append" v-if="pointOrderType==2">L</template>
<template slot="append" v-else>元</template>
</el-input> </el-input>
<span>送</span> <span>送</span>
<el-input placeholder="请输入赠送积分" style="width: 30%;margin: 0 10px" v-model="item.givePoints"> <el-input placeholder="请输入赠送积分" style="width: 40%;margin: 0 10px" v-model="item.givePoints">
<template slot="append">积分</template> <template slot="append">积分</template>
</el-input> </el-input>
<img src="@/assets/images/ljt.png" style="width: 25px;height: 25px;" <img src="@/assets/images/ljt.png" style="width: 25px;height: 25px;"
@ -169,13 +170,14 @@
@click="addGrowthValues(growthValueOrderType)"> @click="addGrowthValues(growthValueOrderType)">
</div> </div>
<div v-for="(item,index) in growthValueList" :key="index" style="font-size: 14px;margin: 15px 0"> <div v-for="(item,index) in growthValueList" :key="index" style="font-size: 14px;margin: 15px 0;margin-left: 11%">
<span>消费满</span> <span>消费满</span>
<el-input placeholder="请输入消费金额" style="width: 30%;margin: 0 10px" v-model="item.consumeAmount"> <el-input placeholder="请输入" style="width: 39%;margin: 0 10px" v-model="item.consumeAmount">
<template slot="append">元</template> <template slot="append" v-if="growthValueOrderType==2">L</template>
<template slot="append" v-else>元</template>
</el-input> </el-input>
<span>送</span> <span>送</span>
<el-input placeholder="请输入赠送成长值" style="width: 30%;margin: 0 10px" <el-input placeholder="请输入赠送成长值" style="width: 40%;margin: 0 10px"
v-model="item.giveGrowthValue"> v-model="item.giveGrowthValue">
<template slot="append">成长值</template> <template slot="append">成长值</template>
</el-input> </el-input>
@ -197,20 +199,21 @@
@click="addCoupons(couponOrderType)"> @click="addCoupons(couponOrderType)">
</div> </div>
<div v-for="(item,index) in couponList" :key="index" style="font-size: 14px;margin: 15px 0"> <div v-for="(item,index) in couponList" :key="index" style="font-size: 14px;margin: 15px 0;margin-left: 11%">
<span>消费满</span> <span>消费满</span>
<el-input placeholder="请输入消费金额" style="width: 30%;margin: 0 10px" v-model="item.consumeAmount"> <el-input placeholder="请输入" style="width: 30%;margin: 0 10px" v-model="item.consumeAmount">
<template slot="append">元</template> <template slot="append" v-if="couponOrderType==2">L</template>
<template slot="append" v-else>元</template>
</el-input> </el-input>
<span>送</span> <span>送</span>
<el-select v-model="item.vouchersId" style="margin-left: 10px;width: 20%" placeholder="请选择"> <el-select v-model="item.vouchersId" style="margin-left: 10px;width: 22%" placeholder="请选择">
<el-option <el-option
v-for="(item1,index1) in cardCouponList" v-for="(item1,index1) in cardCouponList"
:key="index1" :key="index1"
:label="item1.name" :label="item1.name"
:value="item1.id"></el-option> :value="item1.id"></el-option>
</el-select> </el-select>
<el-input style="width: 20%;margin: 0 10px" v-model="item.giftCardTotal"> <el-input style="width: 25%;margin: 0 10px" v-model="item.giftCardTotal">
<template slot="append">张</template> <template slot="append">张</template>
</el-input> </el-input>
<img src="@/assets/images/ljt.png" style="width: 25px;height: 25px;" <img src="@/assets/images/ljt.png" style="width: 25px;height: 25px;"

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

@ -44,10 +44,10 @@
<div style="display: flex"> <div style="display: flex">
<div style="width: 17%"> <div style="width: 17%">
<el-checkbox-group v-model="ruleForm.courtesyReward"> <el-checkbox-group v-model="ruleForm.courtesyReward">
<div> <div >
<el-checkbox label="3" name="type">赠送积分</el-checkbox> <el-checkbox label="3" name="type">赠送积分</el-checkbox>
</div> </div>
<div> <div style="margin: 10px 0">
<el-checkbox label="2" name="type">赠送成长值</el-checkbox> <el-checkbox label="2" name="type">赠送成长值</el-checkbox>
</div> </div>
<div style="display: flex;font-size: 14px;margin: 15px 0"> <div style="display: flex;font-size: 14px;margin: 15px 0">

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

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

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

@ -174,7 +174,7 @@
<el-form-item label="优惠条件" required style="width: 45%;" v-if="ruleForm.type=='3'"> <el-form-item label="优惠条件" required style="width: 45%;" v-if="ruleForm.type=='3'">
<div class="d-s"> <div class="d-s">
<el-select v-model="ruleForm.useType" placeholder="请选择" style="width: 100px"> <el-select v-model="ruleForm.useType" placeholder="请选择" style="width: 110px">
<el-option label="订单金额" value="1"/> <el-option label="订单金额" value="1"/>
<el-option label="实收金额" value="2"/> <el-option label="实收金额" value="2"/>
<el-option label="兑换券" value="3"/> <el-option label="兑换券" value="3"/>
@ -182,7 +182,7 @@
<el-option label="油品立减券" value="5"/> <el-option label="油品立减券" value="5"/>
<el-option label="单品代金券" value="6"/> <el-option label="单品代金券" value="6"/>
</el-select> </el-select>
<div style="margin: 0px 5px;">范围</div> <div style="width: 60px;text-align: center">范围</div>
<el-input placeholder="" v-model="ruleForm.zkStartAmount" style="width: 110px"> <el-input placeholder="" v-model="ruleForm.zkStartAmount" style="width: 110px">
<template slot="append">元</template> <template slot="append">元</template>
</el-input> </el-input>
@ -660,7 +660,7 @@ export default {
}, },
uploading: false, uploading: false,
fileList: [], fileList: [],
labelPosition: 'left', labelPosition: 'right',
queryParams: { queryParams: {
number: '', number: '',
remark: '', remark: '',

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

@ -325,7 +325,7 @@
:value="dict.value"></el-checkbox> :value="dict.value"></el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
<el-form-item label=" 会员标签" prop="babelIds"> <el-form-item label=" 会员标签" >
<el-select v-model="ruleForm1.babelIds" multiple placeholder="请选择会员标签" style="width: 100%"> <el-select v-model="ruleForm1.babelIds" multiple placeholder="请选择会员标签" style="width: 100%">
<el-option <el-option
v-for="item in userLabelList" v-for="item in userLabelList"
@ -557,9 +557,6 @@ export default {
paymentType: [ paymentType: [
{required: true, message: '请输入支付方式', trigger: 'blur'}, {required: true, message: '请输入支付方式', trigger: 'blur'},
], ],
babelIds: [
{required: true, message: '请输入会员标签', trigger: 'blur'},
],
moneyMin: [ moneyMin: [
{required: true, message: '请输入实收金额', trigger: 'blur'}, {required: true, message: '请输入实收金额', trigger: 'blur'},
], ],
@ -661,6 +658,15 @@ export default {
}, },
// 提交活动规则 // 提交活动规则
submitRuleForm() { submitRuleForm() {
if (this.ruleForm1.consumeType == 1){
if (!this.ruleForm1.literMin || !this.ruleForm1.literMax){
this.$message.error("请填写消费条件信息")
}
}else {
if (!this.ruleForm1.moneyMin || !this.ruleForm1.moneyMax){
this.$message.error("请填写消费条件信息")
}
}
this.$refs["ruleForm1"].validate((valid) => { this.$refs["ruleForm1"].validate((valid) => {
if (valid) { if (valid) {
if (this.ruleForm1.paymentType) this.ruleForm1.paymentType = this.ruleForm1.paymentType.toString() if (this.ruleForm1.paymentType) this.ruleForm1.paymentType = this.ruleForm1.paymentType.toString()

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

@ -58,12 +58,12 @@
</el-form-item> </el-form-item>
<el-form-item label="活动奖品" prop="courtesyReward"> <el-form-item label="活动奖品" prop="courtesyReward">
<div style="display: flex"> <div style="display: flex">
<div style="width: 17%"> <div style="width: 15%">
<el-checkbox-group v-model="ruleForm.courtesyReward"> <el-checkbox-group v-model="ruleForm.courtesyReward">
<div> <div>
<el-checkbox label="3" name="type">赠送积分</el-checkbox> <el-checkbox label="3" name="type">赠送积分</el-checkbox>
</div> </div>
<div> <div style="margin: 10px 0">
<el-checkbox label="2" name="type">赠送成长值</el-checkbox> <el-checkbox label="2" name="type">赠送成长值</el-checkbox>
</div> </div>
<div style="display: flex;font-size: 14px;margin: 15px 0"> <div style="display: flex;font-size: 14px;margin: 15px 0">
@ -74,33 +74,33 @@
</div> </div>
</el-checkbox-group> </el-checkbox-group>
</div> </div>
<div style="width: 70%"> <div style="width: 85%">
<div style="display: flex;font-size: 14px;"> <div style="display: flex;font-size: 14px;">
<div>赠送</div> <div style="width: 6%;">赠送</div>
<el-input placeholder="请输入赠送的积分数量" style="width: 70%;margin: 0 10px" <el-input placeholder="请输入赠送的积分数量" style="width: 94%;"
v-model="ruleForm.points"> v-model="ruleForm.points">
<template slot="append">积分</template> <template slot="append">积分</template>
</el-input> </el-input>
</div> </div>
<div style="display: flex;font-size: 14px;margin: 15px 0"> <div style="display: flex;font-size: 14px;margin: 15px 0">
<div>赠送</div> <div style="width: 6%;">赠送</div>
<el-input placeholder="请输入赠送的成长值数量" style="width: 70%;margin: 0 10px" <el-input placeholder="请输入赠送的成长值数量" style="width: 94%;"
v-model="ruleForm.growthValue"> v-model="ruleForm.growthValue">
<template slot="append">成长值</template> <template slot="append">成长值</template>
</el-input> </el-input>
</div> </div>
<div v-for="(item,index) in couponList" :key="index" style="font-size: 14px;margin: 15px 0"> <div v-for="(item,index) in couponList" :key="index" style="font-size: 14px;margin: 15px 0;display: flex">
<span>赠送</span> <div style="width: 5%;">赠送</div>
<el-select v-model="item.vouchersId" style="margin-left: 10px;width: 30%" placeholder="请选择"> <el-select v-model="item.vouchersId" style="margin-left: 10px;width: 45%" placeholder="请选择">
<el-option <el-option
v-for="(item1,index1) in cardCouponList" v-for="(item1,index1) in cardCouponList"
:key="index1" :key="index1"
:label="item1.name" :label="item1.name"
:value="item1.id"></el-option> :value="item1.id"></el-option>
</el-select> </el-select>
<el-input style="width: 30%;margin-left: 10px" v-model="item.giftCardTotal"> <el-input style="width: 43%;margin-left: 10px" v-model="item.giftCardTotal">
<template slot="append">张</template> <template slot="append">张</template>
</el-input> </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"

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

@ -43,12 +43,12 @@
</el-form-item> </el-form-item>
<el-form-item label="活动奖品" prop="rewardDisplay"> <el-form-item label="活动奖品" prop="rewardDisplay">
<div style="display: flex"> <div style="display: flex">
<div style="width: 17%"> <div style="width: 15%">
<el-checkbox-group v-model="ruleForm.rewardDisplay"> <el-checkbox-group v-model="ruleForm.rewardDisplay">
<div> <div>
<el-checkbox label="3" name="type">赠送积分</el-checkbox> <el-checkbox label="3" name="type">赠送积分</el-checkbox>
</div> </div>
<div> <div style="margin: 10px 0">
<el-checkbox label="2" name="type">赠送成长值</el-checkbox> <el-checkbox label="2" name="type">赠送成长值</el-checkbox>
</div> </div>
<div style="display: flex;font-size: 14px;margin: 15px 0"> <div style="display: flex;font-size: 14px;margin: 15px 0">
@ -59,33 +59,33 @@
</div> </div>
</el-checkbox-group> </el-checkbox-group>
</div> </div>
<div style="width: 70%"> <div style="width: 85%">
<div style="display: flex;font-size: 14px;"> <div style="display: flex;font-size: 14px;">
<div>赠送</div> <div style="width: 6%;">赠送</div>
<el-input placeholder="请输入赠送的积分数量" style="width: 70%;margin: 0 10px" <el-input placeholder="请输入赠送的积分数量" style="width: 94%;"
v-model="ruleForm.points"> v-model="ruleForm.points">
<template slot="append">积分</template> <template slot="append">积分</template>
</el-input> </el-input>
</div> </div>
<div style="display: flex;font-size: 14px;margin: 15px 0"> <div style="display: flex;font-size: 14px;margin: 15px 0">
<div>赠送</div> <div style="width: 6%;">赠送</div>
<el-input placeholder="请输入赠送的成长值数量" style="width: 70%;margin: 0 10px" <el-input placeholder="请输入赠送的成长值数量" style="width: 94%;"
v-model="ruleForm.growthValue"> v-model="ruleForm.growthValue">
<template slot="append">成长值</template> <template slot="append">成长值</template>
</el-input> </el-input>
</div> </div>
<div v-for="(item,index) in couponList" :key="index" style="font-size: 14px;margin: 15px 0"> <div v-for="(item,index) in couponList" :key="index" style="font-size: 14px;margin: 15px 0;display: flex">
<span>赠送</span> <div style="width: 5%;">赠送</div>
<el-select v-model="item.vouchersId" style="margin-left: 10px;width: 30%" placeholder="请选择"> <el-select v-model="item.vouchersId" style="margin-left: 10px;width: 45%" placeholder="请选择">
<el-option <el-option
v-for="(item1,index1) in cardCouponList" v-for="(item1,index1) in cardCouponList"
:key="index1" :key="index1"
:label="item1.name" :label="item1.name"
:value="item1.id"></el-option> :value="item1.id"></el-option>
</el-select> </el-select>
<el-input style="width: 30%;margin-left: 10px" v-model="item.giftCardTotal"> <el-input style="width: 43%;margin-left: 10px" v-model="item.giftCardTotal">
<template slot="append">张</template> <template slot="append">张</template>
</el-input> </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"

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

@ -56,7 +56,7 @@
</div> </div>
</div> </div>
<div style="margin-top: 20px"> <div style="margin-top: 20px">
<el-form-item label="时间段" prop="suitTimeSlotFront"> <el-form-item label="时间段" prop="suitTimeSlotFront" label-width="70px" >
<el-time-picker <el-time-picker
v-model="ruleForm.suitTimeSlotFront" v-model="ruleForm.suitTimeSlotFront"
format="HH:mm" format="HH:mm"
@ -84,7 +84,7 @@
</el-form-item> </el-form-item>
<el-form-item label="活动奖品" prop="courtesyReward"> <el-form-item label="活动奖品" prop="courtesyReward">
<div style="display: flex"> <div style="display: flex">
<div style="width: 17%"> <div style="width: 20%">
<el-checkbox-group v-model="ruleForm.courtesyReward"> <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">
@ -95,18 +95,18 @@
</div> </div>
</el-checkbox-group> </el-checkbox-group>
</div> </div>
<div style="width: 70%"> <div style="width: 80%">
<div v-for="(item,index) in couponList" :key="index" style="font-size: 14px;margin: 15px 0"> <div v-for="(item,index) in couponList" :key="index" style="font-size: 14px;margin: 15px 0;display: flex">
<span>赠送</span> <div style="width: 5%">赠送</div>
<el-select v-model="item.vouchersId" style="margin-left: 10px;width: 30%" placeholder="请选择"> <el-select v-model="item.vouchersId" style="margin-left: 10px;width: 45%" placeholder="请选择">
<el-option <el-option
v-for="(item1,index1) in cardCouponList" v-for="(item1,index1) in cardCouponList"
:key="index1" :key="index1"
:label="item1.name" :label="item1.name"
:value="item1.id"></el-option> :value="item1.id"></el-option>
</el-select> </el-select>
<el-input style="width: 30%;margin-left: 10px" v-model="item.giftCardTotal"> <el-input style="width: 43%;margin-left: 10px" v-model="item.giftCardTotal">
<template slot="append">张</template> <template slot="append">张</template>
</el-input> </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"

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

@ -325,7 +325,7 @@
:value="dict.value"></el-checkbox> :value="dict.value"></el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
<el-form-item label=" 会员标签" prop="babelIds"> <el-form-item label=" 会员标签">
<el-select v-model="ruleForm1.babelIds" multiple placeholder="请选择会员标签" style="width: 100%"> <el-select v-model="ruleForm1.babelIds" multiple placeholder="请选择会员标签" style="width: 100%">
<el-option <el-option
v-for="item in userLabelList" v-for="item in userLabelList"
@ -554,9 +554,6 @@ export default {
paymentType: [ paymentType: [
{required: true, message: '请输入支付方式', trigger: 'blur'}, {required: true, message: '请输入支付方式', trigger: 'blur'},
], ],
babelIds: [
{required: true, message: '请输入会员标签', trigger: 'blur'},
],
moneyMin: [ moneyMin: [
{required: true, message: '请输入实收金额', trigger: 'blur'}, {required: true, message: '请输入实收金额', trigger: 'blur'},
], ],
@ -659,6 +656,15 @@ export default {
}, },
// 提交活动规则 // 提交活动规则
submitRuleForm() { submitRuleForm() {
if (this.ruleForm1.consumeType == 1){
if (!this.ruleForm1.literMin || !this.ruleForm1.literMax){
this.$message.error("请填写消费条件信息")
}
}else {
if (!this.ruleForm1.moneyMin || !this.ruleForm1.moneyMax){
this.$message.error("请填写消费条件信息")
}
}
this.$refs["ruleForm1"].validate((valid) => { this.$refs["ruleForm1"].validate((valid) => {
if (valid) { if (valid) {
if (this.ruleForm1.paymentType) this.ruleForm1.paymentType = this.ruleForm1.paymentType.toString() if (this.ruleForm1.paymentType) this.ruleForm1.paymentType = this.ruleForm1.paymentType.toString()

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

@ -70,12 +70,12 @@
</el-form-item> </el-form-item>
<el-form-item label="活动奖品" prop="courtesyReward"> <el-form-item label="活动奖品" prop="courtesyReward">
<div style="display: flex"> <div style="display: flex">
<div style="width: 17%"> <div style="width: 15%">
<el-checkbox-group v-model="ruleForm.courtesyReward"> <el-checkbox-group v-model="ruleForm.courtesyReward">
<div> <div>
<el-checkbox label="3" name="type">赠送积分</el-checkbox> <el-checkbox label="3" name="type">赠送积分</el-checkbox>
</div> </div>
<div> <div style="margin: 10px 0">
<el-checkbox label="2" name="type">赠送成长值</el-checkbox> <el-checkbox label="2" name="type">赠送成长值</el-checkbox>
</div> </div>
<div style="display: flex;font-size: 14px;margin: 15px 0"> <div style="display: flex;font-size: 14px;margin: 15px 0">
@ -86,33 +86,33 @@
</div> </div>
</el-checkbox-group> </el-checkbox-group>
</div> </div>
<div style="width: 70%"> <div style="width: 85%">
<div style="display: flex;font-size: 14px;"> <div style="display: flex;font-size: 14px;">
<div>赠送</div> <div style="width: 6%;">赠送</div>
<el-input placeholder="请输入赠送的积分数量" style="width: 70%;margin: 0 10px" <el-input placeholder="请输入赠送的积分数量" style="width: 94%;"
v-model="ruleForm.points"> v-model="ruleForm.points">
<template slot="append">积分</template> <template slot="append">积分</template>
</el-input> </el-input>
</div> </div>
<div style="display: flex;font-size: 14px;margin: 15px 0"> <div style="display: flex;font-size: 14px;margin: 15px 0">
<div>赠送</div> <div style="width: 6%;">赠送</div>
<el-input placeholder="请输入赠送的成长值数量" style="width: 70%;margin: 0 10px" <el-input placeholder="请输入赠送的成长值数量" style="width: 94%;"
v-model="ruleForm.growthValue"> v-model="ruleForm.growthValue">
<template slot="append">成长值</template> <template slot="append">成长值</template>
</el-input> </el-input>
</div> </div>
<div v-for="(item,index) in couponList" :key="index" style="font-size: 14px;margin: 15px 0"> <div v-for="(item,index) in couponList" :key="index" style="font-size: 14px;margin: 15px 0;display: flex">
<span>赠送</span> <div style="width: 5%;">赠送</div>
<el-select v-model="item.vouchersId" style="margin-left: 10px;width: 30%" placeholder="请选择"> <el-select v-model="item.vouchersId" style="margin-left: 10px;width: 45%" placeholder="请选择">
<el-option <el-option
v-for="(item1,index1) in cardCouponList" v-for="(item1,index1) in cardCouponList"
:key="index1" :key="index1"
:label="item1.name" :label="item1.name"
:value="item1.id"></el-option> :value="item1.id"></el-option>
</el-select> </el-select>
<el-input style="width: 30%;margin-left: 10px" v-model="item.giftCardTotal"> <el-input style="width: 43%;margin-left: 10px" v-model="item.giftCardTotal">
<template slot="append">张</template> <template slot="append">张</template>
</el-input> </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"

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

@ -57,12 +57,12 @@
</el-form-item> </el-form-item>
<el-form-item label="活动奖品" prop="courtesyReward"> <el-form-item label="活动奖品" prop="courtesyReward">
<div style="display: flex"> <div style="display: flex">
<div style="width: 17%"> <div style="width: 15%">
<el-checkbox-group v-model="ruleForm.courtesyReward"> <el-checkbox-group v-model="ruleForm.courtesyReward">
<div> <div>
<el-checkbox label="3" name="type">赠送积分</el-checkbox> <el-checkbox label="3" name="type">赠送积分</el-checkbox>
</div> </div>
<div> <div style="margin: 10px 0">
<el-checkbox label="2" name="type">赠送成长值</el-checkbox> <el-checkbox label="2" name="type">赠送成长值</el-checkbox>
</div> </div>
<div style="display: flex;font-size: 14px;margin: 15px 0"> <div style="display: flex;font-size: 14px;margin: 15px 0">
@ -73,33 +73,33 @@
</div> </div>
</el-checkbox-group> </el-checkbox-group>
</div> </div>
<div style="width: 70%"> <div style="width: 85%">
<div style="display: flex;font-size: 14px;"> <div style="display: flex;font-size: 14px;">
<div>赠送</div> <div style="width: 6%;">赠送</div>
<el-input placeholder="请输入赠送的积分数量" style="width: 70%;margin: 0 10px" <el-input placeholder="请输入赠送的积分数量" style="width: 94%;"
v-model="ruleForm.points"> v-model="ruleForm.points">
<template slot="append">积分</template> <template slot="append">积分</template>
</el-input> </el-input>
</div> </div>
<div style="display: flex;font-size: 14px;margin: 15px 0"> <div style="display: flex;font-size: 14px;margin: 15px 0">
<div>赠送</div> <div style="width: 6%;">赠送</div>
<el-input placeholder="请输入赠送的成长值数量" style="width: 70%;margin: 0 10px" <el-input placeholder="请输入赠送的成长值数量" style="width: 94%;"
v-model="ruleForm.growthValue"> v-model="ruleForm.growthValue">
<template slot="append">成长值</template> <template slot="append">成长值</template>
</el-input> </el-input>
</div> </div>
<div v-for="(item,index) in couponList" :key="index" style="font-size: 14px;margin: 15px 0"> <div v-for="(item,index) in couponList" :key="index" style="font-size: 14px;margin: 15px 0;display: flex">
<span>赠送</span> <div style="width: 5%;">赠送</div>
<el-select v-model="item.vouchersId" style="margin-left: 10px;width: 30%" placeholder="请选择"> <el-select v-model="item.vouchersId" style="margin-left: 10px;width: 45%" placeholder="请选择">
<el-option <el-option
v-for="(item1,index1) in cardCouponList" v-for="(item1,index1) in cardCouponList"
:key="index1" :key="index1"
:label="item1.name" :label="item1.name"
:value="item1.id"></el-option> :value="item1.id"></el-option>
</el-select> </el-select>
<el-input style="width: 30%;margin-left: 10px" v-model="item.giftCardTotal"> <el-input style="width: 43%;margin-left: 10px" v-model="item.giftCardTotal">
<template slot="append">张</template> <template slot="append">张</template>
</el-input> </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"