|
|
|
@ -295,10 +295,10 @@ Page({ |
|
|
|
const goodsDetail = this.data.goodsDetail || {}; |
|
|
|
const title = formatShareTitle(goodsDetail); |
|
|
|
|
|
|
|
// 获取联系人、电话号码和地区信息
|
|
|
|
// 获取联系人、电话号码和地区信息（提取省份）
|
|
|
|
const contactName = goodsDetail.product_contact || ''; |
|
|
|
const contactPhone = goodsDetail.contact_phone || ''; |
|
|
|
const region = goodsDetail.region || ''; |
|
|
|
const region = extractProvince(goodsDetail.region || ''); |
|
|
|
|
|
|
|
// 构建包含联系人信息的分享路径
|
|
|
|
const contactNameParam = encodeURIComponent(contactName); |
|
|
|
@ -335,10 +335,10 @@ Page({ |
|
|
|
const goodsDetail = this.data.goodsDetail || {}; |
|
|
|
const title = formatShareTitle(goodsDetail); |
|
|
|
|
|
|
|
// 获取联系人、电话号码和地区信息
|
|
|
|
// 获取联系人、电话号码和地区信息（提取省份）
|
|
|
|
const contactName = goodsDetail.product_contact || ''; |
|
|
|
const contactPhone = goodsDetail.contact_phone || ''; |
|
|
|
const region = goodsDetail.region || ''; |
|
|
|
const region = extractProvince(goodsDetail.region || ''); |
|
|
|
|
|
|
|
// 构建分享查询参数
|
|
|
|
const contactNameParam = encodeURIComponent(contactName); |
|
|
|
@ -732,14 +732,16 @@ Page({ |
|
|
|
if (contactFromShare) { |
|
|
|
contactPhone = contactFromShare.contact_phone || ''; |
|
|
|
contactName = contactFromShare.product_contact || ''; |
|
|
|
region = contactFromShare.region || ''; |
|
|
|
// 提取省份信息
|
|
|
|
region = extractProvince(contactFromShare.region || ''); |
|
|
|
console.log('使用分享URL中的联系人信息:', { contactName, contactPhone, region }); |
|
|
|
} |
|
|
|
// 优先级2：预加载数据中的联系人信息
|
|
|
|
else if (preloadedData) { |
|
|
|
contactPhone = preloadedData.contact_phone || preloadedData.contactPhone || preloadedData.phone || ''; |
|
|
|
contactName = preloadedData.product_contact || preloadedData.contact || preloadedData.contactName || ''; |
|
|
|
region = preloadedData.region || ''; |
|
|
|
// 提取省份信息
|
|
|
|
region = extractProvince(preloadedData.region || ''); |
|
|
|
console.log('使用预加载数据中的联系人信息:', { contactName, contactPhone, region }); |
|
|
|
} |
|
|
|
|
|
|
|
@ -788,11 +790,6 @@ Page({ |
|
|
|
minOrder: product.minOrder || product.quantity, |
|
|
|
yolk: product.yolk, |
|
|
|
spec: product.spec || product.specification || '暂无规格', |
|
|
|
region: region, |
|
|
|
// 保留原始字段引用，确保数据完整性
|
|
|
|
imageUrls: imageUrls || [], |
|
|
|
// 添加预处理后的媒体数据，包含类型信息
|
|
|
|
mediaItems: mediaItems, |
|
|
|
displayGrossWeight: formatGrossWeight(grossWeightValue, product.weight), |
|
|
|
isReserved: reservedGoodsIds.some(itemId => String(itemId) === productIdStr), |
|
|
|
created_at: product.created_at || product.createdAt, |
|
|
|
@ -814,7 +811,12 @@ Page({ |
|
|
|
// 确保reservedCount字段使用我们计算得到的值，放在最后以覆盖其他来源的值
|
|
|
|
reservedCount: finalReservationCount, |
|
|
|
// 添加净重和件数的一一对应数据
|
|
|
|
weightQuantityData: weightQuantityData |
|
|
|
weightQuantityData: weightQuantityData, |
|
|
|
// 确保imageUrls和mediaItems被正确设置
|
|
|
|
imageUrls: imageUrls || [], |
|
|
|
mediaItems: mediaItems, |
|
|
|
// 确保region使用提取后的省份信息，放在最后覆盖所有展开操作
|
|
|
|
region: region |
|
|
|
}; |
|
|
|
|
|
|
|
// 调试：打印formattedGoods的imageUrls和mediaItems
|
|
|
|
|
