diff --git a/app.json b/app.json index 36803e1..8013d00 100644 --- a/app.json +++ b/app.json @@ -12,7 +12,6 @@ "pages/user/index/index", "pages/user/order_list/order_list", "pages/user/order_detail/order_detail", - "pages/user/address_list/address_list", "pages/user/userinfo/userinfo", "pages/user/coupon/coupon", "pages/user/checkcoupon/checkcoupon", @@ -232,7 +231,8 @@ "pages/team/team_more/team_more", "pages/user/return_goods_info/return_goods_info", "pages/user/return_goods_list/return_goods_list", - "pages/user/return_goods/return_goods" + "pages/user/return_goods/return_goods", + "pages/user/address_list/address_list" ] } diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js index 4cb8a4c..8bdb315 100644 --- a/packageA/pages/goodsInfo/goodsInfo.js +++ b/packageA/pages/goodsInfo/goodsInfo.js @@ -816,7 +816,7 @@ Page({ enterAddress: function() { this.data.enterAddressPage = !0, wx.navigateTo({ - url: "/pages/user/address_list/address_list?operate=selectAddress" + url: "/packageF/pages/user/address_list/address_list?operate=selectAddress" }); }, diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js index 5778cf0..55a1e2c 100644 --- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js +++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js @@ -662,7 +662,7 @@ Page({ enterAddress: function () { this.data.enterAddressPage = !0, wx.navigateTo({ - url: "/pages/user/address_list/address_list?operate=selectAddress" + url: "/packageF/pages/user/address_list/address_list?operate=selectAddress" }); }, diff --git a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js index f86aa08..d850b6a 100644 --- a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js +++ b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js @@ -3018,7 +3018,7 @@ Page({ getApp().globalData.is_cart_old = 1; this.data.isget_by_quan = {}; this.data.enterAddressPage = !0, wx.navigateTo({ - url: "/pages/user/address_list/address_list" + url: "/packageF/pages/user/address_list/address_list" }); }, diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js index f90b71c..2250a22 100644 --- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js @@ -1667,7 +1667,7 @@ Page({ enterAddressPage: function () { getApp().globalData.is_cart_old = 1; this.data.enterAddressPage = !0, wx.navigateTo({ - url: "/pages/user/address_list/address_list" + url: "/packageF/pages/user/address_list/address_list" }); }, diff --git a/packageC/pages/payForAnother/payForAnother.js b/packageC/pages/payForAnother/payForAnother.js index 122cc4b..721bc94 100644 --- a/packageC/pages/payForAnother/payForAnother.js +++ b/packageC/pages/payForAnother/payForAnother.js @@ -2691,7 +2691,7 @@ Page({ getApp().globalData.is_cart_old = 1; this.data.isget_by_quan = {}; this.data.enterAddressPage = !0, wx.navigateTo({ - url: "/pages/user/address_list/address_list" + url: "/packageF/pages/user/address_list/address_list" }); }, diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js index d4f53f3..eb814b0 100644 --- a/packageC/pages/presell/cart/cart.js +++ b/packageC/pages/presell/cart/cart.js @@ -995,7 +995,7 @@ Page({ getApp().globalData.is_cart_old = 1; this.data.isget_by_quan = {}; this.data.enterAddressPage = !0, wx.navigateTo({ - url: "/pages/user/address_list/address_list" + url: "/packageF/pages/user/address_list/address_list" }); }, diff --git a/packageC/pages/presell/cart/cart2.js b/packageC/pages/presell/cart/cart2.js index 6249f72..96502ef 100644 --- a/packageC/pages/presell/cart/cart2.js +++ b/packageC/pages/presell/cart/cart2.js @@ -1876,7 +1876,7 @@ Page({ getApp().globalData.is_cart_old = 1; this.data.isget_by_quan = {}; this.data.enterAddressPage = !0, wx.navigateTo({ - url: "/pages/user/address_list/address_list" + url: "/packageF/pages/user/address_list/address_list" }); }, diff --git a/packageC/pages/presell/cart/cart2_pre.js b/packageC/pages/presell/cart/cart2_pre.js index 677bcab..ff75dcc 100644 --- a/packageC/pages/presell/cart/cart2_pre.js +++ b/packageC/pages/presell/cart/cart2_pre.js @@ -1060,7 +1060,7 @@ Page({ enterAddressPage: function () { getApp().globalData.is_cart_old = 1; this.data.enterAddressPage = !0, wx.navigateTo({ - url: "/pages/user/address_list/address_list" + url: "/packageF/pages/user/address_list/address_list" }); }, diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js index c27d4f4..022320c 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.js +++ b/packageC/pages/presell/goodsInfo/goodsInfo.js @@ -959,7 +959,7 @@ Page({ }, enterAddress: function () { this.data.enterAddressPage = !0, wx.navigateTo({ - url: "/pages/user/address_list/address_list?operate=selectAddress" + url: "/packageF/pages/user/address_list/address_list?operate=selectAddress" }); }, onUnload: function () { diff --git a/packageC/pages/presell/pregoodsInfo/goodsInfo.js b/packageC/pages/presell/pregoodsInfo/goodsInfo.js index 7cfd9eb..38e9802 100644 --- a/packageC/pages/presell/pregoodsInfo/goodsInfo.js +++ b/packageC/pages/presell/pregoodsInfo/goodsInfo.js @@ -908,7 +908,7 @@ Page({ }, enterAddress: function () { this.data.enterAddressPage = !0, wx.navigateTo({ - url: "/pages/user/address_list/address_list?operate=selectAddress" + url: "/packageF/pages/user/address_list/address_list?operate=selectAddress" }); }, onUnload: function () { diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index 4f4f0bd..cdbcb52 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -5562,7 +5562,7 @@ Page({ getApp().globalData.is_cart_old = 1; this.data.isget_by_quan = {}; this.data.enterAddressPage = !0, wx.navigateTo({ - url: "/pages/user/address_list/address_list" + url: "/packageF/pages/user/address_list/address_list" }); }, diff --git a/packageE/pages/cart/cart2_inte/cart2_inte.js b/packageE/pages/cart/cart2_inte/cart2_inte.js index 39296e5..322d2d5 100644 --- a/packageE/pages/cart/cart2_inte/cart2_inte.js +++ b/packageE/pages/cart/cart2_inte/cart2_inte.js @@ -1514,7 +1514,7 @@ Page({ getApp().globalData.is_cart_old = 1; this.data.isget_by_quan = {}; this.data.enterAddressPage = !0, wx.navigateTo({ - url: "/pages/user/address_list/address_list" + url: "/packageF/pages/user/address_list/address_list" }); }, diff --git a/packageE/pages/cart/cart2_pt/cart2_pt.js b/packageE/pages/cart/cart2_pt/cart2_pt.js index a542b56..234d140 100644 --- a/packageE/pages/cart/cart2_pt/cart2_pt.js +++ b/packageE/pages/cart/cart2_pt/cart2_pt.js @@ -1500,7 +1500,7 @@ Page({ enterAddressPage: function () { getApp().globalData.is_cart_old = 1; this.data.enterAddressPage = !0, wx.navigateTo({ - url: "/pages/user/address_list/address_list" + url: "/packageF/pages/user/address_list/address_list" }); }, diff --git a/packageE/pages/cart/cart_wk/cart_wk.js b/packageE/pages/cart/cart_wk/cart_wk.js index b81a94b..84160b0 100644 --- a/packageE/pages/cart/cart_wk/cart_wk.js +++ b/packageE/pages/cart/cart_wk/cart_wk.js @@ -1201,7 +1201,7 @@ Page({ enterAddressPage: function () { getApp().globalData.is_cart_old = 1; this.data.enterAddressPage = 1, wx.navigateTo({ - url: "/pages/user/address_list/address_list?is_back=1" + url: "/packageF/pages/user/address_list/address_list?is_back=1" }); }, diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index ee03341..4560153 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -1266,7 +1266,7 @@ Page({ enterAddress: function () { this.data.enterAddressPage = !0, wx.navigateTo({ - url: "/pages/user/address_list/address_list?operate=selectAddress" + url: "/packageF/pages/user/address_list/address_list?operate=selectAddress" }); }, onUnload: function () { diff --git a/pages/user/userinfo/userinfo.wxml b/pages/user/userinfo/userinfo.wxml index 4b21b03..54e81aa 100644 --- a/pages/user/userinfo/userinfo.wxml +++ b/pages/user/userinfo/userinfo.wxml @@ -275,7 +275,7 @@ - + 收货地址