From b2d360d9113b6955287108ca9e90d76a1f3c1419 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 15:05:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
wechat_staff/components/disRealpic/index.wxml | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/wechat_staff/components/disRealpic/index.wxml b/wechat_staff/components/disRealpic/index.wxml
index f10a0d9..2ba68ec 100644
--- a/wechat_staff/components/disRealpic/index.wxml
+++ b/wechat_staff/components/disRealpic/index.wxml
@@ -1,5 +1,5 @@
<view class="app">
- <view class="home_top" style="top:{{ menuButtonInfo.top + menuButtonInfo.height + 6 }}px">
+ <view class="home_top">
<view class="search_wrap">
<image src="../../static/icon/ic_search@2x.png" mode="widthFix"></image>
<input bindconfirm="bindblur" model:value="{{ query }}" type="text" placeholder="鎼滅储瀹炴櫙鍚嶇О" />
@@ -7,7 +7,7 @@
</view>
<!-- -->
- <view class="home_content" style="padding-top:{{ menuButtonInfo.top + menuButtonInfo.height + 6 }}px;">
+ <view class="home_content">
<view class="main_content">
<scroll-view class="query_wrap_scroll" scroll-x>
<view class="query_wrap">
@@ -28,7 +28,7 @@
</view>
</view>
<view wx:if="{{ activeParam.length > 0 }}" class="shade"></view>
- <view class="status">
+ <view wx:if="{{ showTouch }}" animation="{{animationData}}" class="status">
<view class="item {{ sortType == '' ? 'active' : '' }}" data-status="" bindtap="statusChange">榛樿</view>
<view class="separate"></view>
<view class="item {{ sortType == 'greet' ? 'active' : '' }}" data-status="greet" bindtap="statusChange">鏈�鐑�</view>
@@ -36,16 +36,16 @@
<view class="item {{ sortType == 'time' ? 'active' : '' }}" data-status="time" bindtap="statusChange">鏈�鏂�</view>
</view>
<!-- goods_list -->
- <scroll-view bindscrolltolower="scrolltolower" scroll-y enable-passive enable-flex class="goods_list">
- <view wx:for="{{ dataList }}" data-index="index" data-item="{{item}}" class="item {{(index%2 == 0 && index == dataList.length-1)?'lastitem':''}}" bindtap="handleDetail">
- <view class="img_wrap">
+ <scroll-view bindscrolltoupper="bindscrolltoupper" binddragging="touchmove" binddragstart="touchstart" bindscrolltolower="scrolltolower" scroll-y enhanced class="goods_list">
+ <view class="empty"></view>
+ <view wx:for="{{ dataList }}" class="item {{(index%2 == 0 && index == dataList.length-1)?'lastitem':''}}">
+ <view data-item="{{item}}" bindtap="handleDetail" wx:if="{{ item.openType != 'video' }}" class="img_wrap">
<image src="{{ item.coverImage }}" class="img"></image>
<view wx:if="{{ item.openType == 'link' }}" data-item="{{item}}" bindtap="priviewFull" class="full">
<text>VR</text>
</view>
- <image wx:if="{{ item.openType == 'video' }}" bindtap="videoClick" data-videourl="{{ item.openContent }}" class="play" src="../../static/icon/ic_play.png" mode="widthFix"></image>
- <image wx:if="{{ false }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
</view>
+ <video id="video{{item.id}}" class="img_wrap" wx:if="{{ item.openType == 'video' }}" src="{{item.openContent}}" poster="{{ item.coverImage }}" data-id="{{ item.id }}" bindplay="videoClick"></video>
<view class="content">
<view class="name">{{ item.title }}</view>
</view>
@@ -63,7 +63,5 @@
</scroll-view>
</view>
</view>
-
- <videoPlay class="videoPlay"/>
</view>
<wxs module="format" src="../../utils/format.wxs"></wxs>
\ No newline at end of file
--
Gitblit v1.9.3