From a3d2fe9dff3b6cd9fa8fdd91e87aac843f694c0f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 29 七月 2024 16:23:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 wechat_jiaxuan/pages/productVideo/index.wxml |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/wechat_jiaxuan/pages/productVideo/index.wxml b/wechat_jiaxuan/pages/productVideo/index.wxml
index d6c1608..41fe112 100644
--- a/wechat_jiaxuan/pages/productVideo/index.wxml
+++ b/wechat_jiaxuan/pages/productVideo/index.wxml
@@ -1,7 +1,7 @@
-<view class="container">
+<view class="container"  >
   <!-- 鍒嗙被 -->
   <view>
-    <scroll-view scroll-x="true" style="weight: 710rpx;margin-bottom: 30rpx;">
+    <scroll-view scroll-x="true" style="width: 710rpx;margin-bottom: 30rpx;" >
       <view class="scroll_cate">
         <view bindtap="cateClick" data-code="{{item.labelCode}}" wx:for="{{ category }}" class="item {{ tagCodes == item.labelCode ? 'active': '' }}">{{ item.labelName }}</view>
       </view>
@@ -13,7 +13,7 @@
     </scroll-view> -->
   </view>
   <!-- content -->
-  <view class="content">
+  <view class="content" >
     <view wx:for="{{ dataList }}" class="item">
       <view class="img_wrap">
         <image class="img" src="{{ item.coverImage }}" mode="aspectFill"></image>
@@ -29,5 +29,14 @@
         </view>
       </view>
     </view>
-  </view>
+    <view wx:if="{{ dataList.length == 0 }}" class="empty_wrap">
+      <image class="default_empty" src="../../static/images/default_empty.png"></image>
+    </view>
+  </view>  
+  <!-- <view wx:if="{{ isShow }}" bind:tap="onClose" class="video_content">   
+      <view  class="video">
+      <video    id="myVideo" src="{{curVideoSrc}}"  autoplay   show-fullscreen-btn show-play-btn ></video>
+      </view> 
+  </view > -->
+  <videoPlay class='videoPlay' /> 
 </view>
\ No newline at end of file

--
Gitblit v1.9.3