diff --git a/pages/user/userinfo/userinfo.js b/pages/user/userinfo/userinfo.js
index 81c1379..afd74eb 100644
--- a/pages/user/userinfo/userinfo.js
+++ b/pages/user/userinfo/userinfo.js
@@ -1,82 +1,586 @@
 function e(e, a, r) {
-    return a in e ? Object.defineProperty(e, a, {
-        value: r,
-        enumerable: !0,
-        configurable: !0,
-        writable: !0
-    }) : e[a] = r, e;
+  return a in e ? Object.defineProperty(e, a, {
+    value: r,
+    enumerable: !0,
+    configurable: !0,
+    writable: !0
+  }) : e[a] = r, e;
 }
 
-var a = getApp(), r = a.globalData.setting,
- t = a.request, s = require("../../../utils/common.js"), util = require("../../../utils/util.js");
+var a = getApp(),
+  r = a.globalData.setting,
+  t = a.request,
+  s = require("../../../utils/common.js"),
+  util = require("../../../utils/util.js");
+
+var timestamp = Date.parse(new Date());
+var date = new Date(timestamp);
 
 Page({
-    data: {
-        url: r.url,
-        resourceUrl: r.resourceUrl,
-        iurl: r.imghost,
-        defaultAvatar: r.resourceUrl + "/static/images/user68.jpg",
-        user: null,
-        tc_hide:true,
-        stoname:"",
-    },
-    onShow: function() {
-        var e = this; var req=t;
-        a.getUserInfo(function(a) {
-            var txt = util.formatTime(a.birthday,'yyyy-M-d'),arr = txt.split(' ');
-            a.birthday=arr[0];
-            var txt2 = util.formatTime(a.reg_time, 'yyyy-M-d'), arr2 = txt.split(' ');
-            a.reg_time = arr2[0];
-            req.get("/api/weshop/pickup/get/" + r.stoid + "/" + a.pickup_id, {
-                success: function (da) {
-                  console.log('getsto');
-                  console.log(da);
-                  //设置门店
-                  e.setData({ stoname: da.data.data.pickup_name});
-                }
-            })
-            e.setData({
-                user: a
-            });
-        }, !0);
-    },
-    editUserInfo: function(e) {
-        var r = e.currentTarget.dataset.type;
-        if (("password" == r || "paypwd" == r) && !this.data.user.mobile) return a.showWarning("请先绑定手机号码");
-        r && this.data.user && wx.navigateTo({
-            url: "/pages/user/userinfo_edit/userinfo_edit?type=" + r
-        });
-    },
-
-    /*--------------------修改头像---------------------*/
-    changeAvatar: function() {
-        return false;
-        var r = this;
-        wx.chooseImage({
-            count: 1,
-            sizeType: [ "compressed", "original" ],
-            sourceType: [ "camera", "album" ],
-            success: function(u) {
-                t.uploadFile(r.data.url + "/api/user/upload_headpic", {
-                    filePath: u.tempFilePaths[0],
-                    name: "head_pic",
-                    success: function(t) {
-                        var u = s.getFullUrl(t.data.result);
-                        r.setData(e({}, "user.head_pic", u)), a.globalData.userInfo.head_pic = u, a.showSuccess("设置头像成功");
+  data: {
+    phone:"",
+    url: r.url,
+    resourceUrl: r.resourceUrl,
+    iurl: r.imghost,
+    defaultAvatar: r.resourceUrl + "/static/images/user68.jpg",
+    user: null,
+    tc_hide: true,
+    stoname: "",
+    checkDate: false,
+    datet: "",
+    year: date.getFullYear(),
+    store: 0,
+    all_sto: "",
+    region_name: "",
+    def_pick_store: "",
+    sort_store: 0, //门店分类
+    sec_sto: "",
+    more_store: 0, //选择门店
+    choice_sort_store: 1, //选择分类门店
+    more_store: 0, //选择门店
+    lat: null, //维度
+    lon: null, //经度
+    fir_pick_index: 0,
+    sec_pick_index: 0,
+    is_gps: 1,
+    lon: 0,
+    only_pk: 0,
+    open_ind_store: 0, //哪里打开的门店列表的控制属性
+    ispwhid:1,//是否隐藏密码显示
+    isstcsp:1,//是否启动密码消费
+    isGender:1,//什么性别
+    iscalendar:1,//是否是农历
+  },
+  //是否启动密码消费
+  isstcsp:function(){
+    var th = this;
+    var isstcsp = th.data.isstcsp;
+    if (isstcsp==0){
+          th.setData({
+            isstcsp:1
+          })
+      }else{
+      th.setData({
+        isstcsp: 0
+      })
+      }
+  },
+  //出生日期是否是农历
+  iscalendar:function(){
+    var th = this;
+    var iscalendar = th.data.iscalendar;
+    if (iscalendar == 0) {
+      th.setData({
+        iscalendar: 1
+      })
+    } else {
+      th.setData({
+        iscalendar: 0
+      })
+    }
+  },
+  //性别
+  isGender:function(){
+    var th = this;
+    
+    var isGender = th.data.isGender;
+    if (isGender == 2) {
+      th.setData({
+        isGender: 1
+      })
+    } else {
+      th.setData({
+        isGender: 2
+      })
+    }
+  },
+  //密码是否隐藏显示
+  ispwhid:function(){
+    var th = this;
+    var ispwhid = th.data.ispwhid;
+    if (ispwhid == 0) {
+      th.setData({
+        ispwhid: 1
+      })
+    } else {
+      th.setData({
+        ispwhid: 0
+      })
+    }
+  },
+  checkDate: function() {
+    var th = this;
+    if (th.data.checkDate) {
+      th.setData({
+        checkDate: false
+      })
+    } else {
+      th.setData({
+        checkDate: true
+      })
+    }
+  },
+  bindChange: function(e) {
+    this.setData({
+      datet: e.detail.value,
+    });
+  },
+  //---点击二级之后的选择---
+  choose_for_store: function(e) {
+    var index_c = e.currentTarget.dataset.ind;
+
+    this.setData({
+      sec_pick_index: index_c,
+      fir_pick_index: index_c
+    })
+  },
+  //确定def_pick为选择的门店
+  sure_pick: function(e) {
+    var th = this;
+    var item = null;
+    var openindstore = th.data.open_ind_store;
+
+    if (th.data.choice_sort_store == 0) {
+      var index = th.data.fir_pick_index;
+      if (th.data.is_show_sto_cat == 1) {
+        item = th.data.def_pickpu_list[index];
+      } else {
+        item = th.data.only_pk[index]; //当没有门店分类的时候
+      }
+
+    } else {
+      var index = th.data.sec_pick_index;
+      item = th.data.sec_sto.s_arr[index];
+    }
+
+    console.log("选择门店刷新", "def_pick_store", item);
+    th.setData({
+      def_pick_store: item,
+      sto_sele_name: item.pickup_name,
+      sto_sele_id: item.pickup_id,
+      sto_sele_distr: item.distr_type,
+      store: 0,
+      choice_sort_store: 0,
+      fir_pick_index: 0
+    });
+
+    if (openindstore == 1) {
+      th.setData({
+        openSpecModal: !0,
+        openSpecModal_ind: openindstore,
+      });
+    } else if (openindstore == 2) {
+      th.setData({
+        openSpecModal: !0,
+        openSpecModal_ind: openindstore,
+
+        openSpecModal_pt: 1
+      });
+    }
+  },
+  choose_for_store_fir: function(e) {
+    var index_c = e.currentTarget.dataset.ind;
+
+    this.setData({
+      fir_pick_index: index_c
+    })
+  },
+  wait_for_store_config: function() {
+    var th = this;
+    wx.getLocation({
+      type: 'wgs84',
+      success: function(res) {
+        th.data.lat = res.latitude;
+        th.data.lon = res.longitude;
+        th.data.is_get_local_ok = 1;
+      },
+      fail: function(res) {
+        if (res.errCode == 2) {
+          th.setData({
+            is_gps: 0
+          });
+          if (th.data.is_gps == 0) {
+            getApp().confirmBox("请开启GPS定位", null, 10000, !1);
+          }
+
+        } else {
+          th.setData({
+            is_gps: "3"
+          });
+        }
+
+        th.data.is_get_local_ok = 1;
+      }
+    })
+  },
+  onclickstore: function() {
+    var th = this;
+    if (th.data.store == 0) {
+      this.setData({
+        store: 1
+      })
+    } else {
+      this.setData({
+        store: 0
+      })
+    }
+    var dd = {
+      store_id: r.stoid,
+      isstop: 0,
+      pageSize: 300
+    }
+    th.setData({
+      sort_store: 1
+    });
+    var i = getApp().request;
+    //如果有距离的话
+    if (th.data.lat != null) {
+      dd.lat = th.data.lat;
+      dd.lon = th.data.lon;
+    }
+    //----------获取门店----------------
+    getApp().request.promiseGet("/api/weshop/pickup/list", {
+      data: dd,
+    }).then(res => {
+      var e = res;
+      if (e.data.code == 0) {
+        //-- 如果有默认选择门店的时候，要把默认门店放在第一位 --
+        if (th.data.def_pick_store) {
+          for (var k = 0; k < e.data.data.pageData.length; k++) {
+            if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) {
+              e.data.data.pageData.splice(k, 1); //删除
+              break;
+            }
+          }
+          e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加
+        }
+
+        //单总量超出5个的时候
+        if (e.data.data.total > 5) {
+          i.get("/api/weshop/storagecategory/page", {
+            data: {
+              store_id: r.stoid,
+              is_show: 1,
+              pageSize: 300
+            },
+            success: function(ee) {
+              if (ee.data.code == 0) {
+                if (ee.data.data.pageData.length > 0) {
+                  var def_arr = new Array();
+                  var ishas = 0;
+                  //-- 开始就看5个门店 --
+                  for (var k = 0; k < 5; k++) {
+                    if (k == e.data.data.pageData.length) break;
+                    def_arr.push(e.data.data.pageData[k]);
+                  }
+
+                  th.setData({
+                    def_pickpu_list: def_arr,
+                    pickpu_list: ee.data.data.pageData
+                  });
+                  var sto_cate = ee.data.data.pageData;
+                  var sto_arr = e.data.data.pageData;
+                  var newarr = new Array();
+                  var qita = new Array();
+
+                  //----要进行门店分组--------
+                  for (var i = 0; i < sto_arr.length; i++) {
+                    //找一下这个门店有没有在分类数组内
+                    var find2 = 0,
+                      find2name = "";
+                    for (var m = 0; m < sto_cate.length; m++) {
+                      if (sto_arr[i].category_id == sto_cate[m].cat_id) {
+                        find2 = sto_cate[m].cat_id;
+                        find2name = sto_cate[m].cat_name;
+                        break;
+                      }
+                    }
+
+                    if (newarr.length > 0) {
+                      var find = 0;
+                      //如果有找到，那门店就在这个分组内，否则，分类就要排在其他
+                      if (find2 != 0) {
+                        for (var ii = 0; ii < newarr.length; ii++) {
+                          if (sto_arr[i].category_id == newarr[ii].cat_id) {
+                            newarr[ii].s_arr.push(sto_arr[i]);
+                            find = 1;
+                            break;
+                          }
+                        }
+                        if (find == 0) {
+                          var arr0 = new Array();
+                          arr0.push(sto_arr[i]);
+                          var item = {
+                            cat_id: find2,
+                            name: find2name,
+                            s_arr: arr0
+                          };
+                          newarr.push(item);
+                        }
+                      } else {
+                        qita.push(sto_arr[i]);
+                      }
+                    } else {
+                      //如果有找到，那门店就在这个分组内，否则，分类就要排在其他
+                      if (find2 != 0) {
+                        var arr0 = new Array();
+                        arr0.push(sto_arr[i]);
+                        var item = {
+                          cat_id: find2,
+                          name: find2name,
+                          s_arr: arr0
+                        };
+                        newarr.push(item);
+                      } else {
+                        qita.push(sto_arr[i]);
+                      }
                     }
+                  }
+
+                  //----安排其他的分类-----
+                  if (qita.length > 0) {
+                    var item = {
+                      cat_id: -1,
+                      name: "其他",
+                      s_arr: qita
+                    };
+                    newarr.push(item);
+                  }
+                  th.setData({
+                    is_show_sto_cat: 1,
+                    all_sto: newarr
+                  });
+
+                } else {
+                  th.setData({
+                    is_show_sto_cat: -1,
+                    only_pk: e.data.data.pageData
+                  });
+                }
+              } else {
+                th.setData({
+                  is_show_sto_cat: -1,
+                  only_pk: e.data.data.pageData
                 });
+              }
             }
+          });
+        } else {
+          th.setData({
+            is_show_sto_cat: 0,
+            only_pk: e.data.data.pageData
+          });
+        }
+      }
+    }, 200)
+    console.log(th.data.all_sto + 'eeee');
+  },
+  //选择更多门店
+  more_store: function() {
+    this.setData({
+      sort_store: 1
+    });
+  },
+  //---选择分类门店---
+  choice_sort_store: function(e) {
+    var index = e.currentTarget.dataset.index;
+    var region_name = e.currentTarget.dataset.region;
+    var item = this.data.all_sto[index];
+    this.setData({
+      region_name: region_name,
+      sort_store: 0,
+      choice_sort_store: 1,
+      sec_sto: item,
+      sec_pick_index: 0
+    });
+  },
+  // 返回按钮
+  returns: function() {
+    this.setData({
+      sort_store: 0,
+      choice_sort_store: 0
+    });
+  },
+  //身份证号严格校验
+  IdentityIDCard: function(e) {
+    var code = e.detail.value;
+    //身份证号前两位代表区域
+    var city = {
+      11: "北京",
+      12: "天津",
+      13: "河北",
+      14: "山西",
+      15: "内蒙古",
+      21: "辽宁",
+      22: "吉林",
+      23: "黑龙江 ",
+      31: "上海",
+      32: "江苏",
+      33: "浙江",
+      34: "安徽",
+      35: "福建",
+      36: "江西",
+      37: "山东",
+      41: "河南",
+      42: "湖北 ",
+      43: "湖南",
+      44: "广东",
+      45: "广西",
+      46: "海南",
+      50: "重庆",
+      51: "四川",
+      52: "贵州",
+      53: "云南",
+      54: "西藏 ",
+      61: "陕西",
+      62: "甘肃",
+      63: "青海",
+      64: "宁夏",
+      65: "新疆",
+      71: "台湾",
+      81: "香港",
+      82: "澳门",
+      91: "国外 "
+    };
+    //身份证格式正则表达式
+    var idCardReg = /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}(\d|X)$/i;
+    var errorMess = ""; //错误提示信息
+    var isPass = true; //身份证验证是否通过（true通过、false未通过）
+
+    //如果身份证不满足格式正则表达式
+    if (!code || !idCardReg.test(code)) {
+      console.log("您输入的身份证号格式有误！");
+      errorMess = "您输入的身份证号格式有误！";
+      isPass = false;
+    }
+
+    //区域数组中不包含需验证的身份证前两位
+    else if (!city[code.substr(0, 2)]) {
+      errorMess = "您输入的身份证地址编码有误！";
+      isPass = false;
+    } else {
+      //18位身份证需要验证最后一位校验位
+      if (code.length == 18) {
+        code = code.split('');
+        //∑(ai×Wi)(mod 11)
+        //加权因子
+        var factor = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2];
+        //校验位
+        var parity = [1, 0, 'X', 9, 8, 7, 6, 5, 4, 3, 2];
+        var sum = 0;
+        var ai = 0;
+        var wi = 0;
+        for (var i = 0; i < 17; i++) {
+          ai = code[i];
+          wi = factor[i];
+          sum += ai * wi;
+        }
+        var last = parity[sum % 11];
+        if (parity[sum % 11] != code[17]) {
+          errorMess = "您输入的身份证号不存在！";
+          isPass = false;
+        }
+      }
+    }
+    var returnParam = {
+      'errorMess': errorMess,
+      'isPass': isPass
+    }
+    if (errorMess != "") {
+      wx.showModal({
+        title: errorMess,
+        content: '',
+        showCancel: false,
+        confirmText: '确定',
+        confirmColor: '',
+        success: function(res) {},
+        fail: function(res) {},
+        complete: function(res) {},
+      })
+    }
+    return returnParam;
+  },
+  //------初始化加载----------
+  onLoad: function(t) {
+          var th = this;
+          th.setData({
+            isGender:th.data.user.sex
+          })//设置性别
+  },
+  onShow: function() {
+    
+    this.wait_for_store_config();
+    var e = this;
+    var req = t;
+    a.getUserInfo(function(a) {
+      var txt = util.formatTime(a.birthday, 'yyyy-M-d'),
+        arr = txt.split(' ');
+      a.birthday = arr[0];
+      var txt2 = util.formatTime(a.reg_time, 'yyyy-M-d'),
+        arr2 = txt.split(' ');
+      a.reg_time = arr2[0];
+      if (a.pickup_id!=null) {
+        req.get("/api/weshop/pickup/get/" + r.stoid + "/" + a.pickup_id, {
+          success: function(da) {
+            console.log('getsto');
+            console.log(da);
+            //设置门店
+            e.setData({
+              stoname: da.data.data.pickup_name
+            });
+          }
+        })
+      }
+      var phone = "";
+      phone+=a.mobile.substr(0, 3)+"****";
+      phone += a.mobile.substr(7, 12);
+      e.setData({
+        phone:phone,
+        user: a
+      });
+      e.setData({
+        isGender:e.data.user.sex
+      })
+    }, !0);
+  },
+
+  editUserInfo: function(e) {
+    var r = e.currentTarget.dataset.type;
+    if (("password" == r || "paypwd" == r) && !this.data.user.mobile) return a.showWarning("请先绑定手机号码");
+    r && this.data.user && wx.navigateTo({
+      url: "/pages/user/userinfo_edit/userinfo_edit?type=" + r
+    });
+  },
+
+  /*--------------------修改头像---------------------*/
+  changeAvatar: function() {
+    return false;
+    var r = this;
+    wx.chooseImage({
+      count: 1,
+      sizeType: ["compressed", "original"],
+      sourceType: ["camera", "album"],
+      success: function(u) {
+        t.uploadFile(r.data.url + "/api/user/upload_headpic", {
+          filePath: u.tempFilePaths[0],
+          name: "head_pic",
+          success: function(t) {
+            var u = s.getFullUrl(t.data.result);
+            r.setData(e({}, "user.head_pic", u)), a.globalData.userInfo.head_pic = u, a.showSuccess("设置头像成功");
+          }
         });
-    },
+      }
+    });
+  },
 
 
   //------卡片的显示和关闭--------
-  show_tc: function () {
+  show_tc: function() {
     this.setData({
       tc_hide: false,
     });
   },
-  hide_tc: function () {
+  hide_tc: function() {
     this.setData({
       tc_hide: true,
     });
diff --git a/pages/user/userinfo/userinfo.wxml b/pages/user/userinfo/userinfo.wxml
index 19cd0d1..69adb7d 100644
--- a/pages/user/userinfo/userinfo.wxml
+++ b/pages/user/userinfo/userinfo.wxml
@@ -1,97 +1,352 @@
+<wxs module="filters" src="../../../utils/filter.wxs"></wxs>
 <view class="container">
-    <view class="user-container">
-        <view bindtap="changeAvatar" class="user-head">
-            <view class="user-txt">头像</view>
-            <image class="user_headimg" src="{{user.head_pic?user.head_pic:defaultAvatar}}"></image>
-        </view>
-        <view bindtap="editUserInfo1" class="user-name" data-type="nickname">
-            <view class="user-name-txt">昵称</view>
-            <!-- <image class="arrow-right" src="{{iurl}}/miniapp/images/icon-arrowdown.png"></image> -->
-            <view class="user-txt-right one-line">{{user.nickname}}</view>
-        </view>
-        <view bindtap="editUserInfo1" class="user-name" data-type="sex">
-            <view class="user-name-txt">性别</view>
-            <!-- <image class="arrow-right" src="{{iurl}}/miniapp/images/icon-arrowdown.png"></image> -->
-            <view class="user-txt-right">{{user.sex?user.sex==1?'男':'女':'保密'}}</view>
-        </view>
-       
-        <view bindtap="editUserInfo1" class="user-name" data-type="sex">
-            <view class="user-name-txt">生日</view>
-            <!-- <image class="arrow-right" src="{{iurl}}/miniapp/images/icon-arrowdown.png"></image> -->
-            <view class="user-txt-right">{{user.birthday}}</view>
-        </view>
 
+  <!-- 头像,昵称,多个卡 -->
+  <view class="head flex-space-between">
+    <view class="flex-center">
 
-         <view bindtap="editUserInfo1" class="user-name mt" data-type="nickname">
-            <view class="user-name-txt">姓名</view>
-            <!-- <image class="arrow-right" src="{{iurl}}/miniapp/images/icon-arrowdown.png"></image> -->
-            <view class="user-txt-right one-line" wx:if="{{user.vipname}}">{{user.vipname}}</view>
+      <view class="flex-center">
+        <image class="Headportrait" src="{{user.head_pic}}"></image>
+      </view>
+      <view class="flex-center vipmax">
+        <view>
+          <view class="fs32">
+            <view class="ellipsis-1 Nickname">{{user.nickname}}
+            </view>
+          </view>
+
+          <view class="flex-center fs22 vip">
+            <navigator url="">
+              <view class="flex-center AncrownMax">
+                <image class="Ancrown" src="{{iurl}}/miniapp/images/userqy/user_userqy_huang.png"></image>
+                <view>黑卡会员</view>
+              </view>
+            </navigator>
+            <navigator url="/pages/user/plus/plus">
+              <view class="flex-center plusMax">
+                <image class="fuls" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
+                <view>PULS会员</view>
+              </view>
+            </navigator>
+          </view>
         </view>
+      </view>
+    </view>
+    <view class="flex ai_and">
+      <view class="flex-level ai_and" style="background-image:url({{iurl}}/miniapp/images/userinfo/userinfo/code.png);width:170rpx;height:140rpx;background-size:100%;" bindtap="show_tc">
+        <view class="fs26 code" style="color:rgb(255,255,255);margin-left:9rpx;">我的二维码</view>
+      </view>
+    </view>
+  </view>
 
-         <view bindtap="editUserInfo1" class="user-name" data-type="nickname">
-            <view class="user-name-txt">身份证</view>
-            <!-- <image class="arrow-right" src="{{iurl}}/miniapp/images/icon-arrowdown.png"></image> -->
-            <view class="user-txt-right one-line" wx:if="{{user.idcard}}">{{user.idcard}}</view>
+  <view class="user-container">
+    <view class="Bbottom">
+      <view bindtap="changeAvatar" class="user-head flex-vertical-between">
+        <view class="user-txt">卡号</view>
+        <view class="user-txt-right">{{user.erpvipno}}
         </view>
-        <view bindtap="editUserInfo1" class="user-name" data-type="mobile">
-            <view class="user-name-txt">电话</view>
-            <!-- <image class="arrow-right" src="{{iurl}}/miniapp/images/icon-arrowdown.png"></image> -->
-            <view class="user-txt-right">{{user.mobile}}</view>
+      </view>
+      <view bindtap="editUserInfo1" class="user-name flex-vertical-between" data-type="nickname">
+        <view class="flex-center" bindtap="isstcsp">
+          <view>消费密码</view>
+          <view class="flex-center cmleft">
+            <block wx:if="{{isstcsp}}">
+              <icon size="20" type="success" color="rgb(212,2,31)"></icon>
+            </block>
+            <block wx:else>
+              <icon size="20" type="success" color="rgb(0, 0, 0, 0.4)"></icon>
+            </block>
+            <view class="Mleft">启动密码消费</view>
+          </view>
         </view>
-         <view bindtap="editUserInfo1" class="user-name" data-type="mobile">
-            <view class="user-name-txt">地址</view>
-            <!-- <image class="arrow-right" src="{{iurl}}/miniapp/images/icon-arrowdown.png"></image> -->
-            <view class="user-txt-right" wx:if="{{user.address}}">{{user.address}}</view>
+        <!-- 是否显示密码 -->
+        <view class="flex">
+          <block wx:if="{{ispwhid}}">
+            <input class="fs28 hion user-txt-right" maxlength="6" value="{{user.paypwd.length>0?user.paypwd:'******'}}" type="number" password="true"/>
+          </block>
+          <block wx:else>
+            <input class="fs20 hion user-txt-right" maxlength="6" value="{{user.paypwd.length>0?user.paypwd:'未设置'}}" type="number"/>
+          </block>
+          <block wx:if="{{ispwhid}}">
+            <image class="eye" src="{{iurl}}/miniapp/images/userinfo/userinfo/Eye.png" bindtap="ispwhid"></image>
+          </block>
+          <block wx:else>
+            <image class="eye" src="../../../images/open_eye.png" bindtap="ispwhid"></image>
+          </block>
         </view>
-
-        <view bindtap="editUserInfo1" class="user-name" data-type="email">
-            <view class="user-name-txt">所属门店</view>
-            <!-- <image class="arrow-right" src="{{iurl}}/miniapp/images/icon-arrowdown.png"></image> -->
-            <view class="user-txt-right one-line">{{stoname}}</view>
+      </view>
+      <view bindtap="editUserInfo1" class="user-name flex-vertical-between" data-type="sex">
+        <view>性别</view>
+        <view class="flex" wx:if="{{isGender!=0}}">
+          <view class="flex-center {{isGender==1?'Gendercheck':'Gender'}}" bindtap="isGender">
+            <block wx:if="{{isGender==1}}">
+              <image class="GenderImage" src="{{iurl}}/miniapp/images/userinfo/userinfo/malealready.png"></image>
+            </block>
+            <block wx:else>
+              <image class="GenderImage" src="../../../images/userinfo/malenot.png"></image>
+            </block>
+            <view class="fs24">男</view>
+          </view>
+          <view class="flex-center {{isGender==2?'Gendercheck':'Gender'}}" bindtap="isGender">
+            <block wx:if="{{isGender==2}}">
+              <image class="GenderImage" src="{{iurl}}/miniapp/images/userinfo/userinfo/femalealready.png"></image>
+            </block>
+            <block wx:else>
+              <image class="GenderImage" src="{{iurl}}/miniapp/images/userinfo/userinfo/femalenot.png"></image>
+            </block>
+            <view class="fs26">女</view>
+          </view>
         </view>
-        <!-- <view bindtap="editUserInfo1" class="user-change" data-type="password">
-            <view class="user-name-txt">修改密码</view>
-            <image class="arrow-right" src="{{iurl}}/miniapp/images/icon-arrowdown.png"></image>
+         <view class="user-txt-right" wx:if="{{isGender==0}}" bindtap="isGender">保密</view>
+      </view>
+
+      <view bindtap="editUserInfo1" class="user-name flex-vertical-between" data-type="sex">
+        <view>出生日期</view>
+
+
+        <view class="flex flex-vertical-between fs28 Birth">
+          <view class="flex" bindtap="iscalendar">
+            <block wx:if="{{iscalendar}}">
+              <view class="flex-center">
+                <icon size="20" type="success" color="rgb(212,2,31)"></icon>
+              </view>
+            </block>
+            <block wx:else>
+              <icon size="20" type="success" color="rgb(0, 0, 0, 0.4)"></icon>
+            </block>
+            <view class="flex-center">
+              <view class="Mleft">农历</view>
+            </view>
+          </view>
+          <view class="user-txt-right">
+            <!-- 填充数据的时候要判断是否已经有出生日期，有值的话就不可修改 -->
+            <picker bindchange='bindChange' value="{{datet}}" mode="date" 
+            start="{{year-70}}-1-1" end="{{year}}-12-31">
+              <view>{{datet==""?user.birthday:datet}}</view>
+            </picker>
+          </view>
         </view>
-        <view bindtap="editUserInfo1" class="user-name" data-type="paypwd">
-            <view class="user-name-txt">支付密码</view>
-            <image class="arrow-right" src="{{iurl}}/miniapp/images/icon-arrowdown.png"></image>
-        </view> -->
-        <navigator class="user-name mt" url="/pages/user/address_list/address_list">
-            <view class="user-name-txt">收货地址</view>
-            <image class="arrow-right" src="{{iurl}}/miniapp/images/icon-arrowdown.png"></image>
-        </navigator>
-        <view bindtap='show_tc' class="user-name" data-type="email">
-            <view class="user-name-txt">我的二维码名片</view>
-            <image class="arrow-right" src="{{iurl}}/miniapp/images/user/code.png"></image>
+      </view>
+    </view>
+    <view class="Bbottom">
+      <view bindtap="editUserInfo1" class="user-name mt flex-vertical-between" data-type="nickname">
+        <view class="user-name-txt">姓名</view>
+        <input class="user-txt-right" style="text-indent:300rpx;" placeholder="{{user.vipname.length>0?user.vipname:'*姓名'}}"/>
+      </view>
+
+      <view bindtap="editUserInfo1" class="user-name flex-vertical-between" data-type="nickname">
+        <view class="user-name-txt">身份证</view>
+        <block wx:if="{{user.idcard.length>0}}">
+          <view class="user-txt-right">{{user.idcard}}</view>
+        </block>
+        <block wx:else>
+          <input class="user-txt-right" bindblur="IdentityIDCard" value="" type="idcard" maxlength="18" placeholder="*身份证" />
+        </block>
+      </view>
+      <navigator url="/pages/user/Change_phone/Change_phone?mobile={{user.mobile}}" class="user-name flex-vertical-between" data-type="mobile">
+        <view class="user-name-txt">更换手机</view>
+        <view class="flex-center user-txt-right">
+          <view class="flex">{{phone}}</view>
+          <view class="angle">∟</view>
         </view>
-        <view bindtap="editUserInfo1" class="user-name" data-type="email">
-            <view class="user-name-txt">绑定的时间</view>
-            <!-- <image class="arrow-right" src="{{iurl}}/miniapp/images/icon-arrowdown.png"></image> -->
-            <view class="user-txt-right one-line">{{user.reg_time}}</view>
+      </navigator>
+      <view class="user-name flex-vertical-between" data-type="mobile">
+        <view class="user-name-txt">地址</view>
+        <block wx:if="{{user.address.length>0}}">
+          <view>{{user.address}}</view>
+        </block>
+        <block wx:else>
+          <input maxlength="30" class="user-txt-right" placeholder="*地址" style=" text-indent: 370rpx;" />
+        </block>
+      </view>
+
+      <view bindtap="onclickstore" class="user-name flex-vertical-between" data-type="email">
+        <view class="user-name-txt">所属门店</view>
+        <view class="flex-center user-txt-right">
+          <view class="one-line">{{def_pick_store.pickup_name}}</view>
+          <view class="angle">∟</view>
         </view>
+      </view>
     </view>
+    <navigator class="user-name mt flex-vertical-between" url="/pages/user/address_list/address_list">
+      <view class="user-name-txt">收货地址</view>
+      <view class="flex-center user-txt-right">
+        <view class="flex">{{user.address_id}}</view>
+        <view class="angle">∟</view>
+      </view>
+    </navigator>
+    <view bindtap="editUserInfo1" class="user-name flex-vertical-between" data-type="email">
+      <view class="user-name-txt">绑定的时间</view>
+      <view class="user-txt-right one-line">{{user.reg_time}}</view>
+    </view>
+  </view>
+</view>
+<!-- 确认修改按钮 -->
+<view class="flex-center confirm">
+  <view class="flex-center fs30 confirmtext">
+    <view>确认修改</view>
+  </view>
 </view>
 
 <!--弹出层内容，其中的“我知道”中绑定让弹出层消失的函数：bindtap="hide"-->
 <view class="tc_view" hidden='{{tc_hide}}' bindtap='hide_tc'>
   <view class="modal-box" hidden="{{flag}}" bindtap="hide"></view>
   <view class="modal-body">
-      <view class="modal-content">
-         <view class="flex">
-            <image src="{{user.head_pic}}" class="hd_img"></image>
-            <view class="ctent_txt">
-                <view class='txt1'>{{user.nickname}}
-                    <image wx:if="{{user.sex==2}}" class="arrow-right" src="{{iurl}}/miniapp/images/user/wum.png"></image>
-                    <image wx:else class="arrow-right" src="{{iurl}}/miniapp/images/user/man.png"></image>
-                </view>
-                <view class='txt2' wx:if="{{user.address}}">{{user.address}}</view>
-            </view>      
-         </view>  
-         <view class="m_ta">
-           <image class='g_img' src='https://mshop.yolipai.net//index.php?m=Home&c=Index&a=qr_code&data={{user.mobile}}'></image>
-         </view>
-         <view class="s_sao">扫一扫上面的二维码图案，即可消费</view>
+    <view class="modal-content">
+      <view class="flex">
+        <image src="{{user.head_pic}}" class="hd_img"></image>
+        <view class="ctent_txt">
+          <view class='txt1'>{{user.nickname}}
+            <image wx:if="{{user.sex==2}}" class="arrow-right" src="{{iurl}}/miniapp/images/user/wum.png"></image>
+            <image wx:else class="arrow-right" src="{{iurl}}/miniapp/images/user/man.png"></image>
+          </view>
+          <view class='txt2' wx:if="{{user.address}}">{{user.address}}</view>
+        </view>
       </view>
+      <view class="m_ta">
+        <image class='g_img' src='https://mshop.yolipai.net//index.php?m=Home&c=Index&a=qr_code&data={{user.mobile}}'></image>
+      </view>
+      <view class="s_sao">扫一扫上面的二维码图案，即可消费</view>
+    </view>
   </view>
 </view>
+
+<!-- 选择门店的弹框，1.1版最新的 -->
+<block wx:if="{{store==1}}">
+  <view class="mongolia-layer" bindtap="onclickstore"></view>
+  <view class="popup-frame">
+    <block wx:if="{{sort_store==0}}">
+      <!-- 头部 标题 -->
+      <view class="popup-top flex-space-between">
+        <text class="fs32 nearby_store">{{choice_sort_store==0?'附近的门店':region_name}}</text>
+        <view>
+          <view>
+            <icon bindtap="onclickstore" class="modal-closes" color="black" size="22" type="cancel"></icon>
+          </view>
+          <view class="felx choose_more" bindtap="more_store">
+            <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'更多门店':'返回'}}</text>
+            <view class="bg_rights"></view>
+          </view>
+        </view>
+      </view>
+      <!-- 门店列表，最外层的门店列表，一开始 -->
+      <view class="store-list">
+        <!--如果还没有点击更多门店的时候  -->
+        <block wx:if="{{choice_sort_store==0}}">
+          <!-- 需要for循环 -->
+          <block wx:if="is_show_sto_cat==1">
+            <view class="store_choose flex" wx:for="{{def_pickpu_list}}" bindtap="choose_for_store_fir" data-ind="{{index}}">
+              <view class="store flex-vertical">
+                <!-- 需要点击事件 -->
+                <block wx:if="{{index==fir_pick_index}}">
+                  <view class="circle white xc-hook fs20 red-b">Г</view>
+                </block>
+                <block wx:else>
+                  <view class="circle  xc-hooks"></view>
+                </block>
+                <view class="address-frame xc-ash">
+                  <view class="flex-vertical-between butttem5">
+                    <view class="flex xc-ash">
+                      <view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view>
+                    </view>
+                    <view>
+                      <view class="distance fs24 address-val" wx:if="{{item.distance!=null}}">
+                        距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+'km':filters.toFix(item.distance,0)+"m"}}</view>
+                    </view>
+                  </view>
+                  <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
+                </view>
+              </view>
+            </view>
+          </block>
+          <block wx:else>
+            <view class="store_choose flex" wx:for="{{only_pk}}" bindtap="choose_for_store_fir" data-ind="{{index}}">
+              <view class="store flex-vertical">
+                <!-- 需要点击事件 -->
+                <block wx:if="{{index==fir_pick_index}}">
+                  <view class="circle white xc-hook fs20 red-b">Г</view>
+                </block>
+                <block wx:else>
+                  <view class="circle  xc-hooks"></view>
+                </block>
+
+                <view class="address-frame xc-ash">
+                  <view class="flex-vertical-between ">
+                    <view class="flex xc-ash">
+                      <view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view>
+                    </view>
+                    <view>
+                      <view class="distance fs24 address-val" wx:if="{{item.distance!=null}}">距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}
+                      </view>
+                    </view>
+                  </view>
+                  <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
+                </view>
+              </view>
+            </view>
+          </block>
+        </block>
+        <block wx:else>
+          <!-- 如果是点击选择门店分类后显示分类下的门店  -->
+          <view class="store_choose flex" wx:for="{{sec_sto.s_arr}}" data-ind="{{index}}" bindtap="choose_for_store">
+            <view class="store flex-vertical">
+              <!-- 需要点击事件 -->
+              <block wx:if="{{index==sec_pick_index}}">
+                <view class="circle white xc-hook fs20 red-b">Г</view>
+              </block>
+              <block wx:else>
+                <view class="circle  xc-hooks"></view>
+              </block>
+
+              <view class="address-frame xc-ash">
+                <view class="flex-vertical-between ">
+                  <view class="flex xc-ash">
+                    <view class="fs28 xc-black3 address_name">{{item.pickup_name}}</view>
+                  </view>
+                  <view>
+                    <view class="distance fs24 address-val" wx:if="{{item.distance!=null}}"> 距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}</view>
+                  </view>
+                </view>
+                <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
+              </view>
+            </view>
+          </view>
+        </block>
+
+      </view>
+
+      <!-- 门店列表底部 -->
+      <view class="store-bottom-frame">
+        <view class="store-bottom flex-center">
+          <view class="determine red-b fs30 white t-c" bindtap="sure_pick" data-openindstore="{{open_ind_store}}">确定</view>
+          <!-- <view class="default  t-c fs28" bindtap="set_def_pick" data-openindstore="{{open_ind_store}}">设为默认</view> -->
+        </view>
+      </view>
+
+    </block>
+
+
+    <block wx:else>
+      <view class="popup-top flex-space-between">
+        <text class="fs32 nearby_store">门店分类选择</text>
+        <view>
+          <view>
+            <icon bindtap="onclickstore" class="modal-closes" color="black" size="22" type="cancel"></icon>
+          </view>
+        </view>
+      </view>
+      <view class="sort_store_list">
+
+        <view class="sort-store-frame" wx:for="{{all_sto}}" data-index="{{index}}" bindtap="choice_sort_store" data-region="{{item.name}}">
+          <view class="sort-store flex-vertical-between">
+            <view class="fs30" di>{{item.name}}</view>
+            <view class="black_rights-frame">
+              <view class="black_rights"></view>
+            </view>
+          </view>
+        </view>
+
+      </view>
+    </block>
+  </view>
+</block>
\ No newline at end of file
diff --git a/pages/user/userinfo/userinfo.wxss b/pages/user/userinfo/userinfo.wxss
index cbd6456..f87c6ff 100644
--- a/pages/user/userinfo/userinfo.wxss
+++ b/pages/user/userinfo/userinfo.wxss
@@ -1,103 +1,560 @@
+.container{
+  padding-bottom:165rpx;
+}
 .user-container {
-    font-size: 30rpx;
+  font-size: 30rpx;
+}
+input{
+  width: 450rpx;
+}
+.head {
+  height: 220rpx;
+  border-bottom: 6rpx solid rgb(245, 245, 245);
+  border-top: 2rpx solid rgb(245, 245, 245);
+  background-size: 100%;
+}
+.angle{
+  transform: rotate(225deg);
+  font-size: 24rpx;
+  margin-top: 2rpx;
+}
+.Headportrait {
+  width: 145rpx;
+  height: 145rpx;
+  border-radius: 50%;
+  margin-left: 40rpx;
 }
 
-.user-head {
-    width: 100%;
-    height: 200rpx;
-    position: relative;
-    background-color: white;
+.vip {
+  margin-top: 30rpx;
+  color: rgb(255, 255, 255);
 }
 
-.user-txt {
-    float: left;
-    margin-left: 40rpx;
-    margin-top: 80rpx;
-    color: #666;
+.AncrownMax {
+  background-color: rgb(57, 57, 57);
+  width: 150rpx;
+  height: 36rpx;
+  border-radius: 20rpx;
+  margin-right: 20rpx;
+  line-height: 36rpx;
+}
+.Nickname{
+  max-width:170rpx;
+}
+.Ancrown {
+  width: 30rpx;
+  height: 30rpx;
+  margin-right: 5rpx;
+}
+
+.plusMax {
+  background-color: rgb(212, 58, 30);
+  width: 150rpx;
+  height: 36rpx;
+  border-radius: 20rpx;
+  line-height: 36rpx;
+}
+
+.fuls {
+  width: 25rpx;
+  height: 25rpx;
+  margin-right: 5rpx;
+}
+
+.Bbottom {
+  border-bottom: 6rpx solid rgb(245, 245, 245);
+}
+
+.Mleft {
+  margin-left: 8rpx;
+}
+
+.Birth {
+  width: 500rpx;
+}
+
+.Gendercheck {
+  width: 90rpx;
+  height: 35rpx;
+  border: 2rpx solid rgb(212, 2, 31);
+  color: rgb(212, 2, 31);
+  border-radius: 20rpx;
+  margin-left: 15rpx;
+}
+
+.Gender {
+  width: 90rpx;
+  height: 35rpx;
+  border: 2rpx solid rgb(153, 153, 153);
+  color: rgb(153, 153, 153);
+  border-radius: 20rpx;
+  margin-left: 15rpx;
+}
+
+.GenderImage {
+  width: 25rpx;
+  height: 25rpx;
+  margin-right: 10rpx;
+}
+.confirm{
+  width: 100%;
+  position:fixed;
+  left: 0rpx;
+  bottom: 0rpx;
+  height: 130rpx;
+  background-color: rgb(255,255,255);
+}
+
+.confirmtext {
+  width: 495rpx;
+  height: 65rpx;
+  color: rgb(255, 255, 255);
+  background-color: rgb(214, 1, 33);
+  border-radius: 35rpx;
+}
+
+.cmleft {
+  margin-left: 45rpx;
+}
+
+.hion {
+  width:85rpx;
+  margin-top: 3rpx;
+  margin-right: 5rpx;
+}
+
+.eye {
+  width: 50rpx;
+  height: 50rpx;
+}
+
+.user-head {
+  height: 95rpx;
+  background-color: white;
+  margin: 0rpx 20rpx;
+  border-bottom: 2rpx solid rgb(245, 245, 245);
+  padding: 0rpx 20rpx;
+  padding-top: 20rpx;
 }
 
 .user_headimg {
-    height: 140rpx;
-    width: 140rpx;
-    border-radius: 70rpx;
-    float: right;
-    margin-right: 30rpx;
-    margin-top: 25rpx;
+  height: 140rpx;
+  width: 140rpx;
+  border-radius: 70rpx;
 }
 
 .user-name {
-    width: 100%;
-    height: 100rpx;
-    margin-top: 2rpx;
-    background-color: white;
+  height: 95rpx;
+  margin-top: 2rpx;
+  background-color: white;
+  margin: 0rpx 20rpx;
+  border-bottom: 2rpx solid rgb(245, 245, 245);
+  padding: 0rpx 20rpx;
 }
-.user-name.mt{ margin-top: 20rpx;}
 
-.user-name-txt {
-    float: left;
-    margin-left: 40rpx;
-    margin-top: 30rpx;
-    color: #666;
+.user-name.mt {
+  margin-top: 20rpx;
 }
 
-.user-txt-right {
-    float: right;
-    margin-top: 30rpx;
-    margin-right: 30rpx;
-    font-sise:34rpx
+.address {
+  max-width: 300rpx;
+}
+
+.Receiving_goods {
+  width: 330rpx;
 }
 
 .user-change {
-    width: 100%;
-    height: 100rpx;
-    margin-top: 20rpx;
-    background-color: white;
+  width: 100%;
+  height: 100rpx;
+  margin-top: 20rpx;
+  background-color: white;
 }
 
 .one-line {
-    white-space: nowrap;
-    word-break: keep-all;
-    overflow: hidden;
+  white-space: nowrap;
+  word-break: keep-all;
+  overflow: hidden;
+}
+
+/*---弹出层---*/
+
+.modal-box {
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  top: 0px;
+  background: rgba(0, 0, 0, 0.4);
+  overflow: hidden;
+}
+
+.modal-body {
+  position: fixed;
+  top: 80rpx;
+  left: 0;
+  z-index: 100;
+  background: #fff;
+  margin-left: 73rpx;
+  width: 600rpx;
+  height: 860rpx;
+  border-radius: 8px;
+  text-align: center;
+}
+
+.modal-content {
+  width: 480rpx;
+  margin: 0 auto;
+  margin-top: 60rpx;
+  overflow: hidden;
+}
+
+.modal-content .hd_img {
+  width: 170rpx;
+  height: 170rpx;
+  border-radius: 5px;
+}
+
+.ctent_txt {
+  margin-left: 30rpx;
+  text-align: left;
+}
+
+.txt1 {
+  font-size: 34rpx;
+  font-weight: bold;
+}
+
+.txt2 {
+  font-size: 30rpx;
+  color: #999;
+  margin-top: 20rpx;
 }
 
 .arrow-right {
-    width: 30rpx;
-    height: 30rpx;
-    margin-right: 30rpx;
-    float: right;
-    margin-top: 20rpx;
+  width: 30rpx;
+  height: 30rpx;
+  margin-left: 10rpx;
 }
 
+.code {
+    margin-bottom: 10rpx;
+}
 
-/*---弹出层---*/
-.modal-box{
-  position:fixed; width:100%;height:100%;
-  top:0px; background:rgba(0,0,0,0.4);
+.user-txt-right {
+  color: rgb(153, 153, 153);
+  font-size: 28rpx;
+}
+
+.user-txt {
+  font-size: 32rpx;
+}
+
+.m_ta {
+  margin-top: 50rpx;
+}
+
+.g_img {
+  width: 480rpx;
+  height: 480rpx;
+}
+
+.s_sao {
+  font-size: 27rpx;
+  margin-top: 25rpx;
+}
+
+.order-ico1 {
+  width: 80rpx;
+  height: 46rpx;
+  margin-left: 40rpx;
+  margin-right: 20rpx;
+  color: rgba(0, 0, 0, 0.4);
+}
+
+.f_btn {
+  font-size: 24rpx;
+  padding: 0 12rpx;
+  margin-right: 26rpx;
+  margin-top: -10rpx;
+}
+
+.order-ico3 {
+  width: 54rpx;
+  height: 40rpx;
+  margin-left: 40rpx;
+  margin-right: 20rpx;
+}
+
+.wh1001 {
+  width: 62rpx;
+  height: 100%;
+}
+
+.wh1002 {
+  width: 76rpx;
+  height: 100%;
+}
+
+.order-ico.cla {
+  width: 32rpx;
+}
+
+.order-ico.cla2 {
+  width: 42rpx;
+  margin-left: 34rpx;
+}
+
+.order-ico.cla3 {
+  width: 40rpx;
+  margin-left: 36rpx;
+}
+/* 日期控件 */
+.pi{
+   width:200rpx;
+  height:auto; 
+  margin-left:10rpx;
+}
+.vipmax{
+  margin-left: 20rpx;
+}
+
+
+/* 门店地址 */
+.xc-address_frame{
+  border-top:1rpx solid #eee;
+  width: 100%;
+  height: auto;
+}
+.on_height{
+height: 90rpx;
+}
+.sn_height{
+  height: 170rpx;
+}
+.xc-address_frame .address_frame{
+  width: 92%;
+padding-left: 10rpx;
+margin: auto;
+
+}
+.stores-img{
+width: 40rpx;
+  height: 35rpx;
+  margin-right: 10rpx;
+}
+.shop_name{
+  margin-right: 10rpx;
+}
+.address{
+  width: 87%;
+  margin-top: 5rpx;
+  margin-bottom: 5rpx;
+}
+.distance{
+  padding-left: 15rpx;
+  padding-right: 15rpx;
+  background: #eee;
+  border-radius: 20rpx;
+  margin-right: 5rpx;
+  color: #999;
+  height: 38rpx;
+line-height: 38rpx;
+
+}
+/* 选择门店的弹窗 */
+.mongolia-layer{
+  position: fixed;
+left: 0;
+top: 0;
+right: 0;
+bottom: 0;
+z-index: 11;
+background: rgba(0,0,0,0.4);
+width: 100%;
+height: 91.9%;
+
+}
+.popup-frame{
+  position: fixed;
+bottom:-1rpx;
+z-index: 20;
+background: white;
+width: 100%;
+border-radius: 20rpx 20rpx 0 0;
+height: 72%;
+}
+.popup-top{
+  border-bottom: 1rpx solid #eee;
+  height: 155rpx;
+  width: 95%;
+  margin: auto;
+  line-height: 155rpx;
+
+}
+.bg_rights{ 
+        border-top: 2rpx solid ;
+        border-right: 2rpx solid ;
+        transform: rotate(45deg);
+        display:inline-block;
+        width:15rpx;height:15rpx;
+        border-color:#da0b31;
+}
+.modal-closes {
+    position: absolute;
+    right: 30rpx;
+    top: 20rpx;
+    height: 50rpx;
+    line-height: 50rpx;
+}
+.choose_more{
+  margin-top: 40rpx;
+  padding-right: 20rpx;
+
+}
+.choose_mores{
+  margin-top: 30rpx;
+  margin-right: 15rpx;
+
+}
+.store-list{
+  width: 95%;
+  height: 72%;
+  overflow-y: scroll;
+  margin: auto;
+}
+.store-list .store_choose{
+  width: 100%;
+  height: 120rpx;
+  line-height: 125rpx;
+  border-bottom: 1rpx solid #eee;
+
+}
+.store-list .store_choose .store{
+width: 100%;
+margin: auto;
+line-height: 37rpx;
+padding-left: 20rpx;
+
+}
+.xc-hook{
+  width: 33rpx;
+  height: 33rpx;
+  transform: rotate(-145deg);
+line-height: 37rpx;
+text-align: center;
+}
+ .xc-hooks{
+   width: 30rpx;
+  height: 30rpx;
+  border: 1rpx solid #999; 
+ }
+ .address-frame{
+   width: 93%;
+margin-left: 7rpx;
+
+ }
+ .nearby_store{
+margin-left: 17rpx;
+ }
+ .address_name{
+   margin-right: 10rpx;
+
+ }
+ .address-val{
+   height: 38rpx;
+line-height: 38rpx;
+
+ }
+ .store-bottom{
+   width: 85%;
+   margin: auto;
+   height: 70rpx;
+ }
+ .determine{
+   width: 320rpx;
+  height: 55rpx;
+  border-radius: 50rpx;
+  line-height: 55rpx;
+ }
+ .default{
+   width: 260rpx;
+  height: 55rpx;
+  border:3rpx solid #c8c8c8;
+    border-radius: 50rpx;
+    line-height: 55rpx;
+ }
+ .store-bottom-frame{
+   width: 95%;
+     margin: auto;
+   
+ }
+ /* 门店分类列表 */
+.sort_store_list{
+  height: 82%;
   overflow: hidden;
+  overflow-y: scroll;
+  width: 95%;
+  margin: auto;
 }
-.modal-body{
-  position:fixed;top:80rpx;left: 0; z-index: 100;
-   background: #fff; margin-left: 73rpx;
-   width: 600rpx;
-   height: 860rpx;
-   border-radius: 8px; text-align: center;
-}
-.modal-content{width: 480rpx;  margin: 0 auto; margin-top: 60rpx; overflow: hidden }
-.modal-content .hd_img{ width:170rpx; height: 170rpx;border-radius:5px }
-.ctent_txt{ margin-left: 30rpx; text-align: left}
-.txt1{font-size: 34rpx; font-weight: bold}
-.txt2{font-size: 30rpx; color:#999; margin-top: 20rpx }
-.arrow-right{ width: 40rpx; height: 40rpx; position: relative;top:10rpx; margin-left: 20rpx;}
-
-.m_ta{margin-top:50rpx; }
-.g_img{ width: 480rpx; height: 480rpx}
-.s_sao{font-size: 27rpx; margin-top: 25rpx}
-.order-ico1{ width: 80rpx;height: 46rpx; margin-left: 40rpx;margin-right: 20rpx;}
-.f_btn{font-size:24rpx; padding: 0 12rpx; margin-right: 26rpx; margin-top: -10rpx}
-.order-ico3{ width: 54rpx;height: 40rpx; margin-left: 40rpx;margin-right: 20rpx;}
-
-.wh1001{ width: 62rpx; height: 100%;}
-.wh1002{ width: 76rpx; height: 100%;}
-.order-ico.cla{width: 32rpx;}
-.order-ico.cla2{width: 42rpx;margin-left: 34rpx;}
-.order-ico.cla3{width: 40rpx; margin-left: 36rpx;}
+.sort_store_list .sort-store-frame{
+  width: 100%;
+height: 100rpx;
+line-height:100rpx;
+border-bottom: 1rpx solid #eee;
+
+}
+.sort_store_list .sort-store-frame .sort-store{
+  width: 94.5%;
+  margin: auto;
+}
+.black_rights-frame{
+width: 50%；
+}
+.black_rights-frame .black_rights{
+  border-top: 3rpx solid;
+border-right: 3rpx solid;
+transform: rotate(45deg);
+display: inline-block;
+width: 20rpx;
+height: 20rpx;
+}
+.xc-val-money{
+  height:80rpx;
+}
+
+.xc-distance-bottom{
+ margin-bottom: 40rpx;
+}
+.xc-distance-top{
+margin-top: 10rpx;
+}
+.xc-width{
+  width: 100%;
+}
+.right-arrow{ width: 15rpx; height:15rpx;
+        border-top: 2rpx solid #d70026;
+        border-right: 2rpx solid #d70026;
+        transform: rotate(45deg);display:inline-block;
+        margin-bottom:3rpx;
+}
+.xc-goods-attribute{
+  border-bottom: 1px solid #eee;
+padding-bottom: 15px;
+margin-bottom:40rpx;
+}
+.xc-val-fream{
+  width: 105rpx;
+}
+.is_stock{
+width: 58%;
+height: 70rpx;
+border-radius: 55rpx;
+}
+.select_store_height{
+  height: 50rpx;
+}
+.butttem5{
+  margin-bottom: 5rpx;
+}
+
+.s_btn{ margin-top: 25rpx; }
\ No newline at end of file