From edcff2912e16e3247c1fe3fd0134f105e7f6ceb0 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Tue, 9 Mar 2021 14:24:55 +0800
Subject: [PATCH] no message

---
 pages/agent/detail/index.wxml | 105 ++++++++++++++++++++++------------
 1 file changed, 68 insertions(+), 37 deletions(-)

diff --git a/pages/agent/detail/index.wxml b/pages/agent/detail/index.wxml
index c2b85cb..85eb5d1 100644
--- a/pages/agent/detail/index.wxml
+++ b/pages/agent/detail/index.wxml
@@ -11,7 +11,6 @@
 </view>
 <!--结算中和已完成、收货待审核-->
 <view wx:if="{{orderInfo && (orderInfo.status == 53 || orderInfo.status == 54)}}">
-
 	<view wx:for="{{orderInfo.orderItems}}" wx:key="index" style="margin-top:{{index == 0 ? 0 : 16}}rpx">
 		<view class="bg-white flex flex-justify text-sg" style="padding: 24rpx 30rpx">
 			<text class="text-sg text-bold">货车车牌：{{item.logisticcsInfo.plateNumber}}</text>
@@ -51,25 +50,25 @@
 				<text class="text-black">预计总金额</text>
 				<text style="color:#F5222D">{{formate.formateAmount(item.preTotalMoney)}}元</text>
 			</view>
-			<view class="flex flex-justify text-sm" style="margin-top:4rpx">
-				<text class="text-gray">结算单价x净重</text>
-				<text class="text-gray">{{formate.formatePrice2(item.unitPrice)}}*{{formate.formateWeight(item.weightnoteInfo.netWeight)}}</text>
+			<view class="flex flex-justify text-sm" style="margin-top:2rpx">
+				<text class="text-gray">结算单价 x 净重</text>
+				<text class="text-gray">{{formate.formatePrice2(item.unitPrice)}} x {{formate.formateWeight(item.weightnoteInfo.netWeight)}}</text>
 			</view>
 			<view class="flex flex-justify text-sg" style="margin-top:20rpx;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-sm" style="margin-top:12rpx">
-				<text class="text-gray">预估总金额x{{agent.getActivitySettleType(orderInfo.activitySettleType)}}</text>
-				<text class="text-gray">{{formate.formateAmount(item.preTotalMoney)}}元x{{agent.getActivitySettleType(orderInfo.activitySettleType)}}</text>
+			<view class="flex flex-justify text-sm" style="margin-top:2rpx">
+				<text class="text-gray">预估总金额 x {{agent.getActivitySettleType(orderInfo.activitySettleType)}}</text>
+				<text class="text-gray">{{formate.formateAmount(item.preTotalMoney)}}元 x {{agent.getActivitySettleType(orderInfo.activitySettleType)}}</text>
 			</view>
 			<view class="flex flex-justify text-sg" style="margin-top:20rpx;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-sm" style="margin-top:12rpx">
-			  <text class="text-gray">代卖费单价x净重</text>
-				<text class="text-gray">{{formate.formatePrice2(item.unitSurcharge)}}x{{formate.formateWeight(item.weightnoteInfo.netWeight)}}</text>
+			<view class="flex flex-justify text-sm" style="margin-top:2rpx">
+			  <text class="text-gray">代卖费单价 x 净重</text>
+				<text class="text-gray">{{formate.formatePrice2(item.unitSurcharge)}} x {{formate.formateWeight(item.weightnoteInfo.netWeight)}}</text>
 			</view>
 			<view class="flex text-sg" style="justify-content: flex-end;margin-top:20rpx;border-top:2rpx solid #f3f3f3;padding-top:20rpx">
 				<text class="text-black text-bold">首笔实收金额：</text>
@@ -77,37 +76,69 @@
 			</view>
 		</view>
 		<!-- 尾款  -->
-		<view class="bg-white" style="padding: 24rpx 30rpx;margin-top:16rpx" wx:elif="{{item.activityOrderAuditPassNum == 2}}">
-			<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-sm" style="margin-top:4rpx">
-			  <text class="text-gray">结算单价x结算重量-首笔应收金额</text>
-			  <text class="text-gray">{{formate.formatePrice2(item.unitPrice)}}x{{formate.formateWeight(item.weightnoteInfo.settletWeight)}}-{{formate.formateAmount(item.prepayMoney)}}元</text>
-			</view>
-		 <view class="flex flex-justify text-sg" style="margin-top:20rpx;border-top:2rpx solid #f3f3f3" wx:if="{{item.adjustMoney}}">
-		   <text class="text-black">调节费</text>
-		   <text style="color:#F5222D">-{{formate.formateAmount(item.adjustMoney)}}元</text>
-		 </view>
-		 <view class="flex text-sg" style="justify-content: flex-end;margin-top:20rpx;border-top:2rpx solid #f3f3f3;padding-top:20rpx">
-		   <text class="text-black text-bold">尾款实收金额：</text>
-		   <text style="color:#F5222D">{{formate.formateAmount(item.finalPayMoney)}}元</text>
-		 </view>
-		 <view class="flex text-sg" style="justify-content: flex-end;margin-top:20rpx;border-top:2rpx solid #f3f3f3;padding-top:20rpx">
-		    <text class="text-black text-bold">总收款金额：</text>
-		    <text style="color:#F5222D">{{formate.formateAmount(item.settlePrice)}}元</text>
+		<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-sm" style="margin-top:2rpx">
+				  <text class="text-gray">结算单价 x 净重</text>
+				  <text class="text-gray">{{formate.formatePrice2(item.unitPrice)}} x {{formate.formateWeight(item.weightnoteInfo.netWeight)}}</text>
+			  </view>
+		  	<view class="flex flex-justify text-sg" style="margin-top:20rpx;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-sm" style="margin-top:2rpx">
+				  <text class="text-gray">预估总金额 x {{agent.getActivitySettleType(orderInfo.activitySettleType)}}</text>
+				  <text class="text-gray">{{formate.formateAmount(item.preTotalMoney)}}元 x {{agent.getActivitySettleType(orderInfo.activitySettleType)}}</text>
+			  </view>
+			  <view class="flex flex-justify text-sg" style="margin-top:20rpx;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-sm" style="margin-top:2rpx">
+			    <text class="text-gray">代卖费单价 x 净重</text>
+				  <text class="text-gray">{{formate.formatePrice2(item.unitSurcharge)}} x {{formate.formateWeight(item.weightnoteInfo.netWeight)}}</text>
+			  </view>
+			  <view class="flex text-sg" style="justify-content: flex-end;margin-top:20rpx;border-top:2rpx solid #f3f3f3;padding-top:20rpx">
+				  <text class="text-black text-bold">首笔实收金额：</text>
+				  <text class="text-gray" style="color:#F5222D">{{formate.formateAmount(item.preSettleMoney)}}元</text>
+			  </view>
 		  </view>
-		</view>
+		  <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.unSettleMoney)}}元</text>
+			  </view>
+		   <view class="flex flex-justify text-sm" style="margin-top:2rpx">
+			    <text class="text-gray">结算单价 x 结算重量 - 首笔应收金额</text>
+			    <text class="text-gray">{{formate.formatePrice2(item.unitPrice)}} x {{formate.formateWeight(item.weightnoteInfo.settletWeight)}} - {{formate.  formateAmount(item.prepayMoney)}}元</text>
+			  </view>
+		   <view class="flex flex-justify text-sg" style="margin-top:20rpx;border-top:2rpx solid #f3f3f3" wx:if="{{item.adjustMoney}}">
+		     <text class="text-black">调节费</text>
+		     <text style="color:#F5222D">-{{formate.formateAmount(item.adjustMoney)}}元</text>
+		   </view>
+		   <view class="flex text-sg" style="justify-content: flex-end;margin-top:20rpx;border-top:2rpx solid #f3f3f3;padding-top:20rpx">
+		     <text class="text-black text-bold">尾款实收金额：</text>
+		     <text style="color:#F5222D">{{formate.formateAmount(item.finalPayMoney)}}元</text>
+		   </view>
+		   <view class="flex text-sg" style="justify-content: flex-end;margin-top:20rpx;border-top:2rpx solid #f3f3f3;padding-top:20rpx">
+		      <text class="text-black text-bold">总收款金额：</text>
+		      <text style="color:#F5222D">{{formate.formateAmount(item.settlePrice)}}元</text>
+		    </view>
+	  	</view>
+	  </view>
 		<!-- 全款 -->
 		<view class="bg-white" style="padding: 24rpx 30rpx;margin-top:16rpx" wx:else>
 			<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-sm" style="margin-top:4rpx">
-			  <text class="text-gray">结算单价x结算重量</text>
-			  <text class="text-gray">{{formate.formatePrice2(item.weightnoteInfo.settleUtiPrice)}}x{{formate.formateWeight(item.weightnoteInfo.settletWeight)}}</text>
+			<view class="flex flex-justify text-sm" style="margin-top:2rpx">
+			  <text class="text-gray">结算单价 x 结算重量</text>
+			  <text class="text-gray">{{formate.formatePrice2(item.weightnoteInfo.settleUtiPrice)}} x {{formate.formateWeight(item.weightnoteInfo.settletWeight)}}</text>
 			</view>
 		  <view class="flex flex-justify text-sg" style="margin-top:20rpx;border-top:2rpx solid #f3f3f3;padding-top:16rpx" wx:if="{{item.adjustMoney}}">
 			  <text class="text-black">调节费</text>
@@ -117,9 +148,9 @@
 			  <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:4rpx">
-			  <text class="text-gray">代卖费单价x结算重量</text>
-			  <text class="text-gray">{{formate.formatePrice2(item.unitSurcharge)}}x{{formate.formateWeight(item.weightnoteInfo.settletWeight)}}</text>
+			<view class="flex flex-justify text-sm" style="margin-top:2rpx">
+			  <text class="text-gray">代卖费单价 x 结算重量</text>
+			  <text class="text-gray">{{formate.formatePrice2(item.unitSurcharge)}} x {{formate.formateWeight(item.weightnoteInfo.settletWeight)}}</text>
 		  </view>
 			<view class="flex text-sg" style="justify-content: flex-end;margin-top:20rpx;border-top:2rpx solid #f3f3f3;padding-top:20rpx">
 			  <text class="text-black text-bold">总收款金额：</text>