Merge remote-tracking branch 'origin/master'

jiangping

2024-09-27 04b4bddaac0a222760113899568d20b45af701f4

 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>