浏览代码

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

guhongwei 4 年之前
父节点
当前提交
100dfadcd5
共有 1 个文件被更改,包括 36 次插入24 次删除
  1. 36 24
      src/views/market/index.vue

+ 36 - 24
src/views/market/index.vue

@@ -19,7 +19,7 @@
               <el-col :span="24" class="leftDown">
                 <el-row :gutter="7">
                   <el-col
-                    :span="4"
+                    :span="6"
                     class="achieveList"
                     v-for="(item, index) in achieveList"
                     :key="index"
@@ -138,11 +138,11 @@
                   :key="index"
                   @click.native="$router.push({ path: '/market/marketlists', query: { type: '3', column_name: '专家智库', id: item._id } })"
                 >
-                  <el-col :span="12" class="expertimage">
+                  <el-col :span="24" 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="12" class="rightInfo">
+                  <el-col :span="24" class="rightInfo">
                     <el-col :span="24" class="name textOver">
                       {{ item.name }}
                     </el-col>
@@ -619,12 +619,12 @@ export default {
     async search() {
       let res = await this.marketquery({ skip: 0, limit: 6, type: '1', status: '1' });
       if (this.$checkRes(res)) this.$set(this, `achieveList`, res.data);
-      res = await this.marketquery({ skip: 0, limit: 6, type: '0', status: '1' });
+      res = await this.marketquery({ skip: 0, limit: 8, 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' });
+      res = await this.marketquery({ skip: 0, limit: 4, type: '2', status: '1' });
       if (this.$checkRes(res)) this.$set(this, `businessList`, res.data);
-      res = await this.expertquery({ skip: 0, limit: 6 });
+      res = await this.expertquery({ skip: 0, limit: 8 });
       if (this.$checkRes(res)) this.$set(this, `expertList`, res.data);
     },
     // 未注册用户添加产品
@@ -718,7 +718,7 @@ export default {
   margin: 15px 0 30px 0;
   overflow: hidden;
   .left {
-    border-right: 1px dashed #ccc;
+    // border-right: 1px dashed #ccc;
     margin-bottom: 15px;
     .leftTop {
       height: 50px;
@@ -761,14 +761,16 @@ export default {
       .achieveList {
         // position: relative;
         overflow: hidden;
-        height: 220px;
+        // height: 220px;
+        height: 315px;
         margin-top: 5px;
         padding: 0px 8px;
         .achieveImage {
           position: relative;
           .el-image {
             width: 100%;
-            height: 220px;
+            // height: 220px;
+            height: 310px;
             overflow: hidden;
             border-radius: 5px;
             transition: all 0.4s linear;
@@ -776,11 +778,12 @@ export default {
           }
           .aName {
             position: absolute;
-            top: 25px;
+            top: 34px;
             left: 0px;
             text-align: center;
             transform: scale(0.8);
             font-weight: bolder;
+            font-size: 15px;
             // color: transparent;
             // 文字边框宽度和颜色
             -webkit-text-stroke: 1px #f18d2c;
@@ -795,10 +798,11 @@ export default {
             top: 31px;
             left: 0px;
             overflow: hidden;
+            font-size: 14px;
             line-height: 20px;
             letter-spacing: 2px;
             text-overflow: ellipsis;
-            -webkit-line-clamp: 7;
+            -webkit-line-clamp: 12;
             word-break: break-all;
             display: -webkit-box;
             -webkit-box-orient: vertical;
@@ -817,8 +821,8 @@ export default {
           }
           .company {
             position: absolute;
-            top: 3px;
-            left: 20px;
+            top: 6px;
+            left: 30px;
             width: 86%;
             color: #ec6c2d;
             -webkit-text-stroke: 1px #f18d2c;
@@ -884,20 +888,22 @@ export default {
         width: 288px;
         margin-top: 15px;
         .name {
-          font-size: 15px;
+          font-size: 18px;
+          width: 65%;
         }
         .date {
           text-align: right;
           font-size: 15px;
+          width: 35%;
         }
         .demand {
           display: -webkit-box;
           -webkit-box-orient: vertical;
-          -webkit-line-clamp: 6;
+          -webkit-line-clamp: 9;
           overflow: hidden;
           margin-top: 13px;
-          height: 180px;
-          line-height: 30px;
+          height: 280px;
+          line-height: 31px;
           font-size: 13px;
         }
       }
@@ -926,7 +932,7 @@ export default {
   margin: 0 0 15px 0;
   background-color: #e9edf6;
   .left {
-    border-right: 1px dashed #ccc;
+    // border-right: 1px dashed #ccc;
     margin-bottom: 30px;
     .leftTop {
       height: 50px;
@@ -975,20 +981,22 @@ export default {
         width: 288px;
         margin-top: 15px;
         .name {
-          font-size: 15px;
+          font-size: 18px;
+          width: 65%;
         }
         .date {
           text-align: right;
           font-size: 15px;
+          width: 35%;
         }
         .info {
           display: -webkit-box;
           -webkit-box-orient: vertical;
-          -webkit-line-clamp: 6;
+          -webkit-line-clamp: 9;
           overflow: hidden;
           margin-top: 13px;
-          height: 180px;
-          line-height: 30px;
+          height: 280px;
+          line-height: 31px;
           font-size: 13px;
         }
       }
@@ -1053,8 +1061,10 @@ export default {
         border: 1px dashed #044b79;
         padding: 10px;
         .expertimage {
+          text-align: center;
           .el-image {
-            width: 95%;
+            // width: 95%;
+            width: 50%;
             height: 125px;
 
             border-radius: 90px;
@@ -1063,8 +1073,10 @@ export default {
         .rightInfo {
           padding: 0 0 0 16px;
           .name {
-            font-size: 16px;
+            font-size: 18px;
             padding: 15px 0 0 0;
+            font-weight: bolder;
+            text-align: center;
           }
           .school {
             font-size: 16px;