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

src/views/home.vue

@@ -32,7 +32,7 @@
             {id:1,label:"项目立项申请",goto:"/projectApplication",icon:"iconfont icon-shuben"},
             {id:2,label:"活动管理",goto:"/makerActvity",icon:"el-icon-wind-power"},
             {id:3,label:"资金使用管理",goto:"/makerfund",icon:"iconfont icon-zijinguanli"},
-            {id:4,label:"项目管理",goto:"/ProjectManagement",icon:"iconfont icon-project_management"},
+            {id:4,label:"项目管理",goto:"/ProjectManagement",icon:"el-icon-receiving"},
             {id:5,label:"项目结项",goto:"/projectSettlement",icon:"iconfont icon-_yuanhuanchong"},
             {id:6,label:"学分登记",goto:"/credit",icon:"iconfont icon-yonghu"},
             {id:7,label:"成果展示",goto:"/resultsShow",icon:"iconfont icon-xiangmuguanli2"},
@@ -96,7 +96,7 @@
                   i{
                     position: relative;
                     top: 1px;
-                    font-size: 16px;
+                    font-size: 17px;
                     margin-right: 3px;
                   }
                 }
@@ -109,7 +109,7 @@
               // overflow: hidden ;
               margin-left: 20px;
               box-sizing: border-box;
-              padding: 30px;
+              padding: 20px 30px;
               border-radius: 5px;
             }
         }

src/views/projectApply/projectApplicationApply2.vue

@@ -132,7 +132,6 @@
     }
     .editor{
       width: 100%;
-      min-width: 700px;
       box-sizing: border-box;
       padding: 15px 0px 10px 0px;
     }