From 168ad730e8d9b573046be340233e1f88b69a0376 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 31 May 2022 16:43:40 +0800
Subject: [PATCH] 显示送积分的bug游湖

---
 packageA/pages/profile/profile.wxml | 28 ++++++++++++++--------------
 pages/user/userinfo/userinfo.wxml   | 24 ++++++++++++------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/packageA/pages/profile/profile.wxml b/packageA/pages/profile/profile.wxml
index 60fdbf9..cc2045e 100644
--- a/packageA/pages/profile/profile.wxml
+++ b/packageA/pages/profile/profile.wxml
@@ -33,8 +33,8 @@
 				<input bindinput="getReferee" bindblur="" disabled="{{user['fromuser_id']}}" value="{{user['fromuser_id']?user['fromuser_id']:''}}"  data-name="推荐人" class="user-txt-right f1 pdl20 t-r" placeholder="请输入推荐人手机号码或卡号"/>
 				
 				<block wx:if="{{!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>
+			      <view class="c-red pdl20 fs24" wx:if="{{reg_info.introducer && reg_info.introducer_state && (reg_info.introducer_type == 0)}}">+{{reg_info.introducer}}积分</view>
+				  <view class="c-red pdl20 fs24" wx:elif="{{reg_info.introducer  && reg_info.introducer_state && (reg_info.introducer_type == 1)}}">+{{reg_info.introducer}}成长值</view>
 				</block>  
 			</view>
 		
@@ -43,8 +43,8 @@
                  <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']}}">
-				    <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>
+				    <view class="c-red pdl20 fs24" wx:if="{{reg_info.name && reg_info.name_state && (reg_info.name_val_type == 0)}}">+{{reg_info.name}}积分</view>
+				    <view class="c-red pdl20 fs24" wx:elif="{{reg_info.name  && reg_info.name_state && (reg_info.name_val_type == 1)}}">+{{reg_info.name}}成长值</view>
 				 </block>
 			</view>
 			
@@ -72,8 +72,8 @@
 			  </view>
 
 			    <block wx:if="{{!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>
+				  <view class="c-red pdl20 fs24" wx:if="{{reg_info.sex && reg_info.sex_state  && (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 && (reg_info.sex_state_type == 1)}}">+{{reg_info.sex}}成长值</view>
 				</block>
 			</view>
 			
@@ -95,8 +95,8 @@
 			  </view>
 			  
 			   <block wx:if="{{!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>
+				  <view class="c-red pdl20 fs24 shrink0" wx:if="{{reg_info.birthday && reg_info.birthday_state && (reg_info.birthday_type == 0)}}">+{{reg_info.birthday}}积分</view>
+				  <view class="c-red pdl20 fs24 shrink0" wx:elif="{{reg_info.birthday && reg_info.birthday_state && (reg_info.birthday_type == 1)}}">+{{reg_info.birthday}}成长值</view>
 				</block>
 			</view>
 			
@@ -105,8 +105,8 @@
          <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}}">
-				<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>
+				<view class="c-red pdl20 fs24" wx:if="{{reg_info.idcard && reg_info.idcard_state && (reg_info.idcard_type == 0)}}">+{{reg_info.idcard}}积分</view>
+				<view class="c-red pdl20 fs24" wx:elif="{{reg_info.idcard  && reg_info.idcard_state && (reg_info.idcard_type == 1)}}">+{{reg_info.idcard}}成长值</view>
 		</block>		
       </view>
       
@@ -115,8 +115,8 @@
         <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}}">
-			  <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>
+			  <view class="c-red pdl20 fs24" wx:if="{{reg_info.address && reg_info.address_state && (reg_info.address_type == 0)}}">+{{reg_info.address}}积分</view>
+			  <view class="c-red pdl20 fs24" wx:elif="{{reg_info.address && reg_info.address_state && (reg_info.address_type == 1)}}">+{{reg_info.address}}成长值</view>
 			</block>
       </view>
 			
@@ -130,8 +130,8 @@
         </view>
 		
 		<block wx:if="{{!user.pickup_id && !is_fx }}">
-				<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>
+				<view class="c-red pdl20 fs24" wx:if="{{reg_info.pick && reg_info.pick_state && (reg_info.pick_type == 0)}}">+{{reg_info.pick}}积分</view>
+				<view class="c-red pdl20 fs24" wx:elif="{{reg_info.pick  && reg_info.pick_state && (reg_info.pick_type == 1)}}">+{{reg_info.pick}}成长值</view>
 		</block>		
       </view>
 			
diff --git a/pages/user/userinfo/userinfo.wxml b/pages/user/userinfo/userinfo.wxml
index 0d4998b..cf1af24 100644
--- a/pages/user/userinfo/userinfo.wxml
+++ b/pages/user/userinfo/userinfo.wxml
@@ -115,8 +115,8 @@
           </view>
 
           <block wx:if="{{!user.sex}}">
-            <text class="lb_txt"  wx:if="{{reg_info.sex && (reg_info.sex_state_type == 0)}}">+{{reg_info.sex}}积分</text>
-            <text class="lb_txt"  wx:if="{{reg_info.sex && (reg_info.sex_state_type == 1)}}">+{{reg_info.sex}}成长值</text>
+            <text class="lb_txt"  wx:if="{{reg_info.sex && reg_info.sex_state && (reg_info.sex_state_type == 0)}}">+{{reg_info.sex}}积分</text>
+            <text class="lb_txt"  wx:if="{{reg_info.sex && reg_info.sex_state && (reg_info.sex_state_type == 1)}}">+{{reg_info.sex}}成长值</text>
           </block>
 
         </view>
@@ -158,8 +158,8 @@
             </block>
 
             <block wx:if="{{!user.birthday}}">
-              <text class="lb_txt"  wx:if="{{reg_info.birthday && (reg_info.birthday_type == 0)}}">+{{reg_info.birthday}}积分</text>
-              <text class="lb_txt"  wx:if="{{reg_info.birthday && (reg_info.birthday_type == 1)}}">+{{reg_info.birthday}}成长值</text>
+              <text class="lb_txt"  wx:if="{{reg_info.birthday && reg_info.birthday_state && (reg_info.birthday_type == 0)}}">+{{reg_info.birthday}}积分</text>
+              <text class="lb_txt"  wx:if="{{reg_info.birthday && reg_info.birthday_state && (reg_info.birthday_type == 1)}}">+{{reg_info.birthday}}成长值</text>
             </block>
 
           </view>
@@ -172,8 +172,8 @@
         <view class="flex ai_c">
             <input bindblur="user_name" class="user-txt-right t-r" placeholder="*姓名" value='{{user.vipname}}' />
             <block wx:if="{{!user.vipname}}">
-            <text class="lb_txt"  wx:if="{{reg_info.name && (reg_info.name_val_type == 0)}}">+{{reg_info.name}}积分</text>
-            <text class="lb_txt"  wx:if="{{reg_info.name && (reg_info.name_val_type == 1)}}">+{{reg_info.name}}成长值</text>
+            <text class="lb_txt"  wx:if="{{reg_info.name && reg_info.name_state && (reg_info.name_val_type == 0)}}">+{{reg_info.name}}积分</text>
+            <text class="lb_txt"  wx:if="{{reg_info.name && reg_info.name_state && (reg_info.name_val_type == 1)}}">+{{reg_info.name}}成长值</text>
           </block>
         </view>
       </view>
@@ -183,8 +183,8 @@
         <view class="flex ai_c">
           <input bindblur="identity_card" class="user-txt-right t-r" value="{{user.idcard}}" placeholder="*身份证" />
           <block wx:if="{{!user.idcard}}">
-            <text class="lb_txt"  wx:if="{{reg_info.idcard && (reg_info.idcard_type == 0)}}">+{{reg_info.idcard}}积分</text>
-            <text class="lb_txt"  wx:if="{{reg_info.idcard && (reg_info.idcard_type == 1)}}">+{{reg_info.idcard}}成长值</text>
+            <text class="lb_txt"  wx:if="{{reg_info.idcard && reg_info.idcard_state  && (reg_info.idcard_type == 0)}}">+{{reg_info.idcard}}积分</text>
+            <text class="lb_txt"  wx:if="{{reg_info.idcard && reg_info.idcard_state  && (reg_info.idcard_type == 1)}}">+{{reg_info.idcard}}成长值</text>
           </block>
         </view>
 
@@ -206,8 +206,8 @@
         <view class="flex ai_c">
             <input bindblur="address" maxlength="30" value="{{user.address}}" class="user-txt-right" placeholder="*地址" style="text-align:right" />
             <block wx:if="{{!user.address}}">
-             <text class="lb_txt"  wx:if="{{reg_info.address && (reg_info.address_type == 0)}}">+{{reg_info.address}}积分</text>
-             <text class="lb_txt"  wx:if="{{reg_info.address && (reg_info.address_type == 1)}}">+{{reg_info.address}}成长值</text>
+             <text class="lb_txt"  wx:if="{{reg_info.address && reg_info.address_state && (reg_info.address_type == 0)}}">+{{reg_info.address}}积分</text>
+             <text class="lb_txt"  wx:if="{{reg_info.address && reg_info.address_state && (reg_info.address_type == 1)}}">+{{reg_info.address}}成长值</text>
             </block>
         </view>
 
@@ -221,8 +221,8 @@
           <view class="flex ai_c">
             <view class="angle">∟</view>
             <block wx:if="{{!user.pickup_id}}">
-              <text class="lb_txt"  wx:if="{{reg_info.pick && (reg_info.pick_type == 0)}}">+{{reg_info.pick}}积分</text>
-              <text class="lb_txt"  wx:if="{{reg_info.pick && (reg_info.pick_type == 1)}}">+{{reg_info.pick}}成长值</text>
+              <text class="lb_txt"  wx:if="{{reg_info.pick && reg_info.pick_state && (reg_info.pick_type == 0)}}">+{{reg_info.pick}}积分</text>
+              <text class="lb_txt"  wx:if="{{reg_info.pick && reg_info.pick_state && (reg_info.pick_type == 1)}}">+{{reg_info.pick}}成长值</text>
             </block>
           </view>
 
--
libgit2 0.21.4