From b1ec67cfacb731b75d0b24491946882f2f248ffc Mon Sep 17 00:00:00 2001 From: woody Date: Tue, 23 Sep 2025 16:57:32 +0800 Subject: [PATCH 01/10] =?UTF-8?q?feat(directPush):=20=E7=9B=B4=E6=8E=A8?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=9B=B4=E6=8D=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/giftGoods.js | 2 +- src/router/index.js | 10 +- src/views/marketing/directGifts/addDirect.vue | 101 +-- .../marketing/directGifts/directUpdata.vue | 606 +++++------------- src/views/marketing/directGifts/index.vue | 316 +++++---- 5 files changed, 358 insertions(+), 677 deletions(-) diff --git a/src/api/giftGoods.js b/src/api/giftGoods.js index 8f503dc..a7366c5 100644 --- a/src/api/giftGoods.js +++ b/src/api/giftGoods.js @@ -354,7 +354,7 @@ export function lotteryRuleConfigSubmit(data) { // 直推赠送 export function directRuleConfigSubmit(data) { return request({ - url: '/sale/manage/recommend/submit', + url: '/sale/manage/recommend/directPushUpgrade', method: 'post', data }) diff --git a/src/router/index.js b/src/router/index.js index 74e7a8c..ef3ee5d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2004,15 +2004,15 @@ export const constantRoutes = [ }, { - path: 'directGifts', - name: 'DirectGifts', + path: 'directUpgrade', + name: 'DirectUpgrade', component: ParentView, children: [ { - path: 'directGiftsList', - name: 'DirectGiftsList', + path: 'directUpgradeList', + name: 'DirectUpgradeList', component: () => import('@/views/marketing/directGifts/index'), - meta: { title: '直推赠送' } + meta: { title: '直推升级' } }, { path: 'addDirect', diff --git a/src/views/marketing/directGifts/addDirect.vue b/src/views/marketing/directGifts/addDirect.vue index d1f50cb..4696025 100644 --- a/src/views/marketing/directGifts/addDirect.vue +++ b/src/views/marketing/directGifts/addDirect.vue @@ -68,69 +68,6 @@ - - - -
- {{ '注册等级' }} - - {{ item.gradeName }} - -
-
- {{ '真实奖衔' }} - - {{ item.awardsName }} - -
-
- {{ '权限中心' }} - - {{ item.label }} - -
- - - @@ -166,12 +103,8 @@ - - +
@@ -189,17 +122,12 @@ import Editor from '@/components/Editor' import * as api from '@/api/giftGoods.js' import topBar from '@/components/topBar' import ImageUpload from '@/components/ImageUpload' -import repurchQuan from '@/views/marketing/directGifts/repurchQuan' import directUpdata from '@/views/marketing/directGifts/directUpdata' -import directAverage from '@/views/marketing/directGifts/directAverage' export default { - name: 'GiftGoodsList', + name: 'AddDirectPushUpgrade', components: { - topBar, ImageUpload, - repurchQuan, directUpdata, - directAverage, Editor }, data() { @@ -210,17 +138,9 @@ export default { name: '基本信息', id: 0 }, - { - name: '复购券', - id: 1 - }, { name: '直推升级', id: 2 - }, - { - name: '复购券均分', - id: 3 } ], uploadImgUrl: process.env.VUE_APP_BASE_API + '/system/upload', @@ -245,9 +165,6 @@ export default { actCover: [ { required: true, message: '请上传活动封面', trigger: 'change' } ], - goalMemberConfigList: [ - { required: true, message: '请选择目标用户群体', trigger: 'change' } - ], ruleFormTime: [ { required: true, message: '请选择活动时间', trigger: 'change' } ], @@ -330,16 +247,10 @@ export default { this.$set(this.ruleForm, 'realList', arr2) this.$set(this.ruleForm, 'centerList', arr3) - this.$refs.repurchQuan.getPage( - this.addData.repurchaseCouponsShowList || '' - ) this.$refs.directUpdata.getPage( this.addData.recommendUpgradeList || '' ) this.$refs.directUpdata.getPages(this.addData.authorityList || '') - this.$refs.directAverage.getPage( - this.addData.acRecommendSharVO || '' - ) const that = this setTimeout(() => { @@ -379,12 +290,8 @@ export default { this.$set(this.ruleForm, 'realList', arr2) this.$set(this.ruleForm, 'centerList', arr3) - this.$refs.repurchQuan.getPage( - this.addData.repurchaseCouponsShowList || '' - ) this.$refs.directUpdata.getPage(this.addData.recommendUpgradeList || '') this.$refs.directUpdata.getPages(this.addData.authorityList || '') - this.$refs.directAverage.getPage(this.addData.acRecommendSharVO || '') const that = this setTimeout(() => { @@ -494,11 +401,9 @@ export default { { controlType: this.controlType, activityParam: this.ruleForm, - repurchaseCouponsShowList: this.$refs.repurchQuan.allData, recommendUpgradeList: this.$refs.directUpdata.recommendUpgradeList, - authorityList: this.$refs.directUpdata.form.waresAuthorityList, - acRecommendSharVO: this.$refs.directAverage.allData?.[0] || '' + authorityList: this.$refs.directUpdata.form.waresAuthorityList } ) api.directRuleConfigSubmit(obj).then((res) => { diff --git a/src/views/marketing/directGifts/directUpdata.vue b/src/views/marketing/directGifts/directUpdata.vue index 4aec5eb..ab58543 100644 --- a/src/views/marketing/directGifts/directUpdata.vue +++ b/src/views/marketing/directGifts/directUpdata.vue @@ -7,19 +7,22 @@ diff --git a/src/views/marketing/directRanking/config.vue b/src/views/marketing/directRanking/config.vue new file mode 100644 index 0000000..10b60e4 --- /dev/null +++ b/src/views/marketing/directRanking/config.vue @@ -0,0 +1,94 @@ + + + + + diff --git a/src/views/marketing/directRanking/index.vue b/src/views/marketing/directRanking/index.vue index da441b5..d642299 100644 --- a/src/views/marketing/directRanking/index.vue +++ b/src/views/marketing/directRanking/index.vue @@ -2,171 +2,139 @@
+ />
- - - - - - + :clearable="false" + @change="changeTime" + /> - {{ '搜索' }} + {{ '搜索' }} {{ '重置' }}
-
-
- - {{ '导出' }} -
-
+
- + - - + - + /> - + /> - - - - - - + prop="numberOfPeople" + label="直推人数" + />
- + /> -->
- - - \ No newline at end of file diff --git a/src/views/marketing/directRanking/mixins.js b/src/views/marketing/directRanking/mixins.js new file mode 100644 index 0000000..5348d18 --- /dev/null +++ b/src/views/marketing/directRanking/mixins.js @@ -0,0 +1,48 @@ +import topBar from '@/components/topBarRole' +import { getRouters } from '@/api/settle' + +export default { + data() { + return { + topList: [ + { + name: '直推人数排行数据', + path: 'directRankingList', + url: 'DirectRankingList', + changed: false + }, + { + name: '直推金额排行数据', + path: 'directAmountRankingList', + url: 'DirectAmountRankingList', + changed: false + }, + { + name: '直推配置', + path: 'directConfig', + url: 'DirectConfig', + changed: false + } + ] + } + }, + components: { + topBar + }, + mounted() { + this.getUserRoute() + }, + methods: { + getUserRoute() { + getRouters().then((res) => { + res.data.forEach((item) => { + this.topList.forEach((items) => { + if (item.routeName === items.url) { + items.changed = true + } + }) + }) + }) + } + } +} From ac48a7e158131c17a5730acc265aa00ae471769a Mon Sep 17 00:00:00 2001 From: woody Date: Wed, 24 Sep 2025 10:54:40 +0800 Subject: [PATCH 05/10] =?UTF-8?q?fix(addDirect):=20=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=8F=8A=E5=B1=95=E7=A4=BA=E6=97=B6=E9=97=B4=E8=A1=A5=E6=97=B6?= =?UTF-8?q?=E5=88=86=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/marketing/directGifts/addDirect.vue | 31 +++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/src/views/marketing/directGifts/addDirect.vue b/src/views/marketing/directGifts/addDirect.vue index fdbe81d..6a84cb2 100644 --- a/src/views/marketing/directGifts/addDirect.vue +++ b/src/views/marketing/directGifts/addDirect.vue @@ -204,6 +204,9 @@ export default { } }, methods: { + splitDate(date) { + return date.split(' ')[0] + }, getDetails() { api .recommendDetail({ @@ -223,13 +226,17 @@ export default { this.ruleForm.actEndDate = res.data.activityParam.actEndDate this.ruleForm.disStartDate = res.data.activityParam.disStartDate this.ruleForm.disEndDate = res.data.activityParam.disEndDate + const actStartDate = this.splitDate(res.data.activityParam.actStartDate) + const actEndDate = this.splitDate(res.data.activityParam.actEndDate) + const disStartDate = this.splitDate(res.data.activityParam.disStartDate) + const disEndDate = this.splitDate(res.data.activityParam.disEndDate) this.$set(this.ruleForm, 'ruleFormTime', [ - res.data.activityParam.actStartDate, - res.data.activityParam.actEndDate + actStartDate, + actEndDate ]) this.$set(this.ruleForm, 'ruleFormTime1', [ - res.data.activityParam.disStartDate, - res.data.activityParam.disEndDate + disStartDate, + disEndDate ]) const arr1 = [] const arr2 = [] @@ -267,12 +274,12 @@ export default { ) this.$set(this.ruleForm, 'actCover', this.addData.activityParam.actCover) this.$set(this.ruleForm, 'ruleFormTime', [ - this.addData.activityParam.actStartDate, - this.addData.activityParam.actEndDate + this.splitDate(this.addData.activityParam.actStartDate), + this.splitDate(this.addData.activityParam.actEndDate) ]) this.$set(this.ruleForm, 'ruleFormTime1', [ - this.addData.activityParam.disStartDate, - this.addData.activityParam.disEndDate + this.splitDate(this.addData.activityParam.disStartDate), + this.splitDate(this.addData.activityParam.disEndDate) ]) const arr1 = [] const arr2 = [] @@ -400,7 +407,13 @@ export default { {}, { controlType: this.controlType, - activityParam: this.ruleForm, + activityParam: { + ...this.ruleForm, + actStartDate: this.ruleForm.actStartDate + ' 00:00:00', + actEndDate: this.ruleForm.actEndDate + ' 23:59:59', + disStartDate: this.ruleForm.disStartDate + ' 00:00:00', + disEndDate: this.ruleForm.disEndDate + ' 23:59:59' + }, recommendUpgradeList: this.$refs.directUpdata.recommendUpgradeList, authorityList: this.$refs.directUpdata.form.waresAuthorityList From dec9a08d77b7b66d5c315c581f23c7ab53997325 Mon Sep 17 00:00:00 2001 From: woody Date: Wed, 24 Sep 2025 10:58:51 +0800 Subject: [PATCH 06/10] =?UTF-8?q?feat(router):=20=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 111 ++++++++++++++++++++++---------------------- 1 file changed, 56 insertions(+), 55 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 2d2d984..21f3a0c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1928,6 +1928,7 @@ export const constantRoutes = [ } ] }, + { path: 'lotteryDetails', name: 'LotteryDetails', @@ -1941,33 +1942,6 @@ export const constantRoutes = [ } ] }, - { - path: 'rechargeCard', - name: 'RechargeCard', - component: ParentView, - children: [ - { - path: 'rechargeCardList', - name: 'RechargeCardList', - component: () => import('@/views/marketing/rechargeCard/index'), - meta: { title: '充值提货卡' } - }, - { - path: 'addRechargeCard', - name: 'addRechargeCard', - component: () => import('@/views/marketing/rechargeCard/addRechargeCard'), - meta: { title: '充值提货卡-添加' }, - hidden: true - }, - { - path: 'rechargeQc', - name: 'rechargeQc', - component: () => import('@/views/marketing/rechargeCard/rechargeQc'), - meta: { title: '充值提货卡-添加' }, - hidden: true - } - ] - }, { path: 'lottery', name: 'Lottery', @@ -2002,6 +1976,33 @@ export const constantRoutes = [ } ] }, + { + path: 'rechargeCard', + name: 'RechargeCard', + component: ParentView, + children: [ + { + path: 'rechargeCardList', + name: 'RechargeCardList', + component: () => import('@/views/marketing/rechargeCard/index'), + meta: { title: '充值提货卡' } + }, + { + path: 'addRechargeCard', + name: 'addRechargeCard', + component: () => import('@/views/marketing/rechargeCard/addRechargeCard'), + meta: { title: '充值提货卡-添加' }, + hidden: true + }, + { + path: 'rechargeQc', + name: 'rechargeQc', + component: () => import('@/views/marketing/rechargeCard/rechargeQc'), + meta: { title: '充值提货卡-添加' }, + hidden: true + } + ] + }, { path: 'directUpgrade', @@ -2023,6 +2024,34 @@ export const constantRoutes = [ } ] }, + { + path: 'directRanking', + name: 'DirectRanking', + component: ParentView, + meta: { title: '直推排行数据' }, + children: [ + { + path: 'directRankingList', + name: 'DirectRankingList', + component: () => import('@/views/marketing/directRanking/index'), + meta: { title: '直推人数排行数据' } + }, + { + path: 'directAmountRankingList', + name: 'DirectAmountRankingList', + component: () => import('@/views/marketing/directRanking/amount'), + meta: { title: '直推金额排行数据' }, + hidden: true + }, + { + path: 'directConfig', + name: 'DirectConfig', + component: () => import('@/views/marketing/directRanking/config'), + meta: { title: '直推配置' }, + hidden: true + } + ] + }, // { // path: 'benefitsGift', // name: 'BenefitsGift', @@ -2122,34 +2151,6 @@ export const constantRoutes = [ meta: { title: '旅游活动数据' } } ] - }, - { - path: 'directRanking', - name: 'DirectRanking', - component: ParentView, - meta: { title: '直推排行数据' }, - children: [ - { - path: 'directRankingList', - name: 'DirectRankingList', - component: () => import('@/views/marketing/directRanking/index'), - meta: { title: '直推人数排行数据' } - }, - { - path: 'directAmountRankingList', - name: 'DirectAmountRankingList', - component: () => import('@/views/marketing/directRanking/amount'), - meta: { title: '直推金额排行数据' }, - hidden: true - }, - { - path: 'directConfig', - name: 'DirectConfig', - component: () => import('@/views/marketing/directRanking/config'), - meta: { title: '直推配置' }, - hidden: true - } - ] } ] From 7f32588951ccd3a38f417fccfa7e9d7d58da823c Mon Sep 17 00:00:00 2001 From: woody Date: Wed, 24 Sep 2025 13:23:47 +0800 Subject: [PATCH 07/10] =?UTF-8?q?feat(record):=20=E7=9B=B4=E6=8E=A8?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=95=B0=E6=8D=AE=E9=A1=B5=E9=9D=A2=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/giftGoods.js | 8 + src/router/index.js | 7 + src/views/marketing/directGifts/index.vue | 2 +- src/views/marketing/directGifts/record.vue | 315 +++++++++++++++++++++ 4 files changed, 331 insertions(+), 1 deletion(-) create mode 100644 src/views/marketing/directGifts/record.vue diff --git a/src/api/giftGoods.js b/src/api/giftGoods.js index 4741a88..cfc50dd 100644 --- a/src/api/giftGoods.js +++ b/src/api/giftGoods.js @@ -401,3 +401,11 @@ export function tourismRuleConfigSubmit(data) { }) } +// 直推升级数据 +export function directUpgradeRecordList(params) { + return request({ + url: '/sale/manage/recommend/directPushUpgradeList', + method: 'get', + params + }) +} diff --git a/src/router/index.js b/src/router/index.js index 21f3a0c..e3ad2d0 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2008,6 +2008,7 @@ export const constantRoutes = [ path: 'directUpgrade', name: 'DirectUpgrade', component: ParentView, + meta: { title: '直推升级' }, children: [ { path: 'directUpgradeList', @@ -2021,6 +2022,12 @@ export const constantRoutes = [ component: () => import('@/views/marketing/directGifts/addDirect'), meta: { title: '基本信息' }, hidden: true + }, + { + path: 'directUpgradeRecordList', + name: 'DirectUpgradeRecordList', + component: () => import('@/views/marketing/directGifts/record'), + meta: { title: '直推升级数据' } } ] }, diff --git a/src/views/marketing/directGifts/index.vue b/src/views/marketing/directGifts/index.vue index bebe531..28d4f87 100644 --- a/src/views/marketing/directGifts/index.vue +++ b/src/views/marketing/directGifts/index.vue @@ -374,7 +374,7 @@ export default { this.download( 'activity/manage/recommend/export', Object.assign({}, { actType: 12 }, this.queryParams, this.select), - `${'直推赠送'}${new Date().getTime()}.xlsx` + `${'直推升级'}${new Date().getTime()}.xlsx` ) }) }, diff --git a/src/views/marketing/directGifts/record.vue b/src/views/marketing/directGifts/record.vue new file mode 100644 index 0000000..c0588f8 --- /dev/null +++ b/src/views/marketing/directGifts/record.vue @@ -0,0 +1,315 @@ + + + + + From 0d1961c416adf17fada0f98213f157467f0ff839 Mon Sep 17 00:00:00 2001 From: woody Date: Wed, 24 Sep 2025 15:16:29 +0800 Subject: [PATCH 08/10] =?UTF-8?q?fix(directRecord):=20=E7=9B=B4=E6=8E=A8?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=95=B0=E6=8D=AE=E6=B7=BB=E5=8A=A0=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/marketing/directGifts/record.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/marketing/directGifts/record.vue b/src/views/marketing/directGifts/record.vue index c0588f8..9afb376 100644 --- a/src/views/marketing/directGifts/record.vue +++ b/src/views/marketing/directGifts/record.vue @@ -81,7 +81,7 @@
Date: Wed, 24 Sep 2025 15:18:31 +0800 Subject: [PATCH 09/10] =?UTF-8?q?fix(directConfig):=20=E7=9B=B4=E6=8E=A8?= =?UTF-8?q?=E6=8E=92=E8=A1=8C=E9=85=8D=E7=BD=AE=E5=BC=80=E5=85=B3=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/marketing/directRanking/config.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/marketing/directRanking/config.vue b/src/views/marketing/directRanking/config.vue index 10b60e4..b0b370b 100644 --- a/src/views/marketing/directRanking/config.vue +++ b/src/views/marketing/directRanking/config.vue @@ -44,8 +44,8 @@ export default { mixins: [mixins], data() { return { - pushPeople: false, - pushAmount: false, + pushPeople: 'false', + pushAmount: 'false', moren: 'directConfig' } }, From e38e5b1c280de4af69f23c2527655e3caa644a63 Mon Sep 17 00:00:00 2001 From: woody Date: Wed, 24 Sep 2025 15:52:37 +0800 Subject: [PATCH 10/10] =?UTF-8?q?fix(config):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=9B=B4=E6=8E=A8=E9=85=8D=E7=BD=AE=E5=BC=80=E5=85=B3=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/marketing/directRanking/config.vue | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/views/marketing/directRanking/config.vue b/src/views/marketing/directRanking/config.vue index b0b370b..b8908a8 100644 --- a/src/views/marketing/directRanking/config.vue +++ b/src/views/marketing/directRanking/config.vue @@ -10,9 +10,9 @@ @@ -20,9 +20,9 @@ @@ -73,14 +73,16 @@ export default { setMemberDirectPush(val) { setMemberDirectPush(val).then(res => { if (res.code === 200) { - this.pushPeople = res.data + this.$message.success('操作成功') + this.pushPeople = val } }) }, setMemberDirectPushAmount(val) { setMemberDirectPushAmount(val).then(res => { if (res.code === 200) { - this.pushAmount = res.data + this.$message.success('操作成功') + this.pushAmount = val } }) }