购物车的选择收货地址，收货地址，尾款选择物流，收货地址选择优惠券

F5VT98DI7XY4X12\Administrator
1 parent 7d6ab3d6
Showing 11 changed files with 637 additions and 246 deletions
images/dpr.png
images/nothingaddress.png
pages/cart/cart2/cart2.js
pages/cart/cart2/cart2.wxml
pages/cart/cart_wk/cart_wk.js
pages/user/add_address/add_address.js
pages/user/add_address/add_address.wxml
pages/user/add_address/add_address.wxss
pages/user/address_list/address_list.js
pages/user/address_list/address_list.wxml
pages/user/address_list/address_list.wxss
@@ -73,6 +73,7 @@ Page({
   	//选择的券的门店
 	  selected_quan_pick:null,  
     is_close_quan:0,
+    disabled:0,
  
   },
   onLoad: function(t) {
@@ -990,7 +991,7 @@ Page({
   },
   enterAddressPage: function() {
     this.data.enterAddressPage = !0, wx.navigateTo({
-      url: "/pages/user/address_list/address_list?operate=select"
+      url: "/pages/user/address_list/address_list?is_back=1"
     });
   },
  
@@ -1119,7 +1120,7 @@ Page({
  
  
     if(bn==1){
-       th.setData({open_quan:1,selected_quan_pick:pickid});
+       th.setData({open_quan:1,selected_quan_pick:pickid, disabled:1});
     }else{
       //---多单打开券的时候，就要判断券在其他门店是否有使用---
       var quanlist=th.data.cartlist[cindx].quan_list;
@@ -1128,12 +1129,12 @@ Page({
          var is_using= th.check_in_sele(quanlist[i].CashRepNo,pickid);
          if(is_using)  quanlist[i].is_using=1;
       }
-      th.setData({open_quan:1,selected_quan_pick:pickid,selected_quan_list:quanlist});
+      th.setData({open_quan:1,selected_quan_pick:pickid,selected_quan_list:quanlist,disabled:1});
     }
   },
   close_coupon:function (e) {
     var th=this;
-    th.setData({open_quan:0});
+    th.setData({open_quan:0,disabled:0});
   },
  
   //---判断券时候在已经选择的列表中---
@@ -89,7 +89,7 @@
                 <view class="coupon-mes">
                     <view>用户备注（50字）</view>
                     <view class="leave-word">
-                        <textarea bindinput="keyUpChangeNum" class="word-box" maxlength="50" name="user_note_{{item.pickup_id}}"></textarea>
+                        <textarea bindinput="keyUpChangeNum" disabled="{{disabled}}" class="word-box" maxlength="50" name="user_note_{{item.pickup_id}}"></textarea>
                         <view class="max-word">{{maxWord}}/50</view>
                     </view>
                 </view>
@@ -183,19 +183,9 @@
                   </view>
                 </view>
                 <view class="coupon-mes">
-                    <!-- <view bindtap="useCoupon" class="coupon-title">
-                        <view class="classname">
-                            <view class="">优惠券</view>
-                            <view class="coupon-num">{{order.couponNum}}张可用</view>
-                        </view>
-                        <view class="set-btn">
-                            <view>{{coupon?coupon.coupon.name:'未使用'}}</view>
-                            <image class="arrow-rigth" src="{{imgUrl}}/miniapp/images/icon-arrowdown.png"></image>
-                        </view>
-                    </view> -->
                     <view>用户备注（50字）</view>
                     <view class="leave-word">
-                        <textarea bindinput="keyUpChangeNum" class="word-box" maxlength="50" name="user_note"></textarea>
+                        <textarea bindinput="keyUpChangeNum" disabled="{{disabled}}" class="word-box" maxlength="50" name="user_note"></textarea>
                         <view class="max-word">{{maxWord}}/50</view>
                     </view>
                 </view>
@@ -287,6 +287,9 @@ Page({
     this.setData({
       exp_type: type
     });
+
+
+
     //--计算物流的值--
     if (type == 0) {
        th.calculate_wuliu();
@@ -405,7 +408,7 @@ Page({
             case 2:
               if (goods_weight < 0) goods_weight = 0;
               //累积商品重量 每种商品的重量 * 数量
-              goods_weight += good['weight'] * good['buynum'];
+              goods_weight += good['weight'] * th.data.order.order_goods['goods_num'];
               break;
             case 3:
               if (goods_piece < 0) goods_piece = 0;
@@ -12,6 +12,7 @@ Page({
         iurl: a.imghost,
         address: null,
         isnew:0,
+        is_op_co:false,//switch开关
     },
     onLoad: function(s) {
         var a = this,th=a;
@@ -25,6 +26,31 @@ Page({
             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: 6 },
+      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", {
@@ -44,92 +70,101 @@ Page({
             }
         });
     },
+  //-----------添加或者编辑-----------
+  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;
  
-    //-----------添加或者编辑-----------
-    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 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;
-        }
-
-        
-        //判断是不是空对象
-        //--------如果是修改地址----------
-        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();
-                    });
-                  }
+     //判断用户名是否为空
+    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{
-          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();
-                  });
-                }
-              });
-          }   
-
-
-        
-        } 
-    },
+              }
+            });
+          }
+        });
+
+      } 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() {
@@ -146,5 +181,20 @@ Page({
                 });
             }
         });
-    }
+    },
+    //是否是默认地址
+  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
 <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 class="item-input" name="consignee" value="{{address.consignee}}"></input>
+            <view class="item-name">收货人</view>
+            <input 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}}"></input>
+            <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}}</view>
+            <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 class="detailed_item-input" name="address" value="{{address.address}}" placeholder="街道 楼牌号等" placeholder-style="color: rgb(199, 199, 199)"></textarea>
         </view>
-        <view class="item">
-            <view class="item-name">详细地址:</view>
-            <input class="item-input" name="address" value="{{address.address}}"></input>
-        </view>
-        <view class="item">
+        <view class="item item_default">
             <view class="item-name">设为默认地址</view>
-            <switch checked="{{address.is_default==1?true:false}}" class="item-switch" color="#e30000" name="is_default" type="switch"></switch>
+            <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" class="delete-btn">删除地址</button>
+            <button bindtap="deleteAddress" wx:if="{{address.mobile!=null}}" class="delete-btn">删除地址</button>
             <button class="submit-btn" formType="submit">提交地址</button>
         </view>
     </form>
 page {
-    background: white;
+  background: rgb(255, 255, 255);
+}
+
+.topbcolor {
+  width: 100%;
+  height: 7rpx;
+  background-color: rgb(245, 245, 245);
 }
  
 .item {
-    float: left;
-    padding: 0 30rpx;
-    width: 100%;
-    box-sizing: border-box;
-    font-size: 30rpx;
-    border-bottom: 1rpx #f5f5f5 solid;
-    line-height: 100rpx;
-    height: 100rpx;
-    position: relative;
+  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 {
-    float: left;
+  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 {
-    float: left;
-    height: 100rpx;
-    width: 450rpx;
-    margin-left: 20rpx;
-    word-break: keep-all;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
+  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 {
-    float: right;
+  zoom: 0.7;
+}
+
+.item-switch::before {
+  width: 80rpx !important;
+  height: 35rpx !important;
+  zoom: 1;
 }
  
 .arrow {
-    position: absolute;
-    right: 30rpx;
-    width: 32rpx;
-    height: 32rpx;
-    padding-top: 30rpx;
+  position: absolute;
+  right: 26rpx;
+  width: 26rpx;
+  height: 26rpx;
+  padding-top: 28rpx;
 }
  
 .address-btns {
-    position: absolute;
-    bottom: 80rpx;
-    float: left;
-    width: 100%;
-    padding: 10rpx 0;
+  position: absolute;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  bottom: 80rpx;
+  width: 100%;
 }
  
 .delete-btn {
-    float: left;
-    width: 40%;
-    margin: 0 10% 0 5%;
-    border-radius: 10rpx;
-    color: #999;
-    border: 1px solid #f2f2f2;
+  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 {
-    float: left;
-    width: 40%;
-    background-color: #e30000;
-    color: white;
-    border-radius: 10rpx;
+  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";
 \ No newline at end of file
+@import "../../../utils/regions/regions.wxss";
-var e = getApp(), t = require("../../../utils/request.js"),os=e.globalData.setting,oo=e.globalData;
+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,
-     
-    },
-    onLoad: function(e) {
-        this.data.operate = e.operate;
-    },
-    onShow: function() {
-        this.data.curpage=1;
-        this.data.addresses=[];
-        this.requestAddressList();
-    },
-    
+  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) {
+    this.data.operate = e.operate;
+    var is_back=e.is_back;
+    if (is_back) this.setData({ is_back: is_back})
+  },
+  onShow: function () {
+    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();
+    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:6,t:tt},
-            success: function(t) {
-                e.data.curpage++;
-                var arr1 = e.data.addresses;
-                var arr2 = t.data.data.pageData;
-                var arr3 = [...arr1, ...arr2];
+  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: 6, 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
+        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();
-            }
-        });
-    },
+        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: "/pages/user/add_address/add_address" + s
-        });
-    },
+  /*----------编辑地址----------*/
+  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: "/pages/user/add_address/add_address" + s
+    });
+  },
  
-    /*-----选择地址返回确认------*/
-    selectAddress: function(e) {
-        if (null != this.data.operate) {
-            /*----
-            if ("select" == this.data.operate) wx.setStorageSync("cart:cart2:address_id", e.currentTarget.dataset.item.address_id); else if ("teamSelect" == this.data.operate) wx.setStorageSync("team:confirm:address_id", e.currentTarget.dataset.item.address_id); else if ("selectAddress" == this.data.operate) {
-                var t = {
-                    address: e.currentTarget.dataset.item.province_name + e.currentTarget.dataset.item.city_name + e.currentTarget.dataset.item.district_name,
-                    district: e.currentTarget.dataset.item.district
-                };
-                wx.setStorageSync("goodsInfo:goodsInfo:address", t);
-            }---*/
-            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] : {};
-    },
+  /*-----选择地址返回确认------*/
+  selectAddress: function (e) {
+    if (null != this.data.operate) {
+      /*----
+      if ("select" == this.data.operate) wx.setStorageSync("cart:cart2:address_id", e.currentTarget.dataset.item.address_id); else if ("teamSelect" == this.data.operate) wx.setStorageSync("team:confirm:address_id", e.currentTarget.dataset.item.address_id); else if ("selectAddress" == this.data.operate) {
+          var t = {
+              address: e.currentTarget.dataset.item.province_name + e.currentTarget.dataset.item.city_name + e.currentTarget.dataset.item.district_name,
+              district: e.currentTarget.dataset.item.district
+          };
+          wx.setStorageSync("goodsInfo:goodsInfo:address", t);
+      }---*/
+      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); 
+  go_url: function (e) {
+    var url = e.currentTarget.dataset.url;
+    getApp().goto(url);
+    
+  },
+  //判断是否选择
+  add_is_pickup:function(e){
+    var th = this;
+    var index = e.currentTarget.dataset.icon;
+    var a = this.data.addresses[index]; 
+     
+    if(a.is_pickup==1) {
+      if(th.data.is_back){
+          wx.navigateBack({});
+      }
+      return false;
     }
  
+     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) {
+            var add_arr = th.data.addresses;
+            for (var i in add_arr){
+                add_arr[i].is_pickup=0;
+            }
+            th.setData({addresses:add_arr});
+            a.is_pickup = 1;
+            t.put("/api/weshop/useraddress/updateById", {
+              data: a,
+              isShowLoading: 0,
+              success: function (s) {
+                   var obj={};
+                   var txt = "addresses[" + index +"].is_pickup";
+                   obj[txt]=1;
+                   th.setData(obj);  
+                   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;
+           }
+        });
+
+      
+    
+  } 
 });
 \ No newline at end of file
-<view class="container">
+<!-- <view class="container">
     <view class="address-box" wx:for="{{addresses}}" wx:key="{{index}}">
         <view class="address-user">
             <view class="user-name">{{item.consignee}}</view>
@@ -12,7 +12,68 @@
             <image src="{{iurl}}/miniapp/images/address_edit.png"></image>
         </view>
     </view>
-    <view bindtap="go_url" class="address-create" data-url="/pages/user/add_address/add_address">
+    <navigator class="address-create" url="/pages/user/add_address/add_address">
         <view class="create-btn">+新建地址</view>
-    </view>
+    </navigator>
+</view> -->
+<!-- 无收货地址提醒页面 -->
+<view class="topbcolor"></view>
+<view class="nothing" wx:if="{{is_address_read==0?false:true && addresses.length<0}}">
+  <view class="image flex-level">
+    <image src="../../../images/nothingaddress.png"></image>
+  </view>
+
+  <view class="nothingaddress flex-level">
+    <view>暂无收货地址</view>
+  </view>
+
+  <view class="address flex-level">
+    <navigator bindtap="go_url" data-url="/pages/user/add_address/add_address">添加收货地址</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">
+        <!-- 个人直接信息 -->
+        <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="../../../images/dpr.png"></image>
+      </view>
+    </view>
+
+  </view>
+
+  <!-- 新建收货地址 -->
+  <view class="new">
+    <navigator bindtap="go_url" data-url="/pages/user/add_address/add_address">
+      <view class="add">+</view>
+      <view class="addAddress">新建收货地址</view>
+    </navigator>
+  </view>
+
+</view>
 \ No newline at end of file
-page {
+/* 没有收货地址时的样式 */
+
+.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;
 }
  
@@ -15,7 +48,7 @@ page {
     width: 150rpx;
 }
  
-.user-name {
+.N-name {
     font-size: 30rpx;
     padding-bottom: 20rpx;
     word-break: keep-all;
@@ -62,20 +95,14 @@ page {
 }
  
 .address-create {
-    background-color: #fff;
-    width: 100%;
+    width: 50%;
     text-align: center;
     position: fixed;
-    bottom: 0rpx;
-    height: 200rpx;
-    border-top:1rpx solid #eee 
-    
+    bottom: 80rpx;
+    left: 25%;
 }
  
 .create-btn {
-    width: 50%;
-    margin: 0 auto;
-    margin-top: 60rpx;
     font-size: 28rpx;
     color: white;
     background-color: #f23030;
@@ -83,4 +110,131 @@ page {
     text-align: center;
     line-height: 80rpx;
     display: block;
-}
 \ No newline at end of file
+} */
+
+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: 100%;
+  display: flex;
+  justify-content: center;
+  position: fixed;
+  bottom: 0rpx;
+  height: 204rpx;
+  align-items: center;
+  background-color: rgb(255, 255, 255);
+}
+
+.container .new .add {
+  margin-right: 10rpx;
+}
+
+.container navigator {
+  display: flex;
+  width: 430rpx;
+  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;
+}