From 335fc9c32da4079bc8f99e3f575688aed299ef98 Mon Sep 17 00:00:00 2001
From: cheng.xu <cheng.xu@meidd.com>
Date: Wed, 18 Sep 2019 08:59:54 +0800
Subject: [PATCH] 样式和 页面调整

---
 pages/team/team_ping/team_ping.wxml | 32 +++++++++++++++++---------------
 pages/team/team_ping/team_ping.wxss |  4 ++--
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/pages/team/team_ping/team_ping.wxml b/pages/team/team_ping/team_ping.wxml
index d250119..e235918 100644
--- a/pages/team/team_ping/team_ping.wxml
+++ b/pages/team/team_ping/team_ping.wxml
@@ -33,20 +33,9 @@
       <view class="flex">
       <text  class='fs24 xc-wc {{item.pt_status==1?"xc-rmbs":"xc-rmb"}}'>￥</text>
         <view class='pd-jg xc-wc'>{{item.order_goods[0].goods_price}}</view>
-        <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>
+        <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>
 </view>
-        <view class="xc-still-bad flex fs24" wx:if="{{item.pt_status==1}}">   
-           <block wx:if="{{item.ct_num-item.tx.length>0}}">     
-             还差<text class="xc-wc">{{item.ct_num-item.tx.length}}</text>人成团
-           </block>  
-            <block wx:elif="{{item.max_ct_num-item.tx.length>0}}">     
-                还差<text class="xc-wc">{{item.max_ct_num-item.tx.length}}</text>人享受最低价
-            </block>  
-            <block wx:else>     
-                您已经可以享受最低价
-            </block>  
-
-       </view>
+      
    <view class="xc-img-frame" wx:if="{{item.pt_status==2 || item.pt_status==4 || item.pt_status==5 }}">
    <image style='width' class=""src="{{iurl}}/miniapp/images/xc_qtcg.png"></image>
    </view>
@@ -54,15 +43,27 @@
     <image src="{{iurl}}/miniapp/images/xc-qtshibai.png"></image></view>
         </view>
 
+<view class="xc-still-bad flex fs24" wx:if="{{item.pt_status==1}}">   
+           <block wx:if="{{item.ct_num-item.tx.length>0}}">     
+             还差<text class="xc-wc">{{item.ct_num-item.tx.length}}</text>人成团
+           </block>  
+            <block wx:elif="{{item.max_ct_num-item.tx.length>0}}">     
+                还差<text class="xc-wc">{{item.max_ct_num-item.tx.length}}</text>人享受最价</block>  
+            <block wx:else>您已经可以享受最低价</block>  
+       </view>
+
+
         </view>
+         
     </view>
-   
+    
     </view>
     <!--foot-->
     <view style='width:100%;border-bottom:10rpx solid #eee; '> 
     <view class='pd-list-foot'>
-      <view class='foot-left'>
+      <view class='foot-left flex'>
         共{{item.order_goods[0].goods_num}}件, 
+        <view class="t-c">
         <block wx:if="{{item.is_zsorder==4}}">
             <block wx:if="{{item.pt_status==3 || item.pt_status==4 || item.pt_status==5 || item.pt_status==6}}">
                金额：<text class="xc-wc">￥</text>
@@ -80,6 +81,7 @@
            金额：<text class="xc-wc">￥</text>
            <view class='foot-l-wz fs35'>{{filters.toFix(item.user_money+item.order_amount,2)}}</view>
         </block>
+        </view>
       </view>
 
       <view class='foot-right'>
diff --git a/pages/team/team_ping/team_ping.wxss b/pages/team/team_ping/team_ping.wxss
index 4068cb0..c5a0670 100644
--- a/pages/team/team_ping/team_ping.wxss
+++ b/pages/team/team_ping/team_ping.wxss
@@ -361,7 +361,7 @@ height:86rpx;
 
 }
 .xc-still-bad{
-line-height:100rpx;
+line-height:10rpx;
 }
 .xc-ellipsis{
   line-height:121rpx;
@@ -374,5 +374,5 @@ margin-left:5rpx;
     color: #e4374d;
     font-weight: normal;
     margin-top:-40rpx; 
-    margin-left:78rpx 
+  
 }
\ No newline at end of file
--
libgit2 0.21.4