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/disProduct/index.wxml |   62 +++++--------------------------
 1 files changed, 10 insertions(+), 52 deletions(-)

diff --git a/wechat_jiaxuan/components/disProduct/index.wxml b/wechat_jiaxuan/components/disProduct/index.wxml
index d9ce151..c03500f 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxml
+++ b/wechat_jiaxuan/components/disProduct/index.wxml
@@ -1,25 +1,11 @@
 <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="main_left">
-      <view class="item active">鍏ㄥ眿瀹氬埗</view>
-      <view class="item">鍏ㄥ眿瀹氬埗</view>
-      <view class="item">鍏ㄥ眿瀹氬埗</view>
-      <view class="item">鍏ㄥ眿瀹氬埗</view>
-      <view class="item">鍏ㄥ眿瀹氬埗</view>
-      <view class="item">鍏ㄥ眿瀹氬埗</view>
-      <view class="item">鍏ㄥ眿瀹氬埗</view>
-      <view class="item">鍏ㄥ眿瀹氬埗</view>
-      <view class="item">鍏ㄥ眿瀹氬埗</view>
-      <view class="item">鍏ㄥ眿瀹氬埗</view>
-      <view class="item">鍏ㄥ眿瀹氬埗</view>
-      <view class="item">鍏ㄥ眿瀹氬埗</view>
-      <view class="item">鍏ㄥ眿瀹氬埗</view>
-      <view class="item">鍏ㄥ眿瀹氬埗</view>
-      <view class="item">鍏ㄥ眿瀹氬埗</view>
+      <view data-code="{{item.code}}" bindtap="cateClick" wx:for="{{cateList}}" class="item {{ catalogCode == item.code ? 'active' : '' }}">{{ item.name }}</view>
     </view>
     <view class="main_right">
       <view class="query_wrap">
@@ -59,53 +45,25 @@
         </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>
       <view class="goods_list">
-        <view class="item" bindtap="handleDetail">
+        <view wx:for="{{ datalist }}" data-id="{{item.id}}" class="item" bindtap="handleDetail">
           <view class="img_wrap">
-            <image src="../../static/icon/test.png" class="img"></image>
+            <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">閽㈢惔鏇�</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>
+            <text class="num {{true ? 'primary' : ''}}">{{ item.favoriteCount	 }}</text>
             <image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
-            <text>1000</text>
-          </view>
-        </view>
-        <view class="item">
-          <view class="img_wrap">
-            <image src="../../static/icon/test.png" class="img"></image>
-            <image wx:if="{{ true }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
-          </view>
-          <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 class="item">
-          <view class="img_wrap">
-            <image src="../../static/icon/test.png" class="img"></image>
-            <image wx:if="{{ true }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
-          </view>
-          <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.readCount }}</text>
           </view>
         </view>
       </view>

--
Gitblit v1.9.3