shaogen1995 3 năm trước cách đây
mục cha
commit
bfa0b2002e

BIN
houtai/public/favicon.ico


BIN
web/public/favicon.ico


BIN
webM/public/favicon.ico


+ 1 - 1
webM/src/assets/base.css

@@ -144,6 +144,6 @@ body {
   display: none !important;
 }
 
-video{
+video {
   width: 100%;
 }

+ 1 - 1
webM/src/components/four.vue

@@ -18,7 +18,7 @@
             <img src="../assets/img/videoPlay.png" alt="" />
           </div>
         </div>
-        <video :src="baseURL + item.filePath"></video>
+        <video class="videoDom" autoplay muted :src="baseURL + item.filePath"></video>
       </div>
     </div>
     <!-- 数据加载中 -->

+ 2 - 2
webM/src/utils/request.js

@@ -1,8 +1,8 @@
 import axios from 'axios'
 const service = axios.create({
   // baseURL: 'http://192.168.0.135:8016', // 本地调试
-  // baseURL: 'http://project.4dage.com:8016', // 线上调试
-  baseURL: '', // build
+  baseURL: 'http://project.4dage.com:8016', // 线上调试
+  // baseURL: '', // build
   timeout: 5000
 })
 // 请求拦截器

+ 29 - 14
webM/src/views/info/index.vue

@@ -59,11 +59,11 @@
     <!-- 下面主要内容盒子 -->
     <div class="mainBox">
       <Son1 v-if="topDataInd === '1000'" @openLook="openLook" />
-      <Son2 v-else-if="topDataInd === '2000'"  @openLook="openLook"/>
-      <Son3 v-else-if="topDataInd === '3000'"  @openLook="openLook"/>
-      <Son4 v-else-if="topDataInd === '4000'"  @openLook="openLook"/>
-      <Son5 v-else-if="topDataInd === '5000'"  @openLook="openLook"/>
-      <Son6 v-else-if="topDataInd === '6000'"  @openLook="openLook"/>
+      <Son2 v-else-if="topDataInd === '2000'" @openLook="openLook" />
+      <Son3 v-else-if="topDataInd === '3000'" @openLook="openLook" />
+      <Son4 v-else-if="topDataInd === '4000'" @openLook="openLook" />
+      <Son5 v-else-if="topDataInd === '5000'" @openLook="openLook" />
+      <Son6 v-else-if="topDataInd === '6000'" @openLook="openLook" />
     </div>
     <!-- 查看视频的盒子 -->
     <div class="videoBox" v-if="lookShow === 'video'">
@@ -91,7 +91,7 @@ export default {
     return {
       lookShow: null,
       lookUrl: null,
-      lookPics:[],
+      lookPics: [],
       // 菜单数据
       topData: [],
       // 菜单的显示和隐藏
@@ -108,6 +108,8 @@ export default {
       pageGifLeft: 0,
       pageGifTim: null,
       pageOpcAc: false,
+      // 判断是安卓还是苹果,兼容滚动
+      isAndroid: true,
     };
   },
   //监听属性 类似于data概念
@@ -125,7 +127,9 @@ export default {
       dom.scrollTo({ left: 82 * (val - 1), behavior: "smooth" });
       // 控制页面滑动
       let pageDom = document.querySelector(".mainBox");
-      pageDom.scrollTo({ top: this.pageHei * val, behavior: "smooth" });
+      if (this.isAndroid)
+        pageDom.scrollTo({ top: this.pageHei * val, behavior: "smooth" });
+      else pageDom.scrollTop = this.pageHei * val;
 
       // // 切换的时候暂时视频
       // this.$nextTick(() => {
@@ -172,13 +176,24 @@ export default {
     this.leftData = res.data[0].children;
   }, //生命周期 - 挂载完成(可以访问DOM元素)
   mounted() {
-    // 获取页面盒子的高度
-    let pageDom = document.querySelector(".mainBox");
-    this.pageHei = pageDom.offsetHeight;
-    this.pageGifTim = setInterval(() => {
-      this.pageGifLeft += 29;
-      if (this.pageGifLeft >= 725) this.pageGifLeft = 0;
-    }, 100);
+    this.$nextTick(() => {
+      // 获取页面盒子的高度
+      let pageDom = document.querySelector(".mainBox");
+      this.pageHei = pageDom.offsetHeight;
+      this.pageGifTim = setInterval(() => {
+        this.pageGifLeft += 29;
+        if (this.pageGifLeft >= 725) this.pageGifLeft = 0;
+      }, 100);
+
+      // 滚动兼容问题-判断是苹果还是安卓
+      let u = navigator.userAgent;
+      if (u.indexOf("Android") > -1 || u.indexOf("Adr") > -1) {
+        this.isAndroid = true;
+      }
+      if (!!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/)) {
+        this.isAndroid = false;
+      }
+    });
   },
   beforeCreate() {}, //生命周期 - 创建之前
   beforeMount() {}, //生命周期 - 挂载之前