diff --git a/packageA/pages/profile/profile.js b/packageA/pages/profile/profile.js
new file mode 100644
index 0000000..1cedc68
--- /dev/null
+++ b/packageA/pages/profile/profile.js
@@ -0,0 +1,917 @@
+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;
+}
+
+var a = getApp(),
+ r = a.globalData.setting,
+ t = a.request,
+ s = require("../../../utils/common.js"),
+ util = require("../../../utils/util.js"),
+ ut = util,
+ d = getApp().globalData;
+
+var timestamp = Date.parse(new Date());
+var date = new Date(timestamp);
+const {
+ barcode,
+ qrcode
+} = require('../../../utils/index.js');
+
+Page({
+ 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: 0, //选择分类门店
+ 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: 0, //是否启用密码消费
+ isGender: 1, //什么性别
+ iscalendar: 0, //是否是农历
+ consumption: "", //消费密码
+ identity_card: "", //身份证值
+ address: "", //地址
+ openid: "", //openid
+ pulscardname: "", //puls会员的卡
+ gradename: "", //会员权益的卡
+ isBool: "",
+ sto_sele_id: "", //所属门店id
+ is_zy: 0, //是否执行onshow
+ is_lable_set: "", //是否启用我的兴趣标签
+ check_label: [], //我选择的兴趣标签
+ fir_guide_id:null, //存储会员详情接口出来的美导ID
+
+ },
+ //通过路径跳转到其他页面
+ goto: function(e) {
+ var url = e.currentTarget.dataset.url;
+ getApp().goto(url);
+ },
+ //获取配置信息
+ get_config: function() {
+ var th = this;
+ getApp().getConfig2(function(ee) {
+ var sms_conf = ee.switch_list;
+ sms_conf = JSON.parse(sms_conf);
+ th.setData({
+ is_lable_set: sms_conf.user_label_set, //是不是会员标签设置
+ guide_title:sms_conf.guide_consultant, //系统参数 导购标题
+ guide_change_time:sms_conf.guide_change_time //每月能修改几次
+ })
+ if (sms_conf.user_label_set) {
+ th.query_checklabels();
+ }
+ })
+ },
+ //查找会员选择的兴趣标签
+ query_checklabels: function() {
+ var th = this;
+ var url = "/api/weshop/marketing/holiday/vip/interest/label/get";
+ var interest_lables = th.data.interest_lables; //兴趣标签
+ getApp().request.promiseGet(url, {
+ data: {
+ userId: d.user_id,
+ storeId: r.stoid
+ }
+ }).then(res => {
+ if (res.data.code == 0) {
+ var data = res.data.data;
+ var VipLabel = th.data.check_label; //通过id标签找到已选择的标签
+ var dateList = data.VipLabel.split(",");
+ for (var i in dateList) {
+ if (dateList[i] != "") {
+ VipLabel.push(dateList[i]);
+ }
+ }
+ th.setData({
+ check_label: VipLabel
+ })
+ } else {
+ getApp().my_warnning("系统繁忙，请稍后再试", 0, th);
+ }
+ })
+ },
+ //是否启动密码消费
+ isstcsp: function() {
+ var th = this;
+ var isstcsp = th.data.isstcsp;
+ if (isstcsp == 0) {
+ th.setData({
+ isstcsp: 1
+ })
+ } else {
+ th.setData({
+ isstcsp: 0
+ })
+ }
+ },
+ //出生日期是否是农历
+ iscalendar: function() {
+
+ if(this.data.user.birthday) return false;
+ var th = this;
+ var iscalendar = th.data.iscalendar;
+ if (iscalendar == 0) {
+ th.setData({
+ iscalendar: 1
+ })
+ } else {
+ th.setData({
+ iscalendar: 0
+ })
+ }
+ },
+ //性别
+ isGender: function(e) {
+ var th = this;
+ var sex = e.currentTarget.dataset.sex;
+ th.setData({
+ isGender: sex
+ })
+ },
+ //密码是否隐藏显示
+ 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];
+ }
+ th.setData({
+ def_pick_store: item,
+ stoname: item.pickup_name,
+ 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: 'gcj02',
+ 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;
+ //检验门店的点击，看下次数是不是到了
+ this.check_click_ok(function(){
+ if (th.data.store == 0) {
+ th.setData({
+ store: 1
+ })
+ } else {
+ th.setData({
+ store: 0
+ })
+ }
+ var dd = {
+ store_id: r.stoid,
+ isstop: 0,
+ pageSize: 300
+ }
+ th.setData({
+ sort_store: 0
+ });
+ 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)
+
+ },2)
+
+ },
+
+ //选择更多门店
+ 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)) {
+ 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 user = getApp().globalData.userInfo;
+ if (user.card_field != '' && user.card_field != null && user.card_field != undefined && user.card_expiredate) {
+ var now = ut.gettimestamp();
+ var str = user.card_expiredate.replace(/-/g, '/');;
+ var end = new Date(str);
+ end = Date.parse(end) / 1000;
+ if (now < end) {
+ this.puls_user();
+ }
+ }
+ this.initial_user();
+ },
+ //-----------会员是否初始化---------------------
+ initial_user: function() {
+
+ var th = this;
+ getApp().request.get("/api/weshop/users/grade/vip/init/get", {
+ data: {
+ storeId: r.stoid,
+ },
+ success: function(su) {
+ var isBool = su.data.data.isBool;
+ th.setData({
+ isBool: isBool
+ });
+
+ if (!isBool) return false;
+ //-----会员权益获取--------------
+ getApp().request.get("/api/weshop/users/grade/aftervipinfo/get", {
+ data: {
+ storeId: r.stoid,
+ userId: getApp().globalData.user_id,
+ },
+ success: function(su) {
+ var gradename = su.data.data.GradeName;
+ th.setData({
+ gradename: gradename
+ });
+ }
+ });
+
+ }
+ });
+ this.get_config();
+ },
+
+
+ //-----Plus会员获取-----------
+ puls_user: function() {
+ var th = this;
+ getApp().request.get("/api/weshop/plus/vip/mem/list", {
+ data: {
+ storeId: r.stoid,
+ userId: getApp().globalData.user_id,
+ },
+ success: function(su) {
+
+ if (su.data.code == 0) {
+ var cardname = su.data.data[0].MemCardName;
+ th.setData({
+ pulscardname: cardname
+ });
+ }
+ }
+ });
+ },
+
+ onShow: function() {
+ var e = this;
+ if (this.data.is_zy) return false;
+ this.wait_for_store_config();
+
+ //如果有传值进行跳转的话
+ var choice_guide=null;
+ if(getApp().globalData.choice_guide){
+ choice_guide=JSON.parse(JSON.stringify(getApp().globalData.choice_guide));
+ getApp().globalData.choice_guide=null;
+ }
+
+ var req = t;
+ req.get("/api/weshop/users/getAndUpdateUser/" + r.stoid + "/" + getApp().globalData.user_id, {
+ success: function(src) {
+ var a = src.data.data;
+
+ if(!a) a={};
+ var time ="",birthday ="";
+ if(a && a.reg_time) time=util.formatTime(a.reg_time, "'Y/M/D");
+ if(a && a.birthday) birthday=util.formatTime(a.birthday, "'Y/M/D");
+
+ a.reg_time = time;
+ a.birthday = birthday
+
+ if(a.address=='null' || !a.address){
+ a.address="";
+ }
+
+ e.data.fir_guide_id=a.staffId;
+ if(choice_guide){
+ a.staffName=choice_guide.StaffName;
+ a.staffId=choice_guide.Id;
+ }
+
+
+ e.setData({
+ phone: a.mobile,
+ user: a,
+ openid: a.openid,
+ sto_sele_id: a.pickup_id,
+ consumption: a.paypwd,
+ identity_card: a.idcard,
+ address: a.address,
+ isGender: a.sex,
+ isstcsp: a.vipnopwd,
+ iscalendar:a.islunar
+ });
+
+ }
+ })
+ 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) {
+ if(da.data.data){
+ //设置门店
+ e.setData({
+ stoname: da.data.data.pickup_name
+ });
+ }
+
+ }
+ })
+ }
+ // var phone = "";
+ // phone+=a.mobile.substr(0, 3)+"****";
+ // phone += a.mobile.substr(7, 12);
+
+
+
+ // 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() {
+ if (!getApp().globalData.userInfo) return false;
+ //base64_encode($user.mobile.'|'.date('Y-m-d H:i:s')
+ var val=getApp().globalData.userInfo.mobile+"|"+ut.formatTime();
+ val="^"+ut.base64_encode(val);
+
+ qrcode('qrcode', val, 480, 480, this);
+
+ this.setData({
+ tc_hide: false,
+ });
+ },
+ hide_tc: function() {
+ this.setData({
+ tc_hide: true,
+ });
+ },
+ //消费密码输入框失去焦点事件
+ lose_focus: function(e) {
+ var th = this;
+ var val = e.detail.value;
+ this.setData({
+ consumption: val
+ })
+ },
+
+ //地址
+ address: function(e) {
+ var val = e.detail;
+ this.setData({
+ address: val.value
+ });
+ },
+
+ //身份证验证
+ identity_card: function(e) {
+ var val = e.detail;
+
+ this.setData({
+ identity_card: val.value
+ });
+
+ },
+ //用户名字
+ user_name: function(e) {
+ var th = this;
+ var name = e.detail.value;
+ var vipname = 'user.vipname';
+ if (name != "" || name != null) {
+ th.setData({
+ [vipname]: name
+ });
+ }
+
+ },
+
+ //点击确认修改信息
+ confirm_revision: function() {
+ var th = this;
+ var isstcsp = th.data.isstcsp; //是否启用消费密码
+ var phone = th.data.phone; //手机号码
+ if (phone == "" || phone == null) {
+ getApp().my_warnning("手机不能为空", 0, th);
+ return false;
+ }
+ var consumption = th.data.consumption; //消费密码
+ var isstcsp = th.data.isstcsp;
+ if (isstcsp == 1) {
+
+ if (consumption == null || consumption == "" || consumption == undefined) {
+ getApp().my_warnning("消费密码不能为空", 0, th);
+ return false;
+ }
+ if (consumption.length < 6) {
+ getApp().my_warnning("消费密码不能小于6位", 0, th);
+ return false;
+ }
+ }
+ var sex = th.data.isGender; //性别
+
+ if (sex != "1" && sex != "2") {
+ getApp().my_warnning("请选择性别", 0, th);
+ return false;
+ }
+ var user_name = th.data.user.vipname; //用户姓名
+ if (user_name == "" || user_name == null) {
+ getApp().my_warnning("请输入名字", 0, th);
+ return false;
+ }
+ var identity_card = th.data.identity_card; //身份证
+
+ if (identity_card!=null && identity_card!=undefined && identity_card != "" && !(/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(identity_card))) {
+ getApp().my_warnning("身份证号码错误", 0, th);
+ return false;
+ }
+ var address = th.data.address; //地址
+ var sto_sele_id = th.data.sto_sele_id;
+ var datas = {
+ mobile: phone, //手机号码
+ store_id: r.stoid,
+ user_id: getApp().globalData.user_id,
+ vipnopwd: isstcsp,
+ vippass: consumption, //消费密码
+ sex: sex, //性别
+ vipname: user_name, //昵称
+ idcard: identity_card, //身份证
+ address: address, //地址
+ pickup_id: sto_sele_id ,//自提门店 所属门店
+ islunar:th.data.iscalendar,
+ birthday:th.data.datet
+ }
+ //往上提交美导的ID
+ if(th.data.fir_guide_id!=th.data.user.staffId){
+ datas.staffId=th.data.user.staffId;
+ }
+
+ getApp().request.put("/api/weshop/users/updateUserInfo", {
+ data: datas,
+ success: function(res) {
+ if (res.data.code == 0) {
+ getApp().my_warnning("修改成功", 1, th);
+ getApp().goto("/pages/user/index/index");
+ } else {
+ getApp().my_warnning("系统繁忙,请稍后再试", 0, th);
+ }
+ }
+ })
+ },
+ //选择地址
+ goto_address: function() {
+ // this.setData({ is_zy: 1 });
+ },
+ //更换手机
+ go_phone: function(e) {
+ var url = e.currentTarget.dataset.url;
+ this.setData({
+ is_zy: 1
+ });
+ getApp().goto(url);
+ },
+
+ //--点击分享事件---
+ onShareAppMessage: function(t) {
+ return o.share;
+ },
+
+ //-- 跳转到获取导购的列表 --
+ go_get_guide:function () {
+ this.check_click_ok(function(){
+ getApp().goto("/pages/user/choice_guide/choice_guide");
+ },1)
+ },
+
+ //点击门店，导购的次数判断, type 1=导购 2=门店
+ check_click_ok:function(func,idx){
+ var th=this;
+ var userId=getApp().globalData.user_id;
+ getApp().request.get("/api/weshop/users/getGuideNum/"+r.stoid+"/"+userId+"/"+idx, {
+ success: function(res) {
+ if(res.data.code==0){
+ func();
+ }else{
+ getApp().my_warnning(res.data.msg, 0, th);
+ }
+ }
+ });
+ }
+
+
+});
\ No newline at end of file
diff --git a/packageA/pages/profile/profile.json b/packageA/pages/profile/profile.json
new file mode 100644
index 0000000..2a7d666
--- /dev/null
+++ b/packageA/pages/profile/profile.json
@@ -0,0 +1,7 @@
+{
+ "navigationBarTitleText": "个人信息",
+ "enablePullDownRefresh": false,
+ "usingComponents": {
+ "warn": "/components/long_warn/long_warn"
+ }
+}
\ No newline at end of file
diff --git a/packageA/pages/profile/profile.wxml b/packageA/pages/profile/profile.wxml
new file mode 100644
index 0000000..341ef43
--- /dev/null
+++ b/packageA/pages/profile/profile.wxml
@@ -0,0 +1,315 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{user.nickname}}
+
+
+
+
+
+
+
+
+
+
+
+ 推荐人:
+
+ 可获10积分
+
+
+
+ 姓名:
+
+ 可获10积分
+
+
+
+ 性别:
+
+
+
+
+
+
+
+
+ 男
+
+
+
+
+
+
+
+
+ 女
+
+
+ 可获10积分
+
+
+
+ 出生日期:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 农历
+
+
+
+
+
+
+ {{datet?datet:"请选择时间"}}
+
+
+
+ {{datet==""? user.birthday==""?"":filters.replace_time2(user.birthday):datet}}
+
+
+
+
+ 可获10积分
+
+
+
+
+ 身份证号码:
+
+ 可获10积分
+
+
+
+
+ 地址:
+
+ 可获10积分
+
+
+
+
+ 手机:
+
+ 可获10积分
+
+
+
+ 验证码:
+
+ 获取验证码
+
+
+
+
+
+ 所属门店:
+
+ {{stoname}}
+ ∟
+
+ 可获10积分
+
+
+
+
+
+ 我已阅读同意 《用户使用协议》与《隐私政策》
+
+
+
+
+
+
+
+ 保存
+ 保存成功即可获得一张20.00元优惠券
+
+
+
+
+
+
+
+
+
+
+ {{user.nickname}}
+
+
+
+ {{user.address}}
+
+
+
+
+
+ 扫一扫上面的二维码图案，即可消费
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/packageA/pages/profile/profile.wxss b/packageA/pages/profile/profile.wxss
new file mode 100644
index 0000000..1a0babf
--- /dev/null
+++ b/packageA/pages/profile/profile.wxss
@@ -0,0 +1,720 @@
+.container {
+ padding-bottom: 132rpx;
+ transform: translate();
+}
+
+.user-container {
+ 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;
+ color: rgb(153, 153, 153);
+}
+
+.Headportrait {
+ width: 145rpx;
+ height: 145rpx;
+ border-radius: 50%;
+ margin-left: 40rpx;
+}
+
+.vip {
+ margin-top: 30rpx;
+ color: rgb(255, 255, 255);
+}
+
+.AncrownMax {
+ background-color: rgb(57, 57, 57);
+ height: 36rpx;
+ border-radius: 20rpx;
+ margin-right: 20rpx;
+ line-height: 36rpx;
+ padding-right: 14rpx;
+ padding-left: 10rpx;
+}
+
+.Nickname {
+ max-width: 170rpx;
+}
+
+.Ancrown {
+ width: 30rpx;
+ height: 30rpx;
+ margin-right: 5rpx;
+}
+
+.plusMax {
+ background-color: rgb(212, 58, 30);
+ height: 36rpx;
+ border-radius: 20rpx;
+ line-height: 36rpx;
+ padding-left: 10rpx;
+ padding-right: 14rpx;
+}
+
+.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;
+ padding: 20rpx 0;
+ /* height: 130rpx; */
+ background-color: rgb(255, 255, 255);
+ z-index: 9;
+ border-top: 1rpx solid #ddd;
+}
+
+.confirmtext {
+ width: 495rpx;
+ line-height: 65rpx;
+ text-align: center;
+ color: rgb(255, 255, 255);
+ background-color: rgb(214, 1, 33);
+ border-radius: 35rpx;
+ margin: 0 auto;
+}
+
+.cmleft {
+ margin-left: 45rpx;
+}
+
+.hion {
+ width: 300rpx;
+ text-align: right;
+ 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;
+}
+
+.user-name {
+ 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;
+}
+
+.address {
+ max-width: 300rpx;
+}
+
+.Receiving_goods {
+ width: 330rpx;
+}
+
+.user-change {
+ width: 100%;
+ height: 100rpx;
+ margin-top: 20rpx;
+ background-color: white;
+}
+
+.one-line {
+ 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: 35rpx;
+ height: 35rpx;
+ margin-left: 10rpx;
+ position: relative;
+ top: 5rpx;
+}
+
+.code {
+ margin-bottom: 10rpx;
+}
+
+.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;
+}
+
+.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;
+}
+
+.padding {
+ padding: 0rpx 20rpx;
+}
+
+.interest {
+ padding: 0rpx 20rpx;
+ padding-top: 30rpx;
+ padding-bottom: 30rpx;
+}
+
+.lables {
+ display: inline-block;
+ padding-top: 25rpx;
+}
+
+.lable {
+ display: inline-block;
+ height: 44rpx;
+ line-height: 44rpx;
+ margin-right: 15rpx;
+ color: rgb(255, 255, 255);
+ border: 2rpx solid rgb(255, 138, 160);
+ background-color: rgb(255, 138, 160);
+ padding: 0rpx 25rpx;
+ border-radius: 30rpx;
+ margin-bottom: 21rpx;
+ max-width: 195rpx;
+}
+
+.add_lable {
+ height: 44rpx;
+ line-height: 44rpx;
+ color: rgb(189, 189, 189);
+ border: 2rpx solid rgb(189, 189, 189);
+ border-radius: 30rpx;
+ padding: 0rpx 25rpx;
+}
+
+.plus {
+ font-weight: bold;
+ margin-right: 8rpx;
+}
+
+.lable_wh {
+ height: 46rpx;
+ line-height: 46rpx;
+}
+
+.contact {
+ background-color: #FE6867;
+ color: white;
+ border-radius: 8rpx;
+ padding-left: 10rpx;
+ padding-right: 10rpx;
+ margin-right: 20rpx;
+}
+
+.btn {
+ background-color: #C4182E;
+ color: white;
+ border-radius: 6rpx;
+}
+
+.red {
+ color: #C4182E;
+}
+
+
+
+/*checkbox 选项框大小 */
+checkbox .wx-checkbox-input {
+ width: 34rpx;
+ height: 34rpx;
+ border-radius: 50%;
+
+}
+/*checkbox选中后样式 */
+checkbox .wx-checkbox-input.wx-checkbox-input-checked {
+ background-color: #C4182E;
+ border-color: #C4182E;
+ /* color: white; */
+}
+/*checkbox选中后图标样式 */
+checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
+ width: 34rpx;
+ height: 34rpx;
+ line-height: 34rpx;
+ text-align: center;
+ font-size: 24rpx;
+ color: #fff;
+ background: transparent;
+ transform: translate(-50%, -50%) scale(1);
+ -webkit-transform: translate(-50%, -50%) scale(1);
+}
+
+
+.star:before {
+ content: '*';
+ color: #C4182E;
+}