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 @@ - - - - -