fix: jifen

src/view/companyGroup/membershipSystem/addPointSystem.vue

@@ -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;
             }
           }
         })

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;
             }
           }
         })