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

src/views/market/index.vue

@@ -4,7 +4,7 @@
       <el-col :span="24">
         <el-col :span="24" class="top">
           <div class="w_1200">
-            <el-col :span="12" class="left">
+            <el-col :span="24" class="left">
               <el-col :span="24" class="leftTop">
                 <el-col :span="2" class="image">
                   <el-image :src="iconImage"></el-image>
@@ -19,7 +19,7 @@
               <el-col :span="24" class="leftDown">
                 <el-row :gutter="7">
                   <el-col
-                    :span="8"
+                    :span="4"
                     class="achieveList"
                     v-for="(item, index) in achieveList"
                     :key="index"
@@ -46,7 +46,7 @@
                 </el-row>
               </el-col>
             </el-col>
-            <el-col :span="12" class="right">
+            <el-col :span="24" class="right">
               <el-col :span="24" class="rightTop">
                 <el-col :span="2" class="image">
                   <el-image :src="iconImage"></el-image>
@@ -60,20 +60,21 @@
               </el-col>
               <el-col :span="24" class="rightDown">
                 <el-col
-                  :span="24"
+                  :span="4"
                   class="technologyList"
                   v-for="(item, index) in technologyList"
                   :key="index"
                   @click.native="$router.push({ path: '/market/marketlists', query: { type: '0', column_name: '科技需求', id: item._id } })"
                 >
-                  <el-col :span="20" class="name textOver">
+                  <el-col :span="12" class="name textOver">
                     {{ item.name }}
                   </el-col>
-                  <el-col :span="4" class="date">
+                  <el-col :span="12" class="date">
                     {{ item.meta | getDate }}
                   </el-col>
-                  <el-col :span="12" class="field"> 所属领域：{{ item.field }} </el-col>
-                  <el-col :span="12" class="field"> 合作方式：{{ item.cooperation }} </el-col>
+                  <!-- <el-col :span="12" class="field"> 所属领域：{{ item.requirementdesc }} </el-col>
+                  <el-col :span="12" class="field"> 合作方式：{{ item.cooperation }} </el-col> -->
+                  <el-col :span="24" class="demand">{{ item.requirementdesc }}</el-col>
                 </el-col>
               </el-col>
             </el-col>
@@ -84,7 +85,7 @@
         </el-col>
         <el-col :span="24" class="down">
           <div class="w_1200">
-            <el-col :span="12" class="left">
+            <el-col :span="24" class="left">
               <el-col :span="24" class="leftTop">
                 <el-col :span="2" class="image">
                   <el-image :src="iconImage"></el-image>
@@ -98,17 +99,17 @@
               </el-col>
               <el-col :span="24" class="leftDown">
                 <el-col
-                  :span="24"
+                  :span="4"
                   class="businessList"
                   v-for="(item, index) in businessList"
                   :key="index"
                   @click.native="$router.push({ path: '/market/marketlists', query: { type: '2', column_name: '商务服务', id: item._id } })"
                 >
-                  <el-col :span="10" class="name textOver">
+                  <el-col :span="12" class="name textOver">
                     {{ item.name }}
                   </el-col>
-                  <el-col :span="10" class="messbute"> 信息属性：{{ item.messattribute }} </el-col>
-                  <el-col :span="4" class="date">
+                  <!-- <el-col :span="10" class="messbute"> 信息属性：{{ item.messattribute }} </el-col> -->
+                  <el-col :span="12" class="date">
                     {{ item.meta | getDate }}
                   </el-col>
                   <el-col :span="24" class="info">
@@ -117,7 +118,7 @@
                 </el-col>
               </el-col>
             </el-col>
-            <el-col :span="12" class="right">
+            <el-col :span="24" class="right">
               <el-col :span="24" class="rightTop">
                 <el-col :span="2" class="image">
                   <el-image :src="iconImage"></el-image>
@@ -131,17 +132,17 @@
               </el-col>
               <el-col :span="24" class="rightDown">
                 <el-col
-                  :span="12"
+                  :span="4"
                   class="expertList"
                   v-for="(item, index) in expertList"
                   :key="index"
                   @click.native="$router.push({ path: '/market/marketlists', query: { type: '3', column_name: '专家智库', id: item._id } })"
                 >
-                  <el-col :span="8" class="expertimage">
+                  <el-col :span="12" class="expertimage">
                     <el-image v-if="item.expertimage != null || undefined" :src="item.expertimage"></el-image>
                     <el-image :src="expertimage" v-else></el-image>
                   </el-col>
-                  <el-col :span="16" class="rightInfo">
+                  <el-col :span="12" class="rightInfo">
                     <el-col :span="24" class="name textOver">
                       {{ item.name }}
                     </el-col>
@@ -620,6 +621,7 @@ export default {
       if (this.$checkRes(res)) this.$set(this, `achieveList`, res.data);
       res = await this.marketquery({ skip: 0, limit: 6, type: '0', status: '1' });
       if (this.$checkRes(res)) this.$set(this, `technologyList`, res.data);
+      console.log(res);
       res = await this.marketquery({ skip: 0, limit: 5, type: '2', status: '1' });
       if (this.$checkRes(res)) this.$set(this, `businessList`, res.data);
       res = await this.expertquery({ skip: 0, limit: 6 });
@@ -713,11 +715,12 @@ export default {
   margin: 0 auto;
 }
 .top {
-  margin: 15px 0;
+  margin: 15px 0 30px 0;
   height: 500px;
   overflow: hidden;
   .left {
     border-right: 1px dashed #ccc;
+    margin-bottom: 15px;
     .leftTop {
       height: 50px;
       .txt {
@@ -753,7 +756,8 @@ export default {
       }
     }
     .leftDown {
-      height: 450px;
+      // height: 450px;
+      margin-top: 15px;
       .achieveList {
         // position: relative;
         overflow: hidden;
@@ -833,6 +837,7 @@ export default {
     }
   }
   .right {
+    margin-top: 15px;
     .rightTop {
       height: 50px;
       .txt {
@@ -868,22 +873,33 @@ export default {
       }
     }
     .rightDown {
-      padding: 0 10px;
+      // padding: 0 10px;
+      margin-top: 15px;
       .technologyList {
-        padding: 10px 0;
-        border-bottom: 1px dashed #ccc;
+        padding: 10px 5px 0px 5px;
+        // border-bottom: 1px dashed #ccc;
+        border: 1px dashed #ccc;
+        margin-right: 15px;
+        width: 185px;
         .name {
-          font-size: 18px;
+          font-size: 13px;
         }
         .date {
-          text-align: center;
-          font-size: 16px;
+          text-align: right;
+          font-size: 13px;
         }
-        .field {
-          padding: 10px 0 0 0;
-          font-size: 15px;
+        .demand {
+          height: 80px;
+          display: -webkit-box;
+          -webkit-box-orient: vertical;
+          -webkit-line-clamp: 5;
+          overflow: hidden;
+          margin-top: 5px;
         }
       }
+      .technologyList:last-child {
+        margin-left: 0px;
+      }
       .technologyList:hover {
         cursor: pointer;
         .name {
@@ -901,12 +917,13 @@ export default {
   }
 }
 .down {
-  height: 550px;
-  padding: 50px 0 0 0;
+  // height: 550px;
+  padding: 50px 0 50px 0;
   margin: 0 0 15px 0;
   background-color: #e9edf6;
   .left {
     border-right: 1px dashed #ccc;
+    margin-bottom: 30px;
     .leftTop {
       height: 50px;
       .txt {
@@ -942,36 +959,34 @@ export default {
       }
     }
     .leftDown {
-      height: 450px;
+      // height: 450px;
       padding: 0 10px;
+      margin-top: 15px;
       .businessList {
-        padding: 10px 0;
-        border-bottom: 1px dashed #044b79;
+        padding: 10px 5px;
+        margin-right: 15px;
+        width: 190px;
+        // border-bottom: 1px dashed #044b79;
+        border: 1px dashed #044b79;
         .name {
-          font-size: 18px;
-        }
-        .messbute {
-          font-size: 16px;
+          font-size: 13px;
         }
         .date {
-          font-size: 16px;
-          text-align: center;
+          text-align: right;
+          font-size: 13px;
         }
         .info {
-          padding: 5px 0 0 0;
-          height: 45px;
-          font-size: 14px;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          -webkit-line-clamp: 2;
-          word-break: break-all;
+          height: 80px;
           display: -webkit-box;
           -webkit-box-orient: vertical;
+          -webkit-line-clamp: 5;
+          overflow: hidden;
+          margin-top: 5px;
         }
       }
-      .businessList:last-child {
-        border-bottom: none;
-      }
+      // .businessList:last-child {
+      //   border-bottom: none;
+      // }
       .businessList:hover {
         cursor: pointer;
         .name {
@@ -1017,36 +1032,38 @@ export default {
       }
     }
     .rightDown {
-      height: 450px;
-      padding: 0 10px;
+      margin-top: 20px;
+      // height: 450px;
+      // padding: 0 10px;
       .expertList {
-        margin: 20px 0 10px 0;
-        padding: 10px 0;
-        border-bottom: 1px dashed #044b79;
+        margin: 0 15px 10px 0;
+        // padding: 10px 0;
+        width: 185px;
+        // border-bottom: 1px dashed #044b79;
         .expertimage {
           .el-image {
-            width: 90px;
-            height: 90px;
+            width: 100%;
+            height: 98px;
             border-radius: 90px;
           }
         }
         .rightInfo {
-          padding: 0 10px;
+          padding: 0 0 0 14px;
           .name {
-            font-size: 18px;
-            padding: 7px 0 0 0;
+            font-size: 13px;
+            padding: 14px 0 0 0;
           }
           .school {
-            font-size: 16px;
-            padding: 7px 0 0 0;
+            font-size: 13px;
+            padding: 14px 0 0 0;
           }
           .edu {
-            font-size: 16px;
-            padding: 7px 0 0 0;
+            font-size: 13px;
+            padding: 14px 0 0 0;
           }
           .company {
-            font-size: 16px;
-            padding: 7px 0 0 0;
+            font-size: 13px;
+            padding: 14px 0 0 0;
           }
         }
       }