Merge remote-tracking branch 'origin/master'

k94314517

2024-07-22 8d48f2f55453635bf60e5e00d1e4746288e9da67

 wechat_jiaxuan/components/disProduct/index.wxml

@@ -14,39 +14,18 @@
      </scroll-view>
      <view class="main_right">
        <view class="query_wrap">
          <view class="item" bindtap="changeOne">
            <view class="name">装修风格</view>
            <van-icon name="{{ showOne ? 'arrow-up' : 'arrow-down' }}" />
          </view>
          <view class="item" bindtap="changeTwo">
            <view class="name">空间名称</view>
            <van-icon name="{{ showTwo ? 'arrow-up' : 'arrow-down' }}" />
          <view data-index="{{index}}" wx:for="{{ secondCateList }}" class="item" bindtap="changeShowParams">
            <view class="name">{{ item.paramName || item.labelName }}</view>
            <van-icon name="{{ index == activeIndex ? 'arrow-up' : 'arrow-down' }}" />
          </view>
        </view>
        <view wx:if="{{ showOne }}" class="query_form">
        <view wx:if="{{ activeParam.length > 0 }}" class="query_form">
          <view class="list">
            <view class="item active">东芝电视</view>
            <view class="item">东芝啊的时撒的代电视</view>
            <view class="item">东芝电视</view>
            <view class="item">东芝电视</view>
            <view class="item">东芝电视</view>
            <view data-index="{{index}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ secondCateList[activeIndex].paramIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
          </view>
          <view class="btns">
            <view class="btn" bindtap="changeOne">取消</view>
            <view class="btn sub">确认</view>
          </view>
        </view>
        <view wx:if="{{ showTwo }}" class="query_form">
          <view class="list">
            <view class="item active">宜家</view>
            <view class="item">宜家</view>
            <view class="item">宜家</view>
            <view class="item">宜家</view>
            <view class="item">宜家</view>
          </view>
          <view class="btns">
            <view class="btn" bindtap="changeTwo">取消</view>
            <view class="btn sub">确认</view>
            <view class="btn" bindtap="cancelParam">取消</view>
            <view class="btn sub" bindtap="subParam">确认</view>
          </view>
        </view>
        <view class="status">
@@ -57,7 +36,6 @@
          <view class="item {{ sortType == 'LATEST' ? 'active' : '' }}" data-status="LATEST" bindtap="statusChange">最新</view>
        </view>
        <scroll-view bindscrolltolower="scrolltolower" scroll-y   enable-passive enable-flex class="goods_list">
          <!-- <view class="goods_list"> -->
            <view wx:for="{{ datalist }}" data-id="{{item.id}}" class="item" bindtap="handleDetail">
              <view class="img_wrap">
                <image src="{{ item.coverImage }}" class="img" mode="widthFix"></image>
@@ -72,7 +50,6 @@
                <text>{{ item.viewCount || 0 }}</text>
              </view>
            </view>
          <!-- </view> -->
        </scroll-view>
      </view>
    </view>