diff --git a/pages/user/address_list/address_list.js b/pages/user/address_list/address_list.js
index b5caeec..ce38415 100644
--- a/pages/user/address_list/address_list.js
+++ b/pages/user/address_list/address_list.js
@@ -15,7 +15,14 @@ Page({
     is_address_read:0
   },
   onLoad: function (e) {
-
+    var pages = getCurrentPages();
+
+    var prevPage = pages[pages.length - 2];  //上一个页面
+    console.log("哈哈哈哈哈prevPage", prevPage);
+    //直接调用上一个页面的setData()方法，把数据存到上一个页面中去
+    prevPage.setData({
+      is_zy: 1
+    })
     //清空is_pick_up
     getApp().request.put("/api/weshop/useraddress/updatePickUp", {
       data: {user_id: getApp().globalData.user_id, is_pickup: 0},
diff --git a/pages/user/userinfo/userinfo.js b/pages/user/userinfo/userinfo.js
index bfd0888..f0361d6 100644
--- a/pages/user/userinfo/userinfo.js
+++ b/pages/user/userinfo/userinfo.js
@@ -2,7 +2,7 @@ function e(e, a, r) {
   return a in e ? Object.defineProperty(e, a, {
     value: r,
     enumerable: !0,
-    configurable: !0,
+    configurable: !0, 
     writable: !0
   }) : e[a] = r, e;
 } 
@@ -789,7 +789,7 @@ Page({
    } ,
    //选择地址
   goto_address:function(){
-    this.setData({ is_zy: 1 });
+   // this.setData({ is_zy: 1 });
   },
    //更换手机
    go_phone:function(e){