From ddff80ce514c1d2a8388af5522dd9e33e20d4fc0 Mon Sep 17 00:00:00 2001
From: wangzhen <37717239@qq.com>
Date: Thu, 22 Apr 2021 22:10:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E5=8D=96=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=20,=E9=A2=84=E7=BA=A6=E6=88=96?=
 =?UTF-8?q?=E8=80=85=E5=BE=85=E9=80=81=E8=B4=A7=E7=8A=B6=E6=80=81=E4=B8=8B?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=E7=BB=93=E7=AE=97=E9=87=91=E9=A2=9D=E7=9A=84?=
 =?UTF-8?q?bug.wz?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/agent/detail/index.wxml                 |  7 ++-
 .../detail/item-money-info/money-info.wxml    | 55 +++++--------------
 2 files changed, 19 insertions(+), 43 deletions(-)

diff --git a/pages/agent/detail/index.wxml b/pages/agent/detail/index.wxml
index f99c13f..778ff2d 100644
--- a/pages/agent/detail/index.wxml
+++ b/pages/agent/detail/index.wxml
@@ -35,11 +35,12 @@
 <!-- -------------------- -->
 <!-- 总共多少辆车，单独放在顶部 -->
 <view style="height:16rpx"> </view>
-<view class="bg-white text-df text-gray" style="border-bottom:2rpx solid #f3f3f3;padding:24rpx 30rpx">
-	车辆信息({{orderInfo.orderItems.length}}辆车)
-</view>
+
 <!-- 每一辆车，进度信息和结算信息 -->
 <view wx:for="{{orderInfoStep}}" wx:key="index" style="margin-top:{{index == 0 ? 0 : 16}}rpx">
+	<view class="bg-white text-df text-gray" style="border-bottom:2rpx solid #f3f3f3;padding:24rpx 30rpx">
+	车辆信息{{index+1}}
+</view>
 	<!-- 进度 -->
 	<item-car-info orderInfo="{{orderInfo}}" item="{{item}}" />
 	<!-- 磅单 -->
diff --git a/pages/agent/detail/item-money-info/money-info.wxml b/pages/agent/detail/item-money-info/money-info.wxml
index 50637ec..deb6bf1 100644
--- a/pages/agent/detail/item-money-info/money-info.wxml
+++ b/pages/agent/detail/item-money-info/money-info.wxml
@@ -4,7 +4,8 @@
 <wxs module="formate" src="../../../../pages/formate.wxs"></wxs>
 
 <!-- 预付款 -->
-<view class="bg-white" style="padding: 24rpx 30rpx;margin-top:16rpx" wx:if="{{item.activityOrderAuditPassNum == 1}}">
+<view class="bg-white" style="padding: 24rpx 30rpx;margin-top:16rpx" wx:if="{{item.activityOrderAuditPassNum!=null&&item.activityOrderAuditPassNum >= 1}}">
+	<view class="text-df text-gray" style="solid #f3f3f3;padding-bottom:24rpx">首款信息</view>
 	<view class="flex flex-justify text-sg">
 		<text class="text-black">预计总金额</text>
 		<text style="color:#F5222D">{{formate.formateAmount(item.preTotalMoney)}}元</text>
@@ -27,7 +28,7 @@
 		<text class="text-black">代卖费</text>
 		<text style="color:#F5222D">{{formate.formateAmount(item.proxyAmount) || 0}}元</text>
 	</view>
-	<view class="flex flex-justify text-sm" style="margin-top:2rpx"  >
+	<view class="flex flex-justify text-sm" style="margin-top:2rpx" wx:if="{{item.proxySellerSettleType==0}}" >
 		<text class="text-gray">代卖费单价 x 净重</text>
 		<view class="text-gray">{{formate.formatePrice2(item.unitSurcharge)}} x
 			{{formate.formateWeight3(item.weightnoteInfo.netWeight)}}</view>
@@ -38,52 +39,26 @@
 		<text class="text-gray" style="color:#F5222D">{{formate.formateAmount(item.preSettleMoney)}}元</text>
 	</view>
 </view>
-<!-- 尾款  -->
-<view wx:elif="{{item.activityOrderAuditPassNum == 2}}">
-	<view class="bg-white" style="padding: 24rpx 30rpx;margin-top:16rpx">
-		<view class="flex flex-justify text-sg">
-			<text class="text-black">预计总金额</text>
-			<text style="color:#F5222D">{{formate.formateAmount(item.preTotalMoney)}}元</text>
-		</view>
-		<view class="flex flex-justify text-xs" style="margin-top:2rpx">
-			<text class="text-gray">结算单价 x 净重</text>
-			<view class="text-gray">{{formate.formatePrice2(item.unitPrice)}} x
-				{{formate.formateWeight3(item.weightnoteInfo.netWeight)}}</view>
-		</view>
-		<view class="flex flex-justify text-sg" style="margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:16rpx">
-			<text class="text-black">首笔应收金额</text>
-			<text style="color:#F5222D">{{formate.formateAmount(item.prepayMoney)}}元</text>
-		</view>
-		<view class="flex flex-justify text-xs" style="margin-top:2rpx">
-			<text class="text-gray">预估总金额 x {{agent.getActivitySettleType(orderInfo.activitySettleType)}}</text>
-			<view class="text-gray">{{formate.formateAmount(item.preTotalMoney)}}元 x
-				{{agent.getActivitySettleType(orderInfo.activitySettleType)}}</view>
-		</view>
-		<view class="flex flex-justify text-sg" style="margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:16rpx">
-			<text class="text-black">代卖费</text>
-			<text style="color:#F5222D">{{formate.formateAmount(item.proxyAmount) || 0}}元</text>
-		</view>
-		<view class="flex flex-justify text-xs" style="margin-top:2rpx">
-			<text class="text-gray">代卖费单价 x 净重</text>
-			<view class="text-gray">{{formate.formatePrice2(item.unitSurcharge)}} x
-				{{formate.formateWeight3(item.weightnoteInfo.netWeight)}}</view>
-		</view>
-		<view class="flex flex-justify text-sg" style="margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:24rpx">
-			<text class="text-black text-bold">首笔实收金额：</text>
-			<text class="text-gray" style="color:#F5222D">{{formate.formateAmount(item.preSettleMoney)}}元</text>
-		</view>
-	</view>
+<!-- 尾款 只有活动订单才会有这个字段,并且这个字段=2表示第二次审核了 -->
+<view wx:if="{{item.activityOrderAuditPassNum!=null&&item.activityOrderAuditPassNum >= 2}}">
 	<view class="bg-white" style="padding: 24rpx 30rpx;margin-top:16rpx">
+	<view class="text-df text-gray" style="solid #f3f3f3;padding-bottom:24rpx">尾款信息</view>
 		<view class="flex flex-justify text-sg">
 			<text class="text-black">未结算金额</text>
 			<text style="color:#F5222D">{{formate.formateAmount(item.unSettleMoney)}}元</text>
 		</view>
-		<view class="flex flex-justify text-xs" style="margin-top:2rpx">
+		<view class="flex flex-justify text-xs" style="margin-top:2rpx" wx:if="{{item.proxySellerSettleType==1}}">
 			<text class="text-gray">单价 x 结算重量 - 首笔应收金额</text>
 			<view class="text-gray">{{formate.formatePrice2(item.unitPrice)}} x
 				{{formate.formateWeight3(item.weightnoteInfo.settleWeight)}} -
 				{{formate.formateAmount(item.prepayMoney)}}元</view>
 		</view>
+		<view class="flex flex-justify text-xs" style="margin-top:2rpx" wx:if="{{item.proxySellerSettleType==0}}">
+			<text class="text-gray">单价 x 净重 - 首笔应收金额</text>
+			<view class="text-gray">{{formate.formatePrice2(item.unitPrice)}} x
+				{{formate.formateWeight3(item.weightnoteInfo.netWeight)}} -
+				{{formate.formateAmount(item.prepayMoney)}}元</view>
+		</view>
 		<view class="flex flex-justify text-sg" style="margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:24rpx"
 			wx:if="{{item.adjustMoney && item.adjustMoney != 0}}">
 			<text class="text-black">调节费</text>
@@ -99,8 +74,8 @@
 		</view>
 	</view>
 </view>
-<!-- 全款 -->
-<view wx:if="{{item.paymentType == 3||(orderInfo.activityId==null&&item.status>=53)}}" class="bg-white"
+<!-- 全款 非活动订单,或者一次性付款的活动订单 , 在待审核和待结算,已完成下 , 显示全款信息, -->
+<view wx:if="{{(item.paymentType == 3||orderInfo.activityId==null)&&(item.status>52&&item.status!=55)}}" class="bg-white"
 	style="padding: 24rpx 30rpx;margin-top:16rpx">
 	<view class="flex flex-justify text-sg">
 		<text class="text-black">总金额</text>