Merge remote-tracking branch 'origin/master'

jiangping

2024-07-22 b7fd27a4a7ac72eef5fc142cae9bb63fe69ef233

 wechat_jiaxuan/components/disProduct/index.wxml

@@ -1,74 +1,60 @@
<view class="app">
  <view class="search_wrap">
    <image src="../../static/icon/ic_search@2x.png" mode="widthFix"></image>
    <input bindblur="bindblur" model:value="{{ search }}" type="text" placeholder="搜索产品名称" />
  </view>
  <view class="main_content">
    <view class="main_left">
      <view data-code="{{item.code}}" bindtap="cateClick" wx:for="{{cateList}}" class="item {{ catalogCode == item.code ? 'active' : '' }}">{{ item.name }}</view>
  <view class="home_top" style="top:{{ menuButtonInfo.top + menuButtonInfo.height + 6 }}px">
    <view class="search_wrap">
      <image src="../../static/icon/ic_search@2x.png" mode="widthFix"></image>
      <input bindblur="bindblur" model:value="{{ query }}" type="text" placeholder="搜索产品名称" />
    </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>
      </view>
      <view wx:if="{{ showOne }}" 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="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>
      </view>
      <view class="status">
        <view class="item {{ sortType == 'NORMAL' ? 'active' : '' }}" data-status="NORMAL" bindtap="statusChange">默认</view>
        <view class="separate"></view>
        <view class="item {{ sortType == 'HOT' ? 'active' : '' }}" data-status="HOT" bindtap="statusChange">最热</view>
        <view class="separate"></view>
        <view class="item {{ sortType == 'LATEST' ? 'active' : '' }}" data-status="LATEST" bindtap="statusChange">最新</view>
      </view>
      <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>
            <image wx:if="{{ true }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
          </view>
          <view class="name">{{ item.title }}</view>
          <view class="info">
            <image wx:if="{{ false }}" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
            <image wx:else="" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
            <text class="num {{true ? 'primary' : ''}}">{{ item.favoriteCount    }}</text>
            <image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
            <text>{{ item.readCount }}</text>
  </view>
  <view class="home_content" style="padding-top:{{ menuButtonInfo.top + menuButtonInfo.height + 6 }}px;">
    <view class="main_content">
      <scroll-view class="main_left" enable-flex scroll-y>
        <!-- <view class="main_left"> -->
          <view data-code="{{item.code}}" bindtap="cateClick" wx:for="{{cateList}}" class="item {{ catalogCode == item.code ? 'active' : '' }}">{{ item.name }}</view>
        <!-- </view> -->
      </scroll-view>
      <view class="main_right">
        <view class="query_wrap">
          <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="{{ activeParam.length > 0 }}" class="query_form">
          <view class="list">
            <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="cancelParam">取消</view>
            <view class="btn sub" bindtap="subParam">确认</view>
          </view>
        </view>
        <view class="status">
          <view class="item {{ sortType == 'NORMAL' ? 'active' : '' }}" data-status="NORMAL" bindtap="statusChange">默认</view>
          <view class="separate"></view>
          <view class="item {{ sortType == 'HOT' ? 'active' : '' }}" data-status="HOT" bindtap="statusChange">最热</view>
          <view class="separate"></view>
          <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 wx:for="{{ datalist }}" data-id="{{item.id}}" class="item" bindtap="handleDetail">
              <view class="img_wrap">
                <image src="{{ item.coverImage }}" class="img" mode="widthFix"></image>
                <image wx:if="{{ false }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
              </view>
              <view class="name">{{ item.title }}</view>
              <view class="info">
                <image wx:if="{{ !item.isCollection }}" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
                <image wx:else class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
                <text class="num {{item.isCollection ? 'primary' : ''}}">{{ item.collectCount || 0 }}</text>
                <image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
                <text>{{ item.viewCount || 0 }}</text>
              </view>
            </view>
        </scroll-view>
      </view>
    </view>
  </view>



</view>