From 3bd1d03954a08bd02effc94950a3434d9a213e96 Mon Sep 17 00:00:00 2001
From: Junling Bu <linlinjavaer@gmail.com>
Date: Mon, 5 Nov 2018 15:47:54 +0800
Subject: [PATCH] =?UTF-8?q?fix[litemall-wx]:=20=E5=BD=93=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=E6=97=B6=E5=88=9B=E5=BB=BA=E6=96=B0=E5=9C=B0=E5=9D=80=E5=87=BA?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 litemall-wx/pages/ucenter/address/address.js | 10 +++++++++-
 renard-wx/pages/ucenter/address/address.js   |  8 --------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/litemall-wx/pages/ucenter/address/address.js b/litemall-wx/pages/ucenter/address/address.js
index 7f2f3778..7c1c195c 100644
--- a/litemall-wx/pages/ucenter/address/address.js
+++ b/litemall-wx/pages/ucenter/address/address.js
@@ -40,7 +40,15 @@ Page({
 
       }
 
-      wx.navigateBack();
+      let addressId = event.currentTarget.dataset.addressId;
+      if (addressId && addressId != 0) {
+        wx.navigateBack();
+      } else {
+        wx.navigateTo({
+          url: '/pages/ucenter/addressAdd/addressAdd?id=' + addressId
+        })
+      }
+
     } else {
       wx.navigateTo({
         url: '/pages/ucenter/addressAdd/addressAdd?id=' + event.currentTarget.dataset.addressId
diff --git a/renard-wx/pages/ucenter/address/address.js b/renard-wx/pages/ucenter/address/address.js
index b1cab6c5..3899672b 100644
--- a/renard-wx/pages/ucenter/address/address.js
+++ b/renard-wx/pages/ucenter/address/address.js
@@ -36,18 +36,11 @@ Page({
  },
 
  addressAddOrUpdate(event) {
-  console.log(event);
-
   //返回之前，先取出上一页对象，并设置addressId
   var pages = getCurrentPages();
   var prevPage = pages[pages.length - 2];
 
   if (prevPage.route == "pages/shopping/checkout/checkout") {
-   console.log(event.currentTarget.dataset.addressId);
-   // prevPage.setData({
-   //   addressId: event.currentTarget.dataset.addressId
-   // });
-
    try {
     wx.setStorageSync('addressId', event.currentTarget.dataset.addressId);
    } catch (e) {
@@ -55,7 +48,6 @@ Page({
    }
 
    let addressId = event.currentTarget.dataset.addressId;
-   console.log(addressId);
    if (addressId && addressId != 0) {
     wx.navigateBack();
    } else {