Merge remote-tracking branch 'origin/yingdi2.0' into yingdi2.0

# Conflicts:
#	src/config/server.js

src/request/index/network.js

@@ -16,7 +16,7 @@ import {
 import router from '@/router'
 
 const instance = axios.create({
-  baseURL: DEVELOPMENT_SERVER_URL,
+  baseURL: SERVER_URL,
   timeout: 60000,
   method: "post",
   headers: {

src/request/network.js

@@ -16,7 +16,7 @@ import {
 import router from '@/router'
 
 const instance = axios.create({
-  baseURL: DEVELOPMENT_SERVER_URL,
+  baseURL: SERVER_URL,
   timeout: 60000,
   method: "post",
   headers: {

src/views/base/home/Home.vue

@@ -274,7 +274,7 @@
         }
 
         .tag {
-          font-size: 16px;
+          font-size: 14px;
           display: flex;
           background-color: #D7D7D7;
           padding: 0 9px;
@@ -284,7 +284,7 @@
 
         .item_name {
           line-height: 40px;
-          font-size: 18px;
+          font-size: 15px;
           display: flex;
           align-items: flex-end;
           margin-left: 15px;

src/views/index/camp/Index.vue

@@ -132,7 +132,6 @@
             url: svg3,
           },
         ],
-
         campindex_type: 0,
         index_status: "",
         // homework_val: "",

src/views/index/recruit/Index.vue

@@ -19,7 +19,7 @@
         <!--        </div>-->
         <div class="active-area">
           <div class="left-area card-box">
-            <ul v-if="anchorList.length>0">
+            <ul class="left" v-if="anchorList.length>0">
               <li :key="index" v-for="(item,index) in anchorList">
                 <a @click="anchorSkip(item.id)">{{item.name}}</a>
               </li>
@@ -36,7 +36,6 @@
             </div>
           </div>
         </div>
-
       </div>
       <Footer></Footer>
     </el-container>
@@ -243,9 +242,10 @@
     .left-area {
       flex: 1;
       min-width: 200px;
-
+      background-color: #ffffff;
+      border-radius: 8px;
       ul {
-        padding: 20px 10px;
+        padding: 20px ;
       }
 
       li {
@@ -256,7 +256,7 @@
           text-decoration: none;
           color: #333333;
           width: 100%;
-          font-size: 18px;
+          font-size: 15px;
           /*height: 44px;*/
           line-height: 44px;
           margin: 10px 0;
@@ -279,7 +279,9 @@
     .center-area {
       flex: 4;
       margin: 0 20px;
-
+      width: calc(100% - 100px);
+      border-radius: 8px;
+      background-color: #ffffff;
       .center-area-title {
         text-align: center;
         font-size: 22px;