From 9ffcda3dfe690dece8f4b2f1889face997ffb1fe Mon Sep 17 00:00:00 2001 From: zhangheng Date: Thu, 11 Sep 2025 10:46:29 +0800 Subject: [PATCH 1/5] =?UTF-8?q?##=20=E5=88=A0=E9=99=A4=E6=AD=BB=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/deletedeadlock.js | 17 ++ src/router/index.js | 7 + .../specialBusiness/deleteDeadLock/index.vue | 162 ++++++++++++++++++ 3 files changed, 186 insertions(+) create mode 100644 src/api/deletedeadlock.js create mode 100644 src/views/information/specialBusiness/deleteDeadLock/index.vue diff --git a/src/api/deletedeadlock.js b/src/api/deletedeadlock.js new file mode 100644 index 0000000..fb4d62f --- /dev/null +++ b/src/api/deletedeadlock.js @@ -0,0 +1,17 @@ +import request from '@/utils/request' +// 删除死点列表查询 +export function getdeleteDeadLockList(params) { + return request({ + url: '/member/manager/deleteDeadLock/list', + method: 'get', + params + }) +} + +export function getdeleteDeadLockDel(data) { + return request({ + url: '/member/manager/deleteDeadLock/delete', + method: 'post', + data + }) +} \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 41af54c..2bcbd23 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -461,8 +461,15 @@ export const constantRoutes = [ name: 'MemberRenewal', component: () => import('@/views/information/specialBusiness/memberRenewal/index'), meta: { title: '会员续约' } + }, + { + path: 'deleteDeadLock', + name: 'DeleteDeadLock', + component: () => import('@/views/information/specialBusiness/deleteDeadLock/index'), + meta: {title: '删除死点'} } + ] }, diff --git a/src/views/information/specialBusiness/deleteDeadLock/index.vue b/src/views/information/specialBusiness/deleteDeadLock/index.vue new file mode 100644 index 0000000..acf82a4 --- /dev/null +++ b/src/views/information/specialBusiness/deleteDeadLock/index.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file From ef183d7344e7024c1b3b1510685db47a90546092 Mon Sep 17 00:00:00 2001 From: zhangheng Date: Thu, 11 Sep 2025 13:34:24 +0800 Subject: [PATCH 2/5] =?UTF-8?q?##=20=E5=88=A0=E9=99=A4=E6=AD=BB=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../specialBusiness/deleteDeadLock/index.vue | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/views/information/specialBusiness/deleteDeadLock/index.vue b/src/views/information/specialBusiness/deleteDeadLock/index.vue index acf82a4..19ee7f8 100644 --- a/src/views/information/specialBusiness/deleteDeadLock/index.vue +++ b/src/views/information/specialBusiness/deleteDeadLock/index.vue @@ -22,7 +22,6 @@ -
-
{ - spe.getdeleteDeadLockDel({memberCode:memberCode}).then(() => { - this.$message.success("删除成功"); + spe.getdeleteDeadLockDel({memberCode:memberCode}).then((res) => { + if(res.code == 200){ + this.$message.success("删除成功"); + }else{ + this.$message.error(res.msg); + } this.getSearch(); }); }); From f0b7ed589f5b53065c89d031a27af6da1478f795 Mon Sep 17 00:00:00 2001 From: zhangheng Date: Thu, 11 Sep 2025 13:54:19 +0800 Subject: [PATCH 3/5] =?UTF-8?q?##=20=E5=88=A0=E9=99=A4=E6=AD=BB=E7=82=B9?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BF=94=E5=9B=9E=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/information/specialBusiness/deleteDeadLock/index.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/views/information/specialBusiness/deleteDeadLock/index.vue b/src/views/information/specialBusiness/deleteDeadLock/index.vue index 19ee7f8..081cadb 100644 --- a/src/views/information/specialBusiness/deleteDeadLock/index.vue +++ b/src/views/information/specialBusiness/deleteDeadLock/index.vue @@ -122,8 +122,6 @@ export default { spe.getdeleteDeadLockDel({memberCode:memberCode}).then((res) => { if(res.code == 200){ this.$message.success("删除成功"); - }else{ - this.$message.error(res.msg); } this.getSearch(); }); From 2f1473aac9dfbec656fffe20ff82a1a440e645ac Mon Sep 17 00:00:00 2001 From: sangelxiu1 <15781802@163.com> Date: Tue, 16 Sep 2025 12:10:55 +0800 Subject: [PATCH 4/5] =?UTF-8?q?##=20Opt=20-=20=E5=9C=A8=E7=BA=BF=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E6=98=8E=E7=BB=86=E5=A2=9E=E5=8A=A0=E4=BD=93=E7=B3=BB?= =?UTF-8?q?=E5=90=8D=E7=A7=B0&=E4=BD=93=E7=B3=BB=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../financial/onlinePayDetails/index.vue | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/views/financial/onlinePayDetails/index.vue b/src/views/financial/onlinePayDetails/index.vue index a513142..794764f 100644 --- a/src/views/financial/onlinePayDetails/index.vue +++ b/src/views/financial/onlinePayDetails/index.vue @@ -132,6 +132,22 @@ /> + + + + + + + + { this.tradeTypeList = res.data }) + api.getvertexValue().then(res => { + this.vertexValueList = res.data + }) }, changeTime(val) { // this.select.startDate = val[0] From 6220c821eb29f241f21328faef7b98ada3263ae7 Mon Sep 17 00:00:00 2001 From: woody Date: Tue, 16 Sep 2025 13:40:06 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat(giftGoods):=20=E5=95=86=E5=93=81?= =?UTF-8?q?=E8=B5=A0=E9=80=81=E3=80=81=E6=B6=88=E8=B4=B9=E8=B5=A0=E9=80=81?= =?UTF-8?q?=E3=80=81=E4=BC=9A=E5=91=98=E6=B6=88=E8=B4=B9=E8=B5=A0=E9=80=81?= =?UTF-8?q?=E5=8E=BB=E7=AD=BE=E5=91=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/giftGoods.js | 24 + src/router/index.js | 25 +- .../consumptionGift/addConsumptionInfo.vue | 221 ++++--- .../consumptionGift/consumptionGiftZxqc.vue | 547 ------------------ .../marketing/giftGoods/addGiftGoodsInfo.vue | 358 +++++++----- .../marketing/giftGoods/giftGoodsZxqc.vue | 541 ----------------- .../addConsumptionInfo.vue | 62 +- .../consumptionGiftZxqc.vue | 487 ---------------- 8 files changed, 399 insertions(+), 1866 deletions(-) delete mode 100644 src/views/marketing/consumptionGift/consumptionGiftZxqc.vue delete mode 100644 src/views/marketing/giftGoods/giftGoodsZxqc.vue delete mode 100644 src/views/marketing/memberConsumptionGift/consumptionGiftZxqc.vue diff --git a/src/api/giftGoods.js b/src/api/giftGoods.js index a8e358e..574fbf1 100644 --- a/src/api/giftGoods.js +++ b/src/api/giftGoods.js @@ -318,3 +318,27 @@ export function getBenefitsRuleLogList(params) { }) } +// 消费赠送 +export function consumeRuleConfigSubmit(data) { + return request({ + url: '/sale/manage/consume-rule-config/submit', + method: 'post', + data + }) +} +// 会员消费赠送: +export function memberConsumeRuleSubmit(data) { + return request({ + url: '/sale/manage/member-consume-rule/submit', + method: 'post', + data + }) +} +// 商品赠送: +export function waresRuleConfigSubmit(data) { + return request({ + url: '/sale/manage/wares-rule-config/submit', + method: 'post', + data + }) +} diff --git a/src/router/index.js b/src/router/index.js index 2bcbd23..680341e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -466,10 +466,9 @@ export const constantRoutes = [ path: 'deleteDeadLock', name: 'DeleteDeadLock', component: () => import('@/views/information/specialBusiness/deleteDeadLock/index'), - meta: {title: '删除死点'} + meta: { title: '删除死点' } } - ] }, @@ -1858,13 +1857,6 @@ export const constantRoutes = [ component: () => import('@/views/marketing/giftGoods/setGiftGoodsInfo'), meta: { title: '规则设置' }, hidden: true - }, - { - path: 'giftGoodsZxqc', - name: 'GiftGoodsZxqc', - component: () => import('@/views/marketing/giftGoods/giftGoodsZxqc'), - meta: { title: '在线签呈' }, - hidden: true } ] }, @@ -1892,14 +1884,8 @@ export const constantRoutes = [ component: () => import('@/views/marketing/consumptionGift/setConsumptionInfo'), meta: { title: '规则设置' }, hidden: true - }, - { - path: 'consumptionGiftZxqc', - name: 'ConsumptionGiftZxqc', - component: () => import('@/views/marketing/consumptionGift/consumptionGiftZxqc'), - meta: { title: '在线签呈' }, - hidden: true } + ] }, { @@ -1926,13 +1912,6 @@ export const constantRoutes = [ component: () => import('@/views/marketing/memberConsumptionGift/setConsumptionInfo'), meta: { title: '规则设置' }, hidden: true - }, - { - path: 'memberConsumptionGiftZxqc', - name: 'MemberConsumptionGiftZxqc', - component: () => import('@/views/marketing/memberConsumptionGift/consumptionGiftZxqc'), - meta: { title: '在线签呈' }, - hidden: true } ] }, diff --git a/src/views/marketing/consumptionGift/addConsumptionInfo.vue b/src/views/marketing/consumptionGift/addConsumptionInfo.vue index e96e6fd..6908575 100644 --- a/src/views/marketing/consumptionGift/addConsumptionInfo.vue +++ b/src/views/marketing/consumptionGift/addConsumptionInfo.vue @@ -10,8 +10,13 @@ :topList="topList" :moren="moren"> -->
-
+
{{ item.name }}
@@ -20,12 +25,12 @@
{{ '基本信息' }}
-
- +
+ - + @@ -36,8 +41,13 @@ type="textarea" v-model="ruleForm.actExplain" :disabled="lookOver"> --> - + @@ -52,27 +62,33 @@
- {{ - '注册等级' }} + {{ + '注册等级' }} {{ item.gradeName - }} + }}
- {{ '真实奖衔' }} + {{ '真实奖衔' }} {{ item.awardsName - }} + }}
- {{ '权限中心' }} + {{ '权限中心' }} {{ item.label - }} + }}
@@ -81,20 +97,32 @@ - - + - - + @@ -102,13 +130,13 @@
- - + +
-
- {{ '取消' }} - {{ '确认' }} +
+ {{ '取消' }} + {{ '确认' }}
@@ -138,16 +166,16 @@ export default { topList: [ { name: '基本信息', - id: 0, + id: 0 }, { name: '规则设置', - id: 1, + id: 1 }, { name: '屏蔽设置', - id: 2, - }, + id: 2 + } ], uploadImgUrl: process.env.VUE_APP_BASE_API + '/system/upload', ruleForm: { @@ -157,27 +185,27 @@ export default { levelList: [], realList: [], centerList: [], - goalMemberConfigList: [], + goalMemberConfigList: [] }, rules: { actName: [ - { required: true, message: '请输入活动名称', trigger: 'blur' }, + { required: true, message: '请输入活动名称', trigger: 'blur' } ], actExplain: [ - { required: true, message: '请输入活动说明', trigger: 'blur' }, + { required: true, message: '请输入活动说明', trigger: 'blur' } ], actCover: [ - { required: true, message: '请上传活动封面', trigger: 'change' }, + { required: true, message: '请上传活动封面', trigger: 'change' } ], goalMemberConfigList: [ - { required: true, message: '请选择目标用户群体', trigger: 'change' }, + { required: true, message: '请选择目标用户群体', trigger: 'change' } ], ruleFormTime: [ - { required: true, message: '请选择活动时间', trigger: 'change' }, + { required: true, message: '请选择活动时间', trigger: 'change' } ], ruleFormTime1: [ - { required: true, message: '请选择展示时间', trigger: 'change' }, - ], + { required: true, message: '请选择展示时间', trigger: 'change' } + ] }, lookOver: false, gradeList: [], @@ -186,7 +214,7 @@ export default { pkId: '', waresConfigParam: [], consumeShieldConfigList: [], - controlType:'' + controlType: '' } }, mounted() { @@ -219,7 +247,7 @@ export default { getDetails() { api .consumeDetails({ - pkId: this.pkId, + pkId: this.pkId }) .then((res) => { this.waresConfigParam = res.data.consumeRuleConfigParamList @@ -235,15 +263,15 @@ export default { this.ruleForm.disEndDate = res.data.disEndDate this.$set(this.ruleForm, 'ruleFormTime', [ res.data.actStartDate, - res.data.actEndDate, + res.data.actEndDate ]) this.$set(this.ruleForm, 'ruleFormTime1', [ res.data.disStartDate, - res.data.disEndDate, + res.data.disEndDate ]) - let arr1 = [], - arr2 = [], - arr3 = [] + const arr1 = [] + const arr2 = [] + const arr3 = [] res.data.goalMemberConfigList.forEach((item) => { if (item.memberType == 1) { arr1.push(item.pkLevel) @@ -262,7 +290,7 @@ export default { this.$refs.shieldConsumption.getPage( res.data.consumeShieldConfigList || '' ) - let that = this + const that = this setTimeout(() => { that.getCheck() }, 50) @@ -283,15 +311,15 @@ export default { this.ruleForm.disEndDate = this.addData.activityParam.disEndDate this.$set(this.ruleForm, 'ruleFormTime', [ this.addData.activityParam.actStartDate, - this.addData.activityParam.actEndDate, + this.addData.activityParam.actEndDate ]) this.$set(this.ruleForm, 'ruleFormTime1', [ this.addData.activityParam.disStartDate, - this.addData.activityParam.disEndDate, + this.addData.activityParam.disEndDate ]) - let arr1 = [], - arr2 = [], - arr3 = [] + const arr1 = [] + const arr2 = [] + const arr3 = [] this.addData.activityParam.goalMemberConfigList.forEach((item) => { if (item.memberType == 1) { arr1.push(item.pkLevel) @@ -310,7 +338,7 @@ export default { this.$refs.shieldConsumption.getPage( this.addData.activityParam.consumeShieldConfigList || '' ) - let that = this + const that = this setTimeout(() => { that.getCheck() }, 500) @@ -327,28 +355,28 @@ export default { }, // 单选 getCheck() { - let arr1 = [] - let arr2 = [] - let arr3 = [] + const arr1 = [] + const arr2 = [] + const arr3 = [] // 等级 this.ruleForm.levelList.forEach((item) => { arr1.push({ memberType: 1, - pkLevel: item, + pkLevel: item }) }) // 奖衔 this.ruleForm.realList.forEach((item) => { arr2.push({ memberType: 2, - pkLevel: item, + pkLevel: item }) }) // 权限 this.ruleForm.centerList.forEach((item) => { arr3.push({ memberType: 3, - pkLevel: item, + pkLevel: item }) }) this.ruleForm.goalMemberConfigList = [...arr1, ...arr2, ...arr3] @@ -442,44 +470,53 @@ export default { // }) // } // }) - let a = Object.assign({}, this.ruleForm, { + const a = Object.assign({}, this.ruleForm, { consumeRuleConfigParamList: this.$refs.setConsumptionInfo.allData, consumeShieldConfigList: - this.$refs.shieldConsumption.consumeShieldConfigList, + this.$refs.shieldConsumption.consumeShieldConfigList }) - let obj = Object.assign({ + const obj = Object.assign({ controlType: this.controlType, - activityParam: a, + activityParam: a }) - if (this.controlType == 1) { - this.$router.push({ - path: 'consumptionGiftZxqc', - query: { - data: JSON.stringify(obj), - approvalBusiness: 738, - }, - }) - } else if (this.controlType == 2) { - this.$router.push({ - path: 'consumptionGiftZxqc', - query: { - data: JSON.stringify(obj), - approvalBusiness: 739, - }, - }) - } else if (this.controlType == 3) { - this.$router.push({ - path: 'consumptionGiftZxqc', - query: { - data: JSON.stringify(obj), - approvalBusiness: 740, - }, - }) - } + api.consumeRuleConfigSubmit(obj).then((res) => { + if (res.code === 200) { + this.$message({ + message: res.msg || '操作成功', + type: 'success' + }) + this.$router.back() + } + }) + // if (this.controlType == 1) { + // this.$router.push({ + // path: 'consumptionGiftZxqc', + // query: { + // data: JSON.stringify(obj), + // approvalBusiness: 738 + // } + // }) + // } else if (this.controlType == 2) { + // this.$router.push({ + // path: 'consumptionGiftZxqc', + // query: { + // data: JSON.stringify(obj), + // approvalBusiness: 739 + // } + // }) + // } else if (this.controlType == 3) { + // this.$router.push({ + // path: 'consumptionGiftZxqc', + // query: { + // data: JSON.stringify(obj), + // approvalBusiness: 740 + // } + // }) + // } } }) - }, - }, + } + } } diff --git a/src/views/marketing/consumptionGift/consumptionGiftZxqc.vue b/src/views/marketing/consumptionGift/consumptionGiftZxqc.vue deleted file mode 100644 index 7055db3..0000000 --- a/src/views/marketing/consumptionGift/consumptionGiftZxqc.vue +++ /dev/null @@ -1,547 +0,0 @@ - - - - - - - diff --git a/src/views/marketing/giftGoods/addGiftGoodsInfo.vue b/src/views/marketing/giftGoods/addGiftGoodsInfo.vue index cb85b33..ef4501e 100644 --- a/src/views/marketing/giftGoods/addGiftGoodsInfo.vue +++ b/src/views/marketing/giftGoods/addGiftGoodsInfo.vue @@ -10,11 +10,13 @@ :topList="topList" :moren="moren"> -->
-
+
{{ item.name }}
@@ -22,82 +24,114 @@
-
{{'基本信息'}}
-
- +
{{ '基本信息' }}
+
+ - - + + - + - + - + - +
- {{ '注册等级' }} - - {{ item.gradeName }} + {{ '注册等级' }} + + {{ item.gradeName }}
- {{'真实奖衔'}} - - {{ item.awardsName }} + {{ '真实奖衔' }} + + {{ item.awardsName }}
- {{'权限中心'}} - - {{ item.label }} + {{ '权限中心' }} + + {{ item.label }}
@@ -105,34 +139,40 @@ - - - + + - - - + + @@ -140,17 +180,26 @@
- +
-
- {{ '取消' }} - {{ '确认' }} +
+ {{ '取消' }} + {{ '确认' }}
@@ -170,21 +219,21 @@ export default { Editor, topBar, ImageUpload, - setGiftGoodsInfo, + setGiftGoodsInfo }, data() { return { - controlType:'', + controlType: '', tabActive: 0, topList: [ { name: '基本信息', - id: 0, + id: 0 }, { name: '规则设置', - id: 1, - }, + id: 1 + } ], uploadImgUrl: process.env.VUE_APP_BASE_API + '/system/upload', ruleForm: { @@ -194,34 +243,34 @@ export default { levelList: [], realList: [], centerList: [], - goalMemberConfigList: [], + goalMemberConfigList: [] }, rules: { actName: [ - { required: true, message: '请输入活动名称', trigger: 'blur' }, + { required: true, message: '请输入活动名称', trigger: 'blur' } ], actExplain: [ - { required: true, message: '请输入活动说明', trigger: 'blur' }, + { required: true, message: '请输入活动说明', trigger: 'blur' } ], actCover: [ - { required: true, message: '请上传活动封面', trigger: 'change' }, + { required: true, message: '请上传活动封面', trigger: 'change' } ], goalMemberConfigList: [ - { required: true, message: '请选择目标用户群体', trigger: 'change' }, + { required: true, message: '请选择目标用户群体', trigger: 'change' } ], ruleFormTime: [ - { required: true, message: '请选择活动时间', trigger: 'change' }, + { required: true, message: '请选择活动时间', trigger: 'change' } ], ruleFormTime1: [ - { required: true, message: '请选择展示时间', trigger: 'change' }, - ], + { required: true, message: '请选择展示时间', trigger: 'change' } + ] }, lookOver: false, gradeList: [], awardsList: [], registList: [], pkId: '', - waresConfigParam: [], + waresConfigParam: [] } }, mounted() { @@ -259,7 +308,7 @@ export default { getDetails() { api .activityDetails({ - pkId: this.pkId, + pkId: this.pkId }) .then((res) => { this.waresConfigParam = res.data.waresConfigParam @@ -274,15 +323,15 @@ export default { this.ruleForm.disEndDate = res.data.disEndDate this.$set(this.ruleForm, 'ruleFormTime', [ res.data.actStartDate, - res.data.actEndDate, + res.data.actEndDate ]) this.$set(this.ruleForm, 'ruleFormTime1', [ res.data.disStartDate, - res.data.disEndDate, + res.data.disEndDate ]) - let arr1 = [], - arr2 = [], - arr3 = [] + const arr1 = [] + const arr2 = [] + const arr3 = [] res.data.goalMemberConfigList.forEach((item) => { if (item.memberType == 1) { arr1.push(item.pkLevel) @@ -297,8 +346,8 @@ export default { this.$set(this.ruleForm, 'centerList', arr3) this.$refs.setGiftGoodsInfo.getPage( res.data.waresConfigParam || '' - ) - let that = this + ) + const that = this setTimeout(() => { that.getCheck() }, 50) @@ -319,15 +368,15 @@ export default { this.ruleForm.disEndDate = this.addData.activityParam.disEndDate this.$set(this.ruleForm, 'ruleFormTime', [ this.addData.activityParam.actStartDate, - this.addData.activityParam.actEndDate, + this.addData.activityParam.actEndDate ]) this.$set(this.ruleForm, 'ruleFormTime1', [ this.addData.activityParam.disStartDate, - this.addData.activityParam.disEndDate, + this.addData.activityParam.disEndDate ]) - let arr1 = [], - arr2 = [], - arr3 = [] + const arr1 = [] + const arr2 = [] + const arr3 = [] this.addData.activityParam.goalMemberConfigList.forEach((item) => { if (item.memberType == 1) { arr1.push(item.pkLevel) @@ -343,7 +392,7 @@ export default { this.$refs.setGiftGoodsInfo.getPage( this.addData.activityParam.waresConfigParam || '' ) - let that = this + const that = this setTimeout(() => { that.getCheck() }, 500) @@ -360,28 +409,28 @@ export default { // 单选 // 单选 getCheck() { - let arr1 = [] - let arr2 = [] - let arr3 = [] + const arr1 = [] + const arr2 = [] + const arr3 = [] // 等级 this.ruleForm.levelList.forEach((item) => { arr1.push({ memberType: 1, - pkLevel: item, + pkLevel: item }) }) // 奖衔 this.ruleForm.realList.forEach((item) => { arr2.push({ memberType: 2, - pkLevel: item, + pkLevel: item }) }) // 权限 this.ruleForm.centerList.forEach((item) => { arr3.push({ memberType: 3, - pkLevel: item, + pkLevel: item }) }) this.ruleForm.goalMemberConfigList = [...arr1, ...arr2, ...arr3] @@ -452,42 +501,53 @@ export default { submit() { this.$refs['ruleForm'].validate((valid) => { if (valid) { - let a = Object.assign({}, this.ruleForm, { - waresConfigParam: this.$refs.setGiftGoodsInfo.allData, + const a = Object.assign({}, this.ruleForm, { + waresConfigParam: this.$refs.setGiftGoodsInfo.allData }) - let obj = Object.assign({ + const obj = Object.assign({ controlType: this.controlType, - activityParam: a, + activityParam: a }) - if (this.controlType == 1) { - this.$router.push({ - path: 'giftGoodsZxqc', - query: { - data: JSON.stringify(obj), - approvalBusiness: 729, - }, - }) - } else if (this.controlType == 2) { - this.$router.push({ - path: 'giftGoodsZxqc', - query: { - data: JSON.stringify(obj), - approvalBusiness: 730, - }, - }) - } else if (this.controlType == 3) { - this.$router.push({ - path: 'giftGoodsZxqc', - query: { - data: JSON.stringify(obj), - approvalBusiness: 731, - }, - }) - } + // const approvalBusinessEnumList = [729, 730, 731] + // const approvalBusiness = approvalBusinessEnumList[this.controlType - 1] + api.waresRuleConfigSubmit(obj).then((res) => { + if (res.code === 200) { + this.$message({ + message: res.msg || '操作成功', + type: 'success' + }) + this.$router.back() + } + }) + // if (this.controlType == 1) { + // this.$router.push({ + // path: 'giftGoodsZxqc', + // query: { + // data: JSON.stringify(obj), + // approvalBusiness: 729 + // } + // }) + // } else if (this.controlType == 2) { + // this.$router.push({ + // path: 'giftGoodsZxqc', + // query: { + // data: JSON.stringify(obj), + // approvalBusiness: 730 + // } + // }) + // } else if (this.controlType == 3) { + // this.$router.push({ + // path: 'giftGoodsZxqc', + // query: { + // data: JSON.stringify(obj), + // approvalBusiness: 731 + // } + // }) + // } } }) - }, - }, + } + } } diff --git a/src/views/marketing/giftGoods/giftGoodsZxqc.vue b/src/views/marketing/giftGoods/giftGoodsZxqc.vue deleted file mode 100644 index 7aad670..0000000 --- a/src/views/marketing/giftGoods/giftGoodsZxqc.vue +++ /dev/null @@ -1,541 +0,0 @@ - - - - - - diff --git a/src/views/marketing/memberConsumptionGift/addConsumptionInfo.vue b/src/views/marketing/memberConsumptionGift/addConsumptionInfo.vue index c42ed7d..b81d086 100644 --- a/src/views/marketing/memberConsumptionGift/addConsumptionInfo.vue +++ b/src/views/marketing/memberConsumptionGift/addConsumptionInfo.vue @@ -162,7 +162,7 @@ />
- + {{ '取消' }} {{ '确认' }} @@ -477,32 +477,40 @@ export default { mcrList: this.$refs.setConsumptionInfo.mcrList } ) - console.log(obj, '111111111111111111111') - if (this.controlType == 1) { - this.$router.push({ - path: 'memberConsumptionGiftZxqc', - query: { - data: JSON.stringify(obj), - approvalBusiness: 749 - } - }) - } else if (this.controlType == 2) { - this.$router.push({ - path: 'memberConsumptionGiftZxqc', - query: { - data: JSON.stringify(obj), - approvalBusiness: 750 - } - }) - } else if (this.controlType == 3) { - this.$router.push({ - path: 'memberConsumptionGiftZxqc', - query: { - data: JSON.stringify(obj), - approvalBusiness: 751 - } - }) - } + api.memberConsumeRuleSubmit(obj).then((res) => { + if (res.code === 200) { + this.$message({ + message: res.msg || '操作成功', + type: 'success' + }) + this.$router.back() + } + }) + // if (this.controlType == 1) { + // this.$router.push({ + // path: 'memberConsumptionGiftZxqc', + // query: { + // data: JSON.stringify(obj), + // approvalBusiness: 749 + // } + // }) + // } else if (this.controlType == 2) { + // this.$router.push({ + // path: 'memberConsumptionGiftZxqc', + // query: { + // data: JSON.stringify(obj), + // approvalBusiness: 750 + // } + // }) + // } else if (this.controlType == 3) { + // this.$router.push({ + // path: 'memberConsumptionGiftZxqc', + // query: { + // data: JSON.stringify(obj), + // approvalBusiness: 751 + // } + // }) + // } } }) } diff --git a/src/views/marketing/memberConsumptionGift/consumptionGiftZxqc.vue b/src/views/marketing/memberConsumptionGift/consumptionGiftZxqc.vue deleted file mode 100644 index 488af10..0000000 --- a/src/views/marketing/memberConsumptionGift/consumptionGiftZxqc.vue +++ /dev/null @@ -1,487 +0,0 @@ - - - - -