diff --git a/packageA/pages/profile/profile.js b/packageA/pages/profile/profile.js index f9a751b..dbf9d12 100644 --- a/packageA/pages/profile/profile.js +++ b/packageA/pages/profile/profile.js @@ -571,14 +571,6 @@ Page({ 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=""; } @@ -586,39 +578,15 @@ Page({ 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, - }); - } + self.setData({ + isGender: data.sex, + isLunar: data.islunar, + datet: data.birthday, + stoname: data.pickup_name, + sto_sele_id: data.pickup_id, + vip_user:data + }); + }; } }); diff --git a/packageA/pages/profile/profile.wxml b/packageA/pages/profile/profile.wxml index 359f88d..4c589c9 100644 --- a/packageA/pages/profile/profile.wxml +++ b/packageA/pages/profile/profile.wxml @@ -28,9 +28,9 @@ 推荐人: - + - + +{{reg_info.introducer}}积分 +{{reg_info.introducer}}成长值 @@ -39,8 +39,8 @@ 姓名: - - + + +{{reg_info.name}}积分 +{{reg_info.name}}成长值 @@ -69,7 +69,7 @@ - + +{{reg_info.sex}}积分 +{{reg_info.sex}}成长值 @@ -92,7 +92,7 @@ - + +{{reg_info.birthday}}积分 +{{reg_info.birthday}}成长值 @@ -101,8 +101,8 @@ 身份证: - - + + +{{reg_info.idcard}}积分 +{{reg_info.idcard}}成长值 @@ -111,8 +111,8 @@ 地址: - - + + +{{reg_info.address}}积分 +{{reg_info.address}}成长值 @@ -127,7 +127,7 @@ - + +{{reg_info.pick}}积分 +{{reg_info.pick}}成长值