guhongwei 4 years ago
parent
commit
245d1e2554

+ 1 - 1
src/layout/login/webLogin.vue

@@ -40,7 +40,7 @@
                     <el-input v-model="forms.name" placeholder="请输入用户名称"></el-input>
                   </el-form-item>
                   <el-form-item label="手机号" prop="phone">
-                    <el-input v-model="forms.phone" placeholder="请输入手机号" :minlength="11" :maxlength="11"></el-input>
+                    <el-input v-model="forms.phone" placeholder="请输入手机号" :maxlength="11"></el-input>
                   </el-form-item>
                   <el-form-item label="登录密码" prop="password">
                     <el-input v-model="forms.password" placeholder="请输入登录密码" show-password></el-input>

+ 2 - 2
src/views/adminCenter/dockInfo/parts/dockInfo.vue

@@ -57,9 +57,9 @@
           <el-form-item label="视频文件标题">
             <el-input v-model="form.videointro" placeholder="请输入视频文件标题"></el-input>
           </el-form-item>
-          <el-form-item label="视频文件简介">
+          <!-- <el-form-item label="视频文件简介">
             <el-input v-model="form.videointroinfo" type="textarea" placeholder="请输入视频文件简介"></el-input>
-          </el-form-item>
+          </el-form-item> -->
 
           <el-form-item label="状态">
             <el-radio v-model="form.status" label="1">开始</el-radio>

+ 22 - 22
src/views/hall/direct.vue

@@ -50,13 +50,13 @@
                 <el-col :span="24" class="leftvideo">
                   <p class="title textOver">{{ dockInfo.videointro }}</p>
                   <el-col :span="24" class="video">
-                    <div class="videointro" v-if="viewvideo == 'text'">
-                      <p>{{ dockInfo.videointro }}</p>
-                      <p>{{ dockInfo.videointroinfo }}</p>
-                    </div>
-                    <video :src="dockInfo.file_path" autoplay="" controls="controls" v-else>
+                    <video :src="dockInfo.file_path" autoplay="" controls="controls" v-if="dockInfo.file_path != null || ''">
                       您的浏览器不支持 video 标签。
                     </video>
+                    <div class="videointro" v-else>
+                      <p>{{ dockInfo.videointro }}</p>
+                      <!-- <p>{{ dockInfo.videointroinfo }}</p> -->
+                    </div>
                   </el-col>
                 </el-col>
               </el-col>
@@ -485,15 +485,15 @@ export default {
     text: '',
     // 视频右侧聊天列表
     videoList: 'first',
-    // 视频是否显示
-    viewvideo: 'text',
-    times: 5,
+    // // 视频是否显示
+    // viewvideo: 'text',
+    // times: 5,
   }),
   async created() {
     this.$set(this, `dock_id`, this.$route.query.id);
     // 对接会详情
     await this.searchdock();
-    this.daojishi();
+    // this.daojishi();
   },
   methods: {
     ...mapProduct({ mapProductQuery: 'newquery' }),
@@ -717,19 +717,19 @@ 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) {
+    //       if (this.dockInfo.file_path) {
+    //         this.viewvideo = 'video';
+    //       } else {
+    //         this.viewvideo = 'text';
+    //       }
+    //       clearInterval(this.timer);
+    //     }
+    //   }, 1000);
+    // },
   },
   mounted() {
     this.channel();