Merge branch 'dev_oa_luo20' into dev

WXD-SEASON\season
2 parents 85d80e2f fc431d77
Showing 39 changed files with 1500 additions and 32 deletions
app.json
packageA/pages/goodsInfo/goodsInfo.js
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml
packageC/pages/payForAnother/payForAnother.js
packageC/pages/presell/cart/cart.js
packageC/pages/presell/cart/cart.wxml
packageC/pages/presell/cart/cart2.js
packageC/pages/presell/cart/cart2_pre.js
packageC/pages/presell/goodsInfo/goodsInfo.js
packageC/pages/presell/pregoodsInfo/goodsInfo.js
packageE/pages/cart/cart2/cart2.js
packageE/pages/cart/cart2_inte/cart2_inte.js
packageE/pages/cart/cart2_pt/cart2_pt.js
packageE/pages/cart/cart_wk/cart_wk.js
packageF/pages/user/add_address/add_address.js
packageF/pages/user/add_address/add_address.json
packageF/pages/user/add_address/add_address.wxml
@@ -12,12 +12,10 @@
         "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",
-        "pages/user/add_address/add_address",       
-        "pages/user/express/express",
+        "pages/user/checkcoupon/checkcoupon",  
+  
         "pages/activity/seckill_list/seckill_list",
         "pages/activity/pind_list/pind_list",       
         "pages/team/team_success/team_success",
@@ -47,8 +45,7 @@
         "pages/user/assistance/task_assistance",
         "pages/user/assistance/friend_assistance",
         "pages/user/assistance/assistance_success",
-        "pages/user/assistance/assistance",
-        "pages/store/index",       
+        "pages/user/assistance/assistance", 
         "pages/giftpack/festival/festival",
@@ -232,11 +229,20 @@
               "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",
+              "pages/user/add_address/add_address"
           ]
+      },
+        {
+          "root": "packageG/",
+          "name": "pack7",
+          "pages": [
+              "pages/store/index",
+              "pages/user/express/express"
+          ]
       }
-        
     ],
@@ -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"
     });
   },
@@ -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"
         });
     },
@@ -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"
         });
     },
@@ -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"
     });
   },
@@ -187,7 +187,7 @@
         <navigator bindtap="go_wuliu"  class="tips-btn" hidden="{{!order.shipping_btn}}"
                    data-order_id="{{order.order_id}}"
-                   data-url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
+                   data-url="/packageG/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
           <!---has_rt部分退---->
          <!-- <block wx:if="{{order.return_btn==undefined && order.is_all_return!=1 && order.has_rt!=1}}">
@@ -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"
         });
     },
@@ -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"
         });
     },
@@ -410,7 +410,7 @@
         <view class="tips-btn2" wx:if="{{order.order_status==3}}"  bindtap="deleteOrderData" data-order_id="{{order.order_id}}" >删除订单</view>
         <navigator bindtap="go_wuliu" class="tips-btn2" hidden="{{!order.shipping_btn}}"
                    data-order_id="{{order.order_id}}"
-                   data-url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
+                   data-url="/packageG/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
         <block wx:if="{{order.return_btn==undefined && order.is_all_return!=1}}">
@@ -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"
         });
     },
@@ -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"
     });
   },
@@ -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 () {
@@ -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 () {
@@ -5566,7 +5566,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"
     });
   },
@@ -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"
     });
   },
@@ -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"
     });
   },
@@ -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"
     });
   },
+var s = function(s) {
+    return s && s.__esModule ? s : {
+        default: s
+    };
+}(require("../../../../utils/regions/Regions.js")), e = getApp(), a = e.globalData.setting,os=a,t = e.request;
+var ut = require("../../../../utils/util.js"), oo = e.globalData;
+
+Page({
+    data: {
+        url: a.url,
+        resourceUrl: a.resourceUrl,
+        iurl: a.imghost,
+        address: null,
+        isnew:0,
+        is_op_co:false,//switch开关
+        disabled:0
+    },
+    onLoad: function(s) {
+        var a = this,th=a;
+        var is_e = ut.isEmptyObject(s);
+        this.setData({
+            address: s, isnew:is_e,
+        }), e.getUserInfo(function(s) {
+            a.setData({
+                user: s
+            });
+            th.initRegions();
+        })
+    },
+    
+  onReachBottom: function () {
+    if (this.data.total <= 6) return;
+    if (this.data.ismore) return;
+    this.requestAddressList();
+  },
+
+  requestAddressList: function () {
+    var e = this;
+    t.get(e.data.url + "/api/weshop/useraddress/page", {
+      data: { store_id: os.stoid, user_id: oo.user_id, page: e.data.curpage, pageSize: 20 },
+      success: function (t) {
+        e.data.curpage++;
+        var arr1 = e.data.addresses;
+        var arr2 = t.data.data.pageData;
+        var arr3 = [...arr1, ...arr2];
+
+        var ismore = 0;
+        if (arr3.length == t.data.data.total) ismore = 1
+
+        e.setData({
+          addresses: arr3, total: t.data.data.total, ismore: ismore
+        }), wx.stopPullDownRefresh();
+      }
+    });
+  },
+    initRegions: function() {
+        var e = this;
+        new s.default(this, "regions", {
+            endAreaLevelCall: function(s, a, t) {
+                console.log("initRegions");
+                console.log(t);                        
+                Object.assign(e.data.address, t), e.setData({
+                    "disabled": 0,
+                    "address.province_name": e.data.address.province_name,
+                    "address.city_name": e.data.address.city_name,
+                    "address.district_name": e.data.address.district_name,
+                    "address.twon_name": e.data.address.twon_name,
+                    "address.more_address": 
+                      e.data.address.province_name + "-" + e.data.address.city_name + "-" + e.data.address.district_name
+                       +"-"+e.data.address.twon_name,
+                });
+                console.log(e.data.address);
+            }
+        });
+    },
+  //-----------添加或者编辑-----------
+  submitAddress: function (s) {
+    var a = this.data.address, b = a, th = this;
+    Object.assign(a, s.detail.value), a.is_default = Number(a.is_default);
+    a.store_id = os.stoid;
+
+     //判断用户名是否为空
+    var cs = th.check(a.consignee);
+    if (cs != 1) {
+      return getApp().my_warnning("收货姓名不能为空", 0, th);
+    }
+
+    var ob = ut.check_mobile(a.mobile);
+    if (ob.code != 1) {
+      return getApp().my_warnning(ob.title, 0, th);
+    }
+
+    if (a.more_address == null || a.more_address == undefined || a.more_address == "") {
+      getApp().my_warnning("请选择地区", 0, th);
+      return false;
+    }
+    //判断地址是否为空
+    var add = th.check(a.address);
+    if (add != 1) {
+      return getApp().my_warnning("详细地址不能为空", 0, th);
+    }
+
+    //判断是不是空对象
+    //--------如果是修改地址----------
+    if (!th.data.isnew) {
+      if (a.is_default == 1) {
+        t.put("/api/weshop/useraddress/update", {
+          data: { user_id: oo.user_id, is_default: 0 },
+          success: function (s) {
+            t.put("/api/weshop/useraddress/updateById", {
+              data: a,
+              success: function (s) {
+                e.showSuccess(s.data.msg, function () {
+                  wx.navigateBack();
+                });
+              }
+            });
+          }
+        });
+
+      } else {
+        t.put("/api/weshop/useraddress/updateById", {
+          data: a,
+          success: function (s) {
+            e.showSuccess(s.data.msg, function () {
+              wx.navigateBack();
+            });
+          }
+        });
+      }
+
+    } else {
+      a['user_id'] = oo.user_id;
+      a['store_id'] = os.stoid;
+
+
+      if (a.is_default == 1) {
+        t.put("/api/weshop/useraddress/update", {
+          data: { user_id: oo.user_id, is_default: 0 },
+          success: function (s) {
+
+            //-----新增地址-------
+            t.post("/api/weshop/useraddress/save", {
+              data: a,
+              success: function (s) {
+                e.showSuccess(s.data.msg, function () {
+                  wx.navigateBack();
+                });
+              }
+            });
+
+          }
+        })
+      } else {
+
+        //-----新增地址-------
+        t.post("/api/weshop/useraddress/save", {
+          data: a,
+          success: function (s) {
+            e.showSuccess(s.data.msg, function () {
+              wx.navigateBack();
+            });
+          }
+        });
+      }
+
+
+
+    }
+  },
+
+    //---------删除收货地址------------
+    deleteAddress: function() {
+        var s = this.data.address.address_id;
+        s && wx.showModal({
+            title: "确定删除？",
+            success: function(a) {
+                a.confirm && t.delete("/api/weshop/useraddress/del/" + oo.user_id+"/"+s, {
+                    success: function(s) {
+                        e.showSuccess("删除成功", function() {
+                            wx.navigateBack();
+                        }, 500);
+                    }
+                });
+            }
+        });
+    },
+    //是否是默认地址
+  bind_is_op_co:function(e){
+        var i = e.detail;
+        this.setData({
+          is_op_co:i
+        })
+        console.log(i)
+  },
+ check:function(as){
+    var code = 1;
+    if(as===''){
+         code = -1;
+     }
+      return code;
+}
+});
 \ No newline at end of file
+{
+    "navigationBarTitleText": "收货地址",
+    "enablePullDownRefresh": false,
+    "usingComponents": {
+      "warn": "/components/long_warn/long_warn"
+    }
+}
 \ No newline at end of file
+<import src="../../../../utils/regions/regions.wxml"></import>
+
+
+<view class="container">
+<view class="topbcolor"></view>
+    <form bindsubmit="submitAddress">
+           
+        <view class="item">
+            <view class="item-name">收货人</view>
+            <input maxlength="10" class="item-input" name="consignee" value="{{address.consignee}}" placeholder="请填写收货人姓名" placeholder-style="color: rgb(199, 199, 199)"></input>
+        </view>
+        <view class="item">
+            <view class="item-name">手机号码</view>
+            <input type="number" class="item-input" name="mobile" value="{{address.mobile}}"  placeholder="请填写收货人手机号" placeholder-style="color: rgb(199, 199, 199)"></input>
+        </view>
+        <view bindtap="openRegionsModal" class="item" data-id="0">
+            <view class="item-name">所在地区</view>
+            <view class="item-input{{address.more_address==null?'address':''}}">{{address.more_address==null?'省市区县，乡镇等':address.more_address}}</view>
+            <view class="item-img">
+                <image class="arrow" src="{{iurl}}/miniapp/images/icon-arrowdown.png"></image>
+            </view>
+       </view>
+        <view class="detailed">
+            <view class="detailed_item-name">详细地址</view>
+            <textarea  wx:if="{{!disabled}}" class="detailed_item-input" name="address" disabled="{{disabled}}" data-dis="{{disabled}}"
+            value="{{address.address}}" placeholder="街道 楼牌号等" placeholder-style="color: rgb(199, 199, 199)"></textarea>
+        </view>
+        <view class="item item_default">
+            <view class="item-name">设为默认地址</view>
+            <switch checked="{{address.is_default==1?true:false}}" class="item-switch" 
+            color="{{address.is_default==1?'rgb(239,22,51)':is_op_co==false?'white':'rgb(239,22,51)'}}" name="is_default" type="switch" bindchange="bind_is_op_co"/>
+        </view>
+        <view class="address-btns">
+            <button bindtap="deleteAddress" wx:if="{{address.mobile!=null}}" class="delete-btn">删除地址</button>
+            <button class="submit-btn" formType="submit">提交地址</button>
+        </view>
+    </form>
+</view>
+
+<template is="regions" data="{{regions:regions}}"></template>
+<warn id="warn"></warn>
+page {
+  background: rgb(255, 255, 255);
+}
+
+.topbcolor {
+  width: 100%;
+  height: 7rpx;
+  background-color: rgb(245, 245, 245);
+}
+
+.item {
+  display: flex;
+  align-items: center;
+  padding: 0 31rpx;
+  width: 100%;
+  box-sizing: border-box;
+  border-bottom: 1rpx #f5f5f5 solid;
+  height: 98rpx;
+  position: relative;
+  font-size: 26rpx;
+  padding-top: 16rpx;
+}
+
+.item-name {
+  display: flex;
+  align-items: center;
+  height: 100%;
+  width: 104rpx;
+}
+
+.item-img {
+  height: 100%;
+  align-items: center;
+}
+
+.item_default {
+  display: flex;
+  justify-content: space-between;
+}
+
+.item_default .item-name {
+  width: 200rpx;
+}
+
+.item-input {
+  display: flex;
+  height: 100%;
+  margin-left: 40rpx;
+  /* word-break: keep-all;
+  white-space: nowrap;
+  overflow: hidden; */
+  text-overflow: ellipsis;
+  color: rgb(0, 0, 0);
+  align-items: center;
+  width: 74%;
+}
+
+.item-inputaddress {
+  color: rgb(199, 199, 199);
+  margin-left: 40rpx;
+}
+
+.detailed {
+  height: 193rpx;
+  padding-bottom: 95rpx;
+  display: flex;
+  padding: 0 31rpx;
+  padding-top: 41rpx;
+  font-size: 26rpx;
+  border-bottom: 1rpx #f5f5f5 solid;
+}
+
+.detailed .detailed_item-name {
+  width: 137rpx;
+}
+
+.detailed_item-input {
+  margin-left: 40rpx;
+  height: auto;
+  width: 100%;
+  min-height: 40rpx;
+  padding-bottom: 28rpx;
+}
+
+.item-switch {
+  zoom: 0.7;
+}
+
+.item-switch::before {
+  width: 80rpx !important;
+  height: 35rpx !important;
+  zoom: 1;
+}
+
+.arrow {
+  position: absolute;
+  right: 26rpx;
+  width: 26rpx;
+  height: 26rpx;
+  padding-top: 28rpx;
+}
+
+.address-btns {
+  position: absolute;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  bottom: 80rpx;
+  width: 100%;
+}
+
+.delete-btn {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 285rpx;
+  height: 60rpx;
+  border-radius: 40rpx;
+  font-size: 27rpx;
+  color: rgb(0, 0, 0);
+  border: 1rpx solid rgb(210, 210, 210);
+}
+
+.submit-btn {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 285rpx;
+  height: 59rpx;
+  background-color: #e30000;
+  font-size: 27rpx;
+  color: rgb(255, 255, 255);
+  border-radius: 40rpx;
+}
+@import "../../../../utils/regions/regions.wxss";
+var e = getApp(), t = require("../../../../utils/request.js"), os = e.globalData.setting, oo = e.globalData, t = e.request;
+
+Page({
+  data: {
+    url: e.globalData.setting.url,
+    resourceUrl: e.globalData.setting.resourceUrl,
+    iurl: e.globalData.setting.imghost,
+    addresses: [],
+    operate: null,
+    curpage: 1,
+    total: 0,
+    ismore: 0,
+    is_back:0,  //有没有跳转
+    isloading:0,
+    is_address_read:0
+  },
+  onLoad: function (e) {
+    var pages = getCurrentPages();
+    var prevPage = pages[pages.length - 2];  //上一个页面
+    //直接调用上一个页面的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},
+      success: function (s) {
+      }
+    });
+
+    this.data.operate = e.operate;
+  },
+  onShow: function () {
+    var is_back=getApp().globalData.is_cart_old;
+    if (is_back) this.setData({ is_back: is_back})
+
+    this.data.curpage = 1;
+    this.data.addresses = [];
+    this.requestAddressList();
+    console.log(this.data.addresses)
+  },
+
+  onReachBottom: function () {
+    if (this.data.total <= 6) return;
+    if (this.data.ismore) return;
+    this.requestAddressList();
+  },
+
+  requestAddressList: function () {
+    var tt = Math.random() * 100
+    var e = this;
+    t.get(e.data.url + "/api/weshop/useraddress/page", {
+      data: { store_id: os.stoid, user_id: oo.user_id, page: e.data.curpage, pageSize: 20, t: tt },
+      success: function (t) {
+        e.data.curpage++;
+        var arr1 = e.data.addresses;
+        var arr2 = t.data.data.pageData;
+        var arr3 = [...arr1, ...arr2];
+        var ismore = 0;
+        if (arr3.length == t.data.data.total) ismore = 1
+        e.setData({
+          addresses: arr3, total: t.data.data.total, ismore: ismore,
+          is_address_read:1
+        }), wx.stopPullDownRefresh();
+      }
+    });
+  },
+
+  /*----------编辑地址----------*/
+  editAddress: function (e) {
+    var t = this.getAddressData(e.currentTarget.dataset.id), s = "";
+    for (var a in t) s += (0 != s.length ? "&" : "?") + a + "=" + t[a];
+    s && wx.navigateTo({
+      url: "/packageF/pages/user/add_address/add_address" + s
+    });
+  },
+
+  /*-----选择地址返回确认------*/
+  selectAddress: function (e) {
+    if (null != this.data.operate) {
+      oo.baddr = e.currentTarget.dataset.item;
+      wx.navigateBack();
+    }
+  },
+  
+  getAddressData: function (e) {
+    var t = this.data.addresses;
+    for (var s in t) if (t[s].address_id == e) break;
+    return s ? t[s] : {};
+  },
+
+  go_url: function (e) {
+    var url = e.currentTarget.dataset.url;
+    getApp().goto(url);
+    
+  },
+  //判断是否选择
+  add_is_pickup:function(e){
+
+     if(this.data.is_back==0) return false;
+
+     var th = this;
+     var index = e.currentTarget.dataset.ind;
+     var a = this.data.addresses[index];
+
+     if (th.data.isloading) return;
+     th.data.isloading=1;
+
+       t.put("/api/weshop/useraddress/updatePickUp", {
+          data: { user_id: oo.user_id, is_pickup: 0 },
+          isShowLoading:0,
+          success: function (s) {
+
+            a.is_pickup = 1;
+            t.put("/api/weshop/useraddress/updateById", {
+              data: a,
+              isShowLoading: 0,
+              success: function (s) {
+
+                   th.data.isloading=0         
+                   if (th.data.is_back) {
+                      wx.navigateBack({});
+                   }
+
+              },fail: function (t) {
+                th.data.isloading = 0;
+              }
+            });
+          },
+          fail: function (t) {
+            th.data.isloading = 0;
+           }
+        });
+
+      
+    
+  } ,
+  
+   //获取微信地址
+    get_wx:function(){
+      var th=this;
+      wx.getSetting({
+        success(res) {
+          getApp().globalData.no_clear=1;
+          console.log("vres.authSetting['scope.address']：", res.authSetting['scope.address']);
+          if (res.authSetting['scope.address']) {
+            getApp().globalData.no_clear=1;
+            wx.chooseAddress({
+              success(res) {
+                th.save_wx_addr(res);
+              }
+            })
+  
+          } else {
+            if (res.authSetting['scope.address'] == false) {
+              getApp().globalData.no_clear=1;
+              wx.openSetting({
+                success(res) {}
+              })
+            } else {
+
+              getApp().globalData.no_clear=1;
+              wx.chooseAddress({
+                success(res) {
+                  th.save_wx_addr(res);
+                }
+              })
+            }
+          }
+        }
+      })
+    },
+  
+    save_wx_addr:function (res) {
+      var pd={},th=this;
+      pd.store_id=os.stoid;
+      pd.user_id=getApp().globalData.user_id;
+      pd.userName=res.userName;
+      pd.provinceName=res.provinceName;
+      pd.countryName=res.countyName;
+      pd.cityName=res.cityName;
+      pd.detailInfo=res.detailInfo;
+      pd.postalCode=res.postalCode;
+      pd.telNumber=res.telNumber;
+      getApp().request.promisePost("/api/weshop/useraddress/saveWx",{data:pd}).then(res=>{
+        if(res.data.code==0){
+          getApp().my_warnning("保存成功",1,th);
+          setTimeout(function () {
+            th.onShow();
+          },1000)
+        }
+      })
+  
+    },
+
+
+
+});
 \ No newline at end of file
+{
+    "navigationBarTitleText": "收货地址",
+	"usingComponents": {	    
+	    "warn": "/components/long_warn/long_warn"	   
+	}
+}
 \ No newline at end of file
+<!-- 无收货地址提醒页面 -->
+<view class="topbcolor"></view>
+<view class="nothing" wx:if="{{is_address_read && addresses.length<=0}}">
+    <view class="image flex-level">
+        <image src="{{iurl}}/miniapp/images/nothingaddress.png"></image>
+    </view>
+
+    <view class="nothingaddress flex-level">
+        <view>暂无收货地址</view>
+    </view>
+
+    <view class="address flex jc_sb" style="width:76%; margin-left:12%">
+
+        <navigator bindtap="get_wx" class="ye">
+            <view class="add">+</view>
+            <view class="addAddress">获取微信地址</view>
+        </navigator>
+
+        <navigator bindtap="go_url" data-url="/packageF/pages/user/add_address/add_address">
+            <view class="add">+</view>
+            <view class="addAddress">新建收货地址</view>
+        </navigator>
+
+
+    </view>
+</view>
+
+        <!-- 收货地址页面集合框架 -->
+<view class="container" wx:if="{{addresses.length>0}}">
+    <!-- 所有的收货地址框架 -->
+    <view class="address-box">
+
+        <!-- 单个收货地址框架 -->
+        <view class="address-user" wx:for="{{addresses}}" wx:key="index">
+            <!-- 选择icon
+            <view class="icon">
+              <icon type="success" color="red" size="33rpx" wx:if="{{item.is_pickup==1}}"  bindtap="add_is_pickup" data-icon="{{index}}"></icon>
+              <icon class="no_xuanze" color="white" wx:if="{{item.is_pickup==0}}"  bindtap="add_is_pickup" data-icon="{{index}}"></icon>
+            </view>-->
+
+            <!-- 收货地址全部信息 -->
+            <view class="address" bindtap="add_is_pickup" data-ind="{{index}}">
+                <!-- 个人直接信息 -->
+                <view class="user">
+                    <!-- 名字 -->
+                    <view class="userName">{{item.consignee}}</view>
+                    <!-- 电话 -->
+                    <view class="userPhone">{{item.mobile}}</view>
+                    <view class="default" wx:if="{{item.is_default}}">默认地址</view>
+                </view>
+
+                <!-- 收货地址 -->
+                <view class="ShippingAddress ellipsis-2 ">{{item.more_address}} {{item.address}}</view>
+            </view>
+
+            <!-- 编辑地址图片 -->
+            <view class="edit" bindtap="editAddress" data-id="{{item.address_id}}">
+                <image src="{{iurl}}/miniapp/images/dpr.png"></image>
+            </view>
+        </view>
+
+    </view>
+    <view style="height:210rpx"></view>
+
+    <!-- 新建收货地址 -->
+    <view class="new flex jc_sb">
+        <navigator bindtap="get_wx" class="ye">
+            <view class="add">+</view>
+            <view class="addAddress">获取微信地址</view>
+        </navigator>
+
+        <navigator bindtap="go_url" data-url="/packageF/pages/user/add_address/add_address">
+            <view class="add">+</view>
+            <view class="addAddress">新建收货地址</view>
+        </navigator>
+    </view>
+</view>
+<warn id="warn"></warn>
 \ No newline at end of file
+/* 没有收货地址时的样式 */
+
+.nothing {
+  width: 100%;
+  font-size: 31rpx;
+}
+
+.nothing image {
+  width: 299rpx;
+  height: 283rpx;
+  margin-top: 161rpx;
+}
+
+.nothing .nothingaddress {
+  color: rgb(251, 65, 66);
+  margin-top: 35rpx;
+}
+
+.nothing .address {
+  margin-top: 61rpx;
+}
+
+.nothing .address navigator {
+  color: rgb(255, 255, 255);
+  background-color: rgb(251, 65, 66);
+  width: 256rpx;
+  height: 55rpx;
+  border-radius: 30rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+/* page {
+    margin-bottom: 200rpx;
+}
+
+.address-box {
+    background-color: white;
+    padding: 25rpx 0 25rpx 25rpx;
+    font-size: 28rpx;
+    border-bottom: 3rpx #f8f8f8 solid;
+}
+
+.address-user {
+    box-sizing: border-box;
+    float: left;
+    width: 150rpx;
+}
+
+.N-name {
+    font-size: 30rpx;
+    padding-bottom: 20rpx;
+    word-break: keep-all;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+}
+
+.default {
+    color: white;
+    background-color: red;
+    padding: 4rpx;
+    width: fit-content;
+    border-radius: 6rpx;
+}
+
+.address-info {
+    box-sizing: border-box;
+    float: left;
+    width: 480rpx;
+    padding-left: 10rpx;
+}
+
+.mobile {
+    padding-bottom: 25rpx;
+}
+
+.address {
+    height: 70rpx;
+    overflow: hidden;
+}
+
+.address-edit {
+    box-sizing: border-box;
+    width: 95rpx;
+    float: left;
+    text-align: center;
+    padding-top: 32rpx;
+}
+
+.address-edit>image {
+    width: 36rpx;
+    height: 42rpx;
+}
+
+.address-create {
+    width: 50%;
+    text-align: center;
+    position: fixed;
+    bottom: 80rpx;
+    left: 25%;
+}
+
+.create-btn {
+    font-size: 28rpx;
+    color: white;
+    background-color: #f23030;
+    border-radius: 10rpx;
+    text-align: center;
+    line-height: 80rpx;
+    display: block;
+} */
+
+page {
+  margin-bottom: 200rpx;
+}
+
+.topbcolor {
+  width: 100%;
+  height: 7rpx;
+  background-color: rgb(245, 245, 245);
+}
+
+.container {
+  margin-top: 7rpx;
+}
+
+.container .address-box {
+  width: 100%;
+}
+
+.container .address-box .address-user {
+  display: flex;
+  justify-content: center;
+  width: 100%;
+  border-bottom: 2rpx solid rgb(245, 245, 245);
+  height: 180rpx;
+  align-items: center;
+}
+
+.container .address-box .address-user .icon {
+  padding-right: 20rpx;
+  display: flex;
+  align-items: center;
+  height: 100%;
+}
+
+.container .address-box .address-user .no_xuanze {
+  width: 31rpx;
+  height: 31rpx;
+  border-radius: 50%;
+  border: 1rpx solid;
+}
+
+.container .address-box .address-user .address {
+  width: 530rpx;
+}
+
+.container .address-box .address-user .address .user {
+  display: flex;
+  align-items: center;
+  width: 500rpx;
+  font-weight: bold;
+  font-size: 31rpx;
+  color: rgb(40, 36, 33);
+}
+
+.container .address-box .address-user .address .user .userName {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+  max-width: 149rpx;
+}
+
+.container .address-box .address-user .address .user .userPhone {
+  margin-left: 41rpx;
+}
+
+.container .address-box .address-user .address .user .default {
+  display: flex;
+  width: 105rpx;
+  height: 31rpx;
+  background-color: rgb(239, 22, 51);
+  justify-content: center;
+  font-size: 20rpx;
+  color: rgb(255, 255, 253);
+  border-radius: 8rpx;
+  margin-left: 21rpx;
+  line-height: 31rpx;
+}
+
+.container .address-box .address-user .address .ShippingAddress {
+  font-size: 24rpx;
+  color: rgb(41, 38, 33);
+  height: 66rpx;
+}
+
+.container .address-box .address-user .edit {
+  display: flex;
+  justify-content: center;
+  margin-left: 60rpx;
+  height: 100%;
+  align-items: center;
+}
+
+.container .address-box .address-user .edit image {
+  width: 41rpx;
+  height: 38rpx;
+  align-items: center;
+}
+
+.container .new {
+  width: 86%;
+  display: flex;
+  position: fixed;
+  bottom: 0rpx;
+  height: 204rpx;
+  align-items: center;
+  background-color: rgb(255, 255, 255);
+  margin-left:7% 
+}
+
+.container .new .add {
+  margin-right: 10rpx;
+}
+
+.container navigator {
+  display: flex;
+  width: 300rpx;
+  height: 62rpx;
+  background-color: rgb(239, 22, 51);
+  border-radius: 40rpx;
+  justify-content: center;
+  align-items: center;
+  color: rgb(255, 255, 255);
+  font-size: 27rpx;
+}
+
+.container navigator.ye{
+  background-color: #fc872d;
+}
+.nothing .address navigator.ye{
+  background-color: #fc872d;
+}
+var o=getApp().globalData.setting;
+Page({
+  data:{
+	  is_get_local_ok:0,
+	  is_gps:0,
+	  lat:null,
+	  lon:null,
+	  page:1,
+	  cat_list:null,
+	  pick_list:null,
+	  url:o.imghost,
+	  is_no_more:0,
+	  key_word:'',   //关键字搜索
+	  cat_id:0,      //分类ID
+	  islading:0,
+  },	
+
+  //调用视频接口
+  onLoad:function(e){
+	  var th=this;
+	   wx.getLocation({
+	     type: 'gcj02',
+	     success: function(res) {	   
+	        th.data.lat = res.latitude;
+	        th.data.lon = res.longitude;
+	        th.data.is_get_local_ok = 1;	     	      
+	     },
+	     fail: function(res) {
+	   	    th.data.is_get_local_ok = 1;	   
+	        if (res.errCode == 2) {
+	             getApp().confirmBox("请开启GPS定位", null, 25000, !1);	        
+	        }
+	   
+	     }
+	   }) 
+	   //--获取门店分类---
+	   getApp().request.get("/api/weshop/storagecategory/page", {
+		   data: {
+			 store_id: o.stoid,
+			 is_show: 1,
+			 pageSize: 300
+		   },
+		   success:function(res){
+			   if(res.data.code==0){
+				   th.setData({cat_list:res.data.data.pageData})
+			   }
+		   },
+	   })
+	   this.get_sto();
+  },
+  
+  //---------拿出门店分类和门店------------
+  get_sto() {
+    var th = this;
+    var timer_get = setInterval(function() {
+      if (th.data.is_get_local_ok == 0) return false;    
+      clearInterval(timer_get);
+	  th.get_list();     
+    }, 500)
+  
+  },
+  
+  get_list:function(){
+	  if(this.data.is_no_more==1) return false;
+	  if(this.data.islading==1) return false;
+	  this.data.islading=1;
+	  var th=this,req = getApp().request;
+	  var  dd = {
+	      store_id: o.stoid,
+	      isstop: 0,
+	      pageSize: 10,
+		  page:th.data.page
+	  }  	   
+	  if(th.data.key_word!="" && th.data.key_word!=undefined) {
+		  dd.keyword=th.data.key_word;
+	  }
+	  if(th.data.cat_id){
+		  dd.category_id=th.data.cat_id;
+	  }
+	  if(th.data.lat){
+		  dd.lat=th.data.lat;
+		  dd.lon=th.data.lon;
+	  }
+	  
+	   
+	  wx.showLoading();
+	  //----------获取门店---------
+	  req.promiseGet("/api/weshop/pickup/list", {
+	    data: dd,
+	  }).then(res => {
+		  this.data.islading=0;
+		  wx.hideLoading();
+		  if(res.data.code==0){			  
+			  if(res.data.data.pageData.length<=0){
+				  th.data.is_no_more=1; return false;
+			  }  
+			  
+			  th.data.page=dd.page+1
+			  var pick_list=th.data.pick_list;
+			  if(!pick_list) pick_list=[];
+			  pick_list=pick_list.concat(res.data.data.pageData);		  
+			  th.setData({
+				  pick_list:pick_list
+			  })
+		  }
+	  })
+  },
+  
+    //---加载更多是靠这个函数----
+    onReachBottom: function() {
+		this.get_list();
+	},
+	
+	lose_focus:function(e){
+		 var key_word = e.detail.value;
+		 this.data.key_word=key_word;
+	},
+	
+	
+	phone:function(e){
+		 var index=e.currentTarget.dataset.index;
+		 var item=this.data.pick_list[index];		
+		 wx.makePhoneCall({		
+		      phoneNumber: item.pickup_phone,
+         })
+	},
+	
+	  //分类的下拉
+	 bindPickerChange: function (e) {
+	    var index = e.detail.value;//这里会获取他的索引值
+	    var self = this;
+	    var list = self.data.cat_list;
+	    var item = list[index];		
+		this.data.cat_id=item['cat_id'];
+	    self.setData({
+	      periodsname: item['cat_name'],
+	      cid: item['cat_id']
+	    })
+		this.data.page=1;
+	    this.data.is_no_more=0;
+		this.setData({ pick_list:null})
+		this.get_list();
+		
+	  },
+	  
+	  //搜索关键字
+	  sear:function(){
+			this.data.page=1;
+			this.data.is_no_more=0;
+		  this.setData({ pick_list:null})
+		  this.get_list();
+	  },
+	  
+	
+	map: function (e) {
+	   var index = e.currentTarget.dataset.index;//这里会获取他的索引值
+	   var self = this;
+	   var list = self.data.pick_list;
+	   var item = list[index];		
+	 	   
+	   wx.openLocation({
+	             //当前经纬度
+	             latitude:  parseFloat(item.lat),
+	             longitude: parseFloat(item.lon),
+	             //缩放级别默认28
+	             scale: 28,
+	             //位置名
+	             name:item.pickup_name,
+	             //详细地址
+	             address: item.pickup_address,
+	             //成功打印信息
+	             success: function(res) {},
+	             //失败打印信息
+	             fail: function(err) {},
+	             //完成打印信息
+	             complete: function(info){},
+	           })	   	  
+	 },
+  
+  
+
+  
+})
 \ No newline at end of file
+{
+    "navigationBarTitleText": "门店列表",
+    "enablePullDownRefresh": false,
+	"usingComponents": {
+		 "nav_box": "/components/nav_box/nav_box"
+	}
+}
 \ No newline at end of file
+<view class="bcolor flex jc_sb">
+	<view class="sear_inp flex ai-center">
+	    <view class="sear_btn" bindtap='sear'>
+	       <image src="{{url}}/miniapp/images/search.png" style="width: 30rpx; height: 30rpx;  margin-left: 10rpx;"></image>	
+	  	</view>
+		<input bindinput ="lose_focus" class="fs28" value=""/>
+	</view>
+	<view class="select">
+		<picker bindchange="bindPickerChange" value="{{index}}" range="{{cat_list}}" range-key='cat_name'>
+	     	<view class="course_icon">{{periodsname?periodsname:"选择分类"}}</view>	 
+		</picker>	
+	</view>	
+</view>
+<view>
+	<view class="box" wx:for="{{pick_list}}">  
+	    <!-- 门店名称 -->
+	    <view class="pickname">{{item.pickup_name}}</view> 
+		<!-- 电话 -->
+		<view class="mt flex jc_sb"  bindtap="phone" data-index="{{index}}" > 
+		    <!-- 左边电话 -->
+		    <view>{{item.pickup_phone}}</view>	
+			<!-- 右边按钮 -->
+			<view class="buttonclass"><image src='{{url}}/miniapp/images/storelist/store_phone.png' class="fmob"></image>一键拔号</view>
+		</view>
+		<!-- 电话 -->
+		<view class="mt flex jc_sb"  bindtap="map" data-index="{{index}}"> 
+		    <!-- 左边电话 -->
+		    <view class="addr">{{item.fulladdress}}</view>	
+			<!-- 右边按钮 -->
+			<view class="buttonclass"><image src='{{url}}/miniapp/images/storelist/store_addr.png' class="faddr"></image>地图导航</view>
+		</view>		
+   </view>	
+</view>
+
+<!--  制作一个圆球导航  -->
+<nav_box></nav_box>
 \ No newline at end of file
+.box{
+	padding: 10px;
+	border-bottom: 10px solid #f5f5f5;
+	color: #000000;
+} 
+.box .pickname {
+    font-size: 32rpx;
+    line-height: 80rpx;
+    border-bottom: 1rpx solid #EEEEEE;
+}
+
+.box .mt {
+    margin-top: 20rpx;
+}
+.addr{ width: 75%;color: #848484;}
+.buttonclass {
+    width: 160rpx;
+    height: 60rpx;
+    line-height: 60rpx;
+    text-align: center;
+    border: solid 1px #c3172d;
+    border-radius: 20rpx;
+    font-size: 28rpx;
+    color: #c3172d;
+}
+.fmob
+{width: 28rpx;
+height: 32rpx;
+margin-right: 10rpx;
+top: 4rpx;
+position: relative;
+}
+
+.faddr{
+width: 26rpx;
+height: 32rpx;
+margin-right: 6rpx;
+top: 4rpx;
+position: relative;
+}
+
+.bcolor{background-color: #f5f5f5; height: 126rpx;}
+
+.sear_inp{width: 490rpx; background-color:#eaeaea; height: 80rpx; border-radius:5rpx; margin: 25rpx;}
+.sear_inp input{width: 400rpx;}
+.select{height: 80rpx; width: 220rpx;background-color:#eaeaea; margin:25rpx; font-size: 28rpx; line-height: 80rpx;text-align: center }
+.sear_btn{ width: 50rpx; height: 100%; display: flex; align-items: center;}
+
+.border-bottom {
+	border-bottom: 2rpx solid #e0e0e0;
+}
+
+.fs22 {
+	font-size: 22rpx;
+}
+
+.flexShrink-0 {
+	flex-shrink: 0;
+}
+
+.pt16 {
+	padding-top: 16rpx;
+}
+
+.maxWidth-340 {
+	max-width: 340rpx;
+}
+
+.maxWidth-400 {
+	max-width: 400rpx;
+}
+
+
+/* 图标字体 */
+/* @font-face {
+  font-family: 'iconfont';
+  src: url('//at.alicdn.com/t/font_2054717_8s87fgrotfo.eot');
+  src: url('//at.alicdn.com/t/font_2054717_8s87fgrotfo.eot?#iefix') format('embedded-opentype'),
+  url('//at.alicdn.com/t/font_2054717_8s87fgrotfo.woff2') format('woff2'),
+  url('//at.alicdn.com/t/font_2054717_8s87fgrotfo.woff') format('woff'),
+  url('//at.alicdn.com/t/font_2054717_8s87fgrotfo.ttf') format('truetype'),
+  url('//at.alicdn.com/t/font_2054717_8s87fgrotfo.svg#iconfont') format('svg');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 28rpx;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-weizhi:before {
+  content: "\e615";
+	color: #FFBA10;
+}
+
+.icon-arrow_down:before {
+  content: "\e600";
+}
+
+.icon-arrow_right:before {
+  content: "\e61f";
+} */
+/* 图标字体 */
+
+
+
+.icon-weizhi {
+	color: #FFBA10;
+}
+
+page {
+	height: 100%;
+	font-size: 28rpx;
+}
+
+.container {
+	height: 100%;
+}
+#map {
+	/* width: 100%;
+	height: ; */
+	display: block;
+	width: 100%;
+	height: 100%;
+}
+.tab-container.active {
+	height: calc(100% - 86rpx);
+}
+.map-container.active ~ .tab-container .list-container {
+	height: 204rpx;
+	overflow: hidden;
+}
+.map-container.active ~ .tab-container .list {
+	overflow: hidden;
+}
+.tab-container.active .list-container {
+	height: calc(100% - 108rpx - 84rpx);
+	background-color: #F7F7F7;
+}
+
+
+.search-container {
+	display: flex;
+	align-items: center;
+	padding: 0 32rpx;
+	border-bottom: 2rpx solid #F0F0F0;
+}
+
+.city:after {
+	display: inline-block;
+	content: '◣';
+	font-size: 14rpx;
+	padding-left: 8rpx;
+	padding-right: 20rpx;
+	transform: rotateZ(-45deg);
+	position: relative;
+	top: -16rpx;
+}
+
+.input-container {
+	padding: 12rpx 0;
+	flex: 1;
+}
+
+.input {
+	padding: 0 20rpx;
+	height: 60rpx;
+	line-height: 60rpx;
+	border-radius: 30rpx;
+	background-color: #F3F3F3;
+}
+
+.placeholder {
+	color: #676767;
+	font-size: 24rpx;
+}
+
+
+
+
+
+/* 切换卡 */
+.tab-title-container {
+	display: flex;
+	text-align: center;
+	border-bottom: 20rpx solid #F7F7F7;
+}
+.tab-title {
+	width: 50%;
+	line-height: 88rpx;
+	position: relative;
+}
+.tab-title.active {
+	font-weight: bold;
+}
+.tab-title.active::after {
+	position: absolute;
+	content: '';
+	width: 110rpx;
+	height: 4rpx;
+	left: 50%;
+	bottom: 0;
+	transform: translateX(-50%);
+	background-color: #FFBA10;
+}
+
+.map-container {
+	transition: 0.1s all linear;
+	background-color: pink;
+}
+
+.map-container.active {
+	height: calc(100% - 86rpx - 80rpx - 200rpx);
+	transition: 0.1s all linear;
+}
+
+
+
+
+/* 查看地图 */
+.view-map {
+	line-height: 80rpx;
+	text-align: center;
+	font-size: 24rpx;
+	color: #000;
+	border-bottom: 2rpx solid #F0F0F0;
+}
+
+
+/* 列表 */
+.list {
+	height: 100%;
+}
+.list-item {
+	padding: 40rpx 28rpx;
+	border-bottom: 2rpx solid #F0F0F0;
+	justify-content: space-between;
+	background-color: #fff;
+}
+.list-item:last-child {
+	border-bottom: none;
+}
+radio .wx-radio-input {
+  width: 32rpx;
+  height: 32rpx;
+}
+radio .wx-radio-input.wx-radio-input-checked {
+	border-color: #333;
+	/* border-color: #FFBA10; */
+	background-color: white;
+}
+radio .wx-radio-input.wx-radio-input-checked::before {
+	display: inline-block;
+  content: ''; 
+  width: 24rpx;
+  height: 24rpx;
+  border-radius: 50%;
+	background-color: #333;
+  /* background-color: #FFBA10; */
+}
+.name-container {
+	padding-left: 14rpx;
+	padding-right: 30rpx;
+	box-sizing: border-box;
+}
+.name {
+	display: flex;
+	align-items: center;
+	font-size: 30rpx;
+	position: relative;
+}
+.address {
+	color: #6E6E6E;
+	font-size: 26rpx;
+	line-height: 34rpx;
+	padding-top: 16rpx;
+	/* padding-right: 40rpx; */
+	text-align: justify;
+}
+.tag {
+	color: #FF5B5A;
+	border-radius: 6rpx;
+	border: 2rpx solid #FF5B5A;
+	font-size: 22rpx;
+	padding: 0 4rpx;
+	flex-shrink: 0;
+	margin-left: 4rpx;
+}
+
+.distance {
+	color: #6E6E6E;
+	font-size: 22rpx;
+	line-height: 34rpx;
+	padding-top: 16rpx;
+	/* word-break: break-all; */
+}
+
+.icon-arrow_right {
+	padding-left: 20rpx;
+}
+
+.right {
+	min-width: 200rpx;
+	text-align: right;
+}
+
+.icon-arrow_down.active {
+	display: inline-block;
+	transform: rotateZ(180deg);
+}
+
+
+
+
+
+
+
+
+
@@ -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 () {
@@ -71,7 +71,7 @@ Page({
     var t = this.getAddressData(e.currentTarget.dataset.id), s = "";
     for (var a in t) s += (0 != s.length ? "&" : "?") + a + "=" + t[a];
     s && wx.navigateTo({
-      url: "/pages/user/add_address/add_address" + s
+      url: "/packageF/pages/user/add_address/add_address" + s
     });
   },
@@ -16,7 +16,7 @@
             <view class="addAddress">获取微信地址</view>
         </navigator>
-        <navigator bindtap="go_url" data-url="/pages/user/add_address/add_address">
+        <navigator bindtap="go_url" data-url="/packageF/pages/user/add_address/add_address">
             <view class="add">+</view>
             <view class="addAddress">新建收货地址</view>
         </navigator>
@@ -69,7 +69,7 @@
             <view class="addAddress">获取微信地址</view>
         </navigator>
-        <navigator bindtap="go_url" data-url="/pages/user/add_address/add_address">
+        <navigator bindtap="go_url" data-url="/packageF/pages/user/add_address/add_address">
             <view class="add">+</view>
             <view class="addAddress">新建收货地址</view>
         </navigator>
@@ -179,7 +179,7 @@
         <navigator bindtap="go_wuliu" class="tips-btn" hidden="{{!order.shipping_btn}}"
                    data-order_id="{{order.order_id}}"
-                   data-url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
+                   data-url="/packageG/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
           <!---has_rt部分退---->
          <block wx:if="{{order.return_btn==undefined && order.is_all_return!=1 && order.has_rt!=1}}">
@@ -262,9 +262,9 @@
 	          </block>
 	          <view bindtap="go_wuliu" class="commodity_To_evaluate flex-level View_evaluation" data-order_id="{{item.order_id}}"
-					hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==1)}}" data-url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</view>
+					hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==1)}}" data-url="/packageG/pages/user/express/express?order_id={{item.order_id}}">查看物流</view>
 	          <view bindtap="go_wuliu" class="commodity_To_evaluate flex-level View_evaluation" data-order_id="{{item.order_id}}"
-					hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==2)}}" data-url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</view>
+					hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==2)}}" data-url="/packageG/pages/user/express/express?order_id={{item.order_id}}">查看物流</view>
 				<navigator class="commodity_To_evaluate flex-level View_evaluation" url="/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id={{item.order_id}}&&group_id={{item.order_goods[0].prom_id}}" wx:if="{{item.order_goods[0].prom_type==9}}">订单详情</navigator>	 
 			  <navigator class="commodity_To_evaluate flex-level View_evaluation" url="{{item.ord_url}}?order_id={{item.order_id}}" wx:else>订单详情</navigator>
@@ -275,7 +275,7 @@
     </view>
     </view>
-    <navigator bindtap="goto-address" class="user-name mt flex-vertical-between" url="/pages/user/address_list/address_list">
+    <navigator bindtap="goto-address" class="user-name mt flex-vertical-between" url="/packageF/pages/user/address_list/address_list">
       <view class="user-name-txt">收货地址</view>
       <view class="flex-center user-txt-right">
         <view class="angle">∟</view>