From fa474653f4a76dae8b3e14cc8d4e99305b85ab18 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Thu, 17 Jun 2021 09:49:53 +0800
Subject: [PATCH] no message

---
 xtends/statics/agent-report/index.wxml    | 6 +++---
 xtends/statics/gross-report/index.wxml    | 6 +++---
 xtends/statics/purchase-report/index.wxml | 5 ++---
 xtends/statics/sale-report/index.wxml     | 2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/xtends/statics/agent-report/index.wxml b/xtends/statics/agent-report/index.wxml
index 80893d6..541ca29 100644
--- a/xtends/statics/agent-report/index.wxml
+++ b/xtends/statics/agent-report/index.wxml
@@ -16,17 +16,17 @@
 </view>
 <view class="bg-white flex" style="height:120rpx;padding-top:24rpx;">
   <view style="width:320rpx;padding-left:48rpx">
-    <view class="text-xxl text-bold" style="color:#008AFF">{{formate.formateWeight(totalInfo.totalWeight || 0)}}</view>
+    <view class="text-xxl text-bold" style="color:#008AFF">{{formate.formateWeight(reportInfo.totalWeight || 0)}}</view>
     <view class="text-black text-sm">代卖重量(吨)</view>
   </view>
   <view style="width:300rpx;">
-    <view class="text-xxl text-bold" style="color:#008AFF">{{formate.formateWeight(totalInfo.totalWeight || 0)}}</view>
+    <view class="text-xxl text-bold" style="color:#008AFF">{{reportInfo.totalWeight || 0}}</view>
     <view class="text-black text-sm">实收(元)</view>
   </view>
 </view>
 <view class="bg-white flex" style="height:120rpx;padding-top:8rpx">
   <view style="width:320rpx;padding-left:48rpx">
-    <view class="text-xxl text-bold" style="color:#008AFF">{{formate.formateWeight(totalInfo.totalWeight || 0)}}</view>
+    <view class="text-xxl text-bold" style="color:#008AFF">{{reportInfo.totalWeight || 0}}</view>
     <view class="text-black text-sm">代卖费(元)</view>
   </view>
   <view style="width:300rpx;">
diff --git a/xtends/statics/gross-report/index.wxml b/xtends/statics/gross-report/index.wxml
index 73d9348..7b632aa 100644
--- a/xtends/statics/gross-report/index.wxml
+++ b/xtends/statics/gross-report/index.wxml
@@ -16,17 +16,17 @@
 </view>
 <view class="bg-white flex" style="height:120rpx;padding-top:24rpx;">
   <view style="width:320rpx;padding-left:48rpx">
-    <view class="text-xxl text-bold" style="color:#008AFF">{{formate.formateWeight(reportInfo.totalSalesPrice || 0)}}</view>
+    <view class="text-xxl text-bold" style="color:#008AFF">{{formate.numberFormat(reportInfo.totalSalesPrice || 0)}}</view>
     <view class="text-black text-sm">总支出(元)</view>
   </view>
   <view style="width:300rpx;">
-    <view class="text-xxl text-bold" style="color:#008AFF">{{formate.formateWeight(reportInfo.totalReceiptPrice || 0)}}</view>
+    <view class="text-xxl text-bold" style="color:#008AFF">{{formate.numberFormat(reportInfo.totalReceiptPrice || 0)}}</view>
     <view class="text-black text-sm">总收入(元)</view>
   </view>
 </view>
 <view class="bg-white flex" style="height:120rpx;padding-top:8rpx">
   <view style="width:320rpx;padding-left:48rpx">
-    <view class="text-xxl text-bold" style="color:#008AFF">{{formate.formateWeight(reportInfo.totalGrossProfit || 0)}}</view>
+    <view class="text-xxl text-bold" style="color:#008AFF">{{formate.numberFormat(reportInfo.totalGrossProfit || 0)}}</view>
     <view class="text-black text-sm">总毛利(元)</view>
   </view>
   <view style="width:300rpx;">
diff --git a/xtends/statics/purchase-report/index.wxml b/xtends/statics/purchase-report/index.wxml
index d2e09ae..c26742f 100644
--- a/xtends/statics/purchase-report/index.wxml
+++ b/xtends/statics/purchase-report/index.wxml
@@ -1,5 +1,4 @@
 <!--xtends//statics/index/index.wxml-->
-<wxs module="formate" src="../../../pages/formate.wxs"></wxs>
 <cu-custom bgColor="bg-white" isBack="{{true}}">
   <view slot="content">收货报表</view>
 </cu-custom>
@@ -16,11 +15,11 @@
 </view>
 <view class="bg-white flex" style="height:140rpx;padding-top:24rpx;">
   <view style="width:320rpx;padding-left:48rpx">
-    <view class="text-xxl text-bold" style="color:#278CC8">{{formate.formateWeight(reportInfo.totalSettleWeight || 0)}}</view>
+    <view class="text-xxl text-bold" style="color:#278CC8">{{reportInfo.totalSettleWeight || 0}}</view>
     <view class="text-black text-sm">重量(公斤)</view>
   </view>
   <view style="width:300rpx;">
-    <view class="text-xxl text-bold" style="color:#278CC8">{{formate.formateWeight(reportInfo.totalSettlePrice || 0)}}</view>
+    <view class="text-xxl text-bold" style="color:#278CC8">{{reportInfo.totalSettlePrice || 0}}</view>
     <view class="text-black text-sm">合计金额(元)</view>
   </view>
 </view>
diff --git a/xtends/statics/sale-report/index.wxml b/xtends/statics/sale-report/index.wxml
index 922855a..c21108e 100644
--- a/xtends/statics/sale-report/index.wxml
+++ b/xtends/statics/sale-report/index.wxml
@@ -30,7 +30,7 @@
     <view class="text-black text-sm">出货车数(车)</view>
   </view>
   <view style="width:300rpx;">
-    <view class="text-xxl text-bold" style="color:#278CC8">{{formate.formateWeight(reportInfo.totalSettlePrice || 0)}}</view>
+    <view class="text-xxl text-bold" style="color:#278CC8">{{reportInfo.totalSettlePrice || 0}}</view>
     <view class="text-black text-sm">金额(元)</view>
   </view>
 </view>