diff --git a/src/components/home/home.vue b/src/components/home/home.vue index bf4ea05..d09d599 100644 --- a/src/components/home/home.vue +++ b/src/components/home/home.vue @@ -820,7 +820,7 @@ export default { overflow: hidden; transform: translateX(100%); opacity: 0; - transition: all 0.3s; + transition: all 0.5s; &.active { opacity: 1; transform: translateX(0); diff --git a/src/utils/index.js b/src/utils/index.js index 8958411..efe43a1 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -106,3 +106,10 @@ export function timestampToTime(timestamp, format) { } } +/** +* @description:获取设备类型 +* @returns PC端为null,移动端为设备类型(Array) +*/ +export function getDeviceType() { + return navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i) +} diff --git a/src/views/login/login.vue b/src/views/login/login.vue index c2359c2..c7a8086 100644 --- a/src/views/login/login.vue +++ b/src/views/login/login.vue @@ -326,7 +326,7 @@ export default { .page { transform: translateX(100%); opacity: 0; - transition: all 0.3s; + transition: all 0.5s; &.active { opacity: 1; transform: translateX(0); diff --git a/src/views/model/downloadVideo.vue b/src/views/model/downloadVideo.vue index 9ea0e04..008c6d2 100644 --- a/src/views/model/downloadVideo.vue +++ b/src/views/model/downloadVideo.vue @@ -23,7 +23,7 @@ import Vue from "vue"; import { Toast } from "vant"; import { mapState, mapActions } from "vuex"; import HeadTop from "./../../components/common/head.vue"; -import { scrollToID, deepCopy } from "../../utils"; +import { scrollToID, getDeviceType } from "../../utils"; import { doGetVideoDetialById } from "../../api/downloadVideo"; @@ -79,13 +79,30 @@ export default { }, open() { + // 检测设备类型 + const deviceType = getDeviceType(); + let isAndroid = false; + if (!deviceType) { + // 设备类型为pc + isAndroid = false; + } else { + if (deviceType[0] == "Android") { + // 设备类型为安卓 + isAndroid = true; + } else { + // 其他设备 + isAndroid = false; + } + } + new Aliplayer( { id: "J_prismPlayer", cover: this.coverUrl, source: this.videoUrl, - width: "480px", - height: "854px", + // 安卓设备尺寸比其他设备小一半,需适配 + width: isAndroid ? "260px" : "480px", + height: isAndroid ? "427px" : "854px", // 以下可选设置 isLive: false, // 直播 rePlay: false, // 循环播放 diff --git a/src/views/model/getPaper copy.vue b/src/views/model/getPaper copy.vue deleted file mode 100644 index f419a67..0000000 --- a/src/views/model/getPaper copy.vue +++ /dev/null @@ -1,258 +0,0 @@ - - - - -