diff --git a/.local.config.js b/.local.config.js index e78d1de..c272e47 100644 --- a/.local.config.js +++ b/.local.config.js @@ -160,6 +160,10 @@ const localDevConfig = ({ uniacid: 228, domain: 'https://5g.aigc-quickapp.com/', }, + '2797': { // + uniacid: 2797, + domain: 'https://xcx.aigc-quickapp.com/', + }, // })['5g-237']; // 商品分类,没有立即咨询文字 // })['5g-97']; // 大宗商品贸易,支持自定义字体大小、颜色 // })['5g-50']; // 燃气安全产品机器人,购物车无反应 @@ -173,7 +177,7 @@ const localDevConfig = ({ // })['2724']; // 生物菌肥 // })['2811']; // 选择要使用的环境配置 // })['local-11']; // 选择要使用的环境配置 -})['228']; // 本地 +})['2797']; // 本地 // })['local-2']; // 本地 // })['local-11']; // 本地 // })['1-test']; // test diff --git a/components-diy/diy-video-list.vue b/components-diy/diy-video-list.vue index 2b651f2..b21db73 100644 --- a/components-diy/diy-video-list.vue +++ b/components-diy/diy-video-list.vue @@ -54,17 +54,21 @@ - @@ -144,7 +148,7 @@ export default { // 弹窗视频容器样式 popupVideoStyle() { - let style = 'position:fixed;width:100%;left:0;'; + let style = 'position:fixed;width:60%;left:50%;margin-left:-30%;'; const defaultRatio = 9 / 16; let ratio = defaultRatio; @@ -157,15 +161,15 @@ export default { if (isPortrait) { style += 'top:50%;transform:translateY(-50%);'; } else { - style += 'top:20%;'; + style += 'top:25%;'; } // #ifdef H5 - style += 'padding-top: ' + (ratio * 100) + '%;'; + style += 'height:0;padding-top: ' + (ratio * 100) + '%;'; // #endif // #ifdef MP-WEIXIN - style += 'padding-top: ' + (ratio * 100) + '%;'; + style += 'height:0;padding-top: ' + (ratio * 100) + '%;'; // #endif // #ifdef MP-HARMONY @@ -178,7 +182,12 @@ export default { methods: { // 显示视频播放弹窗 showVideo(item) { - this.video_url = item.videoUrl; + let url = item.videoUrl || ''; + // 处理视频URL:完整链接直接使用,否则通过 $util.img() 转换 + if (url && url.indexOf('http://') !== 0 && url.indexOf('https://') !== 0) { + url = this.$util.img(url); + } + this.video_url = url; this.popupVideoWidth = 0; this.popupVideoHeight = 0; this.$refs.videoPopup.open(); diff --git a/components-diy/diy-video.vue b/components-diy/diy-video.vue index f770f7a..3638023 100644 --- a/components-diy/diy-video.vue +++ b/components-diy/diy-video.vue @@ -11,6 +11,9 @@ :style="videoWarpCss" controls preload="metadata" + playsinline + webkit-playsinline + x5-playsinline @loadedmetadata="onVideoLoaded" @click="handlerClick(videoUrl)" > @@ -106,11 +109,11 @@ export default { } // #ifdef H5 - style += 'padding-top: ' + (ratio * 100) + '%;'; + style += 'height:0;padding-top: ' + (ratio * 100) + '%;'; // #endif // #ifdef MP-WEIXIN - style += 'padding-top: ' + (ratio * 100) + '%;'; + style += 'height:0;padding-top: ' + (ratio * 100) + '%;'; // #endif // #ifdef MP-HARMONY diff --git a/components/ns-video-player-popup/ns-video-player-popup.vue b/components/ns-video-player-popup/ns-video-player-popup.vue index e698390..7854046 100644 --- a/components/ns-video-player-popup/ns-video-player-popup.vue +++ b/components/ns-video-player-popup/ns-video-player-popup.vue @@ -9,9 +9,13 @@ {{ $lang('components.ns-video-player-popup.videoUrlNotExist') }} @@ -22,6 +26,8 @@