Commit 1b7cf2a0 by crushh

update: dist

parent dfed0ff0
......@@ -82,7 +82,7 @@ export default {
showTabs: {
// 展示哪些tab
type: Array,
default: () => [1, 2, 3]
default: () => [0, 1, 2]
},
realTimeType: {
// 实时与非实时分组的可选
......@@ -169,13 +169,16 @@ export default {
this.getDefaultSelected(this.selectedIds);
}
},
showTabs(val) {
console.log(val);
let arr = this.optionsVal;
if (val && val.length) {
arr = this.optionsVal.filter(item => val.includes(item.name));
showTabs: {
immediate: true,
handler(val) {
console.log(val);
let arr = this.optionsVal;
if (val && val.length) {
arr = this.optionsVal.filter(item => val.includes(item.name));
}
this.options = arr;
}
this.options = arr;
}
},
methods: {
......
......@@ -43,7 +43,7 @@
<span v-else>{{ activeTime }}</span>
</el-form-item>
<el-dialog title="选择节日" :visible.sync="visible" width="700px" :before-close="close">
<div class="tips">
<div class="tips" style="margin-bottom:20px">
仅支持选择节日日期为最近1-60天内的节日
</div>
<div class="holiday" v-for="item in holidayData" :key="item.id">
......@@ -287,7 +287,7 @@ export default {
margin-left: 0;
}
.el-radio {
margin-bottom: 12px;
margin-bottom: 16px;
}
}
</style>
......@@ -42,7 +42,7 @@
<el-button v-if="form.memberType == 0 && !memberCrowdWidgetId && form.scene != 4" size="small" @click="ruleVisible = true"><i class="iconfont fz14 icon-Plus"></i> 添加其他条件</el-button>
<ruleFilter v-show="form.memberType == 0 && form.scene != 4" :visiable.sync="ruleVisible" @save="handleRuleFilterSave" :memberCrowdWidgetId="memberCrowdWidgetId" />
<el-button v-if="form.memberType == 1 && !selectedGroupIds" size="small" @click="groupVisible = true">添加分组</el-button>
<gic-new-member-group v-show="form.memberType == 1" :visiable.sync="groupVisible" :selectedIds="selectedGroupIds" @change="confirmGroupDialog" />
<gic-new-member-group v-show="form.memberType == 1" :showTabs="showTabs" :visiable.sync="groupVisible" :selectedIds="selectedGroupIds" @change="confirmGroupDialog" />
</div>
<div v-if="form.scene == 4 && form.memberType == 0">
<div class="consumeLine">
......@@ -319,6 +319,7 @@ export default {
return {
validateOption,
validateVal,
showTabs: [0, 1, 2],
//ai营销场景,一个活动下只有一个计划,一个计划里有多个事件
form: {
activityName: '', //活动名称
......@@ -467,6 +468,11 @@ export default {
return str;
}
},
created() {
if (this.$store.state.marketing.superAdmin != 1) {
this.showTabs = [0, 1];
}
},
mounted() {
const { scene, id } = this.$route.params;
this.form.scene = scene && Number(scene);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment