From 709a54fa4216d9e4200ce10cb9ebcd89dad40fa9 Mon Sep 17 00:00:00 2001
From: F5VT98DI7XY4X12\Administrator <765199919@qq.com>
Date: Wed, 4 Sep 2019 16:37:18 +0800
Subject: [PATCH] 订单显示，  拼团显示， 拼团订单，  会员中心页面的bug调整

---
 pages/team/team_ping/team_ping.js         |  2 +-
 pages/team/team_ping/team_ping.wxml       | 27 +++++++++++++++++++++------
 pages/team/team_ping/team_ping.wxss       | 32 +++++++++++++++++---------------
 pages/team/team_success/team_success.js   |  8 +++++---
 pages/team/team_success/team_success.wxml |  6 +++---
 pages/user/index/index.js                 |  2 +-
 pages/user/order_detail/order_detail.wxml | 77 +++++++++++++++++++++++++++++++++--------------------------------------------
 pages/user/order_detail/order_detail.wxss | 11 +++++++++--
 pages/user/order_list/order_list.wxml     |  2 +-
 9 files changed, 91 insertions(+), 76 deletions(-)

diff --git a/pages/team/team_ping/team_ping.js b/pages/team/team_ping/team_ping.js
index aa8975b..0ccecc4 100644
--- a/pages/team/team_ping/team_ping.js
+++ b/pages/team/team_ping/team_ping.js
@@ -157,7 +157,7 @@ Page({
     }
 
     wx.hideLoading();
-    ee.setData({ order: this.data.requestData, ordertx:ordertx});
+    ee.setData({ order: this.data.requestData, ordertx: ordertx, isgo:1});
   },
   
   //---滚动到底部加载更多---
diff --git a/pages/team/team_ping/team_ping.wxml b/pages/team/team_ping/team_ping.wxml
index decccf5..3d233e3 100644
--- a/pages/team/team_ping/team_ping.wxml
+++ b/pages/team/team_ping/team_ping.wxml
@@ -1,4 +1,4 @@
-<!--pages/team_ping/team_ping.wxml-->
+<wxs module="filters" src="../../../utils/filter.wxs"></wxs>
   
 <!--选择款-->
 <view class='top'>
@@ -62,9 +62,24 @@
     <view style='width:100%;border-bottom:10rpx solid #eee; '> 
     <view class='pd-list-foot'>
       <view class='foot-left'>
-        共{{item.order_goods[0].goods_num}}件, 金额：
-        <text class="xc-wc">￥</text>
-        <view class='foot-l-wz fs35'>{{item.user_money+item.order_amount}}</view>
+        共{{item.order_goods[0].goods_num}}件, 
+        <block wx:if="{{item.is_zsorder==4}}">
+            <block wx:if="{{item.pt_status==4 || item.pt_status==5}}">
+               定金：<text class="xc-wc">￥</text>
+               <view class='foot-l-wz fs35'>{{filters.toFix(item.user_money+item.order_amount+item.pt_tail_money,2)}}</view>
+            </block>       
+            <block wx:else>
+                  <view class='foot-l-wz fs35' wx:if="item.is_zsorder==4">
+                       定金:￥{{filters.toFix(item.order_amount+item.user_money,2)}}</view>     
+                  <view class='foot-l-wz fs35' wx:else>金额:￥{{filters.toFix(item.order_amount+item.user_money,2)}}</view>
+                  <view class='foot-l-wz2 fs35'  wx:if="{{item.pt_tail_money>0}}">尾款:￥{{item.pt_tail_money}}</view>
+            </block>
+        
+        </block>
+        <block wx:else>
+           金额：<text class="xc-wc">￥</text>
+           <view class='foot-l-wz fs35'>{{filters.toFix(item.user_money+item.order_amount,2)}}</view>
+        </block>
       </view>
 
       <view class='foot-right'>
@@ -103,6 +118,6 @@
 
 
 </view>
-<view wx:else>
-<view class='kon'>暂无更多</view>
+<view wx:elif="{{isgo}}">
+  <view class='kon'>暂无更多</view>
 </view>
\ No newline at end of file
diff --git a/pages/team/team_ping/team_ping.wxss b/pages/team/team_ping/team_ping.wxss
index 2d9dc1c..bc72682 100644
--- a/pages/team/team_ping/team_ping.wxss
+++ b/pages/team/team_ping/team_ping.wxss
@@ -175,34 +175,28 @@ height:222rpx;
 
 
 .pd-list-foot{
-  
-      width: 100%;
+    width: 100%;
     margin: auto;
-    overflow: hidden;
-    height: 105rpx;
-        font-size: 28rpx;
+    font-size: 28rpx;
     line-height: 105rpx;
     color: #000;
     display: flex;
     justify-content:space-between;
-    
-
+  
 }
-
+ 
 .foot-l-wz{
-  padding-right: 10rpx;
+    padding-right: 10rpx;
     display: inline-block;
-    font-size: 34rpx;
-    line-height: 100rpx;
-        color: #e4374d;
+    font-size: 34rpx;  
+    color: #e4374d;
     font-weight: normal;
 }
 
 .foot-left{
 
- margin-left:19rpx;
-min-width: 360rpx;
-  height: 100rpx;
+   margin-left:19rpx;
+   min-width: 360rpx;
    line-height: 100rpx;
    font-size:26rpx;
 }
@@ -375,4 +369,12 @@ line-height:100rpx;
   line-height:121rpx;
 margin-left:5rpx;
 
+}
+
+.foot-l-wz2{
+    font-size: 34rpx;  
+    color: #e4374d;
+    font-weight: normal;
+    margin-top:-40rpx; 
+    margin-left:80rpx 
 }
\ No newline at end of file
diff --git a/pages/team/team_success/team_success.js b/pages/team/team_success/team_success.js
index a1ed7ac..b13191d 100644
--- a/pages/team/team_success/team_success.js
+++ b/pages/team/team_success/team_success.js
@@ -651,8 +651,10 @@ Page({
         });
     },
 
-
-    
-
+    go_pay_wk:function(){
+      var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id;
+      getApp().goto(url);
+    }
+  
 })
 
diff --git a/pages/team/team_success/team_success.wxml b/pages/team/team_success/team_success.wxml
index cadedf4..0da7b65 100644
--- a/pages/team/team_success/team_success.wxml
+++ b/pages/team/team_success/team_success.wxml
@@ -152,12 +152,12 @@
     <!-- <block wx:if="{{pay_f!=1 && order.pt_status<2}}"> -->
       <!----/ // // // //按钮---->
       
-      <view wx:if="{{teamlist.kttype==3}}" class='bodybutton' bindtap='cmeng'>
+      <view wx:if="{{teamlist.kttype==3}}" class='bodybutton'>
         <!-- 阶梯团 -->
-        <button wx:if="{{p_status==1}}"  style='background-color:#fab55a; color:#fff'>
+        <button wx:if="{{p_status==1}}"  bindtap='cmeng'  style='background-color:#fab55a; color:#fff'>
           邀请好友参团
         </button>
-        <button style='background-color:#42c780;' wx:if="{{order.pt_status==2 && order.is_zsorder==4 }}">
+        <button bindtap="go_pay_wk" style='background-color:#42c780;' wx:if="{{order.pt_status==2 && order.is_zsorder==4 }}">
           支付尾款
         </button>    
       </view>
diff --git a/pages/user/index/index.js b/pages/user/index/index.js
index b6b4536..5d6c12a 100644
--- a/pages/user/index/index.js
+++ b/pages/user/index/index.js
@@ -75,7 +75,7 @@ Page({
             if (su.data.code == 0) {
               var yuer = parseFloat(th.data.userInfo.user_money -
                   th.data.userInfo.frozen_money - su.data.data.summoney).toFixed(2);
-              th.setData({ txmon: su.data.data.summoney, yuer });
+              th.setData({ txmon: su.data.data.summoney, yuer: yuer });
             }
           }
         })
diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml
index 3f22b61..2bc619b 100644
--- a/pages/user/order_detail/order_detail.wxml
+++ b/pages/user/order_detail/order_detail.wxml
@@ -61,65 +61,54 @@
         </view>
     </view>
     <view class="price-information information">
-        <view class="title">价格信息</view>
-        <block wx:if="{{order.is_zsorder==4}}">
-           <view class="item">
+           <view class="title" style="margin-bottom:10rpx" >价格信息</view>
+           <view class="item pnew"  wx:if="{{order.is_zsorder==4}}">
                 <view>商品总价</view>
                 <view>￥ {{filters.toFix(order.order_goods[0].member_goods_price*order.order_goods[0].goods_num,2)}}元</view>
            </view>
-           <view class="item">
+           <view class="item pnew" wx:else>
+              <view>商品总价</view>
+              <view>￥ {{order.goods_price}}元</view>
+            </view>
+
+           <view class="item pnew">
                 <view>定金金额</view>
                 <view>￥ {{filters.toFix(order.order_amount+order.user_money,2)}}元</view>
            </view>
-           <view class="item" wx:if="{{order.pt_tail_money>0}}">
+           <view class="item pnew" wx:if="{{order.pt_tail_money>0}}">
               <view>尾款金额</view>
               <view>￥ {{order.pt_tail_money}}元</view>
            </view>
+
+            <view class="item pnew" wx:if="{{order.shipping_price>0}}">
+                 <view>配送费用</view>
+                 <view>￥ {{order.shipping_price}}元</view>
+            </view>
+            <view class="item pnew" wx:if="{{order.coupon_price>0}}">
+                <view>优惠券</view>
+                <view> ￥ {{order.coupon_price}}元</view>
+           </view>
+
+            <view class="item pnew" wx:if="{{order.integral_money>0}}">
+               <view>积分</view>
+               <view> ￥ {{order.integral_money}}元</view>
+            </view>
+
+            <view class="item pnew" wx:if="{{order.order_prom_amount>0}}">
+                <view>订单优惠</view>
+                <view>￥ {{order.order_prom_amount}}元</view>
+            </view>
           
             <view class="item" wx:if="{{order.pt_tail_money>0}}">
               <view>订单总价</view>
-              <view>￥ {{order.pt_tail_money}}元</view>
+              <view>￥ {{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money)}}元</view>
             </view>
 
+           <view class="item-line"></view>
            <view class="item" wx:if="{{order.user_money>0}}">
-            <view>使用余额</view>
-            <view>￥ {{order.user_money}}元</view>
-        </view>
-        </block>
-
-        <block wx:else>
-        <view class="item">
-            <view>商品总价</view>
-            <view>￥ {{order.goods_price}}元</view>
-        </view>
-        <view class="item" wx:if="{{order.shipping_price>0}}">
-            <view>运费</view>
-            <view>￥ {{order.shipping_price}}元</view>
-        </view>
-        <view class="item" wx:if="{{order.coupon_price>0}}">
-            <view>优惠券</view>
-            <view> ￥ {{order.coupon_price}}元</view>
-        </view>
-        <view class="item" wx:if="{{order.integral_money>0}}">
-            <view>积分</view>
-            <view> ￥ {{order.integral_money}}元</view>
-        </view>
-        <view class="item" wx:if="{{order.user_money>0}}">
-            <view>余额</view>
-            <view> ￥ {{order.user_money}}元</view>
-        </view>
-        <view class="item" wx:if="{{order.order_prom_amount>0}}">
-            <view>订单优惠</view>
-            <view>￥ {{order.order_prom_amount}}元</view>
-        </view>
-       
-        <view class="item">
-            <view>实付金额</view>
-            <view class="pay-amount">￥ {{order.order_amount}}元</view>
-        </view>
-
-
-        </block> 
+              <view>使用余额</view>
+              <view>￥ {{order.user_money}}元</view>
+           </view>
     </view>
 
     <view class="btn-wrap">
diff --git a/pages/user/order_detail/order_detail.wxss b/pages/user/order_detail/order_detail.wxss
index c18cc63..e82786b 100644
--- a/pages/user/order_detail/order_detail.wxss
+++ b/pages/user/order_detail/order_detail.wxss
@@ -119,7 +119,7 @@
 .information .title {
     height: 70rpx;
     line-height: 70rpx;
-    border-bottom: 1px solid #ddd;
+    border-bottom: 1rpx solid #ddd;
     font-size: 34rpx;
     color: #333;
 }
@@ -130,8 +130,15 @@
     height: 60rpx;
     line-height: 60rpx;
     font-size: 30rpx;
-    color: #666;
+    color: #333;
+}
+
+.information .item.pnew{
+    height: 50rpx;
+    line-height: 50rpx;
+    color: #999; 
 }
+.item-line{ margin: 5rpx 0; height: 1rpx; border-bottom:1rpx solid #ddd }
 
 .delivery-address,.leave-word {
     width: 500rpx;
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index 64d9258..4136502 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -53,7 +53,7 @@
                              <view>金额:￥{{filters.toFix(item.order_amount+item.user_money+item.pt_tail_money,2)}}</view>
                       </block>    
                       <block wx:else>
-                        <view wx:if="item.is_zsorder==4">定金:￥{{filters.toFix(item.order_amount+item.user_money,2)}}</view>          
+                        <view wx:if="{{item.is_zsorder==4}}">定金:￥{{filters.toFix(item.order_amount+item.user_money,2)}}</view>          
                         <view wx:else>金额:￥{{filters.toFix(item.order_amount+item.user_money,2)}}</view>
                         <view wx:if="{{item.pt_tail_money>0}}">尾款:￥{{item.pt_tail_money}}</view>
                       </block>    
--
libgit2 0.21.4