提交12-9

lichao
1 parent 177df08c
Showing 11 changed files with 2109 additions and 2665 deletions
garbage-removal/src/apis/order.js
garbage-removal/src/components/liu-delivery-time/liu-delivery-time.vue
garbage-removal/src/manifest.json
garbage-removal/src/pages/change-password/index.vue
garbage-removal/src/pages/home-info/address/addSite.vue
garbage-removal/src/pages/home-info/clean/index.vue
garbage-removal/src/pages/home/index.vue
garbage-removal/src/pages/login/code.vue
garbage-removal/src/pages/order-info/order-disposal/scan-detail/index.vue
garbage-removal/src/pages/order-info/order-other/detail/index.vue
garbage-removal/src/pages/wode/index.vue
@@ -211,3 +211,12 @@ export async function insertRandomCopyByTypeAndOrderId(params) {
 export async function selectGarOrderCar(orderNo) {
   return await request.get(`/order/selectGarOrderCar/${orderNo}`);
 }
+
+export async function deleteDriverByOrderNo(orderNo, carCode) {
+  return await request.post(`/order/deleteDriverByOrderNo`, null, {
+    params: {
+      orderNo,
+      carCode
+    }
+  });
+}
@@ -125,143 +125,69 @@ const getFutureDays = () =&gt; {
 const getTimeList = () => {
-	const timeList = [{
-		time: '00:00-01:00',
-		start: '00:00',
-		end: '01:00',
-		timeStr:'22-07'
-	},{
-		time: '01:00-02:00',
-		start: '01:00',
-		end: '02:00',
-		timeStr:'22-07'
-	},{
-		time: '02:00-03:00',
-		start: '02:00',
-		end: '03:00',
-		timeStr:'22-07'
-	},{
-		time: '03:00-04:00',
-		start: '03:00',
-		end: '04:00',
-		timeStr:'22-07'
-	},{
-		time: '04:00-05:00',
-		start: '04:00',
-		end: '05:00',
-		timeStr:'22-07'
-	},{
-		time: '05:00-06:00',
-		start: '05:00',
-		end: '06:00',
-		timeStr:'22-07'
-	},{
-		time: '06:00-07:00',
-		start: '06:00',
-		end: '07:00',
-		timeStr:'22-07'
-	},{
-		time: '07:00-08:00',
-		start: '07:00',
-		end: '08:00',
-		timeStr:'07-08'
-	},{
-		time: '08:00-09:00',
-		start: '08:00',
-		end: '09:00',
-		timeStr:'08-09'
-	},{
-		time: '09:00-10:00',
-		start: '09:00',
-		end: '10:00',
-		timeStr:'09-10'
-	},
-	{
-		time: '10:00-11:00',
-		start: '10:00',
-		end: '11:00',
-		timeStr:'10-11'
-	},
-	{
-		time: '11:00-12:00',
-		start: '11:00',
-		end: '12:00',
-		timeStr:'11-12'
-	},
-	{
-		time: '12:00-13:00',
-		start: '12:00',
-		end: '13:00',
-		timeStr:'12-13'
-	},
-	{
-		time: '13:00-14:00',
-		start: '13:00',
-		end: '14:00',
-		timeStr:'13-14'
-	},
-	{
-		time: '14:00-15:00',
-		start: '14:00',
-		end: '15:00',
-		timeStr:'14-15'
-	},
-	{
-		time: '15:00-16:00',
-		start: '15:00',
-		end: '16:00',
-		timeStr:'15-16'
-	},
-	{
-		time: '16:00-17:00',
-		start: '16:00',
-		end: '17:00',
-		timeStr:'16-17'
-	},
-	{
-		time: '17:00-18:00',
-		start: '17:00',
-		end: '18:00',
-		timeStr:'17-18'
-	},
-	{
-		time: '18:00-19:00',
-		start: '18:00',
-		end: '19:00',
-		timeStr:'18-19'
-	},
-	{
-		time: '19:00-20:00',
-		start: '19:00',
-		end: '20:00',
-		timeStr:'19-20'
-	},
-	{
-		time: '20:00-21:00',
-		start: '20:00',
-		end: '21:00',
-		timeStr:'20-21'
-	},
-	{
-		time: '21:00-22:00',
-		start: '21:00',
-		end: '22:00',
-		timeStr:'21-22'
-	},
-	{
-		time: '22:00-23:00',
-		start: '22:00',
-		end: '23:00',
-		timeStr:'22-07'
-	},
-	{
-		time: '23:00-24:00',
-		start: '23:00',
-		end: '24:00',
-		timeStr:'22-07'
-	}
-	];
-	return timeList
+  const timeList = [{
+    time: '00:00-02:00',
+    start: '00:00',
+    end: '02:00',
+    timeStr:'22-07'
+  },{
+    time: '02:00-04:00',
+    start: '02:00',
+    end: '04:00',
+    timeStr:'22-07'
+  },{
+    time: '04:00-06:00',
+    start: '04:00',
+    end: '06:00',
+    timeStr:'22-07'
+  },{
+    time: '06:00-08:00',
+    start: '06:00',
+    end: '08:00',
+    timeStr:'22-07'
+  },{
+    time: '08:00-10:00',
+    start: '08:00',
+    end: '10:00',
+    timeStr:'07-08'
+  },{
+    time: '10:00-12:00',
+    start: '10:00',
+    end: '12:00',
+    timeStr:'10-11'
+  },{
+    time: '12:00-14:00',
+    start: '12:00',
+    end: '14:00',
+    timeStr:'12-13'
+  },{
+    time: '14:00-16:00',
+    start: '14:00',
+    end: '16:00',
+    timeStr:'14-15'
+  },{
+    time: '16:00-18:00',
+    start: '16:00',
+    end: '18:00',
+    timeStr:'16-17'
+  },{
+    time: '18:00-20:00',
+    start: '18:00',
+    end: '20:00',
+    timeStr:'18-19'
+  },{
+    time: '20:00-22:00',
+    start: '20:00',
+    end: '22:00',
+    timeStr:'20-21'
+  },{
+    time: '22:00-24:00',
+    start: '22:00',
+    end: '24:00',
+    timeStr:'22-07'
+  }
+  ];
+  return timeList
 }
 /**
@@ -271,12 +197,15 @@ const getTimeList = () =&gt; {
  * @param {*} skip 跳过几个
  */
 const getCurrentDayTimeList = (startTime, hours, skip) => {
-	const timeList = getTimeList();
-	// 因为从9点开始所以从9点开始截取
-	// let startIndex = startTime + skip;
-	let abs = startTime > hours ? 1 : -1;
-	let index = startTime - hours >= skip ? 0 : (startTime - hours) * abs + skip;
-	return timeList.slice(index, timeList.length + 1)
+  const timeList = getTimeList();
+  // 计算当前小时所属的时间段索引
+  // 每个时间段是2小时，从00:00-02:00开始
+  let index = Math.floor(hours / 2) + 1; // 加1是为了跳过已过期的时间段
+  // 确保不会超出数组范围
+  if (index >= timeList.length) {
+    return []; // 如果没有可选时间段，返回空数组
+  }
+  return timeList.slice(index, timeList.length)
 }
 const open = () => {
 	isShow.value = true;
@@ -28,7 +28,14 @@
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-feature android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-feature android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-feature android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
+                    "<uses-feature android:name=\"android.hardware.location.gps\"/>",
+                    "<uses-feature android:name=\"android.hardware.location.network\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
                     "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
@@ -58,7 +65,7 @@
         "appid" : "wx6c12c068d07c46f8",
         "permission" : {
             "scope.userLocation" : {
-                "desc" : "你的位置信息将用于小程序位置接口的"
+                "desc" : "为了给您提供准确的地址定位服务"
             }
         },
         "libVersion" : "latest",
@@ -71,9 +78,13 @@
         "router" : {
             "mode" : "history"
         },
-        "sdkConfigs" : {
-            "maps" : {}
-        }
+          "sdkConfigs" : {
+              "maps" : {
+                  "qqmap": {
+                      "key": "XICBZ-ALWKT-2KPXZ-VCBL7-XMRYO-2QFS4"
+                  }
+              }
+          }
     },
     "mp-alipay" : {
         "usingComponents" : true
@@ -5,17 +5,6 @@
       <view class="title">修改密码</view>
       <view class="input-wrapper">
-        <u-icon name="account" size="36" color="#909399" class="input-icon"></u-icon>
-        <input
-            class="login-input"
-            type="text"
-            v-model="formData.phone"
-            placeholder="请输入手机号"
-            placeholder-class="placeholder-style"
-        />
-      </view>
-
-      <view class="input-wrapper">
         <u-icon name="lock" size="36" color="#909399" class="input-icon"></u-icon>
         <input
             class="login-input"
@@ -49,10 +38,6 @@
       </view>
       <button @tap="handleChangePassword" class="submit-btn">确认修改</button>
-
-      <view class="back-to-login">
-        <text class="link" @click="backToLogin">返回登录</text>
-      </view>
     </view>
   </view>
 </template>
@@ -103,10 +88,6 @@ const getCaptcha = () =&gt; {
 // 修改密码
 const handleChangePassword = () => {
   // 表单验证
-  if (!proxy.$u.test.mobile(formData.value.phone)) {
-    proxy.$u.toast("请输入正确的手机号");
-    return;
-  }
   if (!formData.value.oldPassword) {
     proxy.$u.toast("请输入原密码");
@@ -125,7 +106,6 @@ const handleChangePassword = () =&gt; {
   // 调用修改密码接口
   const params = {
-    tel: formData.value.phone,
     oldPassword: formData.value.oldPassword,
     newPassword: formData.value.newPassword,
   };
@@ -162,739 +162,99 @@ const submit = () =&gt; {
 }
 /**
- * 打开地图选择地址
+ * 打开地图选择地址（自动定位到当前位置，修复 startCompass:fail 问题）
  */
 const chooseAddressDetail = () => {
-	console.log('打开地图选择地址');
-  takeLocation();
-
-	// 创建选择方式的模态框
-	const choiceContainer = document.createElement('div');
-	choiceContainer.id = 'choiceContainer';
-	choiceContainer.style.cssText = `		position: fixed;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		background: rgba(0, 0, 0, 0.5);
-		z-index: 9999;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	`;
-
-	const choiceBox = document.createElement('div');
-	choiceBox.style.cssText = `		background: white;
-		padding: 20px;
-		border-radius: 8px;
-		text-align: center;
-		width: 80%;
-		max-width: 300px;
-		box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
-	`;
-
-	const title = document.createElement('h3');
-	title.innerText = '请选择地址输入方式';
-	title.style.cssText = `		margin-top: 0;
-		color: #333;
-		font-size: 18px;
-	`;
-
-	const mapBtn = document.createElement('button');
-	mapBtn.innerText = '地图选择';
-	mapBtn.style.cssText = `		display: block;
-		width: 100%;
-		padding: 12px;
-		margin: 10px 0;
-		background: #19a97c;
-		color: white;
-		border: none;
-		border-radius: 4px;
-		cursor: pointer;
-		font-size: 16px;
-		transition: background 0.3s;
-	`;
-
-	mapBtn.onmouseover = function() {
-		mapBtn.style.background = '#13966a';
-	};
-
-	mapBtn.onmouseout = function() {
-		mapBtn.style.background = '#19a97c';
-	};
-
-	const manualBtn = document.createElement('button');
-	manualBtn.innerText = '手动输入';
-	manualBtn.style.cssText = `		display: block;
-		width: 100%;
-		padding: 12px;
-		margin: 10px 0;
-		background: #409eff;
-		color: white;
-		border: none;
-		border-radius: 4px;
-		cursor: pointer;
-		font-size: 16px;
-		transition: background 0.3s;
-	`;
-
-	manualBtn.onmouseover = function() {
-		manualBtn.style.background = '#3388e6';
-	};
-
-	manualBtn.onmouseout = function() {
-		manualBtn.style.background = '#409eff';
-	};
-
-	const cancelBtn = document.createElement('button');
-	cancelBtn.innerText = '取消';
-	cancelBtn.style.cssText = `		display: block;
-		width: 100%;
-		padding: 12px;
-		margin: 10px 0;
-		background: #ff4d4f;
-		color: white;
-		border: none;
-		border-radius: 4px;
-		cursor: pointer;
-		font-size: 16px;
-		transition: background 0.3s;
-	`;
-
-	cancelBtn.onmouseover = function() {
-		cancelBtn.style.background = '#e63939';
-	};
-
-	cancelBtn.onmouseout = function() {
-		cancelBtn.style.background = '#ff4d4f';
-	};
-
-	choiceBox.appendChild(title);
-	choiceBox.appendChild(mapBtn);
-	choiceBox.appendChild(manualBtn);
-	choiceBox.appendChild(cancelBtn);
-	choiceContainer.appendChild(choiceBox);
-	document.body.appendChild(choiceContainer);
-
-	// 地图选择按钮事件
-	mapBtn.onclick = function() {
-		document.body.removeChild(choiceContainer);
-
-		// 地图选择方式
-		let coordinate = 'gcj02';
-
-		// 创建一个模态框来显示地图
-		const mapContainer = document.createElement('div');
-		mapContainer.id = 'mapContainerWrapper';
-		mapContainer.style.cssText = `			position: fixed;
-			top: 0;
-			left: 0;
-			width: 100%;
-			height: 100%;
-			background: white;
-			z-index: 9999;
-		`;
-
-		// 创建顶部工具栏
-		const toolbar = document.createElement('div');
-		toolbar.style.cssText = `			position: absolute;
-			top: 0;
-			left: 0;
-			width: 100%;
-			height: 50px;
-			background: #fff;
-			box-shadow: 0 2px 4px rgba(0,0,0,0.1);
-			z-index: 10000;
-			display: flex;
-			align-items: center;
-			padding: 0 15px;
-			box-sizing: border-box;
-		`;
-
-		const titleText = document.createElement('div');
-		titleText.innerText = '请选择地址';
-		titleText.style.cssText = `			flex: 1;
-			text-align: center;
-			font-size: 16px;
-			font-weight: bold;
-			color: #333;
-		`;
-
-		// 创建关闭按钮
-		const closeBtn = document.createElement('button');
-		closeBtn.innerText = '✕';
-		closeBtn.style.cssText = `			width: 30px;
-			height: 30px;
-			background: #ff4d4f;
-			color: white;
-			border: none;
-			border-radius: 50%;
-			cursor: pointer;
-			font-size: 16px;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-		`;
-
-		toolbar.appendChild(titleText);
-		toolbar.appendChild(closeBtn);
-
-		// 创建地图容器
-		const mapElement = document.createElement('div');
-		mapElement.id = 'mapContainer';
-		mapElement.style.cssText = `			width: 100%;
-			height: 100%;
-			margin-top: 50px;
-		`;
-
-		mapContainer.appendChild(toolbar);
-		mapContainer.appendChild(mapElement);
-		document.body.appendChild(mapContainer);
-
-		// 加载腾讯地图API
-		const script = document.createElement('script');
-		script.src = 'https://map.qq.com/api/js?v=2.exp&key=XICBZ-ALWKT-2KPXZ-VCBL7-XMRYO-2QFS4&callback=initMap';
-
-		// 定义全局回调函数
-		window.initMap = function() {
-			// 初始化地图，设置默认位置为长沙
-			const center = new qq.maps.LatLng(28.198265, 112.984353); // 长沙市坐标
-			const map = new qq.maps.Map(mapElement, {
-				center: center,
-				zoom: 15
-			});
-      window.currentMapInstance = map;
-      // 地图初始化完成后自动获取当前位置
-      setTimeout(() => {
-        takeLocation();
-      }, 500);
-
-			// 添加点击事件监听器
-			qq.maps.event.addListener(map, 'click', function(event) {
-				const lat = event.latLng.getLat();
-				const lng = event.latLng.getLng();
-
-				// 使用腾讯地图逆解析API获取地址信息
-				const key = "XICBZ-ALWKT-2KPXZ-VCBL7-XMRYO-2QFS4";
-				const url = `https://apis.map.qq.com/ws/geocoder/v1/?key=${key}&location=${lat},${lng}&output=jsonp`;
-
-				// 创建script标签实现JSONP
-				const jsonpScript = document.createElement('script');
-				const callbackName = 'jsonp_callback_' + Math.round(100000 * Math.random());
-
-				// 定义全局回调函数
-				window[callbackName] = function(data) {
-					// 清理
-					delete window[callbackName];
-					document.body.removeChild(jsonpScript);
-
-					if (data.status === 0) {
-						const component = data.result.address_component;
-						const address = data.result.address;
-
-						// 创建确认选择的模态框
-						const confirmContainer = document.createElement('div');
-						confirmContainer.style.cssText = `							position: fixed;
-							top: 0;
-							left: 0;
-							width: 100%;
-							height: 100%;
-							background: rgba(0, 0, 0, 0.5);
-							z-index: 10001;
-							display: flex;
-							justify-content: center;
-							align-items: center;
-						`;
-
-						const confirmBox = document.createElement('div');
-						confirmBox.style.cssText = `							background: white;
-							padding: 20px;
-							border-radius: 8px;
-							text-align: center;
-							width: 80%;
-							max-width: 300px;
-							box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
-						`;
-
-						const confirmTitle = document.createElement('h3');
-						confirmTitle.innerText = '确认地址';
-						confirmTitle.style.cssText = `							margin-top: 0;
-							color: #333;
-						`;
-
-						const confirmText = document.createElement('p');
-						confirmText.innerText = address;
-						confirmText.style.cssText = `							color: #666;
-							font-size: 14px;
-							line-height: 1.5;
-							margin: 10px 0;
-						`;
-
-						const confirmBtn = document.createElement('button');
-						confirmBtn.innerText = '确认';
-						confirmBtn.style.cssText = `							display: inline-block;
-							width: 45%;
-							padding: 10px;
-							margin: 5px;
-							background: #19a97c;
-							color: white;
-							border: none;
-							border-radius: 4px;
-							cursor: pointer;
-							font-size: 14px;
-						`;
-
-						const cancelConfirmBtn = document.createElement('button');
-						cancelConfirmBtn.innerText = '取消';
-						cancelConfirmBtn.style.cssText = `							display: inline-block;
-							width: 45%;
-							padding: 10px;
-							margin: 5px;
-							background: #ff4d4f;
-							color: white;
-							border: none;
-							border-radius: 4px;
-							cursor: pointer;
-							font-size: 14px;
-						`;
-
-						confirmBox.appendChild(confirmTitle);
-						confirmBox.appendChild(confirmText);
-						confirmBox.appendChild(confirmBtn);
-						confirmBox.appendChild(cancelConfirmBtn);
-						confirmContainer.appendChild(confirmBox);
-						document.body.appendChild(confirmContainer);
-
-						// 确认按钮事件
-						confirmBtn.onclick = function() {
-							addressInfo.garLongitude = lng;
-							addressInfo.garLatitude = lat;
-							addressInfo.garCoordinate = coordinate;
-
-							if (component.province == "湖南省") {
-								addressInfo.addressDetail = address.replace(component.province + component.city + component.district, "");
-								addressInfo.addressArea = component.province + '-' + component.city + '-' + component.district;
-							} else {
-								addressInfo.addressDetail = address;
-							}
-
-							// 关闭所有模态框
-							document.body.removeChild(confirmContainer);
-							document.body.removeChild(mapContainer);
-							// 清理全局函数
-							delete window.initMap;
-						};
-
-						// 取消确认按钮事件
-						cancelConfirmBtn.onclick = function() {
-							document.body.removeChild(confirmContainer);
-						};
-					} else {
-						// 创建错误提示的模态框
-						const errorContainer = document.createElement('div');
-						errorContainer.style.cssText = `							position: fixed;
-							top: 0;
-							left: 0;
-							width: 100%;
-							height: 100%;
-							background: rgba(0, 0, 0, 0.5);
-							z-index: 10001;
-							display: flex;
-							justify-content: center;
-							align-items: center;
-						`;
-
-						const errorBox = document.createElement('div');
-						errorBox.style.cssText = `							background: white;
-							padding: 20px;
-							border-radius: 8px;
-							text-align: center;
-							width: 80%;
-							max-width: 300px;
-							box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
-						`;
-
-						const errorTitle = document.createElement('h3');
-						errorTitle.innerText = '提示';
-						errorTitle.style.cssText = `							margin-top: 0;
-							color: #333;
-						`;
-
-						const errorText = document.createElement('p');
-						errorText.innerText = '地址解析失败，请重新选择';
-						errorText.style.cssText = `							color: #666;
-							font-size: 14px;
-							margin: 10px 0;
-						`;
-
-						const okBtn = document.createElement('button');
-						okBtn.innerText = '确定';
-						okBtn.style.cssText = `							display: inline-block;
-							width: 100%;
-							padding: 10px;
-							margin: 5px 0;
-							background: #409eff;
-							color: white;
-							border: none;
-							border-radius: 4px;
-							cursor: pointer;
-							font-size: 14px;
-						`;
-
-						errorBox.appendChild(errorTitle);
-						errorBox.appendChild(errorText);
-						errorBox.appendChild(okBtn);
-						errorContainer.appendChild(errorBox);
-						document.body.appendChild(errorContainer);
-
-						// 确定按钮事件
-						okBtn.onclick = function() {
-							document.body.removeChild(errorContainer);
-						};
-					}
-				};
-
-				// 设置错误处理
-				jsonpScript.onerror = function() {
-					// 清理
-					delete window[callbackName];
-					document.body.removeChild(jsonpScript);
-
-					// 创建错误提示的模态框
-					const errorContainer = document.createElement('div');
-					errorContainer.style.cssText = `						position: fixed;
-						top: 0;
-						left: 0;
-						width: 100%;
-						height: 100%;
-						background: rgba(0, 0, 0, 0.5);
-						z-index: 10001;
-						display: flex;
-						justify-content: center;
-						align-items: center;
-					`;
-
-					const errorBox = document.createElement('div');
-					errorBox.style.cssText = `						background: white;
-						padding: 20px;
-						border-radius: 8px;
-						text-align: center;
-						width: 80%;
-						max-width: 300px;
-						box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
-					`;
-
-					const errorTitle = document.createElement('h3');
-					errorTitle.innerText = '提示';
-					errorTitle.style.cssText = `						margin-top: 0;
-						color: #333;
-					`;
-
-					const errorText = document.createElement('p');
-					errorText.innerText = '地址解析失败，请重新选择';
-					errorText.style.cssText = `						color: #666;
-						font-size: 14px;
-						margin: 10px 0;
-					`;
-
-					const okBtn = document.createElement('button');
-					okBtn.innerText = '确定';
-					okBtn.style.cssText = `						display: inline-block;
-						width: 100%;
-						padding: 10px;
-						margin: 5px 0;
-						background: #409eff;
-						color: white;
-						border: none;
-						border-radius: 4px;
-						cursor: pointer;
-						font-size: 14px;
-					`;
-
-					errorBox.appendChild(errorTitle);
-					errorBox.appendChild(errorText);
-					errorBox.appendChild(okBtn);
-					errorContainer.appendChild(errorBox);
-					document.body.appendChild(errorContainer);
-
-					// 确定按钮事件
-					okBtn.onclick = function() {
-						document.body.removeChild(errorContainer);
-					};
-				};
-
-				jsonpScript.src = url + '&callback=' + callbackName;
-				document.body.appendChild(jsonpScript);
-			});
-
-			// 添加当前位置定位功能
-			if (navigator.geolocation) {
-				navigator.geolocation.getCurrentPosition(
-					(position) => {
-						const lat = position.coords.latitude;
-						const lng = position.coords.longitude;
-						const pos = new qq.maps.LatLng(lat, lng);
-						map.setCenter(pos);
-					},
-					(error) => {
-						console.log('获取当前位置失败', error);
-					}
-				);
-			}
-		};
-
-		// 关闭按钮事件
-		closeBtn.onclick = function() {
-			document.body.removeChild(mapContainer);
-			// 清理全局函数
-			delete window.initMap;
-		};
-
-		document.body.appendChild(script);
-	};
-
-	// 手动输入按钮事件
-	manualBtn.onclick = function() {
-		document.body.removeChild(choiceContainer);
-
-		// 创建自定义输入框模态框
-		const inputContainer = document.createElement('div');
-		inputContainer.style.cssText = `			position: fixed;
-			top: 0;
-			left: 0;
-			width: 100%;
-			height: 100%;
-			background: rgba(0, 0, 0, 0.5);
-			z-index: 9999;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-		`;
-
-		const inputBox = document.createElement('div');
-		inputBox.style.cssText = `			background: white;
-			padding: 20px;
-			border-radius: 8px;
-			text-align: center;
-			width: 80%;
-			max-width: 300px;
-			box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
-		`;
-
-		const inputTitle = document.createElement('h3');
-		inputTitle.innerText = '请输入详细地址';
-		inputTitle.style.cssText = `			margin-top: 0;
-			color: #333;
-		`;
-
-		const inputField = document.createElement('input');
-		inputField.type = 'text';
-		inputField.placeholder = '请输入详细地址';
-		inputField.style.cssText = `			width: 100%;
-			padding: 10px;
-			margin: 10px 0;
-			border: 1px solid #ddd;
-			border-radius: 4px;
-			box-sizing: border-box;
-			font-size: 14px;
-		`;
-
-		const submitBtn = document.createElement('button');
-		submitBtn.innerText = '确定';
-		submitBtn.style.cssText = `			display: inline-block;
-			width: 45%;
-			padding: 10px;
-			margin: 5px;
-			background: #19a97c;
-			color: white;
-			border: none;
-			border-radius: 4px;
-			cursor: pointer;
-			font-size: 14px;
-		`;
-
-		const cancelInputBtn = document.createElement('button');
-		cancelInputBtn.innerText = '取消';
-		cancelInputBtn.style.cssText = `			display: inline-block;
-			width: 45%;
-			padding: 10px;
-			margin: 5px;
-			background: #ff4d4f;
-			color: white;
-			border: none;
-			border-radius: 4px;
-			cursor: pointer;
-			font-size: 14px;
-		`;
-
-		inputBox.appendChild(inputTitle);
-		inputBox.appendChild(inputField);
-		inputBox.appendChild(submitBtn);
-		inputBox.appendChild(cancelInputBtn);
-		inputContainer.appendChild(inputBox);
-		document.body.appendChild(inputContainer);
-
-		// 确定按钮事件
-		submitBtn.onclick = function() {
-			const manualAddress = inputField.value.trim();
-			if (manualAddress) {
-				addressInfo.addressDetail = manualAddress;
-				document.body.removeChild(inputContainer);
-			} else {
-				// 创建提示模态框
-				const tipContainer = document.createElement('div');
-				tipContainer.style.cssText = `					position: fixed;
-					top: 0;
-					left: 0;
-					width: 100%;
-					height: 100%;
-					background: rgba(0, 0, 0, 0.5);
-					z-index: 10000;
-					display: flex;
-					justify-content: center;
-					align-items: center;
-				`;
-
-				const tipBox = document.createElement('div');
-				tipBox.style.cssText = `					background: white;
-					padding: 20px;
-					border-radius: 8px;
-					text-align: center;
-					width: 80%;
-					max-width: 300px;
-					box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
-				`;
-
-				const tipText = document.createElement('p');
-				tipText.innerText = '请输入详细地址';
-				tipText.style.cssText = `					color: #666;
-					font-size: 14px;
-					margin: 10px 0;
-				`;
-
-				const okBtn = document.createElement('button');
-				okBtn.innerText = '确定';
-				okBtn.style.cssText = `					display: inline-block;
-					width: 100%;
-					padding: 10px;
-					margin: 5px 0;
-					background: #409eff;
-					color: white;
-					border: none;
-					border-radius: 4px;
-					cursor: pointer;
-					font-size: 14px;
-				`;
-
-				tipBox.appendChild(tipText);
-				tipBox.appendChild(okBtn);
-				tipContainer.appendChild(tipBox);
-				document.body.appendChild(tipContainer);
-
-				// 确定按钮事件
-				okBtn.onclick = function() {
-					document.body.removeChild(tipContainer);
-				};
-			}
-		};
-
-		// 取消按钮事件
-		cancelInputBtn.onclick = function() {
-			document.body.removeChild(inputContainer);
-		};
-
-		// 回车键确认
-		inputField.addEventListener('keypress', function(e) {
-			if (e.key === 'Enter') {
-				submitBtn.click();
-			}
-		});
-
-		// 聚焦到输入框
-		setTimeout(() => {
-			inputField.focus();
-		}, 100);
-	};
-
-	// 取消按钮事件
-	cancelBtn.onclick = function() {
-		document.body.removeChild(choiceContainer);
-	};
-}
-
-// 定义定位回调函数
-const takeLocationCallBack = (lngLat) => {
-  const ll = lngLat.split(",");
-  console.log("定位结果:", ll);
-
-  if (ll.length >= 2) {
-    const longitude = parseFloat(ll[0]);
-    const latitude = parseFloat(ll[1]);
-
-    // 在地图上定位到当前位置
-    const mapContainer = document.getElementById('mapContainer');
-    if (mapContainer && window.qq && qq.maps && window.currentMapInstance) {
-      const pos = new qq.maps.LatLng(latitude, longitude);
-      window.currentMapInstance.setCenter(pos);
-      window.currentMapInstance.setZoom(17); // 放大一些以便更好地查看位置
-
-      // 清除之前的标记（如果有的话）
-      if (window.currentLocationMarker) {
-        window.currentLocationMarker.setMap(null);
-      }
-
-      // 添加新的当前位置标记
-      window.currentLocationMarker = new qq.maps.Marker({
-        position: pos,
-        map: window.currentMapInstance
+  console.log('打开地图选择地址（自动定位）');
+
+  // 1. 先获取当前位置的经纬度（关键：统一坐标系为 gcj02，关闭 altitude 避免额外权限）
+  uni.getLocation({
+    type: 'gcj02', // 必须使用 gcj02（腾讯/高德地图标准，避免坐标系不匹配）
+    altitude: false, // 关闭海拔获取，减少权限要求
+    isHighAccuracy: false, // 关闭高精度定位（降低硬件依赖）
+    success: (locationRes) => {
+      console.log('当前位置经纬度:', locationRes);
+      const { latitude, longitude } = locationRes;
+
+      // 2. 打开地图选择器（移除可能触发指南针的参数）
+      uni.chooseLocation({
+        latitude: latitude,
+        longitude: longitude,
+        scale: 16,
+        name: addressInfo.addressDetail || '',
+        address: addressInfo.addressArea || '',
+        success: (res) => {
+          addressInfo.addressDetail = res.name;
+          addressInfo.garLongitude = res.longitude;
+          addressInfo.garLatitude = res.latitude;
+        },
+        fail: (err) => {
+          console.error('地图选择失败:', err);
+          handleLocationError(err);
+        }
       });
+    },
+    fail: (err) => {
+      console.error('获取当前位置失败:', err);
+      handleLocationError(err);
+    }
+  });
+};
-      // 创建或更新信息窗口
-      if (!window.currentLocationInfoWindow) {
-        window.currentLocationInfoWindow = new qq.maps.InfoWindow({
-          map: window.currentMapInstance
-        });
+/**
+ * 统一处理定位/地图错误
+ */
+const handleLocationError = (err) => {
+  const errMsg = err.errMsg || '';
+
+  // 1. 处理权限拒绝
+  if (errMsg.includes('auth deny') || errMsg.includes('permission denied')) {
+    uni.showModal({
+      title: '授权提示',
+      content: '需要获取您的位置权限才能自动定位，请在设置中开启',
+      confirmText: '去设置',
+      cancelText: '手动输入',
+      success: (modalRes) => {
+        if (modalRes.confirm) {
+          uni.openSetting(); // 打开系统设置
+        } else {
+          // 手动输入地址（隐藏地图选择，直接让用户输入）
+          uni.showToast({ title: '请手动输入详细地址', icon: 'none' });
+        }
       }
-
-      // 设置信息窗口内容并打开
-      window.currentLocationInfoWindow.setContent('<div style="padding:10px;">您的当前位置</div>');
-      window.currentLocationInfoWindow.setPosition(pos);
-      window.currentLocationInfoWindow.open();
-    }
-  } else {
-    uni.showToast({
-      title: '定位结果异常',
-      icon: 'none'
     });
   }
-}
-const takeLocation = () => {
-  // 调用原生接口获取定位
-  if (window.JsInterface && typeof window.JsInterface.takeLocation === 'function') {
-    window.JsInterface.takeLocation();
-  } else {
-    // 如果没有原生接口，使用uni.getLocation作为备选方案
-    uni.getLocation({
-      type: 'gcj02',
-      success: function (res) {
-        // 直接处理结果
-        handleLocationResult(res.longitude, res.latitude);
-      },
-      fail: function (err) {
-        console.error('定位失败:', err);
-        uni.showToast({
-          title: '定位失败',
-          icon: 'none'
+  // 2. 处理指南针失败（startCompass:fail）
+  else if (errMsg.includes('startCompass:fail')) {
+    uni.showModal({
+      title: '提示',
+      content: '当前设备不支持指南针功能，将为您打开地图手动选择地址',
+      showCancel: false,
+      success: () => {
+        // 降级方案：不传递初始经纬度，直接打开地图
+        uni.chooseLocation({
+          success: (res) => {
+            addressInfo.addressDetail = res.name;
+            addressInfo.garLongitude = res.longitude;
+            addressInfo.garLatitude = res.latitude;
+          },
+          fail: () => {
+            uni.showToast({ title: '地图选择失败，请手动输入地址', icon: 'none' });
+          }
         });
       }
     });
   }
-}
+
+  // 3. 其他错误（网络/设备问题）
+  else {
+    uni.showToast({ title: '定位失败，请手动输入地址', icon: 'none' });
+  }
+};
 onMounted(() => {
 	proxy.$refs.addressFrom.setRules(rules)
-  window.takeLocationCallBack = takeLocationCallBack
 })
 onLoad((options) => {
@@ -71,7 +71,7 @@
 							<view class="company-clean-container-car-main-content-type">
 								<view class="company-clean-container-car-main-content-type-price-area">
-									<text style="color: red;">*</text>添加车辆数量:
+									<text style="color: red;">*</text>预估车辆数（趟）:
 								</view>
 								<view style=" width:100%;display:flex; color:#909399; align-items: center;">
 									<u-number-box :min="0" :max="9999" integer buttonSize="46" :inputWidth="100"
@@ -45,10 +45,12 @@
               <u-dropdown active-color="#19a97c">
                 <u-dropdown-item :height="'240rpx'" :placement="'left'" v-model="registrationAreaValue"
                   @change="handleDropdownAreaChange" :title="'所属区域'" :options="dropdownOptions[0]"></u-dropdown-item>
+
                 <u-dropdown-item :placement="'center'" v-model="carTypeValue" @change="handleDropdownCarChange"
                   :title="'车辆类型'" :options="dropdownOptions[1]"></u-dropdown-item>
+
                 <u-dropdown-item :placement="'right'" v-model="sortValue" @change="handleDropdownSortChange"
-                  :title="dropdownOptions[2][sortValue].label" :options="dropdownOptions[2]"></u-dropdown-item>
+                                 :title="'排序'" :options="dropdownOptions[2]"></u-dropdown-item>
               </u-dropdown>
             </view>
           </view>
@@ -158,18 +160,14 @@ const carTypeValue = ref(&#39;&#39;)
 const carTypeRealValue = ref('')
 const dropdownOptions = ref([
   [{
-    label: '芙蓉区',
-    value: '芙蓉区',
+    label: '湘江新区',
+    value: '湘江新区'
   },
   {
     label: '天心区',
     value: '天心区'
   },
   {
-    label: '岳麓区',
-    value: '岳麓区'
-  },
-  {
     label: '开福区',
     value: '开福区'
   },
@@ -194,25 +192,25 @@ const dropdownOptions = ref([
     value: '宁乡市'
   },
   {
-    label: '湘江新区',
-    value: '湘江新区'
+    label: '芙蓉区',
+    value: '芙蓉区'
   }
   ], [{
     label: '暂未开放',
     value: '暂未开放',
   },]
   , [{
-    label: '距离排序',
+    label: '距离优先',
     value: 0,
   },
-  {
-    label: '清运排序',
-    value: 1
-  },
-  {
-    label: '评价排序',
-    value: 2
-  }]
+    {
+      label: '运量优先',
+      value: 1
+    },
+    {
+      label: '评分优先',
+      value: 2
+    }]
 ])
 // 信息指南
@@ -417,11 +415,27 @@ onShow(() =&gt; {
 const updateOrderBadge = async () => {
   try {
-    const res = await getOrderCountByType(0);
-    await uni.setTabBarBadge({
-      index: 1, // 订单tab在tabBar中的索引
-      text: String(res.data.data.total)
-    });
+    // 获取待清运订单数量(type=0)
+    const pendingRes = await getOrderCountByType(0);
+    const pendingCount = pendingRes.data.data.total || 0;
+
+    // 获取清运中订单数量(type=1)
+    const processingRes = await getOrderCountByType(1);
+    const processingCount = processingRes.data.data.total || 0;
+
+    // 计算总数
+    const totalCount = pendingCount + processingCount;
+
+    if (totalCount > 0) {
+      await uni.setTabBarBadge({
+        index: 1, // 订单tab在tabBar中的索引
+        text: String(totalCount)
+      });
+    } else {
+      await uni.removeTabBarBadge({
+        index: 1
+      });
+    }
   } catch (error) {
     console.error('获取订单数量失败:', error);
   }
@@ -97,7 +97,6 @@
       <view class="alternative">
 <!--        <text class="link" @click="toRegister">立即注册</text>-->
-        <text class="link" @click="toChangePassword">修改密码</text>
       </view>
     </view>
   </view>
@@ -228,31 +228,44 @@
 	const handlerInputChange = (val) => {
 		console.log(val);
 	}
-	const handlerSubmit = async () => {
-		// 校验参数
-		let params = {
-			...details.value,
-			fillImageList: fileList.value.map((item) => item.url),
-			garOrderHandlerCompanyName: details.value.garOrderCompanyName,
-			garOrderHandlerCompanyId: details.value.garOrderCompanyId,
-			// 添加定位信息
-			latitude: location.value.latitude,
-			longitude: location.value.longitude,
-			transportDistance : details.value.transportDistance
-		}
-		if (validateParams(params)) {
-			await askTransport(params).then((res) => {
-				console.log(res);
-				if (res.data.code == 200) {
-					// 修改提示框，添加跳转到订单页面的选项
-          uni.$u.toast("当前趟次记录完毕！")
-				}
-			}).catch((err) => {
-				uni.$u.toast("当前趟次记录失败")
-			})
-		}
-	}
+  const handlerSubmit = async () => {
+    // 校验参数
+    let params = {
+      ...details.value,
+      fillImageList: fileList.value.map((item) => item.url),
+      garOrderHandlerCompanyName: details.value.garOrderCompanyName,
+      garOrderHandlerCompanyId: details.value.garOrderCompanyId,
+      // 添加定位信息
+      latitude: location.value.latitude,
+      longitude: location.value.longitude,
+      transportDistance : details.value.transportDistance
+    }
+    if (validateParams(params)) {
+      // 添加确认提醒对话框
+      uni.showModal({
+        title: '确认提交',
+        content: `请确认以下信息：\n\n车辆载重：${params.garCarryingWeight} 吨\n\n确认无误后点击确定提交`,
+        success: function (res) {
+          if (res.confirm) {
+            // 用户点击确定
+            askTransport(params).then((res) => {
+              console.log(res);
+              if (res.data.code == 200) {
+                // 修改提示框，添加跳转到订单页面的选项
+                uni.$u.toast("当前趟次记录完毕！")
+              }
+            }).catch((err) => {
+              uni.$u.toast("当前趟次记录失败")
+            })
+          } else if (res.cancel) {
+            // 用户点击取消
+            console.log('用户点击取消');
+          }
+        }
+      });
+    }
+  }
 	const validateParams = (params) => {
 		if (!params.garOrderHandlerName) {
+
 <template>
-	<clashDriverDispatch ref="clashDriverDispatchRef" :valueKey="'licensePlateNumber'"
-		:onconfirm="handleDriverDispatchConfirm" :dataList="driverPersonnelList">
-	</clashDriverDispatch>
-	<clashDisposalDispatch ref="clashDisposalDispatchRef" :valueKey="'companyName'"
-		:onconfirm="handleDisposalDispatchConfirm" :dataList="driverPersonnelList">
-	</clashDisposalDispatch>
-	<u-popup :zIndex="10074" closeOnClickOverlay :show="carPopupShowFlag" :round="10" @close="handlePopupClick(false)"
-		@open="handlePopupClick(true)">
-		<view class="company-clean-container-car-popup">
-			<!-- 主要内容 -->
-			<view class="company-clean-container-car-popup-content">
-				<view class="company-clean-container-car-popup-content-title">
-					<view style="text-align: center;">
-						车辆类型
-					</view>
-				</view>
-				<view class="company-clean-container-car-popup-content-box">
-					<view class="company-clean-container-car-popup-content-box-item"
-						v-for="(item, index) in garCarInfoList" :key="index">
-						<view class="company-clean-container-car-popup-content-box-item-text">
-							{{ item.garOrderCarType }}
-						</view>
-          <view class="company-clean-container-car-popup-content-box-item-number"
-							hover-class="hoverClickStyle">
-						<u-number-box :min="1" :max="9999" integer buttonSize="46" :inputWidth="100"
-							v-model="garCarInfoList[item.garOrderCarType].garOrderCarNumber"
-							:disabledInput="true"></u-number-box>
-					</view>
-					</view>
-				</view>
-			</view>
-			<!-- 占位盒子 -->
-			<view class="company-clean-container-car-popup-button-safe">
-				<view class="company-clean-container-car-popup-button-safe-btn">
-					<u-button type="primary" color="#19a97c" @click="submitUpdateCarInfo">确定</u-button>
-				</view>
-			</view>
-		</view>
-	</u-popup>
-	<view class="order-detail-container" v-if="dataGram != null || dataGram != undefined">
-		<view class="order-detail-container-box">
-			<view class="order-detail-top">
-				<view class="order-detail-top-box">
-					<view class="order-detail-top-box-step">
-						<u-steps :current="currentStep(dataGram.garOrderHandlerStatus)" dot>
-							<u-steps-item title="待清运"></u-steps-item>
-							<u-steps-item title="清运中"></u-steps-item>
-							<u-steps-item title="已完成"></u-steps-item>
-						</u-steps>
-					</view>
-				</view>
-			</view>
-			<!-- 信息提示 -->
-			<view class="order-detail-container-box-card">
-				<text v-if="dataGram.garCancelFlag == 0" style="color: red;">请于交易完成后线下支付！！</text>
-				<view v-else style="display: flex; color:red;">
-					<u-icon name="close-circle" color="red"></u-icon>
-					<text> &nbsp;&nbsp;订单已被取消！原因：{{ dataGram.garReason }}</text>
-				</view>
-			</view>
-			<!-- 订单信息 -->
+  <clashDriverDispatch ref="clashDriverDispatchRef" :valueKey="'licensePlateNumber'"
+                       :onconfirm="handleDriverDispatchConfirm" :dataList="driverPersonnelList">
+  </clashDriverDispatch>
+  <clashDisposalDispatch ref="clashDisposalDispatchRef" :valueKey="'companyName'"
+                         :onconfirm="handleDisposalDispatchConfirm" :dataList="driverPersonnelList">
+  </clashDisposalDispatch>
+  <u-popup :zIndex="10074" closeOnClickOverlay :show="carPopupShowFlag" :round="10" @close="handlePopupClick(false)"
+           @open="handlePopupClick(true)">
+    <view class="company-clean-container-car-popup">
+      <!-- 主要内容 -->
+      <view class="company-clean-container-car-popup-content">
+        <view class="company-clean-container-car-popup-content-title">
+          <view style="text-align: center;">
+            车辆类型
+          </view>
+        </view>
+        <view class="company-clean-container-car-popup-content-box">
+          <view class="company-clean-container-car-popup-content-box-item"
+                v-for="(item, index) in garCarInfoList" :key="index">
+            <view class="company-clean-container-car-popup-content-box-item-text">
+              {{ item.garOrderCarType }}
+            </view>
+            <view class="company-clean-container-car-popup-content-box-item-number"
+                  hover-class="hoverClickStyle">
+              <u-number-box :min="1" :max="9999" integer buttonSize="46" :inputWidth="100"
+                            v-model="garCarInfoList[item.garOrderCarType].garOrderCarNumber"
+                            :disabledInput="true"></u-number-box>
+            </view>
+          </view>
+        </view>
+      </view>
+      <!-- 占位盒子 -->
+      <view class="company-clean-container-car-popup-button-safe">
+        <view class="company-clean-container-car-popup-button-safe-btn">
+          <u-button type="primary" color="#19a97c" @click="submitUpdateCarInfo">确定</u-button>
+        </view>
+      </view>
+    </view>
+  </u-popup>
+  <view class="order-detail-container" v-if="dataGram != null || dataGram != undefined">
+    <view class="order-detail-container-box">
+      <view class="order-detail-top">
+        <view class="order-detail-top-box">
+          <view class="order-detail-top-box-step">
+            <u-steps :current="currentStep(dataGram.garOrderHandlerStatus)" dot>
+              <u-steps-item title="待清运"></u-steps-item>
+              <u-steps-item title="清运中"></u-steps-item>
+              <u-steps-item title="已完成"></u-steps-item>
+            </u-steps>
+          </view>
+        </view>
+      </view>
+      <!-- 信息提示 -->
+      <view class="order-detail-container-box-card">
+        <text v-if="dataGram.garCancelFlag == 0" style="color: red;">请于交易完成后线下支付！！</text>
+        <view v-else style="display: flex; color:red;">
+          <u-icon name="close-circle" color="red"></u-icon>
+          <text> &nbsp;&nbsp;订单已被取消！原因：{{ dataGram.garReason }}</text>
+        </view>
+      </view>
+      <!-- 订单信息 -->
       <view class="order-detail-container-box-card order-info-section">
         <view class="order-info-header">
           <view class="order-detail-container-header-card-uicon"></view>
@@ -133,9 +134,9 @@
           </view>
         </view>
       </view>
-			<!-- 车辆信息 -->
+      <!-- 车辆信息 -->
-      <view class="order-detail-container-box-card vehicle-section">
+      <view class="order-detail-container-box-card vehicle-section" v-if="userType !== '用户'">
         <view class="section-header">
           <view class="header-icon-bar"></view>
           <u-icon name="car" size="22" color="#fff" style="margin-right: 10rpx;"></u-icon>
@@ -172,31 +173,7 @@
           </view>
         </view>
-        <view class="driver-info-card" v-if="driverList.length > 0">
-          <view class="card-header">
-            <u-icon name="account" size="18" color="#19a97c"></u-icon>
-            <text class="card-title">驾驶员信息</text>
-          </view>
-          <view class="driver-list">
-            <view class="driver-item" v-for="(driver, index) in driverList" :key="index">
-              <view class="driver-basic-info">
-                <u-icon name="account" size="16" color="#19a97c"></u-icon>
-                <text class="info-label">驾驶员:</text>
-                <text class="info-value">{{ driver.garOrderHandlerName }}</text>
-              </view>
-              <view class="driver-car-info">
-                <u-icon name="car" size="16" color="#19a97c"></u-icon>
-                <text class="info-label">车牌号:</text>
-                <text class="info-value">{{ driver.garHandlerCarCode }}</text>
-              </view>
-              <view class="driver-status">
-                <u-tag text="正在清运" type="success" size="mini" />
-              </view>
-            </view>
-          </view>
-        </view>
-
-        <view class="handler-list-card">
+        <view class="handler-list-card" >
           <view class="card-header">
             <u-icon name="list" size="18" color="#19a97c"></u-icon>
             <text class="card-title">处理人员信息</text>
@@ -207,101 +184,38 @@
               <text class="handler-car">{{ item.garHandlerCarCode }}</text>
               <text class="handler-volume">{{ item.garOrderContainerVolume }}</text>
             </view>
-            <view class="handler-trip-count">
-              <text class="count-label">趟次:</text>
-              <text class="count-value">{{ item.garCarCount }}车</text>
-            </view>
-          </view>
-        </view>
-
-        <view class="assign-trip-card" v-if="userType == '运输企业负责人'">
-      <view class="card-header">
-        <u-icon name="edit-pen" size="18" color="#19a97c"></u-icon>
-        <text class="card-title">分配趟次</text>
-      </view>
-      <view class="assign-content">
-        <view class="selector-wrapper">
-          <text class="selector-label">分配人员:</text>
-          <select v-model="selectedHandlerTel" class="handler-selector">
-            <option value="">请选择分配人员</option>
-            <option value="ADD_TOTAL_TRIPS">新增总趟次</option>
-            <option
-                v-for="handler in handlerList"
-                :key="handler.garOrderHandlerTel"
-                :value="handler.garOrderHandlerTel">
-              {{ handler.garOrderHandlerName }}
-            </option>
-          </select>
-        </view>
-
-        <view class="number-box-wrapper">
-          <text class="number-label">趟次数量:</text>
-          <u-number-box
-              v-model="carCount"
-              :min="0"
-              :max="999"
-              integer
-              buttonSize="46"
-              inputWidth="70">
-          </u-number-box>
-        </view>
-
-        <u-button
-            type="success"
-            class="confirm-button"
-            @click="confirmAddVehicle"
-            :disabled="!isDriverAssigned">
-          确定
-        </u-button>
-      </view>
-    </view>
-
-        <view class="assign-trip-card" v-if="dataGram.garEvaluateFlag !== 0 && userType === '用户'">
-          <view class="card-header">
-            <u-icon name="edit-pen" size="18" color="#19a97c"></u-icon>
-            <text class="card-title">新增车辆</text>
-          </view>
-          <view class="assign-content">
-            <view class="selector-wrapper">
-              <text class="selector-label">新增车辆:</text>
-              <select v-model="selectedHandlerTels" class="handler-selector">
-                <option value="">请选择新增车型</option>
-                <option
-                    v-for="car in garCarTypeList"
-                    :key="car.garOrderCarType"
-                    :value="car.garOrderCarType">
-                  {{ car.garOrderCarType }}
-                </option>
-              </select>
-            </view>
-
-            <view class="number-box-wrapper">
-              <text class="number-label">趟次数量:</text>
+            <view class="handler-trip-controls">
               <u-number-box
-                  v-model="carCount"
+                  v-model="item.carCountInput"
                   :min="0"
                   :max="999"
                   integer
-                  buttonSize="46"
-                  inputWidth="70">
+                  buttonSize="30"
+                  inputWidth="50">
               </u-number-box>
+              <u-button
+                  type="success"
+                  size="mini"
+                  class="assign-button"
+                  @click="assignTripToHandler(item)">
+                {{ item.garCarCount && item.garCarCount > 0 ? '修改' : '分配' }}
+              </u-button>
+              <u-button
+                  type="error"
+                  size="mini"
+                  class="delete-button"
+                  @click="deleteHandler(item)">
+                删除
+              </u-button>
             </view>
-
-            <u-button
-                type="success"
-                class="confirm-button"
-                @click="confirmAddVehicles"
-                >
-              确定
-            </u-button>
           </view>
         </view>
-    </view>
+      </view>
       <!-- 订单人员 -->
-      <view class="order-detail-container-box-card order-person-section">
+      <view class="order-detail-container-box-card order-person-section" v-if="userType !== '用户'">
         <view class="section-header">
           <view class="header-icon-bar"></view>
           <u-icon name="account" size="22" color="#fff" style="margin-right: 8rpx;"></u-icon>
@@ -390,8 +304,8 @@
           <text class="empty-text">暂无处理照片</text>
         </view>
       </view>
-			<view class="space-box">{{ spaceStr }}</view>
-		</view>
+      <view class="space-box">{{ spaceStr }}</view>
+    </view>
     <!-- 占位符 -->
     <view class="order-detail-bottom">
@@ -449,15 +363,15 @@
         </view>
       </view>
     </view>
-		<u-action-sheet :closeOnClickOverlay="true" :closeOnClickAction="false" @actionSheetClose="handleClose"
-			@submitFunction="submitFunction" @select="selectClick" :actions="list" round="15" title="取消订单"
-			:show="cancelShow">
-		</u-action-sheet>
-	</view>
-	<view v-if="showUQRcode" class="mask-container" @click="showUQRcode = false">
-		<uqrcode :h5SaveIsDownload="true" ref="qrCodeRef" canvas-id="qrcode" :value="qrCodeText"
-			:options="{ margin: 10, boxSizing: borderBox }"></uqrcode>
-	</view>
+    <u-action-sheet :closeOnClickOverlay="true" :closeOnClickAction="false" @actionSheetClose="handleClose"
+                    @submitFunction="submitFunction" @select="selectClick" :actions="list" round="15" title="取消订单"
+                    :show="cancelShow">
+    </u-action-sheet>
+  </view>
+  <view v-if="showUQRcode" class="mask-container" @click="showUQRcode = false">
+    <uqrcode :h5SaveIsDownload="true" ref="qrCodeRef" canvas-id="qrcode" :value="qrCodeText"
+             :options="{ margin: 10, boxSizing: borderBox }"></uqrcode>
+  </view>
   <u-popup :zIndex="10075" closeOnClickOverlay :show="driverListPopupShowFlag" :round="10" @close="driverListPopupShowFlag = false">
     <view class="driver-list-popup">
@@ -480,1820 +394,2021 @@
   </u-popup>
 </template>
-<script setup>
-	import {
-		queryCarList
-	} from '@/apis/carinfo.js';
-  import {
-    dispatchDisposalOrders,
-    dispatchOrders,
-    getGarOrderMatchHandlers,
-    queryDisposalDispatch,
-    queryOrderDetail,
-    queryOrderDispatch,
-    sendToDriver,
-    updateGarRealCarCount,
-    updateOrder,
-    queryCarCode,
-    queryByOrderNo,
-    updateCarCount,
-    queryGarRealCarCountByGarOrderNo,
-    selectGarOrderCar,
-    insertRandomCopyByTypeAndOrderId
-  } from "@/apis/order.js";
-	import {
-		createQrCode
-	} from '@/apis/qrcode.js';
-	import uqrcode from '@/components/Sansnn-uQRCode_4.0.6/components/uqrcode/uqrcode.vue';
-	import clashDisposalDispatch from '@/components/clash-disposal-dispatch/index.vue';
-	import clashDriverDispatch from '@/components/clash-driver-dispatch/index.vue';
-	import zStatic from '@/components/z-paging/js/z-paging-static';
-	import {
-		useMainStore
-	} from '@/stores/index.js';
-	import {
-		onLoad,
-		onShow
-	} from '@dcloudio/uni-app';
-  import {
-    computed, watch
-  } from 'vue';
-  import { ref } from 'vue';
-	const paramFrom = ref({
-		carNumber: 0,
-		carType: ""
-	})
-  const totalCarNumber = ref(0);
-  const driverListPopupShowFlag = ref(false);
-  const driverListForAssignment = ref([]);
-	const garCarInfoList = ref({})
-	const carPopupShowFlag = ref(false)
-  const driverList = ref([]);
-	const isOnloadIn = ref(false)
-	const clashDriverDispatchRef = ref()
-	const clashDisposalDispatchRef = ref()
-	const driverPersonnelList = ref([])
-	const disposalPersonnelList = ref([])
-  const handlerList = ref([])
-  const orderNo = ref(null)
-  const carCount = ref(null)
-  const tel = ref(null)
-  const selectedHandlerTel = ref("")
-  const realCarCount = ref(null)
-	const store = useMainStore();
-	const userType = computed(() => store.userType)
-	const dataGram = ref();
-	const orderId = ref(null)
-	const currentImages = ref([])
-	const putOnImages = ref([])
-	const putOnImagesGrouped = ref([])  // 新增这个变量
-	const putDownImages = ref([])
-	const emptyBase64Image = ref(zStatic.base64Empty)
-	const showUQRcode = ref(false)
-	const spaceStr = ref("")
-	const cancelShow = ref(false)
-	const currentCancelName = ref("")
-	const qrCodeRef = ref()
-	const qrCodeText = ref()
-	const candidates = ref([])
-	const garCarLabelInfoList = ref({})
-	const garCarLabelInfoNow = ref()
-  const selectedHandlerTels = ref("")
-  const garCarTypeList = ref([])
-  const driverAssigned = ref(false);  // 添加这行，跟踪驾驶员是否已分配
-  const disposalAssigned = ref(false);  // 添加这行，跟踪处置场所是否已分配
-
-
-  const isInTransit = (index) => {
-    // 如果订单已完成，所有趟次都不是"清运中"
-    if (dataGram.value.garOrderHandlerStatus === 3) {
-      return false;
-    }
+<script setup>import {
+  queryCarList
+} from '@/apis/carinfo.js';
+import {
+  dispatchDisposalOrders,
+  dispatchOrders,
+  getGarOrderMatchHandlers,
+  queryDisposalDispatch,
+  queryOrderDetail,
+  queryOrderDispatch,
+  sendToDriver,
+  updateGarRealCarCount,
+  updateOrder,
+  queryCarCode,
+  queryByOrderNo,
+  updateCarCount,
+  queryGarRealCarCountByGarOrderNo,
+  selectGarOrderCar,
+  insertRandomCopyByTypeAndOrderId, deleteDriverByOrderNo
+} from "@/apis/order.js";
+import {
+  createQrCode
+} from '@/apis/qrcode.js';
+import uqrcode from '@/components/Sansnn-uQRCode_4.0.6/components/uqrcode/uqrcode.vue';
+import clashDisposalDispatch from '@/components/clash-disposal-dispatch/index.vue';
+import clashDriverDispatch from '@/components/clash-driver-dispatch/index.vue';
+import zStatic from '@/components/z-paging/js/z-paging-static';
+import {
+  useMainStore
+} from '@/stores/index.js';
+import {
+  onLoad,
+  onShow
+} from '@dcloudio/uni-app';
+import {
+  computed, watch
+} from 'vue';
+import { ref } from 'vue';
+const paramFrom = ref({
+  carNumber: 0,
+  carType: ""
+})
+const totalCarNumber = ref(0);
+const driverListPopupShowFlag = ref(false);
+const driverListForAssignment = ref([]);
+const garCarInfoList = ref({})
+const carPopupShowFlag = ref(false)
+const driverList = ref([]);
+const isOnloadIn = ref(false)
+const clashDriverDispatchRef = ref()
+const clashDisposalDispatchRef = ref()
+const driverPersonnelList = ref([])
+const disposalPersonnelList = ref([])
+const handlerList = ref([])
+const orderNo = ref(null)
+const carCount = ref(null)
+const tel = ref(null)
+const selectedHandlerTel = ref("")
+const realCarCount = ref(null)
+const store = useMainStore();
+const userType = computed(() => store.userType)
+const dataGram = ref();
+const orderId = ref(null)
+const currentImages = ref([])
+const putOnImages = ref([])
+const putOnImagesGrouped = ref([])  // 新增这个变量
+const putDownImages = ref([])
+const emptyBase64Image = ref(zStatic.base64Empty)
+const showUQRcode = ref(false)
+const spaceStr = ref("")
+const cancelShow = ref(false)
+const currentCancelName = ref("")
+const qrCodeRef = ref()
+const qrCodeText = ref()
+const candidates = ref([])
+const garCarLabelInfoList = ref({})
+const garCarLabelInfoNow = ref()
+const selectedHandlerTels = ref("")
+const garCarTypeList = ref([])
+const driverAssigned = ref(false);  // 添加这行，跟踪驾驶员是否已分配
+const disposalAssigned = ref(false);  // 添加这行，跟踪处置场所是否已分配
+// 新增：用于存储待分配的驾驶员列表
+const pendingDriverAssignments = ref({})
+
+
+const isInTransit = (index) => {
+  // 如果订单已完成，所有趟次都不是"清运中"
+  if (dataGram.value.garOrderHandlerStatus === 3) {
+    return false;
+  }
-    // 当前正在清运的趟次索引（从1开始）
-    const currentTransitIndex = putOnImagesGrouped.value.length;
+  // 当前正在清运的趟次索引（从1开始）
+  const currentTransitIndex = putOnImagesGrouped.value.length;
-    // 只有当前趟次是"清运中"
-    return index === currentTransitIndex;
-  };
+  // 只有当前趟次是"清运中"
+  return index === currentTransitIndex;
+};
-  const isCompleted = (index) => {
-    // 如果订单已完成，所有趟次都是"已运完"
-    if (dataGram.value.garOrderHandlerStatus === 3) {
-      return true;
-    }
+const isCompleted = (index) => {
+  // 如果订单已完成，所有趟次都是"已运完"
+  if (dataGram.value.garOrderHandlerStatus === 3) {
+    return true;
+  }
-    // 已完成的趟次索引小于当前正在清运的趟次索引
-    const currentTransitIndex = putOnImagesGrouped.value.length;
+  // 已完成的趟次索引小于当前正在清运的趟次索引
+  const currentTransitIndex = putOnImagesGrouped.value.length;
-    return index < currentTransitIndex;
-  };
+  return index < currentTransitIndex;
+};
-  const getStatusText = (index) => {
-    // 如果订单已完成，显示"已运完"
-    if (dataGram.value.garOrderHandlerStatus === 3) {
-      return '已运完';
-    }
+const getStatusText = (index) => {
+  // 如果订单已完成，显示"已运完"
+  if (dataGram.value.garOrderHandlerStatus === 3) {
+    return '已运完';
+  }
-    // 当前正在清运的趟次索引（从1开始）
-    const currentTransitIndex = putOnImagesGrouped.value.length;
+  // 当前正在清运的趟次索引（从1开始）
+  const currentTransitIndex = putOnImagesGrouped.value.length;
-    if (index === currentTransitIndex) {
-      return '正在清运';
-    } else if (index < currentTransitIndex) {
-      return '已运完';
-    } else {
-      return '正在清运';
+  if (index === currentTransitIndex) {
+    return '正在清运';
+  } else if (index < currentTransitIndex) {
+    return '已运完';
+  } else {
+    return '正在清运';
+  }
+};
+
+const list = computed(() => {
+  let reason = [{
+    name: '订单信息填写有误',
+  },
+    {
+      name: '线下协商有问题',
+    },
+    {
+      name: '不需要清运了',
+    },
+    {
+      name: '其他',
+    },
+    {
+      name: '提交',
     }
-  };
-
-	const list = computed(() => {
-		let reason = [{
-				name: '订单信息填写有误',
-			},
-			{
-				name: '线下协商有问题',
-			},
-			{
-				name: '不需要清运了',
-			},
-			{
-				name: '其他',
-			},
-			{
-				name: '提交',
-			}
-		]
-		if (userType.value === '用户') {
-			reason.unshift({
-				name: '长时间无人接单',
-			})
-		}
-		return reason
-	})
-
-  const isDriverAssigned = computed(() => {
-    // 检查是否有分配的驾驶员
-    return handlerList.value && handlerList.value.length > 0;
-  });
-  const isDriverAndDisposalAssigned = () => {
-    // 直接使用已有的响应式变量来判断分配状态
-    const hasDrivers = driverAssigned.value;
-    const hasDisposalSites = disposalAssigned.value;
-
-    return hasDrivers && hasDisposalSites;
-  };
+  ]
+  if (userType.value === '用户') {
+    reason.unshift({
+      name: '长时间无人接单',
+    })
+  }
+  return reason
+})
+
+const isDriverAssigned = computed(() => {
+  // 检查是否有分配的驾驶员
+  return handlerList.value && handlerList.value.length > 0;
+});
+const isDriverAndDisposalAssigned = () => {
+  // 直接使用已有的响应式变量来判断分配状态
+  const hasDrivers = driverAssigned.value || (pendingDriverAssignments.value && Object.keys(pendingDriverAssignments.value).length > 0);
+  const hasDisposalSites = disposalAssigned.value;
+
+  return hasDrivers && hasDisposalSites;
+};
+
+const isAllTripsCompleted = () => {
+  // 检查所有趟次是否已完成
+  if (!dataGram.value || !dataGram.value.garCarInfoList || !putOnImagesGrouped.value) {
+    return false;
+  }
-	const isAllTripsCompleted = () => {
-		// 检查所有趟次是否已完成
-		if (!dataGram.value || !dataGram.value.garCarInfoList || !putOnImagesGrouped.value) {
-			return false;
-		}
+  // 获取订单要求的趟次数
+  const requiredTrips = dataGram.value.garCarInfoList.length;
-		// 获取订单要求的趟次数
-		const requiredTrips = dataGram.value.garCarInfoList.length;
+  // 获取实际完成的趟次数
+  const completedTrips = putOnImagesGrouped.value.length;
-		// 获取实际完成的趟次数
-		const completedTrips = putOnImagesGrouped.value.length;
+  // 如果完成的趟次数大于等于要求的趟次数，则表示全部运完
+  console.log("实际完成次数" + completedTrips + "要求次数" + requiredTrips)
+  return completedTrips >= requiredTrips;
+}
-		// 如果完成的趟次数大于等于要求的趟次数，则表示全部运完
-    console.log("实际完成次数" + completedTrips + "要求次数" + requiredTrips)
-		return completedTrips >= requiredTrips;
-	}
+const assignTripToDriver = ()=>{
+  sendToDriver(orderId.value).then(res=>{
+    if (res.data.success) {
+      uni.$u.toast('分配成功');
+    }
+  })
+}
+// 获取驾驶员列表的方法
+const fetchDriverList = (orderId) => {
+  queryCarCode(orderId).then(res => {
+    if (res.data.success) {
+      driverList.value = res.data.data;
+    }
+  });
+};
+
+watch(selectedHandlerTel, (newVal) => {
+  tel.value = newVal;
+});
+
+const refreshOrderData = () => {
+  // 刷新处理人员列表
+  queryByOrderNo(orderNo.value).then(res => {
+    if (res.data.success) {
+      handlerList.value = res.data.data
+      // 为每个处理人员初始化输入框的值
+      handlerList.value.forEach(handler => {
+        // 将已分配的趟次数量作为初始值
+        handler.carCountInput = handler.garCarCount || 0;
+      });
+    }
+  }).catch(err => {
+    console.error('获取订单信息失败:', err);
+  })
+
+  // 刷新总趟次数
+  queryGarRealCarCountByGarOrderNo(orderNo.value).then(res => {
+    if (res.data.success) {
+      realCarCount.value = res.data.data
+    }
+  })
-  const assignTripToDriver = ()=>{
-    sendToDriver(orderId.value).then(res=>{
-      if (res.data.success) {
-        uni.$u.toast('分配成功');
-      }
-    })
+  selectGarOrderCar(orderNo.value).then(res => {
+    if (res.data.success) {
+      garCarTypeList.value = res.data.data
+    }
+  })
+};
+
+const onCarCountChange = (e, handler) => {
+  handler.carCountInput = e.value;
+};
+
+const assignTripToHandler = (handler) => {
+  // 检查必填字段
+  if (handler.carCountInput === undefined || handler.carCountInput === null) {
+    uni.$u.toast(`请输入分配的趟次!`);
+    return;
   }
-  // 获取驾驶员列表的方法
-  const fetchDriverList = (orderId) => {
-    queryCarCode(orderId).then(res => {
-      if (res.data.success) {
-        driverList.value = res.data.data;
-      }
-    });
-  };
-  watch(selectedHandlerTel, (newVal) => {
-    tel.value = newVal;
-  });
+  // 确保输入的是非负整数
+  if (handler.carCountInput < 0) {
+    uni.$u.toast(`分配趟次不能为负数!`);
+    handler.carCountInput = handler.garCarCount || 0;
+    return;
+  }
-  const refreshOrderData = () => {
-    // 刷新处理人员列表
-    queryByOrderNo(orderNo.value).then(res => {
-      if (res.data.success) {
-        handlerList.value = res.data.data
-      }
-    }).catch(err => {
-      console.error('获取订单信息失败:', err);
-    })
+  // 获取当前已分配的趟次数
+  const currentAllocated = handler.garCarCount || 0;
-    // 刷新总趟次数
-    queryGarRealCarCountByGarOrderNo(orderNo.value).then(res => {
-      if (res.data.success) {
-        realCarCount.value = res.data.data
-      }
-    })
+  // 计算需要增加或减少的趟次数
+  let delta = handler.carCountInput - currentAllocated;
-    selectGarOrderCar(orderNo.value).then(res => {
-      if (res.data.success) {
-        garCarTypeList.value = res.data.data
-      }
-    })
-  };
-  const confirmAddVehicles = () =>{
-    const params = {
-      carCount: carCount.value,
-      tel: tel.value,
-      orderNo : orderNo.value,
-      orderCarType :selectedHandlerTels.value
-    };
-    if(selectedHandlerTels.value === ""){
-      uni.$u.toast(`请选择车型!`);
-      return;
-    }
-    insertRandomCopyByTypeAndOrderId(params).then(res => {
-      if (res.data.success) {
-        uni.$u.toast(`添加成功!`);
-        // 刷新订单详情
-        handleOrderDetail(orderId.value);
-        refreshOrderData()
-      } else {
-        uni.$u.toast(`添加失败!`);
-      }
-    })
+  // 如果没有变化则不处理
+  if (delta === 0) {
+    uni.$u.toast('分配数量未发生变化');
+    return;
   }
+  // 检查如果是增加操作，是否会超过总需求趟次
+  if (delta > 0) {
+    // 检查已分配趟次总和是否超过订单要求的总发车次数（排除当前正在修改的人员）
+    const allocatedTrips = handlerList.value.reduce((sum, h) => {
+      // 如果是当前正在操作的handler，就不要把它已有的趟次算进去
+      if (h.garOrderHandlerTel === handler.garOrderHandlerTel) {
+        return sum;
+      }
+      return sum + parseInt(h.garCarCount || 0);
+    }, 0);
+    const totalRequiredTrips = realCarCount.value || 0;
-  const confirmAddVehicle = () => {
-
-    // 检查必填字段
-    if (!carCount.value) {
-      uni.$u.toast(`请选择分配的趟次!`);
-      return;
-    }
-    if (!tel.value) {
-      uni.$u.toast(`请选择分配人员!`);
+    if (allocatedTrips + handler.carCountInput > totalRequiredTrips) {
+      uni.$u.toast(`分配趟次过多，最多只能再分配${totalRequiredTrips - allocatedTrips}趟!`);
+      // 将输入框重置为之前的值
+      handler.carCountInput = handler.garCarCount || 0;
       return;
     }
+  }
+  // 调用API传递订单ID和车辆数量（传递差值，可能是负数）
+  const params = {
+    carCount: delta, // 传递差值，可能是正数（增加）或负数（减少）
+    tel: handler.garOrderHandlerTel,
+    orderNo : orderNo.value
+  };
-    if (selectedHandlerTel.value === 'ADD_TOTAL_TRIPS') {
-      updateGarRealCarCount(orderId.value, carCount.value)
-          .then(res => {
-            if (res.data.success) {
-              uni.$u.toast(`总趟次更新成功!`);
-              // 刷新订单详情
-              handleOrderDetail(orderId.value);
-              refreshOrderData()
-            } else {
-              uni.$u.toast(`总趟次更新失败!`);
-            }
-          })
-          .catch(err => {
-            uni.$u.toast('总趟次更新请求失败');
-            console.error('总趟次更新失败:', err);
-          });
-      return;
+  updateCarCount(params)
+      .then(res => {
+        if (res.data.success) {
+          if (delta === 0) {
+            uni.$u.toast('取消分配成功!');
+          } else if (delta > 0) {
+            uni.$u.toast('增加分配成功!');
+          } else {
+            uni.$u.toast('减少分配成功!');
+          }
+          // 刷新订单详情
+          handleOrderDetail(orderId.value);
+          refreshOrderData()
+        } else {
+          uni.$u.toast('操作失败!');
+          // 将输入框重置为之前的值
+          handler.carCountInput = handler.garCarCount || 0;
+        }
+      })
+      .catch(err => {
+        uni.$u.toast('操作失败');
+        console.error('操作失败:', err);
+        // 将输入框重置为之前的值
+        handler.carCountInput = handler.garCarCount || 0;
+      });
+};
+
+const confirmAddVehicles = () =>{
+  const params = {
+    carCount: carCount.value,
+    tel: tel.value,
+    orderNo : orderNo.value,
+    orderCarType :selectedHandlerTels.value
+  };
+  if(selectedHandlerTels.value === ""){
+    uni.$u.toast(`请选择车型!`);
+    return;
+  }
+  insertRandomCopyByTypeAndOrderId(params).then(res => {
+    if (res.data.success) {
+      uni.$u.toast(`添加成功!`);
+      // 刷新订单详情
+      handleOrderDetail(orderId.value);
+      refreshOrderData()
+    } else {
+      uni.$u.toast(`添加失败!`);
     }
+  })
+}
-    // 检查已分配趟次总和是否超过订单要求的总发车次数
-    const allocatedTrips = handlerList.value.reduce((sum, handler) => sum + parseInt(handler.garCarCount || 0), 0);
-    const totalRequiredTrips = realCarCount.value || 0;
-    console.log('已分配趟次总和:', allocatedTrips);
-    console.log('总需求趟次:', totalRequiredTrips);
-    if (allocatedTrips >= totalRequiredTrips) {
-      uni.$u.toast(`全部趟次已分配完成，无需再分配!`);
-      return;
-    }
+const confirmAddVehicle = () => {
-    // 检查本次分配后是否会超过总发车次数
-    if (allocatedTrips + carCount.value > totalRequiredTrips) {
-      uni.$u.toast(`分配趟次过多，最多只能再分配${totalRequiredTrips - allocatedTrips}趟!`);
-      return;
-    }
+  // 检查必填字段
+  if (!carCount.value) {
+    uni.$u.toast(`请选择分配的趟次!`);
+    return;
+  }
+  if (!tel.value) {
+    uni.$u.toast(`请选择分配人员!`);
+    return;
+  }
-    // 调用API传递订单ID和新增车辆数量
-    const params = {
-      carCount: carCount.value,
-      tel: tel.value,
-      orderNo : orderNo.value
-    };
-    updateCarCount(params)
+  if (selectedHandlerTel.value === 'ADD_TOTAL_TRIPS') {
+    updateGarRealCarCount(orderId.value, carCount.value)
         .then(res => {
           if (res.data.success) {
-            uni.$u.toast(`分配成功!`);
+            uni.$u.toast(`总趟次更新成功!`);
             // 刷新订单详情
             handleOrderDetail(orderId.value);
-            queryByOrderNo(orderNo.value).then(res => {
-              if (res.data.success) {
-                handlerList.value = res.data.data
-              }
-            }).catch(err => {
-              console.error('获取订单信息失败:', err);
-            })
+            refreshOrderData()
           } else {
-            uni.$u.toast(`分配失败!`);
+            uni.$u.toast(`总趟次更新失败!`);
           }
         })
         .catch(err => {
-          uni.$u.toast('新增车辆请求失败');
-          console.error('新增车辆失败:', err);
+          uni.$u.toast('总趟次更新请求失败');
+          console.error('总趟次更新失败:', err);
         });
-  };
+    return;
+  }
-	const handlePopupClick = (val) => {
-		carPopupShowFlag.value = val
-	}
-	// 创建二维码
-	const createQrCodeLocal = (orderId) => {
-		// 获取本地地址拼接订单id
-		showUQRcode.value = true;
-		const hostname = window.location.hostname;
-		const port = window.location.port;
-		const protocol = window.location.protocol;
-		const localAddress = `${protocol}//${hostname}:${port}`;
-		// const localAddress = `http://localhost:5173`;
-		qrCodeText.value = localAddress + "/pages/order-info/order-other/guest/index?orderId=" + orderId;
-		console.log(qrCodeRef.value);
-	}
-	// 获取二维码
-	const handleQrCodeClick = (orderId) => {
-		// 微信小程序可用
-		// #ifdef MP-WEIXIN
-		createQrCode(orderId).then((res) => {
-			if (res.data.success) {
-				uni.previewImage({
-					urls: [res.data.data],
-					longPressActions: {
-						itemList: ['发送给朋友', '保存图片', '收藏'],
-						success: function(res) {
-							console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
-						},
-						fail: function(res) {
-							console.log(res);
-						}
-					}
-				})
-			}
-		})
-		// #endif
-		// H5
-		// #ifdef H5
-		createQrCodeLocal(orderId)
-		// #endif
-	}
-
-	const handleOrderDispatchClick = (orderId) => {
-		// 获取订单车辆数量
-		const orderCarCount = dataGram.value?.garCarInfoList?.length || 0;
-		
-		// 获取驾驶员人员
-		queryOrderDispatch(orderId).then(res => {
-			console.log(res.data.data);
-			if (res.data.success) {
-				// 过滤车辆  非用户选择的车辆无法选中
-				driverPersonnelList.value = res.data.data;
-				// 恢复原始的open调用方式，只传递dataList
-				clashDriverDispatchRef.value.open(res.data.data);
-        refreshOrderData()
-			} else {
-				uni.$u.toast("驾驶员分配成功！");
-        refreshOrderData()
-			}
-		})
-	}
-	const handleDisposalDispatchClick = (orderId) => {
-		// 获取处置场所人员
-		queryDisposalDispatch(orderId).then(res => {
-			if (res.data.success) {
-				disposalPersonnelList.value = res.data.data
-				clashDisposalDispatchRef.value.open(res.data.data)
-        refreshOrderData()
-			} else {
-				uni.$u.toast("处理场所分配成功！")
-        refreshOrderData()
-			}
-		})
-	}
-
-
-
-	const handleClose = (e) => {
-		cancelShow.value = false
-	}
-	const handleEvaluateDetail = (orderId, userType) => {
-		uni.$u.route(`pages/order-info/order-other/evaluate-info/index`, {
-			orderId: orderId,
-			userType: userType
-		})
-	}
-	const selectClick = (index) => {
-		currentCancelName.value = index.name;
-	}
-	const handleOrderDetail = (orderId) => {
-		queryOrderDetail(orderId).then(res => {
-			dataGram.value = res.data.data;
-      fetchDriverList(orderId);
-			currentImages.value = res.data.data.currentImages.map(item => {
-				return {
-					url: import.meta.env.VITE_BASE_URL + item
-				};
-			});
-			
-			putOnImages.value = res.data.data.putOnImages.map(item => {
-			let processedItem = item;
-			let carName = '';
-
-			// 提取name后面的字符串作为carName并从item中移除
-			if (item.includes('name')) {
-				const nameIndex = item.indexOf('name');
-				carName = item.substring(nameIndex + 4);
-
-				processedItem = item.substring(0, nameIndex);
-			}
-
-			// 保持原有逻辑不变，但添加carName到返回对象
-			const newItem = processedItem.substring(0, processedItem.length - 6);
-			const newIndex = processedItem.substring(processedItem.length - 6);
-			return { url: import.meta.env.VITE_BASE_URL + newItem, newIndex, carName };
-			});
-
-			// 按照newIndex升序排序
-			putOnImages.value.sort((a, b) => {
-			return parseInt(a.newIndex) - parseInt(b.newIndex);
-			});
-
-			// 重新组织数据，将相同newIndex的图片放在一起
-			const groupedImages = {};
-			putOnImages.value.forEach(item => {
-			if (!groupedImages[item.newIndex]) {
-				groupedImages[item.newIndex] = [];
-			}
-			groupedImages[item.newIndex].push(item);
-			});
-
-			// 转换newIndex为1,2,3的连续数字
-			const sortedKeys = Object.keys(groupedImages).sort((a, b) => parseInt(a) - parseInt(b));
-				const newGroupedImages = {};
-				sortedKeys.forEach((key, index) => {
-				newGroupedImages[index + 1] = groupedImages[key];
-			});
-
-			// 转换为数组形式，方便在模板中遍历
-			putOnImagesGrouped.value = Object.keys(newGroupedImages).map(key => ({
-				index: key,
-				images: newGroupedImages[key],
-        carName: newGroupedImages[key] && newGroupedImages[key].length > 0 ? newGroupedImages[key][0].carName : ''
-			}));
-   			console.log('putOnImagesGrouped.value:', putOnImagesGrouped.value);
-			putDownImages.value = res.data.data.putDownImages.map(item => {
-				return {
-					url: import.meta.env.VITE_BASE_URL + item
-				};
-			});
-		})
-	}
-	/**
-	 * 拨打电话回调
-	 */
-	const handleContactClick = (val) => {
-		uni.makePhoneCall({
-			phoneNumber: val
-		}).then(res => {}).catch(err => {});
-	}
-
-	const handlerJumpOtherApp = (latitude, longitude, garCoordinate) => {
-		console.log(latitude + "=================>" + longitude);
-		// 给出提示确定要跳转吗
-		uni.showModal({
-			title: '提示',
-			content: '是否跳转到app定位进行导航？',
-			success: function(res) {
-				if (res.confirm) {
-					uni.openLocation({
-						latitude: latitude,
-						longitude: longitude,
-						success: function() {
-							console.log('success');
-						}
-					});
-				}
-			}
-		})
-	}
-
-	/**
-	 * 取消订单
-	 * @param {*} orderId
-	 */
-	const handleOderCancelClick = () => {
-		cancelShow.value = true;
-	}
-
-	/**
-	 * 提交取消订单
-	 */
-	const submitFunction = (otherReason) => {
-		let reason = otherReason
-		if (currentCancelName.value != "其他") {
-			reason = currentCancelName.value
-		}
-		if (!reason) {
-			uni.$u.toast("请提供取消订单的原因")
-			return
-		}
-		let params = {
-			garOrderId: orderId.value,
-			garCancelFlag: 1,
-			garReason: reason
-		}
-		updateOrder(params).then(res => {
-			if (res.data.success) {
-				cancelShow.value = false
-				uni.$u.toast(res.data.data)
-				uni.$u.route({
-					type: "reLaunch",
-					url: `pages/order/index`,
-				})
-			}
-		})
-	}
-	// 提交完成
-const handleSubmitSuccess = (orderId) => {
-		uni.showModal({
-			title: '提示',
-			content: '订单已经清运完成了吗？',
-			success: function(res) {
-				if (res.confirm) {
-					updateOrder({
-						garOrderId: orderId,
-						handleType: 3
-					}).then(res => {
-						if (res.data.success) {
-							uni.$u.toast("已完成")
-							handleOrderDetail(orderId)
-						}
-					})
-				} else if (res.cancel) {}
-			}
-		});
-	}
-	const handleEvaluate = (orderId, userType) => {
-		uni.$u.route(`pages/order-info/order-other/evaluate/index?orderId=${orderId}&userType=${userType}`)
-	}
-
-	// 接收订单
-	const handleOrder = (orderId) => {
-		updateOrder({
-			garOrderId: orderId,
-			handleType: 0
-		}).then(res => {
-			if (res.data.success) {
-				if (res.data.data === "订单已经被别人接受啦") {
-					uni.$u.toast(res.data.data)
-					uni.$u.route({
-						type: "reLaunch",
-						url: `pages/order/index`,
-					})
-				} else {
-					uni.$u.toast(res.data.data)
-					handleOrderDetail(orderId)
-          refreshOrderData()
-				}
-			}
-		})
-	}
-
-	const currentStep = (step) => {
-		if (step > 2) {
-			return step - 1;
-		}
-		return step;
-	}
-
-	/**
-	 * 清运状态
-	 * @param {*} status
-	 */
-	const cleanStatus = (status) => {
-		if (dataGram.garCancelFlag === 1) {
-			return '取消清运';
-		}
-		switch (status) {
-			case 0:
-				return '准备清运';
-			case 1:
-				return '正在清运';
-			case 3:
-				return '清运完成';
-		}
-	}
-
-		const handleDisposalDispatchConfirm = (val) => {
-		console.log(val);
-		if (!val) {
-			return
-		}
-		let data = {
-			garOrderId: orderId.value,
-			dispatchList: []
-		}
-		for (const key in val) {
-			data.dispatchList.push({
-				...val[key]
-			});
-		}
-		console.log(data);
-		dispatchDisposalOrders(data).then(res => {
-			if (res.data.success) {
-				uni.$u.toast(res.data.msg)
-				// 标记处置场所已分配
-				disposalAssigned.value = true;
-				// 检查是否两个任务都已完成
-			} else {
-				uni.$u.toast("指定人员失败，请重试")
-			}
-			clashDriverDispatchRef.value.close()
-		})
-	}
-
-	const handlerUpdateOrderClick = () => {
-		carPopupShowFlag.value = true;
-		// TODO  照搬一键清运得弹窗
-		console.log("点击了修改订单按钮");
-		// TODO
-		queryCarList({
-			companyId: dataGram.value.garOrderCompanyId
-		}).then(res => {
-			// 设置车辆类型
-			candidates.value = [
-				[...new Set(res.data.rows
-					.filter(item => item.containerVolume)
-					.map(item => {
-						garCarLabelInfoList.value[item.carType] = item
-						return item.carType
-					}))]
-			];
-			// 设置初始车辆数量
-			candidates.value[0].forEach((item, index) => {
-				garCarInfoList.value[item] = {
-					garOrderCarNumber: 1,
-					garOrderCarType: item,
-					id: garCarLabelInfoList.value[item].id,
-					containerVolume: garCarLabelInfoList.value[item].containerVolume
-				}
-			})
-			// 设置默认车辆
-			paramFrom.value.carType = candidates.value[0][0];
-			garCarLabelInfoNow.value = garCarLabelInfoList.value[paramFrom.value.carType]
-			console.log(garCarLabelInfoList.value, garCarInfoList.value, paramFrom.value.carType);
-		})
-	}
-	// 指定人员
-const handleDriverDispatchConfirm = (val) => {
-		console.log(val);
-		if (!val) {
-			return;
-		}
-		
-		// 获取订单车辆数量
-		const orderCarCount = dataGram.value?.garCarInfoList?.length || 0;
-		
-		// 计算选择的驾驶员数量
-		const selectedDriverCount = Object.keys(val).length;
-		
-		// 检查驾驶员数量是否超过订单车辆数量
-		if (selectedDriverCount > orderCarCount) {
-			jumpPrompt(`选择的驾驶员数量不能超过${orderCarCount}个`);
-			return;
-		}
-		
-		let data = {
-			garOrderId: orderId.value,
-			dispatchList: []
-		}
-		for (const key in val) {
-			data.dispatchList.push({
-				...val[key]
-			});
-		}
-		console.log(data);
-		dispatchOrders(data).then(res => {
-			if (res.data.success) {
-				uni.$u.toast(res.data.msg);
-				// 标记驾驶员已分配
-				driverAssigned.value = true;
-        refreshOrderData();
-			} else {
-				uni.$u.toast("指定人员失败，请重试");
-			}
-			clashDriverDispatchRef.value.close();
-		})
-	}
-
-	const submitUpdateCarInfo = () => {
-		let garCarInfos = [];
-		for (const key in garCarInfoList.value) {
-			garCarInfos.push(garCarInfoList.value[key])
-		}
-
-		let data = {
-			garOrderId: orderId.value,
-			garCarInfoList: garCarInfos,
-			updated: true
-		}
-		if (dataGram.value.garOrderAgreementTime) {
-			let index = dataGram.value.garOrderAgreementTime.indexOf(' ') + 1;
-			if (index > 0) {
-				let val = dataGram.value.garOrderAgreementTime.substring(index, dataGram.value.garOrderAgreementTime
-					.length);
-
-
-				if (val == "07:00-08:00" || val == "08:00-09:00" || val == "09:00-10:00" || val == "10:00-11:00" ||
-					val == "11:00-12:00" || val == "12:00-13:00" || val == "13:00-14:00" ||
-					val == "14:00-15:00" || val == "15:00-16:00" || val == "16:00-17:00" || val == "17:00-18:00" ||
-					val == "18:00-19:00" || val == "19:00-20:00" || val == "20:00-21:00" ||
-					val == "21:00-22:00") {
-					let size = garCarInfos.length;
-					for (let index = 0; index < size; index++) {
-						if ((garCarInfos[index].containerVolume == "8" || parseInt(garCarInfos[index]
-								.containerVolume) >= 8) && garCarInfos[index].garOrderCarNumber > 0) {
-							console.log(garCarInfos[index]);
-
-							jumpPrompt("中大型车辆只能选择22:00-07:00时间段");
-							return;
-						}
-
-					}
-				}
-
-			}
-
-		}
-		console.log(dataGram.value.garOrderAgreementTime);
-		console.log(garCarInfos);
-		console.log("=================================>");
-
-
-		updateOrder(data).then(res => {
-			if (res.data.code == 200) {
-				uni.$u.toast("车辆信息修改成功")
-				// 更新数据
-				handleOrderDetail(orderId.value)
-				// 关闭弹窗
-				carPopupShowFlag.value = false
-			}
-		}).catch(err => {
-			uni.$u.toast("修改失败，请重试")
-		})
-	}
-
-
-
-	const jumpPrompt = (msg) => {
-		uni.showModal({
-			title: '提示',
-			content: msg,
-			showCancel: false,
-			success: function(res) {
-				if (res.confirm) {} else if (res.cancel) {}
-			}
-		});
-	}
-  const showLeftButtons = computed(() => {
-    return (dataGram.value?.garOrderHandlerStatus === 0 && userType.value == '运输企业负责人' && dataGram.value?.garCancelFlag === 0) ||
-        (dataGram.value?.garOrderScanHandlerFlag === 0 && userType.value == '用户' && dataGram.value?.garOrderHandlerStatus != 3 && dataGram.value?.garAskStatus != '1');
-  });
+  // 检查已分配趟次总和是否超过订单要求的总发车次数
+  const allocatedTrips = handlerList.value.reduce((sum, handler) => sum + parseInt(handler.garCarCount || 0), 0);
+  const totalRequiredTrips = realCarCount.value || 0;
-  const showCenterButtons = computed(() => {
-    return (dataGram.value?.garOrderHandlerStatus === 0 && userType.value == '运输企业负责人' && dataGram.value?.handleFlag && dataGram.value?.garCancelFlag === 0) ||
-        (dataGram.value?.garOrderHandlerStatus === 1 && userType.value == '运输企业负责人') ||
-        (dataGram.value?.garOrderHandlerStatus === 1 && userType.value == '运输企业负责人' && isAllTripsCompleted());
-  });
+  console.log('已分配趟次总和:', allocatedTrips);
+  console.log('总需求趟次:', totalRequiredTrips);
-  const showRightButtons = computed(() => {
-    return (dataGram.value?.garOrderHandlerStatus === 0 && userType.value == '用户' && dataGram.value?.garCancelFlag === 0) ||
-        (dataGram.value?.garEvaluateFlag === 0 && userType.value === '用户') ||
-        (dataGram.value?.garHandlerEvaluateFlag === 0 && userType.value === '运输企业负责人' && dataGram.value?.haveEvaluateOfClient == 1) ||
-        (dataGram.value?.garHandlerEvaluateFlag === 1 && userType.value === '运输企业负责人' && dataGram.value?.haveEvaluateOfClient == 1) ||
-        (dataGram.value?.garEvaluateFlag === 1 && userType.value === '用户');
-  });
+  if (allocatedTrips >= totalRequiredTrips) {
+    uni.$u.toast(`全部趟次已分配完成，无需再分配!`);
+    return;
+  }
-  const showTopButtons = computed(() => {
-    return (dataGram.value?.garOrderHandlerStatus === 0 && userType.value == '运输企业负责人' && dataGram.value?.handleFlag && dataGram.value?.garCancelFlag === 0) ||
-        (dataGram.value?.garOrderHandlerStatus === 1 && userType.value == '运输企业负责人' && !isAllTripsCompleted()) ||
-        (dataGram.value?.garOrderHandlerStatus === 1 && userType.value == '运输企业负责人' && isAllTripsCompleted());
-  });
-	/**
-	 * 初始化信息
-	 */
-	onLoad((options) => {
-		orderId.value = options.orderId
-    orderNo.value = options.orderId
-		handleOrderDetail(orderId.value)
-    refreshOrderData()
-	})
-
-	onShow(() => {
-		try {
-			if (isOnloadIn.value) {
-				handleOrderDetail(orderId.value)
-			} else {
-				isOnloadIn.value = true
-			}
-		} catch (error) {
-			console.log(error);
-		}
-	})
-</script>
+  // 检查本次分配后是否会超过总发车次数
+  if (allocatedTrips + carCount.value > totalRequiredTrips) {
+    uni.$u.toast(`分配趟次过多，最多只能再分配${totalRequiredTrips - allocatedTrips}趟!`);
+    return;
+  }
-<style lang="scss" scoped>
+  // 调用API传递订单ID和新增车辆数量
+  const params = {
+    carCount: carCount.value,
+    tel: tel.value,
+    orderNo : orderNo.value
+  };
-	$custom-marin-bottom: 20rpx;
-	$custom-page-padding: 20rpx;
-	$custom-border-radio: 20rpx;
-	$custom-bottom-height: 200rpx;
+  updateCarCount(params)
+      .then(res => {
+        if (res.data.success) {
+          uni.$u.toast(`分配成功!`);
+          // 刷新订单详情
+          handleOrderDetail(orderId.value);
+          queryByOrderNo(orderNo.value).then(res => {
+            if (res.data.success) {
+              handlerList.value = res.data.data
+            }
+          }).catch(err => {
+            console.error('获取订单信息失败:', err);
+          })
+        } else {
+          uni.$u.toast(`分配失败!`);
+        }
+      })
+      .catch(err => {
+        uni.$u.toast('新增车辆请求失败');
+        console.error('新增车辆失败:', err);
+      });
+};
+
+const handlePopupClick = (val) => {
+  carPopupShowFlag.value = val
+}
+// 创建二维码
+const createQrCodeLocal = (orderId) => {
+  // 获取本地地址拼接订单id
+  showUQRcode.value = true;
+  const hostname = window.location.hostname;
+  const port = window.location.port;
+  const protocol = window.location.protocol;
+  const localAddress = `${protocol}//${hostname}:${port}`;
+  // const localAddress = `http://localhost:5173`;
+  qrCodeText.value = localAddress + "/pages/order-info/order-other/guest/index?orderId=" + orderId;
+  console.log(qrCodeRef.value);
+}
+// 获取二维码
+const handleQrCodeClick = (orderId) => {
+  // 微信小程序可用
+  // #ifdef MP-WEIXIN
+  createQrCode(orderId).then((res) => {
+    if (res.data.success) {
+      uni.previewImage({
+        urls: [res.data.data],
+        longPressActions: {
+          itemList: ['发送给朋友', '保存图片', '收藏'],
+          success: function(res) {
+            console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
+          },
+          fail: function(res) {
+            console.log(res);
+          }
+        }
+      })
+    }
+  })
+  // #endif
+  // H5
+  // #ifdef H5
+  createQrCodeLocal(orderId)
+  // #endif
+}
+
+const handleOrderDispatchClick = (orderId) => {
+  // 获取订单车辆数量
+  const orderCarCount = dataGram.value?.garCarInfoList?.length || 0;
+
+  // 获取驾驶员人员
+  queryOrderDispatch(orderId).then(res => {
+    console.log(res.data.data);
+    if (res.data.success) {
+      // 过滤车辆  非用户选择的车辆无法选中
+      driverPersonnelList.value = res.data.data;
+      // 恢复原始的open调用方式，只传递dataList
+      clashDriverDispatchRef.value.open(res.data.data);
+      refreshOrderData()
+    } else {
+      uni.$u.toast("驾驶员分配成功！");
+      refreshOrderData()
+    }
+  })
+}
+const handleDisposalDispatchClick = (orderId) => {
+  // 获取处置场所人员
+  queryDisposalDispatch(orderId).then(res => {
+    if (res.data.success) {
+      disposalPersonnelList.value = res.data.data
+      clashDisposalDispatchRef.value.open(res.data.data)
+      refreshOrderData()
+    } else {
+      uni.$u.toast("处理场所分配成功！")
+      refreshOrderData()
+    }
+  })
+}
+
+
+
+const handleClose = (e) => {
+  cancelShow.value = false
+}
+const handleEvaluateDetail = (orderId, userType) => {
+  uni.$u.route(`pages/order-info/order-other/evaluate-info/index`, {
+    orderId: orderId,
+    userType: userType
+  })
+}
+const selectClick = (index) => {
+  currentCancelName.value = index.name;
+}
+const handleOrderDetail = (orderId) => {
+  queryOrderDetail(orderId).then(res => {
+    dataGram.value = res.data.data;
+    fetchDriverList(orderId);
+    currentImages.value = res.data.data.currentImages.map(item => {
+      return {
+        url: import.meta.env.VITE_BASE_URL + item
+      };
+    });
-	@mixin card {
-		padding: $custom-page-padding;
-		box-sizing: border-box;
-		background-color: #ffffff;
-		border-radius: $custom-border-radio;
-		margin-bottom: $custom-marin-bottom;
-	}
+    putOnImages.value = res.data.data.putOnImages.map(item => {
+      let processedItem = item;
+      let carName = '';
-  .order-detail-bottom {
-    position: fixed;
-    width: 100%;
-    bottom: 0;
-    left: 0;
-    background-color: #fff;
-    box-shadow: 0 -2rpx 10rpx rgba(0,0,0,0.05);
-    padding: 20rpx $custom-page-padding;
-    box-sizing: border-box;
+      // 提取name后面的字符串作为carName并从item中移除
+      if (item.includes('name')) {
+        const nameIndex = item.indexOf('name');
+        carName = item.substring(nameIndex + 4);
-    .order-detail-bottom-box {
-      display: flex;
-      flex-direction: column;
-      gap: 20rpx;
+        processedItem = item.substring(0, nameIndex);
+      }
-      .order-detail-top-buttons {
-        width: 100%;
+      // 保持原有逻辑不变，但添加carName到返回对象
+      const newItem = processedItem.substring(0, processedItem.length - 6);
+      const newIndex = processedItem.substring(processedItem.length - 6);
+      return { url: import.meta.env.VITE_BASE_URL + newItem, newIndex, carName };
+    });
-        .button-group-wrap,
-        .button-group-spread {
-          display: flex;
-          gap: 20rpx;
-          width: 100%;
+    // 按照newIndex升序排序
+    putOnImages.value.sort((a, b) => {
+      return parseInt(a.newIndex) - parseInt(b.newIndex);
+    });
-          u-button {
-            flex: 1;
-            height: 72rpx;
-            line-height: 72rpx;
-            font-size: 26rpx;
-            padding: 0 20rpx;
-            border-radius: 36rpx;
-          }
-        }
+    // 重新组织数据，将相同newIndex的图片放在一起
+    const groupedImages = {};
+    putOnImages.value.forEach(item => {
+      if (!groupedImages[item.newIndex]) {
+        groupedImages[item.newIndex] = [];
+      }
+      groupedImages[item.newIndex].push(item);
+    });
-        .button-group-spread {
-          justify-content: space-between;
+    // 转换newIndex为1,2,3的连续数字
+    const sortedKeys = Object.keys(groupedImages).sort((a, b) => parseInt(a) - parseInt(b));
+    const newGroupedImages = {};
+    sortedKeys.forEach((key, index) => {
+      newGroupedImages[index + 1] = groupedImages[key];
+    });
-          .btn-left,
-          .btn-right {
-            flex: 1;
+    // 转换为数组形式，方便在模板中遍历
+    putOnImagesGrouped.value = Object.keys(newGroupedImages).map(key => ({
+      index: key,
+      images: newGroupedImages[key],
+      carName: newGroupedImages[key] && newGroupedImages[key].length > 0 ? newGroupedImages[key][0].carName : ''
+    }));
+    console.log('putOnImagesGrouped.value:', putOnImagesGrouped.value);
+    putDownImages.value = res.data.data.putDownImages.map(item => {
+      return {
+        url: import.meta.env.VITE_BASE_URL + item
+      };
+    });
+  })
+}
+/**
+ * 拨打电话回调
+ */
+const handleContactClick = (val) => {
+  uni.makePhoneCall({
+    phoneNumber: val
+  }).then(res => {}).catch(err => {});
+}
+
+const handlerJumpOtherApp = (latitude, longitude, garCoordinate) => {
+  console.log(latitude + "=================>" + longitude);
+  // 给出提示确定要跳转吗
+  uni.showModal({
+    title: '提示',
+    content: '是否跳转到app定位进行导航？',
+    success: function(res) {
+      if (res.confirm) {
+        uni.openLocation({
+          latitude: latitude,
+          longitude: longitude,
+          success: function() {
+            console.log('success');
           }
-        }
+        });
       }
-
-      .order-detail-bottom-buttons {
-        display: flex;
-        flex-direction: column;
-        width: 100%;
-        gap: 20rpx;
-
-        .cancel-button-container {
-          width: 100%;
-
-          u-button {
-            width: 100%;
-            height: 72rpx;
-            line-height: 72rpx;
-            font-size: 26rpx;
-            border-radius: 36rpx;
+    }
+  })
+}
+
+/**
+ * 取消订单
+ * @param {*} orderId
+ */
+const handleOderCancelClick = () => {
+  cancelShow.value = true;
+}
+
+/**
+ * 提交取消订单
+ */
+const submitFunction = (otherReason) => {
+  let reason = otherReason
+  if (currentCancelName.value != "其他") {
+    reason = currentCancelName.value
+  }
+  if (!reason) {
+    uni.$u.toast("请提供取消订单的原因")
+    return
+  }
+  let params = {
+    garOrderId: orderId.value,
+    garCancelFlag: 1,
+    garReason: reason
+  }
+  updateOrder(params).then(res => {
+    if (res.data.success) {
+      cancelShow.value = false
+      uni.$u.toast(res.data.data)
+      uni.$u.route({
+        type: "reLaunch",
+        url: `pages/order/index`,
+      })
+    }
+  })
+}
+// 提交完成
+const handleSubmitSuccess = (orderId) => {
+  uni.showModal({
+    title: '提示',
+    content: '订单已经清运完成了吗？',
+    success: function(res) {
+      if (res.confirm) {
+        updateOrder({
+          garOrderId: orderId,
+          handleType: 3
+        }).then(res => {
+          if (res.data.success) {
+            uni.$u.toast("已完成")
+            handleOrderDetail(orderId)
           }
-        }
+        })
+      } else if (res.cancel) {}
+    }
+  });
+}
+const handleEvaluate = (orderId, userType) => {
+  uni.$u.route(`pages/order-info/order-other/evaluate/index?orderId=${orderId}&userType=${userType}`)
+}
+
+// 接收订单
+const handleOrder = (orderId) => {
+  // 在开始运输前先分配驾驶员（如果有待分配的驾驶员）
+  if (pendingDriverAssignments.value && Object.keys(pendingDriverAssignments.value).length > 0) {
+    let data = {
+      garOrderId: orderId,
+      dispatchList: []
+    }
+    for (const key in pendingDriverAssignments.value) {
+      data.dispatchList.push({
+        ...pendingDriverAssignments.value[key]
+      });
+    }
-        .evaluation-buttons-container {
-          display: flex;
-          gap: 20rpx;
-
-          u-button {
-            flex: 1;
-            height: 72rpx;
-            line-height: 72rpx;
-            font-size: 26rpx;
-            border-radius: 36rpx;
+    dispatchOrders(data).then(res => {
+      if (res.data.success) {
+        // 清空待分配列表
+        pendingDriverAssignments.value = {};
+        // 标记驾驶员已分配
+        driverAssigned.value = true;
+
+        // 然后更新订单状态为开始运输
+        updateOrder({
+          garOrderId: orderId,
+          handleType: 0
+        }).then(res => {
+          if (res.data.success) {
+            if (res.data.data === "订单已经被别人接受啦") {
+              uni.$u.toast(res.data.data)
+              uni.$u.route({
+                type: "reLaunch",
+                url: `pages/order/index`,
+              })
+            } else {
+              uni.$u.toast(res.data.data)
+              handleOrderDetail(orderId)
+              refreshOrderData()
+            }
           }
+        })
+      } else {
+        uni.$u.toast("指定人员失败，请重试");
+      }
+    })
+  } else {
+    // 没有待分配的驾驶员，直接开始运输
+    updateOrder({
+      garOrderId: orderId,
+      handleType: 0
+    }).then(res => {
+      if (res.data.success) {
+        if (res.data.data === "订单已经被别人接受啦") {
+          uni.$u.toast(res.data.data)
+          uni.$u.route({
+            type: "reLaunch",
+            url: `pages/order/index`,
+          })
+        } else {
+          uni.$u.toast(res.data.data)
+          handleOrderDetail(orderId)
+          refreshOrderData()
         }
       }
+    })
+  }
+}
+
+const currentStep = (step) => {
+  if (step > 2) {
+    return step - 1;
+  }
+  return step;
+}
+
+/**
+ * 清运状态
+ * @param {*} status
+ */
+const cleanStatus = (status) => {
+  if (dataGram.garCancelFlag === 1) {
+    return '取消清运';
+  }
+  switch (status) {
+    case 0:
+      return '准备清运';
+    case 1:
+      return '正在清运';
+    case 3:
+      return '清运完成';
+  }
+}
+
+const handleDisposalDispatchConfirm = (val) => {
+  console.log(val);
+  if (!val) {
+    return
+  }
+  let data = {
+    garOrderId: orderId.value,
+    dispatchList: []
+  }
+  for (const key in val) {
+    data.dispatchList.push({
+      ...val[key]
+    });
+  }
+  console.log(data);
+  dispatchDisposalOrders(data).then(res => {
+    if (res.data.success) {
+      uni.$u.toast(res.data.msg)
+      // 标记处置场所已分配
+      disposalAssigned.value = true;
+      // 检查是否两个任务都已完成
+    } else {
+      uni.$u.toast("指定人员失败，请重试")
     }
+    clashDriverDispatchRef.value.close()
+  })
+}
+
+const handlerUpdateOrderClick = () => {
+  carPopupShowFlag.value = true;
+  // TODO  照搬一键清运得弹窗
+  console.log("点击了修改订单按钮");
+  // TODO
+  queryCarList({
+    companyId: dataGram.value.garOrderCompanyId
+  }).then(res => {
+    // 设置车辆类型
+    candidates.value = [
+      [...new Set(res.data.rows
+          .filter(item => item.containerVolume)
+          .map(item => {
+            garCarLabelInfoList.value[item.carType] = item
+            return item.carType
+          }))]
+    ];
+    // 设置初始车辆数量
+    candidates.value[0].forEach((item, index) => {
+      garCarInfoList.value[item] = {
+        garOrderCarNumber: 1,
+        garOrderCarType: item,
+        id: garCarLabelInfoList.value[item].id,
+        containerVolume: garCarLabelInfoList.value[item].containerVolume
+      }
+    })
+    // 设置默认车辆
+    paramFrom.value.carType = candidates.value[0][0];
+    garCarLabelInfoNow.value = garCarLabelInfoList.value[paramFrom.value.carType]
+    console.log(garCarLabelInfoList.value, garCarInfoList.value, paramFrom.value.carType);
+  })
+}
+
+// 指定人员
+
+// 指定人员
+const handleDriverDispatchConfirm = (val) => {
+  console.log(val);
+  if (!val) {
+    return;
   }
-	.order-detail-container {
-		height: 100%;
-		width: 100%;
-		background-color: $u-info-light;
-		box-sizing: border-box;
-		overflow-y: scroll;
-		background: linear-gradient(to bottom, #19a97c, $u-info-light, $u-info-light, $u-info-light);
+  // 获取订单车辆数量
+  const orderCarCount = dataGram.value?.garCarInfoList?.length || 0;
+  // 计算选择的驾驶员数量
+  const selectedDriverCount = Object.keys(val).length;
-		.order-detail-container-box {
-			height: 100%;
-			width: 100%;
-			padding: $custom-page-padding;
-			box-sizing: border-box;
+  // 检查驾驶员数量是否超过订单车辆数量
+  if (selectedDriverCount > orderCarCount) {
+    jumpPrompt(`选择的驾驶员数量不能超过${orderCarCount}个`);
+    return;
+  }
-			.order-detail-top {
-				@include card();
+  // 判断是否是重新分配（订单状态为1）
+  const isReassigning = dataGram.value?.garOrderHandlerStatus === 1;
-				.order-detail-top-box {
-					.order-detail-top-box-step {
-						u-steps {
-							u-steps-item {}
-						}
-					}
-				}
-			}
+  if (isReassigning) {
+    // 如果是重新分配，直接调用接口分配驾驶员
+    let data = {
+      garOrderId: orderId.value,
+      dispatchList: []
+    }
+    for (const key in val) {
+      data.dispatchList.push({
+        ...val[key]
+      });
+    }
+    dispatchOrders(data).then(res => {
+      if (res.data.success) {
+        uni.$u.toast("驾驶员重新分配成功");
+        // 更新界面数据
+        handleOrderDetail(orderId.value);
+        refreshOrderData();
+        // 标记驾驶员已分配
+        driverAssigned.value = true;
+      } else {
+        uni.$u.toast("指定人员失败，请重试");
+      }
+      clashDriverDispatchRef.value.close();
+    });
+  } else {
+    // 初次分配，将待分配的驾驶员存储起来，但不立即调用后端接口
+    pendingDriverAssignments.value = { ...val };
-      .order-detail-container-box-card {
-        @include card();
+    // 显示提示信息
+    uni.$u.toast("驾驶员已选择，将在开始运输时分配");
-        .order-detail-container-header-card-title {
-          font-weight: bold;
-          line-height: 80rpx;
-          border-bottom: 3rpx solid $u-info-light;
-          margin-bottom: $custom-marin-bottom;
-          color: $u-primary;
-          display: flex;
-          align-items: center;
+    // 关闭弹窗
+    clashDriverDispatchRef.value.close();
+  }
+}
-          .order-detail-container-header-card-uicon {
-            background-color: $u-primary;
-            margin-right: 10rpx;
-            height: 35rpx;
-            width: 15rpx;
-            border-radius: 4rpx;
-          }
-        }
+const submitUpdateCarInfo = () => {
+  let garCarInfos = [];
+  for (const key in garCarInfoList.value) {
+    garCarInfos.push(garCarInfoList.value[key])
+  }
-        /* 订单信息标题特殊样式 */
-        .order-info-header {
-          display: flex;
-          align-items: center;
-          background: linear-gradient(90deg, #19a97c, #19a97c80);
-          color: white;
-          padding: 15rpx;
-          border-radius: 10rpx;
-          margin-bottom: 15rpx;
-
-          .order-detail-container-header-card-uicon {
-            background-color: white;
-            opacity: 0.8;
-            margin-right: 8rpx;
-            height: 25rpx;
-            width: 6rpx;
-            border-radius: 3rpx;
+  let data = {
+    garOrderId: orderId.value,
+    garCarInfoList: garCarInfos,
+    updated: true
+  }
+  if (dataGram.value.garOrderAgreementTime) {
+    let index = dataGram.value.garOrderAgreementTime.indexOf(' ') + 1;
+    if (index > 0) {
+      let val = dataGram.value.garOrderAgreementTime.substring(index, dataGram.value.garOrderAgreementTime
+          .length);
+
+
+      if (val == "07:00-08:00" || val == "08:00-09:00" || val == "09:00-10:00" || val == "10:00-11:00" ||
+          val == "11:00-12:00" || val == "12:00-13:00" || val == "13:00-14:00" ||
+          val == "14:00-15:00" || val == "15:00-16:00" || val == "16:00-17:00" || val == "17:00-18:00" ||
+          val == "18:00-19:00" || val == "19:00-20:00" || val == "20:00-21:00" ||
+          val == "21:00-22:00") {
+        let size = garCarInfos.length;
+        for (let index = 0; index < size; index++) {
+          if ((garCarInfos[index].containerVolume == "8" || parseInt(garCarInfos[index]
+              .containerVolume) >= 8) && garCarInfos[index].garOrderCarNumber > 0) {
+            console.log(garCarInfos[index]);
+
+            jumpPrompt("中大型车辆只能选择22:00-07:00时间段");
+            return;
           }
-          .title-text {
-            font-size: 28rpx;
-            font-weight: bold;
-          }
         }
+      }
-        .order-detail-container-header-item {
-          display: flex;
-          margin-bottom: $custom-marin-bottom;
+    }
-          .order-detail-container-header-title {
-            color: $u-main-color;
-            white-space: nowrap;
-            color: $u-info;
+  }
+  console.log(dataGram.value.garOrderAgreementTime);
+  console.log(garCarInfos);
+  console.log("=================================>");
+
+
+  updateOrder(data).then(res => {
+    if (res.data.code == 200) {
+      uni.$u.toast("车辆信息修改成功")
+      // 更新数据
+      handleOrderDetail(orderId.value)
+      // 关闭弹窗
+      carPopupShowFlag.value = false
+    }
+  }).catch(err => {
+    uni.$u.toast("修改失败，请重试")
+  })
+}
+
+
+const deleteHandler = (handler) => {
+  uni.showModal({
+    title: '确认删除',
+    content: `确定要删除处理人员 ${handler.garOrderHandlerName} 吗？`,
+    success: function (res) {
+      if (res.confirm) {
+        deleteDriverByOrderNo(orderNo.value, handler.garHandlerCarCode).then(res => {
+          if (res.data.success) {
+            uni.$u.toast('删除成功');
+            // 重新加载处理人员信息
+            refreshOrderData();
+            // 重新获取驾驶员列表
+            fetchDriverList(orderId.value);
+          } else {
+            uni.$u.toast('删除失败: ' + res.data.msg);
           }
+        }).catch(err => {
+          uni.$u.toast('删除失败');
+          console.error('删除处理人员失败:', err);
+        });
+      }
+    }
+  });
+};
-          .order-detail-container-header-content {
-            display: flex;
-          }
+
+const jumpPrompt = (msg) => {
+  uni.showModal({
+    title: '提示',
+    content: msg,
+    showCancel: false,
+    success: function(res) {
+      if (res.confirm) {} else if (res.cancel) {}
+    }
+  });
+}
+const showLeftButtons = computed(() => {
+  return (dataGram.value?.garOrderHandlerStatus === 0 && userType.value == '运输企业负责人' && dataGram.value?.garCancelFlag === 0) ||
+      (dataGram.value?.garOrderScanHandlerFlag === 0 && userType.value == '用户' && dataGram.value?.garOrderHandlerStatus != 3 && dataGram.value?.garAskStatus != '1');
+});
+
+const showCenterButtons = computed(() => {
+  return (dataGram.value?.garOrderHandlerStatus === 0 && userType.value == '运输企业负责人' && dataGram.value?.handleFlag && dataGram.value?.garCancelFlag === 0) ||
+      (dataGram.value?.garOrderHandlerStatus === 1 && userType.value == '运输企业负责人') ||
+      (dataGram.value?.garOrderHandlerStatus === 1 && userType.value == '运输企业负责人' && isAllTripsCompleted());
+});
+
+const showRightButtons = computed(() => {
+  return (dataGram.value?.garOrderHandlerStatus === 0 && userType.value == '用户' && dataGram.value?.garCancelFlag === 0) ||
+      (dataGram.value?.garEvaluateFlag === 0 && userType.value === '用户') ||
+      (dataGram.value?.garHandlerEvaluateFlag === 0 && userType.value === '运输企业负责人' && dataGram.value?.haveEvaluateOfClient == 1) ||
+      (dataGram.value?.garHandlerEvaluateFlag === 1 && userType.value === '运输企业负责人' && dataGram.value?.haveEvaluateOfClient == 1) ||
+      (dataGram.value?.garEvaluateFlag === 1 && userType.value === '用户');
+});
+
+const showTopButtons = computed(() => {
+  return (dataGram.value?.garOrderHandlerStatus === 0 && userType.value == '运输企业负责人' && dataGram.value?.handleFlag && dataGram.value?.garCancelFlag === 0) ||
+      (dataGram.value?.garOrderHandlerStatus === 1 && userType.value == '运输企业负责人' && !isAllTripsCompleted()) ||
+      (dataGram.value?.garOrderHandlerStatus === 1 && userType.value == '运输企业负责人' && isAllTripsCompleted());
+});
+/**
+ * 初始化信息
+ */
+onLoad((options) => {
+  orderId.value = options.orderId
+  orderNo.value = options.orderId
+  handleOrderDetail(orderId.value)
+  refreshOrderData()
+})
+
+onShow(() => {
+  try {
+    if (isOnloadIn.value) {
+      handleOrderDetail(orderId.value)
+    } else {
+      isOnloadIn.value = true
+    }
+  } catch (error) {
+    console.log(error);
+  }
+})
+</script>
+
+
+<style lang="scss" scoped>
+$custom-marin-bottom: 20rpx;
+$custom-page-padding: 20rpx;
+$custom-border-radio: 20rpx;
+$custom-bottom-height: 200rpx;
+
+@mixin card {
+  padding: $custom-page-padding;
+  box-sizing: border-box;
+  background-color: #ffffff;
+  border-radius: $custom-border-radio;
+  margin-bottom: $custom-marin-bottom;
+}
+
+.order-detail-bottom {
+  position: fixed;
+  width: 100%;
+  bottom: 0;
+  left: 0;
+  background-color: #fff;
+  box-shadow: 0 -2rpx 10rpx rgba(0,0,0,0.05);
+  padding: 20rpx $custom-page-padding;
+  box-sizing: border-box;
+
+  .order-detail-bottom-box {
+    display: flex;
+    flex-direction: column;
+    gap: 20rpx;
+
+    .order-detail-top-buttons {
+      width: 100%;
+
+      .button-group-wrap,
+      .button-group-spread {
+        display: flex;
+        gap: 20rpx;
+        width: 100%;
+
+        u-button {
+          flex: 1;
+          height: 72rpx;
+          line-height: 72rpx;
+          font-size: 26rpx;
+          padding: 0 20rpx;
+          border-radius: 36rpx;
         }
       }
-      /* 车辆信息板块美化 */
+      .button-group-spread {
+        justify-content: space-between;
-      /* 车辆信息板块美化 */
-      .vehicle-section {
-        .section-header {
-          display: flex;
-          align-items: center;
-          background: linear-gradient(90deg, #19a97c, #19a97c80);
-          color: white;
-          padding: 15rpx; /* 减小内边距 */
-          border-radius: 10rpx; /* 减小圆角 */
-          margin-bottom: 15rpx; /* 减小外边距 */
+        .btn-left,
+        .btn-right {
+          flex: 1;
+        }
+      }
+    }
-          .header-icon-bar {
-            background-color: white;
-            opacity: 0.8;
-            margin-right: 8rpx; /* 减小右边距 */
-            height: 25rpx; /* 减小高度 */
-            width: 6rpx; /* 减小宽度 */
-            border-radius: 3rpx;
-          }
+    .order-detail-bottom-buttons {
+      display: flex;
+      flex-direction: column;
+      width: 100%;
+      gap: 20rpx;
-          .header-title {
-            font-size: 28rpx; /* 减小字体大小 */
-            font-weight: bold;
-          }
+      .cancel-button-container {
+        width: 100%;
+
+        u-button {
+          width: 100%;
+          height: 72rpx;
+          line-height: 72rpx;
+          font-size: 26rpx;
+          border-radius: 36rpx;
         }
+      }
-        /* 卡片通用样式 */
-        .trip-summary-card, .vehicle-info-card, .driver-info-card, .handler-list-card, .assign-trip-card {
-          background-color: #fff;
-          border-radius: 10rpx; /* 减小圆角 */
-          box-shadow: 0 1rpx 8rpx rgba(0, 0, 0, 0.05); /* 减小阴影 */
-          margin-bottom: 15rpx; /* 减小外边距 */
-          overflow: hidden;
+      .evaluation-buttons-container {
+        display: flex;
+        gap: 20rpx;
+
+        u-button {
+          flex: 1;
+          height: 72rpx;
+          line-height: 72rpx;
+          font-size: 26rpx;
+          border-radius: 36rpx;
         }
+      }
+    }
+  }
+}
-        .card-header {
-          display: flex;
-          align-items: center;
-          padding: 15rpx; /* 减小内边距 */
-          background-color: #f5f5f5;
-          border-bottom: 1rpx solid #eee;
+.order-detail-container {
+  height: 100%;
+  width: 100%;
+  background-color: $u-info-light;
+  box-sizing: border-box;
+  overflow-y: scroll;
+  background: linear-gradient(to bottom, #19a97c, $u-info-light, $u-info-light, $u-info-light);
-          .card-title {
-            font-weight: bold;
-            color: #333;
-            margin-left: 8rpx; /* 减小左边距 */
-            font-size: 26rpx; /* 减小字体大小 */
+
+  .order-detail-container-box {
+    height: 100%;
+    width: 100%;
+    padding: $custom-page-padding;
+    box-sizing: border-box;
+
+    .order-detail-top {
+      @include card();
+
+      .order-detail-top-box {
+        .order-detail-top-box-step {
+          u-steps {
+            u-steps-item {}
           }
         }
+      }
+    }
-        /* 发车次数摘要 */
-        .trip-summary-card {
-          .summary-content {
-            display: flex;
-            align-items: center;
-            padding: 20rpx 15rpx; /* 减小内边距 */
-            background: linear-gradient(90deg, #e8f4f0, #fff);
-            .summary-label {
-              color: #666;
-              margin-right: 8rpx; /* 减小右边距 */
-              font-size: 24rpx; /* 减小字体大小 */
-            }
+    .order-detail-container-box-card {
+      @include card();
-            .summary-value {
-              color: #19a97c;
-              font-weight: bold;
-              font-size: 28rpx; /* 减小字体大小 */
-              margin: 0 4rpx; /* 减小边距 */
-            }
+      .order-detail-container-header-card-title {
+        font-weight: bold;
+        line-height: 80rpx;
+        border-bottom: 3rpx solid $u-info-light;
+        margin-bottom: $custom-marin-bottom;
+        color: $u-primary;
+        display: flex;
+        align-items: center;
-            .summary-unit {
-              color: #666;
-              font-size: 24rpx; /* 减小字体大小 */
-            }
-          }
+        .order-detail-container-header-card-uicon {
+          background-color: $u-primary;
+          margin-right: 10rpx;
+          height: 35rpx;
+          width: 15rpx;
+          border-radius: 4rpx;
         }
+      }
-        /* 车辆类型详情 */
-        .vehicle-info-card {
-          .car-type-list {
-            padding: 15rpx; /* 减小内边距 */
+      /* 订单信息标题特殊样式 */
+      .order-info-header {
+        display: flex;
+        align-items: center;
+        background: linear-gradient(90deg, #19a97c, #19a97c80);
+        color: white;
+        padding: 15rpx;
+        border-radius: 10rpx;
+        margin-bottom: 15rpx;
-            .car-type-item {
-              display: flex;
-              flex-wrap: wrap;
-              padding: 15rpx; /* 减小内边距 */
-              background-color: #f8f8f8;
-              border-radius: 6rpx; /* 减小圆角 */
-              margin-bottom: 10rpx; /* 减小外边距 */
+        .order-detail-container-header-card-uicon {
+          background-color: white;
+          opacity: 0.8;
+          margin-right: 8rpx;
+          height: 25rpx;
+          width: 6rpx;
+          border-radius: 3rpx;
+        }
-              &:last-child {
-                margin-bottom: 0;
-              }
+        .title-text {
+          font-size: 28rpx;
+          font-weight: bold;
+        }
+      }
-              .car-type-info, .car-count-info {
-                display: flex;
-                align-items: center;
-                width: 100%;
-                margin-bottom: 8rpx; /* 减小外边距 */
-
-                &:last-child {
-                  margin-bottom: 0;
-                }
-
-                .info-label {
-                  color: #666;
-                  margin: 0 8rpx; /* 减小边距 */
-                  font-size: 24rpx; /* 减小字体大小 */
-                  min-width: 80rpx; /* 减小最小宽度 */
-                }
-
-                .info-value {
-                  color: #333;
-                  font-weight: 500;
-                  font-size: 24rpx; /* 减小字体大小 */
-                }
-              }
-            }
-          }
+      .order-detail-container-header-item {
+        display: flex;
+        margin-bottom: $custom-marin-bottom;
+
+        .order-detail-container-header-title {
+          color: $u-main-color;
+          white-space: nowrap;
+          color: $u-info;
         }
-        /* 驾驶员信息 */
-        .driver-info-card {
-          .driver-list {
-            padding: 15rpx; /* 减小内边距 */
+        .order-detail-container-header-content {
+          display: flex;
+        }
+      }
+    }
-            .driver-item {
-              padding: 15rpx; /* 减小内边距 */
-              background-color: #f8f8f8;
-              border-radius: 6rpx; /* 减小圆角 */
-              margin-bottom: 10rpx; /* 减小外边距 */
+    /* 车辆信息板块美化 */
-              &:last-child {
-                margin-bottom: 0;
-              }
+    /* 车辆信息板块美化 */
+    .vehicle-section {
+      .section-header {
+        display: flex;
+        align-items: center;
+        background: linear-gradient(90deg, #19a97c, #19a97c80);
+        color: white;
+        padding: 15rpx; /* 减小内边距 */
+        border-radius: 10rpx; /* 减小圆角 */
+        margin-bottom: 15rpx; /* 减小外边距 */
+
+        .header-icon-bar {
+          background-color: white;
+          opacity: 0.8;
+          margin-right: 8rpx; /* 减小右边距 */
+          height: 25rpx; /* 减小高度 */
+          width: 6rpx; /* 减小宽度 */
+          border-radius: 3rpx;
+        }
-              .driver-basic-info, .driver-car-info {
-                display: flex;
-                align-items: center;
-                margin-bottom: 8rpx; /* 减小外边距 */
-
-                &:last-child {
-                  margin-bottom: 0;
-                }
-
-                .info-label {
-                  color: #666;
-                  margin: 0 8rpx; /* 减小边距 */
-                  font-size: 24rpx; /* 减小字体大小 */
-                  min-width: 100rpx; /* 减小最小宽度 */
-                }
-
-                .info-value {
-                  color: #333;
-                  font-weight: 500;
-                  font-size: 24rpx; /* 减小字体大小 */
-                }
-              }
+        .header-title {
+          font-size: 28rpx; /* 减小字体大小 */
+          font-weight: bold;
+        }
+      }
-              .driver-status {
-                text-align: right;
-                margin-top: 8rpx; /* 减小外边距 */
-              }
-            }
+      /* 卡片通用样式 */
+      .trip-summary-card, .vehicle-info-card, .driver-info-card, .handler-list-card, .assign-trip-card {
+        background-color: #fff;
+        border-radius: 10rpx; /* 减小圆角 */
+        box-shadow: 0 1rpx 8rpx rgba(0, 0, 0, 0.05); /* 减小阴影 */
+        margin-bottom: 15rpx; /* 减小外边距 */
+        overflow: hidden;
+      }
+
+      .card-header {
+        display: flex;
+        align-items: center;
+        padding: 15rpx; /* 减小内边距 */
+        background-color: #f5f5f5;
+        border-bottom: 1rpx solid #eee;
+
+        .card-title {
+          font-weight: bold;
+          color: #333;
+          margin-left: 8rpx; /* 减小左边距 */
+          font-size: 26rpx; /* 减小字体大小 */
+        }
+      }
+
+      /* 发车次数摘要 */
+      .trip-summary-card {
+        .summary-content {
+          display: flex;
+          align-items: center;
+          padding: 20rpx 15rpx; /* 减小内边距 */
+          background: linear-gradient(90deg, #e8f4f0, #fff);
+
+          .summary-label {
+            color: #666;
+            margin-right: 8rpx; /* 减小右边距 */
+            font-size: 24rpx; /* 减小字体大小 */
+          }
+
+          .summary-value {
+            color: #19a97c;
+            font-weight: bold;
+            font-size: 28rpx; /* 减小字体大小 */
+            margin: 0 4rpx; /* 减小边距 */
+          }
+
+          .summary-unit {
+            color: #666;
+            font-size: 24rpx; /* 减小字体大小 */
           }
         }
+      }
-        /* 处理人员信息 */
-        .handler-list-card {
-          .handler-item {
+      /* 车辆类型详情 */
+      .vehicle-info-card {
+        .car-type-list {
+          padding: 15rpx; /* 减小内边距 */
+
+          .car-type-item {
             display: flex;
-            justify-content: space-between;
-            align-items: center;
+            flex-wrap: wrap;
             padding: 15rpx; /* 减小内边距 */
-            border-bottom: 1rpx solid #eee;
+            background-color: #f8f8f8;
+            border-radius: 6rpx; /* 减小圆角 */
+            margin-bottom: 10rpx; /* 减小外边距 */
             &:last-child {
-              border-bottom: none;
+              margin-bottom: 0;
             }
-            .handler-basic-info {
+            .car-type-info, .car-count-info {
               display: flex;
-              flex-direction: column;
-
-              .handler-name {
-                font-weight: bold;
-                font-size: 26rpx; /* 减小字体大小 */
-                color: #333;
-                margin-bottom: 4rpx; /* 减小外边距 */
-              }
+              align-items: center;
+              width: 100%;
+              margin-bottom: 8rpx; /* 减小外边距 */
-              .handler-car, .handler-volume {
-                font-size: 22rpx; /* 减小字体大小 */
-                color: #666;
-                margin-right: 10rpx; /* 减小右边距 */
+              &:last-child {
+                margin-bottom: 0;
               }
-            }
-            .handler-trip-count {
-              display: flex;
-              flex-direction: column;
-              align-items: flex-end;
-
-              .count-label {
-                font-size: 22rpx; /* 减小字体大小 */
+              .info-label {
                 color: #666;
-                margin-bottom: 4rpx; /* 减小外边距 */
+                margin: 0 8rpx; /* 减小边距 */
+                font-size: 24rpx; /* 减小字体大小 */
+                min-width: 80rpx; /* 减小最小宽度 */
               }
-              .count-value {
-                font-weight: bold;
-                color: #19a97c;
-                font-size: 26rpx; /* 减小字体大小 */
+              .info-value {
+                color: #333;
+                font-weight: 500;
+                font-size: 24rpx; /* 减小字体大小 */
               }
             }
           }
         }
+      }
+
+      /* 驾驶员信息 */
+      .driver-info-card {
+        .driver-list {
+          padding: 15rpx; /* 减小内边距 */
-        /* 分配趟次 */
-        .assign-trip-card {
-          .assign-content {
+          .driver-item {
             padding: 15rpx; /* 减小内边距 */
+            background-color: #f8f8f8;
+            border-radius: 6rpx; /* 减小圆角 */
+            margin-bottom: 10rpx; /* 减小外边距 */
-            .selector-wrapper, .number-box-wrapper {
+            &:last-child {
+              margin-bottom: 0;
+            }
+
+            .driver-basic-info, .driver-car-info {
               display: flex;
               align-items: center;
-              margin-bottom: 15rpx; /* 减小外边距 */
+              margin-bottom: 8rpx; /* 减小外边距 */
               &:last-child {
                 margin-bottom: 0;
               }
-              .selector-label, .number-label {
-                width: 140rpx; /* 减小宽度 */
+              .info-label {
+                color: #666;
+                margin: 0 8rpx; /* 减小边距 */
                 font-size: 24rpx; /* 减小字体大小 */
-                color: #333;
+                min-width: 100rpx; /* 减小最小宽度 */
               }
-              .handler-selector {
-                flex: 1;
-                height: 40rpx; /* 减小高度 */
-                border: 1px solid #DCDFE6;
-                border-radius: 4px;
-                padding: 0 8rpx; /* 减小内边距 */
-                outline: none;
+              .info-value {
+                color: #333;
+                font-weight: 500;
                 font-size: 24rpx; /* 减小字体大小 */
               }
             }
-            .confirm-button {
-              width: 100%;
-              border-radius: 6rpx; /* 减小圆角 */
-              font-size: 26rpx; /* 减小字体大小 */
-              height: 40rpx; /* 减小高度 */
+            .driver-status {
+              text-align: right;
+              margin-top: 8rpx; /* 减小外边距 */
             }
           }
         }
       }
-		}
+      /* 处理人员信息 */
+      .handler-list-card {
+        .handler-item {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          padding: 15rpx; /* 减小内边距 */
+          border-bottom: 1rpx solid #eee;
-		.space-box {
-			padding-bottom: $custom-bottom-height;
-			margin-bottom: 40rpx;
-		}
+          &:last-child {
+            border-bottom: none;
+          }
+          .handler-basic-info {
+            display: flex;
+            flex-direction: column;
-    .order-detail-bottom {
-      position: fixed; // 改为fixed定位，确保始终在底部
-      width: 100%;
-      bottom: 0;
-      left: 0;
-      background-color: #fff; // 添加背景色，避免穿透
-      box-shadow: 0 -2rpx 10rpx rgba(0,0,0,0.05); // 添加阴影，提升层次感
-      padding: 20rpx $custom-page-padding; // 上下内边距，左右和页面一致
-      box-sizing: border-box;
+            .handler-name {
+              font-weight: bold;
+              font-size: 26rpx; /* 减小字体大小 */
+              color: #333;
+              margin-bottom: 4rpx; /* 减小外边距 */
+            }
-      .order-detail-bottom-box {
-        height: auto; // 取消固定高度，自适应内容
-        padding: 0; // 移除原有内边距
-        display: flex;
-        flex-wrap: wrap; // 允许换行
-        gap: 16rpx; // 按钮之间统一间距
-        align-items: center;
-      }
+            .handler-car, .handler-volume {
+              font-size: 22rpx; /* 减小字体大小 */
+              color: #666;
+              margin-right: 10rpx; /* 减小右边距 */
+            }
+          }
-      .button-group-vertical {
-        display: flex;
-        flex-direction: column;
-        gap: 20rpx;
-        width: 100%;
-      }
+          .handler-trip-count {
+            display: flex;
+            flex-direction: column;
+            align-items: flex-end;
-      // 左中右三个区域统一处理
-      .order-detail-bottom-left,
-      .order-detail-bottom-center,
-      .order-detail-bottom-right {
-        min-width: auto; // 取消最小宽度限制
-        flex: 1; // 三个区域平均分配宽度
-        display: flex;
-        justify-content: center;
-        align-items: center;
-      }
+            .count-label {
+              font-size: 22rpx; /* 减小字体大小 */
+              color: #666;
+              margin-bottom: 4rpx; /* 减小外边距 */
+            }
-      // 左侧区域单独处理（取消订单按钮）
-      .order-detail-bottom-left {
-        justify-content: flex-start;
-        flex-direction: column;
-        align-items: flex-start;
+            .count-value {
+              font-weight: bold;
+              color: #19a97c;
+              font-size: 26rpx; /* 减小字体大小 */
+            }
+          }
+
+          .handler-trip-controls {
+            display: flex;
+            align-items: center;
+            gap: 10rpx;
+
+            .assign-button {
+              padding: 0 15rpx;
+              font-size: 22rpx;
+              height: 50rpx;
+              line-height: 50rpx;
+            }
+            .delete-button {
+              padding: 0 15rpx;
+              font-size: 22rpx;
+              height: 50rpx;
+              line-height: 50rpx;
+            }
+          }
+        }
       }
-      // 右侧区域单独处理（评价相关按钮）
-      .order-detail-bottom-right {
-        justify-content: flex-end;
+      /* 分配趟次 */
+      .assign-trip-card {
+        .assign-content {
+          padding: 15rpx; /* 减小内边距 */
+
+          .selector-wrapper, .number-box-wrapper {
+            display: flex;
+            align-items: center;
+            margin-bottom: 15rpx; /* 减小外边距 */
+
+            &:last-child {
+              margin-bottom: 0;
+            }
+
+            .selector-label, .number-label {
+              width: 140rpx; /* 减小宽度 */
+              font-size: 24rpx; /* 减小字体大小 */
+              color: #333;
+            }
+
+            .handler-selector {
+              flex: 1;
+              height: 40rpx; /* 减小高度 */
+              border: 1px solid #DCDFE6;
+              border-radius: 4px;
+              padding: 0 8rpx; /* 减小内边距 */
+              outline: none;
+              font-size: 24rpx; /* 减小字体大小 */
+            }
+          }
+
+          .confirm-button {
+            width: 100%;
+            border-radius: 6rpx; /* 减小圆角 */
+            font-size: 26rpx; /* 减小字体大小 */
+            height: 40rpx; /* 减小高度 */
+          }
+        }
       }
     }
+  }
-    // 中间按钮组优化（分配/处理订单按钮）
-    .order-detail-bottom-center {
-      .button-group-wrap {
-        display: flex;
-        flex-wrap: wrap; // 超出时自动换行
-        gap: 16rpx; // 按钮之间间距
-        justify-content: center;
-        width: 100%;
-      }
-      // 单个按钮样式统一优化
-      u-button {
-        flex: 0 0 auto; // 不自动拉伸
-        min-width: 180rpx; // 最小宽度，确保按钮不会太窄
-        max-width: 240rpx; // 最大宽度，避免过宽
-        height: 72rpx; // 统一按钮高度
-        line-height: 72rpx; // 垂直居中
-        font-size: 26rpx; // 字体大小优化
-        padding: 0 20rpx;
-        border-radius: 36rpx; // 圆角优化，更美观
-      }
+  .space-box {
+    padding-bottom: $custom-bottom-height;
+    margin-bottom: 40rpx;
+  }
-      // 重新分配按钮组样式
-      .button-group-spread {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        width: 100%;
-        gap: 16rpx; // 中间间距
-      }
+
+  .order-detail-bottom {
+    position: fixed; // 改为fixed定位，确保始终在底部
+    width: 100%;
+    bottom: 0;
+    left: 0;
+    background-color: #fff; // 添加背景色，避免穿透
+    box-shadow: 0 -2rpx 10rpx rgba(0,0,0,0.05); // 添加阴影，提升层次感
+    padding: 20rpx $custom-page-padding; // 上下内边距，左右和页面一致
+    box-sizing: border-box;
+
+    .order-detail-bottom-box {
+      height: auto; // 取消固定高度，自适应内容
+      padding: 0; // 移除原有内边距
+      display: flex;
+      flex-wrap: wrap; // 允许换行
+      gap: 16rpx; // 按钮之间统一间距
+      align-items: center;
     }
-    // 适配小屏幕，当按钮过多时自动换行
-    @media (max-width: 375px) {
-      .order-detail-bottom-box {
-        gap: 12rpx;
-      }
+    .button-group-vertical {
+      display: flex;
+      flex-direction: column;
+      gap: 20rpx;
+      width: 100%;
+    }
-      .order-detail-bottom-center u-button {
-        min-width: 160rpx;
-        font-size: 24rpx;
-        height: 68rpx;
-        line-height: 68rpx;
-      }
+    // 左中右三个区域统一处理
+    .order-detail-bottom-left,
+    .order-detail-bottom-center,
+    .order-detail-bottom-right {
+      min-width: auto; // 取消最小宽度限制
+      flex: 1; // 三个区域平均分配宽度
+      display: flex;
+      justify-content: center;
+      align-items: center;
     }
-	}
-
-	.mask-container {
-		position: fixed;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		z-index: 999;
-		background-color: rgba(0, 0, 0, 0.5);
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	// 弹出框
-	.company-clean-container-car-popup {
-		min-height: 450rpx;
-		padding: $custom-page-padding;
-		box-sizing: border-box;
-
-		.company-clean-container-car-popup-content {
-			font-size: 28rpx;
-
-			.company-clean-container-car-popup-content-box {
-				box-sizing: border-box;
-				padding: $custom-page-padding;
-				border: 2rpx solid #19a97c;
-				border-radius: 10rpx;
-
-				.company-clean-container-car-popup-content-box-item {
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-					margin: 20rpx 0;
-					box-sizing: border-box;
-
-					.company-clean-container-car-popup-content-box-item-text {}
-
-					.company-clean-container-car-popup-content-box-item-number {}
-				}
-			}
-
-			.company-clean-container-car-popup-content-title {
-				color: $u-main-color;
-				box-sizing: border-box;
-				margin-bottom: 20rpx;
-				font-size: 30rpx;
-				font-weight: bold;
-			}
-		}
-
-		.company-clean-container-car-popup-button-safe {
-			width: 100%;
-			height: $custom-bottom-height;
-			box-sizing: border-box;
-			padding: 20rpx;
-
-			.company-clean-container-car-popup-button-safe-btn {
-				width: 100%;
-				height: 100%;
-				border-radius: 10rpx;
-				font-size: 30rpx;
-				line-height: 100rpx;
-				text-align: center;
-			}
-		}
-	}
-	.image-group {
-		margin-bottom: 20px;
-		padding: 10px;
-		background-color: #f5f5f5;
-		border-radius: 5px;
-	}
-
-	.image-group-title {
-		margin-bottom: 10px;
-		font-weight: bold;
-		color: #333;
-	}
-/* 确保u-upload组件内的图片水平排列 */
-	.image-group .u-upload {
-		display: flex;
-		flex-wrap: wrap;
-	}
-  .image-group-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 10rpx;
+    // 左侧区域单独处理（取消订单按钮）
+    .order-detail-bottom-left {
+      justify-content: flex-start;
+      flex-direction: column;
+      align-items: flex-start;
+    }
+
+    // 右侧区域单独处理（评价相关按钮）
+    .order-detail-bottom-right {
+      justify-content: flex-end;
+    }
   }
-  .car-status {
-    padding: 4rpx 12rpx;
-    border-radius: 6rpx;
-    font-size: 24rpx;
-    font-weight: bold;
+  // 中间按钮组优化（分配/处理订单按钮）
+  .order-detail-bottom-center {
+    .button-group-wrap {
+      display: flex;
+      flex-wrap: wrap; // 超出时自动换行
+      gap: 16rpx; // 按钮之间间距
+      justify-content: center;
+      width: 100%;
+    }
-    &.in-transit {
-      background-color: #fff7e6;
-      color: #ff9900;
+    // 单个按钮样式统一优化
+    u-button {
+      flex: 0 0 auto; // 不自动拉伸
+      min-width: 180rpx; // 最小宽度，确保按钮不会太窄
+      max-width: 240rpx; // 最大宽度，避免过宽
+      height: 72rpx; // 统一按钮高度
+      line-height: 72rpx; // 垂直居中
+      font-size: 26rpx; // 字体大小优化
+      padding: 0 20rpx;
+      border-radius: 36rpx; // 圆角优化，更美观
     }
-    &.completed {
-      background-color: #e6f7ff;
-      color: #19a97c;
+    // 重新分配按钮组样式
+    .button-group-spread {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      width: 100%;
+      gap: 16rpx; // 中间间距
     }
   }
-  .driver-list-popup {
-    min-height: 400rpx;
-    max-height: 800rpx;
-    padding: $custom-page-padding;
-    box-sizing: border-box;
-    .driver-list-popup-header {
-      text-align: center;
-      margin-bottom: 30rpx;
-
-      .driver-list-popup-title {
-        font-size: 32rpx;
-        font-weight: bold;
-        color: $u-main-color;
-      }
+  // 适配小屏幕，当按钮过多时自动换行
+  @media (max-width: 375px) {
+    .order-detail-bottom-box {
+      gap: 12rpx;
     }
-    .driver-list-popup-content {
-      max-height: 600rpx;
-      overflow-y: auto;
+    .order-detail-bottom-center u-button {
+      min-width: 160rpx;
+      font-size: 24rpx;
+      height: 68rpx;
+      line-height: 68rpx;
+    }
+  }
+}
+
+.mask-container {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 999;
+  background-color: rgba(0, 0, 0, 0.5);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+// 弹出框
+.company-clean-container-car-popup {
+  min-height: 450rpx;
+  padding: $custom-page-padding;
+  box-sizing: border-box;
+
+  .company-clean-container-car-popup-content {
+    font-size: 28rpx;
+
+    .company-clean-container-car-popup-content-box {
+      box-sizing: border-box;
+      padding: $custom-page-padding;
+      border: 2rpx solid #19a97c;
+      border-radius: 10rpx;
-      .driver-item {
+      .company-clean-container-car-popup-content-box-item {
         display: flex;
-        justify-content: space-between;
         align-items: center;
-        padding: 20rpx 0;
-        border-bottom: 1rpx solid $u-border-color;
-
-        .driver-info {
-          display: flex;
-          flex-direction: column;
+        justify-content: space-between;
+        margin: 20rpx 0;
+        box-sizing: border-box;
-          .driver-name {
-            font-size: 28rpx;
-            font-weight: bold;
-            margin-bottom: 10rpx;
-          }
+        .company-clean-container-car-popup-content-box-item-text {}
-          .driver-phone {
-            font-size: 24rpx;
-            color: $u-tips-color;
-          }
-        }
+        .company-clean-container-car-popup-content-box-item-number {}
       }
     }
-    .driver-list-popup-footer {
-      margin-top: 30rpx;
-      text-align: center;
+    .company-clean-container-car-popup-content-title {
+      color: $u-main-color;
+      box-sizing: border-box;
+      margin-bottom: 20rpx;
+      font-size: 30rpx;
+      font-weight: bold;
     }
   }
-  .driver-info-container {
-    .driver-info-row {
-      display: flex;
-      flex-wrap: wrap;
-      padding: 10rpx 0;
-      border-bottom: 1rpx solid $u-border-color;
-      justify-content: flex-start;
-      .driver-name, .car-code {
-        margin-right: 20rpx;
-        color: $u-main-color;
-      }
+  .company-clean-container-car-popup-button-safe {
+    width: 100%;
+    height: $custom-bottom-height;
+    box-sizing: border-box;
+    padding: 20rpx;
-      .driver-name {
-        font-weight: bold;
-      }
+    .company-clean-container-car-popup-button-safe-btn {
+      width: 100%;
+      height: 100%;
+      border-radius: 10rpx;
+      font-size: 30rpx;
+      line-height: 100rpx;
+      text-align: center;
     }
+  }
+}
+.image-group {
+  margin-bottom: 20px;
+  padding: 10px;
+  background-color: #f5f5f5;
+  border-radius: 5px;
+}
+
+.image-group-title {
+  margin-bottom: 10px;
+  font-weight: bold;
+  color: #333;
+}
-    .driver-info-row:last-child {
-      border-bottom: none;
-    }
+/* 确保u-upload组件内的图片水平排列 */
+.image-group .u-upload {
+  display: flex;
+  flex-wrap: wrap;
+}
+.image-group-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 10rpx;
+}
+
+.car-status {
+  padding: 4rpx 12rpx;
+  border-radius: 6rpx;
+  font-size: 24rpx;
+  font-weight: bold;
+
+  &.in-transit {
+    background-color: #fff7e6;
+    color: #ff9900;
   }
-  /* 车辆类型列表样式 */
-  .car-type-info-container {
-    .car-type-info-header {
+  &.completed {
+    background-color: #e6f7ff;
+    color: #19a97c;
+  }
+}
+.driver-list-popup {
+  min-height: 400rpx;
+  max-height: 800rpx;
+  padding: $custom-page-padding;
+  box-sizing: border-box;
+
+  .driver-list-popup-header {
+    text-align: center;
+    margin-bottom: 30rpx;
+
+    .driver-list-popup-title {
+      font-size: 32rpx;
       font-weight: bold;
-      color: $u-primary;
-      margin-bottom: 20rpx;
-      padding-bottom: 15rpx;
-      border-bottom: 2rpx solid $u-primary;
-      display: flex;
-      align-items: center;
-
-      .header-icon {
-        display: inline-block;
-        width: 6rpx;
-        height: 30rpx;
-        background-color: $u-primary;
-        border-radius: 3rpx;
-        margin-right: 15rpx;
-      }
+      color: $u-main-color;
     }
+  }
+
+  .driver-list-popup-content {
+    max-height: 600rpx;
+    overflow-y: auto;
-    .car-type-info-row {
+    .driver-item {
       display: flex;
-      flex-direction: column;
-      padding: 20rpx 15rpx;
-      background-color: #f8f8f8;
-      border-radius: 12rpx;
-      margin-bottom: 15rpx;
-      box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
+      justify-content: space-between;
+      align-items: center;
+      padding: 20rpx 0;
+      border-bottom: 1rpx solid $u-border-color;
-      .car-info-item {
+      .driver-info {
         display: flex;
-        align-items: center;
-        margin-bottom: 10rpx;
-
-        &:last-child {
-          margin-bottom: 0;
-        }
-
-        .car-type-label, .car-count-label {
-          font-weight: 500;
-          color: #666;
-          margin-right: 10rpx;
-          width: 100rpx;
-        }
+        flex-direction: column;
-        .car-type-value, .car-count-value {
-          color: $u-main-color;
+        .driver-name {
+          font-size: 28rpx;
           font-weight: bold;
+          margin-bottom: 10rpx;
         }
-        .car-count-value {
-          color: $u-primary;
+        .driver-phone {
+          font-size: 24rpx;
+          color: $u-tips-color;
         }
       }
+    }
+  }
-      &:last-child {
-        margin-bottom: 0;
-      }
+  .driver-list-popup-footer {
+    margin-top: 30rpx;
+    text-align: center;
+  }
+}
+.driver-info-container {
+  .driver-info-row {
+    display: flex;
+    flex-wrap: wrap;
+    padding: 10rpx 0;
+    border-bottom: 1rpx solid $u-border-color;
+    justify-content: flex-start;
+
+    .driver-name, .car-code {
+      margin-right: 20rpx;
+      color: $u-main-color;
+    }
+
+    .driver-name {
+      font-weight: bold;
     }
   }
-  /* 订单信息板块样式 */
-  .order-info-section {
-    .info-item {
+  .driver-info-row:last-child {
+    border-bottom: none;
+  }
+}
+
+/* 车辆类型列表样式 */
+.car-type-info-container {
+  .car-type-info-header {
+    font-weight: bold;
+    color: $u-primary;
+    margin-bottom: 20rpx;
+    padding-bottom: 15rpx;
+    border-bottom: 2rpx solid $u-primary;
+    display: flex;
+    align-items: center;
+
+    .header-icon {
+      display: inline-block;
+      width: 6rpx;
+      height: 30rpx;
+      background-color: $u-primary;
+      border-radius: 3rpx;
+      margin-right: 15rpx;
+    }
+  }
+
+  .car-type-info-row {
+    display: flex;
+    flex-direction: column;
+    padding: 20rpx 15rpx;
+    background-color: #f8f8f8;
+    border-radius: 12rpx;
+    margin-bottom: 15rpx;
+    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
+
+    .car-info-item {
       display: flex;
-      padding: 15rpx;
-      background-color: #f8f8f8;
-      border-radius: 6rpx;
+      align-items: center;
       margin-bottom: 10rpx;
       &:last-child {
         margin-bottom: 0;
       }
-      .info-label {
-        display: flex;
-        align-items: center;
-        min-width: 140rpx;
+      .car-type-label, .car-count-label {
+        font-weight: 500;
         color: #666;
-        font-size: 24rpx;
+        margin-right: 10rpx;
+        width: 100rpx;
       }
-      .info-content {
-        flex: 1;
-        display: flex;
-        align-items: center;
-        color: #333;
-        font-size: 24rpx;
-
-        .content-text {
-          flex: 1;
-        }
+      .car-type-value, .car-count-value {
+        color: $u-main-color;
+        font-weight: bold;
+      }
-        .qr-code-icon {
-          margin-left: 10rpx;
-        }
+      .car-count-value {
+        color: $u-primary;
       }
     }
-    /* 处置场地特殊处理 */
-    .info-item:nth-child(n+5):nth-child(-n+7) {
-      .info-label {
-        min-width: 140rpx;
-      }
+    &:last-child {
+      margin-bottom: 0;
     }
   }
+}
-  /* 订单人员板块样式 */
-  .order-person-section {
-    .section-header {
-      display: flex;
-      align-items: center;
-      background: linear-gradient(90deg, #19a97c, #19a97c80);
-      color: white;
-      padding: 15rpx;
-      border-radius: 10rpx;
-      margin-bottom: 15rpx;
+/* 订单信息板块样式 */
+.order-info-section {
+  .info-item {
+    display: flex;
+    padding: 15rpx;
+    background-color: #f8f8f8;
+    border-radius: 6rpx;
+    margin-bottom: 10rpx;
-      .header-icon-bar {
-        background-color: white;
-        opacity: 0.8;
-        margin-right: 8rpx;
-        height: 25rpx;
-        width: 6rpx;
-        border-radius: 3rpx;
-      }
+    &:last-child {
+      margin-bottom: 0;
+    }
-      .header-title {
-        font-size: 28rpx;
-        font-weight: bold;
-      }
+    .info-label {
+      display: flex;
+      align-items: center;
+      min-width: 140rpx;
+      color: #666;
+      font-size: 24rpx;
     }
-    .info-item {
+    .info-content {
+      flex: 1;
       display: flex;
-      padding: 15rpx;
-      background-color: #f8f8f8;
-      border-radius: 6rpx;
-      margin-bottom: 10rpx;
+      align-items: center;
+      color: #333;
+      font-size: 24rpx;
-      &:last-child {
-        margin-bottom: 0;
+      .content-text {
+        flex: 1;
       }
-      .info-label {
-        display: flex;
-        align-items: center;
-        min-width: 140rpx;
-        color: #666;
-        font-size: 24rpx;
+      .qr-code-icon {
+        margin-left: 10rpx;
       }
+    }
+  }
-      .info-content {
-        flex: 1;
-        display: flex;
-        align-items: center;
-        color: #333;
-        font-size: 24rpx;
+  /* 处置场地特殊处理 */
+  .info-item:nth-child(n+5):nth-child(-n+7) {
+    .info-label {
+      min-width: 140rpx;
+    }
+  }
+}
-        .content-text {
-          flex: 1;
-        }
+/* 订单人员板块样式 */
+.order-person-section {
+  .section-header {
+    display: flex;
+    align-items: center;
+    background: linear-gradient(90deg, #19a97c, #19a97c80);
+    color: white;
+    padding: 15rpx;
+    border-radius: 10rpx;
+    margin-bottom: 15rpx;
+
+    .header-icon-bar {
+      background-color: white;
+      opacity: 0.8;
+      margin-right: 8rpx;
+      height: 25rpx;
+      width: 6rpx;
+      border-radius: 3rpx;
+    }
-        .icon-box {
-          margin-left: 10rpx;
-        }
-      }
+    .header-title {
+      font-size: 28rpx;
+      font-weight: bold;
     }
   }
-  /* 处理信息板块样式 */
-  .process-info-section {
-    .section-header {
+  .info-item {
+    display: flex;
+    padding: 15rpx;
+    background-color: #f8f8f8;
+    border-radius: 6rpx;
+    margin-bottom: 10rpx;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+
+    .info-label {
       display: flex;
       align-items: center;
-      background: linear-gradient(90deg, #19a97c, #19a97c80);
-      color: white;
-      padding: 15rpx;
-      border-radius: 10rpx;
-      margin-bottom: 15rpx;
+      min-width: 140rpx;
+      color: #666;
+      font-size: 24rpx;
+    }
+
+    .info-content {
+      flex: 1;
+      display: flex;
+      align-items: center;
+      color: #333;
+      font-size: 24rpx;
-      .header-icon-bar {
-        background-color: white;
-        opacity: 0.8;
-        margin-right: 8rpx;
-        height: 25rpx;
-        width: 6rpx;
-        border-radius: 3rpx;
+      .content-text {
+        flex: 1;
       }
-      .header-title {
-        font-size: 28rpx;
-        font-weight: bold;
+      .icon-box {
+        margin-left: 10rpx;
       }
     }
+  }
+}
-    .photo-section {
-      .info-item {
-        margin-bottom: 15rpx;
+/* 处理信息板块样式 */
+.process-info-section {
+  .section-header {
+    display: flex;
+    align-items: center;
+    background: linear-gradient(90deg, #19a97c, #19a97c80);
+    color: white;
+    padding: 15rpx;
+    border-radius: 10rpx;
+    margin-bottom: 15rpx;
+
+    .header-icon-bar {
+      background-color: white;
+      opacity: 0.8;
+      margin-right: 8rpx;
+      height: 25rpx;
+      width: 6rpx;
+      border-radius: 3rpx;
+    }
-        .info-label {
-          display: flex;
-          align-items: center;
-          color: #666;
-          font-size: 24rpx;
-        }
+    .header-title {
+      font-size: 28rpx;
+      font-weight: bold;
+    }
+  }
+
+  .photo-section {
+    .info-item {
+      margin-bottom: 15rpx;
+
+      .info-label {
+        display: flex;
+        align-items: center;
+        color: #666;
+        font-size: 24rpx;
       }
+    }
-      .image-groups {
-        .image-group {
-          padding: 15rpx;
-          background-color: #f8f8f8;
-          border-radius: 6rpx;
-          margin-bottom: 15rpx;
+    .image-groups {
+      .image-group {
+        padding: 15rpx;
+        background-color: #f8f8f8;
+        border-radius: 6rpx;
+        margin-bottom: 15rpx;
-          &:last-child {
-            margin-bottom: 0;
-          }
+        &:last-child {
+          margin-bottom: 0;
+        }
-          .image-group-header {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            margin-bottom: 10rpx;
+        .image-group-header {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          margin-bottom: 10rpx;
-            .image-group-title {
-              font-size: 24rpx;
-              font-weight: bold;
-              color: #333;
-            }
+          .image-group-title {
+            font-size: 24rpx;
+            font-weight: bold;
+            color: #333;
           }
         }
       }
     }
+  }
-    .empty-image-section {
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      justify-content: center;
-      padding: 30rpx;
+  .empty-image-section {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 30rpx;
-      .empty-text {
-        margin-top: 20rpx;
-        color: #999;
-        font-size: 24rpx;
-      }
+    .empty-text {
+      margin-top: 20rpx;
+      color: #999;
+      font-size: 24rpx;
     }
   }
+}
 </style>
 \ No newline at end of file
@@ -34,6 +34,14 @@
           <text>地址管理</text>
         </view>
       </view>
+      <view class="cell-box" @click="toChangePassword" hover-class="handlerClick">
+        <view class="cell-icon">
+          <image width="35rpx" height="35rpx" src="../../static/image/address-manager.png"></image>
+        </view>
+        <view class="cell-label">
+          <text>修改密码</text>
+        </view>
+      </view>
       <view class="cell-box" @click="handlerChangeRole" hover-class="handlerClick">
         <view class="cell-icon">
           <image src="../../static/image/role-change.png"></image>
@@ -81,6 +89,12 @@ const userNameMrthod = (userName) =&gt; {
   return null == userName?"":undefined == userName?"":"undefined"==userName?"":userName;
 }
+const toChangePassword = () => {
+  uni.$u.route({
+    url: 'pages/change-password/index'
+  });
+};
+
 const handlerChangeRole = () => {
   uni.showModal({