diff --git a/App.vue b/App.vue index 04ed5309..3937d177 100644 --- a/App.vue +++ b/App.vue @@ -7,10 +7,10 @@ data: { // 基础配置 // 数据接口请求地址 - request_url:'http://shopxo.com/', + request_url:'https://new.shopxo.vip/', // 静态资源地址(如系统根目录不在public目录下面请在静态地址后面加public目录、如:https://d1.shopxo.vip/public/) - static_url:'http://shopxo.com/', + static_url:'https://new.shopxo.vip/', // 系统类型(默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立) system_type: 'default', diff --git a/pages/plugins/live/pull/components/video/video.vue b/pages/plugins/live/pull/components/video/video.vue index 5de331f7..42127127 100644 --- a/pages/plugins/live/pull/components/video/video.vue +++ b/pages/plugins/live/pull/components/video/video.vue @@ -156,7 +156,7 @@ auto_play_success(e) { // 静音播放成功时,触发事件,提示用户需要修改点击修改播放状态 if (e) { - this.$emit('mutedAutoPlaySuccess'); + this.$emit('mutedAutoPlaySuccess', this.muted); } }, @@ -169,7 +169,13 @@ auto_play_error(e) { // 播放失败,并且是非静音状态,则静音播放尝试是否成功 if (!e) { - this.muted = true; + console.log(this.muted); + // 如果是静音播放了,但是还是播放失败 + if (this.muted) { + this.$emit('mutedAutoPlayError'); + } else { + this.muted = true; + } } }, diff --git a/pages/plugins/live/pull/pull.vue b/pages/plugins/live/pull/pull.vue index 35bc5781..2cdfec87 100644 --- a/pages/plugins/live/pull/pull.vue +++ b/pages/plugins/live/pull/pull.vue @@ -23,6 +23,10 @@ 因浏览器限制静音,请点击打开声音 + + + + @@ -55,12 +59,18 @@ return { theme_view: app.globalData.get_theme_value_view(), is_muted_auto_play_success: false, + is_muted_auto_play_error: false, initial_reminder: false } }, methods: { - muted_auto_play_success() { - this.is_muted_auto_play_success = true; + muted_auto_play_success(is_muted) { + if (is_muted) { + this.is_muted_auto_play_success = true; + } + }, + muted_auto_play_error() { + this.is_muted_auto_play_error = true; }, // 静音提示点击 muted_tap() { @@ -69,6 +79,8 @@ } // 关闭静音提示 this.is_muted_auto_play_success = false; + // 关闭播放按钮 + this.is_muted_auto_play_error = false; } }, } @@ -121,6 +133,26 @@ border-bottom: 1px solid rgba(210,27,70,1); } } + .live-play { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + z-index: 11; + width: 100%; + height: 100%; + .icon-bofang { + height: 200rpx; + width: 200rpx; + font-size: 200rpx !important; + color: inherit !important; + background: #fff; + border-radius: 50%; + display: flex; + align-items: center; + justify-content: center; + } + } .live-ended { background: linear-gradient(to bottom,#AD18F9,#05DFC7); position: absolute;