Merge branch 'master' of http://git.cc-lotus.info/service-platform/web-test into master

src/layout/live/head.vue

@@ -6,7 +6,7 @@
       </div>
       <div class="supertop">
         <div class="w_1200">
-          <el-col :span="12" class="left">
+          <!-- <el-col :span="12" class="left">
             <span>欢迎来到中科在线</span>
             <span @click="guanzhu()">关注公众号</span>
           </el-col>
@@ -47,6 +47,13 @@
                 <el-button type="primary" size="mini" class="loginBtn" @click="adminLogin">管理登录</el-button>
               </span>
             </el-col>
+          </el-col> -->
+          <el-col :span="12" class="left">
+            <span>欢迎来到中科在线</span>
+            <span @click="guanzhu()">关注公众号</span>
+          </el-col>
+          <el-col :span="12" class="right">
+            右侧
           </el-col>
         </div>
       </div>
@@ -214,41 +221,41 @@ export default {
       font-weight: bold;
     }
   }
-  .right {
-    height: 40px;
-    line-height: 40px;
-    font-size: 16px;
-    color: #000;
-    .one {
-      text-align: right;
-      color: #000;
-      font-weight: bold;
-    }
-    .two {
-      text-align: center;
-      .loginBtn:hover {
-        cursor: pointer;
-      }
-      .center {
-        font-size: 15px;
-        font-weight: bold;
-        color: #fff;
-      }
-      .center:hover {
-        cursor: pointer;
-        color: #0085d2;
-      }
-      .outLogin {
-        margin: 0 0 0 5px;
-        font-weight: bold;
-        font-size: 14px;
-      }
-      .outLogin:hover {
-        cursor: pointer;
-        color: #0085d2;
-      }
-    }
-  }
+  // .right {
+  //   height: 40px;
+  //   line-height: 40px;
+  //   font-size: 16px;
+  //   color: #000;
+  //   .one {
+  //     text-align: right;
+  //     color: #000;
+  //     font-weight: bold;
+  //   }
+  //   .two {
+  //     text-align: center;
+  //     .loginBtn:hover {
+  //       cursor: pointer;
+  //     }
+  //     .center {
+  //       font-size: 15px;
+  //       font-weight: bold;
+  //       color: #fff;
+  //     }
+  //     .center:hover {
+  //       cursor: pointer;
+  //       color: #0085d2;
+  //     }
+  //     .outLogin {
+  //       margin: 0 0 0 5px;
+  //       font-weight: bold;
+  //       font-size: 14px;
+  //     }
+  //     .outLogin:hover {
+  //       cursor: pointer;
+  //       color: #0085d2;
+  //     }
+  //   }
+  // }
 }
 .btnER {
   font-size: 16px;

src/style/style.css

@@ -173,7 +173,8 @@ textarea {
 
 .w_1200 {
 	margin: 0 auto;
-	width: 80%;
+  width: 1200px;
+  /* width: 80%; */
 }
 
 

src/views/adminCenter/index.vue

@@ -105,7 +105,8 @@ export default {
 
 <style lang="less" scoped>
 .w_1200 {
-  width: 80%;
+  // width: 80%;
+  width: 1200px;
   margin: 0 auto;
 }
 .info {

src/views/hall/liveApply.vue

@@ -339,7 +339,8 @@ export default {
 
 <style lang="less" scoped>
 .w_1200 {
-  width: 80%;
+  // width: 80%;
+  width: 1200px;
   margin: 0 auto;
 }
 .top {

src/views/hallList/index.vue

@@ -95,7 +95,8 @@ export default {
 
 <style lang="less" scoped>
 .main {
-  width: 80%;
+  // width: 80%;
+  width: 1200px;
   margin: 0 auto;
   float: none;
 }

src/views/market/index.vue

@@ -152,16 +152,16 @@
                   :key="index"
                   @click.native="$router.push({ path: '/market/marketlists', query: { type: '3', column_name: '专家服务', id: item.id } })"
                 >
-                  <el-col :span="6" class="expertimage">
+                  <el-col :span="8" class="expertimage">
                     <el-image v-if="item.expertimage != ''" :src="item.expertimage"></el-image>
                     <el-image v-else :src="expertimage"></el-image>
                   </el-col>
-                  <el-col :span="18" class="rightInfo">
+                  <el-col :span="16" class="rightInfo">
                     <el-col :span="24" class="name textOver">
                       {{ item.name }}
                     </el-col>
-                    <el-col :span="12" class="school textOver"> 院校：{{ item.school }} </el-col>
-                    <el-col :span="12" class="edu textOver"> 学历：{{ item.education }} </el-col>
+                    <el-col :span="24" class="school textOver"> 院校：{{ item.school }} </el-col>
+                    <!-- <el-col :span="12" class="edu textOver"> 学历：{{ item.education }} </el-col> -->
                     <el-col :span="24" class="company textOver">单位：{{ item.company }} </el-col>
                   </el-col>
                 </el-col>
@@ -723,7 +723,8 @@ export default {
 
 <style lang="less" scoped>
 .w_1200 {
-  width: 80%;
+  // width: 80%;
+  width: 1200px;
   margin: 0 auto;
 }
 .top {

src/views/market/marketlists.vue

@@ -293,7 +293,8 @@ export default {
 
 <style lang="less" scoped>
 .w_1200 {
-  width: 80%;
+  // width: 80%;
+  width: 1200px;
   margin: 0 auto;
 }
 .main {

src/views/service/index.vue

@@ -182,7 +182,8 @@ export default {
 <style lang="less" scoped>
 .w_1200 {
   margin: 0 auto;
-  width: 80%;
+  // width: 80%;
+  width: 1200px;
   min-height: 600px;
 }
 .serviceOne {

src/views/service/list.vue

@@ -3,7 +3,7 @@
     <el-row>
       <div class="w_1200">
         <el-col :span="24" class="main">
-          <el-col :span="4" class="menu">
+          <el-col :span="5" class="menu">
             <el-image :src="squareImage"></el-image>
             <span class="topMenu">Menu</span>
             <!-- <el-col class="menuList" :span="24" v-for="(item, index) in menuList" :key="index">
@@ -32,7 +32,7 @@
               </el-collapse>
             </el-col>
           </el-col>
-          <el-col :span="19" class="info">
+          <el-col :span="18" class="info">
             <el-col :span="24" class="infoTop">
               <span>|</span> <span>{{ columnName }}</span>
             </el-col>
@@ -223,7 +223,8 @@ export default {
 
 <style lang="less" scoped>
 .w_1200 {
-  width: 80%;
+  // width: 80%;
+  width: 1200px;
   margin: 0 auto;
 }
 .main {
@@ -272,7 +273,7 @@ export default {
 }
 .info {
   float: right;
-  width: 82%;
+  width: 78%;
   min-height: 900px;
   padding: 20px;
   box-shadow: 0 0 10px #2d64b3;