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

src/views/market/index.vue

@@ -2,7 +2,7 @@
   <div id="index">
     <el-col :span="24" class="main">
       <el-col :span="24" class="marketTop">
-        <el-col :span="12" class="left">
+        <!-- <el-col :span="12" class="left">
           <el-col :span="1" class="leftTitle">
             <p>科<br />技<br />产<br />品</p>
             <p></p>
@@ -14,8 +14,8 @@
             </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> -->
+        <!-- <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">
@@ -29,6 +29,42 @@
             <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>
+            <span class="topText">
+              <span>科技产品</span>
+              <span
+                ><p>P</p>
+                <p>roduct</p></span
+              >
+              <span @click="toProductList">更多</span>
+            </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>
+            <p class="textOver">{{ item.name }}</p>
+          </el-col>
+        </el-col>
+        <el-col :span="12" class="right">
+          <el-col :span="24" class="downLeftTop">
+            <el-image :src="downLeftTopImage"></el-image>
+            <span class="topText">
+              <span>技术供求</span>
+              <span
+                ><p>T</p>
+                <p>echnology</p></span
+              >
+              <span @click="toTecList">更多</span>
+            </span>
+          </el-col>
+          <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="24">
           <el-image :src="gongqiuImage" class="gongqiuImage"></el-image>
@@ -64,21 +100,25 @@
             <el-col :span="24" class="downLeftTop">
               <el-image :src="downLeftTopImage"></el-image>
               <span class="topText">
-                <span>金融供求</span>
+                <span>专家供求</span>
                 <span
-                  ><p>B</p>
-                  <p>anking</p></span
+                  ><p>E</p>
+                  <p>xpert</p></span
                 >
                 <span>更多</span>
               </span>
             </el-col>
-            <el-col :span="24" class="downRightImage">
-              <el-image :src="serviceImage"></el-image>
-            </el-col>
             <el-col :span="24">
-              <el-col :span="24" class="downRightList" v-for="(item, index) in bankingList" :key="index">
-                <span></span>
-                <span>{{ item.title }}</span>
+              <el-col :span="24" class="downRightList" v-for="(item, index) in expertsList" :key="index">
+                <el-col :span="10"><el-image :src="item.imgpath"></el-image></el-col>
+                <el-col :span="14"
+                  ><p>{{ item.name }}</p>
+                  <p>从事领域：</p>
+                  <p>{{ item.field }}</p></el-col
+                >
+                <el-col :span="24"
+                  ><p>{{ item.job_profile }}</p></el-col
+                >
               </el-col>
             </el-col>
           </el-col>
@@ -108,6 +148,7 @@
           </el-col>
         </el-col>
       </el-col>
+      <el-col :span="24" class="marketPublish">我要发布</el-col>
     </el-col>
   </div>
 </template>
@@ -125,39 +166,9 @@ export default {
   data: () => ({
     gongqiuImage: require('@/assets/live/main2.png'),
     downLeftTopImage: require('@/assets/live/square_big.png'),
-    serviceImage: require('@/assets/live/service_picture_one.jpg'),
     productList: [],
     tecList: [],
-    bankingList: [
-      {
-        image:
-          'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1588061253920&di=18e7a68061c9debd24a2db64967b891c&imgtype=0&src=http%3A%2F%2Fbpic.588ku.com%2Fback_pic%2F03%2F51%2F81%2F1257923ada49020.jpg',
-        title: '测试型数据测试型数测试型数测试型数据测试型数据测试型数测试型数测试型数据',
-        content:
-          '测试型数据测试型数测试型数测试型数据测试型数据测试型数测试型数测试型数据测试型数据测试型数测试型数测试型数据测试型数据测试型数测试型数测试型数据',
-      },
-      {
-        image:
-          'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1588061253920&di=18e7a68061c9debd24a2db64967b891c&imgtype=0&src=http%3A%2F%2Fbpic.588ku.com%2Fback_pic%2F03%2F51%2F81%2F1257923ada49020.jpg',
-        title: '测试型数据测试型数测试型数测试型数据测试型数据测试型数测试型数测试型数据',
-        content:
-          '测试型数据测试型数测试型数测试型数据测试型数据测试型数测试型数测试型数据测试型数据测试型数测试型数测试型数据测试型数据测试型数测试型数测试型数据',
-      },
-      {
-        image:
-          'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1588061253920&di=18e7a68061c9debd24a2db64967b891c&imgtype=0&src=http%3A%2F%2Fbpic.588ku.com%2Fback_pic%2F03%2F51%2F81%2F1257923ada49020.jpg',
-        title: '测试型数据测试型数测试型数测试型数据测试型数据测试型数测试型数测试型数据',
-        content:
-          '测试型数据测试型数测试型数测试型数据测试型数据测试型数测试型数测试型数据测试型数据测试型数测试型数测试型数据测试型数据测试型数测试型数测试型数据',
-      },
-      {
-        image:
-          'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1588061253920&di=18e7a68061c9debd24a2db64967b891c&imgtype=0&src=http%3A%2F%2Fbpic.588ku.com%2Fback_pic%2F03%2F51%2F81%2F1257923ada49020.jpg',
-        title: '测试型数据测试型数测试型数测试型数据测试型数据测试型数测试型数测试型数据',
-        content:
-          '测试型数据测试型数测试型数测试型数据测试型数据测试型数测试型数测试型数据测试型数据测试型数测试型数测试型数据测试型数据测试型数测试型数测试型数据',
-      },
-    ],
+    expertsList: [],
     serviceList: [],
     newList: [],
   }),
@@ -194,8 +205,9 @@ export default {
       if (this.$checkRes(res)) this.$set(this, `newList`, res.data);
       res = await this.query({ skip: 0, limit: 4, totaltype: '2' });
       if (this.$checkRes(res)) this.$set(this, `serviceList`, res.data);
-      // res = await this.expertQuery({ skip: 0, limit: 4 });
-      // if (this.$checkRes(res)) this.$set(this, `expertsList`, res.data);
+      res = await this.expertQuery({ skip: 0, limit: 4 });
+      if (this.$checkRes(res)) this.$set(this, `expertsList`, res.data);
+      console.log(res.data);
     },
     toProductList() {
       // window.location.href = 'http://free.liaoningdoupo.com/platweb/supermaket/supermarketlist?totaltype=1';
@@ -250,6 +262,9 @@ export default {
   height: 500px;
   margin: 10px 0 20px 0;
   overflow: hidden;
+  // box-shadow: 2px 2px 2px #888888;
+  border-right: 1px dashed #044b79;
+  width: 49.5%;
 }
 .leftTitle {
   text-align: center;
@@ -278,6 +293,7 @@ export default {
   margin: 0 10px 10px 0;
   width: 48%;
   height: 220px;
+  cursor: pointer;
 }
 .productList:nth-child(2n) {
   margin: 0 0 10px 0;
@@ -325,6 +341,7 @@ export default {
   height: 500px;
   overflow: hidden;
   margin: 10px 0 20px 0;
+  width: 49.5%;
 }
 .rightListTop {
   position: relative;
@@ -367,6 +384,7 @@ export default {
   width: 80%;
   font-size: 18px;
   padding: 0 15px;
+  cursor: pointer;
 }
 .tecList span:nth-child(3n) {
   display: inline-block;
@@ -376,6 +394,7 @@ export default {
   color: #ffffff;
   font-size: 16px;
   padding: 3px 0px;
+  cursor: pointer;
 }
 .tecList span:last-child {
   display: block;
@@ -498,6 +517,7 @@ export default {
 }
 .bankingLists {
   height: 152px;
+  cursor: pointer;
 }
 .bankingLists .el-image {
   width: 100%;
@@ -530,6 +550,7 @@ export default {
 
 .bankingList {
   height: 152px;
+  cursor: pointer;
 }
 .bankingList .el-image {
   width: 100%;
@@ -559,39 +580,38 @@ export default {
   line-height: 25px;
   font-weight: 400;
 }
-
-.downRightImage {
-  float: none;
-  width: 85%;
-  margin: 0 auto;
-}
-.downRightImage .el-image {
+.downRightList {
+  width: 49%;
+  margin: 10px 0;
   height: 200px;
+  font-size: 16px;
+  display: inline-block;
+  cursor: pointer;
+}
+.downRightList .el-image {
   width: 100%;
+  height: 100px;
+  border-radius: 100%;
 }
-.downRightList {
-  float: none;
-  width: 85%;
-  margin: 10px auto;
-  height: 50px;
-  font-size: 16px;
-  line-height: 35px;
+.downRightList p {
+  padding-left: 10px;
 }
-.downRightList span:first-child {
-  display: inline-block;
-  width: 10px;
-  height: 10px;
-  background: #2188c6;
-  border-radius: 90px;
-  margin: 10px;
+.downRightList p:first-child {
+  font-size: 20px;
+  height: 40px;
 }
-.downRightList span:last-child {
-  width: 80%;
+.downRightList p:last-child {
+  width: 90%;
+  font-size: 16px;
   overflow: hidden;
-  white-space: nowrap;
   text-overflow: ellipsis;
-  display: inline-block;
+  -webkit-line-clamp: 5;
+  word-break: break-all;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  height: auto;
 }
+
 .marketNew {
   float: none;
   width: 80%;
@@ -601,4 +621,24 @@ export default {
 .downLeftInfos {
   height: 330px;
 }
+.marketPublish {
+  position: fixed;
+  background: #0279d5;
+  width: 100px;
+  height: 100px;
+  z-index: 999;
+  left: 2%;
+  top: 80%;
+  border-radius: 20px;
+  box-shadow: 2px 2px 2px #055c9f;
+  text-align: center;
+  line-height: 100px;
+  font-size: 20px;
+  color: #fff;
+  font-weight: bold;
+}
+.marketPublish:hover {
+  background: #f60;
+  cursor: pointer;
+}
 </style>