gengxin

public/static/liveIndex.html

@@ -52,6 +52,9 @@
  function btnDirect() {
      var query = window.location.search.substring(1);
      window.open('../direct?'+query)
+
+     
+   window.location.href = "../direct?id="+query
   }
 </script>
 </html>

src/layout/market/zhuanjia.vue

@@ -125,7 +125,7 @@ export default {
           this.$message.error('缺少卖家信息,请联系卖家或管理员');
           return;
         } else {
-          obj.seller_id = this.zhuanjiainfo.id;
+          obj.seller_id = this.zhuanjiainfo.uid;
           obj.seller_name = this.zhuanjiainfo.name;
         }
         console.log(obj);

src/views/direct.vue

@@ -8,7 +8,8 @@
                 <el-col v-else-if="">
                   <el-col else> -->
             <el-col :span="24" class="title">
-              吉林省计算中心对接直播大厅
+              <!-- 吉林省计算中心对接直播大厅 -->
+              {{ title }}
             </el-col>
             <el-col :span="24" class="zhuban">
               <span>主办方:</span>
@@ -21,23 +22,23 @@
               </p>
               <p>
                 <span>特邀嘉宾</span>
-                <span>1人</span>
+                <span>{{ expertList.length }}人</span>
               </p>
               <p>
                 <span>洽谈合作</span>
-                <span>1人</span>
+                <span>{{ qiatan }}人</span>
               </p>
               <p>
                 <span>达成意愿</span>
-                <span>1人</span>
+                <span>{{ dacheng }}人</span>
               </p>
               <p>
                 <span>展示成果</span>
-                <span>1人</span>
+                <span>{{ chengguo }}人</span>
               </p>
               <p>
                 <span>发布需求</span>
-                <span>1人</span>
+                <span>{{ xuqiu }}人</span>
               </p>
             </el-col>
           </div>
@@ -63,7 +64,8 @@
                 <el-col :span="24">
                   <ul>
                     <li v-for="(item, index) in directlist" :key="index">
-                      <span>[{{ item.time }}]</span> <span>{{ item.name1 }}</span> <span>与</span><span>{{ item.name2 }}</span
+                      <span> {{ item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || '' }}</span>
+                      <span>{{ item.market_username }}</span> <span>与</span><span>{{ item.username }}</span
                       ><span>实现对接</span>
                     </li>
                   </ul>
@@ -181,7 +183,8 @@
                       <el-col :span="20" class="info">
                         <p>
                           <span class="textOver">{{ item.name }}</span>
-                          <el-button size="mini" type="primary" @click="twoBtnDetail(item)">详情</el-button>
+                          <el-button size="mini" type="success" @click="zhuanjiaduijies(item)">对接</el-button>
+                          <el-button size="mini" type="primary" @click="twoBtnDetail(item)" style="margin:0 5px 0 5px">详情</el-button>
                         </p>
 
                         <p>
@@ -270,6 +273,7 @@ import chat from '@/components/parts/chat.vue';
 import directDetail from '@/layout/direct/directDetail.vue';
 import exportDetail from '@/layout/direct/exportDetail.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
+const { mapActions: transaction } = createNamespacedHelpers('transaction');
 const { mapActions: mapProduct } = createNamespacedHelpers('marketproduct');
 const { mapActions: market } = createNamespacedHelpers('market');
 const { mapActions: dock } = createNamespacedHelpers('dock');
@@ -387,6 +391,12 @@ export default {
         name1: '中科院宁波先进制造所',
         name2: '深圳市华尔威体育用品',
       },
+
+      {
+        time: '2019-03-05',
+        name1: '中科院宁波先进制造所',
+        name2: '深圳市华尔威体育用品',
+      },
     ],
     // 嘉宾访谈
     jiabinlist: [
@@ -419,18 +429,43 @@ export default {
     superOne: require('@/assets/live/main1.png'),
     two: require('@/assets/live/top_bg.png'),
     superOnes: require('@/assets/live/测试图片.jpg'),
+    title: '',
+    xuqiu: '',
+    chengguo: '',
+    qiatan: '',
+    dacheng: '',
   }),
   created() {
     this.searchInfo();
     this.searchzhanjia();
     this.searchchanpin();
     this.searchfuwu();
+    this.searchdock();
   },
   methods: {
     ...mapProduct({ mapProductQuery: 'newquery' }),
     ...market({ marketFetch: 'fetch' }),
-    ...dock({ dockQuery: 'query' }),
+    ...dock({ dockQuery: 'query', dockFetch: 'fetch' }),
     ...expertsuser({ expertQuery: 'query' }),
+    ...transaction({ tquery: 'query' }),
+    async searchdock() {
+      console.log(this.id);
+      let res = await this.dockFetch(this.id);
+      this.$set(this, `title`, res.data.title);
+      let aaa = await this.tquery({ skip: 0, limit: 9, status: 2 });
+      console.log(res.data);
+      this.$set(this, `directlist`, aaa.data);
+      let abb = await this.tquery({ status: 0 });
+      let acc = await this.tquery({ status: 1 });
+      this.$set(this, `dacheng`, acc.total);
+      this.$set(this, `qiatan`, abb.total);
+      this.$set(this, `chengguo`, aaa.total);
+      console.log(abb.total);
+      console.log(acc.total);
+      console.log(aaa.total);
+      let aff = await this.mapProductQuery();
+      this.$set(this, `xuqiu`, aff.total);
+    },
     //技术
     async searchInfo(newname) {
       let res = await this.mapProductQuery({ skip: 0, limit: 10, totaltype: '0', name: newname });
@@ -528,12 +563,21 @@ export default {
       this.dialogExport = true;
       this.$set(this, `exportInfo`, data);
     },
+
+    zhuanjiaduijies(data) {
+      this.$router.push({ path: '/live/hall/dock/zhanjiaduijie', query: { id: data.id } });
+    },
+
     // 关闭专家详情
     handleCloseExport(done) {
       done();
     },
   },
   computed: {
+    id() {
+      return this.$route.query.id;
+    },
+    ...mapState(['user']),
     pageTitle() {
       return `${this.$route.meta.title}`;
     },
@@ -960,7 +1004,7 @@ export default {
   width: 286px;
   height: 100px;
   z-index: 999;
-  left: 42%;
+  left: 72%;
   top: -6%;
   text-align: center;
   line-height: 100px;

src/views/hall/dock/zongjie.vue

@@ -6,7 +6,7 @@
         <el-col :span="24" class="info">
           <div class="w_1200">
             <el-col :span="24" class="top">
-              <p>{{ zjinfo.top }}展会总结</p>
+              <p>{{ zjinfo.top }}展会总结3333333333</p>
               <p>主办方：吉林省计算中心</p>
             </el-col>
             <el-col :span="24" class="main">
@@ -51,10 +51,11 @@
 <script>
 import _ from 'lodash';
 import { mapState, createNamespacedHelpers } from 'vuex';
-import chat from './parts/chat.vue';
-const { mapActions: mapProduct } = createNamespacedHelpers('marketproduct');
-const { mapActions: personalRoom } = createNamespacedHelpers('personalroom');
-const { mapActions: transaction } = createNamespacedHelpers('transaction');
+// import chat from './parts/chat.vue';
+// const { mapActions: mapProduct } = createNamespacedHelpers('marketproduct');
+// const { mapActions: personalRoom } = createNamespacedHelpers('personalroom');
+const { mapActions: dock } = createNamespacedHelpers('dock');
+
 export default {
   name: 'dockDetail',
   props: {},
@@ -87,15 +88,17 @@ export default {
       xiangmu: '233',
       xuqiu: '123',
     },
-    room: {},
   }),
   created() {
-    if (this.$route.query.id) {
-      this.searchInfo();
-    }
+    this.searchInfo();
+  },
+  methods: {
+
   },
-  methods: {},
   computed: {
+    id() {
+      return this.$route.query.id;
+    },
     ...mapState(['user']),
     pageTitle() {
       return `${this.$route.meta.title}`;

src/views/hallList/zongjie.vue

@@ -69,6 +69,10 @@
 </template>
 
 <script>
+import _ from 'lodash';
+import { mapState, createNamespacedHelpers } from 'vuex';
+
+const { mapActions: dock } = createNamespacedHelpers('dock');
 export default {
   name: 'zongjie',
   props: {},
@@ -102,9 +106,24 @@ export default {
       xuqiu: '123',
     },
   }),
-  created() {},
-  computed: {},
-  methods: {},
+  created() {
+    this.searchInfo();
+  },
+  computed: {
+    id() {
+      return this.$route.query.id;
+    },
+  },
+  methods: {
+    ...dock({ dockQuery: 'query', dockFetch: 'fetch' }),
+    async searchInfo() {
+      console.log('ccc');
+      let res = await this.dockFetch(this.id);
+      console.log('dad');
+      this.zjinfo.top = res.data.title;
+      console.log(res.data.title);
+    },
+  },
 };
 </script>