guhongwei 4 年之前
父節點
當前提交
4b9e63f71a
共有 2 個文件被更改,包括 47 次插入52 次删除
  1. 33 40
      src/views/hall/direct.vue
  2. 14 12
      src/views/market/index.vue

+ 33 - 40
src/views/hall/direct.vue

@@ -44,11 +44,15 @@
             <el-col :span="24" class="livevideo">
               <el-col :span="12" class="left">
                 <el-col :span="24" class="lefttop">
-                  <span style="color: rgb(255, 132, 0);">视频</span>
-                  <span>直播</span>
+                  <el-col :span="4" class="lefttopleft">
+                    <span style="color: rgb(255, 132, 0);">视频</span>
+                    <span>直播</span>
+                  </el-col>
+                  <el-col :span="20" class="lefttopright">
+                    <p class="textOver">{{ dockInfo.videointro }}</p>
+                  </el-col>
                 </el-col>
                 <el-col :span="24" class="leftvideo">
-                  <p class="title textOver">{{ dockInfo.videointro }}</p>
                   <el-col :span="24" class="video">
                     <video :src="dockInfo.file_path" autoplay="" controls="controls" v-if="dockInfo.file_path != null || ''">
                       您的浏览器不支持 video 标签。
@@ -487,13 +491,13 @@ export default {
     videoList: 'first',
     // // 视频是否显示
     // viewvideo: 'text',
-    // times: 5,
+    times: 300,
   }),
   async created() {
     this.$set(this, `dock_id`, this.$route.query.id);
     // 对接会详情
     await this.searchdock();
-    // this.daojishi();
+    this.daojishi();
   },
   methods: {
     ...mapProduct({ mapProductQuery: 'newquery' }),
@@ -717,19 +721,15 @@ export default {
       else return '暂无';
     },
     // 文字/视频倒计时
-    // daojishi() {
-    //   this.timer = setInterval(() => {
-    //     this.times--;
-    //     if (this.times === 0) {
-    //       if (this.dockInfo.file_path) {
-    //         this.viewvideo = 'video';
-    //       } else {
-    //         this.viewvideo = 'text';
-    //       }
-    //       clearInterval(this.timer);
-    //     }
-    //   }, 1000);
-    // },
+    daojishi() {
+      this.timer = setInterval(() => {
+        this.times--;
+        if (this.times === 0) {
+          location.reload();
+          clearInterval(this.timer);
+        }
+      }, 1000);
+    },
   },
   mounted() {
     this.channel();
@@ -828,23 +828,24 @@ export default {
       border-radius: 5px;
       .lefttop {
         padding: 0 10px;
-        height: 40px;
-        line-height: 40px;
-        font-size: 20px;
-        font-weight: 700;
-        border-bottom: 2px dashed #6e042c;
-      }
-      .leftvideo {
-        .title {
-          padding: 0 10px;
-          height: 30px;
-          line-height: 30px;
+        height: 60px;
+        .lefttopleft {
+          height: 60px;
+          line-height: 40px;
+          font-size: 20px;
+          font-weight: 700;
+        }
+        .lefttopright {
+          height: 60px;
+          line-height: 65px;
           font-weight: bolder;
           -webkit-text-stroke: 1px #6e042c;
           -webkit-text-fill-color: #fff;
           letter-spacing: 3px;
-          font-size: 16px;
+          font-size: 20px;
         }
+      }
+      .leftvideo {
         .video {
           padding: 5px 10px 10px 10px;
           height: 390px;
@@ -855,14 +856,6 @@ export default {
             background: #000;
             padding: 0px 0 15px 0px;
           }
-          // p {
-          //   background: #000;
-          //   text-align: center;
-          //   color: #fff;
-          //   padding: 90px 15px;
-          //   font-size: 30px;
-          //   height: 190px;
-          // }
           .videointro {
             background: #000;
             color: #fff;
@@ -871,11 +864,11 @@ export default {
             p:first-child {
               text-align: center;
               font-size: 30px;
-              padding: 10% 0 15px 0;
+              padding: 25% 0;
             }
             p:last-child {
               text-align: center;
-              font-size: 20px;
+              font-size: 30px;
               line-height: 35px;
               overflow: hidden;
               text-overflow: ellipsis;

+ 14 - 12
src/views/market/index.vue

@@ -27,18 +27,20 @@
                   >
                     <el-col :span="24" class="achieveImage">
                       <el-image v-if="item.image && item.image.length > 0" :src="item.image[0].url"></el-image>
-                      <el-image v-else :src="achievezb"></el-image>
-                      <el-col :span="24" class="company textOver">
-                        {{ item.company }}
-                      </el-col>
-                      <el-col :span="24" class="aName textOver">
-                        {{ item.name }}
-                      </el-col>
-                      <el-col :span="24" class="a-brief">{{ item.achievebrief }}</el-col>
-                      <el-col :span="24" class="cont">
-                        <el-col :span="24" class="a-field">领域:{{ item.field }}</el-col>
-                        <el-col :span="24" class="a-contacts">联系人:{{ item.contacts }}</el-col>
-                      </el-col>
+                      <span v-else>
+                        <el-image :src="achievezb"></el-image>
+                        <el-col :span="24" class="company textOver">
+                          {{ item.company }}
+                        </el-col>
+                        <el-col :span="24" class="aName textOver">
+                          {{ item.name }}
+                        </el-col>
+                        <el-col :span="24" class="a-brief">{{ item.achievebrief }}</el-col>
+                        <el-col :span="24" class="cont">
+                          <el-col :span="24" class="a-field">领域:{{ item.field }}</el-col>
+                          <el-col :span="24" class="a-contacts">联系人:{{ item.contacts }}</el-col>
+                        </el-col>
+                      </span>
                     </el-col>
                   </el-col>
                 </el-row>