From 29658de29b2eb5292bf0c2fad7427b374b769ebc Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 10 五月 2023 20:29:31 +0800
Subject: [PATCH] 样式修改,引入字体,修改逻辑

---
 pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue |   34 +++++++++-------------------------
 1 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue b/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
index 6af93fb..786fab1 100644
--- a/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
+++ b/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
@@ -26,6 +26,7 @@
 				</view>
 				<view class="filter-condition"></view>
 				<view class="date-information">
+					<u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" textSize="30" iconSize="1000" v-if="filterList.length == 0"></u-empty>
 					<view class="statistics-card" v-for="(item, index) in filterList" :key="index">
 						<view class="card-top">
 							<view class="left"><combined-title :title="item.condition"></combined-title></view>
@@ -218,6 +219,8 @@
 			},
 			first: '',
 			last: '',
+			firstFilter: '',
+			lastFilter: '',
 			taskList: [],
 			filterList: [],
 			totalLength: 0,
@@ -242,7 +245,7 @@
 			// 鐐瑰嚮鍙崇澶磋鎯呭脊绐�
 			faYunDetailobj: {},
 			modalShow: false,
-			coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅鍦�', '鍑虹叅浠�']
+			coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅浠�', '鍑虹叅浠�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠', '杩涘叆鍦洪櫌']
 		};
 	},
 	onShow() {
@@ -258,6 +261,7 @@
 			let d = '01';
 			m = m < 10 ? '0' + m : m; //鏈堜唤琛� 0
 			this.first = [y, m, d].join('-');
+			this.firstFilter = [y, m, d].join('-');
 		},
 		lastDate() {
 			let y = new Date().getFullYear(); //鑾峰彇骞翠唤
@@ -266,6 +270,7 @@
 			m = m < 10 ? '0' + m : m; //鏈堜唤琛� 0
 			d = d < 10 ? '0' + d : d; //鏃ユ暟琛� 0
 			this.last = [y, m, d].join('-');
+			this.lastFilter = [y, m, d].join('-');
 		},
 		// 绛涢�夋潯浠�
 		getShipping() {
@@ -431,19 +436,8 @@
 		// 閲嶇疆绛涢��
 		resetCondition() {
 			this.conditinonShow = false;
-			this.filterList = this.taskList;
-			if (this.filterList.length != 0) {
-				this.totalLength = this.filterList.map(v => v.taskCoalList.length).reduce((x, y) => x + y);
-				this.totalTon = this.filterList.map(v =>
-					v.taskCoalList.reduce((prev, cur) => {
-						return cur.clean + prev;
-					}, 0)
-				);
-				this.totalTon = this.totalTon.reduce((x, y) => x + y);
-			} else {
-				this.totalLength = 0;
-				this.totalTon = 0;
-			}
+			this.first = this.dateRange.slice(0, 10);
+			this.last = this.dateRange.slice(11);
 			this.coalList.forEach(v => {
 				v.active = false;
 			});
@@ -560,7 +554,7 @@
 			return uni.getStorageSync('roleType');
 		},
 		dateRange() {
-			return `鏃ユ湡:${this.first}-${this.last}`;
+			return `${this.firstFilter}-${this.lastFilter}`;
 		},
 		dateselect() {
 			return `${this.first}-${this.last}`;
@@ -674,7 +668,6 @@
 						width: 100%;
 						height: vww(16);
 						font-size: 40rpx;
-						font-family: Source Han Sans CN;
 						font-weight: bold;
 						color: #3b56eb;
 						text-align: center;
@@ -683,7 +676,6 @@
 						width: 96rpx;
 						height: 24rpx;
 						font-size: 24rpx;
-						font-family: Source Han Sans CN;
 						font-weight: 400;
 						color: #333333;
 					}
@@ -693,7 +685,6 @@
 				width: 160rpx;
 				height: 38rpx;
 				font-size: 40rpx;
-				font-family: Adobe Heiti Std;
 				font-weight: normal;
 				color: #ffffff;
 				line-height: 69rpx;
@@ -724,7 +715,6 @@
 				width: 330rpx;
 				height: 40rpx;
 				font-size: 28rpx;
-				font-family: Source Han Sans CN;
 				font-weight: 400;
 				color: #494949;
 			}
@@ -751,13 +741,11 @@
 					@include flex;
 					.left {
 						font-size: 30rpx;
-						font-family: Microsoft YaHei;
 						font-weight: 400;
 						color: #494949;
 					}
 					.card-top_num {
 						font-size: 40rpx;
-						font-family: CTCuHeiSJ;
 						font-weight: 400;
 						color: #6074ee;
 					}
@@ -809,7 +797,6 @@
 						.point-number {
 							width: 20%;
 							font-size: 40rpx;
-							font-family: CTCuHeiSJ;
 							font-weight: 400;
 							color: #f81414;
 						}
@@ -824,7 +811,6 @@
 							flex-grow: 1;
 							height: 30rpx;
 							font-size: 30rpx;
-							font-family: Microsoft YaHei;
 							font-weight: 300;
 							color: #515151;
 							position: relative;
@@ -842,7 +828,6 @@
 								height: 30rpx;
 								line-height: 30rpx;
 								font-size: 30rpx;
-								font-family: Microsoft YaHei;
 								font-weight: 300;
 								color: #515151;
 							}
@@ -865,7 +850,6 @@
 						}
 						.carnum-text {
 							font-size: 28rpx;
-							font-family: Microsoft YaHei;
 							font-weight: 300;
 							color: #515151;
 						}

--
Gitblit v1.9.1