提交12-9

lichao
1 parent 177df08c
Showing 9 changed files with 250 additions and 935 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
@@ -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) {