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 || '');