From 712cc5c3e65788ffb3a82d2d50b9b39bff4f21cb Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Mon, 26 Nov 2018 17:29:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 alipay/pages/buy/buy.js                              | 12 ++++++++----
 .../Api/Controller/BuyController.class.php           |  5 ++++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/alipay/pages/buy/buy.js b/alipay/pages/buy/buy.js
index 19f8f2b98..5f3bc10ef 100755
--- a/alipay/pages/buy/buy.js
+++ b/alipay/pages/buy/buy.js
@@ -88,12 +88,16 @@ Page({
               common_order_is_booking: data.common_order_is_booking || 0,
             });
             if (this.data.address == null || this.data.address_id == 0) {
-              this.setData({
-                address: data.base.address,
-                address_id: ((data.base.address || null) == null) ? 0 : data.base.address.id,
-              });
+              if((data.base.address || null) != null && data.base.address.length > 0) {
+                this.setData({
+                  address: data.base.address,
+                  address_id: data.base.address.id,
+                });
+              }
             }
           }
+
+          console.log(this.data.address)
         } else {
           this.setData({
             data_list_loding_status: 2,
diff --git a/service/Application/Api/Controller/BuyController.class.php b/service/Application/Api/Controller/BuyController.class.php
index 91582ecd3..2564afb70 100755
--- a/service/Application/Api/Controller/BuyController.class.php
+++ b/service/Application/Api/Controller/BuyController.class.php
@@ -55,11 +55,14 @@ class BuyController extends CommonController
         // 商品校验
         if(isset($ret['code']) && $ret['code'] == 0)
         {
+            // 用户默认地址
+            $address = UserService::UserDefaultAddress(['user'=>$this->user]);
+
             // 商品/基础信息
             $base = [
                 'total_price'   => empty($ret['data']) ? 0 : array_sum(array_column($ret['data'], 'total_price')),
                 'total_stock'   => empty($ret['data']) ? 0 : array_sum(array_column($ret['data'], 'stock')),
-                'address'       => UserService::UserDefaultAddress(['user'=>$this->user])['data'],
+                'address'       => empty($address['data']) ? null : $address['data'],
             ];
 
             // 支付方式
-- 
GitLab