fix； 积分有效期

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">
@@ -1010,6 +1010,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

@@ -1073,6 +1073,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 +1530,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(',') : '';