From f612ac80e746d436471804d9d2cd01a05853cc6c Mon Sep 17 00:00:00 2001
From: zzy <411037547@qq.com>
Date: Fri, 14 Apr 2023 10:51:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=AF=8F=E6=97=A5=E8=90=A5?=
 =?UTF-8?q?=E6=94=B6=E6=8E=A8=E9=80=81BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/everdayRenven/AnhuiIndex.vue              |  6 ------
 .../components/anhuiYestodayRevenueData.js      | 17 ++++++++++++++---
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/pages/everdayRenven/AnhuiIndex.vue b/pages/everdayRenven/AnhuiIndex.vue
index 6e8e867..a54942d 100644
--- a/pages/everdayRenven/AnhuiIndex.vue
+++ b/pages/everdayRenven/AnhuiIndex.vue
@@ -455,12 +455,6 @@
 				let _this = this
 				const [reginList, totalData, busniessTypePie, busniessTradePie, busniessAreaPie, bayonetPie] =
 					await anhuiYestodayRevenueData.getData(this.theRequest) // 获取实时数据
-        console.log('reginList',reginList)
-        console.log('totalData',totalData)
-        console.log('busniessTypePie',busniessTypePie)
-        console.log('busniessTradePie',busniessTradePie)
-        console.log('busniessAreaPie',busniessAreaPie)
-        console.log('bayonetPie',bayonetPie)
 
 				if (this.theRequest.GroupType !== 1010) {
 					this.regionList = reginList // 营收上传列表 reginListModel[]
diff --git a/pages/everdayRenven/components/anhuiYestodayRevenueData.js b/pages/everdayRenven/components/anhuiYestodayRevenueData.js
index eee7ea3..5585925 100644
--- a/pages/everdayRenven/components/anhuiYestodayRevenueData.js
+++ b/pages/everdayRenven/components/anhuiYestodayRevenueData.js
@@ -20,10 +20,17 @@ const methods = {
 			Statistics_Month: obj.month ,
 			Province_Code: obj.ProvinceCode ,
 			pushProvinceCode: obj.ProvinceCode ,
-			Serverpart_ID: obj.ServerpartIds ? obj.ServerpartIds : '',
+			Serverpart_ID: obj.GroupType != 1020 ? obj.ServerpartIds : '',
 			SPRegionType_ID: obj.GroupType == 1020 ? obj.ServerpartIds : '',
 			// Revenue_Include: 1
 		}
+		const requestParamasBudget = {
+			Statistics_Date: obj.time ,
+			Statistics_Month: obj.month ,
+			Province_Code: obj.ProvinceCode ,
+			pushProvinceCode: obj.ProvinceCode ,
+			Serverpart_ID: obj.ServerpartIds ? obj.ServerpartIds : ''
+		}
 		this.provinceCode = obj.ProvinceCode 
 		// 营收数据
 		const data = await request.$webGet('CommercialApi/Revenue/GetRevenuePushList', requestParamas)
@@ -38,13 +45,17 @@ const methods = {
 		if (tradeData.Result_Code != 100) return
 
 		// 计划营收金额 
-		const budgetAmount = await request.$webGet('CommercialApi/Revenue/GetBudgetExpenseList', requestParamas)
+		const budgetAmount = await request.$webGet('CommercialApi/Revenue/GetBudgetExpenseList', requestParamasBudget)
 		if (budgetAmount.Result_Code != 100) return
 		
 		// 移动支付分账数据 
 		const mobileShare = await request.$webGet('CommercialApi/Revenue/GetMobileShare', requestParamas)
 		if (mobileShare.Result_Code != 100) return
 
+		// 万佳商城配送数据 
+		const mallDeliver = await request.$webGet('CommercialApi/Revenue/GetMallDeliver', requestParamas)
+		if (mallDeliver.Result_Code != 100) return
+
 		// 片区车流量
 		const bayonetCount = await request.$webGet('CommercialApi/Revenue/GetSPBayonetList', requestParamas)
 		if (bayonetCount.Result_Code != 100) return
@@ -55,7 +66,7 @@ const methods = {
 		}
 		return _this.getReginList(data.Result_Data.List, busniessCounts.Result_Data.List,
 			tradeData.Result_Data.List, budgetAmount.Result_Data.List,
-			bayonetCount.Result_Data.List, mobileShare.Result_Data)
+			bayonetCount.Result_Data.List, mobileShare.Result_Data, mallDeliver.Result_Data)
 		 // [reginList, totalData, busniessTypePie, busniessTradePie]
 
 	},