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

src/views/market/index.vue

@@ -2,34 +2,6 @@
   <div id="index">
     <el-col :span="24" class="main">
       <el-col :span="24" class="marketTop">
-        <!-- <el-col :span="12" class="left">
-          <el-col :span="1" class="leftTitle">
-            <p>科<br />技<br />产<br />品</p>
-            <p></p>
-          </el-col>
-          <el-col :span="23" class="infoLeft">
-            <el-col :span="12" class="productList" v-for="(item, index) in productList" :key="index" @click.native="productDetail(item.id)">
-              <el-image :src="item.image[0].url"></el-image>
-              <p class="textOver">{{ item.name }}</p>
-            </el-col>
-          </el-col>
-          <el-col :span="24" class="leftListDown"><span></span><span @click="toProductList">MORE</span></el-col>
-        </el-col> -->
-        <!-- <el-col :span="12" class="right">
-          <el-col :span="24" class="rightListTop"><span @click="toTecList">MORE</span><span></span></el-col>
-          <el-col :span="23" class="infoRight">
-            <el-col :span="24" class="tecList" v-for="(item, index) in tecList" :key="index">
-              <span></span>
-              <span class="textOver" @click="tecDetail(item.id)">{{ item.name }}</span>
-              <span>对接</span>
-              <span>{{ item.meta | getDate }}</span>
-            </el-col>
-          </el-col>
-          <el-col :span="1" class="rightTitle">
-            <p></p>
-            <p>技<br />术<br />供<br />求</p>
-          </el-col>
-        </el-col> -->
         <el-col :span="12" class="left">
           <el-col :span="24" class="downLeftTop">
             <el-image :src="downLeftTopImage"></el-image>
@@ -43,12 +15,16 @@
             </span>
           </el-col>
           <el-col :span="12" class="productList" v-for="(item, index) in productList" :key="index" @click.native="productDetail(item.id)">
-            <!-- <el-image :src="item.image[0].url"></el-image> -->
             <template v-if="item.image.length">
               <el-image :src="item.image[0].url"></el-image>
             </template>
-            <template v-else>暂无图片</template>
-            <p class="textOver">{{ item.name || '暂无' }}</p>
+            <template v-else>
+              <el-col :span="24" class="noImgTitle">
+                <!-- <p>{{ item.name }}</p> -->
+                <p>{{ item.introduction.substring(0, 180) }}</p>
+              </el-col>
+            </template>
+            <p class="title textOver">{{ item.name || '暂无' }}</p>
           </el-col>
         </el-col>
         <el-col :span="12" class="right">
@@ -322,9 +298,9 @@ export default {
 }
 .productList .el-image {
   width: 100%;
-  height: 220px;
+  height: 170px;
 }
-.productList p {
+.productList .title {
   position: absolute;
   text-align: center;
   bottom: 0;
@@ -337,6 +313,16 @@ export default {
   width: 100%;
   font-size: 18px;
 }
+.productList .noImgTitle {
+  height: 170px;
+  padding: 0 15px;
+  p:first-child {
+    font-size: 14px;
+  }
+  // p:last-child {
+  //   font-size: 14px;
+  // }
+}
 .leftListDown {
   position: relative;
 }