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/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index cb54ec2..894bb6d 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -2149,6 +2149,7 @@ Page({
                         var shipping_price =0;
                         var quan_no_goods_arr=null;
                         var is_by_quan=0;
+                        var pickid=th.data.bn_pick;
 
                         //如果是包邮券的时候，要看看券的情况,判断一下包邮有没有不包邮模板
                         if (quan_no && th.data.using_quan[pickid].isby == 1) {
@@ -3040,6 +3041,13 @@ Page({
                             df_goods.push(goods);
                             df_room_ids += g_item.room_id + ",";
                         } else {
+
+                            //-- 如果只有一件的时候，商品又是代发商品，订单的状态要改成代发订单 --
+                            if(g_item.whsle_id){
+                                goods.is_whsle_goods=1;
+                                item.is_whsle=1;
+                            }
+
                             item.order_goods.push(goods);
                             //如果房间号不为空的时候
                             if (g_item.room_id) {
@@ -3056,7 +3064,6 @@ Page({
                 //处理代发商品的拆分
                 if(df_goods.length>0 &&  item.order_goods.length>0 ){
                     var df_item=JSON.parse(JSON.stringify(item));
-
                     item.goods_price= parseFloat(item.goods_price-df_price).toFixed(2);
                     item.total_amount= parseFloat(item.total_amount-df_price).toFixed(2);
 
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>