Merge remote-tracking branch 'origin/dev-circle-nine-20201231' into dev-circle-nine-20201231

src/components/activitymanagement/baseinfo.vue

@@ -480,8 +480,49 @@
 
         })
       },
+      checkName(){
+        if(vm.formData.appModuleDto.linkType == 4 && vm.formData.appModuleDto.name == ""){
+          vm.$message.error("请选择模块！");
+          return false;
+        }
+        else {
+          return true;
+        }
+      },
+
+      checkParamList(){
+        if(vm.formData.appModuleDto.linkType == 4
+          && vm.formData.appModuleDto.name != ""
+          && vm.formData.appModuleDto.paramFlag == 1){
+
+          if(vm.formData.appModuleDto.paramList.length == 0){
+            vm.$message.error("请选择参数！");
+            return false;
+          }
+          else {
+            for(let i = 0; i < vm.formData.appModuleDto.paramList.length; i++){
+              if(vm.formData.appModuleDto.paramList[i].value == ""){
+                vm.$message.error("请选择参数！");
+                return false;
+              }
+            }
+
+          }
+          return true;
+
+        }
+        else {
+          return true;
+        }
+      },
       //表单校验
       submitForm() {
+        if(!vm.checkName()){
+            return;
+          }
+          if(!vm.checkParamList()){
+            return;
+          }
         let formName = "formData";
         let flag = null;
         if (!this.formData.listImage){

src/views/activitymanagement/create-activity.vue

@@ -60,7 +60,7 @@
             paramList2: [],
             type: 0 // 类型:1 列表页，4 详情页
           },
-          auditFlag:0,
+          auditFlag:2,
           listImage: '',//活动列表页图片
           introImage:'',//介绍页图片url
           imgUrl1More: {},