Skip to content

S
shareConfig
Commit 9b7e15fe by 无尘
Options

fix：修改即时奖励

parent 88c4bd66
Showing with 271 additions and 46 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>分享有礼</title><link href=./static/css/app.793bdaf34be2813fbbc29a29b94475fd.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.33.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.29.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.38.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.1.91.js></script><script type=text/javascript src=./static/js/manifest.b99258193efb8e3e23be.js></script><script type=text/javascript src=./static/js/vendor.8455def81090347f10ce.js></script><script type=text/javascript src=./static/js/app.e7c85c59cd94b7abeca3.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>分享有礼</title><link href=./static/css/app.29bb42ca63070b0da4e1cb13755fc9e6.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.33.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.29.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.38.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.1.91.js></script><script type=text/javascript src=./static/js/manifest.8716bf7a27da15e5cb7b.js></script><script type=text/javascript src=./static/js/vendor.8455def81090347f10ce.js></script><script type=text/javascript src=./static/js/app.e7c85c59cd94b7abeca3.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/2.2e9c2f1b6300af949d8e.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/2.3aafedfcefbf5aa22384.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.8716bf7a27da15e5cb7b.js 0 → 100644
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var f,i,u,d=0,b=[];d<r.length;d++)i=r[d],t[i]&&b.push(t[i][0]),t[i]=0;for(f in c)Object.prototype.hasOwnProperty.call(c,f)&&(e[f]=c[f]);for(n&&n(r,c,a);b.length;)b.shift()();if(a)for(d=0;d<a.length;d++)u=o(o.s=a[d]);return u};var r={},t={15:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"8a732b49262f7df9b526",1:"5b546fa38466a0b05e37",2:"2e9c2f1b6300af949d8e",3:"b45331471e8656c5cb89",4:"c9baf4695a3666998280",5:"e5f29637bed979a22d84",6:"f11d902de0350ef6b333",7:"b0fd74564cc799593b8f",8:"fe9ec49f63ecd8e527ba",9:"522a01ff8d619d2bf030",10:"e16b73d2d4b922255e52",11:"c11d02c33702d00b2e2e",12:"cb13b689aaa548c4bc33"}[e]+".js";var f=setTimeout(i,12e4);function i(){a.onerror=a.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=i,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/manifest.b99258193efb8e3e23be.js deleted 100644 → 0
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var f,i,u,d=0,b=[];d<r.length;d++)i=r[d],t[i]&&b.push(t[i][0]),t[i]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,c);b.length;)b.shift()();if(c)for(d=0;d<c.length;d++)u=o(o.s=c[d]);return u};var r={},t={15:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"8a732b49262f7df9b526",1:"5b546fa38466a0b05e37",2:"3aafedfcefbf5aa22384",3:"b45331471e8656c5cb89",4:"c9baf4695a3666998280",5:"e5f29637bed979a22d84",6:"f11d902de0350ef6b333",7:"b0fd74564cc799593b8f",8:"fe9ec49f63ecd8e527ba",9:"522a01ff8d619d2bf030",10:"e16b73d2d4b922255e52",11:"c11d02c33702d00b2e2e",12:"cb13b689aaa548c4bc33"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,a.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/components/active-config/configs/entry-award.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-11-21 16:37:02 * @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-12-05 10:49:25 * @LastEditTime: 2019-12-05 17:21:29
--> -->
<!-- <!--
<entry-award></entry-award> <entry-award></entry-award>
...@@ -303,6 +303,9 @@ export default { ...@@ -303,6 +303,9 @@ export default {
that.$refs['rewardForm'].validate(valid => { that.$refs['rewardForm'].validate(valid => {
if (valid) { if (valid) {
that.$emit('input', that.passAward); that.$emit('input', that.passAward);
if (that.passAward.dealNumberFlag == 0 && that.passAward.dealNumberFlag == 0) {
resolve(false);
}
if (that.passAward.dealNumberFlag == 1 && !that.passAward.dealNumberSettingParam.length) { if (that.passAward.dealNumberFlag == 1 && !that.passAward.dealNumberSettingParam.length) {
resolve(false); resolve(false);
} }
......
src/components/active-config/reward-config.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-11-18 10:37:02 * @Date: 2019-11-18 10:37:02
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-12-05 14:14:54 * @LastEditTime: 2019-12-05 18:21:34
--> -->
<!-- <!--
<reward-config @submitBack="submitBack" @submitNext="submitNext"></reward-config> <reward-config @submitBack="submitBack" @submitNext="submitNext"></reward-config>
...@@ -472,6 +472,94 @@ export default { ...@@ -472,6 +472,94 @@ export default {
"stepType": this.stepTypeNum //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励 "stepType": this.stepTypeNum //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
} }
}, },
// 消费行为控制
consumeAction: {
consumeStoreControlFlag: 0, //消费门店控制开关 1控制，0不控制
consumeStoreName: '', //消费门店文案
dealAmountControlFlag: 0, //成交额控制开关 0不控制，1控制区间
dealAmountControlMin: 1, //成交额控制最小值
dealAmountControlMax: 1, //成交额控制最大值
singleDealNumberControlFlag: 0, //单笔成交件数控制开关 0不控制，1控制区间
singleDealNumberControlMin: 1, //单笔成交件数最小值
singleDealNumberControlMax: 1, //单笔成交件数最大值
uuid: '',
storeList: [],
"stepType": this.stepTypeNum //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
},
// 即时奖励
instanceAward: {
instanceMade: 1, //即时奖励模式 1、定额奖励，2阶梯奖励，3成交额等比奖励
instancePoint: 1, //奖励积分（定额中的积分，等比中的积分）
instanceNumber: 1, //等比奖励种的每多少元
instanceContent: [
{
start: 1,
end: 5,
point: 1,
infinity: false
},
{
start: 10,
end: 20,
point: 1,
infinity: false
}
], //即时奖励内容（阶梯内容） 奖励内容json字符串
awardLimitType: 1, //奖励限制类型 1、不限制奖励（推荐），2、限制奖励次数，3、限制奖励额度
awardLimitNumber: 1, //限制奖励次数
awardLimitPoint: 1, //限制奖励额度
stepType: this.stepTypeNum //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
},
// 闯关奖励
passAward: {
dealNumberFlag: 1, //成交人数开关 1开启
dealAmountFlag: 0, //成交额开关 1开启
dealNumberSettingParam: [], //成交人数奖项 成交人数奖项json
dealAmountSettingParam: [], //成交额奖项 成交额奖项json
stepType: this.stepTypeNum //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
},
// 竞赛奖励
compitionAward: {
dealNumberFlag: 1, //成交人数开关 1开启
dealAmountFlag: 0, //成交额开关 1开启
dealNumberSettingParam: [], //成交人数奖项 成交人数奖项json
dealAmountSettingParam: [], //成交额奖项 成交额奖项json
stepType: this.stepTypeNum //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
},
// 受邀人奖励
invitedAward: {
pointSettingFlag: true, //积分奖励开关 1开启
cardSettingFlag: false, //卡券开关 1开启
pointAwardMode: 1, //1、定额，2、阶梯，3、等比
pointAwardPoint: 1, //定额奖励积分
pointAwardStepParam: [
{
amount: 1,
point: 1
}
],
pointAwardPerAmount: 1, //等比奖励中的每成交多少元
pointAwardPerPoint: 1, //等比奖励中积分
cardAwardMode: 1,
cardId: '',
cardName: '',
cardAwardStepParam: [
{
amount: 1,
cardId: '',
cardName: ''
}
],
"stepType": this.stepTypeNum //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
},
// 防欺诈
pointFreeze: {
amountLimitFlag: 0,
amountLimitAmount: 1,
pointProgram: 1, //0、不限制，1、延时发放（推荐），2积分冻结
pointControlDay: 1, //限制延时
"stepType": this.stepTypeNum //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
},
rules: { rules: {
awardMode: [{ required: true, message: '请选择奖励模式', trigger: 'blur' }] awardMode: [{ required: true, message: '请选择奖励模式', trigger: 'blur' }]
}, },
...@@ -1274,40 +1362,40 @@ export default { ...@@ -1274,40 +1362,40 @@ export default {
} }
} }
let spot = true; let spot = true;
if (!!that.$refs.hasOwnProperty('multSpot') && that.$refs.multSpot.length ) { if (!!that.$refs.hasOwnProperty('multSpot') && that.$refs.multSpot.length ) {
for (let index = 0; index < that.$refs.multSpot.length; index++) { for (let index = 0; index < that.$refs.multSpot.length; index++) {
spot = await that.$refs.multSpot[index].submitForm(); spot = await that.$refs.multSpot[index].submitForm();
}
} }
}
let entry = true; let entry = true;
if (!!that.$refs.hasOwnProperty('multEntry') && that.$refs.multEntry.length ) { if (!!that.$refs.hasOwnProperty('multEntry') && that.$refs.multEntry.length ) {
for (let index = 0; index < that.$refs.multEntry.length; index++) { for (let index = 0; index < that.$refs.multEntry.length; index++) {
entry = await that.$refs.multEntry[index].submitForm(); entry = await that.$refs.multEntry[index].submitForm();
}
} }
}
let competition = true; let competition = true;
if (!!that.$refs.hasOwnProperty('multCompetition') && that.$refs.multCompetition.length ) { if (!!that.$refs.hasOwnProperty('multCompetition') && that.$refs.multCompetition.length ) {
for (let index = 0; index < that.$refs.multCompetition.length; index++) { for (let index = 0; index < that.$refs.multCompetition.length; index++) {
competition = await that.$refs.multCompetition[index].submitForm() competition = await that.$refs.multCompetition[index].submitForm()
}
} }
}
let invitee = true; let invitee = true;
if (!!that.$refs.hasOwnProperty('multInvitee') && that.$refs.multInvitee.length ) { if (!!that.$refs.hasOwnProperty('multInvitee') && that.$refs.multInvitee.length ) {
for (let index = 0; index < that.$refs.multInvitee.length; index++) { for (let index = 0; index < that.$refs.multInvitee.length; index++) {
invitee = await that.$refs.multInvitee[index].submitForm(); invitee = await that.$refs.multInvitee[index].submitForm();
}
} }
}
let freeze = true; let freeze = true;
if (!!that.$refs.multFreeze && that.$refs.multFreeze.length ) { if (!!that.$refs.multFreeze && that.$refs.multFreeze.length ) {
for (let index = 0; index < that.$refs.multFreeze.length; index++) { for (let index = 0; index < that.$refs.multFreeze.length; index++) {
freeze = await that.$refs.multFreeze[index].submitForm(); freeze = await that.$refs.multFreeze[index].submitForm();
}
} }
}
that.$store.dispatch('saveRewardInfo', that.activeInfoData); that.$store.dispatch('saveRewardInfo', that.activeInfoData);
that.$store.dispatch('saveMultRewardInfo', that.ProgressiveData); that.$store.dispatch('saveMultRewardInfo', that.ProgressiveData);
} }
...@@ -1366,19 +1454,146 @@ export default { ...@@ -1366,19 +1454,146 @@ export default {
console.log('单次数据', that.activeInfoData); console.log('单次数据', that.activeInfoData);
const names = that.basePath.map(ele => ele.transName); const names = that.basePath.map(ele => ele.transName);
that.activeInfoData.stepType = that.stepObj[names[names.length - 1]]; that.activeInfoData.stepType = that.stepObj[names[names.length - 1]];
that.activeInfoData.consumeAction.stepType = that.stepObj[names[names.length - 1]]; if (that.activeInfoData.hasOwnProperty('consumeAction')) {
that.activeInfoData.instanceAward.stepType = that.stepObj[names[names.length - 1]]; that.activeInfoData.consumeAction.stepType = that.stepObj[names[names.length - 1]];
that.activeInfoData.passAward.stepType = that.stepObj[names[names.length - 1]]; }
that.activeInfoData.compitionAward.stepType = that.stepObj[names[names.length - 1]]; if (that.activeInfoData.hasOwnProperty('instanceAward')) {
that.activeInfoData.invitedAward.stepType = that.stepObj[names[names.length - 1]]; that.activeInfoData.instanceAward.stepType = that.stepObj[names[names.length - 1]];
that.activeInfoData.pointFreeze.stepType = that.stepObj[names[names.length - 1]]; }
if (that.activeInfoData.hasOwnProperty('passAward')) {
that.activeInfoData.passAward.stepType = that.stepObj[names[names.length - 1]];
}
if (that.activeInfoData.hasOwnProperty('compitionAward')) {
that.activeInfoData.compitionAward.stepType = that.stepObj[names[names.length - 1]];
}
if (that.activeInfoData.hasOwnProperty('invitedAward')) {
that.activeInfoData.invitedAward.stepType = that.stepObj[names[names.length - 1]];
}
if (that.activeInfoData.hasOwnProperty('pointFreeze')) {
that.activeInfoData.pointFreeze.stepType = that.stepObj[names[names.length - 1]];
}
//本来不用判断具体提交数据，后端只保存选择的，判断所有不选的去掉字段
let filterData = JSON.parse(JSON.stringify(that.activeInfoData));
await that.deleteKey(filterData);
const postData = { const postData = {
activityId: that.activeInfoData.activityId, activityId: filterData.activityId,
awardMode: that.activeInfoData.awardMode, awardMode: filterData.awardMode,
awardItems: [that.activeInfoData] awardItems: [filterData]
}; };
console.log(filterData)
that.postSave(postData); that.postSave(postData);
}, },
async deleteKey(filterData) {
const that = this;
const names = that.basePath.map(ele => ele.transName);
if (!names.includes('消费')) {
that.$set(filterData, 'consumeAction', null);
that.$set(filterData, 'pointFreeze', null);
}
if (filterData.instantAwardFlag == 0) {
that.$set(filterData, 'instanceAward', null);
}
if (filterData.passAwardFlag == 0) {
that.$set(filterData, 'passAward', null);
}
if (filterData.competitionAwardFlag == 0) {
that.$set(filterData, 'compitionAward', null);
}
// 消费行为控制
if (names.includes('消费') && filterData.consumeAction.consumeStoreControlFlag == 0) {
that.$set(filterData.consumeAction, 'consumeStoreName','');
that.$set(filterData.consumeAction, 'storeList',[]);
that.$set(filterData.consumeAction, 'uuid','');
}
if (names.includes('消费') && filterData.consumeAction.dealAmountControlFlag == 0) {
that.$set(filterData.consumeAction, 'dealAmountControlMin','');
that.$set(filterData.consumeAction, 'dealAmountControlMax','');
}
if (names.includes('消费') && filterData.consumeAction.singleDealNumberControlFlag == 0) {
that.$set(filterData.consumeAction, 'singleDealNumberControlMin','');
that.$set(filterData.consumeAction, 'singleDealNumberControlMax','');
}
// 反欺诈
if (names.includes('消费') && filterData.pointFreeze.amountLimitFlag == 0) {
that.$set(filterData.pointFreeze, 'amountLimitAmount', '');
}
if (names.includes('消费') && filterData.pointFreeze.pointProgram == 0) {
that.$set(filterData.pointFreeze, 'pointControlDay', '');
}
// 判断即时消费
if (filterData.instantAwardFlag == 1 && filterData.instanceAward.instanceMade == 1) {
that.$set(filterData.instanceAward, 'instanceContent',[]);
that.$set(filterData.instanceAward, 'instanceNumber','');
}
if (filterData.instantAwardFlag == 1 && filterData.instanceAward.instanceMade == 2) {
that.$set(filterData.instanceAward, 'instancePoint','');
that.$set(filterData.instanceAward, 'instanceNumber','');
}
if (filterData.instantAwardFlag == 1 && filterData.instanceAward.instanceMade == 3) {
that.$set(filterData.instanceAward, 'instancePoint','');
that.$set(filterData.instanceAward, 'instanceContent',[]);
}
if (filterData.instantAwardFlag == 1 && filterData.instanceAward.awardLimitType == 1) {
that.$set(filterData.instanceAward, 'awardLimitNumber','');
that.$set(filterData.instanceAward, 'awardLimitPoint','');
}
if (filterData.instantAwardFlag == 1 && filterData.instanceAward.awardLimitType == 2) {
that.$set(filterData.instanceAward, 'awardLimitNumber','');
}
if (filterData.instantAwardFlag == 1 && filterData.instanceAward.awardLimitType == 3) {
that.$set(filterData.instanceAward, 'awardLimitPoint','');
}
// 闯关奖励
if (filterData.passAwardFlag == 1 && filterData.passAward.dealNumberFlag == 0) {
that.$set(filterData.passAward, 'dealNumberSettingParam',[]);
}
if (filterData.passAwardFlag == 1 && filterData.passAward.dealAmountFlag == 0) {
that.$set(filterData.passAward, 'dealAmountSettingParam',[]);
}
// 竞赛奖励
if (filterData.competitionAwardFlag == 1 && filterData.compitionAward.dealNumberFlag == 0) {
that.$set(filterData.compitionAward, 'dealNumberSettingParam',[]);
}
if (filterData.competitionAwardFlag == 1 && filterData.compitionAward.dealAmountFlag == 0) {
that.$set(filterData.compitionAward, 'dealAmountSettingParam',[]);
}
// 受邀奖励
if (filterData.invitedAward.pointSettingFlag == 0 ) {
that.$set(filterData.invitedAward, 'pointAwardMode', '1');
that.$set(filterData.invitedAward, 'pointAwardPoint', '');
that.$set(filterData.invitedAward, 'pointAwardStepParam', []);
that.$set(filterData.invitedAward, 'pointAwardPerAmount','');
that.$set(filterData.invitedAward, 'pointAwardPerPoint','');
}
if (filterData.invitedAward.pointSettingFlag == 1 && filterData.invitedAward.pointAwardMode == 1 ) {
that.$set(filterData.invitedAward, 'pointAwardStepParam',[]);
that.$set(filterData.invitedAward, 'pointAwardPerAmount','');
that.$set(filterData.invitedAward, 'pointAwardPerPoint','');
}
if (filterData.invitedAward.pointSettingFlag == 1 && filterData.invitedAward.pointAwardMode == 2 ) {
that.$set(filterData.invitedAward, 'pointAwardPoint','');
that.$set(filterData.invitedAward, 'pointAwardPerAmount','');
that.$set(filterData.invitedAward, 'pointAwardPerPoint','');
}
if (filterData.invitedAward.pointSettingFlag == 1 && filterData.invitedAward.pointAwardMode == 3 ) {
that.$set(filterData.invitedAward, 'pointAwardPoint','');
that.$set(filterData.invitedAward, 'pointAwardStepParam',[]);
}
if (filterData.invitedAward.cardSettingFlag == 0 ) {
that.$set(filterData.invitedAward, 'cardAwardMode','1');
that.$set(filterData.invitedAward, 'cardId','');
that.$set(filterData.invitedAward, 'cardName','');
that.$set(filterData.invitedAward, 'cardAwardStepParam',[]);
}
if (filterData.invitedAward.cardSettingFlag == 0 && filterData.invitedAward.cardAwardMode==1) {
that.$set(filterData.invitedAward, 'cardAwardStepParam',[]);
}
if (filterData.invitedAward.cardSettingFlag == 0 && filterData.invitedAward.cardAwardMode==2) {
that.$set(filterData.invitedAward, 'cardId','');
that.$set(filterData.invitedAward, 'cardName','');
}
},
async moreCheck() { async moreCheck() {
const that = this; const that = this;
let flag = true; let flag = true;
...@@ -1510,9 +1725,16 @@ export default { ...@@ -1510,9 +1725,16 @@ export default {
return false; return false;
} }
if (resData.result.awardMode == 1) { if (resData.result.awardMode == 1) {
that.consumeAction.stepType = resData.result.stepType;
that.instanceAward.stepType = resData.result.stepType;
that.passAward.stepType = resData.result.stepType;
that.compitionAward.stepType = resData.result.stepType;
that.invitedAward.stepType = resData.result.stepType;
that.pointFreeze.stepType = resData.result.stepType;
const obj = { const obj = {
activityId: resData.result.activityId, activityId: resData.result.activityId,
awardMode: resData.result.awardMode, awardMode: resData.result.awardMode,
stepType: resData.result.stepType,
instantAwardFlag: resData.result.awardItems[0].instantAwardFlag, // 即时 instantAwardFlag: resData.result.awardItems[0].instantAwardFlag, // 即时
passAwardFlag: resData.result.awardItems[0].passAwardFlag, // 闯关 passAwardFlag: resData.result.awardItems[0].passAwardFlag, // 闯关
competitionAwardFlag: resData.result.awardItems[0].competitionAwardFlag, // 竞赛 competitionAwardFlag: resData.result.awardItems[0].competitionAwardFlag, // 竞赛
...@@ -1523,12 +1745,12 @@ export default { ...@@ -1523,12 +1745,12 @@ export default {
receiveCardFlag: resData.result.awardItems[0].receiveCardFlag, // 领取卡券开关 receiveCardFlag: resData.result.awardItems[0].receiveCardFlag, // 领取卡券开关
consumeAwardFlag: resData.result.awardItems[0].consumeAwardFlag, // 消费奖开关 consumeAwardFlag: resData.result.awardItems[0].consumeAwardFlag, // 消费奖开关
// 消费行为控制 // 消费行为控制
consumeAction: resData.result.awardItems[0].consumeAction, consumeAction: resData.result.awardItems[0].consumeAction? resData.result.awardItems[0].consumeAction : that.consumeAction,
instanceAward: resData.result.awardItems[0].instanceAward, instanceAward: resData.result.awardItems[0].instanceAward? resData.result.awardItems[0].instanceAward : that.instanceAward,
passAward: resData.result.awardItems[0].passAward, passAward: resData.result.awardItems[0].passAward? resData.result.awardItems[0].passAward: that.passAward,
compitionAward: resData.result.awardItems[0].compitionAward, compitionAward: resData.result.awardItems[0].compitionAward? resData.result.awardItems[0].compitionAward : that.compitionAward,
invitedAward: resData.result.awardItems[0].invitedAward, invitedAward: resData.result.awardItems[0].invitedAward? resData.result.awardItems[0].invitedAward : that.invitedAward,
pointFreeze: resData.result.awardItems[0].pointFreeze pointFreeze: resData.result.awardItems[0].pointFreeze? resData.result.awardItems[0].pointFreeze : that.pointFreeze
}; };
if (obj.invitedAward) { if (obj.invitedAward) {
obj.invitedAward.pointSettingFlag = obj.invitedAward.pointSettingFlag==1 ? true:false; obj.invitedAward.pointSettingFlag = obj.invitedAward.pointSettingFlag==1 ? true:false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment