From 6b3661100088e13dd061bcf2aa16b8170f6760b6 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Thu, 17 Jun 2021 19:40:39 +0800
Subject: [PATCH] no message

---
 api/saas.js                            |  2 +-
 xtends/statics/agent-report/index.js   | 18 +++++++++---------
 xtends/statics/agent-report/index.wxml | 10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/api/saas.js b/api/saas.js
index 6be3178..6a6f5ed 100644
--- a/api/saas.js
+++ b/api/saas.js
@@ -79,7 +79,7 @@ const repeatSideOrder = (params) => mPost(`/ztb-factory/renew/scrap-paper-offsit
 const getReceiptReport = (params) => mGet(`/ztb-factory/get/receipt-daily-report`, params, sconfig)
 const getSalesReport = (params) => mGet(`/ztb-factory/get/sales-daily-report`, params, sconfig)
 const getGrossReport = (params) => mGet(`/ztb-factory/get/gross-profit-daily-report`, params, sconfig)
-const getAgentReport = (params) => mGet(`/ztb-factory/get/gross-profit-daily-report`, params, sconfig)
+const getAgentReport = (params) => mGet(`/ztb-factory/get/agency-sales-profit-daily-report`, params, sconfig)
 
 export {
   sconfig,
diff --git a/xtends/statics/agent-report/index.js b/xtends/statics/agent-report/index.js
index f847390..23392ae 100644
--- a/xtends/statics/agent-report/index.js
+++ b/xtends/statics/agent-report/index.js
@@ -12,16 +12,16 @@ Scene({
     height: app.globalData.fragmentHeight,
     form: {},
     columns: [
-      { prop: 'datetime', width: 200, label: '品类', color: '#55C355' },
-      { prop: 'sign_in_time', width: 200, label: '结算重量(吨)' },
-      { prop: 'sign_out_time', width: 200, label: '实收金额(元)' },
-      { prop: 'work_hour', width: 150, label: '代卖费(元)' }
+      { prop: 'productCategoryName', width: 200, label: '品类', color: '#55C355' },
+      { prop: 'settleWeight', width: 200, label: '结算重量(吨)' },
+      { prop: 'paidPrice', width: 200, label: '实收金额(元)' },
+      { prop: 'proxyPaySurcharge', width: 150, label: '代卖费(元)' }
     ],
     reportInfo:{
-      productGrossProfitReportList: [],
-      totalGrossProfit: 0,
-      totalSalesPrice: 0,
-      totalReceiptPrice: 0
+      productAgencySalesReportList: [],
+      totalPaidPrice: 0,
+      totalProxyPaySurcharge: 0,
+      totalSettleWeight: 0
     },
     show: false
   },
@@ -67,7 +67,7 @@ Scene({
       if(result.data){
         this.setData({ reportInfo: result.data })
       } else {
-        this.setData({ reportInfo: { productGrossProfitReportList: [], totalGrossProfit: 0, totalSalesPrice: 0, totalReceiptPrice: 0 } })
+        this.setData({ reportInfo: { productAgencySalesReportList: [], totalPaidPrice: 0, totalProxyPaySurcharge: 0, totalSettleWeight: 0 } })
       }
       wx.hideLoading()
     }).catch(err => {
diff --git a/xtends/statics/agent-report/index.wxml b/xtends/statics/agent-report/index.wxml
index 541ca29..94207de 100644
--- a/xtends/statics/agent-report/index.wxml
+++ b/xtends/statics/agent-report/index.wxml
@@ -16,23 +16,23 @@
 </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.totalWeight || 0)}}</view>
+    <view class="text-xxl text-bold" style="color:#008AFF">{{formate.numberFormat(reportInfo.totalSettleWeight || 0)}}</view>
     <view class="text-black text-sm">代卖重量(吨)</view>
   </view>
-  <view style="width:300rpx;">
-    <view class="text-xxl text-bold" style="color:#008AFF">{{reportInfo.totalWeight || 0}}</view>
+  <view style="width:300rpx;">formateAmount
+    <view class="text-xxl text-bold" style="color:#008AFF">{{formate.formateAmount(reportInfo.totalPaidPrice || 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">{{reportInfo.totalWeight || 0}}</view>
+    <view class="text-xxl text-bold" style="color:#008AFF">{{formate.formateAmount(reportInfo.totalProxyPaySurcharge || 0)}}</view>
     <view class="text-black text-sm">代卖费(元)</view>
   </view>
   <view style="width:300rpx;">
   </view>
 </view>
-<van-table headers="{{columns}}" data="{{ data }}" height="{{ height }}" stripe="{{ true }}"/>
+<van-table headers="{{columns}}" data="{{ reportInfo.productAgencySalesReportList }}" height="{{ height }}" stripe="{{ true }}"/>
 
 <van-calendar show="{{ show }}" type="range" row-height="50" color="#008AFF" z-index="22" min-date="{{ minDate }}" max-date="{{ maxDate }}" default-date="{{ vdate }}" title="日期范围选择" show-subtitle="{{ false }}" show-confirm="{{ false }}" bind:close="onClose" bind:confirm="onSelect"/>
 <notification id="qn-notification"/>