11.2
This commit is contained in:
ds
parent
4d5d426b4d
commit
c86fedc23b
@ -510,8 +510,8 @@
|
||||
</el-dialog>
|
||||
|
||||
<!-- 添加或修改对话框 -->
|
||||
<el-dialog center :title="title" :close-on-click-modal="false" :visible.sync="open1" width="35%" append-to-body>
|
||||
<el-form ref="form1" :model="form1" :rules="rules" label-width="80px">
|
||||
<el-dialog center :title="title" :close-on-click-modal="false" :visible.sync="open1" width="40%" append-to-body>
|
||||
<el-form ref="form1" :model="form1" :rules="rules" label-width="100px">
|
||||
|
||||
<el-form-item label="活动名称" prop="name">
|
||||
<el-input v-model="form1.name" placeholder="请输入活动名称" maxlength="30"/>
|
||||
@ -558,9 +558,12 @@
|
||||
<el-checkbox-group v-model="weekDay" v-if="form1.sendFrequency==1">
|
||||
<el-checkbox v-for="(item,index) in weekList" :key="index" :label="item"></el-checkbox>
|
||||
</el-checkbox-group>
|
||||
<el-checkbox-group v-model="monthDay" v-if="form1.sendFrequency==2">
|
||||
<el-select v-model="monthDay" v-if="form1.sendFrequency==2" multiple>
|
||||
<el-option v-for="item in 31" :key="item" :value="item+''" :label="item + '日'">{{ item }}日</el-option>
|
||||
</el-select>
|
||||
<!-- <el-checkbox-group v-model="monthDay" v-if="form1.sendFrequency==2">
|
||||
<el-checkbox v-for="item in 31" :key="item" :label="item+''">{{ item }}日</el-checkbox>
|
||||
</el-checkbox-group>
|
||||
</el-checkbox-group> -->
|
||||
<el-time-picker
|
||||
v-model="form1.sendTime"
|
||||
format="HH:mm"
|
||||
@ -568,7 +571,7 @@
|
||||
</el-time-picker>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="群发方式" prop="sendWay">
|
||||
<!-- <el-form-item label="群发方式" prop="sendWay">
|
||||
<div style="display: flex">
|
||||
<el-checkbox-group v-model="form1.sendWay">
|
||||
<el-checkbox label="短信消息"></el-checkbox>
|
||||
@ -577,42 +580,89 @@
|
||||
<img style="width: 16px;height: 16px;margin-top: 9px;margin-left: 10px" src="@/assets/images/wenhao.png">
|
||||
</el-tooltip>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="群发礼品" prop="senfGift">
|
||||
</el-form-item> -->
|
||||
<!-- <el-form-item label="群发礼品" prop="senfGift">
|
||||
<el-checkbox-group v-model="form1.senfGift">
|
||||
<el-checkbox label="积分"></el-checkbox>
|
||||
<el-checkbox label="优惠券"></el-checkbox>
|
||||
<el-checkbox label="成长值"></el-checkbox>
|
||||
</el-checkbox-group>
|
||||
</el-form-item> -->
|
||||
|
||||
|
||||
<el-form-item label="群发礼品" prop="senfGift">
|
||||
<div style="display: flex">
|
||||
<div style="width: 15%">
|
||||
<el-checkbox-group v-model="form1.senfGift">
|
||||
<div style="display: flex; font-size: 14px;">
|
||||
<el-checkbox label="积分"></el-checkbox>
|
||||
</div>
|
||||
<div style="display: flex; font-size: 14px; margin: 15px 0;align-items: center">
|
||||
<el-checkbox label="成长值"></el-checkbox>
|
||||
</div>
|
||||
<div style="display: flex; font-size: 14px;margin: 15px 0;align-items: center">
|
||||
<el-checkbox label="优惠券"></el-checkbox>
|
||||
</div>
|
||||
</el-checkbox-group>
|
||||
</div>
|
||||
<div style="width: 85%">
|
||||
<div style="display: flex; font-size: 14px;">
|
||||
<el-input style="width: 100%; margin-left: 30px;" v-model="form1.points">
|
||||
<template slot="append">积分</template>
|
||||
</el-input>
|
||||
</div>
|
||||
<div style="display: flex; font-size: 14px; margin: 14px 0; align-items: center">
|
||||
<el-input style="width: 100%; margin-left: 30px;" v-model="form1.growthValue">
|
||||
<template slot="append">成长值</template>
|
||||
</el-input>
|
||||
</div>
|
||||
<div style="font-size: 14px; margin: 14px 0; display: flex; align-items: center">
|
||||
<el-select v-model="form1.couponId" style="margin-left: 30px;width: 50%" >
|
||||
<el-option
|
||||
v-for="(item1,index1) in couponList"
|
||||
:key="index1"
|
||||
:label="item1.name"
|
||||
:value="item1.id"></el-option>
|
||||
</el-select>
|
||||
<el-input style="width: 50%; margin-left: 10px;" v-model="form1.couponTotal">
|
||||
<template slot="append">张</template>
|
||||
</el-input>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="短信模板" prop="messageId">
|
||||
|
||||
|
||||
|
||||
<!-- <el-form-item label="短信模板" prop="messageId">
|
||||
<el-select v-model="form1.messageId" placeholder="请选择短信模板名称" style="width: 100%">
|
||||
<el-option v-for="(item,index) in messageList" :key="index" :label="item.name" :value="item.id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form-item> -->
|
||||
<el-form-item label="跳转链接" prop="jumpLink">
|
||||
<div class="d-s">
|
||||
<!-- <div class="d-s">
|
||||
<div class="icon-type" v-for="(item,index) in jumpLinkList" :key="index"
|
||||
:class="{ 'acvtive' : index === tindex3 }" @click="Typeindex3(index)">
|
||||
<img src="../../assets/images/wx.png" style="width: 20px;height: 20px" v-if="index != tindex3">
|
||||
<img src="../../assets/images/xz.png" style="width: 20px;height: 20px" v-if="index == tindex3">
|
||||
{{ item }}
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
<el-select v-if="form1.jumpLink==0" v-model="form1.appletJumpPage" placeholder="请选择跳转页面"
|
||||
style="width: 100%">
|
||||
<el-option v-for="(item,index) in jumpPageList" :key="index" :label="item.name"
|
||||
:value="item.id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="会员数量">-->
|
||||
<!-- {{ form1.sendUserNum }}-->
|
||||
<!-- </el-form-item>-->
|
||||
<el-form-item label="群发会员数量">
|
||||
{{ form1.sendUserNum }}
|
||||
</el-form-item>
|
||||
|
||||
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="submitForm1">确 定</el-button>
|
||||
<el-button @click="cancel1">取 消</el-button>
|
||||
<el-button type="primary" @click="submitForm1">保 存</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
@ -632,6 +682,7 @@ import {listUserLabel} from "@/api/staff/user/userlabel";
|
||||
import {listUserGrade} from "@/api/staff/user/usergrade";
|
||||
import {getOilNameList, oilNumberList} from "@/api/order/oilnumgun";
|
||||
import {getListApi} from "@/api/setting/message";
|
||||
import {getCardCouponNum} from "@/api/EventMarketing/cardCoupon";
|
||||
|
||||
export default {
|
||||
data() {
|
||||
@ -691,6 +742,8 @@ export default {
|
||||
}
|
||||
],
|
||||
|
||||
// 优惠券列表信息
|
||||
couponList:[],
|
||||
total: 0,
|
||||
queryParams: {
|
||||
page: 1,
|
||||
@ -779,8 +832,15 @@ export default {
|
||||
created() {
|
||||
this.getList()
|
||||
this.getUserLabelList()
|
||||
this.getCardCoupon()
|
||||
},
|
||||
methods: {
|
||||
|
||||
getCardCoupon(){
|
||||
getCardCouponNum({status:1}).then(res => {
|
||||
this.couponList = res.data
|
||||
})
|
||||
},
|
||||
// 定时群发选择分组
|
||||
chooseGroup(){
|
||||
this.groupList.forEach(item => {
|
||||
|
||||
@ -114,13 +114,13 @@
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="备注" >
|
||||
<el-input v-model="form.desc" placeholder="请输入备注" type="textarea"/>
|
||||
<el-input v-model="form.desc" placeholder="请输入备注" type="textarea" :rows="4"/>
|
||||
</el-form-item>
|
||||
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
<el-button type="primary" @click="submitForm">保 存</el-button>
|
||||
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
@ -86,6 +86,11 @@ public class UserMassSend extends BaseEntity implements Serializable {
|
||||
*/
|
||||
private Integer points;
|
||||
|
||||
/**
|
||||
* 赠送成长值
|
||||
*/
|
||||
private Integer growthValue;
|
||||
|
||||
/**
|
||||
* 优惠券ID
|
||||
*/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user