diff --git a/src/main.ts b/src/main.ts index 28e54a0e9..a69b2bf53 100644 --- a/src/main.ts +++ b/src/main.ts @@ -42,7 +42,7 @@ export const getServerConfig = async (): Promise => { return axios({ baseURL: "", method: "get", - url: (app.config.globalProperties.$baseUrl || "/") + "serverConfig.json" + url: process.env.NODE_ENV === 'production' ? "/manages/serverConfig.json" : "/serverConfig.json" }).then(({ data: config }) => { let $config = app.config.globalProperties.$config // 自动注入项目配置 diff --git a/src/style/index.scss b/src/style/index.scss index 461e97051..2ca0e41d8 100644 --- a/src/style/index.scss +++ b/src/style/index.scss @@ -20,7 +20,7 @@ label { } html { - overflow-x: hidden; + overflow: hidden; width: 100%; height: 100%; box-sizing: border-box; @@ -29,7 +29,7 @@ html { #app { width: 100%; height: 100%; - overflow-x: hidden; + overflow: hidden; } *, diff --git a/src/views/components/video/index.vue b/src/views/components/video/index.vue index f36d781de..3fb8d2ae9 100644 --- a/src/views/components/video/index.vue +++ b/src/views/components/video/index.vue @@ -6,9 +6,36 @@ import { onMounted } from "vue"; import Player from "xgplayer/dist/simple_player"; import { volume, playbackRate, screenShot } from "xgplayer/dist/controls"; + +export interface deviceInter { + match: any; +} export default { setup() { + // 检测设备类型(手机返回true,反之) + const deviceDetection = () => { + let sUserAgent: deviceInter = navigator.userAgent.toLowerCase(); + let bIsIpad = sUserAgent.match(/ipad/i) == "ipad"; + let bIsIphoneOs = sUserAgent.match(/iphone os/i) == "iphone os"; + let bIsMidp = sUserAgent.match(/midp/i) == "midp"; + let bIsUc7 = sUserAgent.match(/rv:1.2.3.4/i) == "rv:1.2.3.4"; + let bIsUc = sUserAgent.match(/ucweb/i) == "ucweb"; + let bIsAndroid = sUserAgent.match(/android/i) == "android"; + let bIsCE = sUserAgent.match(/windows ce/i) == "windows ce"; + let bIsWM = sUserAgent.match(/windows mobile/i) == "windows mobile"; + return bIsIphoneOs || + bIsMidp || + bIsUc7 || + bIsUc || + bIsAndroid || + bIsCE || + bIsWM + ? true + : false; + }; + onMounted(() => { + console.log("---", deviceDetection()); let player = new Player({ id: "mse", autoplay: false, @@ -17,7 +44,7 @@ export default { "https://sf1-hscdn-tos.pstatp.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-720p.mp4", poster: "https://s2.pstatp.com/cdn/expire-1-M/byted-player-videos/1.0.0/poster.jpg", - fluid: true, + fluid: deviceDetection() ? true : false, controlPlugins: [volume, playbackRate, screenShot], playbackRate: [0.5, 0.75, 1, 1.5, 2], //传入倍速可选数组 }); @@ -27,7 +54,7 @@ export default { }; -