From b7b9d046889e38ba97d649698f654fe5d113ef22 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Wed, 28 Apr 2021 16:12:42 +0800
Subject: [PATCH] no message

---
 pages/agent/agent-item/index.wxml             |  2 +-
 .../order-detail/item-money-info/index.wxml   | 27 +++++++++----------
 .../agent/order-detail/pound-info/index.wxml  |  8 +++---
 .../order-detail/reserve-info/index.wxml      |  4 +--
 pages/formate.wxs                             |  2 +-
 5 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/pages/agent/agent-item/index.wxml b/pages/agent/agent-item/index.wxml
index 89eca74..5545ef6 100644
--- a/pages/agent/agent-item/index.wxml
+++ b/pages/agent/agent-item/index.wxml
@@ -9,7 +9,7 @@
 		<view class="text-xs text-gray" style="margin-top:4rpx">
 			<text>{{item.locProvinceName + item.locCityName + item.locDistrictName}}</text>
 			<text class="text-gray" style="margin: 0rpx 8rpx" wx:if="{{item.cumulativeWeight > 0}}">|</text>
-			<text wx:if="{{item.cumulativeWeight > 0}}">已代卖：{{formate.formateWeight(item.cumulativeWeight)}}</text>
+			<text wx:if="{{item.cumulativeWeight > 0}}">已代卖：{{formate.formateWeight(item.cumulativeWeight)}}吨</text>
 			<text class="text-gray" style="margin: 0rpx 8rpx">|</text>
 			<text wx:if="{{item.yesterdayTotalQuantity && item.yesterdayTotalQuantity >= 0}}">昨日排队：{{item.yesterdayTotalQuantity}}辆</text>
 			<text wx:else>昨日排队：--</text>
diff --git a/pages/agent/order-detail/item-money-info/index.wxml b/pages/agent/order-detail/item-money-info/index.wxml
index 0cabb34..9107c9d 100644
--- a/pages/agent/order-detail/item-money-info/index.wxml
+++ b/pages/agent/order-detail/item-money-info/index.wxml
@@ -10,8 +10,7 @@
 	</view>
 	<view class="flex flex-justify text-sm" 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 class="text-gray">{{formate.formatePrice(item.unitPrice)}}元/吨 x {{formate.formateWeight(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>
@@ -28,8 +27,8 @@
 	</view>
 	<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>
+		<view class="text-gray">{{formate.formatePrice(item.unitSurcharge)}}元/吨 x
+			{{formate.formateWeight(item.weightnoteInfo.netWeight)}}吨</view>
 	</view>
 	<view class="flex text-sg"
 		style="justify-content: flex-end;margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:24rpx">
@@ -47,14 +46,14 @@
 		</view>
 		<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)}} -
+			<view class="text-gray">{{formate.formatePrice(item.unitPrice)}}元/吨 x
+				{{formate.formateWeight(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)}} -
+			<view class="text-gray">{{formate.formatePrice(item.unitPrice)}}元/吨 x
+				{{formate.formateWeight(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"
@@ -81,8 +80,8 @@
 	</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.weightnoteInfo.settleUtiPrice)}} x
-			{{formate.formateWeight(item.weightnoteInfo.settleWeight)}}</view>
+		<view class="text-gray">{{formate.formatePrice(item.weightnoteInfo.settleUtiPrice)}}元/吨 x
+			{{formate.formateWeight(item.weightnoteInfo.settleWeight)}}吨</view>
 	</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>
@@ -90,13 +89,13 @@
 	</view>
 	<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.unitSurcharge==null?0:item.unitSurcharge)}} x
-			{{formate.formateWeight(item.weightnoteInfo.settleWeight)}}</view>
+		<view class="text-gray">{{formate.formatePrice(item.unitSurcharge==null?0:item.unitSurcharge)}}元/吨 x
+			{{formate.formateWeight(item.weightnoteInfo.settleWeight)}}吨</view>
 	</view>
 	<view class="flex flex-justify text-xs" style="margin-top:2rpx" wx:elif="{{item.proxySellerSettleType==0}}">
 		<text class="text-gray">代卖费单价 x 净重</text>
-		<view class="text-gray">{{formate.formatePrice2(item.unitSurcharge)}} x
-			{{formate.formateWeight(item.weightnoteInfo.netWeight)}}</view>
+		<view class="text-gray">{{formate.formatePrice(item.unitSurcharge)}}元/吨 x
+			{{formate.formateWeight(item.weightnoteInfo.netWeight)}}吨</view>
 	</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}}">
diff --git a/pages/agent/order-detail/pound-info/index.wxml b/pages/agent/order-detail/pound-info/index.wxml
index d575761..b84fcbc 100644
--- a/pages/agent/order-detail/pound-info/index.wxml
+++ b/pages/agent/order-detail/pound-info/index.wxml
@@ -6,15 +6,15 @@
   style="padding: 24rpx 30rpx">
   <view class="flex flex-justify text-sg">
     <text class="text-black">结算单价</text>
-    <text class="text-gray">{{formate.formatePrice2(item.weightnoteInfo.settleUtiPrice)}}</text>
+    <text class="text-gray">{{formate.formatePrice(item.weightnoteInfo.settleUtiPrice)}}元/吨</text>
   </view>
   <view class="flex flex-justify text-sg" style="margin-top:20rpx">
     <text class="text-black">净重</text>
-    <text class="text-gray">{{formate.formateWeight(item.weightnoteInfo.netWeight)}}</text>
+    <text class="text-gray">{{formate.formateWeight(item.weightnoteInfo.netWeight)}}吨</text>
   </view>
   <view class="flex flex-justify text-sg" style="margin-top:20rpx" wx:if="{{item.weightnoteInfo.settleWeight}}">
     <text class="text-black">结算重量</text>
-    <text class="text-gray">{{formate.formateWeight(item.weightnoteInfo.settleWeight)}}</text>
+    <text class="text-gray">{{formate.formateWeight(item.weightnoteInfo.settleWeight)}}吨</text>
   </view>
   <view class="flex flex-justify text-sg" style="margin-top:20rpx" wx:if="{{item.weightnoteInfo.deductedPoint}}">
     <text class="text-black">扣点</text>
@@ -22,7 +22,7 @@
   </view>
   <view class="flex flex-justify text-sg" style="margin-top:20rpx">
     <text class="text-black">代卖费</text>
-    <text class="text-gray">{{formate.formatePrice2(item.unitSurcharge==null?0:item.unitSurcharge)}}</text>
+    <text class="text-gray">{{formate.formatePrice(item.unitSurcharge==null?0:item.unitSurcharge)}}元/吨</text>
   </view>
   <view class="flex flex-justify text-sg" style="margin-top:20rpx">
     <text class="text-black">调节费</text>
diff --git a/pages/agent/order-detail/reserve-info/index.wxml b/pages/agent/order-detail/reserve-info/index.wxml
index b2fed53..6f6c943 100644
--- a/pages/agent/order-detail/reserve-info/index.wxml
+++ b/pages/agent/order-detail/reserve-info/index.wxml
@@ -13,11 +13,11 @@
 			</view>
 			<view class="flex flex-justify text-sg" style="margin-top:20rpx">
 				<text class="text-black">预估单价</text>
-				<text class="text-gray">{{formate.formatePrice2(orderInfo.paperCategoryPrice)}}</text>
+				<text class="text-gray">{{formate.formatePrice(orderInfo.paperCategoryPrice)}}元/吨</text>
 			</view>
 			<view class="flex flex-justify text-sg" style="margin-top:20rpx">
 				<text class="text-black">预计重量</text>
-				<text class="text-gray">{{formate.formateWeight(orderInfo.totalEstimatedWeight)}}</text>
+				<text class="text-gray">{{formate.formateWeight(orderInfo.totalEstimatedWeight)}}吨</text>
 			</view>
 			<!-- <view class="flex flex-justify text-sg" style="margin-top:20rpx">
 				<text class="text-black">货车数量</text>
diff --git a/pages/formate.wxs b/pages/formate.wxs
index 38b58c3..934e432 100644
--- a/pages/formate.wxs
+++ b/pages/formate.wxs
@@ -63,7 +63,7 @@ function formateAmount(amount, fix) {
 }
 
 function formateWeight(weight) {
-  return (parseFloat(weight) / 1000).toFixed(2)
+  return (parseFloat(weight) / 1000).toFixed(1)
 }
 
 function formatePrice(weight) {