From 2c08a98f7e85ec7c9376f27a7933e75e44d672f7 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 27 八月 2024 15:52:59 +0800
Subject: [PATCH] ll

---
 wechat_jiaxuan/components/disProduct/index.wxml |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/wechat_jiaxuan/components/disProduct/index.wxml b/wechat_jiaxuan/components/disProduct/index.wxml
index 0c14b19..38bb3cc 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxml
+++ b/wechat_jiaxuan/components/disProduct/index.wxml
@@ -15,15 +15,21 @@
       <view class="main_right">
         <scroll-view class="query_wrap_scroll" scroll-x>
           <view class="query_wrap">
-            <view data-index="{{index}}" wx:for="{{ secondCateList }}" class="item" bindtap="changeShowParams">
-              <view class="name">{{ item.tempParamName || item.labelName }}</view>
-              <van-icon name="{{ index == activeIndex ? 'arrow-up' : 'arrow-down' }}" />
-            </view>
+            <block wx:for="{{ secondCateList }}">
+              <view class="item" data-index="{{index}}"  bindtap="changeShowParams">
+                <view class="name">{{ item.tempParamName || item.labelName }}</view>
+                <van-icon name="{{ index == activeIndex && !item.openRelLabel && activeParam.length > 0 ? 'arrow-up' : 'arrow-down' }}" />
+              </view>
+              <view wx:if="{{item.relLabel && item.relLabel.labelCode}}" data-type="child" data-index="{{index}}" class="item" bindtap="changeShowParams">
+                <view class="name">{{ item.tempParamRelName || item.relLabel.labelName }}</view>
+                <van-icon name="{{ index == activeIndex && item.openRelLabel && activeParam.length > 0? 'arrow-up' : 'arrow-down' }}" />
+              </view>
+            </block>
           </view>
         </scroll-view>
         <view wx:if="{{ activeParam.length > 0 }}" class="query_form">
           <view class="list">
-            <view data-index="{{index}}" data-tempindex="{{item.tempParamIndex}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ secondCateList[activeIndex].tempParamIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
+            <view data-index="{{index}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ (!secondCateList[activeIndex].openRelLabel && secondCateList[activeIndex].tempParamIndex === index) || (secondCateList[activeIndex].openRelLabel && secondCateList[activeIndex].tempParamRelIndex === index)  ? 'active' : '' }}">{{ item.labelValueName }}</view>
           </view>
           <view class="btns">
             <view class="btn" bindtap="cancelParam">鍙栨秷</view>
@@ -31,17 +37,18 @@
           </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>
           <view class="separate"></view>
           <view class="item {{ sortType == 'time' ? 'active' : '' }}" data-status="time" bindtap="statusChange">鏈�鏂�</view>
         </view>
-        <scroll-view bindscrolltolower="scrolltolower" scroll-y enable-passive enable-flex class="goods_list">
+        <scroll-view bindscrolltoupper="bindscrolltoupper" binddragging="touchmove" binddragstart="touchstart" bindscrolltolower="scrolltolower" scroll-y enhanced class="goods_list">
+          <view class="empty"></view>
           <view wx:for="{{ datalist }}" data-id="{{item.id}}" class="item" bindtap="handleDetail">
             <view class="img_wrap">
-              <image src="{{ item.coverImage }}" class="img" mode="aspectFit"></image>
+              <image src="{{ item.coverImage }}" class="img" mode="aspectFill"></image>
               <image wx:if="{{ item.isNew }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
             </view>
             <view class="name">{{ item.title }}</view>

--
Gitblit v1.9.3