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

src/view/companyGroup/membershipSystem/addPointSystem.vue

@@ -242,7 +242,7 @@
                 <el-input v-model="ruleForm.integralGetFreezeDays" @keyup.native="formatInputNum($event)" style="width: 115px"></el-input><label>天</label>
                 <span class="setting-tips">仅对通过订单获取的积分生效，活动类获取的积分没有冻结期</span>
               </el-form-item>
-              <el-form-item label="积分有效期：" prop="userGeneralIntegralExpireRule">
+              <el-form-item label="积分有效期：" prop="userGeneralIntegralExpireRule" class="eff">
                <el-radio  v-model="ruleForm.userGeneralIntegralExpireRule" :label="1">通用积分策略有效期</el-radio>
                 <el-radio v-model="ruleForm.userGeneralIntegralExpireRule"  :label="0">自定义有效期
                   <el-tooltip placement="right" effect="light">
@@ -617,7 +617,7 @@ export default {
 
       ruleForm: {
         userGeneralIntegralExpireRule: 1,
-        integralExpireType: '0', //积分有效期类型 0 未默认滚动到期 1永久 2 按年失效 3按月失效
+        integralExpireType: '', //积分有效期类型 0 未默认滚动到期 1永久 2 按年失效 3按月失效
         integralExpireRule: '', //积分有效期规则 年 x(年),x(月),x(日，为0标识月末)  月,x(月),x(日，为0标识月末)
         // 积分获取规则
         integralStrategyId: '', //策略id
@@ -800,8 +800,9 @@ export default {
       postRequest('/api-admin/get-member-integral-setting',{requestProject: that.projectName})
         .then((res) => {
           var resData = res.data
+          console.log(resData.result,'resData');
           if(resData.errorCode == 0) {
-            this.timeType = resData.result.memberIntegral.integralExpireType;
+            this.timeType = resData.result.memberIntegral.integralExpireType ? resData.result.memberIntegral.integralExpireType : '';
             this.timeRuleType = resData.result.memberIntegral.integralExpireRule ? resData.result.memberIntegral.integralExpireRule.split(',') : '';
             if(this.timeType ==2) {
               this.yearYT = Number(this.timeRuleType[0])
@@ -811,7 +812,7 @@ export default {
               this.mouthMT = Number(this.timeRuleType[0])
               this.mouthDT = this.timeRuleType[1]
             } else if (this.timeType == 0 || this.timeType == null) {
-              this.effectiveDays = resData.result.memberIntegral.integralGetEffectiveDays;
+              this.effectiveDays = resData.result.memberIntegral.effectiveTime;
             }
           }
         })
@@ -1010,6 +1011,14 @@ export default {
                 showMsg.showmsg('请完善积分有效期信息','error')
                 return;
               }
+            } else if (data.userGeneralIntegralExpireRule == 1) {
+              console.log(11111, data.integralExpireType);
+              if(this.timeType == -1) {
+                console.log(222);
+                this.scrollToError(this, 'eff');
+                showMsg.showmsg('请设置积分有效期','error')
+                return;
+              }
             }
             that.checkListValue(data).then(res => {
               if (!res.flag) {

src/view/companyGroup/membershipSystem/editPointSystem.vue

@@ -823,7 +823,7 @@ export default {
 
       ruleForm: {
         userGeneralIntegralExpireRule: 1,
-        integralExpireType: '1', //积分有效期类型 0 未默认滚动到期 1永久 2 按年失效 3按月失效
+        integralExpireType: '', //积分有效期类型 0 未默认滚动到期 1永久 2 按年失效 3按月失效
         integralExpireRule: '', //积分有效期规则 年 x(年),x(月),x(日，为0标识月末)  月,x(月),x(日，为0标识月末)
         // 积分获取规则
         integralStrategyId: 'ff80808163a7a09b0163b01171e202db', //策略id
@@ -894,7 +894,8 @@ export default {
         .then((res) => {
           var resData = res.data
           if(resData.errorCode == 0) {
-            this.timeType = resData.result.memberIntegral.integralExpireType;
+            if(!resData.result.memberIntegral) return;
+            this.timeType = resData.result.memberIntegral.integralExpireType ? resData.result.memberIntegral.integralExpireType : '';
             this.timeRuleType = resData.result.memberIntegral.integralExpireRule.split(',');
             if(this.timeType ==2) {
               this.yearYT = Number(this.timeRuleType[0])
@@ -904,7 +905,7 @@ export default {
               this.mouthMT = Number(this.timeRuleType[0])
               this.mouthDT = this.timeRuleType[1]
             } else if (this.timeType == 0 || this.timeType == null) {
-              this.effectiveDays = resData.result.memberIntegral.integralGetEffectiveDays;
+              this.effectiveDays = resData.result.memberIntegral.effectiveTime;
             }
           }
         })
@@ -1073,6 +1074,7 @@ export default {
               showMsg.showmsg('请设置积分有效期', 'error');
               return;
             }
+
             if (data.userGeneralIntegralExpireRule == 0) {
               if(data.integralExpireType ==3 && (this.mouthM == '' || this.mouthD == '')) {
                 this.scrollToError(this, 'mouthM');
@@ -1529,6 +1531,7 @@ export default {
             // 当有效期类型为null时判断有效期天数是否为null 不为null 有效期类型为0  为null 无选中状态
             if(that.ruleForm.integralExpireType==null) {
               this.ruleForm.integralExpireType = 0;
+              this.ruleForm.userGeneralIntegralExpireRule = 0;
             }
             // 积分有效期
             that.ruleForm.integralExpireRule = that.ruleForm.integralExpireRule ? that.ruleForm.integralExpireRule.split(',') : '';