From 282ae8b61eed9a9eb81ac85a9c7f6899eb3652fd Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 29 七月 2024 19:26:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_jiaxuan/components/disRealpic/index.wxml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/wechat_jiaxuan/components/disRealpic/index.wxml b/wechat_jiaxuan/components/disRealpic/index.wxml
index 4842835..a42d9be 100644
--- a/wechat_jiaxuan/components/disRealpic/index.wxml
+++ b/wechat_jiaxuan/components/disRealpic/index.wxml
@@ -12,7 +12,7 @@
<scroll-view class="query_wrap_scroll" scroll-x>
<view class="query_wrap">
<view data-index="{{ index }}" wx:for="{{ cateList }}" class="item" bindtap="changeShowParams">
- <view class="name">{{ item.paramName || item.labelName }}</view>
+ <view class="name">{{ item.tempParamName || item.labelName }}</view>
<van-icon name="{{ activeIndex === index ? 'arrow-up' : 'arrow-down' }}" />
</view>
</view>
@@ -20,7 +20,7 @@
<!-- param -->
<view wx:if="{{ activeParam && activeParam.length > 0 }}" class="query_param">
<view class="list">
- <view data-index="{{index}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ cateList[activeIndex].paramIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
+ <view data-index="{{index}}" data-tempindex="{{item.tempParamIndex}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ cateList[activeIndex].tempParamIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
</view>
<view class="btns">
<view class="btn" bindtap="cancelParam">鍙栨秷</view>
@@ -40,9 +40,8 @@
<view wx:for="{{ dataList }}" data-item="{{item}}" class="item" bindtap="handleDetail">
<view class="img_wrap">
<image src="{{ item.coverImage }}" class="img"></image>
- <view wx:if="{{ item.openType == 'link' }}" data-item="{{item}}" bindtap="priviewFull" class="full">
- <image class="icon" src="../../static/icon/ic_720.png" mode="widthFix"></image>
- <text>鍏ㄦ櫙</text>
+ <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>
@@ -66,4 +65,5 @@
</view>
+ <videoPlay class="videoPlay"/>
</view>
\ No newline at end of file
--
Gitblit v1.9.3