diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue index 9495791ae..e24347795 100644 --- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue @@ -650,7 +650,7 @@ export default { resetForm(formName) { this.$refs[formName].resetFields(); // this.getInfo() - this.$router.push({path: "/EventMarketing/center/index"}) + this.$router.push({path: "/EventMarketing/center/index",query: {activeId:this.activeId}}) }, indexMethod(index) { return index * 2; diff --git a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue index 70134075a..1babe130d 100644 --- a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue @@ -328,7 +328,7 @@ export default { this.$refs[formName].resetFields(); this.ifWrite = true // this.getInfo() - this.$router.push({path: "/EventMarketing/center/index"}) + this.$router.push({path: "/EventMarketing/center/index",query: {activeId:this.activeId}}) }, /** 查询新人有礼活动列表 */ getList() { diff --git a/fuintAdmin/src/views/EventMarketing/center/index.vue b/fuintAdmin/src/views/EventMarketing/center/index.vue index 742a6b7a9..9b50caad6 100644 --- a/fuintAdmin/src/views/EventMarketing/center/index.vue +++ b/fuintAdmin/src/views/EventMarketing/center/index.vue @@ -473,6 +473,9 @@ export default { } else { this.getList(); } + if (this.$route.query.activeId){ + this.tabindex = 1 + } this.getOldList() }, diff --git a/fuintAdmin/src/views/EventMarketing/liJianMarketing/index.vue b/fuintAdmin/src/views/EventMarketing/liJianMarketing/index.vue index c0757166a..2fec69919 100644 --- a/fuintAdmin/src/views/EventMarketing/liJianMarketing/index.vue +++ b/fuintAdmin/src/views/EventMarketing/liJianMarketing/index.vue @@ -608,7 +608,7 @@ export default { resetForm(formName) { this.$refs[formName].resetFields(); // this.getInfo() - this.$router.push({path:"/EventMarketing/center/index"}) + this.$router.push({path:"/EventMarketing/center/index",query: {activeId:this.activeId}}) }, } } diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue index 9bcda3f98..fb05d1ce1 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue @@ -95,13 +95,6 @@ -
@@ -314,7 +307,7 @@
- + - + - - - - - - - -
-
- - - - - -
- - - - - - - -
-
- - - - - + +
+ + + + + + + + + + + + + + +
+
+ + + + + + + +
+
+ + + + + + + + + + + + + + +
+
+ + + + + + + +
+ + + + + + + + + + + + + + + @@ -383,7 +413,7 @@
- +
+ :class="{ 'acvtive' : index === tindex3 }" @click="Typeindex3(index)" style="margin-bottom: 20px"> {{ item }} + style="margin-left: 20px;">
- + { + getRequestList({pageNo: 1, pageSize: 10000,activeType:2}).then(res => { this.timeShareList = res.data.records }) }, diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/birthday.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/birthday.vue index 2800799b4..71d3f89bd 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/birthday.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/birthday.vue @@ -352,7 +352,7 @@ export default { this.$refs[formName].resetFields(); this.ifWrite = true // this.getInfo() - this.$router.push({path: "/EventMarketing/center/index"}) + this.$router.push({path: "/EventMarketing/center/index",query: {activeId:this.activeId}}) }, /** 查询新人有礼活动列表 */ getList() { diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/invite.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/invite.vue index 829ea5470..122a36f59 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/invite.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/invite.vue @@ -327,7 +327,7 @@ export default { this.$refs[formName].resetFields(); this.ifWrite = true // this.getInfo() - this.$router.push({path: "/EventMarketing/center/index"}) + this.$router.push({path: "/EventMarketing/center/index",query: {activeId:this.activeId}}) }, /** 查询新人有礼活动列表 */ getList() { diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/popUp.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/popUp.vue index 6e39e95f1..8e1e7ce23 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/popUp.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/popUp.vue @@ -411,7 +411,7 @@ export default { this.$refs[formName].resetFields(); this.ifWrite = true // this.getInfo() - this.$router.push({path: "/EventMarketing/center/index"}) + this.$router.push({path: "/EventMarketing/center/index",query: {activeId:this.activeId}}) }, /** 查询新人有礼活动列表 */ getList() { diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue index 96c8e3b0f..0da4423a5 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/separate.vue @@ -95,13 +95,6 @@ -
@@ -342,41 +335,72 @@ - - - - - - - - - - - - -
-
- - - - - -
- - - - - - - -
-
- - - - - +
+ + + + + + + + + + + + + + +
+
+ + + + + + + +
+
+ + + + + + + + + + + + + + +
+
+ + + + + + + +
+ + + + + + + + + + + + + + + @@ -502,7 +526,7 @@ export default { // 分时 queryParams: { pageNo: 1, - pageSize: 5, + pageSize: 10000, activeType: 1 }, total: 0, @@ -579,6 +603,7 @@ export default { ruleForm1: { activeType: 1, timeType: 0, + consumeType:'', paymentType: [] } } @@ -589,9 +614,10 @@ export default { }, methods: { // 重置活动规则 - resetRule(){ + resetRule() { this.ruleForm1 = { activeType: 1, + consumeType:'', timeType: 0, paymentType: [] } @@ -600,7 +626,7 @@ export default { this.monthDay = [] }, // 删除活动规则 - deleteRule(data){ + deleteRule(data) { deletePriceRule(data.id).then(res => { this.$message.success("删除成功") this.getRuleList() @@ -616,12 +642,12 @@ export default { this.getUserLabelList() this.showDialogVisible = true - if (res.data){ + if (res.data) { this.ruleForm1 = res.data if (res.data.paymentType) this.ruleForm1.paymentType = res.data.paymentType.split(",") if (res.data.babelIds) this.ruleForm1.babelIds = res.data.babelIds.split(",") - if (res.data.timeSlots){ + if (res.data.timeSlots) { if (res.data.timeType == "0") { this.weekDay = this.ruleForm1.timeSlots.split(",") } else if (this.ruleForm1.timeType == "1") { @@ -669,7 +695,7 @@ export default { }, // 查询分时优惠列表信息 getTimeShareList() { - getRequestList({pageNo: 1, pageSize: 10000}).then(res => { + getRequestList({pageNo: 1, pageSize: 10000,activeType:1}).then(res => { this.timeShareList = res.data.records }) }, diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/userConsume.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/userConsume.vue index 6542f8af4..9585615bf 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/userConsume.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/userConsume.vue @@ -410,7 +410,7 @@ export default { this.$refs[formName].resetFields(); this.ifWrite = true // this.getInfo() - this.$router.push({path: "/EventMarketing/center/index"}) + this.$router.push({path: "/EventMarketing/center/index",query: {activeId:this.activeId}}) }, /** 查询新人有礼活动列表 */ getList() { diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/userRecharge.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/userRecharge.vue index 8e5f17ec3..f41dc30fe 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/userRecharge.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/userRecharge.vue @@ -357,7 +357,7 @@ export default { this.$refs[formName].resetFields(); this.ifWrite = true // this.getInfo() - this.$router.push({path: "/EventMarketing/center/index"}) + this.$router.push({path: "/EventMarketing/center/index",query: {activeId:this.activeId}}) }, /** 查询新人有礼活动列表 */ getList() { diff --git a/fuintAdmin/src/views/power/page/mode.vue b/fuintAdmin/src/views/power/page/mode.vue index d1ff48ab6..884c4d7d6 100644 --- a/fuintAdmin/src/views/power/page/mode.vue +++ b/fuintAdmin/src/views/power/page/mode.vue @@ -106,12 +106,12 @@ - + - + @@ -122,7 +122,7 @@ + :maxlength="200" show-word-limit >
{油罐名称} {商品名称} @@ -134,7 +134,7 @@ - + @@ -148,20 +148,20 @@
- - + - +