订单地址的bug

app/common/model/Region.php

@@ -31,7 +31,7 @@ class Region extends BaseModel
 
     protected $createTime = false;
     protected $updateTime = false;
-
+    protected $isGlobalScopeStoreId = false;
     /**
      * 类型自动转换
      * @var array

app/index/controller/Cart.php

@@ -13,6 +13,7 @@ declare (strict_types=1);
 namespace app\index\controller;
 
 use app\index\model\Cart as CartModel;
+use app\index\model\Region;
 use app\index\model\Region as RegionModel;
 use app\index\model\UserAddress;
 use app\index\service\Cart as CartService;

app/index/model/UserAddress.php

@@ -71,7 +71,7 @@ class UserAddress extends UserAddressModel
     public function add(array $data)
     {
         // 当前用户信息
-        $user = UserService::getCurrentLoginUser(true);
+        $user = UserService::getCurrentLoginUser();
         // 省市区ID
         list($data['province_id'], $data['city_id'], $data['region_id']) = $this->getRegionId($data);
         // 添加收货地址
@@ -93,10 +93,10 @@ class UserAddress extends UserAddressModel
             !$user['address_id'] && $this->setDefault((int)$this['address_id']);
             //return true;
             //$regionValue = $data['region'][2]['label'] ?? '';
-            $region = Region::get(['id' => $data['region_id']]);
+            $reg = Region::get($data['region_id']);
             return [
                 'address_id' => $this['address_id'],
-                'full' => $data['detail'] . ',' . $region['name'] . '(' . $data['zip_code'] . '),US',
+                'full' => $data['detail'] . ',' . $reg['name'] . '(' . $data['zip_code'] . '),US',
                 'zip_code' => $data['zip_code'],
                 'name' => $data['name'],
                 'last_name' => $data['last_name'],

app/index/service/order/Checkout.php

@@ -17,6 +17,7 @@ use app\index\model\Order as OrderModel;
 use app\index\model\User as UserModel;
 use app\index\model\Goods as GoodsModel;
 use app\index\model\Setting as SettingModel;
+use app\index\model\UserAddress;
 use app\index\model\UserCoupon as UserCouponModel;
 
 use app\index\service\User as UserService;
@@ -306,13 +307,19 @@ class Checkout extends BaseService
     {
         // 系统支持的配送方式 (后台设置)
         $deliveryType = SettingModel::getItem(SettingEnum::DELIVERY)['delivery_type'];
+        if (!empty($this->param['address_id'])){
+            $addr = UserAddress::detail(intval($this->param['address_id']));
+        }else{
+            $addr = $this->user['address_default'];
+        }
+
         return [
             // 当前配送类型
             'delivery' => $this->param['delivery'] > 0 ? $this->param['delivery'] : $deliveryType[0],
             // 默认地址
-            'address' => $this->user['address_default'],
+            'address' => $addr,//$this->user['address_default'],
             // 是否存在收货地址
-            'existAddress' => $this->user['address_id'] > 0,
+            'existAddress' => true,//$this->user['address_id'] > 0
             // 配送费用
             'expressPrice' => 0.00,
             // 当前用户收货城市是否存在配送规则中
@@ -845,6 +852,7 @@ class Checkout extends BaseService
             'user_id' => $this->user['user_id'],
             'store_id' => $this->storeId,
             'name' => $address['name'],
+            'last_name' => $address['last_name'],
             'phone' => $address['phone'],
             'province_id' => $address['province_id'],
             'city_id' => $address['city_id'],

app/index/view/cart/shoppingCart.html

@@ -471,11 +471,6 @@
             }
 
             return new Promise(function (resolve, reject) {
-                // setTimeout(() => {
-                //     $("#addressText").text("新地址")
-                //     resolve(1001);
-                //     $("#addressContainer").hide(0)
-                // })
                 $.ajax({
                     url: "/index/address/add",
                     method: 'POST',

app/index/view/user/orderDetails.html

@@ -159,8 +159,8 @@
                         <!-- 订单名字 -->
                         <div class="orderNameBox eleBox">
                             <div class="orNameFlex">
-                                <h5 class="orName">#Order Name</h5>
-                                <p class="orTime">Created At:2019-07-03 12:00:00</p>
+                                <h5 class="orName">#Order Information</h5>
+                                <p class="orTime">Created At:{$order['create_time']}</p>
                             </div>
                             <div class="orStList">
                                 <div class="orStItem paid">