no message

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,