From 816d84a76c1a2f16f88dba70664397961f55caa1 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 26 七月 2024 10:07:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_jiaxuan/components/disCase/index.wxml | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/wechat_jiaxuan/components/disCase/index.wxml b/wechat_jiaxuan/components/disCase/index.wxml
index e571ee8..9177b3a 100644
--- a/wechat_jiaxuan/components/disCase/index.wxml
+++ b/wechat_jiaxuan/components/disCase/index.wxml
@@ -2,7 +2,7 @@
<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="鎼滅储妗堜緥鍚嶇О" />
+ <input bindconfirm="bindblur" model:value="{{ query }}" type="text" placeholder="鎼滅储妗堜緥鍚嶇О" />
</view>
</view>
<!-- -->
@@ -26,12 +26,13 @@
<view bindtap="subParam" class="btn sub">纭</view>
</view>
</view>
+ <view wx:if="{{ activeParam.length > 0 }}" class="shade"></view>
<view class="status">
- <view class="item {{ sortType == 'NORMAL' ? 'active' : '' }}" data-status="NORMAL" bindtap="statusChange">榛樿</view>
+ <view class="item {{ sortType == '' ? 'active' : '' }}" data-status="" bindtap="statusChange">榛樿</view>
<view class="separate"></view>
- <view class="item {{ sortType == 'HOT' ? 'active' : '' }}" data-status="HOT" bindtap="statusChange">鏈�鐑�</view>
+ <view class="item {{ sortType == 'greet' ? 'active' : '' }}" data-status="greet" bindtap="statusChange">鏈�鐑�</view>
<view class="separate"></view>
- <view class="item {{ sortType == 'LATEST' ? 'active' : '' }}" data-status="LATEST" bindtap="statusChange">鏈�鏂�</view>
+ <view class="item {{ sortType == 'time' ? 'active' : '' }}" data-status="time" bindtap="statusChange">鏈�鏂�</view>
</view>
<!-- goods_list -->
<scroll-view bindscrolltolower="scrolltolower" scroll-y enable-passive enable-flex class="goods_list">
@@ -43,9 +44,9 @@
<view class="content">
<view class="name">{{ item.title }}</view>
<view class="info">
- <image wx:if="{{ !item.isCollection }}" data-code="like" bindtap="handleAction" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
+ <image wx:if="{{ !item.collection }}" 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>
+ <text class="num {{item.collection ? 'primary' : ''}}">{{ item.collectCount }}</text>
<image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
<text>{{ item.viewCount }}</text>
</view>
--
Gitblit v1.9.3