更新

src/views/hall/direct.vue

@@ -42,17 +42,20 @@
         <div class="w_1200">
           <el-col :span="24" class="livemain">
             <el-col :span="24" class="livevideo">
-              <el-col :span="24" class="left">
+              <el-col :span="12" class="left">
                 <el-col :span="24" class="title" @click.native="$router.push({ path: '/live/hallDetail', query: { id: this.$route.query.id } })">
                   <span style="color: rgb(255, 132, 0);">现场</span>
                   <span>直播</span>
                 </el-col>
                 <el-col :span="24" class="video">
+                  <video :src="dockInfo.file_path" autoplay="autoplay" controls="controls" style="height: 395px; width: 100%;">
+                    您的浏览器不支持 video 标签。
+                  </video>
                   <div class="box">
                     <div class="con1" ref="con1" :class="{ anim: animate == true }" @mouseenter="mEnter" @mouseleave="mLeave">
                       <el-col class="lunboList" :span="24" v-for="(item, index) in lunboList" :key="index">
                         <p>
-                          <span>[{{ item.meta | getDate }}]</span>
+                          <span>[{{ item.date }}]</span>
                           <span>{{ item.type == '0' ? '欢迎' : '祝贺' }}</span>
                           <span v-if="item.type == '0'">{{ item.login_name }}</span>
                           <span v-if="item.type == '1'">{{ item.market_username }}</span>
@@ -76,13 +79,10 @@
                       </el-col>
                     </div>
                   </div>
-                  <!-- <video :src="dockInfo.file_path" controls="controls" style="height: 395px; width: 100%;">
-                    您的浏览器不支持 video 标签。
-                  </video> -->
                   <!-- <videoPlayer ref="videoPlayer" :options="videoOptions" class="vjs-custom-skin videoPlayer" :playsinline="true" /> -->
                 </el-col>
               </el-col>
-              <el-col :span="24" class="right">
+              <el-col :span="12" class="right">
                 <el-col :span="24">
                   <!-- <span>交易实况</span> -->
                   <el-tabs v-model="activeName" @tab-click="handleClicks">
@@ -646,7 +646,10 @@ export default {
       // 展会动态
       // 登录情况+交易情况
       let jioayi = await this.operaFetch({ dockid: this.dock_id });
-      console.log(jioayi);
+      for (const val of jioayi.data) {
+        var date = moment(val.meta.createdAt).format('YYYY-MM-DD hh:mm');
+        val.date = date;
+      }
       this.$set(this, `lunboList`, jioayi.data);
       // 展会动态结束
       let zxzd = await this.danceQuery({ dock_id: this.dock_id });
@@ -886,7 +889,6 @@ export default {
 }
 .livemain .livevideo .left {
   float: left;
-  width: 50%;
   height: 460px;
   overflow: hidden;
   border: 5px solid #000;
@@ -901,13 +903,14 @@ export default {
   font-weight: 700;
 }
 .livemain .livevideo .left .video {
+  position: relative;
   height: 400px;
   margin: 0 10px 10px 10px;
   border: 2px solid #ccc;
   width: 97%;
+  background-color: #000;
 }
 .livemain .livevideo .right {
-  width: 50%;
   height: 460px;
   overflow: hidden;
   background-color: #6e042c;
@@ -1481,17 +1484,31 @@ export default {
   }
 }
 .box {
+  position: absolute;
+  top: 0;
+  z-index: 999;
   width: 100%;
-  height: 400px;
+  height: 330px;
   overflow: hidden;
   .lunboList {
     height: 30px;
     line-height: 30px;
     padding: 0 10px;
+    font-weight: bold;
+    color: #ffffff8f;
     p {
       font-size: 16px;
     }
   }
+  // .lunboList:first-child {
+  //   color: #ff0000;
+  // }
+  // .lunboList:nth-child(2n) {
+  //   color: #ff4500;
+  // }
+  // .lunboList:nth-child(3n) {
+  //   color: #ffa500;
+  // }
 }
 .anim {
   transition: all 0.5s;