1

src/views/halltwo/directTwo.vue

@@ -267,6 +267,7 @@ import dockchat from './parts/dockchat.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: dock } = createNamespacedHelpers('dock');
 const { mapActions: expertsuser } = createNamespacedHelpers('expertsuser');
+const { mapActions: transaction } = createNamespacedHelpers('transaction');
 export default {
   metaInfo() {
     return { title: this.$route.meta.title };
@@ -318,72 +319,18 @@ export default {
       // 电子信息技术
       achievetwoList: [],
       // 生物与新医学技术
-      achievethreeList: [
-        {
-          name: '测试技术成果',
-          field: '生物与新医学技术',
-        },
-        {
-          name: '九条数据',
-          field: '生物与新医学技术',
-        },
-      ],
+      achievethreeList: [],
       // 航空航天技术
-      achievefourList: [
-        {
-          name: '测试技术成果',
-          field: '航空航天技术',
-        },
-        {
-          name: '九条数据',
-          field: '航空航天技术',
-        },
-      ],
+      achievefourList: [],
       // 科技需求
       techolName: 'first',
-      techoloneList: [
-        {
-          name: '测试技术成果',
-          field: '新材料技术',
-        },
-        {
-          name: '九条数据',
-          field: '新材料技术',
-        },
-      ],
+      techoloneList: [],
       // 新材料技术
-      techoltwoList: [
-        {
-          name: '科技需求',
-          field: '新材料技术',
-        },
-        {
-          name: '九条数据',
-          field: '新材料技术',
-        },
-      ],
+      techoltwoList: [],
       // 高技术服务业
-      techolthreeList: [
-        {
-          name: '科技需求',
-          field: '高技术服务业',
-        },
-        {
-          name: '九条数据',
-          field: '高技术服务业',
-        },
-      ],
+      techolthreeList: [],
       // 新能源及节能技术
-      techolfourList: [
-        {
-          name: '科技需求',
-          field: '新能源及节能技术',
-        },
-        {
-          name: '九条数据',
-          field: '新能源及节能技术',
-        },
-      ],
+      techolfourList: [],
       // 高校院所
       school: require('@a/zh_12.png'),
       schoolList: [
@@ -454,6 +401,7 @@ export default {
   methods: {
     ...dock({ dockQuery: 'query', dockFetch: 'fetch', goodsquery: 'goodsquery' }),
     ...expertsuser({ expertQuery: 'query' }),
+    ...transaction({ tquery: 'query' }),
     async searchInfo() {
       // 查询展会详情
       if (this.id) {
@@ -464,13 +412,35 @@ export default {
           let czxm = res.data.apply.map(item => item.goodsList);
           czxm = _.flattenDeep(czxm);
           let czxmNew = czxm.filter(item => item.dockStatus == '1');
+          // 技术成果
           let achieve = czxmNew.filter(i => i.type == '1');
           if (achieve.length > 0) {
-            // 技术成果全部
+            // 全部
             this.$set(this, `achieveoneList`, achieve);
             // 电子信息技术
             let achievetwoList = achieve.filter(i => i.field == '电子信息技术');
             this.$set(this, `achievetwoList`, achievetwoList);
+            // 生物与新医学技术
+            let achievethreeList = achieve.filter(i => i.field == '生物与新医学技术');
+            this.$set(this, `achievethreeList`, achievethreeList);
+            // 航空航天技术
+            let achievefourList = achieve.filter(i => i.field == '航空航天技术');
+            this.$set(this, `achievefourList`, achievefourList);
+          }
+          // 科技需求
+          let techol = czxmNew.filter(i => i.type == '0');
+          if (techol.length > 0) {
+            // 全部
+            this.$set(this, `techoloneList`, techol);
+            // 新材料技术
+            let techoltwoList = techol.filter(i => i.field == '新材料技术');
+            this.$set(this, `techoltwoList`, techoltwoList);
+            // 高技术服务业
+            let techolthreeList = techol.filter(i => i.field == '高技术服务业');
+            this.$set(this, `techolthreeList`, techolthreeList);
+            // 新能源及节能技术
+            let techolfourList = techol.filter(i => i.field == '新能源及节能技术');
+            this.$set(this, `techolfourList`, techolfourList);
           }
         }
       }
@@ -479,6 +449,9 @@ export default {
       if (this.$checkRes(res)) {
         this.$set(this, `expertList`, res.data);
       }
+      // 查询直播实况
+      let trans = await this.tquery({ dockid: this.id });
+      console.log(trans);
     },
   },
   computed: {

src/views/halltwo/parts/achieve.vue

@@ -40,7 +40,7 @@ export default {
 
 <style lang="less" scoped>
 .achieve {
-  height: 390px;
+  height: 380px;
   overflow: hidden;
   .list {
     padding: 9px 0;