Merge branch '11/24SAAS' of http://git.dayaedu.com/yonge/dy-admin-manager into 11/24SAAS

src/views/resetTeaming/modals/member-setting.vue

@@ -36,7 +36,7 @@
     </el-form-item>
 
     <el-form-item
-       v-if="isUserType && radio"
+      v-if="isUserType && radio"
       label="会员周期"
       prop="num"
       :rules="[
@@ -60,7 +60,7 @@
       />
     </el-form-item>
     <el-form-item
-       v-if="isUserType && radio"
+      v-if="isUserType && radio"
       label="周期单位"
       prop="period"
       :rules="[
@@ -75,7 +75,7 @@
         style="width: 223px !important"
         v-model="form.period"
         @change="changeMemberperiodEnum"
-        :disabled="!form.memberRankSettingId"
+        :disabled="!form.memberRankSettingId || !form.num"
       >
         <el-option
           :label="item.label"
@@ -184,7 +184,7 @@ export default {
     } catch (e) {
       console.log(e);
     }
-    this.getMemberRules()
+    this.getMemberRules();
     // this.$set(this.form, "memberValidDate", 6);
   },
   beforeDestroy() {
@@ -215,6 +215,12 @@ export default {
       }
     },
     changeMemberperiodEnum(val) {
+      if (!this.form.num) {
+        this.$set(this.form, "memberPaymentAmount", null);
+        this.$set(this.form, "originalMemberPaymentAmount", null);
+        this.$set(this.form, "period", null);
+        return;
+      }
       if (val == "DAY") {
         this.$set(
           this.form,
@@ -399,8 +405,8 @@ export default {
         this.$set(this.form, "originalMemberPaymentAmount", null);
         this.$set(this.form, "num", null);
         this.$set(this.form, "period", null);
-      }else{
-        this.changeMember(val)
+      } else {
+        this.changeMember(val);
       }
     },
   },

src/views/teamDetail/components/modals/create-user-pay.vue

@@ -370,6 +370,8 @@ export default {
           });
           this.eclass = [..._];
           this.syncAllMoney();
+        }else{
+          this.eclass = [];
         }
       } catch (error) {
         console.log(error);