From 28c4297e80106b8d0e26cf2708855cc820af2ab1 Mon Sep 17 00:00:00 2001
From: Kiyan <fourcels@gmail.com>
Date: Wed, 31 May 2017 08:54:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/app.js   | 5 ++---
 app/app.json | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/app.js b/app/app.js
index 07637ad..d542102 100644
--- a/app/app.js
+++ b/app/app.js
@@ -43,6 +43,8 @@ App({
     }
 
     getCurrentAddress(address => {
+      address = that.setCurrentAddress(address)
+      cb(address)
       this.getLoginInfo(loginInfo => {
         if (loginInfo.is_login) {
           this.findNearbyUserAddr(userAddress => {
@@ -52,9 +54,6 @@ App({
             address = that.setCurrentAddress(address)
             cb(address)
           })
-        } else {
-          address = that.setCurrentAddress(address)
-          cb(address)
         }
       })
     })
diff --git a/app/app.json b/app/app.json
index 9562533..8ac0f9f 100644
--- a/app/app.json
+++ b/app/app.json
@@ -1,12 +1,12 @@
 {
   "pages": [
     "pages/index/index",
+    "pages/shop/show",
     "pages/order/list",
     "pages/order/show",
     "pages/order/quasi",
     "pages/order/content",
     "pages/mine/coupon",
-    "pages/shop/show",
     "pages/mine/mine",
     "pages/order/review",
     "pages/index/search",