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 | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/wechat_jiaxuan/pages/productVideo/index.wxml b/wechat_jiaxuan/pages/productVideo/index.wxml
index af7be5b..41fe112 100644
--- a/wechat_jiaxuan/pages/productVideo/index.wxml
+++ b/wechat_jiaxuan/pages/productVideo/index.wxml
@@ -1,9 +1,9 @@
-<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-index="{{index}}" wx:for="{{ category }}" class="item {{ index == 0 ? 'active': '' }}">{{ item }}</view>
+ <view bindtap="cateClick" data-code="{{item.labelCode}}" wx:for="{{ category }}" class="item {{ tagCodes == item.labelCode ? 'active': '' }}">{{ item.labelName }}</view>
</view>
</scroll-view>
<!-- <scroll-view scroll-x="true" style="weight: 710rpx;margin-bottom: 28rpx;">
@@ -13,10 +13,10 @@
</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="widthFix"></image>
+ <image class="img" src="{{ item.coverImage }}" mode="aspectFill"></image>
<image bindtap="itemClick" data-videourl="{{ item.videoUrl }}" class="play" src="../../static/icon/ic_play.png" mode="widthFix"></image>
</view>
@@ -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