Commit 335fc9c32da4079bc8f99e3f575688aed299ef98
1 parent
7c66de15
样式和 页面调整
Showing
2 changed files
with
19 additions
and
17 deletions
pages/team/team_ping/team_ping.wxml
@@ -33,20 +33,9 @@ | @@ -33,20 +33,9 @@ | ||
33 | <view class="flex"> | 33 | <view class="flex"> |
34 | <text class='fs24 xc-wc {{item.pt_status==1?"xc-rmbs":"xc-rmb"}}'>¥</text> | 34 | <text class='fs24 xc-wc {{item.pt_status==1?"xc-rmbs":"xc-rmb"}}'>¥</text> |
35 | <view class='pd-jg xc-wc'>{{item.order_goods[0].goods_price}}</view> | 35 | <view class='pd-jg xc-wc'>{{item.order_goods[0].goods_price}}</view> |
36 | - <view class="flex word-line xc-ash {{item.pt_status==1?'xc-rmbs':'xc-rmb'}}"><text class="fs24 xc-black">零售价:</text><text class="fs24 xc-wc">¥</text><text class="fs26 xc-wc">{{item.order_goods[0].market_price}}</text> </view> | 36 | + <view class="flex word-line xc-ash {{item.pt_status==1?'xc-rmbs':'xc-rmb'}}"><text class="fs24 xc-black">零售价:</text><text class="fs24 xc-wc">¥</text><text class="fs26 xc-wc">{{item.order_goods[0].market_price}}</text> </view> |
37 | </view> | 37 | </view> |
38 | - <view class="xc-still-bad flex fs24" wx:if="{{item.pt_status==1}}"> | ||
39 | - <block wx:if="{{item.ct_num-item.tx.length>0}}"> | ||
40 | - 还差<text class="xc-wc">{{item.ct_num-item.tx.length}}</text>人成团 | ||
41 | - </block> | ||
42 | - <block wx:elif="{{item.max_ct_num-item.tx.length>0}}"> | ||
43 | - 还差<text class="xc-wc">{{item.max_ct_num-item.tx.length}}</text>人享受最低价 | ||
44 | - </block> | ||
45 | - <block wx:else> | ||
46 | - 您已经可以享受最低价 | ||
47 | - </block> | ||
48 | - | ||
49 | - </view> | 38 | + |
50 | <view class="xc-img-frame" wx:if="{{item.pt_status==2 || item.pt_status==4 || item.pt_status==5 }}"> | 39 | <view class="xc-img-frame" wx:if="{{item.pt_status==2 || item.pt_status==4 || item.pt_status==5 }}"> |
51 | <image style='width' class=""src="{{iurl}}/miniapp/images/xc_qtcg.png"></image> | 40 | <image style='width' class=""src="{{iurl}}/miniapp/images/xc_qtcg.png"></image> |
52 | </view> | 41 | </view> |
@@ -54,15 +43,27 @@ | @@ -54,15 +43,27 @@ | ||
54 | <image src="{{iurl}}/miniapp/images/xc-qtshibai.png"></image></view> | 43 | <image src="{{iurl}}/miniapp/images/xc-qtshibai.png"></image></view> |
55 | </view> | 44 | </view> |
56 | 45 | ||
46 | +<view class="xc-still-bad flex fs24" wx:if="{{item.pt_status==1}}"> | ||
47 | + <block wx:if="{{item.ct_num-item.tx.length>0}}"> | ||
48 | + 还差<text class="xc-wc">{{item.ct_num-item.tx.length}}</text>人成团 | ||
49 | + </block> | ||
50 | + <block wx:elif="{{item.max_ct_num-item.tx.length>0}}"> | ||
51 | + 还差<text class="xc-wc">{{item.max_ct_num-item.tx.length}}</text>人享受最价</block> | ||
52 | + <block wx:else>您已经可以享受最低价</block> | ||
53 | + </view> | ||
54 | + | ||
55 | + | ||
57 | </view> | 56 | </view> |
57 | + | ||
58 | </view> | 58 | </view> |
59 | - | 59 | + |
60 | </view> | 60 | </view> |
61 | <!--foot--> | 61 | <!--foot--> |
62 | <view style='width:100%;border-bottom:10rpx solid #eee; '> | 62 | <view style='width:100%;border-bottom:10rpx solid #eee; '> |
63 | <view class='pd-list-foot'> | 63 | <view class='pd-list-foot'> |
64 | - <view class='foot-left'> | 64 | + <view class='foot-left flex'> |
65 | 共{{item.order_goods[0].goods_num}}件, | 65 | 共{{item.order_goods[0].goods_num}}件, |
66 | + <view class="t-c"> | ||
66 | <block wx:if="{{item.is_zsorder==4}}"> | 67 | <block wx:if="{{item.is_zsorder==4}}"> |
67 | <block wx:if="{{item.pt_status==3 || item.pt_status==4 || item.pt_status==5 || item.pt_status==6}}"> | 68 | <block wx:if="{{item.pt_status==3 || item.pt_status==4 || item.pt_status==5 || item.pt_status==6}}"> |
68 | 金额:<text class="xc-wc">¥</text> | 69 | 金额:<text class="xc-wc">¥</text> |
@@ -80,6 +81,7 @@ | @@ -80,6 +81,7 @@ | ||
80 | 金额:<text class="xc-wc">¥</text> | 81 | 金额:<text class="xc-wc">¥</text> |
81 | <view class='foot-l-wz fs35'>{{filters.toFix(item.user_money+item.order_amount,2)}}</view> | 82 | <view class='foot-l-wz fs35'>{{filters.toFix(item.user_money+item.order_amount,2)}}</view> |
82 | </block> | 83 | </block> |
84 | + </view> | ||
83 | </view> | 85 | </view> |
84 | 86 | ||
85 | <view class='foot-right'> | 87 | <view class='foot-right'> |
pages/team/team_ping/team_ping.wxss
@@ -361,7 +361,7 @@ height:86rpx; | @@ -361,7 +361,7 @@ height:86rpx; | ||
361 | 361 | ||
362 | } | 362 | } |
363 | .xc-still-bad{ | 363 | .xc-still-bad{ |
364 | -line-height:100rpx; | 364 | +line-height:10rpx; |
365 | } | 365 | } |
366 | .xc-ellipsis{ | 366 | .xc-ellipsis{ |
367 | line-height:121rpx; | 367 | line-height:121rpx; |
@@ -374,5 +374,5 @@ margin-left:5rpx; | @@ -374,5 +374,5 @@ margin-left:5rpx; | ||
374 | color: #e4374d; | 374 | color: #e4374d; |
375 | font-weight: normal; | 375 | font-weight: normal; |
376 | margin-top:-40rpx; | 376 | margin-top:-40rpx; |
377 | - margin-left:78rpx | 377 | + |
378 | } | 378 | } |
379 | \ No newline at end of file | 379 | \ No newline at end of file |