From 87a1eac74044925ffca3277cd472eb088163b262 Mon Sep 17 00:00:00 2001
From: Kiyan <fourcels@gmail.com>
Date: Thu, 8 Jun 2017 09:52:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E6=96=B0=E5=A2=9E=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/app.json                |  2 +-
 app/pages/address/select.js |  8 ++++++++
 app/pages/order/quasi.js    |  4 ++--
 app/pages/order/quasi.wxml  |  2 +-
 app/utils/apis.js           | 22 ++++++++++++++--------
 5 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/app/app.json b/app/app.json
index 3994e73..7982742 100644
--- a/app/app.json
+++ b/app/app.json
@@ -1,5 +1,6 @@
 {
   "pages": [
+    "pages/mine/mine",
     "pages/index/index",
     "pages/order/quasi",
     "pages/order/show",
@@ -7,7 +8,6 @@
     "pages/order/list",
     "pages/order/content",
     "pages/mine/coupon",
-    "pages/mine/mine",
     "pages/order/review",
     "pages/index/search",
     "pages/index/category",
diff --git a/app/pages/address/select.js b/app/pages/address/select.js
index 9e8f2f2..b4bff91 100644
--- a/app/pages/address/select.js
+++ b/app/pages/address/select.js
@@ -53,6 +53,14 @@ Page({
         })
         wx.hideNavigationBarLoading()
         cb && cb()
+        if(data.length === 0) {
+          wx.navigateTo({
+            url: '/pages/address/add',
+            success: function(res) {},
+            fail: function(res) {},
+            complete: function(res) {},
+          })
+        }
       },
       error() {
         that.setData({
diff --git a/app/pages/order/quasi.js b/app/pages/order/quasi.js
index 12a2b51..2357f53 100644
--- a/app/pages/order/quasi.js
+++ b/app/pages/order/quasi.js
@@ -14,7 +14,7 @@ Page({
   },
   onLoad: function (options) {
     // 页面初始化 options为页面跳转所带来的参数
-    this.id = options.id || '2859'
+    this.id = options.id || '2908'
     this.loadData()
   },
   onReady: function () {
@@ -130,7 +130,7 @@ Page({
       return
     }
     if (!info.receiver_addr_id) {
-      return alert('请选择用户地址')
+      return alert('请选择收货地址')
     }
     this.setData({
       loading: true
diff --git a/app/pages/order/quasi.wxml b/app/pages/order/quasi.wxml
index 33db77a..41e85d2 100644
--- a/app/pages/order/quasi.wxml
+++ b/app/pages/order/quasi.wxml
@@ -10,7 +10,7 @@
         </view>
       </navigator>
       <navigator wx:else url="/pages/address/select?callback=callbackAddress" class=" weui-media-box weui-media-box_text weui-cell__ft_in-access weui-media-box_address primary-color text-large">
-        选择地址
+        选择收货地址
       </navigator>
     </view>
   </view>
diff --git a/app/utils/apis.js b/app/utils/apis.js
index dda435b..2fabf1e 100644
--- a/app/utils/apis.js
+++ b/app/utils/apis.js
@@ -87,14 +87,20 @@ export function login(options) {
   } = options
   wx.login({
     success(res) {
-      fetch({
-        url: 'index.php?m=Api&c=WeixinMall&a=login',
-        data: {
-          phone, code,
-          wx_code: res['code'],
-          session_3rd: wx.getStorageSync('session_3rd')
-        },
-        success, error
+      getApp().getCurrentAddress(address => {
+        fetch({
+          url: 'index.php?m=Api&c=WeixinMall&a=login',
+          data: {
+            phone, code,
+            wx_code: res['code'],
+            session_3rd: wx.getStorageSync('session_3rd'),
+            city_id: address.city_id,
+            city_name: address.city,
+            district_id: address.district_id,
+            district_name: address.district,
+          },
+          success, error
+        })
       })
     },
     error(res) {