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

src/App.vue

@@ -264,7 +264,7 @@
       cursor: pointer;
       font-weight: 550;
       font-size: 18px;
-      margin-right: 20px;
+      margin-right: 30px;
       position: relative;
     }
     .AppBarActive::after{

src/views/makerActvity.vue

@@ -149,9 +149,7 @@
       <el-dialog
           title="活动审核"
           :visible.sync="auditDialog"
-          :modal="false"
           class="dialogWidth"
-          :close-on-click-modal="true"
           :before-close="init">
         
           <div class="diaTit">
@@ -182,8 +180,8 @@
               </div>
             </div>
             <div slot="footer" class="dialog-footer">
-              <el-button @click="commit" class="diaBtn" style="background: #0e72e6;color: #fff;" size="small">确认提交</el-button>
-              <el-button @click="init" class="diaBtn" style="background: #cccccc;color: #000;" size="small">取消</el-button>
+              <el-button type="primary" @click="commit" class="diaBtn">确认提交</el-button>
+              <el-button @click="init" class="diaBtn">取消</el-button>
             </div>
       </el-dialog>
       <!-- 活动审核对话框结束 -->
@@ -192,10 +190,8 @@
       <el-dialog
           title="驳回提交"
           :visible.sync="rejectDialog"
-          :modal="false"
           class="dialogWidth"
           width="700px"
-          :close-on-click-modal="true"
           :before-close="init">
         
           <div class="diaTit">
@@ -232,6 +228,7 @@
                 <el-input
                   type="textarea"
                   :rows="4"
+                  style="width:200px"
                   resize="none"
                   placeholder="请输入内容"
                   v-model="textarea">
@@ -241,8 +238,8 @@
 
 
             <div slot="footer" class="dialog-footer">
-              <el-button @click="commit2" class="diaBtn" style="background: #0e72e6;color: #fff;" size="small">确认提交</el-button>
-              <el-button @click="init" class="diaBtn" style="background: #cccccc;color: #000;" size="small">取消</el-button>
+              <el-button type="primary" @click="commit2" class="diaBtn">确认提交</el-button>
+              <el-button @click="init" class="diaBtn">取消</el-button>
             </div>
       </el-dialog>
       <!-- 驳回提交对话框结束 -->
@@ -377,7 +374,7 @@
         width: 300px;
       }
       .el-textarea__inner{
-        width: 480px;
+        width: 380px;
       }
       .el-dialog{
           width: 600px;
@@ -385,7 +382,7 @@
           overflow: hidden;
         }
         .el-dialog__body{
-          padding:30px 35px ;
+          padding:30px 0px 30px 90px ;
         }
         
         .el-dialog__header{
@@ -448,9 +445,6 @@
             display: flex;
             justify-content: center;
             .diaBtn{
-              width: 180px;
-              height: 35px;
-              line-height: 5px;
               font-size: 16px;
             }
         }

src/views/makerfund.vue

@@ -249,8 +249,8 @@
         </div>
 
         <div slot="footer" class="dialog-footer">
-          <el-button @click="init" class="diaBtn" style="background: #0e72e6;color: #fff;" size="small">审核通过</el-button>
-          <el-button @click="init" class="diaBtn" style="background: #cccccc;color: #000;" size="small">取消</el-button>
+          <el-button type="primary" @click="init" class="diaBtn">审核通过</el-button>
+          <el-button @click="init" class="diaBtn">取消</el-button>
         </div>
       </el-dialog>
     </div>
@@ -364,8 +364,8 @@
           </el-input>
         </div>
         <div slot="footer" class="dialog-footer">
-          <el-button @click="init" class="diaBtn" style="background: #0e72e6;color: #fff;" size="small">审核通过</el-button>
-          <el-button @click="init" class="diaBtn" style="background: #cccccc;color: #000;" size="small">取消</el-button>
+          <el-button type="primary" @click="init" class="diaBtn">审核通过</el-button>
+          <el-button @click="init" class="diaBtn">取消</el-button>
         </div>
       </el-dialog>
     </div>
@@ -473,9 +473,10 @@
       color: #fff;
     }
     .diaBtn{     //dialog按钮
-      width: 150px;
-      height: 40px;
-      font-size: 14px;
+      font-size: 16px;
+    }
+    .el-dialog__body{
+          padding:30px 0px 30px 50px ;
     }
     .diaTit{
       width: 100%;

src/views/projectApplication.vue

@@ -160,9 +160,7 @@
       <el-dialog
         title="立项撤回提交"
         :visible.sync="dialogVisible1"
-        :modal="true"
         width="700px"
-        :close-on-click-modal="true"
         class="dialogWidth"
         :before-close="init">
         <div class="diaTit">
@@ -206,8 +204,8 @@
             </div>
           </div>
           <div slot="footer" class="dialog-footer">
-            <el-button @click="commit2" class="diaBtn" style="background: #0e72e6;color: #fff;" size="small">确认提交</el-button>
-            <el-button @click="init" class="diaBtn" style="background: #cccccc;color: #000;" size="small">取消</el-button>
+            <el-button type="primary" @click="commit2" class="diaBtn" >确认提交</el-button>
+            <el-button @click="init" class="diaBtn">取消</el-button>
           </div>
       </el-dialog>
 <!-- 立项撤回对话框开始 -->
@@ -216,9 +214,7 @@
       <el-dialog
           title="立项审核"
           :visible.sync="dialogVisible"
-          :modal="true"
           class="dialogWidth"
-          :close-on-click-modal="true"
           :before-close="init">
         
           <div class="diaTit">
@@ -249,8 +245,8 @@
               </div>
             </div>
             <div slot="footer" class="dialog-footer">
-              <el-button @click="commit" class="diaBtn" style="background: #0e72e6;color: #fff;" size="small">确认提交</el-button>
-              <el-button @click="init" class="diaBtn" style="background: #cccccc;color: #000;" size="small">取消</el-button>
+              <el-button type="primary" @click="commit" class="diaBtn" >确认提交</el-button>
+              <el-button @click="init" class="diaBtn">取消</el-button>
             </div>
       </el-dialog>
 <!-- 立项审核对话框结束 -->
@@ -386,7 +382,7 @@
           overflow: hidden;
         }
         .el-dialog__body{
-          padding:30px 35px ;
+          padding:30px 0px 30px 90px ;
         }
         
         .el-dialog__header{
@@ -445,10 +441,11 @@
             width: 100%;
             display: flex;
             justify-content: center;
+            margin-bottom: 10px;
             .diaBtn{
-              width: 180px;
-              height: 35px;
-              line-height: 5px;
+              // width: 180px;
+              // height: 35px;
+              // line-height: 5px;
               font-size: 16px;
             }
         }

src/views/resultShowDetail.vue

@@ -550,14 +550,15 @@
         margin-top: 20px;
         border-radius: 5px;
         display: flex;
+        justify-content: space-around;
         .navLi{
             // width: 150px;
             height: 100%;
             display: flex;
-            justify-content: center;
+            justify-content: flex-start;
             align-items: center;
             font-size: 18px;
-            margin-left: 20px;
+            // margin-left: 20px;
             cursor: pointer;
         }
         .navLi:hover span{