Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/pages/activity/activeDetail.vue

@@ -85,6 +85,7 @@ import DetailItem from "../../components/activity/activeDetail-item"
      mounted(){
           if(this.$route.query.Id){
             this.msg.Id=this.$route.query.Id
+            this.getDetail()
           }
       },
     methods: {
@@ -116,37 +117,38 @@ import DetailItem from "../../components/activity/activeDetail-item"
          this.ActivityTitle.splice(index,1)
       },
       getItemData(val,index){
-        console.log('119', val,index)
         this.msg.ActivityTitle[index]=val
       },
       //保存信息
       save() {
-        // this.$refs.child[0].ruleVerification();
         this.msg.ActivityTitle=this.ActivityTitle
-        this.$refs.child.forEach(x=>{
+        this.$refs.child.map(x=>{
           x.ruleVerification();
         })
-        // this.$refs.Name.validate();
-        // this.$refs.StartTime.validate();
-        // this.$refs.EndTime.validate();
-        // this.$refs.SignStartTime.validate();
-        // this.$refs.SignEndTime.validate();
-        // if (!this.$refs.Name.hasError &&
-        //   !this.$refs.StartTime.hasError &&
-        //   !this.$refs.EndTime.hasError &&
-        //   !this.$refs.SignStartTime.hasError &&
-        //   !this.$refs.SignEndTime.hasError) {
+        let res= this.$refs.child.every(x=>{
+           return x.ruleVerification();
+        })
 
-          // this.apipostDS("/api/Education/GetSetActivityPlan", this.msg, (res) => {
-          //   console.log(136,res)
-          //   if (res.data.resultCode === 1) {
-          //     this.Success(res.data.message);
-          //   } else {
-          //     this.Error(res.data.message);
-          //   }
-          // })
-        // }
+       console.log('res', res)
+        if(res){
+           this.apipostDS("/api/Education/GetSetActivityPlan", this.msg, (res) => {
+            console.log(136,res)
+            if (res.data.resultCode === 1) {
+              this.Success(res.data.message);
+            } else {
+              this.Error(res.data.message);
+            }
+          })
+        } 
       },
+        getDetail(){
+        this.apipostDS("/api/Education/GetActivity", {Id:this.msg.Id}, (res) => {
+            if (res.data.resultCode === 1) {
+              this.ActivityTitle=res.data.data.ActivityTitleList
+              console.log(152,res.data.data.ActivityTitleList)
+            } 
+          })
+      }
     }
   }