Merge branch 'feature/游戏营销' into test

src/views/game/cmh/rule-config.vue

@@ -406,6 +406,16 @@ export default {
       this.$refs.ruleForm.clearValidate(name);
     },
     validateData() {
+      this.$refs.ruleForm.validate(val => {
+        this.boolVal = val;
+        if (!val) {
+          this.scrollToError(this);
+        }
+      });
+      if (!this.boolVal) {
+        this.$message.error('请确认规则设置的必填字段都已填写且通过校验');
+        return false;
+      }
       if (this.ruleForm.memberType == 0 && this.toggleTag && !this.ruleForm.filterJsonView) {
         this.$message.error('人群筛选未保存条件');
         return false;
@@ -422,16 +432,7 @@ export default {
           return false;
         }
       }
-      this.$refs.ruleForm.validate(val => {
-        this.boolVal = val;
-        if (!val) {
-          this.scrollToError(this);
-        }
-      });
-      if (!this.boolVal) {
-        this.$message.error('请确认规则设置的必填字段都已填写且通过校验');
-        return false;
-      }
+
       return true;
     },
     nextStep(noNext) {