From 14fbe95ee5c7f601da703614f7e1e4a8ec29c8ce Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 29 七月 2024 13:43:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_jiaxuan/components/disProduct/index.wxml | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/wechat_jiaxuan/components/disProduct/index.wxml b/wechat_jiaxuan/components/disProduct/index.wxml
index 578a03f..09c2d56 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxml
+++ b/wechat_jiaxuan/components/disProduct/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 bindconfirm="bindblur" bindblur="bindblur" model:value="{{ query }}" type="text" placeholder="鎼滅储浜у搧鍚嶇О" />
+ <input bindconfirm="bindblur" model:value="{{ query }}" type="text" placeholder="鎼滅储浜у搧鍚嶇О" />
</view>
</view>
<view class="home_content" style="padding-top:{{ menuButtonInfo.top + menuButtonInfo.height + 6 }}px;">
@@ -30,16 +30,16 @@
</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>
<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 src="{{ item.coverImage }}" class="img" mode="aspectFit"></image>
<image wx:if="{{ item.isNew }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
</view>
<view class="name">{{ item.title }}</view>
@@ -51,6 +51,9 @@
<text>{{ item.viewCount || 0 }}</text>
</view>
</view>
+ <view wx:if="{{ datalist.length == 0 }}" class="empty_wrap">
+ <image class="default_empty" src="../../static/images/default_empty.png"></image>
+ </view>
</scroll-view>
</view>
</view>
--
Gitblit v1.9.3