diff --git a/images/首页分享照片.jpg b/images/首页分享照片.jpg index 43ab240..232e8e3 100644 Binary files a/images/首页分享照片.jpg and b/images/首页分享照片.jpg differ diff --git a/pages/goods-detail/goods-detail.js b/pages/goods-detail/goods-detail.js index 8026abc..1ebc8bc 100644 --- a/pages/goods-detail/goods-detail.js +++ b/pages/goods-detail/goods-detail.js @@ -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 diff --git a/pages/settlement/index.js b/pages/settlement/index.js index ee23b91..6397fe5 100644 --- a/pages/settlement/index.js +++ b/pages/settlement/index.js @@ -1647,7 +1647,7 @@ Page({ return { title: '合作入驻 - 又鸟蛋平台', path: '/pages/settlement/index?showGuide=1', - imageUrl: '/images/立即入驻7.jpg' + imageUrl: '/images/立即入驻导航图片.jpg' }; }, @@ -1658,7 +1658,7 @@ Page({ return { title: '合作入驻 - 又鸟蛋平台', query: 'showGuide=1', - imageUrl: '/images/立即入驻7.jpg' + imageUrl: '/images/立即入驻导航图片.jpg' }; } }); \ No newline at end of file diff --git a/server-example/package-lock.json b/server-example/package-lock.json index db9acbf..12f23fe 100644 --- a/server-example/package-lock.json +++ b/server-example/package-lock.json @@ -938,6 +938,21 @@ "node": ">= 0.6" } }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, "node_modules/function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",