From 7c7867be057a7e66dd75bebfb4c6ae11db254362 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Wed, 13 Jul 2022 21:38:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=BB=9F=E8=AE=A1=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/request.js                |  8 +++++
 pages/index/index-home.vue          | 46 ++++++++++++++++++-----------
 pages/order-manage/order-manage.vue | 16 ++++++++--
 3 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/common/js/request.js b/common/js/request.js
index e918ea0..22fa04e 100644
--- a/common/js/request.js
+++ b/common/js/request.js
@@ -524,5 +524,13 @@ export default {
 			data: params
 		})
 		return res[1].data;
+	},
+	async orderStatistics(params = {}) {
+		let res = await uni.request({
+			url: '/order/app/statistics',
+			method: 'POST',
+			data: params
+		})
+		return res[1].data;
 	}
 }
diff --git a/pages/index/index-home.vue b/pages/index/index-home.vue
index 1135733..4c0ac3b 100644
--- a/pages/index/index-home.vue
+++ b/pages/index/index-home.vue
@@ -21,11 +21,11 @@
 			<!-- 未预约，未派单，上门超时 -->
 			<view class="cu-list grid no-border col-3 margin-top-sm" style="background-color: inherit;">
 				<view class="cu-item">
-					<view class="margin-bottom-xs text-xxl">0</view>
-					<view>未预约</view>
+					<view class="margin-bottom-xs text-xxl">{{orderStatistics.newOrderNum}}</view>
+					<view>新订单</view>
 				</view>
 				<view class="cu-item">
-					<view class="margin-bottom-xs text-xxl">0</view>
+					<view class="margin-bottom-xs text-xxl">{{orderStatistics.planOrderNum}}</view>
 					<view>未排单</view>
 				</view>
 				<view class="cu-item">
@@ -49,23 +49,26 @@
 						<text>即将上门订单</text>
 						<text class="cuIcon-right"></text>
 					</view>
-				</view>
-				<!-- 轮播 -->
-				<swiper v-if="curUserInfo && curUserInfo.workerId" class="screen-swiper" :autoplay="true" :circular="true">
-					<swiper-item v-for="(item,index) in waitServOrderToday" :key="index">
-						<view class="padding-sm">
-							<view class="flex justify-between align-center margin-bottom-xs">
-								<view class="text-lg">{{item.goodsName}}</view>
+				</view>
+				<view v-if="!curUserInfo || !curUserInfo.workerId" class="screen-swiper padding text-center">
+					未登录
+				</view>
+				<!-- 轮播 -->
+				<swiper v-else-if="waitServOrderToday && waitServOrderToday.length" class="screen-swiper" :autoplay="true" :circular="true">
+					<swiper-item v-for="(item,index) in waitServOrderToday" :key="index">
+						<view class="padding-sm">
+							<view class="flex justify-between align-center margin-bottom-xs">
+								<view class="text-lg">{{item.goodsName}}</view>
 							</view>
 							<view>
 								时间：<text class="text-red">{{item.expectTimeStart + ' - ' + item.expectTimeEnd}}</text>
-							</view>
-							<view>地址：{{item.address}}</view>
-						</view>
-					</swiper-item>
+							</view>
+							<view>地址：{{item.address}}</view>
+						</view>
+					</swiper-item>
 				</swiper>
-				<view v-else class="screen-swiper padding text-center">
-					未登录
+				<view v-else class="screen-swiper padding text-center text-gray">
+					今日无待上门订单
 				</view>
 			</view>
 			<!-- 每周公告 -->
@@ -152,7 +155,8 @@
 				}],
 				curUserInfo: {},
 				myInfo: {},
-				waitServOrderToday: [],
+				waitServOrderToday: [],
+				orderStatistics: {},
 				isShowSteer: false,
 				isAuthWxLoginModal: false,
 				isAuthWxPhoneModal: false,
@@ -207,7 +211,9 @@
 				}
 				this.servModules = newServModules;
 				// 获取今日待上门单
-				this.loadTodayWaitServOrder();
+				this.loadTodayWaitServOrder();
+				// 订单统计
+				this.loadOrderStatistics();
 			},
 			async loadTodayWaitServOrder() {
 				let date = new Date();
@@ -217,6 +223,10 @@
 					expectTimeEnd: date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() + " 23:59:59"
 				});
 				this.waitServOrderToday = waitServRes.rows;
+			},
+			async loadOrderStatistics() {
+				let res = await this.$request.orderStatistics();
+				this.orderStatistics = res.data;
 			},
 			async chooseEntryType(typeCode) {
 				let status = 1;
diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue
index 85ccd34..65fc0c9 100644
--- a/pages/order-manage/order-manage.vue
+++ b/pages/order-manage/order-manage.vue
@@ -39,7 +39,8 @@
 			<view class="cu-list grid no-border col-5 padding-top-sm bg-white">
 				<view class="cu-item" :class="index==stateCur?'bg-main-color light cur':''" v-for="(item,index) in stateList" :key="index" :data-id="index" @tap="statusSelect">
 					<view class="margin-bottom-xs">{{item.name}}</view>
-					<view>(0)</view>
+					<view v-if="item.code === 0">({{orderStatistics.newOrderNum}})</view>
+					<view v-else>(0)</view>
 				</view>
 				<!-- <view class="cu-item" :class="stateCur === 0 ? 'bg-main-color light' : ''" :data-id="0" @tap="statusSelect">
 					<view class="margin-bottom-xs">超时单</view>
@@ -331,7 +332,8 @@
 				ifShowPageMeta: false,
 				picModalImgList: [],
 				curDate: '',
-				curUserInfo: {}
+				curUserInfo: {},
+				orderStatistics: {}
 			}
 		},
 		onLoad() {
@@ -366,7 +368,9 @@
 				this.loadCategoryList();
 				this.loadRegionList();
 				// 初始化指派成员
-				this.loadTeamMembers();
+				this.loadTeamMembers();
+				// 订单统计
+				this.loadOrderStatistics();
 			},
 			reloadMasterOrderPage(params = {}) {
 				// this.pageParams = [];
@@ -379,6 +383,8 @@
 				this.orderList = [];
 				this.$refs.loadStatusBar.showLoadMore();
 				this.loadMasterOrderPage();
+				// 订单统计
+				this.loadOrderStatistics();
 			},
 			async loadMasterOrderPage(params = {}) {
 				params.pageSize = this.$globalData.initPageSize;
@@ -464,6 +470,10 @@
 				});
 				this.myTeamMembers = res.rows;
 			},
+			async loadOrderStatistics() {
+				let res = await this.$request.orderStatistics();
+				this.orderStatistics = res.data;
+			},
 			bindEvent() {
 				uni.$on(this.$globalFun.HIDE_MODAL, this.hideModal);
 			},