lvhao 1 mēnesi atpakaļ
vecāks
revīzija
a12060f409
1 mainītis faili ar 3 papildinājumiem un 3 dzēšanām
  1. 3 3
      core/CoreApp/models/Model_api.php

+ 3 - 3
core/CoreApp/models/Model_api.php

@@ -249,8 +249,8 @@ function __construct(){
 							$v['shipping_address'] = $v['billing_address'];
 							$khbz = '客户自提订单; ';
 						}
-						$shipping_address = $v['shipping_address']['address2'].' '.$v['shipping_address']['address1'] . ',' . $v['shipping_address']['city'] . ',' . $v['shipping_address']['province'] . ',' . $v['shipping_address']['zip'] . ',' . $v['shipping_address']['country_code'] . ',' . $v['shipping_address']['phone'];
-						@$billing_address = $v['billing_address']['address2'].' '.$v['billing_address']['address1'] . ',' . $v['billing_address']['city'] . ',' . $v['billing_address']['province'] . ',' . $v['billing_address']['zip'] . ',' . $v['billing_address']['country_code'] . ',' . $v['billing_address']['phone'];
+						$shipping_address = $v['shipping_address']['address1'] .' '.$v['shipping_address']['address2']. ',' . $v['shipping_address']['city'] . ',' . $v['shipping_address']['province'] . ',' . $v['shipping_address']['zip'] . ',' . $v['shipping_address']['country_code'] . ',' . $v['shipping_address']['phone'];
+						@$billing_address = $v['billing_address']['address1'].' ' . $v['billing_address']['address2'].',' . $v['billing_address']['city'] . ',' . $v['billing_address']['province'] . ',' . $v['billing_address']['zip'] . ',' . $v['billing_address']['country_code'] . ',' . $v['billing_address']['phone'];
 						$created_at = explode('T',$v['created_at']);
 						$created_at_hi = explode('-',$created_at[1]);
 						$created_at = $created_at[0].' '.$created_at_hi[0];
@@ -368,7 +368,7 @@ function __construct(){
 						'country' => $v['shipping_address']['country_code'],//收货国家二字码
 						'region' => $v['shipping_address']['province_code'],//收货省/州
 						'city' => $v['shipping_address']['city'],//收货城市
-						'street' => $v['shipping_address']['address2'].' '.$v['shipping_address']['address1'],//收货地址
+						'street' => $v['shipping_address']['address1'].' '.$v['shipping_address']['address2'],//收货地址
 						'telephone' => $v['shipping_address']['phone'],//收货人手机
 						'postcode' => $v['shipping_address']['zip'],//收货人邮政编码
 						'email' => $v['customer']['email'],//收货人邮箱