From dbc79ab43fced444933174bd4148ee9f5dd777c3 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期五, 12 七月 2024 14:20:39 +0800
Subject: [PATCH] fix:修改测试问题

---
 pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
index 4ba85a4..2250520 100644
--- a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
+++ b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
@@ -22,9 +22,9 @@
 							<view class="sign">瑁�</view>
 							<view class="filedname exceedHide">
 								<text
-									v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.deptName }}</text>
+									v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '澶栭攢閫�'|| item.orderType == '杞嚭'">{{ item.deptName }}</text>
 								<text
-									v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.customerName }}</text>
+									v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘'|| item.orderType == '澶栬喘閫�' || item.orderType == '杞叆'">{{ item.customerName }}</text>
 							</view>
 						</view>
 						<view class="main-divider"></view>
@@ -38,9 +38,9 @@
 							<view class="sign">鍗�</view>
 							<view class="filedname exceedHide">
 								<text
-									v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.customerName }}</text>
+									v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'|| item.orderType == '澶栭攢閫�' || item.orderType == '杞嚭'">{{ item.customerName }}</text>
 								<text
-									v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.deptName }}</text>
+									v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘'|| item.orderType == '澶栬喘閫�' || item.orderType == '杞叆'">{{ item.deptName }}</text>
 							</view>
 						</view>
 					</view>
@@ -51,6 +51,9 @@
 							<view class="coal-type"
 								v-if="item.orderType">{{ item.orderType }}</view>
 						</view>
+					</view>
+					<view class="second-line">
+						{{item.orderCode}}
 					</view>
 					<view class="third-line">
 						<view class="time-icon">
@@ -72,7 +75,7 @@
 				<u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" textSize="30" iconSize="1000" v-if="orderPlanData.length == 0"></u-empty>
 			</view> -->
 			<view class="history-numbers">
-				<combined-title title="鍘嗗彶鎻愮叅鍗�"></combined-title>
+				<combined-title title="鍘嗗彶鏀跺彂鍗�"></combined-title>
 				<scroll-view :scroll-top="scrollTop"
 					scroll-y="true"
 					class="scroll-Y"
@@ -108,7 +111,7 @@
 								<view class="third-line_num">{{ item.carNumSurplus }}</view>
 							</view>
 							<view class="third-line">
-								<view class="third-line_text">鎻愮叅鍗曚釜鏁帮細</view>
+								<view class="third-line_text">鏀跺彂鍗曚釜鏁帮細</view>
 								<view class="third-line_num">{{ item.tmCount }}</view>
 							</view>
 						</view>
@@ -196,7 +199,7 @@
 			}
 		},
 		methods: {
-			// 鑾峰彇鍘嗗彶鎻愮叅鍗�
+			// 鑾峰彇鍘嗗彶鏀跺彂鍗�
 			getJhOrderPlanDataPage() {
 				uni.showLoading({
 					title: '鍔犺浇涓�'
@@ -220,7 +223,7 @@
 				this.pageCurrent++;
 				this.getJhOrderPlanDataPage();
 			},
-			//fix 鐐瑰嚮鎻愮叅鍗曡繑鍥炰細澧炲姞閲嶅鏁版嵁
+			//fix 鐐瑰嚮鏀跺彂鍗曡繑鍥炰細澧炲姞閲嶅鏁版嵁
 			ArrSet(Arr, id) {
 				var obj = {};
 				const arrays = Arr.reduce((setArr, item) => {
@@ -256,7 +259,7 @@
 					url: `/pages/public-page/forward/forward?orderPlanId=${value.orderPlanId}&carNumSurplusHuodai=${value.carNumSurplusHuodai}&carNum=${value.carNum}`
 				});
 			},
-			// 鐐瑰嚮鍘嗗彶鎻愮叅鍗曚竴琛岃幏鍙栬鎯�
+			// 鐐瑰嚮鍘嗗彶鏀跺彂鍗曚竴琛岃幏鍙栬鎯�
 			faYundetail(v) {
 				uni.navigateTo({
 					url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&cars2=${v.cars2}`
@@ -416,7 +419,7 @@
 
 				.collection-form-item {
 					width: 690rpx;
-					height: 340rpx;
+					height: 370rpx;
 					background: #ffffff;
 					box-shadow: 4rpx 6rpx 25rpx 0rpx rgba(73, 120, 240, 0.15);
 					border-radius: 20rpx;

--
Gitblit v1.9.1