1

src/views/dynamic/parts/userTwo.vue

@@ -25,11 +25,17 @@
             </el-col>
           </el-col>
           <el-col class="box" :span="5">
-            <el-col :span="24" class="four one">
+            <el-col :span="24" class="five one">
               <p>发布需求数量</p>
               <p>{{ detail.num4 }}</p>
             </el-col>
           </el-col>
+          <el-col class="box" :span="5">
+            <el-col :span="24" class="five one">
+              <p>交流互动</p>
+              <p>{{ detail.num5 }}</p>
+            </el-col>
+          </el-col>
           <el-col class="box" :span="5">
             <el-col :span="24" class="three one">
               <p>正在洽谈</p>
@@ -37,13 +43,13 @@
             </el-col>
           </el-col>
           <el-col class="box" :span="5">
-            <el-col :span="24" class="four one">
+            <el-col :span="24" class="two one">
               <p>达成意向</p>
               <p>{{ transaction2 }}</p>
             </el-col>
           </el-col>
           <el-col class="box" :span="5">
-            <el-col :span="24" class="two one">
+            <el-col :span="24" class="four one">
               <p>对接完成</p>
               <p>{{ transaction3 }}</p>
             </el-col>
@@ -60,6 +66,7 @@ const { mapActions: users } = createNamespacedHelpers('users');
 const { mapActions: expertsuser } = createNamespacedHelpers('expertsuser');
 const { mapActions: marketproduct } = createNamespacedHelpers('marketproduct');
 const { mapActions: transaction } = createNamespacedHelpers('transaction');
+const { mapActions: survey } = createNamespacedHelpers('survey');
 export default {
   name: 'userTwo',
   props: {},
@@ -77,6 +84,7 @@ export default {
       num2: 0,
       num3: 0,
       num4: 0,
+      num5: 0,
     },
   }),
   created() {
@@ -87,7 +95,7 @@ export default {
     ...expertsuser({ expertsuserQurty: 'query' }),
     ...marketproduct({ marketproductQuery: 'query' }),
     ...transaction({ transactionQuery: 'query' }),
-
+    ...survey({ surveyquery: 'query' }),
     async searchInfo({} = {}) {
       // 个人，企业
       let res = await this.userQuery();
@@ -97,7 +105,9 @@ export default {
       let exportNum = await this.expertsuserQurty();
       // 发布需求
       let productNum = await this.marketproductQuery({ status: 1 });
-      let listData = { num1: s2.length, num2: s1.length, num3: exportNum.data.length, num4: productNum.data.length };
+      // 在线咨询
+      let zxzx = await this.surveyquery();
+      let listData = { num1: s2.length, num2: s1.length, num3: exportNum.data.length, num4: productNum.data.length, num5: zxzx.total };
       this.$set(this, `detail`, listData);
       //交易
       let transaction1 = await this.transactionQuery({ status: 0 });
@@ -174,4 +184,8 @@ export default {
   background: url(../../../assets/dynamic4.png) no-repeat;
   background-size: 100% 100%;
 }
+.five {
+  background: url(../../../assets/dynamic2.png) no-repeat;
+  background-size: 100% 100%;
+}
 </style>

src/views/hall/direct.vue

@@ -124,6 +124,15 @@
                       </el-col>
                     </el-col>
                   </el-tab-pane>
+                  <el-tab-pane label="洽谈合作" name="second">
+                    <trainList :list="trainoneList"></trainList>
+                  </el-tab-pane>
+                  <el-tab-pane label="达成意向" name="third">
+                    <trainList :list="traintwoList"></trainList>
+                  </el-tab-pane>
+                  <el-tab-pane label="交易完成" name="fourth">
+                    <trainList :list="trainthreeList"></trainList>
+                  </el-tab-pane>
                 </el-tabs>
               </el-col>
             </el-col>
@@ -407,6 +416,8 @@ const { mapActions: dock } = createNamespacedHelpers('dock');
 const { mapActions: expertsuser } = createNamespacedHelpers('expertsuser');
 const { mapActions: newsguidance } = createNamespacedHelpers('newsguidance');
 const { mapActions: newsroadshow } = createNamespacedHelpers('newsroadshow');
+// 正在洽谈，达成意向，交易完成
+import trainList from './parts/trainList.vue';
 import moment from 'moment';
 import _ from 'loadsh';
 export default {
@@ -428,6 +439,7 @@ export default {
     liveFoot,
     directDetail, //技术，产品，服务详情
     expeDetail,
+    trainList,
   },
   data: () => ({
     hand: require('@/assets/emotion/flower2.gif'),
@@ -456,10 +468,6 @@ export default {
     expertimage: require('@/assets/live/222.png'),
     // 交易实况
     directlist: [],
-    //达成意向
-    yixianglist: [],
-    //合作成功
-    successlist: [],
     // 嘉宾访谈
     zxzdlist: [],
     // 路演
@@ -492,6 +500,10 @@ export default {
     // // 视频是否显示
     // viewvideo: 'text',
     times: 5,
+    // 洽谈，意向，完成
+    trainoneList: [],
+    traintwoList: [],
+    trainthreeList: [],
   }),
   async created() {
     this.$set(this, `dock_id`, this.$route.query.id);
@@ -543,6 +555,7 @@ export default {
       this.$set(this.statNum, `tyjb`, arr.data.length);
       // 洽谈合作
       let qthe = await this.tquery({ status: 0, dockid: this.id });
+      this.$set(this, `trainoneList`, qthe.data);
       this.$set(this.statNum, `qthz`, qthe.total);
       // 达成意向
       let dcyx = await this.tquery({ status: 1, dockid: this.id });
@@ -550,16 +563,16 @@ export default {
         var time = moment(val.meta.createdAt).format('YYYY-MM-DD hh:mm');
         val.time = time;
       }
+      this.$set(this, `traintwoList`, dcyx.data);
       this.$set(this.statNum, `dcyx`, dcyx.total);
-      this.$set(this, `yixianglist`, dcyx.data);
       // 交易完成&合作成功
       let jywc = await this.tquery({ status: 2, dockid: this.id });
       for (const val of jywc.data) {
         var time = moment(val.meta.createdAt).format('YYYY-MM-DD hh:mm');
         val.time = time;
       }
+      this.$set(this, `trainthreeList`, jywc.data);
       this.$set(this.statNum, `jywc`, jywc.total);
-      this.$set(this, `successlist`, jywc.data);
       //交易实况
       let jysk = await this.tquery({ dockid: this.id });
       let newjysk = jysk.data.filter(f => f.status == '1' || f.status == '2');

src/views/hall/parts/trainList.vue

@@ -0,0 +1,79 @@
+<template>
+  <div id="trainList">
+    <el-row>
+      <el-col :span="24" class="style">
+        <el-col :span="24" class="list" v-for="(item, index) in list" :key="index">
+          <span>[{{ getDate(item.meta.createdAt) }}]</span>
+          <span class="textOver">{{ item.market_username }}</span>
+          <span>与</span>
+          <span class="textOver">{{ item.username }}</span>
+          <span>{{ item.status == '0' ? '正在洽谈' : item.status == '1' ? '达成意向' : '交易完成' }}</span>
+        </el-col>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { mapState, createNamespacedHelpers } from 'vuex';
+var moment = require('moment');
+export default {
+  name: 'trainList',
+  props: {
+    list: { type: Array },
+  },
+  components: {},
+  data: function() {
+    return {};
+  },
+  created() {},
+  methods: {
+    getDate(value) {
+      let data = moment().format('HH:mm:ss');
+      if (data) return data;
+    },
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  watch: {},
+};
+</script>
+
+<style lang="less" scoped>
+.style {
+  padding: 0 10px;
+  height: 430px;
+  overflow-y: auto;
+  .list {
+    padding: 10px 0;
+    border-bottom: 1px dashed #ccc;
+    font-size: 16px;
+    span {
+      display: inline-block;
+    }
+    span:nth-child(1) {
+      color: #ff0000;
+      font-weight: bold;
+    }
+    span:nth-child(2) {
+      width: 33%;
+      top: 5px;
+      position: relative;
+      font-weight: bold;
+    }
+    span:nth-child(4) {
+      width: 33%;
+      top: 5px;
+      position: relative;
+      font-weight: bold;
+    }
+    span:nth-child(3) {
+      margin: 0 10px;
+    }
+    span:nth-child(5) {
+      float: right;
+    }
+  }
+}
+</style>