优化获取用户地址

2017-05-31 08:54:45 +08:00 · 2017-05-31 08:54:45 +08:00 · 28c4297e80
commit 28c4297e80
parent d65fdc8f92
2 changed files with 3 additions and 4 deletions
--- 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)
        }
      })
    })
--- 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",