gengxin

src/views/direct.vue

@@ -33,11 +33,11 @@
                 <span>{{ dacheng }}项</span>
               </p>
               <p>
-                <span>展示成果</span>
+                <span>交易完成</span>
                 <span>{{ chengguo }}项</span>
               </p>
               <p>
-                <span>发布需求</span>
+                <span>参展项目</span>
                 <span>{{ xuqiu }}项</span>
               </p>
             </el-col>
@@ -57,19 +57,44 @@
               </el-col>
               <el-col :span="24" class="right">
                 <el-col :span="24">
-                  <p>
-                    <span>交易实况</span>
-                  </p>
-                </el-col>
-                <el-col :span="24">
-                  <ul>
-                    <li v-for="(item, index) in directlist" :key="index">
-                      <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>
+                  <!-- <span>交易实况</span> -->
+                  <el-tabs v-model="activeName" @tab-click="handleClicks">
+                    <el-tab-pane label="交易实况" name="first">
+                      <el-col :span="24">
+                        <ul>
+                          <li v-for="(item, index) in directlist" :key="index">
+                            <span> {{ item.time }}</span>
+                            <span>{{ item.market_username }}</span> <span>与</span><span>{{ item.username }}</span
+                            ><span>实现对接</span>
+                          </li>
+                        </ul>
+                      </el-col>
+                    </el-tab-pane>
+                    <el-tab-pane label="达成意向" name="second">
+                      <el-col :span="24" class="yixiang">
+                        <ul>
+                          <li v-for="(item, index) in yixianglist" :key="index">
+                            <span> {{ item.time }}</span>
+                            <span>{{ item.market_username }}</span> <span>与</span><span>{{ item.username }}</span
+                            ><span>实现对接</span>
+                          </li>
+                        </ul>
+                      </el-col>
+                    </el-tab-pane>
+                    <el-tab-pane label="合作成功" name="third">
+                      <el-col :span="24" class="yixiang">
+                        <ul>
+                          <li v-for="(item, index) in successlist" :key="index">
+                            <span> {{ item.time }}</span>
+                            <span>{{ item.market_username }}</span> <span>与</span><span>{{ item.username }}</span
+                            ><span>实现对接</span>
+                          </li>
+                        </ul>
+                      </el-col>
+                    </el-tab-pane>
+                  </el-tabs>
                 </el-col>
+                <!-- -->
               </el-col>
             </el-col>
             <el-col :span="24" class="newimage">
@@ -278,6 +303,7 @@ const { mapActions: mapProduct } = createNamespacedHelpers('marketproduct');
 const { mapActions: market } = createNamespacedHelpers('market');
 const { mapActions: dock } = createNamespacedHelpers('dock');
 const { mapActions: expertsuser } = createNamespacedHelpers('expertsuser');
+import moment from 'moment';
 
 import _ from 'loadsh';
 export default {
@@ -300,7 +326,9 @@ export default {
     exportDetail, //专家详情
   },
   data: () => ({
+    activeName: 'second',
     name: '',
+
     // 详情显示
     dialogVisible: false,
     // 技术，产品，服务详情
@@ -398,6 +426,10 @@ export default {
         name2: '深圳市华尔威体育用品',
       },
     ],
+    //达成意向
+    yixianglist: [],
+    //合作成功
+    successlist: [],
     // 嘉宾访谈
     jiabinlist: [
       {
@@ -449,15 +481,41 @@ export default {
     ...expertsuser({ expertQuery: 'query' }),
     ...transaction({ tquery: 'query' }),
     async searchdock() {
+      // 标题
       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 });
-      this.$set(this, `directlist`, aaa.data);
+      // 交易实况
+      let aaa = await this.tquery();
+      let newaaa = aaa.data.filter(f => f.status == '1' || f.status == '2');
+      for (const val of newaaa) {
+        var time = moment(val.meta.createdAt).format('YYYY-MM-DD hh:mm');
+        val.time = time;
+      }
+      console.log(newaaa);
+
+      this.$set(this, `directlist`, newaaa);
+      // 洽谈
       let abb = await this.tquery({ status: 0 });
+      this.$set(this, `qiatan`, abb.total);
+      // 意向
       let acc = await this.tquery({ status: 1 });
+
+      for (const val of acc.data) {
+        var time = moment(val.meta.createdAt).format('YYYY-MM-DD hh:mm');
+        val.time = time;
+      }
+
       this.$set(this, `dacheng`, acc.total);
-      this.$set(this, `qiatan`, abb.total);
-      this.$set(this, `chengguo`, aaa.total);
+      this.$set(this, `yixianglist`, acc.data);
+      // 成果
+      let aee = await this.tquery({ status: 2 });
+      for (const val of aee.data) {
+        var time = moment(val.meta.createdAt).format('YYYY-MM-DD hh:mm');
+        val.time = time;
+      }
+      this.$set(this, `chengguo`, aee.total);
+      this.$set(this, `successlist`, aee.data);
+      // 需求
       let aff = await this.mapProductQuery();
       this.$set(this, `xuqiu`, aff.total);
     },
@@ -562,6 +620,9 @@ export default {
     zhuanjiaduijies(data) {
       this.$router.push({ path: '/live/hall/dock/zhanjiaduijie', query: { id: data.id } });
     },
+    handleClicks(tab, event) {
+      console.log(tab, event);
+    },
 
     // 关闭专家详情
     handleCloseExport(done) {
@@ -692,7 +753,8 @@ export default {
   border-bottom-left-radius: 5px;
   overflow: hidden;
 }
-.livemain .livevideo .right p {
+
+/deep/.livemain .livevideo .right .el-tabs__nav-scroll {
   color: #fff;
   width: 100%;
   float: left;
@@ -701,6 +763,19 @@ export default {
   padding: 0 10px;
   background: #fe950e;
 }
+
+/deep/.livemain .livevideo .right .el-tabs__item {
+  color: #fff;
+}
+
+/deep/.livemain .livevideo .right .el-tabs__item.is-active {
+  color: #409eff;
+}
+
+/deep/.livemain .livevideo .right .el-tabs__item:hover {
+  color: #409eff;
+}
+
 .right ul {
   padding: 0;
   margin: 0;
@@ -717,12 +792,38 @@ export default {
   white-space: nowrap;
   text-overflow: ellipsis;
 }
+
 .right ul li span:first-child {
   color: #ff8500;
 }
 .right ul li span {
   margin: 0 20px 0 0;
 }
+
+.yixiang ul {
+  padding: 0;
+  margin: 0;
+}
+.yixiang ul li {
+  height: 43px;
+  line-height: 40px;
+  font-size: 14px;
+  color: #fff;
+  border-bottom: 1px solid #ff8500;
+  padding: 0 0 0 10px;
+  margin: 0 20px;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.yixiang ul li span:first-child {
+  color: #ff8500;
+}
+.yixiang ul li span {
+  margin: 0 20px 0 0;
+}
+
 // 图片
 .newimage {
   margin: 20px 0 0 0;

src/views/hall/hallDetail.vue

@@ -11,32 +11,6 @@
               <span>主办方:</span>
               <span>吉林省计算中心直播大厅</span>
             </div>
-            <div class="num">
-              <p>
-                <span>同时在线</span>
-                <span>1人</span>
-              </p>
-              <p>
-                <span>特邀嘉宾</span>
-                <span>1人</span>
-              </p>
-              <p>
-                <span>洽谈合作</span>
-                <span>1人</span>
-              </p>
-              <p>
-                <span>达成意愿</span>
-                <span>1人</span>
-              </p>
-              <p>
-                <span>展示成果</span>
-                <span>1人</span>
-              </p>
-              <p>
-                <span>发布需求</span>
-                <span>1人</span>
-              </p>
-            </div>
           </div>
         </div>
       </div>
@@ -69,6 +43,8 @@
             </el-col>
             <el-col :span="24" class="hallDetailInput" style="text-align:center">
               <wang-editor v-model="content" style="height:130px;padding-bottom:120px" ref="editor"></wang-editor>
+
+              <el-button type="primary" @click="fanhui">返回</el-button>
               <el-button type="primary" @click="sendMessage">发送</el-button>
             </el-col>
           </el-col>
@@ -139,6 +115,10 @@ export default {
         this.$set(this, `sellerList`, sellList);
       }
     },
+
+    fanhui() {
+      history.back();
+    },
     async sendMessage() {
       if (!this.user.uid) {
         this.$message.error('游客不能发言,请先注册');
@@ -221,11 +201,14 @@ export default {
 
 <style lang="less">
 @import '~@/style/style.css';
+
 .hallDetail {
   height: 800px;
   border: 1px solid red;
   margin: 0 0 20px 0;
+  background-color: #fff;
 }
+
 .hallDetail .left {
   height: 450px;
   border: 1px solid #cccccc;
@@ -255,13 +238,23 @@ export default {
   width: 70%;
 }
 
+.pz_main {
+  float: left;
+  width: 100%;
+  min-width: 1200px;
+  position: relative;
+  position: relative;
+  top: -55px;
+  z-index: 999;
+}
+
 .w_1200 {
   margin: auto;
   width: 1200px;
 }
 .livetop {
   width: 100%;
-  height: 487px;
+  height: 290px;
   overflow: hidden;
   background-image: url(../../assets/live/top_3.png);
 }
@@ -276,7 +269,7 @@ export default {
 
 .livetop .zhuban {
   position: relative;
-  top: 140px;
+  top: 115px;
   color: #fff;
   text-align: center;
   width: 100%;