From 25dfe869f07d196a718d07af2313069568f7162e Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Thu, 17 Oct 2024 10:40:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E6=B1=87=E6=80=BB=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 http/yskApi/requestAll.js                |  2 +-
 pageSalesSummary/index.vue               | 31 ++++++++++++------------
 pageSalesSummary/productSalesRanking.vue | 19 +++++++++------
 3 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/http/yskApi/requestAll.js b/http/yskApi/requestAll.js
index 38d23ab..e24e07c 100644
--- a/http/yskApi/requestAll.js
+++ b/http/yskApi/requestAll.js
@@ -77,7 +77,7 @@ export function tbConsInfoFlowfrmLoss(data) {
 // 销售排行榜
 export function dateProduct(params) {
 	return request({
-		url: '/api/summary/dateProduct',
+		url: '/api/summary/productSaleDate',
 		method: 'get',
 		params
 	})
diff --git a/pageSalesSummary/index.vue b/pageSalesSummary/index.vue
index e52bffa..5396766 100644
--- a/pageSalesSummary/index.vue
+++ b/pageSalesSummary/index.vue
@@ -69,11 +69,11 @@
 				</tr>
 			</thead>
 			<tbody>
-				<tr v-for="item in tableList" :key="item.productId">
-					<td>{{item.productId}}</td>
+				<tr v-for="(item,index) in tableList" :key="item.productId">
+					<td>{{++index}}</td>
 					<td>{{item.productName}}</td>
-					<td>{{item.productNum}}</td>
-					<td>{{item.amount}}</td>
+					<td>{{item.num}}</td>
+					<td>{{item.salesAmount}}</td>
 				</tr>
 			</tbody>
 		</table>
@@ -121,9 +121,12 @@
 	let list = ref([])
 	const currentInstance = getCurrentInstance()
 	let tableList = ref([])
+	let day = ref(1)
 
 	function toUrl() {
-		go.to('PAGES_PRODUCT_SALES_RANKING')
+		go.to('PAGES_PRODUCT_SALES_RANKING', {
+			day: day.value
+		})
 	}
 
 	function getlist(start, end) {
@@ -175,26 +178,24 @@
 
 	// 获取表格数据
 	function gettableData() {
-		let day = 1;
 		if (selected.value == 'today') {
-			day = 1
+			day.value = 1
 		} else if (selected.value == 'yesterday') {
-			day = 1
+			day.value = 1
 		} else if (selected.value == 'circumference') {
-			day = 7
+			day.value = 7
 		} else if (selected.value == 'moon') {
-			day = 30
+			day.value = 30
 		} else if (selected.value == 'custom') {
-			day = 30
+			day.value = 30
 		}
 		dateProduct({
 			shopId: uni.getStorageSync('shopId'),
-			day,
+			day: day.value,
 			page: 1,
 			size: 5
 		}).then((res) => {
-			// console.log(res, 'toapjso1')
-			tableList.value = res.totalProduct
+			tableList.value = res.productList.content
 		})
 
 	}
@@ -255,7 +256,7 @@
 
 		.time-selected {
 			color: #318afe;
-			font-size: 32rpx!important;
+			font-size: 32rpx !important;
 		}
 	}
 
diff --git a/pageSalesSummary/productSalesRanking.vue b/pageSalesSummary/productSalesRanking.vue
index 8168838..6b2b5d8 100644
--- a/pageSalesSummary/productSalesRanking.vue
+++ b/pageSalesSummary/productSalesRanking.vue
@@ -10,11 +10,11 @@
 				</tr>
 			</thead>
 			<tbody>
-				<tr v-for="item in tableList" :key="item.productId">
-					<td>{{item.productId}}</td>
+				<tr v-for="(item,index) in tableList" :key="item.productId">
+					<td>{{++index}}</td>
 					<td>{{item.productName}}</td>
-					<td>{{item.productNum}}</td>
-					<td>{{item.amount}}</td>
+					<td>{{item.num}}</td>
+					<td>{{item.salesAmount}}</td>
 				</tr>
 			</tbody>
 		</table>
@@ -31,6 +31,11 @@
 		dateProduct
 	} from '@/http/yskApi/requestAll.js';
 	let tableList = ref([])
+	let props = defineProps({
+		day: {
+			type: Number
+		}
+	})
 	onMounted(() => {
 		gettableData()
 	})
@@ -38,11 +43,11 @@
 	function gettableData() {
 		dateProduct({
 			shopId: uni.getStorageSync('shopId'),
-			day: 30,
-			page: 1,
+			day: props.day,
+			page: 0,
 			size: 50
 		}).then((res) => {
-			tableList.value = res.totalProduct
+			tableList.value = res.productList.content
 		})
 
 	}