Merge branch 'master' of http://git.cc-lotus.info/service-platform/mobile-official into master

src/views/live/parts/videoDetail2.vue

@@ -26,13 +26,43 @@
         <el-col :span="24" class="market">
           <van-tabs v-model="marketactive" type="card" animated>
             <van-tab title="技术成果">
-              技术成果
+              <el-col :span="24" class="one">
+                <el-col :span="24" class="list" v-for="(item, index) in achieveList" :key="index">
+                  <p class="textOver">{{ item.name }}</p>
+                  <p class="textOver">领域：{{ item.field }}</p>
+                  <p class="textOver">联系人：{{ item.contacts }}</p>
+                </el-col>
+              </el-col>
             </van-tab>
             <van-tab title="科技需求">
-              科技需求
+              <el-col :span="24" class="one">
+                <el-col :span="24" class="list" v-for="(item, index) in techolList" :key="index">
+                  <p class="textOver">{{ item.name }}</p>
+                  <p class="textOver">领域：{{ item.field }}</p>
+                  <p class="textOver">联系人：{{ item.contacts }}</p>
+                </el-col>
+              </el-col>
             </van-tab>
             <van-tab title="专家智库">
-              专家智库
+              <el-col :span="24" class="three">
+                <el-col :span="24" class="expertList" v-for="(item, index) in expertList" :key="index" @click.native="expertBtn(item)">
+                  <el-col :span="5" class="image">
+                    <el-image
+                      :src="item.expertimage"
+                      style="width:70px;height: 70px;border: 1px solid #f1f1f1;"
+                      v-if="item.expertimage != null || undefined"
+                    ></el-image>
+                    <el-image :src="expertimage" style="width:70px;height: 70px;border: 1px solid #f1f1f1;" v-else></el-image>
+                  </el-col>
+                  <el-col :span="19" class="info1">
+                    <el-col :span="24" class="name textOver">
+                      {{ item.name }}
+                    </el-col>
+                    <el-col :span="24" class="txt textOver"> {{ item.zwzc || '暂无' }} </el-col>
+                    <el-col :span="24" class="txt textOver"> {{ item.company || '暂无' }} </el-col>
+                  </el-col>
+                </el-col>
+              </el-col>
             </van-tab>
           </van-tabs>
         </el-col>
@@ -110,6 +140,7 @@ import chat from '@/components/parts/chat.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: dock } = createNamespacedHelpers('dock');
 const { mapActions: marketuser } = createNamespacedHelpers('marketuser');
+const { mapActions: exportuser } = createNamespacedHelpers('exportuser');
 const { mapActions: newsguidance } = createNamespacedHelpers('newsguidance');
 const { mapActions: newsroadshow } = createNamespacedHelpers('newsroadshow');
 import moment from 'moment';
@@ -131,11 +162,18 @@ export default {
       //展会详情
       dockinfo: [],
       // 聊天
-      chatactive: 1,
+      chatactive: 0,
       // 图文直播
       lunboList: [],
       // 科技超市
       marketactive: 0,
+      // 技术成果
+      achieveList: [],
+      // 科技需求
+      techolList: [],
+      // 专家智库
+      expertList: [],
+      expertimage: require('@/assets/222.png'),
       // 嘉宾，项目
       jbxmactive: 0,
       // 嘉宾访谈
@@ -153,6 +191,7 @@ export default {
   },
   methods: {
     ...dock({ dockQuery: 'query', dockFetch: 'fetch' }),
+    ...exportuser({ expertQuery: 'query' }),
     ...marketuser({ operaFetch: 'operaFetch' }),
     ...newsguidance({ danceQuery: 'query' }),
     ...newsroadshow({ newsroadshowquery: 'query' }),
@@ -161,6 +200,18 @@ export default {
       //展会详情
       let res = await this.dockFetch(this.dock_id);
       if (this.$checkRes(res)) this.$set(this, `dockinfo`, res.data);
+      let czxm = res.data.apply.map(item => item.goodsList);
+      czxm = _.flattenDeep(czxm);
+      var czxmNew = czxm.filter(item => item.dockStatus == '1');
+      //科技需求
+      var jishuData = czxmNew.filter(item => item.type === '0');
+      this.$set(this, `techolList`, jishuData);
+      //技术成果
+      var chanpinData = czxmNew.filter(item => item.type === '1');
+      if (chanpinData) this.$set(this, `achieveList`, chanpinData);
+      // 专家智库
+      let exportdata = await this.expertQuery({ role: 6 });
+      if (this.$checkRes(exportdata)) this.$set(this, `expertList`, exportdata.data);
       //嘉宾访谈
       let jbftData = await this.danceQuery({ dock_id: this.id });
       if (this.$checkRes(jbftData)) this.$set(this, `zxzdlist`, jbftData.data);
@@ -169,7 +220,6 @@ export default {
       if (this.$checkRes(xmly)) this.$set(this, `xmlyList`, xmly.data);
     },
     // 查询图文直播
-    // 查询图文直播
     async seachLunbo() {
       let res = await this.operaFetch({ dockid: this.id });
       for (const val of res.data) {
@@ -200,6 +250,10 @@ export default {
         }
       }
     },
+    // 专家详情
+    expertBtn(data) {
+      this.$router.push({ path: '/market/exportDetail', query: { id: data.id } });
+    },
     // 返回
     back() {
       this.$router.push({ path: '/live/index' });
@@ -236,6 +290,7 @@ export default {
     overflow: hidden;
     .back {
       position: fixed;
+      z-index: 999;
       i {
         font-size: 30px;
         font-weight: bold;
@@ -266,23 +321,74 @@ export default {
     margin: 15px 0 0 0;
     height: 400px;
     overflow: hidden;
-    // border: 1px solid red;
   }
   // 科技超市
   .market {
     margin: 15px 0 0 0;
+    .one {
+      max-height: 550px;
+      overflow-y: auto;
+      padding: 0 16px;
+      min-height: 102px;
+      .list {
+        border-bottom: 1px dashed #ccc;
+        padding: 10px 0;
+        p {
+          font-size: 16px;
+          color: #666;
+          padding: 5px 0 0 0;
+        }
+        p:nth-child(1) {
+          font-size: 18px;
+          font-weight: bold;
+          color: #000;
+        }
+      }
+    }
+    .three {
+      max-height: 550px;
+      overflow-y: auto;
+      padding: 0 16px;
+      min-height: 92px;
+      .expertList {
+        padding: 5px 0px;
+        border-bottom: 1px dashed #ccc;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        .name {
+          font-size: 18px;
+          font-weight: bolder;
+        }
+        .field {
+          margin-top: 8px;
+          font-size: 16px;
+          color: #666;
+        }
+        .image {
+          margin-top: 5px;
+          .el-image {
+            border-radius: 90%;
+          }
+        }
+        .info1 {
+          padding: 6px 0px 1px 20px;
+        }
+      }
+    }
   }
   // 嘉宾，项目
   .jbxm {
     margin: 15px 0 0 0;
-    height: 500px;
+    // height: 500px;
     overflow: hidden;
     margin-bottom: 20px;
     .jiabinlist {
-      height: 450px;
+      max-height: 450px;
       margin-top: 10px;
       padding: 0px 16px;
       overflow-y: auto;
+      min-height: 70px;
       .jiabin {
         height: 70px;
         margin-bottom: 6px;
@@ -322,10 +428,11 @@ export default {
       }
     }
     .xmly {
-      height: 450px;
+      max-height: 450px;
       margin-top: 10px;
       padding: 0px 16px;
       overflow-y: auto;
+      min-height: 70px;
       .xmlylist {
         border-bottom: 1px dashed #ccc;
         height: 70px;
@@ -360,6 +467,7 @@ export default {
   }
   // 主办方
   .company {
+    margin: 15px 0 0 0;
     .name {
       margin: 0 0 20px 0;
       padding: 0 10px;
@@ -369,7 +477,7 @@ export default {
       }
       p:nth-child(1) {
         font-family: cursive;
-        font-size: 35px;
+        font-size: 30px;
         font-weight: bolder;
         text-shadow: 5px 5px 2px #ccc;
       }
@@ -382,13 +490,13 @@ export default {
 }
 // 标签样式重定义
 /deep/.van-tab {
-  font-size: 18px;
+  font-size: 16px;
 }
 /deep/.van-tabs--card > .van-tabs__wrap {
-  height: 40px;
+  height: 35px;
 }
 /deep/.van-tabs__nav--card {
-  height: 40px;
+  height: 35px;
   // margin: 0;
 }
 /deep/.van-tabs__nav--card {