Commit eb73e8cd by 无尘

fix: 修改bug

parent fecce48f
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>分享有礼</title><link href=./static/css/app.2501689148d2d83ddec90985c9eccc08.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.14.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.7abff912552c18057024.js></script><script type=text/javascript src=./static/js/vendor.8455def81090347f10ce.js></script><script type=text/javascript src=./static/js/app.a5d6a27bac101a87247e.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>分享有礼</title><link href=./static/css/app.71a48db0fe8780bdd6516945a6fefa5b.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.14.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.aeced000aec65b2b8e44.js></script><script type=text/javascript src=./static/js/vendor.8455def81090347f10ce.js></script><script type=text/javascript src=./static/js/app.a5d6a27bac101a87247e.js></script></body></html>
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var f,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.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);s.length;)s.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:"f0728605b4cabfe16cd5",1:"5b546fa38466a0b05e37",2:"96016ff541a14a45d7e6",3:"4d2a65049c6002aa5528",4:"67ccecbc8d185b3f1c8c",5:"0c49c41eb27e8038adad",6:"f11d902de0350ef6b333",7:"b0fd74564cc799593b8f",8:"fe9ec49f63ecd8e527ba",9:"522a01ff8d619d2bf030",10:"e16b73d2d4b922255e52",11:"79c83b22c308f0e0e879",12:"3c0d12e65df907bcbcc5"}[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
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,f){for(var a,i,u,d=0,b=[];d<r.length;d++)i=r[d],t[i]&&b.push(t[i][0]),t[i]=0;for(a in c)Object.prototype.hasOwnProperty.call(c,a)&&(e[a]=c[a]);for(n&&n(r,c,f);b.length;)b.shift()();if(f)for(d=0;d<f.length;d++)u=o(o.s=f[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],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,o.nc&&f.setAttribute("nonce",o.nc),f.src=o.p+"static/js/"+e+"."+{0:"f0728605b4cabfe16cd5",1:"5b546fa38466a0b05e37",2:"78dcd328d2ef6f16f401",3:"35ea2b78d16144c8d6fb",4:"67ccecbc8d185b3f1c8c",5:"0c49c41eb27e8038adad",6:"f11d902de0350ef6b333",7:"b0fd74564cc799593b8f",8:"fe9ec49f63ecd8e527ba",9:"522a01ff8d619d2bf030",10:"e16b73d2d4b922255e52",11:"79c83b22c308f0e0e879",12:"3c0d12e65df907bcbcc5"}[e]+".js";var a=setTimeout(i,12e4);function i(){f.onerror=f.onload=null,clearTimeout(a);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return f.onerror=f.onload=i,c.appendChild(f),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
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-15 14:32:12
* @LastEditTime: 2019-12-17 18:37:20
-->
<!--
<competition-award></competition-award>
......@@ -554,7 +554,7 @@ export default {
if (valid) {
that.$emit('input', that.compitionAward);
if (that.compitionAward.dealNumberFlag == 1 && !that.compitionAward.dealNumberSettingParam.length) {
resolve(false);
resolve({flag: false, msg: '请完善竞赛奖励中成交人数奖项'});
}
if (that.compitionAward.dealNumberFlag == 1 && that.compitionAward.dealNumberSettingParam.length) {
let flag = true;
......@@ -568,11 +568,11 @@ export default {
let nameFlag = await that.isRepeat(names);
console.log(nameFlag,flag)
if(nameFlag){
resolve(false);
resolve({flag: false, msg: '竞赛奖励中成交人数奖项名称不能重复'});
}
if (!flag) {
resolve(false);
resolve({flag: false, msg: '请完善竞赛奖励中成交人数奖项'});
}
}
// 阶梯奖励没有勾选无穷大判断
......@@ -606,12 +606,12 @@ export default {
}
console.log(flag)
if (!flag) {
resolve(false);
resolve({flag: false, msg: '竞赛奖励中排名区间值之间不允许存在间隔'});
}
}
if (that.compitionAward.dealAmountFlag == 1 && !that.compitionAward.dealAmountSettingParam.length) {
resolve(false);
resolve({flag: false, msg: '请完善竞赛奖励中成交额奖项'});
}
if (that.compitionAward.dealAmountFlag == 1 && that.compitionAward.dealAmountSettingParam.length) {
let flag = true;
......@@ -625,16 +625,16 @@ export default {
let nameFlag = await that.isRepeat(names);
console.log(nameFlag,flag)
if(nameFlag){
resolve(false);
resolve({flag: false, msg: '竞赛奖励中成交额奖项名称不能重复'});
}
if (!flag) {
resolve(false);
resolve({flag: false, msg: '请完善竞赛奖励中成交额奖项'});
}
}
// 阶梯奖励没有勾选无穷大判断
if(that.compitionAward.dealAmountFlag == 1 && that.compitionAward.dealAmountSettingParam.length>1&&!that.compitionAward.dealAmountSettingParam[that.compitionAward.dealAmountSettingParam.length-1].infinity) {
/* if(that.compitionAward.dealAmountFlag == 1 && that.compitionAward.dealAmountSettingParam.length>1&&!that.compitionAward.dealAmountSettingParam[that.compitionAward.dealAmountSettingParam.length-1].infinity) {
resolve(false);
}
} */
// 阶梯奖励中顺序值判断
if(that.compitionAward.dealAmountFlag == 1 && that.compitionAward.dealAmountSettingParam.length>1){
let flag = true;
......@@ -660,7 +660,7 @@ export default {
}
}
if (!flag) {
resolve(false);
resolve({flag: false, msg: '竞赛奖励中排名区间值之间不允许存在间隔'});
}
}
resolve(that.compitionAward);
......
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-15 14:30:58
* @LastEditTime: 2019-12-17 19:04:13
-->
<!--
<consume-config></consume-config>
......@@ -289,13 +289,13 @@ export default {
that.consumeAction.storeList = that.consumeAction.consumeStoreControlFlag == 0 ? [] : that.$refs.storeCard.rightList;
that.$emit('input', that.consumeAction);
if (that.consumeAction.consumeStoreControlFlag == 1 && (!that.consumeAction.storeList || !that.consumeAction.storeList.length || !that.consumeAction.consumeStoreName)) {
resolve(false);
resolve({flag: false, msg: '请完善消费行为控制中的消费门店控制'});
}
if (that.consumeAction.dealAmountControlFlag == 1 && (!that.consumeAction.dealAmountControlMin || !that.consumeAction.dealAmountControlMin)) {
resolve(false);
if (that.consumeAction.dealAmountControlFlag == 1 && (!that.consumeAction.dealAmountControlMin || !that.consumeAction.dealAmountControlMax)) {
resolve({flag: false, msg: '请完善消费行为控制中的成交额控制'});
}
if (that.consumeAction.singleDealNumberControlFlag == 1 && (!that.consumeAction.singleDealNumberControlMin || !that.consumeAction.singleDealNumberControlMax)) {
resolve(false);
resolve({flag: false, msg: '请完善消费行为控制中的单笔成交件数控制'});
}
resolve(that.consumeAction);
} else {
......
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-15 14:30:32
* @LastEditTime: 2019-12-17 18:30:29
-->
<!--
<entry-award></entry-award>
......@@ -334,10 +334,10 @@ export default {
if (valid) {
that.$emit('input', that.passAward);
if (that.passAward.dealNumberFlag == 0 && that.passAward.dealNumberFlag == 0) {
resolve(false);
resolve({flag: false, msg: '请完善闯关奖励'});
}
if (that.passAward.dealNumberFlag == 1 && !that.passAward.dealNumberSettingParam.length) {
resolve(false);
resolve({flag: false, msg: '请完善闯关奖励中成交人数奖项'});
}
if (that.passAward.dealNumberFlag == 1 && that.passAward.dealNumberSettingParam.length) {
let flag = true;
......@@ -347,7 +347,7 @@ export default {
}
});
if (!flag) {
resolve(false);
resolve({flag: false, msg: '请完善闯关奖励中成交人数奖项'});
}
}
if (that.passAward.dealNumberFlag == 1 && that.passAward.dealNumberSettingParam.length>1) {
......@@ -371,11 +371,11 @@ export default {
}
}
if (!flag) {
resolve(false);
resolve({flag: false, msg: '请按顺序填写闯关奖励中成交人数奖项中条件值'});
}
}
if (that.passAward.dealAmountFlag == 1 && !that.passAward.dealAmountSettingParam.length) {
resolve(false);
resolve({flag: false, msg: '请完善闯关奖励中成交额奖项'});
}
if (that.passAward.dealAmountFlag == 1 && that.passAward.dealAmountSettingParam.length) {
let flag = true;
......@@ -385,7 +385,7 @@ export default {
}
});
if (!flag) {
resolve(false);
resolve({flag: false, msg: '请完善闯关奖励中成交额奖项'});
}
}
if (that.passAward.dealAmountFlag == 1 && that.passAward.dealAmountSettingParam.length>1) {
......@@ -409,7 +409,7 @@ export default {
}
}
if (!flag) {
resolve(false);
resolve({flag: false, msg: '请按顺序填写闯关奖励中成交额奖项中条件值'});
}
}
resolve(that.passAward);
......
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-15 14:29:47
* @LastEditTime: 2019-12-17 18:39:30
-->
<!--
<fraud-control></fraud-control>
......@@ -231,13 +231,13 @@ export default {
if (valid) {
that.$emit('input', that.pointFreeze);
if (that.pointFreeze.amountLimitFlag ==1 && !that.pointFreeze.amountLimitAmount) {
resolve(false);
resolve({flag: false, msg: '请完善防欺诈风险控制中成交额上限控制'});
}
if (that.pointFreeze.pointProgram ==1 && !that.pointFreeze.pointControlDay) {
resolve(false);
resolve({flag: false, msg: '请完善防欺诈风险控制中积分处理方案'});
}
if (that.pointFreeze.pointProgram ==2 && !that.pointFreeze.pointControlDay) {
resolve(false);
resolve({flag: false, msg: '请完善防欺诈风险控制中积分处理方案'});
}
resolve(that.pointFreeze);
} else {
......
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-16 09:44:30
* @LastEditTime: 2019-12-17 18:57:33
-->
<!--
<invitee-reward></invitee-reward>
......@@ -421,13 +421,13 @@ export default {
resolve(false);
} */
if (that.invitedAward.pointSettingFlag && that.invitedAward.pointAwardMode == 1 && !that.invitedAward.pointAwardPoint) {
resolve(false);
resolve({flag: false, msg: '请完善受邀人奖励中积分奖励的定额奖励'});
}
if (that.invitedAward.pointSettingFlag && that.invitedAward.pointAwardMode == 3 && (!that.invitedAward.pointAwardPerAmount|| !that.invitedAward.pointAwardPerPoint)) {
resolve(false);
resolve({flag: false, msg: '请完善受邀人奖励中积分奖励的成交额等比奖励'});
}
if (that.invitedAward.pointSettingFlag && that.invitedAward.pointAwardMode == 2 && !that.invitedAward.pointAwardStepParam.length) {
resolve(false);
resolve({flag: false, msg: '请完善受邀人奖励中积分奖励的阶梯奖励'});
}
if (that.invitedAward.pointSettingFlag && that.invitedAward.pointAwardMode == 2 && that.invitedAward.pointAwardStepParam.length) {
let flag = true;
......@@ -437,7 +437,7 @@ export default {
}
});
if (!flag) {
resolve(false);
resolve({flag: false, msg: '请完善受邀人奖励中积分奖励的阶梯奖励中的成交额或奖励积分'});
}
}
if (that.invitedAward.pointSettingFlag && that.invitedAward.pointAwardMode == 2 && that.invitedAward.pointAwardStepParam.length>1) {
......@@ -459,14 +459,14 @@ export default {
}
}
if (!flag) {
resolve(false);
resolve({flag: false, msg: '请按顺序填写受邀人奖励中积分奖励的阶梯奖项中成交额'});
}
}
if (that.invitedAward.cardSettingFlag && that.invitedAward.cardAwardMode == 1 && !that.invitedAward.cardId) {
resolve(false);
resolve({flag: false, msg: '请完善受邀人奖励中卡券奖励'});
}
if (that.invitedAward.cardSettingFlag && that.invitedAward.cardAwardMode == 2 && !that.invitedAward.cardAwardStepParam.length) {
resolve(false);
resolve({flag: false, msg: '请完善受邀人奖励中卡券奖励中的阶梯奖励'});
}
if (that.invitedAward.cardSettingFlag && that.invitedAward.cardAwardMode == 2 && that.invitedAward.cardAwardStepParam.length) {
let flag = true;
......@@ -476,7 +476,7 @@ export default {
}
});
if (!flag) {
resolve(false);
resolve({flag: false, msg: '请完善受邀人奖励中卡券奖励的阶梯奖励中的成交额或奖励积分'});
}
}
if (that.invitedAward.cardSettingFlag && that.invitedAward.cardAwardMode == 2 && that.invitedAward.cardAwardStepParam.length>1) {
......@@ -500,7 +500,7 @@ export default {
}
}
if (!flag) {
resolve(false);
resolve({flag: false, msg: '请按顺序填写受邀人奖励中卡券奖励阶梯奖项中成交额'});
}
}
resolve(that.invitedAward);
......
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-15 14:28:02
* @LastEditTime: 2019-12-17 18:23:57
-->
<!--
<spot-award></spot-award>
......@@ -428,17 +428,17 @@ export default {
if (valid) {
that.$emit('input', that.instanceAward);
if(that.instanceAward.instanceMade == 1 && !that.instanceAward.instancePoint){
resolve(false);
resolve({flag: false, msg: '请完善即时奖励中的即时奖励模式'});
}
if(that.instanceAward.instanceMade == 3 && (!that.instanceAward.instancePoint || !that.instanceAward.instanceNumber)){
resolve(false);
resolve({flag: false, msg: '请完善即时奖励中的即时奖励模式'});
}
if(that.instanceAward.instanceMade == 2 && !that.instanceAward.instanceContent.length){
resolve(false);
resolve({flag: false, msg: '请完善即时奖励中的即时奖励模式'});
}
// 阶梯奖励没有勾选无穷大判断
if(that.instanceAward.instanceMade == 2 && that.instanceAward.instanceContent.length>1&&!that.instanceAward.instanceContent[that.instanceAward.instanceContent.length-1].infinity) {
resolve(false);
resolve({flag: false, msg: '请勾选即时奖励中的阶梯奖励无穷大'});
}
if(that.instanceAward.instanceMade == 2 && that.instanceAward.instanceContent.length){
let flag = true;
......@@ -449,7 +449,7 @@ export default {
})
console.log(flag)
if (!flag) {
resolve(false);
resolve({flag: false, msg: '请完善即时奖励中阶梯奖励的内容'});
}
}
// 阶梯奖励中顺序值判断
......@@ -478,14 +478,14 @@ export default {
}
}
if (!flag) {
resolve(false);
resolve({flag: false, msg: '即时奖励中阶梯奖励的不同阶梯的区间值之间不允许存在间隔'});
}
}
if(that.instanceAward.awardLimitType == 2 && !that.instanceAward.awardLimitNumber){
resolve(false);
resolve({flag: false, msg: '请完善即时奖励中即时奖励内容'});
}
if(that.instanceAward.awardLimitType == 3 && !that.instanceAward.awardLimitPoint){
resolve(false);
resolve({flag: false, msg: '请完善即时奖励中即时奖励内容'});
}
resolve(that.instanceAward);
} else {
......
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-18 10:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-16 09:46:12
* @LastEditTime: 2019-12-17 19:04:35
-->
<!--
<reward-config @submitBack="submitBack" @submitNext="submitNext"></reward-config>
......@@ -1409,31 +1409,35 @@ export default {
async singleCheck() {
const that = this;
const flag = that.basePath.map(ele => ele.transName).includes('消费') ? await that.$refs.singleConsume.submitForm() : true;
if (!flag) {
showMsg.showmsg('请完善消费行为控制', 'warning');
if (flag.hasOwnProperty('flag')&& !flag.flag) {
showMsg.showmsg(flag.msg, 'warning');
return false;
}
const spot = that.activeInfoData.instantAwardFlag == 1 ? await that.$refs.singleSpot.submitForm() : true;
if (!spot) {
showMsg.showmsg('请完善即时奖励配置', 'warning');
if (spot.hasOwnProperty('flag')&& !spot.flag) {
showMsg.showmsg(spot.msg, 'warning');
return false;
}
const entry = that.activeInfoData.passAwardFlag == 1 ? await that.$refs.singleEntry.submitForm() : true;
if (!entry) {
showMsg.showmsg('请完善闯关奖励配置', 'warning');
if (entry.hasOwnProperty('flag')&& !entry.flag) {
showMsg.showmsg(entry.msg, 'warning');
return false;
}
const competition = that.activeInfoData.competitionAwardFlag == 1 ? await that.$refs.singleCompetition.submitForm() : true;
if (!competition) {
showMsg.showmsg('请完善竞赛奖励配置', 'warning');
if (competition.hasOwnProperty('flag')&& !competition.flag) {
showMsg.showmsg(competition.msg, 'warning');
return false;
}
const invitee = await that.$refs.singleInvitee.submitForm();
if (!invitee) {
showMsg.showmsg('请完善受邀人奖励配置', 'warning');
if (invitee.hasOwnProperty('flag')&& !invitee.flag) {
showMsg.showmsg(invitee.msg, 'warning');
return false;
}
const freeze = that.basePath.map(ele => ele.transName).includes('消费') ? await that.$refs.singleFreeze.submitForm() : true;
if (freeze.hasOwnProperty('flag')&& !freeze.flag) {
showMsg.showmsg(freeze.msg, 'warning');
return false;
}
console.log('单次数据', that.activeInfoData);
const names = that.basePath.map(ele => ele.transName);
that.activeInfoData.stepType = that.stepObj[names[names.length - 1]];
......@@ -1601,8 +1605,8 @@ export default {
}
}
}
if (!flag) {
showMsg.showmsg('请完善消费行为控制', 'warning');
if (flag.hasOwnProperty('flag')&& !flag.flag) {
showMsg.showmsg(flag.msg, 'warning');
return false;
}
let spot = true;
......@@ -1615,8 +1619,8 @@ export default {
}
}
}
if (!spot) {
showMsg.showmsg('请完善即时奖励配置', 'warning');
if (spot.hasOwnProperty('flag')&& !spot.flag) {
showMsg.showmsg(spot.msg, 'warning');
return false;
}
let entry = true;
......@@ -1628,8 +1632,8 @@ export default {
}
}
}
if (!entry) {
showMsg.showmsg('请完善闯关奖励配置', 'warning');
if (entry.hasOwnProperty('flag')&& !entry.flag) {
showMsg.showmsg(entry.msg, 'warning');
return false;
}
let competition = true;
......@@ -1641,8 +1645,8 @@ export default {
}
}
}
if (!competition) {
showMsg.showmsg('请完善竞赛奖励配置', 'warning');
if (competition.hasOwnProperty('flag')&& !competition.flag) {
showMsg.showmsg(competition.msg, 'warning');
return false;
}
let invitee = true;
......@@ -1654,8 +1658,8 @@ export default {
}
}
}
if (!invitee) {
showMsg.showmsg('请完善受邀人奖励配置', 'warning');
if (invitee.hasOwnProperty('flag')&& !invitee.flag) {
showMsg.showmsg(invitee.msg, 'warning');
return false;
}
let freeze = true;
......@@ -1667,6 +1671,10 @@ export default {
}
}
}
if (freeze.hasOwnProperty('flag')&& !freeze.flag) {
showMsg.showmsg(freeze.msg, 'warning');
return false;
}
// true--->1; false--->0
that.ProgressiveData.forEach(ele => {
if (ele.hasOwnProperty('invitedAward')) {
......
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-13 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-12 10:29:35
* @LastEditTime: 2019-12-17 19:06:43
-->
<!--
<in-progress-active></in-progress-active>
......@@ -13,28 +13,65 @@ import inProgressActive from '@/components/active/in-progress-active.vue';
-->
<template>
<div>
<div v-if="inProgressData.length">
<div class="separator-space">- 当前有计划中的活动,无法创建新的活动 -</div>
<div class="in-progress-active border-box">
<ul>
<template v-for="(item, index) in inProgressData">
<li :class="['border-box', selectItem == item.activityId && index != 0 ? 'li-border' : '']" :key="index + 'data'">
<div class="in-progress-active-title flex flex-space-between border-box" @click.stop.prevent="selectLi(item)">
<li
:class="['border-box', selectItem == item.activityId && index != 0 ? 'li-border' : '']"
:key="index + 'data'"
>
<div
class="in-progress-active-title flex flex-space-between border-box"
@click.stop.prevent="selectLi(item)"
>
<div class="active-title-left">
<div class="active-title-name font-18 color-303133 font-w-700">{{ item.activityName }} <el-tag v-if="item.status == 2" type="danger">待完善</el-tag></div>
<div class="active-title-name font-18 color-303133 font-w-700">{{ item.activityName }} <el-tag
v-if="item.status == 2"
type="danger"
>待完善</el-tag>
</div>
<div class="active-title-date font-14 color-909399 m-t-7">{{ item.startDate | formatTimeYmdHms }} - {{ item.endDate | formatTimeYmdHms }}</div>
</div>
<div class="active-title-right">
<el-button type="primary" plain @click.stop="toEdit(index, item)">活动配置</el-button>
<el-button data-clipboard-action="copy" :data-clipboard-text="item.activityUrl" class="copy-tag" type="primary" plain @click.stop="handleCopy(index, item)">复制路径</el-button>
<el-button
type="primary"
plain
@click.stop="toEdit(index, item)"
>活动配置</el-button>
<el-button
data-clipboard-action="copy"
:data-clipboard-text="item.activityUrl"
class="copy-tag"
type="primary"
plain
@click.stop="handleCopy(index, item)"
>复制路径</el-button>
<!-- -->
<el-button type="primary" plain @click.stop="toDataList(index, item)">数据明细</el-button>
<el-button v-if="item.status == 2" type="primary" plain @click="toDelList(index, item)">删除</el-button>
<el-button
type="primary"
plain
@click.stop="toDataList(index, item)"
>数据明细</el-button>
<el-button
v-if="item.status == 2"
type="primary"
plain
@click="toDelList(index, item)"
>删除</el-button>
</div>
</div>
<div v-if="selectItem == item.activityId" class="in-progress-active-body">
<out-date-active :barChartData="barChartData" :funnelData="funnelData" :activityId="item.activityId"></out-date-active>
<div
v-if="selectItem == item.activityId"
class="in-progress-active-body"
>
<out-date-active
:barChartData="barChartData"
:funnelData="funnelData"
:activityId="item.activityId"
></out-date-active>
</div>
</li>
</template>
......
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