Commit f4e6ae877245042b6cfa2a71915667c160786145
1 parent
50efe5c5
虚拟成团显示的优化~~
Showing
2 changed files
with
2 additions
and
9 deletions
pages/team/team_ping/team_ping.wxml
@@ -63,16 +63,9 @@ | @@ -63,16 +63,9 @@ | ||
63 | <view class="t-c flex {{item.pt_status==3?'jietitun':''}}"> | 63 | <view class="t-c flex {{item.pt_status==3?'jietitun':''}}"> |
64 | <view>共{{item.order_goods[0].goods_num}}件,</view> | 64 | <view>共{{item.order_goods[0].goods_num}}件,</view> |
65 | <block wx:if="{{item.is_zsorder==4}}"> | 65 | <block wx:if="{{item.is_zsorder==4}}"> |
66 | - <block wx:if="{{item.pt_status==3 || item.pt_status==4 || item.pt_status==5 || item.pt_status==6}}"> | 66 | + |
67 | <view>金额:<text class="xc-wc">¥</text></view> | 67 | <view>金额:<text class="xc-wc">¥</text></view> |
68 | <view class='foot-l-wz fs35'>{{filters.toFix(item.user_money+item.order_amount+item.pt_tail_money,2)}}</view> | 68 | <view class='foot-l-wz fs35'>{{filters.toFix(item.user_money+item.order_amount+item.pt_tail_money,2)}}</view> |
69 | - </block> | ||
70 | - <block wx:else> | ||
71 | - <view class='foot-l-wz fs35' wx:if="item.is_zsorder==4"> | ||
72 | - 定金:¥{{filters.toFix(item.order_amount+item.user_money,2)}}</view> | ||
73 | - <view class='foot-l-wz fs35' wx:else>金额:¥{{filters.toFix(item.order_amount+item.user_money,2)}}</view> | ||
74 | - <view class='foot-l-wz2 fs35' wx:if="{{item.pt_tail_money>0}}">尾款:¥{{item.pt_tail_money}}</view> | ||
75 | - </block> | ||
76 | 69 | ||
77 | </block> | 70 | </block> |
78 | <block wx:else> | 71 | <block wx:else> |
pages/team/team_success/team_success.js
@@ -237,7 +237,7 @@ Page({ | @@ -237,7 +237,7 @@ Page({ | ||
237 | 237 | ||
238 | //只装5个 | 238 | //只装5个 |
239 | var ordertx2=[],sf_num=0,ct_nun=teamlist.ct_num; | 239 | var ordertx2=[],sf_num=0,ct_nun=teamlist.ct_num; |
240 | - if(max_num){ | 240 | + if(max_num && !team_g.is_xuni_ct){ |
241 | ct_nun=parseInt(max_num); | 241 | ct_nun=parseInt(max_num); |
242 | if (ct_nun < ordertx.length) ct_nun = ordertx.length; | 242 | if (ct_nun < ordertx.length) ct_nun = ordertx.length; |
243 | } | 243 | } |