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

src/views/projectApply/projectApplicationApply.vue

@@ -91,6 +91,28 @@
               </div>
               <!-- 活动申请填写信息区域结束 -->
 
+          <!-- 项目封面上传开始 -->
+          <div style="position: relative;">
+              <div id="two" class="tabTit">
+                <div id="face"><p>封面上传</p></div>
+                <!-- <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传封面</el-button> -->
+              </div>
+              <hr>
+              <el-upload
+                class="upload-demo"
+                action="https://jsonplaceholder.typicode.com/posts/"
+                :on-preview="handlePreview"
+                :on-remove="handleRemove"
+                :file-list="fileList"
+                style="width: 40%;margin-top: -25px;"
+                list-type="picture">
+                <el-button size="small" style="position: absolute;top: -8px;right: 0;width: 100px;box-sizing: border-box;padding: 9px 0;font-size: 16px;background-color: #0e72e6;border-radius:5px" type="primary">上传封面</el-button>
+                <!-- <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div> -->
+              </el-upload>
+            </div>
+
+          <!-- 项目封面上传开始结束 -->
+
 
 
             <!-- <div> -->
@@ -271,8 +293,7 @@
       props:["data","next",'back','addPerson','amend'],
       data() {
         return {
-          telVerify:'',
-          input:"",
+          fileList: [{name: 'food2.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}],
           addMemberDialog:false,
           amendMemberDialog:false,
           delMember:false,
@@ -281,7 +302,15 @@
       },
       
       methods:{
-
+        submitUpload() {
+          this.$refs.upload.submit();
+        },
+        handleRemove(file, fileList) {
+          console.log(file, fileList);
+        },
+        handlePreview(file) {
+          console.log(file);
+        },
         getText(value) {     //电话验证
           // console.log(value);
           // let text = document.getElementById(inputId).value; //获取输入框的ID 存放到text变量中

src/views/projectManage/ProjectManagementFund1.vue

@@ -21,11 +21,11 @@
                 <el-input v-model="input" placeholder="请输入内容"></el-input><span>(万)</span>
             </div>
             <div class="totalFund1">
-                <div class="totalFundLabel">已经支出</div>
+                <div class="totalFundLabel" style="display: flex;justify-content: flex-end;">已经支出</div>
                 <el-input v-model="input" placeholder="请输入内容"></el-input><span>(万)</span>
             </div>
             <div class="totalFund1">
-                <div class="totalFundLabel">剩余</div>
+                <div class="totalFundLabel" style="display: flex;justify-content: flex-end;">剩余</div>
                 <el-input v-model="input" placeholder="请输入内容"></el-input><span>(万)</span>
             </div>
           </div>

src/views/projectManage/ProjectManagementFund2.vue

@@ -4,7 +4,7 @@
       <div class="right">
         <div class="vfpHeader">
             <div class="titleOne">预算经费</div>
-            <el-button type="primary" @click="back">返回</el-button>
+            <el-button type="primary" @click="$router.back()">返回</el-button>
         </div>
           <hr>
          <!-- 跳转导航开始 -->