分享的的前端显示调整

yvan.ni
1 parent 776e03ed
Showing 2 changed files with 20 additions and 52 deletions
packageA/pages/profile/profile.js
packageA/pages/profile/profile.wxml
@@ -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
+                    });
+
 				};
 			}
 		});
@@ -28,9 +28,9 @@
 		   <!-- 如果需要接骚人信息 -->
 			<view class="user-name flex-vertical" data-type="nickname" wx:if="{{reg_info.introducer_state}}">
 				<view class="user-name-txt">推荐人:</view>
-				<input bindinput="getReferee" bindblur="" value="{{user['fromuser_id']?user['fromuser_id']:''}}"  data-name="推荐人" class="user-txt-right f1 pdl20 t-r" placeholder="请输入推荐人手机号码或卡号"/>
+				<input bindinput="getReferee" bindblur="" value="{{vip_user['fromuser_id']?vip_user['fromuser_id']:''}}"  data-name="推荐人" class="user-txt-right f1 pdl20 t-r" placeholder="请输入推荐人手机号码或卡号"/>
-				<block wx:if="{{!user['fromuser_id']}}">
+				<block wx:if="{{!vip_user['fromuser_id']}}">
 			      <view class="c-red pdl20 fs24" wx:if="{{reg_info.introducer && (reg_info.introducer_type == 0)}}">+{{reg_info.introducer}}积分</view>
 				  <view class="c-red pdl20 fs24" wx:elif="{{reg_info.introducer && (reg_info.introducer_type == 1)}}">+{{reg_info.introducer}}成长值</view>
 				</block>  
@@ -39,8 +39,8 @@
 		    <!-- 如果需要接姓名信息 -->	
            <view  class="user-name flex-vertical" data-type="nickname" wx:if="{{reg_info.name_state}}">
                  <view class="user-name-txt">姓名:</view>
-                 <input bindinput="getName" bindblur=""  value="{{user['vipname']?user['vipname']:''}}"  data-name="姓名" class="user-txt-right f1 pdl20 t-r" placeholder="请输入您的真实姓名"/>
-				 <block wx:if="{{!user['vipname']}}">
+                 <input bindinput="getName" bindblur=""  value="{{vip_user['vipname']?vip_user['vipname']:''}}"  data-name="姓名" class="user-txt-right f1 pdl20 t-r" placeholder="请输入您的真实姓名"/>
+				 <block wx:if="{{!vip_user['vipname']}}">
 				   <view class="c-red pdl20 fs24" wx:if="{{reg_info.name && (reg_info.name_val_type == 0)}}">+{{reg_info.name}}积分</view>
 				    <view class="c-red pdl20 fs24" wx:elif="{{reg_info.name && (reg_info.name_val_type == 1)}}">+{{reg_info.name}}成长值</view>
 				 </block>
@@ -69,7 +69,7 @@
 			    </view>
 			  </view>
-			    <block wx:if="{{!user['sex']}}">	  
+			    <block wx:if="{{!vip_user['sex']}}">
 				  <view class="c-red pdl20 fs24" wx:if="{{reg_info.sex && (reg_info.sex_state_type == 0)}}">+{{reg_info.sex}}积分</view>
 				  <view class="c-red pdl20 fs24" wx:elif="{{reg_info.sex && (reg_info.sex_state_type == 1)}}">+{{reg_info.sex}}成长值</view>
 				</block>
@@ -92,7 +92,7 @@
 			    </view>
 			  </view>
-			   <block wx:if="{{!user['birthday']}}">
+			   <block wx:if="{{!vip_user['birthday']}}">
 				  <view class="c-red pdl20 fs24 shrink0" wx:if="{{reg_info.birthday && (reg_info.birthday_type == 0)}}">+{{reg_info.birthday}}积分</view>
 				  <view class="c-red pdl20 fs24 shrink0" wx:elif="{{reg_info.birthday && (reg_info.birthday_type == 1)}}">+{{reg_info.birthday}}成长值</view>
 				</block>
@@ -101,8 +101,8 @@
       <view class="user-name flex-vertical" data-type="nickname" wx:if="{{reg_info.idcard_state}}">
          <view class="user-name-txt shrink0">身份证:</view>
-         <input bindinput="getId" bindblur="IdentityIDCard" value="{{user.idcard}}"  class="user-txt-right pdl20 f1 t-r" placeholder="请输入身份证号码"></input>
-		 <block wx:if="{{!user.idcard}}">
+         <input bindinput="getId" bindblur="IdentityIDCard" value="{{vip_user.idcard}}"  class="user-txt-right pdl20 f1 t-r" placeholder="请输入身份证号码"></input>
+		 <block wx:if="{{!vip_user.idcard}}">
 				<view class="c-red pdl20 fs24" wx:if="{{reg_info.idcard && (reg_info.idcard_type == 0)}}">+{{reg_info.idcard}}积分</view>
 				<view class="c-red pdl20 fs24" wx:elif="{{reg_info.idcard && (reg_info.idcard_type == 1)}}">+{{reg_info.idcard}}成长值</view>
 		</block>		
@@ -111,8 +111,8 @@
       <view class="user-name flex-vertical" data-type="mobile" wx:if="{{reg_info.address_state}}">
         <view class="user-name-txt">地址:</view>
-            <input bindinput="getAddress" bindblur="" value="{{user.address?user.address:''}}"  data-name="姓名" class="user-txt-right f1" placeholder="请输入详细地址" style="text-align:right" />
-			<block wx:if="{{!user.address}}">
+            <input bindinput="getAddress" bindblur="" value="{{vip_user.address?vip_user.address:''}}"  data-name="姓名" class="user-txt-right f1" placeholder="请输入详细地址" style="text-align:right" />
+			<block wx:if="{{!vip_user.address}}">
 			  <view class="c-red pdl20 fs24" wx:if="{{reg_info.address && (reg_info.address_type == 0)}}">+{{reg_info.address}}积分</view>
 			  <view class="c-red pdl20 fs24" wx:elif="{{reg_info.address && (reg_info.address_type == 1)}}">+{{reg_info.address}}成长值</view>
 			</block>
@@ -127,7 +127,7 @@
           <view class="angle">∟</view>
         </view>
-		<block wx:if="{{!user.pickup_id}}">
+		<block wx:if="{{!vip_user.pickup_id}}">
 				<view class="c-red pdl20 fs24" wx:if="{{reg_info.pick && (reg_info.pick_type == 0)}}">+{{reg_info.pick}}积分</view>
 				<view class="c-red pdl20 fs24" wx:elif="{{reg_info.pick && (reg_info.pick_type == 1)}}">+{{reg_info.pick}}成长值</view>
 		</block>