From a12ac4f4388672c62c6fb59c5ef975e5dff5fc06 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 16 五月 2023 11:08:45 +0800
Subject: [PATCH] 修改部分问题

---
 pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue |   27 ++++++++++-----------------
 1 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
index 839572e..8ace7d0 100644
--- a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
+++ b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
@@ -7,11 +7,13 @@
 					<view class="top-title">鍙戣繍璁″垝璇︽儏</view>
 				</view>
 				<view class="middle-container">
-					<view class="dept-name">{{ deptName }}({{ coalName }})</view>
+					<view class="dept-name">
+						{{ deptName }}
+						<text v-show="deptName">({{ coalName }})</text>
+					</view>
 					<view class="dept-num">
 						<text
 							style="font-size: 46rpx;
-						font-family: CTCuHeiSJ;
 						font-weight: 400;
 						color: #FFFFFF;
 						text-shadow: 0rpx 4rpx 0rpx #1A66FE;"
@@ -20,7 +22,6 @@
 						</text>
 						<text
 							style="font-size: 24rpx;
-						font-family: Microsoft YaHei;
 						font-weight: 400;
 						color: #F81414;
 						text-shadow: 0rpx 4rpx 0rpx #1A66FE;"
@@ -56,7 +57,7 @@
 				</view>
 			</view>
 			<view class="block-top">
-				<combined-title title="鎻愮叅鍗曡鎯�"></combined-title>
+				<combined-title title="鎻愮叅鍗曞巻鍙�"></combined-title>
 				<view class="total">
 					鎬诲噣閲�
 					<text>{{ total || 0 }}</text>
@@ -66,7 +67,7 @@
 				<view class="empty-pointer" v-if="!yyDailyList">鏆傛棤鏇村鏁版嵁</view>
 				<view class="main-block">
 					<view class="main-container">
-						<view class="main-container_content" v-for="(item, index) in yyDailyList" :key="index" @click="showMore(index)">
+						<view class="main-container_content" v-for="(item, index) in yyDailyList" :key="index" @click="showMore(item)">
 							<view class="arrow-icon"><u-icon name="arrow-right" size="30" color="#999999"></u-icon></view>
 							<view class="divider"><u-divider></u-divider></view>
 							<view class="first-line">
@@ -111,7 +112,7 @@
 			orderPlanId: null,
 			orderCode: null,
 			orderPlanDetail: {},
-			coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅鍦�', '鍑虹叅浠�'],
+			coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅浠�', '鍑虹叅浠�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠', '杩涘叆鍦洪櫌'],
 			yyDailyList: [],
 			// 棰嗗彇鏁伴噺
 			cars2: '',
@@ -129,9 +130,9 @@
 				delta: 1
 			});
 		},
-		showMore(index) {
+		showMore(item) {
 			uni.navigateTo({
-				url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore?orderPlanId=${this.orderPlanId}&index=${index}`
+				url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore?orderPlanId=${this.orderPlanId}&id=${item.id}`
 			});
 		},
 		init() {
@@ -203,7 +204,6 @@
 				width: 226rpx;
 				height: 36rpx;
 				font-size: 38rpx;
-				font-family: Adobe Heiti Std;
 				font-weight: normal;
 				color: #fff;
 				line-height: 69rpx;
@@ -217,8 +217,8 @@
 			position: relative;
 			top: vww(54);
 			.dept-name {
+				min-width: 100rpx;
 				font-size: 32rpx;
-				font-family: Adobe Heiti Std;
 				font-weight: normal;
 				color: #ffffff;
 				line-height: 69rpx;
@@ -248,7 +248,6 @@
 					.forward-name,
 					.fleet-name {
 						font-size: 28rpx;
-						font-family: Adobe Heiti Std;
 						font-weight: normal;
 						color: #757575;
 						line-height: 69rpx;
@@ -256,7 +255,6 @@
 					.forward-num,
 					.fleet-num {
 						font-size: 40rpx;
-						font-family: Microsoft YaHei;
 						font-weight: 400;
 						color: #303030;
 						line-height: 69rpx;
@@ -276,7 +274,6 @@
 			height: 30rpx;
 			line-height: vww(15);
 			font-size: 28rpx;
-			font-family: Adobe Heiti Std;
 			font-weight: normal;
 			color: #757575;
 			text {
@@ -284,7 +281,6 @@
 				height: 30rpx;
 				line-height: vww(15);
 				font-size: 40rpx;
-				font-family: CTCuHeiSJ;
 				font-weight: 400;
 				color: #f81414;
 			}
@@ -335,7 +331,6 @@
 						.car-num {
 							height: 31rpx;
 							font-size: 30rpx;
-							font-family: Microsoft YaHei;
 							font-weight: 300;
 							color: #303030;
 						}
@@ -360,7 +355,6 @@
 								height: 29rpx;
 								line-height: 29rpx;
 								font-size: 28rpx;
-								font-family: PingFang SC;
 								font-weight: 400;
 								color: #919090;
 							}
@@ -368,7 +362,6 @@
 								height: 29rpx;
 								line-height: 29rpx;
 								font-size: 38rpx;
-								font-family: PingFang SC;
 								font-weight: 400;
 								color: #035cfb;
 							}

--
Gitblit v1.9.1