Commit bfe84779d6d68b200065687fa718b20162262ee8
1 parent
bb969fc2
提交订单页面的bug修改
Showing
2 changed files
with
12 additions
and
11 deletions
pages/cart/cart2/cart2.js
| ... | ... | @@ -290,7 +290,7 @@ Page({ | 
| 290 | 290 | var m_wind=0,def_exp_code=getApp().globalData.userInfo.def_exp_code; | 
| 291 | 291 | if(e_t==0 && def_exp_code){ | 
| 292 | 292 | for(var k=0;k<th.data.wu_arr.length;k++){ | 
| 293 | - var item=th.data.wu_arr[k]; if(def_exp_code=item.code){ m_wind=k; } | |
| 293 | + var item=th.data.wu_arr[k]; if(def_exp_code==item.code){ m_wind=k; } | |
| 294 | 294 | } | 
| 295 | 295 | } | 
| 296 | 296 | |
| ... | ... | @@ -399,7 +399,7 @@ Page({ | 
| 399 | 399 | var m_wind=0,def_exp_code=getApp().globalData.userInfo.def_exp_code; | 
| 400 | 400 | if(et==0 && def_exp_code){ | 
| 401 | 401 | for(var k=0;k<th.data.wu_arr.length;k++){ | 
| 402 | - var item=th.data.wu_arr[k]; if(def_exp_code=item.code){ m_wind=k; } | |
| 402 | + var item=th.data.wu_arr[k]; if(def_exp_code==item.code){ m_wind=k; } | |
| 403 | 403 | } | 
| 404 | 404 | } | 
| 405 | 405 | |
| ... | ... | @@ -667,11 +667,12 @@ Page({ | 
| 667 | 667 | all_shipping_m += th.data.cartlist[i].shipping_price; | 
| 668 | 668 | all_order_m += th.data.cartlist[i].order_amount; | 
| 669 | 669 | all_user_m += th.data.cartlist[i].user_money; | 
| 670 | - all_coupon_price_m+=th.data.cartlist[i].coupon_price; | |
| 670 | + all_coupon_price_m=parseFloat(all_coupon_price_m)+parseFloat(th.data.cartlist[i].coupon_price); | |
| 671 | 671 | |
| 672 | 672 | |
| 673 | 673 | } | 
| 674 | 674 | |
| 675 | + all_shipping_m=parseFloat(all_shipping_m).toFixed(2); | |
| 675 | 676 | all_total_m = parseFloat(all_total_m).toFixed(2); | 
| 676 | 677 | all_order_m = parseFloat(all_order_m).toFixed(2); | 
| 677 | 678 | all_price = parseFloat(all_price).toFixed(2); | ... | ... | 
pages/cart/cart2/cart2.wxml
| ... | ... | @@ -303,8 +303,8 @@ | 
| 303 | 303 | <view class="xc-frame flex-level"> | 
| 304 | 304 | <view class="list-frame"> | 
| 305 | 305 | |
| 306 | - <view wx:for="{{selected_quan_list}}" bindtap="sele_quan_item" wx:if="{{!item.is_using}}" data-ind="{{index}}" wx:for-item="item"wx:for-index="index"> | |
| 307 | - <view class="xc-coupon-frame flex-center" bindtap="sele_coupon" data-ind="{{index}}"> | |
| 306 | + <view wx:for="{{selected_quan_list}}" bindtap="sele_quan_item" wx:if="{{!item.is_using}}" data-ind="{{q_index}}" wx:for-item="item"wx:for-index="q_index"> | |
| 307 | + <view class="xc-coupon-frame flex-center" bindtap="sele_coupon" data-ind="{{q_index}}"> | |
| 308 | 308 | <view class="coupon-frame flex rel"> | 
| 309 | 309 | <!-- 锯齿 --> | 
| 310 | 310 | <view class="circle-frame abs"> | 
| ... | ... | @@ -372,12 +372,12 @@ | 
| 372 | 372 | <image class="coupon-code" src='{{iurl}}/miniapp/images/hui-ewm.png'></image> | 
| 373 | 373 | </view> --> | 
| 374 | 374 | |
| 375 | - <block wx:if="{{is_coupon==index}}"> | |
| 376 | - <view class="circle white xc-hook fs20 red-b sn"><text>Γ</text></view> | |
| 377 | - </block> | |
| 378 | - <block wx:else> | |
| 379 | - <view class="circle xc-hooks on"></view> | |
| 380 | - </block> | |
| 375 | + <block wx:if="{{item.show_red}}"> | |
| 376 | + <view class="circle white xc-hook fs20 red-b sn"><text>Γ</text></view> | |
| 377 | + </block> | |
| 378 | + <block wx:else> | |
| 379 | + <view class="circle xc-hooks on"></view> | |
| 380 | + </block> | |
| 381 | 381 | </view> | 
| 382 | 382 | |
| 383 | 383 | ... | ... |