From 3051492756ac6639596e4ea0d73571af821a7220 Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Sat, 31 Aug 2024 13:51:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=90=A5=E9=94=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activeConsumption/index.vue | 2 +- .../src/views/EventMarketing/center/index.vue | 11 +- .../EventMarketing/liJianMarketing/index.vue | 403 ++++++++++++++++++ .../EventMarketing/openCardGift/index.vue | 8 +- fuintAdmin/src/views/userGrade/index.vue | 3 + 5 files changed, 423 insertions(+), 4 deletions(-) create mode 100644 fuintAdmin/src/views/EventMarketing/liJianMarketing/index.vue diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue index a5a531854..6427edc77 100644 --- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue @@ -1264,7 +1264,7 @@ export default { }) }, listUserGrade() { - listUserGrade().then(res => { + listUserGrade({page:1,pageSize:1000}).then(res => { if (res.code == 200) { this.userGradeList = res.data.records } diff --git a/fuintAdmin/src/views/EventMarketing/center/index.vue b/fuintAdmin/src/views/EventMarketing/center/index.vue index 74414f2d6..6b27c8966 100644 --- a/fuintAdmin/src/views/EventMarketing/center/index.vue +++ b/fuintAdmin/src/views/EventMarketing/center/index.vue @@ -188,7 +188,7 @@
进行中1个
| -
创建活动
+
创建活动
@@ -453,6 +453,15 @@ export default { }); // this.$router.push('/EventMarketing/openCardGift/index') }, + // 跳转其他页面 + goOtherPage(id){ + if (id==12){ + this.$router.push({ + path: '/userGrade/index', + query: { id: id } + }); + } + }, gobox(id){ if(id == 1){ this.$router.push('/EventMarketing/activeConsumption/index') diff --git a/fuintAdmin/src/views/EventMarketing/liJianMarketing/index.vue b/fuintAdmin/src/views/EventMarketing/liJianMarketing/index.vue new file mode 100644 index 000000000..df495d31d --- /dev/null +++ b/fuintAdmin/src/views/EventMarketing/liJianMarketing/index.vue @@ -0,0 +1,403 @@ + + + + + diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/index.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/index.vue index a39411d76..ae2367400 100644 --- a/fuintAdmin/src/views/EventMarketing/openCardGift/index.vue +++ b/fuintAdmin/src/views/EventMarketing/openCardGift/index.vue @@ -6,6 +6,7 @@ + @@ -18,6 +19,8 @@ import activeConsumption from '../../EventMarketing/activeConsumption/index.vu import separate from './separate.vue' // 限时优惠 import TimeLimited from './TimeLimited.vue' +// 立减营销 +import liJianMarketing from "@/views/EventMarketing/liJianMarketing/index.vue"; export default { data() { @@ -38,8 +41,9 @@ export default { // 分时优惠 separate, // 限时优惠 - TimeLimited - + TimeLimited, + // 立减营销 + liJianMarketing }, methods: { diff --git a/fuintAdmin/src/views/userGrade/index.vue b/fuintAdmin/src/views/userGrade/index.vue index 1ff24ec61..f7a8308b1 100644 --- a/fuintAdmin/src/views/userGrade/index.vue +++ b/fuintAdmin/src/views/userGrade/index.vue @@ -1261,6 +1261,9 @@ export default { this.getClearConfig(); this.getRule(); this.getISEnableLevel(); + if (this.$route.query.id){ + this.getindex(2) + } }, methods: { addlsit() {