sileya-ai
/
vr-shopxo-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

master
gongfuxiang 2026-01-08 11:40:12 +08:00
parent 96864c8a31 7609952be5
commit 00d11fcda8
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pages/plugins/live/pull/components/video/video.vue
View File

@ -167,11 +167,6 @@
*/ */
// 自动播放失败, 静音播放 // 自动播放失败, 静音播放
auto_play_error() { auto_play_error() {
uni.showToast({
title: this.muted ? '静音播放失败' : '自动播放失败，已切换为静音播放',
icon: 'success',
mask: true
})
// 如果是静音播放了，但是还是播放失败 // 如果是静音播放了，但是还是播放失败
if (this.muted) { if (this.muted) {
this.$emit('mutedAutoPlayError'); this.$emit('mutedAutoPlayError');

10
pages/plugins/live/pull/pull.vue
View File

@ -1,7 +1,12 @@
<template> <template>
<view :class="theme_view + ' pr'"> <view :class="theme_view + ' pr'">
<view class="pr live-bg" @click="handle_click" @touchend="handle_touch_end" :data-ignore="false"> <view class="pr live-bg" @click="handle_click" @touchend="handle_touch_end" :data-ignore="false">
<<<<<<< HEAD
<component-live-video v-if="!is_live_ended" ref="liveVideo" :propSrc="live_video_src || 'https://live-pull-all.shopxo.vip/68f764013572f9240ca7ce6c/shopxo.m3u8'" @ended="ended" @loadedmetadata="loadedmetadata" @mutedAutoPlaySuccess="muted_auto_play_success" @mutedTap="muted_tap"></component-live-video> <component-live-video v-if="!is_live_ended" ref="liveVideo" :propSrc="live_video_src || 'https://live-pull-all.shopxo.vip/68f764013572f9240ca7ce6c/shopxo.m3u8'" @ended="ended" @loadedmetadata="loadedmetadata" @mutedAutoPlaySuccess="muted_auto_play_success" @mutedTap="muted_tap"></component-live-video>
=======
<text>{{ !is_live_ended && is_muted_auto_play_error && !live_be_right_back_error }}</text>
<component-live-video v-if="!is_live_ended" ref="liveVideo" :propSrc="live_video_src || 'http://live-pull-all.shopxo.vip/68f764013572f9240ca7ce6c/shopxo.m3u8'" @ended="ended" @loadedmetadata="loadedmetadata" @mutedAutoPlaySuccess="muted_auto_play_success" @mutedTap="muted_tap" @mutedAutoPlayError="muted_auto_play_error"></component-live-video>
>>>>>>> 7609952be5c0b05fb18c21255ae272784897d2ad
<!-- 简化版点赞效果组件 --> <!-- 简化版点赞效果组件 -->
<component-full-screen-like-effect ref="fullScreenLikeEffect" :propCustomImages="like_show_imgs"></component-full-screen-like-effect> <component-full-screen-like-effect ref="fullScreenLikeEffect" :propCustomImages="like_show_imgs"></component-full-screen-like-effect>
</view> </view>
@ -25,7 +30,7 @@
</view> </view>
<!-- 视频播放提示 --> <!-- 视频播放提示 -->
<view v-if="!is_live_ended && is_muted_auto_play_error && !live_be_right_back_error" class="live-play flex-row align-c jc-c pointer-events-none"> <view v-if="!is_live_ended && is_muted_auto_play_error && !live_be_right_back_error" class="live-play flex-row align-c jc-c pointer-events-none">
<component-icon propName="bofang" propSize="200rpx" propColor="#fff" @click="muted_tap"></component-icon> <component-icon propName="bofang" class="component-icon-play" propSize="200rpx" propColor="#fff" @click="muted_tap"></component-icon>
</view> </view>
<!-- 主播暂时离开的提示信息--> <!-- 主播暂时离开的提示信息-->
<view v-if="live_be_right_back_error" class="live-pause flex-row align-c jc-c pointer-events-none"> <view v-if="live_be_right_back_error" class="live-pause flex-row align-c jc-c pointer-events-none">
@ -141,7 +146,8 @@
z-index: 11; z-index: 11;
width: 100%; width: 100%;
height: 100%; height: 100%;
.icon-bofang { background: red;
.component-icon-play {
height: 200rpx; height: 200rpx;
width: 200rpx; width: 200rpx;
font-size: 200rpx !important; font-size: 200rpx !important;