1 participants
-
mentioned in commit cb225886565269b3dcf1671a03d7eb3ec841a13b
-
Status changed to merged
Showing
3 changed files
packageA/pages/profile/profile.wxml
| @@ -33,8 +33,8 @@ | @@ -33,8 +33,8 @@ | ||
| 33 | <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="请输入推荐人手机号码或卡号"/> | 33 | <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="请输入推荐人手机号码或卡号"/> |
| 34 | 34 | ||
| 35 | <block wx:if="{{!user['fromuser_id']}}"> | 35 | <block wx:if="{{!user['fromuser_id']}}"> |
| 36 | - <view class="c-red pdl20 fs24" wx:if="{{reg_info.introducer && (reg_info.introducer_type == 0)}}">+{{reg_info.introducer}}积分</view> | ||
| 37 | - <view class="c-red pdl20 fs24" wx:elif="{{reg_info.introducer && (reg_info.introducer_type == 1)}}">+{{reg_info.introducer}}成长值</view> | 36 | + <view class="c-red pdl20 fs24" wx:if="{{reg_info.introducer && reg_info.introducer_state && (reg_info.introducer_type == 0)}}">+{{reg_info.introducer}}积分</view> |
| 37 | + <view class="c-red pdl20 fs24" wx:elif="{{reg_info.introducer && reg_info.introducer_state && (reg_info.introducer_type == 1)}}">+{{reg_info.introducer}}成长值</view> | ||
| 38 | </block> | 38 | </block> |
| 39 | </view> | 39 | </view> |
| 40 | 40 | ||
| @@ -43,8 +43,8 @@ | @@ -43,8 +43,8 @@ | ||
| 43 | <view class="user-name-txt">姓名:</view> | 43 | <view class="user-name-txt">姓名:</view> |
| 44 | <input bindinput="getName" bindblur="" value="{{user['vipname']?user['vipname']:''}}" data-name="姓名" class="user-txt-right f1 pdl20 t-r" placeholder="请输入您的真实姓名"/> | 44 | <input bindinput="getName" bindblur="" value="{{user['vipname']?user['vipname']:''}}" data-name="姓名" class="user-txt-right f1 pdl20 t-r" placeholder="请输入您的真实姓名"/> |
| 45 | <block wx:if="{{!user['vipname']}}"> | 45 | <block wx:if="{{!user['vipname']}}"> |
| 46 | - <view class="c-red pdl20 fs24" wx:if="{{reg_info.name && (reg_info.name_val_type == 0)}}">+{{reg_info.name}}积分</view> | ||
| 47 | - <view class="c-red pdl20 fs24" wx:elif="{{reg_info.name && (reg_info.name_val_type == 1)}}">+{{reg_info.name}}成长值</view> | 46 | + <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> |
| 47 | + <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> | ||
| 48 | </block> | 48 | </block> |
| 49 | </view> | 49 | </view> |
| 50 | 50 | ||
| @@ -72,8 +72,8 @@ | @@ -72,8 +72,8 @@ | ||
| 72 | </view> | 72 | </view> |
| 73 | 73 | ||
| 74 | <block wx:if="{{!user['sex']}}"> | 74 | <block wx:if="{{!user['sex']}}"> |
| 75 | - <view class="c-red pdl20 fs24" wx:if="{{reg_info.sex && (reg_info.sex_state_type == 0)}}">+{{reg_info.sex}}积分</view> | ||
| 76 | - <view class="c-red pdl20 fs24" wx:elif="{{reg_info.sex && (reg_info.sex_state_type == 1)}}">+{{reg_info.sex}}成长值</view> | 75 | + <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> |
| 76 | + <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> | ||
| 77 | </block> | 77 | </block> |
| 78 | </view> | 78 | </view> |
| 79 | 79 | ||
| @@ -95,8 +95,8 @@ | @@ -95,8 +95,8 @@ | ||
| 95 | </view> | 95 | </view> |
| 96 | 96 | ||
| 97 | <block wx:if="{{!user['birthday']}}"> | 97 | <block wx:if="{{!user['birthday']}}"> |
| 98 | - <view class="c-red pdl20 fs24 shrink0" wx:if="{{reg_info.birthday && (reg_info.birthday_type == 0)}}">+{{reg_info.birthday}}积分</view> | ||
| 99 | - <view class="c-red pdl20 fs24 shrink0" wx:elif="{{reg_info.birthday && (reg_info.birthday_type == 1)}}">+{{reg_info.birthday}}成长值</view> | 98 | + <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> |
| 99 | + <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> | ||
| 100 | </block> | 100 | </block> |
| 101 | </view> | 101 | </view> |
| 102 | 102 | ||
| @@ -105,8 +105,8 @@ | @@ -105,8 +105,8 @@ | ||
| 105 | <view class="user-name-txt shrink0">身份证:</view> | 105 | <view class="user-name-txt shrink0">身份证:</view> |
| 106 | <input bindinput="getId" bindblur="IdentityIDCard" value="{{user.idcard}}" class="user-txt-right pdl20 f1 t-r" placeholder="请输入身份证号码"></input> | 106 | <input bindinput="getId" bindblur="IdentityIDCard" value="{{user.idcard}}" class="user-txt-right pdl20 f1 t-r" placeholder="请输入身份证号码"></input> |
| 107 | <block wx:if="{{!user.idcard}}"> | 107 | <block wx:if="{{!user.idcard}}"> |
| 108 | - <view class="c-red pdl20 fs24" wx:if="{{reg_info.idcard && (reg_info.idcard_type == 0)}}">+{{reg_info.idcard}}积分</view> | ||
| 109 | - <view class="c-red pdl20 fs24" wx:elif="{{reg_info.idcard && (reg_info.idcard_type == 1)}}">+{{reg_info.idcard}}成长值</view> | 108 | + <view class="c-red pdl20 fs24" wx:if="{{reg_info.idcard && reg_info.idcard_state && (reg_info.idcard_type == 0)}}">+{{reg_info.idcard}}积分</view> |
| 109 | + <view class="c-red pdl20 fs24" wx:elif="{{reg_info.idcard && reg_info.idcard_state && (reg_info.idcard_type == 1)}}">+{{reg_info.idcard}}成长值</view> | ||
| 110 | </block> | 110 | </block> |
| 111 | </view> | 111 | </view> |
| 112 | 112 | ||
| @@ -115,8 +115,8 @@ | @@ -115,8 +115,8 @@ | ||
| 115 | <view class="user-name-txt">地址:</view> | 115 | <view class="user-name-txt">地址:</view> |
| 116 | <input bindinput="getAddress" bindblur="" value="{{user.address?user.address:''}}" data-name="姓名" class="user-txt-right f1" placeholder="请输入详细地址" style="text-align:right" /> | 116 | <input bindinput="getAddress" bindblur="" value="{{user.address?user.address:''}}" data-name="姓名" class="user-txt-right f1" placeholder="请输入详细地址" style="text-align:right" /> |
| 117 | <block wx:if="{{!user.address}}"> | 117 | <block wx:if="{{!user.address}}"> |
| 118 | - <view class="c-red pdl20 fs24" wx:if="{{reg_info.address && (reg_info.address_type == 0)}}">+{{reg_info.address}}积分</view> | ||
| 119 | - <view class="c-red pdl20 fs24" wx:elif="{{reg_info.address && (reg_info.address_type == 1)}}">+{{reg_info.address}}成长值</view> | 118 | + <view class="c-red pdl20 fs24" wx:if="{{reg_info.address && reg_info.address_state && (reg_info.address_type == 0)}}">+{{reg_info.address}}积分</view> |
| 119 | + <view class="c-red pdl20 fs24" wx:elif="{{reg_info.address && reg_info.address_state && (reg_info.address_type == 1)}}">+{{reg_info.address}}成长值</view> | ||
| 120 | </block> | 120 | </block> |
| 121 | </view> | 121 | </view> |
| 122 | 122 | ||
| @@ -130,8 +130,8 @@ | @@ -130,8 +130,8 @@ | ||
| 130 | </view> | 130 | </view> |
| 131 | 131 | ||
| 132 | <block wx:if="{{!user.pickup_id && !is_fx }}"> | 132 | <block wx:if="{{!user.pickup_id && !is_fx }}"> |
| 133 | - <view class="c-red pdl20 fs24" wx:if="{{reg_info.pick && (reg_info.pick_type == 0)}}">+{{reg_info.pick}}积分</view> | ||
| 134 | - <view class="c-red pdl20 fs24" wx:elif="{{reg_info.pick && (reg_info.pick_type == 1)}}">+{{reg_info.pick}}成长值</view> | 133 | + <view class="c-red pdl20 fs24" wx:if="{{reg_info.pick && reg_info.pick_state && (reg_info.pick_type == 0)}}">+{{reg_info.pick}}积分</view> |
| 134 | + <view class="c-red pdl20 fs24" wx:elif="{{reg_info.pick && reg_info.pick_state && (reg_info.pick_type == 1)}}">+{{reg_info.pick}}成长值</view> | ||
| 135 | </block> | 135 | </block> |
| 136 | </view> | 136 | </view> |
| 137 | 137 |
pages/cart/cart2/cart2.js
| @@ -2149,6 +2149,7 @@ Page({ | @@ -2149,6 +2149,7 @@ Page({ | ||
| 2149 | var shipping_price =0; | 2149 | var shipping_price =0; |
| 2150 | var quan_no_goods_arr=null; | 2150 | var quan_no_goods_arr=null; |
| 2151 | var is_by_quan=0; | 2151 | var is_by_quan=0; |
| 2152 | + var pickid=th.data.bn_pick; | ||
| 2152 | 2153 | ||
| 2153 | //如果是包邮券的时候，要看看券的情况,判断一下包邮有没有不包邮模板 | 2154 | //如果是包邮券的时候，要看看券的情况,判断一下包邮有没有不包邮模板 |
| 2154 | if (quan_no && th.data.using_quan[pickid].isby == 1) { | 2155 | if (quan_no && th.data.using_quan[pickid].isby == 1) { |
| @@ -3040,6 +3041,13 @@ Page({ | @@ -3040,6 +3041,13 @@ Page({ | ||
| 3040 | df_goods.push(goods); | 3041 | df_goods.push(goods); |
| 3041 | df_room_ids += g_item.room_id + ","; | 3042 | df_room_ids += g_item.room_id + ","; |
| 3042 | } else { | 3043 | } else { |
| 3044 | + | ||
| 3045 | + //-- 如果只有一件的时候，商品又是代发商品，订单的状态要改成代发订单 -- | ||
| 3046 | + if(g_item.whsle_id){ | ||
| 3047 | + goods.is_whsle_goods=1; | ||
| 3048 | + item.is_whsle=1; | ||
| 3049 | + } | ||
| 3050 | + | ||
| 3043 | item.order_goods.push(goods); | 3051 | item.order_goods.push(goods); |
| 3044 | //如果房间号不为空的时候 | 3052 | //如果房间号不为空的时候 |
| 3045 | if (g_item.room_id) { | 3053 | if (g_item.room_id) { |
| @@ -3056,7 +3064,6 @@ Page({ | @@ -3056,7 +3064,6 @@ Page({ | ||
| 3056 | //处理代发商品的拆分 | 3064 | //处理代发商品的拆分 |
| 3057 | if(df_goods.length>0 && item.order_goods.length>0 ){ | 3065 | if(df_goods.length>0 && item.order_goods.length>0 ){ |
| 3058 | var df_item=JSON.parse(JSON.stringify(item)); | 3066 | var df_item=JSON.parse(JSON.stringify(item)); |
| 3059 | - | ||
| 3060 | item.goods_price= parseFloat(item.goods_price-df_price).toFixed(2); | 3067 | item.goods_price= parseFloat(item.goods_price-df_price).toFixed(2); |
| 3061 | item.total_amount= parseFloat(item.total_amount-df_price).toFixed(2); | 3068 | item.total_amount= parseFloat(item.total_amount-df_price).toFixed(2); |
| 3062 | 3069 |
pages/user/userinfo/userinfo.wxml
| @@ -115,8 +115,8 @@ | @@ -115,8 +115,8 @@ | ||
| 115 | </view> | 115 | </view> |
| 116 | 116 | ||
| 117 | <block wx:if="{{!user.sex}}"> | 117 | <block wx:if="{{!user.sex}}"> |
| 118 | - <text class="lb_txt" wx:if="{{reg_info.sex && (reg_info.sex_state_type == 0)}}">+{{reg_info.sex}}积分</text> | ||
| 119 | - <text class="lb_txt" wx:if="{{reg_info.sex && (reg_info.sex_state_type == 1)}}">+{{reg_info.sex}}成长值</text> | 118 | + <text class="lb_txt" wx:if="{{reg_info.sex && reg_info.sex_state && (reg_info.sex_state_type == 0)}}">+{{reg_info.sex}}积分</text> |
| 119 | + <text class="lb_txt" wx:if="{{reg_info.sex && reg_info.sex_state && (reg_info.sex_state_type == 1)}}">+{{reg_info.sex}}成长值</text> | ||
| 120 | </block> | 120 | </block> |
| 121 | 121 | ||
| 122 | </view> | 122 | </view> |
| @@ -158,8 +158,8 @@ | @@ -158,8 +158,8 @@ | ||
| 158 | </block> | 158 | </block> |
| 159 | 159 | ||
| 160 | <block wx:if="{{!user.birthday}}"> | 160 | <block wx:if="{{!user.birthday}}"> |
| 161 | - <text class="lb_txt" wx:if="{{reg_info.birthday && (reg_info.birthday_type == 0)}}">+{{reg_info.birthday}}积分</text> | ||
| 162 | - <text class="lb_txt" wx:if="{{reg_info.birthday && (reg_info.birthday_type == 1)}}">+{{reg_info.birthday}}成长值</text> | 161 | + <text class="lb_txt" wx:if="{{reg_info.birthday && reg_info.birthday_state && (reg_info.birthday_type == 0)}}">+{{reg_info.birthday}}积分</text> |
| 162 | + <text class="lb_txt" wx:if="{{reg_info.birthday && reg_info.birthday_state && (reg_info.birthday_type == 1)}}">+{{reg_info.birthday}}成长值</text> | ||
| 163 | </block> | 163 | </block> |
| 164 | 164 | ||
| 165 | </view> | 165 | </view> |
| @@ -172,8 +172,8 @@ | @@ -172,8 +172,8 @@ | ||
| 172 | <view class="flex ai_c"> | 172 | <view class="flex ai_c"> |
| 173 | <input bindblur="user_name" class="user-txt-right t-r" placeholder="*姓名" value='{{user.vipname}}' /> | 173 | <input bindblur="user_name" class="user-txt-right t-r" placeholder="*姓名" value='{{user.vipname}}' /> |
| 174 | <block wx:if="{{!user.vipname}}"> | 174 | <block wx:if="{{!user.vipname}}"> |
| 175 | - <text class="lb_txt" wx:if="{{reg_info.name && (reg_info.name_val_type == 0)}}">+{{reg_info.name}}积分</text> | ||
| 176 | - <text class="lb_txt" wx:if="{{reg_info.name && (reg_info.name_val_type == 1)}}">+{{reg_info.name}}成长值</text> | 175 | + <text class="lb_txt" wx:if="{{reg_info.name && reg_info.name_state && (reg_info.name_val_type == 0)}}">+{{reg_info.name}}积分</text> |
| 176 | + <text class="lb_txt" wx:if="{{reg_info.name && reg_info.name_state && (reg_info.name_val_type == 1)}}">+{{reg_info.name}}成长值</text> | ||
| 177 | </block> | 177 | </block> |
| 178 | </view> | 178 | </view> |
| 179 | </view> | 179 | </view> |
| @@ -183,8 +183,8 @@ | @@ -183,8 +183,8 @@ | ||
| 183 | <view class="flex ai_c"> | 183 | <view class="flex ai_c"> |
| 184 | <input bindblur="identity_card" class="user-txt-right t-r" value="{{user.idcard}}" placeholder="*身份证" /> | 184 | <input bindblur="identity_card" class="user-txt-right t-r" value="{{user.idcard}}" placeholder="*身份证" /> |
| 185 | <block wx:if="{{!user.idcard}}"> | 185 | <block wx:if="{{!user.idcard}}"> |
| 186 | - <text class="lb_txt" wx:if="{{reg_info.idcard && (reg_info.idcard_type == 0)}}">+{{reg_info.idcard}}积分</text> | ||
| 187 | - <text class="lb_txt" wx:if="{{reg_info.idcard && (reg_info.idcard_type == 1)}}">+{{reg_info.idcard}}成长值</text> | 186 | + <text class="lb_txt" wx:if="{{reg_info.idcard && reg_info.idcard_state && (reg_info.idcard_type == 0)}}">+{{reg_info.idcard}}积分</text> |
| 187 | + <text class="lb_txt" wx:if="{{reg_info.idcard && reg_info.idcard_state && (reg_info.idcard_type == 1)}}">+{{reg_info.idcard}}成长值</text> | ||
| 188 | </block> | 188 | </block> |
| 189 | </view> | 189 | </view> |
| 190 | 190 | ||
| @@ -206,8 +206,8 @@ | @@ -206,8 +206,8 @@ | ||
| 206 | <view class="flex ai_c"> | 206 | <view class="flex ai_c"> |
| 207 | <input bindblur="address" maxlength="30" value="{{user.address}}" class="user-txt-right" placeholder="*地址" style="text-align:right" /> | 207 | <input bindblur="address" maxlength="30" value="{{user.address}}" class="user-txt-right" placeholder="*地址" style="text-align:right" /> |
| 208 | <block wx:if="{{!user.address}}"> | 208 | <block wx:if="{{!user.address}}"> |
| 209 | - <text class="lb_txt" wx:if="{{reg_info.address && (reg_info.address_type == 0)}}">+{{reg_info.address}}积分</text> | ||
| 210 | - <text class="lb_txt" wx:if="{{reg_info.address && (reg_info.address_type == 1)}}">+{{reg_info.address}}成长值</text> | 209 | + <text class="lb_txt" wx:if="{{reg_info.address && reg_info.address_state && (reg_info.address_type == 0)}}">+{{reg_info.address}}积分</text> |
| 210 | + <text class="lb_txt" wx:if="{{reg_info.address && reg_info.address_state && (reg_info.address_type == 1)}}">+{{reg_info.address}}成长值</text> | ||
| 211 | </block> | 211 | </block> |
| 212 | </view> | 212 | </view> |
| 213 | 213 | ||
| @@ -221,8 +221,8 @@ | @@ -221,8 +221,8 @@ | ||
| 221 | <view class="flex ai_c"> | 221 | <view class="flex ai_c"> |
| 222 | <view class="angle">∟</view> | 222 | <view class="angle">∟</view> |
| 223 | <block wx:if="{{!user.pickup_id}}"> | 223 | <block wx:if="{{!user.pickup_id}}"> |
| 224 | - <text class="lb_txt" wx:if="{{reg_info.pick && (reg_info.pick_type == 0)}}">+{{reg_info.pick}}积分</text> | ||
| 225 | - <text class="lb_txt" wx:if="{{reg_info.pick && (reg_info.pick_type == 1)}}">+{{reg_info.pick}}成长值</text> | 224 | + <text class="lb_txt" wx:if="{{reg_info.pick && reg_info.pick_state && (reg_info.pick_type == 0)}}">+{{reg_info.pick}}积分</text> |
| 225 | + <text class="lb_txt" wx:if="{{reg_info.pick && reg_info.pick_state && (reg_info.pick_type == 1)}}">+{{reg_info.pick}}成长值</text> | ||
| 226 | </block> | 226 | </block> |
| 227 | </view> | 227 | </view> |
| 228 | 228 |