From 71011970b9d7f8b61b6fda6f6d8116372cb3a552 Mon Sep 17 00:00:00 2001
From: TraeAI <trae@example.com>
Date: Fri, 6 Mar 2026 17:12:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E5=87=BA=E5=8F=91=E5=9C=B0?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=AE=BE=E7=BD=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/freight-calculator/index.js | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/pages/freight-calculator/index.js b/pages/freight-calculator/index.js
index 4bfb49b..1881b1f 100644
--- a/pages/freight-calculator/index.js
+++ b/pages/freight-calculator/index.js
@@ -198,7 +198,20 @@ Page({
           'goodsInfo.quantity': 1
         });
         
-        // 不再自动设置出发地为商品所在地
+        // 设置出发地为商品所在地
+        const regionToUse = goodsData.fullRegion || goodsData.region;
+        if (regionToUse) {
+          console.log('商品所在地原始地址:', regionToUse);
+          const regionInfo = this.parseRegion(regionToUse);
+          console.log('解析后的地址:', regionInfo);
+          this.setData({
+            'origin.province': regionInfo.province || '',
+            'origin.city': regionInfo.city || '',
+            'origin.district': regionInfo.district || '',
+            'origin.detail': regionInfo.detail || ''
+          });
+          console.log('已设置出发地为商品所在地:', regionInfo);
+        }
       } catch (e) {
         console.error('解析货源信息失败:', e);
       }
@@ -234,7 +247,19 @@ Page({
         selectedGoods: goodsItem
       });
       
-      // 不再自动设置出发地为商品所在地
+      // 设置出发地为商品所在地
+      if (goodsItem.region) {
+        console.log('商品所在地原始地址:', goodsItem.region);
+        const regionInfo = this.parseRegion(goodsItem.region);
+        console.log('解析后的地址:', regionInfo);
+        this.setData({
+          'origin.province': regionInfo.province || '',
+          'origin.city': regionInfo.city || '',
+          'origin.district': regionInfo.district || '',
+          'origin.detail': regionInfo.detail || ''
+        });
+        console.log('已设置出发地为商品所在地:', regionInfo);
+      }
       
       // 设置货物重量（如果有）
       if (goodsItem.grossWeight) {