From 0d7f520dc46da9e1c105df602e21209abe28a44c Mon Sep 17 00:00:00 2001
From: dongjian <315328220@qq.com>
Date: Tue, 30 Dec 2025 17:26:25 +0800
Subject: [PATCH] no message

---
 manifest.json                                 |  2 +-
 .../order_submit/order_submit.vue             | 29 ++++++++++++++++---
 utils/config.js                               |  8 ++---
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/manifest.json b/manifest.json
index 3331a63..994d50d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
     "appid" : "__UNI__4910728",
     "description" : "信任桥优品是一款集线上商城、线下联盟商家的DAO聚合商城；通过“有趣”“有利”“有希望”的卖货玩法，吸引消费者、推广者、商家、投资人参与生态，共同打造共创共享的全球产业生态。",
     "versionName" : "1.0.1",
-    "versionCode" : 155,
+    "versionCode" : 156,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/order_package/order_submit/order_submit.vue b/pages/order_package/order_submit/order_submit.vue
index 889de37..b933578 100644
--- a/pages/order_package/order_submit/order_submit.vue
+++ b/pages/order_package/order_submit/order_submit.vue
@@ -501,17 +501,24 @@ export default {
   },
   async onLoad(option) {
     // const ids = option.ids;
+	await this.addressList();
+	if (option.address) {
+	  this.defaultAddress = option.address;
+	}
     if (option.sed) {
       this.ji = 1;
       this.sed = JSON.parse(option.sed);
+	  await this.addressList();
+	  // console.log('addressListOne',this.addressListOne)
+	  // if(this.addressListOne && this.addressListOne.length){
+		 //  this.addressShow = true;
+	  // }
       this.getOrderTwo();
     }
-	if (option.address) {
-      this.defaultAddress = option.address;
-    }
+	
+	
     if (option.ids) {
       this.ids = option.ids;
-      await this.addressList();
       this.getOrder();
     }
   
@@ -693,6 +700,7 @@ export default {
         this.orderInfo = {
           address: null,
           amount: this.sed.goodsNum * this.sed.specsId.price,
+		  postage:0,
           shops: [
             {
               addrTimes: [
@@ -730,7 +738,20 @@ export default {
             },
           ],
         };
+		console.log('this.defaultAddress',this.defaultAddress,this.addressListOne)
+		if(this.defaultAddress && this.addressListOne && this.addressListOne.length){
+			let arr = this.addressListOne.filter(i=>i.id == this.defaultAddress);
+			if(arr.length){
+				this.orderInfo.address = arr[0];
+			}
+		}
+		if(!this.orderInfo.address && this.addressListOne && this.addressListOne.length){
+			this.orderInfo.address = this.addressListOne[0];
+		}
         this.orderInfo.paymentMethod = null;
+		// if(this.addressListOne && this.addressListOne.length){
+		// 	this.orderInfo.address = this.addressListOne[0];
+		// }
       }
       // const params = {
       // 	cartIds: ids,
diff --git a/utils/config.js b/utils/config.js
index d20d84b..b72c9dd 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -2,11 +2,11 @@
 // export const BASE_URL="http://cl55un59859.vicp.fun:24346"; // 测试环境
 
 
-// export const BASE_URL = "https://api.tbmall.xin"; //生产
-// export const MILD_BASE_URL = "https://agent.tbmall.xin/"; //中台生产
+export const BASE_URL = "https://api.tbmall.xin"; //生产
+export const MILD_BASE_URL = "https://agent.tbmall.xin/"; //中台生产
 
-export const BASE_URL ='https://api.o.tbmall.xin'; // 本地测试
-export const MILD_BASE_URL = "https://agent.o.tbmall.xin/"; //中台测试
+// export const BASE_URL ='https://api.o.tbmall.xin'; // 本地测试
+// export const MILD_BASE_URL = "https://agent.o.tbmall.xin/"; //中台测试
 
 
 export const SHARE_URL = 'https://h.tbmall.xin';