Commit 82c76572 by huaying

Merge branch 'feature/7月-会员积分'

parents 6b8117c0 46187a44
......@@ -1047,6 +1047,7 @@ export default {
if (valid) {
// 处理数据
let data = JSON.parse(JSON.stringify(that.ruleForm));
console.log(data, 'data');
delete data.selectorParamsId;
if (!data.strategyName) {
showMsg.showmsg('请填写策略名称', 'error');
......@@ -1090,6 +1091,28 @@ export default {
return;
}
}
if(data.userGeneralIntegralExpireRule == 1) {
data.integralExpireType = this.timeType
data.integralExpireRule = this.timeRuleType.toString()
if(this.timeType==0 || this.timeType == null){
data.integralGetEffectiveDays = this.effectiveDays
}else {
data.integralExpireRule = this.timeRuleType.toString()
}
}else if (data.userGeneralIntegralExpireRule == 0) {
if(data.integralExpireType == 0) {
data.integralExpireRule = ''
}else if(data.integralExpireType == 1) {
data.integralExpireRule = ''
data.integralGetEffectiveDays = ''
} else if(data.integralExpireType == 2) {
data.integralExpireRule = `${this.yearY},${this.yearM},${this.yearD}`
data.integralGetEffectiveDays = ''
}else if(data.integralExpireType == 3) {
data.integralExpireRule = `${this.mouthM},${this.mouthD}`
data.integralGetEffectiveDays = ''
}
}
that.checkListValue(data).then(res => {
if (!res.flag) {
showMsg.showmsg(res.text, 'error');
......@@ -1145,27 +1168,7 @@ export default {
data.endValidTime = data.perpetualDate[1];
}
delete data.perpetualDate;
if(data.userGeneralIntegralExpireRule == 1) {
data.integralExpireType = this.timeType
if(this.timeType==0 || this.timeType == null){
data.integralGetEffectiveDays = this.effectiveDays
}else {
data.integralExpireRule = this.timeRuleType.toString()
}
}else if (data.userGeneralIntegralExpireRule == 0) {
if(data.integralExpireType == 0) {
data.integralExpireRule = ''
}else if(data.integralExpireType == 1) {
data.integralExpireRule = ''
data.integralGetEffectiveDays = ''
} else if(data.integralExpireType == 2) {
data.integralExpireRule = `${this.yearY},${this.yearM},${this.yearD}`
data.integralGetEffectiveDays = ''
}else if(data.integralExpireType == 3) {
data.integralExpireRule = `${this.mouthM},${this.mouthD}`
data.integralGetEffectiveDays = ''
}
}
that.saveForm(data);
}
});
......
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