From c964c1fad00ea3a975186cbbbf5f884a10e90ea5 Mon Sep 17 00:00:00 2001
From: "DESKTOP-A1SENDA\\HUzy" <472860318@qq.com>
Date: Thu, 13 May 2021 11:25:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E8=B4=B4=E4=B8=8E=E6=89=A3=E6=AC=BE?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=87=91=E9=A2=9D=E6=98=BE=E7=A4=BAUI?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/item-money-info/money-info.wxml    | 19 +++++++++----------
 pages/agent/detail/pound-info/pound-info.wxml |  8 ++++----
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/pages/agent/detail/item-money-info/money-info.wxml b/pages/agent/detail/item-money-info/money-info.wxml
index ab64d82..f9027ed 100644
--- a/pages/agent/detail/item-money-info/money-info.wxml
+++ b/pages/agent/detail/item-money-info/money-info.wxml
@@ -8,7 +8,7 @@
 	<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>
+		<text style="">{{formate.formateAmount(item.preTotalMoney)}}元</text>
 	</view>
 	<view class="flex flex-justify text-sm" style="margin-top:2rpx">
 		<text class="text-gray">结算单价 x 净重</text>
@@ -17,7 +17,7 @@
 	</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>
+		<text style="">{{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>
@@ -26,7 +26,7 @@
 	</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>
+		<text style="">{{formate.formateAmount(item.proxyAmount) || 0}}元</text>
 	</view>
 	<view class="flex flex-justify text-sm" style="margin-top:2rpx" wx:if="{{item.proxySellerSettleType==0}}" >
 		<text class="text-gray">代卖费单价 x 净重</text>
@@ -45,7 +45,7 @@
 	<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>
+			<text style="">{{formate.formateAmount(item.unSettleMoney)}}元</text>
 		</view>
 		<view class="flex flex-justify text-xs" style="margin-top:2rpx" wx:if="{{item.proxySellerSettleType==1}}">
 			<text class="text-gray">单价 x 结算重量 - 首笔应收金额</text>
@@ -62,10 +62,9 @@
 		<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>
-			<text style="color:#F5222D">-{{formate.formateAmount(item.adjustMoney)}}元</text>
+			<text style="">-{{formate.formateAmount(item.adjustMoney)}}元</text>
 		</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}}">
+		<view class="flex flex-justify text-sg" style="margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:24rpx">
 			<text class="text-black">补贴与扣款</text>
 			<text style="color:#F5222D">{{formate.formateAmount(item.totalOtherAmount==null?0:item.totalOtherAmount)}}元</text>
 		</view>
@@ -94,7 +93,7 @@
 	</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.surcharge) || 0}}元</text>
+		<text style="">{{formate.formateAmount(item.surcharge) || 0}}元</text>
 	</view>
 	<view class="flex flex-justify text-xs" style="margin-top:2rpx"  wx:if="{{item.proxySellerSettleType==1}}">
 		<text class="text-gray">代卖费单价 x 结算重量</text>
@@ -109,12 +108,12 @@
 	<view class="flex flex-justify text-sg" style="margin-top:20rpx;border-top:2rpx solid #f3f3f3;padding-top:16rpx"
 		wx:if="{{item.adjustMoney && item.adjustMoney}}">
 		<text class="text-black">调节费</text>
-		<text style="color:#F5222D">{{item.adjustMoney > 0 ? '+' : ''}}{{formate.formateAmount(item.adjustMoney)}}元</text>
+		<text style="">{{item.adjustMoney > 0 ? '+' : ''}}{{formate.formateAmount(item.adjustMoney)}}元</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 && item.adjustMoney}}">
 		<text class="text-black">补贴与扣款</text>
-		<text style="color:#F5222D">{{formate.formateAmount(item.totalOtherAmount==null?0:item.totalOtherAmount)}}元</text>
+		<text style="">{{formate.formateAmount(item.totalOtherAmount==null?0:item.totalOtherAmount)}}元</text>
 	</view>
 	<view class="flex flex-justify text-sg" style="margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:20rpx">
 		<text class="text-black text-bold">总收款金额：</text>
diff --git a/pages/agent/detail/pound-info/pound-info.wxml b/pages/agent/detail/pound-info/pound-info.wxml
index e36d968..258a7cb 100644
--- a/pages/agent/detail/pound-info/pound-info.wxml
+++ b/pages/agent/detail/pound-info/pound-info.wxml
@@ -30,11 +30,11 @@
       <wux-accordion>
         <view slot="header" class="flex flex-justify" style="width: 100%">
           <view class="flex">
-            <text class="text-sg text-black text-bold" style="margin-left: -32rpx">补贴与扣款</text>
+            <text class="text-sg text-black" style="margin-left: -32rpx">补贴与扣款</text>
           </view>
           <view class="text-df text-gray" style="padding-right:16rpx;">{{formate.formateAmount(item.totalOtherAmount==null?0:item.totalOtherAmount)}}元</view>
         </view>
-        <view class="flex flex-justify text-sg" wx:for="{{ item.otherAmountDtoList }}" wx:for-item="cell" wx:for-index="cellIndex" wx:key="cellIndex" style="margin-top:{{cellIndex==0?0:20}}px;font-size:30rpx">
+        <view class="flex flex-justify text-sg" wx:for="{{ item.otherAmountDtoList }}" wx:for-item="cell" wx:for-index="cellIndex" wx:key="cellIndex" style="margin-top:{{cellIndex==0?0:20}}px;font-size:28rpx">
           <text class="text-black">{{cell.title}}</text>
           <text class="text-gray">{{formate.formateAmount(cell.amount==null?0:item.amount)}}元</text>
         </view>
@@ -50,10 +50,10 @@
       </wux-accordion>
     </wux-accordion-group>
   </view>
-  <view class="flex flex-justify text-sg" style="margin-top:20rpx">
+  <!-- <view class="flex flex-justify text-sg" style="margin-top:20rpx">
     <text class="text-black">调节费</text>
     <text class="text-gray">{{item.adjustMoney > 0 ? '+' : ''}}{{formate.formateAmount(item.adjustMoney)}}元</text>
-  </view>
+  </view> -->
   <view class="flex flex-justify text-sg" style="margin-top:20rpx">
     <text class="text-black">磅单图片</text>
   </view>