From 629408aa844b3ab8e8d6f6fd6ea4a4cd17f0a5bd 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: Tue, 6 Jan 2026 10:34:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=95=86=E5=93=81=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E8=A7=84=E6=A0=BC=E4=BF=A1=E6=81=AF=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=EF=BC=8C=E6=AD=A3=E7=A1=AE=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=AF=9B=E9=87=8D=E5=92=8C=E4=BB=B6=E6=95=B0=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods-detail/goods-detail.js | 27 ++++-----------------------
 pages/index/index.js               | 12 ------------
 2 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/pages/goods-detail/goods-detail.js b/pages/goods-detail/goods-detail.js
index c658670..0ac0378 100644
--- a/pages/goods-detail/goods-detail.js
+++ b/pages/goods-detail/goods-detail.js
@@ -599,31 +599,12 @@ Page({
             console.log('✓ 售空分支执行: 只显示规格信息');
             console.log('weightQuantityData设置为:', weightQuantityData);
           } else {
-            // 非售空状态，正常处理规格信息，显示件数
-            console.log('× 非售空分支执行: 显示毛重和件数');
+            // 非售空状态，使用processWeightAndQuantityData函数正确处理规格和件数信息
+            console.log('× 非售空分支执行: 调用processWeightAndQuantityData处理');
             console.log('输入参数: weightSpecString="', weightSpecString, '", quantityString="', quantityString, '"');
             
-            if (weightSpecString) {
-              // 处理毛重规格字符串
-              const weightSpecArray = weightSpecString.split(/[,，、]/).map(item => item.trim()).filter(item => item);
-              // 处理件数字符串
-              const quantityArray = quantityString ? quantityString.split(/[,，、]/).map(item => item.trim()).filter(item => item) : [];
-              // 获取最大长度
-              const maxLength = Math.max(weightSpecArray.length, quantityArray.length);
-              
-              weightQuantityData = [];
-              for (let i = 0; i < maxLength; i++) {
-                const spec = weightSpecArray[i] || '';
-                const qty = quantityArray[i] || '';
-                const weightSpec = spec.includes('毛重') ? spec : `毛重${spec}`;
-                const display = `${weightSpec}----------${qty}件`;
-                weightQuantityData.push({
-                  weightSpec: weightSpec,
-                  quantity: qty,
-                  display: display
-                });
-              }
-            }
+            weightQuantityData = processWeightAndQuantityData(weightSpecString, quantityString, '');
+            
             console.log('× 非售空分支结果:', weightQuantityData);
           }
           
diff --git a/pages/index/index.js b/pages/index/index.js
index 5add9aa..be56fae 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -664,18 +664,6 @@ Page({
         // 其他情况显示具体数字
         displayStock = totalStock;
       }
-      
-      console.log('库存计算详情:', {
-        productId: product.productId || product.id,
-        minOrder: product.minOrder,
-        quantity: product.quantity,
-        stock: product.stock,
-        inventory: product.inventory,
-        availableStock: product.availableStock,
-        totalAvailable: product.totalAvailable,
-        calculatedTotal: totalStock,
-        displayStock: displayStock
-      });
 
       // 格式化规格显示
       const formattedSpec = this.formatSpecification(product.specification || product.spec || '', product.yolk || '');