소스 검색

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

guhongwei 4 년 전
부모
커밋
f2ecdd7cb4
1개의 변경된 파일67개의 추가작업 그리고 50개의 파일을 삭제
  1. 67 50
      src/views/market/index.vue

+ 67 - 50
src/views/market/index.vue

@@ -6,10 +6,10 @@
           <div class="w_1200">
             <el-col :span="24" class="left">
               <el-col :span="24" class="leftTop">
-                <el-col :span="2" class="image">
+                <el-col :span="1" class="image">
                   <el-image :src="iconImage"></el-image>
                 </el-col>
-                <el-col :span="22" class="txt">
+                <el-col :span="23" class="txt">
                   <span>技术成果</span>
                   <span>A</span>
                   <span>chieve</span>
@@ -48,10 +48,10 @@
             </el-col>
             <el-col :span="24" class="right">
               <el-col :span="24" class="rightTop">
-                <el-col :span="2" class="image">
+                <el-col :span="1" class="image">
                   <el-image :src="iconImage"></el-image>
                 </el-col>
-                <el-col :span="22" class="txt">
+                <el-col :span="23" class="txt">
                   <span>科技需求</span>
                   <span>T</span>
                   <span>echnology</span>
@@ -60,7 +60,7 @@
               </el-col>
               <el-col :span="24" class="rightDown">
                 <el-col
-                  :span="4"
+                  :span="6"
                   class="technologyList"
                   v-for="(item, index) in technologyList"
                   :key="index"
@@ -87,10 +87,10 @@
           <div class="w_1200">
             <el-col :span="24" class="left">
               <el-col :span="24" class="leftTop">
-                <el-col :span="2" class="image">
+                <el-col :span="1" class="image">
                   <el-image :src="iconImage"></el-image>
                 </el-col>
-                <el-col :span="22" class="txt">
+                <el-col :span="23" class="txt">
                   <span>商务服务</span>
                   <span>B</span>
                   <span>usiness</span>
@@ -99,7 +99,7 @@
               </el-col>
               <el-col :span="24" class="leftDown">
                 <el-col
-                  :span="4"
+                  :span="6"
                   class="businessList"
                   v-for="(item, index) in businessList"
                   :key="index"
@@ -120,10 +120,10 @@
             </el-col>
             <el-col :span="24" class="right">
               <el-col :span="24" class="rightTop">
-                <el-col :span="2" class="image">
+                <el-col :span="1" class="image">
                   <el-image :src="iconImage"></el-image>
                 </el-col>
-                <el-col :span="22" class="txt">
+                <el-col :span="23" class="txt">
                   <span>专家智库</span>
                   <span>E</span>
                   <span>xpert</span>
@@ -132,7 +132,7 @@
               </el-col>
               <el-col :span="24" class="rightDown">
                 <el-col
-                  :span="4"
+                  :span="6"
                   class="expertList"
                   v-for="(item, index) in expertList"
                   :key="index"
@@ -716,7 +716,6 @@ export default {
 }
 .top {
   margin: 15px 0 30px 0;
-  height: 500px;
   overflow: hidden;
   .left {
     border-right: 1px dashed #ccc;
@@ -727,6 +726,7 @@ export default {
         height: 47px;
         line-height: 47px;
         border-bottom: 3px solid #044b79;
+        padding-left: 10px;
         span:first-child {
           color: #000000;
           font-size: 24px;
@@ -844,6 +844,7 @@ export default {
         height: 47px;
         line-height: 47px;
         border-bottom: 3px solid #044b79;
+        padding-left: 10px;
         span:first-child {
           color: #000000;
           font-size: 24px;
@@ -876,29 +877,32 @@ export default {
       // padding: 0 10px;
       margin-top: 15px;
       .technologyList {
-        padding: 10px 5px 0px 5px;
+        padding: 10px 15px 0px 15px;
         // border-bottom: 1px dashed #ccc;
         border: 1px dashed #ccc;
         margin-right: 15px;
-        width: 185px;
+        width: 288px;
+        margin-top: 15px;
         .name {
-          font-size: 13px;
+          font-size: 15px;
         }
         .date {
           text-align: right;
-          font-size: 13px;
+          font-size: 15px;
         }
         .demand {
-          height: 80px;
           display: -webkit-box;
           -webkit-box-orient: vertical;
-          -webkit-line-clamp: 5;
+          -webkit-line-clamp: 6;
           overflow: hidden;
-          margin-top: 5px;
+          margin-top: 13px;
+          height: 180px;
+          line-height: 30px;
+          font-size: 13px;
         }
       }
-      .technologyList:last-child {
-        margin-left: 0px;
+      .technologyList:nth-child(4n) {
+        margin-right: 0px;
       }
       .technologyList:hover {
         cursor: pointer;
@@ -930,6 +934,7 @@ export default {
         height: 47px;
         line-height: 47px;
         border-bottom: 3px solid #044b79;
+        padding-left: 10px;
         span:first-child {
           color: #000000;
           font-size: 24px;
@@ -963,27 +968,33 @@ export default {
       padding: 0 10px;
       margin-top: 15px;
       .businessList {
-        padding: 10px 5px;
+        padding: 10px 15px 0px 15px;
+        // border-bottom: 1px dashed #ccc;
+        border: 1px dashed #0085d2;
         margin-right: 15px;
-        width: 190px;
-        // border-bottom: 1px dashed #044b79;
-        border: 1px dashed #044b79;
+        width: 288px;
+        margin-top: 15px;
         .name {
-          font-size: 13px;
+          font-size: 15px;
         }
         .date {
           text-align: right;
-          font-size: 13px;
+          font-size: 15px;
         }
         .info {
-          height: 80px;
           display: -webkit-box;
           -webkit-box-orient: vertical;
-          -webkit-line-clamp: 5;
+          -webkit-line-clamp: 6;
           overflow: hidden;
-          margin-top: 5px;
+          margin-top: 13px;
+          height: 180px;
+          line-height: 30px;
+          font-size: 13px;
         }
       }
+      .businessList:nth-child(4n) {
+        margin-right: 0px;
+      }
       // .businessList:last-child {
       //   border-bottom: none;
       // }
@@ -1003,6 +1014,7 @@ export default {
         height: 47px;
         line-height: 47px;
         border-bottom: 3px solid #044b79;
+        padding-left: 10px;
         span:first-child {
           color: #000000;
           font-size: 24px;
@@ -1036,43 +1048,47 @@ export default {
       // height: 450px;
       // padding: 0 10px;
       .expertList {
-        margin: 0 15px 10px 0;
-        // padding: 10px 0;
-        width: 185px;
-        // border-bottom: 1px dashed #044b79;
+        margin: 0 16px 10px 0;
+        width: 288px;
+        border: 1px dashed #044b79;
+        padding: 10px;
         .expertimage {
           .el-image {
-            width: 100%;
-            height: 98px;
+            width: 95%;
+            height: 125px;
+
             border-radius: 90px;
           }
         }
         .rightInfo {
-          padding: 0 0 0 14px;
+          padding: 0 0 0 16px;
           .name {
-            font-size: 13px;
-            padding: 14px 0 0 0;
+            font-size: 16px;
+            padding: 15px 0 0 0;
           }
           .school {
-            font-size: 13px;
-            padding: 14px 0 0 0;
+            font-size: 16px;
+            padding: 15px 0 0 0;
           }
           .edu {
-            font-size: 13px;
-            padding: 14px 0 0 0;
+            font-size: 16px;
+            padding: 15px 0 0 0;
           }
           .company {
-            font-size: 13px;
-            padding: 14px 0 0 0;
+            font-size: 16px;
+            padding: 15px 0 0 0;
           }
         }
       }
-      .expertList:nth-child(5) {
-        border-bottom: none;
-      }
-      .expertList:nth-child(6) {
-        border-bottom: none;
+      .expertList:nth-child(4n) {
+        margin-right: 0px;
       }
+      // .expertList:nth-child(5) {
+      //   border-bottom: none;
+      // }
+      // .expertList:nth-child(6) {
+      //   border-bottom: none;
+      // }
       .expertList:hover {
         cursor: pointer;
         .name {
@@ -1126,6 +1142,7 @@ export default {
           margin: 0 0 5px 0;
           border-bottom: 1px dashed #ccc;
           padding: 10px 0;
+          padding-left: 10px;
           .left {
             text-align: center;
             height: 40px;