diff --git a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue index 89ee38b1d..6e49630d3 100644 --- a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue +++ b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue @@ -478,8 +478,11 @@
自定义
- - + @@ -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=>{ diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue index 18a6ccb53..3756e0bbb 100644 --- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue @@ -128,7 +128,7 @@ -
+
@@ -138,11 +138,11 @@
赠送积分
-
+
消费满 @@ -156,7 +156,7 @@ @click="deletePoints(index)">
-
+
@@ -166,11 +166,11 @@
赠送成长值
-
+
消费满 @@ -185,7 +185,7 @@ @click="deleteGrowthValues(index)">
-
+
@@ -195,11 +195,11 @@
赠送优惠券
-
+
消费满 diff --git a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue index b9acb0745..0f409d82e 100644 --- a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue @@ -50,10 +50,10 @@
赠送成长值
-
+
赠送优惠券
@@ -75,7 +75,7 @@
-
+
赠送
-
diff --git a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue index b239ae181..47afa2cab 100644 --- a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue +++ b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue @@ -309,13 +309,11 @@ :value="dict.value"/> - +
- - - 免密 - 加密 + 免密 + 加密
@@ -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('添加失败'); } diff --git a/fuintAdmin/src/views/EventMarketing/liJianMarketing/index.vue b/fuintAdmin/src/views/EventMarketing/liJianMarketing/index.vue index 1539ff2da..e32365777 100644 --- a/fuintAdmin/src/views/EventMarketing/liJianMarketing/index.vue +++ b/fuintAdmin/src/views/EventMarketing/liJianMarketing/index.vue @@ -163,15 +163,15 @@
-
+
按订单金额
-
+
订单金额满 @@ -185,7 +185,7 @@
-
+
订单金额满 @@ -203,7 +203,7 @@
-
+
订单金额每满 @@ -221,7 +221,7 @@
-
+
订单金额满 @@ -239,15 +239,15 @@
-
+
按加油升数
-
+
加油升数满 @@ -262,7 +262,7 @@
-
+
加油升数满 @@ -282,7 +282,7 @@
-
+
加油升数每满 @@ -302,7 +302,7 @@
-
+
加油升数满 diff --git a/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue b/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue index aad185a38..300c6ab32 100644 --- a/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue +++ b/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue @@ -116,7 +116,7 @@
- + @@ -182,16 +182,16 @@ -
范围
- +
范围
+
~
- + -
优惠
- +
优惠
+
@@ -208,15 +208,15 @@
- + -
- +
+ -
- +
+
diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/birthday.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/birthday.vue index 13d464db3..38c760998 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/birthday.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/birthday.vue @@ -66,10 +66,10 @@
赠送成长值
-
+
赠送优惠券
@@ -91,7 +91,7 @@
-
+
赠送
赠送成长值
-
+
赠送优惠券
@@ -76,7 +76,7 @@
-
+
赠送
-
+
赠送优惠券
-
+
赠送
- + 赠送成长值
-
+
赠送优惠券
@@ -103,7 +103,7 @@
-
+
赠送
赠送成长值
-
+
赠送优惠券
@@ -90,7 +90,7 @@
-
+
赠送
- +
- +