Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/ssti-CollegeManage

src/views/activityManage/makerActvity.vue

@@ -3,7 +3,7 @@
   <div class="makerActvity" v-loading="loading">
     <div class="pAHeader">
       <div class="pAHeader1">创客活动</div>
-      <el-button @click="makerActvityApply">创客活动申请</el-button>
+      <!-- <el-button @click="makerActvityApply">创客活动申请</el-button> -->
     </div>
     <hr>
 

src/views/projectApply/components/MakerSpaceWordDetail.vue

@@ -112,7 +112,7 @@
                 getMakerSpaceWord(this.wordData)
             },
             changeWord(){//修改表格数据
-                this.$message.info("修改表格数据")
+                this.loading = true;
                 let pram = {
                   uid:this.$store.state.userInfo.userid,//用户ID
                   pid:this.$route.query['pid'],
@@ -134,15 +134,23 @@
                       Transforming:this.wordData['Transforming'],//学生创客团队孵化、转化创业项目情况
                       condition:this.wordData['condition'],//立 项基 础及条 件
                   }),//项目详细
-                //   tid:"5f7a66d5-c206-11ed-a4cd-509a4c5b67cf",//特色创客空间建设项目分类ID
                   tName:this.wordData['state'],//项目状态
                   mon:JSON.stringify(this.wordData['fund']),//预算经费
                   planEnd:this.wordData['plannedEnd_at'],//计划完成时间,
                   beh:this.wordData['begin_at'],//项目开始时间,
-                //   apply:this.wordData['applicationDate'],//申请日期
                 }
-                // this.ajax.post(this.$store.state.api+"/updateMakerSpaceWordData",pram).then(result)
-                console.log(pram);
+                this.ajax.post(this.$store.state.api+"/updateMakerSpaceWordData",pram).then(result=>{
+                    console.log(result)
+                    if(result['data']==1){
+                        this.$message.success("修改项目信息成功")
+                        this.submitHint = false;
+                    }else{
+                        this.$message.error("修改项目信息失败")
+                    }
+                    this.getData();
+                }).catch(err=>{
+                    console.log(err)
+                })
             },
             test(){//项目提交
               //检查各个字段