From bf99ae66d14857dfcd97dc6ccb8e82a38d3bd75f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 19 七月 2024 09:05:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_jiaxuan/components/disCase/index.wxml | 111 +++++++++++--------------------------------------------
1 files changed, 23 insertions(+), 88 deletions(-)
diff --git a/wechat_jiaxuan/components/disCase/index.wxml b/wechat_jiaxuan/components/disCase/index.wxml
index 0e72d83..b11fe30 100644
--- a/wechat_jiaxuan/components/disCase/index.wxml
+++ b/wechat_jiaxuan/components/disCase/index.wxml
@@ -1,115 +1,50 @@
<view class="app">
<view class="search_wrap">
<image src="../../static/icon/ic_search@2x.png" mode="widthFix"></image>
- <input type="text" placeholder="鎼滅储浜у搧鍚嶇О" />
+ <input bindblur="bindblur" model:value="{{ search }}" type="text" placeholder="鎼滅储妗堜緥鍚嶇О" />
</view>
<!-- -->
<view class="main_content">
- <view class="query_wrap">
- <view class="item" bindtap="changeShowParams">
- <view class="name">椋庢牸</view>
- <van-icon name="{{ showParams ? 'arrow-up' : 'arrow-down' }}" />
+ <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>
+ <van-icon name="{{ activeIndex === index ? 'arrow-up' : 'arrow-down' }}" />
+ </view>
</view>
- <view class="item" bindtap="changeShowParams">
- <view class="name">绌洪棿</view>
- <van-icon name="{{ showParams ? 'arrow-up' : 'arrow-down' }}" />
- </view>
- <view class="item" bindtap="changeShowParams">
- <view class="name">闂村悕</view>
- <van-icon name="{{ showParams ? 'arrow-up' : 'arrow-down' }}" />
- </view>
- <view class="item" bindtap="changeShowParams">
- <view class="name">闂寸О</view>
- <van-icon name="{{ showParams ? 'arrow-up' : 'arrow-down' }}" />
- </view>
- <view class="item" bindtap="changeShowParams">
- <view class="name">绌虹О</view>
- <van-icon name="{{ showParams ? 'arrow-up' : 'arrow-down' }}" />
- </view>
- </view>
- <view wx:if="{{ showParams }}" class="query_param">
+ </scroll-view>
+ <!-- param -->
+ <view wx:if="{{ activeParam && activeParam.length > 0 }}" class="query_param">
<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 {{ cateList[activeIndex].paramIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
</view>
<view class="btns">
- <view class="btn" bindtap="changeShowParams">鍙栨秷</view>
- <view class="btn sub">纭</view>
+ <view class="btn" bindtap="cancelParam">鍙栨秷</view>
+ <view bindtap="subParam" class="btn sub">纭</view>
</view>
</view>
<view class="status">
- <view class="item {{ activeStatus == '0' ? 'active' : '' }}" data-status="0" bindtap="statusChange">榛樿</view>
+ <view class="item {{ sortType == 'NORMAL' ? 'active' : '' }}" data-status="NORMAL" bindtap="statusChange">榛樿</view>
<view class="separate"></view>
- <view class="item {{ activeStatus == '1' ? 'active' : '' }}" data-status="1" bindtap="statusChange">鏈�鐑�</view>
+ <view class="item {{ sortType == 'HOT' ? 'active' : '' }}" data-status="HOT" bindtap="statusChange">鏈�鐑�</view>
<view class="separate"></view>
- <view class="item {{ activeStatus == '2' ? 'active' : '' }}" data-status="2" bindtap="statusChange">鏈�鏂�</view>
+ <view class="item {{ sortType == 'LATEST' ? 'active' : '' }}" data-status="LATEST" bindtap="statusChange">鏈�鏂�</view>
</view>
<!-- goods_list -->
<view class="goods_list">
- <view class="item" bindtap="handleDetail">
+ <view wx:for="{{ dataList }}" class="item" bindtap="handleDetail">
<view class="img_wrap">
- <image src="../../static/icon/test.png" class="img"></image>
+ <image src="{{ item.coverImage }}" class="img"></image>
<image wx:if="{{ false }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
</view>
<view class="content">
- <view class="name">閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸</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' : ''}}">34</text>
+ <image wx:if="{{ !item.isCollection }}" data-code="like" bindtap="handleAction" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
+ <image wx:else data-code="like_cancel" bindtap="handleAction" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+ <text class="num {{true ? 'primary' : ''}}">{{ item.collectCount }}</text>
<image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
- <text>1000</text>
- </view>
- </view>
- </view>
- <view class="item">
- <view class="img_wrap">
- <image src="../../static/icon/test.png" class="img"></image>
- <image wx:if="{{ false }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
- </view>
- <view class="content">
- <view class="name">閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸</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' : ''}}">34</text>
- <image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
- <text>1000</text>
- </view>
- </view>
- </view>
- <view class="item">
- <view class="img_wrap">
- <image src="../../static/icon/test.png" class="img"></image>
- <image wx:if="{{ false }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
- </view>
- <view class="content">
- <view class="name">閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸</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' : ''}}">34</text>
- <image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
- <text>1000</text>
- </view>
- </view>
- </view>
- <view class="item">
- <view class="img_wrap">
- <image src="../../static/icon/test.png" class="img"></image>
- <image wx:if="{{ false }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
- </view>
- <view class="content">
- <view class="name">閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸</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' : ''}}">34</text>
- <image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
- <text>1000</text>
+ <text>{{ item.viewCount }}</text>
</view>
</view>
</view>
--
Gitblit v1.9.3