From 74dd03c93a6499ee165502a0f25a07adc5cf0a86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E9=A3=9E=E6=B4=8B?=
 <15778543+xufeiyang6017@user.noreply.gitee.com>
Date: Mon, 5 Jan 2026 14:18:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=81=E8=AE=B8=E6=9F=A5=E7=9C=8B=E5=B7=B2?=
 =?UTF-8?q?=E4=B8=8B=E6=9E=B6=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=EF=BC=9A?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4sold=5Fout=E7=8A=B6=E6=80=81=E9=99=90?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/buyer/index.js       |  5 +++--
 pages/favorites/index.js   |  4 ++--
 pages/favorites/index.wxml | 17 +++++++++--------
 pages/index/index.js       |  4 ++--
 pages/index/index.wxml     |  1 +
 pages/index/index.wxss     |  5 +++++
 utils/api.js               | 20 +++++++++++++++++---
 7 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/pages/buyer/index.js b/pages/buyer/index.js
index b07a174..f458f36 100644
--- a/pages/buyer/index.js
+++ b/pages/buyer/index.js
@@ -672,7 +672,7 @@ Page({
 
       // ✅ 修改：添加分页参数
       const { pageSize } = this.data;
-      API.getProductList('published', {
+      API.getProductList(['published', 'sold_out'], {
         viewMode: 'shopping',
         page: 1,           // 第一页
         pageSize: pageSize // 使用配置的页面大小
@@ -831,7 +831,7 @@ Page({
     }
 
     console.log('准备调用API.getProductList，无论是否登录都尝试获取公开商品');
-    return API.getProductList('published', {
+    return API.getProductList(['published', 'sold_out'], {
       timestamp: timestamp,
       viewMode: 'shopping',
       page: currentPage,
@@ -1731,6 +1731,7 @@ Page({
     }
     
     const goodsItem = e.currentTarget.dataset.item;
+    
     // 跳转到商品详情页面，并传递商品数据，使用encodeURIComponent编码JSON字符串
     wx.navigateTo({
       url: '/pages/goods-detail/goods-detail?goodsData=' + encodeURIComponent(JSON.stringify(goodsItem))
diff --git a/pages/favorites/index.js b/pages/favorites/index.js
index d818754..a33a0fb 100644
--- a/pages/favorites/index.js
+++ b/pages/favorites/index.js
@@ -205,7 +205,7 @@ Page({
     }
 
     // 首先获取所有商品列表，确保包含联系人信息
-    API.getProductList('published', {
+    API.getProductList(['published', 'sold_out'], {
       page: 1,
       pageSize: 100 // 获取足够多的商品，确保包含所有收藏商品
     }).then(productListRes => {
@@ -402,7 +402,7 @@ Page({
     
     // 调用API.getProductList获取完整的商品列表，确保包含联系人信息
     wx.showLoading({ title: '加载中' });
-    API.getProductList('published', {
+    API.getProductList(['published', 'sold_out'], {
       page: 1,
       pageSize: 100 // 获取足够多的商品，确保包含当前商品
     }).then(productListRes => {
diff --git a/pages/favorites/index.wxml b/pages/favorites/index.wxml
index 8b381e5..5f6f81f 100644
--- a/pages/favorites/index.wxml
+++ b/pages/favorites/index.wxml
@@ -15,7 +15,7 @@
 
   <!-- 收藏列表 -->
   <view wx:else class="goods-list" style="width: 100%; display: flex; flex-direction: column; align-items: flex-start;">
-    <view wx:for="{{favoritesList}}" wx:key="productId" class="card" style="width: 100%; margin-top: 0; margin-bottom: 20rpx;">
+    <view wx:for="{{favoritesList}}" wx:key="productId" class="card" style="width: 100%; margin-top: 0; margin-bottom: 20rpx; height: 272rpx; display: block; box-sizing: border-box">
       <!-- 图片和信息2:3比例并排显示，整体高度固定 -->
       <view style="display: flex; width: 100%; height: 200rpx; border-radius: 8rpx; overflow: hidden; background-color: #f5f5f5;">
         <!-- 左侧图片区域 40%宽度（2/5），高度固定 -->
@@ -37,7 +37,7 @@
               data-item-id="{{index}}">
               <block wx:for="{{item.Product.imageUrls}}" wx:for-item="img" wx:for-index="idx" wx:key="idx">
                 <swiper-item>
-                  <image src="{{img}}" mode="aspectFill" style="width: 100%; height: 100%;" bindtap="previewImage" data-urls="{{item.Product.imageUrls}}" data-index="{{idx}}"></image>
+                  <image src="{{img}}" mode="aspectFill" style="width: 268rpx; height: 210rpx; display: inline-block; box-sizing: border-box" bindtap="previewImage" data-urls="{{item.Product.imageUrls}}" data-index="{{idx}}"></image>
                 </swiper-item>
               </block>
             </swiper>
@@ -51,28 +51,29 @@
         <!-- 右侧信息区域 60%宽度（3/5），相应调整 -->
         <view style="width: 60%; display: flex; flex-direction: column; background-color: white; border-left: 1rpx solid #f0f0f0;">
             <!-- 上半部分商品信息区域（60%高度），可点击查看详情 -->
-          <view style="flex: 0.6; padding: 0rpx 15rpx 15rpx 15rpx; cursor: pointer;" bindtap="goToGoodsDetail" data-item="{{item}}">
-            <view>
+          <view style="padding: 0rpx 15rpx 15rpx 15rpx; cursor: pointer; width: 391rpx; height: 150rpx; display: block; box-sizing: border-box" bindtap="goToGoodsDetail" data-item="{{item}}">
+            <view style="width: 362rpx; height: 133rpx; display: block; box-sizing: border-box">
                 <view style="display: flex; align-items: center; justify-content: space-between; margin-bottom: 10rpx;">
                   <view style="display: flex; align-items: center; flex: 1;">
-                    <view style="display: inline-block; margin-right: 10rpx; font-size: 18rpx; color: #fff; background: rgba(218, 165, 32, 0.8); padding: 4rpx 10rpx; border-radius: 15rpx; vertical-align: middle; backdrop-filter: blur(10rpx); border: 1rpx solid rgba(255, 255, 255, 0.3); box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.15), inset 0 1rpx 0 rgba(255, 255, 255, 0.5); text-shadow: 0 1rpx 2rpx rgba(0, 0, 0, 0.2); font-weight: bold; margin-top: -0.1rpx;">{{item.Product.supplyStatus || '暂无状态'}}</view>
+                    <view wx:if="{{item.Product.status === 'sold_out'}}" style="display: inline-block; margin-right: 10rpx; font-size: 18rpx; color: #fff; background: linear-gradient(135deg, #8c8c8c 0%, #a6a6a6 100%); padding: 4rpx 10rpx; border-radius: 15rpx; vertical-align: middle; backdrop-filter: blur(10rpx); border: 1rpx solid rgba(255, 255, 255, 0.3); box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.15), inset 0 1rpx 0 rgba(255, 255, 255, 0.5); text-shadow: 0 1rpx 2rpx rgba(0, 0, 0, 0.2); font-weight: bold; margin-top: -0.1rpx;">已下架</view>
+                    <view wx:elif="{{item.Product.supplyStatus}}" style="display: inline-block; margin-right: 10rpx; font-size: 18rpx; color: #fff; background: rgba(218, 165, 32, 0.8); padding: 4rpx 10rpx; border-radius: 15rpx; vertical-align: middle; backdrop-filter: blur(10rpx); border: 1rpx solid rgba(255, 255, 255, 0.3); box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.15), inset 0 1rpx 0 rgba(255, 255, 255, 0.5); text-shadow: 0 1rpx 2rpx rgba(0, 0, 0, 0.2); font-weight: bold; margin-top: -0.1rpx;">{{item.Product.supplyStatus}}</view>
                     <text style="font-size: 36rpx; font-weight: bold;">{{item.Product.productName || '未命名商品'}}</text>
                     <span style="vertical-align: middle; font-size: 12rpx; color: white; background: linear-gradient(135deg, #4a90e2 0%, #2b66f0 50%, #1a4bbd 100%); padding: 4rpx 10rpx; clip-path: polygon(50% 0%, 70% 10%, 100% 30%, 100% 70%, 70% 90%, 50% 100%, 30% 90%, 0% 70%, 0% 30%, 30% 10%); margin-left: 8rpx; box-shadow: 0 2rpx 4rpx rgba(0, 0, 0, 0.3), inset 0 1rpx 2rpx rgba(255, 255, 255, 0.5); text-shadow: 0 1rpx 2rpx rgba(0, 0, 0, 0.5); font-weight: bold; margin-top: -20rpx;">V</span>
                   </view>
                 </view>
-              <view style="font-size: 28rpx; color: #888; margin-top: 30rpx;">
+              <view style="font-size: 28rpx; color: #888; margin-top: 30rpx; width: 362rpx; height: 70rpx; display: block; box-sizing: border-box">
                 {{(item.Product.spec && item.Product.spec !== '无') ? item.Product.spec : (item.Product.specification && item.Product.specification !== '无') ? item.Product.specification : '无'}} | {{item.Product.yolk || '无'}} | {{item.Product.minOrder || item.Product.quantity || 1}}件
               </view>
             </view>
           </view>
           
           <!-- 下半部分按钮区域（40%高度） -->
-          <view style="flex: 0.4; display: flex; justify-content: space-between; align-items: center; padding: 0 20rpx;">
+          <view style="display: flex; justify-content: space-between; align-items: center; padding: 0 20rpx; height: 79rpx; box-sizing: border-box; width: 391rpx">
             <!-- 价格显示 -->
             <text style="color: #52c41a; font-size: 28rpx; font-weight: bold;">¥{{item.Product.price || 0}}</text>
             <!-- 取消收藏按钮 -->
           <button 
-            style="font-size: 24rpx; font-weight: bold; width: 150rpx; height: 60rpx; border-radius: 24rpx; display: flex; justify-content: center; align-items: center; padding: 0; border: none; margin: 0; transition: all 0.3s ease; position: relative; overflow: hidden; color: #FF6B6B; background: rgba(255, 107, 107, 0.15); backdrop-filter: blur(12rpx); -webkit-backdrop-filter: blur(12rpx); border: 1rpx solid rgba(255, 255, 255, 0.3); box-shadow: 0 8rpx 32rpx rgba(31, 38, 135, 0.2), 0 4rpx 16rpx rgba(0, 0, 0, 0.1), inset 0 2rpx 4rpx rgba(255, 255, 255, 0.7), inset 0 -2rpx 4rpx rgba(0, 0, 0, 0.1);"
+            style="font-size: 24rpx; font-weight: bold; width: 149rpx; height: 58rpx; border-radius: 24rpx; display: flex; justify-content: center; align-items: center; padding: 0; border: none; margin: 0; transition: all 0.3s ease; position: relative; overflow: hidden; color: #FF6B6B; background: rgba(255, 107, 107, 0.15); backdrop-filter: blur(12rpx); -webkit-backdrop-filter: blur(12rpx); box-shadow: 0 8rpx 32rpx rgba(31, 38, 135, 0.2), 0 4rpx 16rpx rgba(0, 0, 0, 0.1), inset 0 2rpx 4rpx rgba(255, 255, 255, 0.7), inset 0 -2rpx 4rpx rgba(0, 0, 0, 0.1); box-sizing: border-box; left: 6rpx; top: -11rpx"
             bindtap="cancelFavorite"
             data-productid="{{item.productId}}"
           >
diff --git a/pages/index/index.js b/pages/index/index.js
index 1824e97..b44ed16 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -411,7 +411,7 @@ Page({
       lastDataTimestamp: 0
     });
     
-    API.getProductList('published', {
+    API.getProductList(['published', 'sold_out'], {
       timestamp: timestamp,
       viewMode: 'shopping',
       page: 1,
@@ -869,7 +869,7 @@ Page({
     const timestamp = new Date().getTime();
     const page = isLoadMore ? this.data.page : 1
     
-    API.getProductList('published', {
+    API.getProductList(['published', 'sold_out'], {
       timestamp: timestamp,
       viewMode: 'shopping',
       page: page,
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index e3f30f4..68f3328 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -179,6 +179,7 @@
                   style="height: 270rpx; display: block; box-sizing: border-box; width: 337rpx; position: absolute; top: 0; left: 0; right: 0; bottom: 0; z-index: 1;"></image>
                 <view wx:if="{{item.supplyStatus === '预售'}}" class="promo-tag presale">预售</view>
                 <view wx:if="{{item.supplyStatus === '现货'}}" class="promo-tag in-stock">现货</view>
+                <view wx:if="{{item.status === 'sold_out'}}" class="promo-tag sold-out">已下架</view>
               </view>
               <view class="product-info" style="height: 190rpx; display: flex; box-sizing: border-box">
                 <view class="product-title" style="height: 38rpx; display: -webkit-box; box-sizing: border-box">{{item.name}}</view>
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index f1f43ea..1bdbef9 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1390,6 +1390,11 @@ video.product-media {
   box-shadow: 0 2rpx 8rpx rgba(255, 0, 0, 0.3);
 }
 
+.promo-tag.sold-out {
+  background: linear-gradient(135deg, #8c8c8c 0%, #a6a6a6 100%);
+  box-shadow: 0 2rpx 8rpx rgba(140, 140, 140, 0.3);
+}
+
 /* 商品信息区域 */
 .product-info {
   padding: 16rpx;
diff --git a/utils/api.js b/utils/api.js
index a2243d5..7282539 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -1451,7 +1451,21 @@ module.exports = {
   // 获取商品列表 - 支持未登录用户查看公开商品
   getProductList: function (status = 'published', options = {}) {
     const openid = wx.getStorageSync('openid');
-    console.log('API.getProductList - openid:', openid ? '存在' : '不存在', 'status:', status);
+    
+    // 处理status参数，支持字符串或数组格式
+    let statusList = [];
+    if (Array.isArray(status)) {
+      // 如果传入的是数组，直接使用
+      statusList = status;
+    } else if (typeof status === 'string' && status.includes(',')) {
+      // 如果是逗号分隔的字符串，转换为数组
+      statusList = status.split(',').map(s => s.trim());
+    } else {
+      // 单个状态值，转换为数组
+      statusList = [status];
+    }
+    
+    console.log('API.getProductList - openid:', openid ? '存在' : '不存在', 'statusList:', statusList);
 
     // 不再因为没有openid而拒绝请求，允许未登录用户查看公开商品
 
@@ -1461,7 +1475,7 @@ module.exports = {
 
     // 添加时间戳参数防止请求缓存
     const requestData = {
-      status: status,
+      status: statusList, // 传递状态数组
       // 不设置默认的viewMode，让调用方根据需要设置
       _t: options.timestamp || new Date().getTime(), // 添加时间戳参数防止缓存
       // 始终包含分页参数
@@ -1488,7 +1502,7 @@ module.exports = {
     }
 
     console.log('API.getProductList - 分页参数:', { page: page, pageSize: pageSize });
-
+    console.log('API.getProductList - 查询状态:', statusList);
     console.log('API.getProductList - 请求数据:', requestData);
 
     return request('/api/product/list', 'POST', requestData).then(data => {