From 6df96b3e7a7da1985ee875e84711e9f15c5fbff0 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 24 十二月 2024 18:25:02 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
packageDomain/pages/resourceDetails/myVideo/index.wxml | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.wxml b/packageDomain/pages/resourceDetails/myVideo/index.wxml
index 8b3c41a..6046aab 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.wxml
+++ b/packageDomain/pages/resourceDetails/myVideo/index.wxml
@@ -1,30 +1,23 @@
<view>
- <!-- <view style="width: 100%; height: {{barHeight}}px; "></view>
- <view class="nacigationBar" style="width: 100%; height: {{navBarHeight}}px;">
- <view>
- <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
- </view>
- <view class="navbar-title">璧勬簮璇︽儏-瑙嗛</view>
- </view> -->
<!-- 瑙嗛 -->
<view class="videoBox" wx:if="{{videoChange}}">
<!-- autoplay='false' 鏄惁鑷姩鎾斁 -->
<!-- <video binderror="videoErrorCallback" src="{{showData}}" play-btn-position='center' object-fit='fill' controls enable-play-gesture enable-auto-rotation></video> -->
- <view wx:if="{{videoLoaidng}}" class="video-loading">
+ <view wx:if="{{videoLoading}}" class="video-loading">
<t-loading
theme="circular"
size="60rpx"
class="wrapper"
- loading="{{videoLoaidng}}"
+ loading="{{videoLoading}}"
/>
</view>
- <!-- <video show-center-play-btn="{{false}}" src="{{showData}}" bindloadedmetadata="loadedmetadata" bindtimeupdate="timeUpdate"></video> -->
<t-video
id="tvd"
- src="{{showData}}"
+ src="{{showDataVod}}"
style="width: 100%"
bindvideoloaded="loadedmetadata"
bindtimeupdate="timeUpdate"
+ wx:if="{{!videoLoading}}"
>
</t-video>
</view>
--
Gitblit v1.9.1