diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml
index cf0f2e5..ba90b79 100644
--- a/packageA/pages/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/goodsInfo/goodsInfo.wxml
@@ -42,9 +42,7 @@
销量：{{data.sales_sum}}
有效天数：{{data.validDays?data.validDays:0}}
-
-
-
+
diff --git a/packageA/pages/profile/profile.js b/packageA/pages/profile/profile.js
index f918a9e..7a40acc 100644
--- a/packageA/pages/profile/profile.js
+++ b/packageA/pages/profile/profile.js
@@ -141,8 +141,6 @@ Page({
}
},
-
-
//---点击二级之后的选择---
choose_for_store: function(e) {
var index_c = e.currentTarget.dataset.ind;
@@ -387,12 +385,7 @@ Page({
}
}
}, 200)
- //检验门店的点击，看下次数是不是到了
- // this.check_click_ok(function(){
-
-
- // },2)
-
+
},
//选择更多门店
@@ -535,6 +528,14 @@ Page({
let url2 = '/api/weshop/prom/coupon/get/';
let url3 = '/api/weshop/users/getERPUser/';
url1 += r.stoid;
+ var user=app.globalData.userInfo;
+
+ //-- 赋予默认值 --
+ if(user['idcard']) this.data.id=user['idcard'];
+ if(user['vipname']) this.data.name=user['vipname'];
+ if(user['address']) this.data.address=user['address'];
+
+
app.request.get(url1, {
success: function(res) {
@@ -568,31 +569,78 @@ Page({
},
});
-
-
+
//获取默认信息
- url3 += r.stoid + "/" + app.globalData.user_id;
+ url3 += r.stoid + "/" +user.user_id;
app.request.get(url3, {
success: function(res) {
if(res.data.code == 0) {
console.log('url3', res.data.data.birthday);
let data = res.data.data;
- self.setData({
- isGender: data.sex,
- isLunar: data.islunar,
- datet: data.birthday,
- stoname: data.pickup_name,
- sto_sele_id: data.pickup_id,
- });
+
+ if(data.birthday){
+ data.birthday= ut.formar_no_full(data.birthday);
+ }
+
+ if(user['sex'] && !data.sex){
+ data.sex=user['sex'];
+ }
+ if(user['birthday'] && !data.birthday){
+ data.birthday= ut.formar_no_full(user['birthday']);
+ }
+
+ if(!data.pickup_name){
+ data.pickup_name="";
+ }
+ if(!data.pickup_id){
+ data.pickup_id=0;
+ }
+ //-- 获取门店 --
+ if(user['pickup_id'] && !data.pickup_id){
+ getApp().promiseGet("/api/weshop/pickup/get/"+r.stoid+"/"+user['pickup_id']).then(res=>{
+ if(res.data.code==0 && res.data.data){
+ data.pickup_name=res.data.data.pickup_name;
+ data.pickup_id=res.data.data.pickup_id;
+
+ self.setData({
+ isGender: data.sex,
+ isLunar: data.islunar,
+ datet: data.birthday,
+ stoname: data.pickup_name,
+ sto_sele_id: data.pickup_id,
+ });
+ }
+ else{
+ self.setData({
+ isGender: data.sex,
+ isLunar: data.islunar,
+ datet: data.birthday,
+ stoname: data.pickup_name,
+ sto_sele_id: data.pickup_id,
+ });
+ }
+ })
+ }else{
+ self.setData({
+ isGender: data.sex,
+ isLunar: data.islunar,
+ datet: data.birthday,
+ stoname: data.pickup_name,
+ sto_sele_id: data.pickup_id,
+ });
+ }
};
}
});
+ if(user){
+ self.setData({user:user})
+ }
+
},
-
onShow: function() {
var e = this;
@@ -607,44 +655,7 @@ Page({
}
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(' ');
@@ -665,15 +676,7 @@ Page({
}
})
}
- // var phone = "";
- // phone+=a.mobile.substr(0, 3)+"****";
- // phone += a.mobile.substr(7, 12);
-
-
-
- // e.setData({
- // isGender:e.data.user.sex
- // })
+
}, !0);
},
@@ -710,19 +713,6 @@ Page({
},
- //用户名字
- // 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;
@@ -988,65 +978,99 @@ Page({
//保存
save: function() {
- var th = this;
- // let isAgree = this.data.isAgree;
- // 同意协议
- // if(isAgree) {
+ var th = this;
var sto_sele_id = this.data.sto_sele_id;
- let tjrname = this.data.referee;
- if (tjrname == "" || tjrname == null) {
- app.my_warnning("请输入推荐人", 0, this);
- return false;
- };
- let vipname = this.data.name;
- if (vipname == "" || vipname == null) {
- app.my_warnning("请输入姓名", 0, this);
- return false;
- };
- let sex = this.data.isGender;
- if (sex != "1" && sex != "2") {
- app.my_warnning("请选择性别", 0, this);
- return false;
- };
- let birthday = this.data.datet;
- if (birthday == "" || birthday == null) {
- app.my_warnning("请选择出生日期", 0, this);
- return false;
- };
- let idcard = this.data.id;
- if (idcard == "" || idcard == null) {
- app.my_warnning("请输入身份证号码", 0, this);
- return false;
- };
- let address = this.data.address;
- if (address == "" || address == null) {
- app.my_warnning("请输入地址", 0, this);
- return false;
- };
- let pickup_id = sto_sele_id;
- if (pickup_id == "" || pickup_id == null) {
- app.my_warnning("请输入地址", 0, this);
- return false;
+ var user=app.globalData.userInfo;
+
+ var data = {
+ store_id: r.stoid,
+ user_id: app.globalData.user_id,
};
+
+ //-- 需要推荐人 --
+ if(this.data.reg_info.introducer_state){
+ let tjrname = this.data.referee;
+ if (tjrname == "" || tjrname == null) {
+ app.my_warnning("请输入推荐人", 0, this);
+ return false;
+ };
+ if(ut.check_mobile(tjrname).code==-1){
+ app.my_warnning("请输入推荐人正确的手机号", 0, this);
+ return false;
+ }
+
+ if(tjrname==user.mobile){
+ app.my_warnning("推荐人不能是自己", 0, this);
+ return false;
+ }
+ data.tjrname=tjrname;
+ }
+
+ //-- 需要姓名 --
+ if(this.data.reg_info.name_state){
+ let vipname = this.data.name;
+ if (vipname == "" || vipname == null) {
+ app.my_warnning("请输入姓名", 0, this);
+ return false;
+ };
+ data.vipname=vipname;
+ }
+ //需要性别
+ if(this.data.reg_info.sex_state){
+ let sex = this.data.isGender;
+ if (sex != "1" && sex != "2") {
+ app.my_warnning("请选择性别", 0, this);
+ return false;
+ };
+ data.sex=sex;
+ }
+
+ //需要生日
+ if(this.data.reg_info.birthday_state){
+ let birthday = this.data.datet;
+ if (birthday == "" || birthday == null) {
+ app.my_warnning("请选择出生日期", 0, this);
+ return false;
+ };
+
+ data.birthday=birthday;
+ data.islunar=self.data.isLunar;
+ }
+
+ //-- 需要身份证 --
+ if(this.data.reg_info.idcard_state){
+ let idcard = this.data.id;
+ if (idcard == "" || idcard == null) {
+ app.my_warnning("请输入身份证号码", 0, this);
+ return false;
+ };
+ data.idcard=idcard;
+ }
+ //需要地址
+ if(this.data.reg_info.address_state){
+ let address = this.data.address;
+ if (address == "" || address == null) {
+ app.my_warnning("请输入地址", 0, this);
+ return false;
+ };
+ data.address=address;
+ }
+ //需要门店
+ if(this.data.reg_info.pick_state){
+ let pickup_id = sto_sele_id;
+ if (pickup_id == "" || pickup_id == null) {
+ app.my_warnning("请输入门店", 0, this);
+ return false;
+ };
+ data.pickup_id=sto_sele_id;
+ }
+
let isAgree = this.data.isAgree;
if(!isAgree) {
app.my_warnning("请您先阅读和勾选指定的内容", 0, this);
return false;
};
-
- var data = {
- store_id: r.stoid,
- user_id: app.globalData.user_id,
- tjrname: tjrname, //推荐人
- vipname: vipname, //名称
- sex: sex, //性别
- birthday: self.data.datet,
- islunar: self.data.isLunar,
- idcard: self.data.id,
- address: address,
- pickup_id: sto_sele_id ,//自提门店 所属门店
- };
-
+
console.log('data==>', data);
diff --git a/packageA/pages/profile/profile.wxml b/packageA/pages/profile/profile.wxml
index 83e9160..f42c7b3 100644
--- a/packageA/pages/profile/profile.wxml
+++ b/packageA/pages/profile/profile.wxml
@@ -24,21 +24,29 @@
-
+
+
+
推荐人:
-
- +{{reg_info.introducer}}积分
- +{{reg_info.introducer}}成长值
+
+
+
+ +{{reg_info.introducer}}积分
+ +{{reg_info.introducer}}成长值
+
-
-
- 姓名:
-
- +{{reg_info.name}}积分
- +{{reg_info.name}}成长值
+
+
+
+ 姓名:
+
+
+ +{{reg_info.name}}积分
+ +{{reg_info.name}}成长值
+
-
+
性别:
@@ -60,11 +68,14 @@
女
- +{{reg_info.sex}}积分
- +{{reg_info.sex}}成长值
+
+
+ +{{reg_info.sex}}积分
+ +{{reg_info.sex}}成长值
+
-
+
出生日期:
@@ -74,45 +85,52 @@
- {{datet? filters.format_time(datet):"请选择时间"}}∟
+ {{datet?datet:"请选择时间"}}∟
- +{{reg_info.birthday}}积分
- +{{reg_info.birthday}}成长值
+
+
+ +{{reg_info.birthday}}积分
+ +{{reg_info.birthday}}成长值
+
- 身份证:
-
+ 身份证:
+
+
+{{reg_info.idcard}}积分
+{{reg_info.idcard}}成长值
+
地址:
-
- +{{reg_info.address}}积分
- +{{reg_info.address}}成长值
+
+
+ +{{reg_info.address}}积分
+ +{{reg_info.address}}成长值
+
-
-
-
-
+
所属门店:
- {{stoname}}
+ {{stoname?stoname:'请选择门店'}}
∟
+
+
+{{reg_info.pick}}积分
+{{reg_info.pick}}成长值
+
diff --git a/pages/togoin/togoin.js b/pages/togoin/togoin.js
index 5a0a930..89be71a 100644
--- a/pages/togoin/togoin.js
+++ b/pages/togoin/togoin.js
@@ -31,22 +31,20 @@ Page({
var logo=th.data.imghots+e.store_logo;
th.setData({ store: e,store_logo:logo});
})
-
+
+ //判断注册的条件
app.getConfig2(function (e) {
- if(e.reg_type==1){
- var need_go=0;
+ if(e.reg_type==1){
var arr=JSON.parse(e.reg_info);
- if(arr['name_state']==1) need_go=1;
- if(!need_go && arr['birthday_state']==1) need_go=1;
- if(!need_go && arr['idcard_state']==1) need_go=1;
- if(!need_go && arr['address_state']==1) need_go=1;
- if(!need_go && arr['pick_state']==1) need_go=1;
- if(!need_go && arr['sex_state']==1) need_go=1;
- if(!need_go && arr['introducer_state']==1) need_go=1;
- th.setData({need_go:1});
- }
-
- })
+ if(arr['name_state']==1) th.data.name_need_go=1;
+ if(arr['birthday_state']==1) th.data.birth_need_go=1;
+ if(arr['idcard_state']==1) th.data.idcard_need_go=1;
+ if(arr['address_state']==1) th.data.address_need_go=1;
+ if(arr['pick_state']==1) th.data.pick_need_go=1;
+ if(arr['sex_state']==1) th.data.sex_need_go=1;
+ if(arr['introducer_state']==1) th.data.introducer_need_go=1;
+ }
+ },1)
},
//绑定手机号
getphone:function (e) {
@@ -60,8 +58,7 @@ Page({
var th=this;
var sessionKey = getApp().globalData.sessionKey;
var openid = getApp().globalData.openid;
- var r=getApp().globalData.getu;
-
+ var r=getApp().globalData.getu;
th.save_the_data(r,e,sessionKey,openid)
},
@@ -186,14 +183,24 @@ Page({
} else {
return app.showWarning("授权登入失败！"+e.data.msg);
}
-
- wx.setStorageSync("userinfo",e.data.data);
+
+
+ var need_go=0;
+ var t_user=e.data.data;
+
+ wx.setStorageSync("userinfo",e.data.data);
wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = t.getFullUrl(a.globalData.userInfo.head_pic);
- //如果有需要跳转，就跳转到.如果微信端有注册，就不需要跳转
- if(app.globalData.userInfo['openid']){
- th.data.need_go=0;
- }
- if(th.data.need_go){
+
+ //如果有需要完善的信息没有完善，就需要跳转
+ if(!t_user['vipname'] && th.data.name_need_go){ need_go=1;}
+ if(!t_user['birthday'] && th.data.birth_need_go){ need_go=1;}
+ if(!t_user['idcard'] && th.data.idcard_need_go){ need_go=1;}
+ if(!t_user['address'] && th.data.address_need_go){ need_go=1;}
+ if(!t_user['pickup_id'] && th.data.pick_need_go){ need_go=1;}
+ if(!t_user['sex'] && th.data.sex_need_go){ need_go=1;}
+ if(!t_user['fromuser_id'] && th.data.introducer_need_go){ need_go=1;}
+
+ if(need_go){
getApp().goto("/packageA/pages/profile/profile");
}else{
wx.navigateBack({ delta: 1})
@@ -227,7 +234,7 @@ Page({
wx.login({
success: function (o) {
var dd = {
- js_code:o.code,
+ js_code:o.code,
store_id: os.stoid,
nickname: app.clear_word(app.globalData.getu.nickName),
head_pic: app.clear_word(app.globalData.getu.avatarUrl)