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

src/views/activityManage/components/markeractivityWord.vue

@@ -415,10 +415,12 @@
               uid:this.$store.state.userInfo.userid,
               pid:this.wordData['associatedProjects'],
             }).then(result=>{
-              console.log(result);
+              // console.log(result);
               let data = result['data'][1]
               let total = Number(result['data'][0][0]['fund']);
               this.wordData['college'] = result['data'][0][0]['classid'];
+              console.log("====================")
+              console.log(this.wordData)
               this.wordData['tel'] = result['data'][0][0]['phone'];
               this.wordData['pro_leader'] = result['data'][0][0]['pro_leader'];
               let isUse = 0;

src/views/projectManage/components/FundDetail.vue

@@ -120,6 +120,7 @@ computed:{
 },
 mounted(){
   this.getData()
+  console.log(111);
 }
 }
 </script>