提交12-19

lichao
1 parent 6283a76f
Showing 11 changed files with 527 additions and 289 deletions
garbage-removal/src/components/clash-disposal-dispatch/index.vue
garbage-removal/src/components/clash-driver-dispatch/index.vue
garbage-removal/src/components/next-tree/next-tree.vue
garbage-removal/src/pages/home-info/clean/index.vue
garbage-removal/src/pages/order-info/order-disposal/scan-detail/index.vue
garbage-removal/src/pages/order-info/order-driver/detail/guest/index.vue
garbage-removal/src/pages/order-info/order-driver/detail/index.vue
garbage-removal/src/pages/order-info/order-other/detail/index.vue
garbage-removal/src/pages/order/order-disposal/index.vue
garbage-removal/src/pages/wode/index.vue
garbage-removal/src/utils/request/request.js
@@ -142,7 +142,7 @@ function changeVerify(current, chooseList) {
 function open(dataList) {
   treeData.value = handlerTreeData(dataList)
   treeData.value = treeData.value.filter(item => {
-    return item.children[0].id
+    return item.children && item.children.length > 0 && item.children[0] && item.children[0].id
   })
   setTimeout(() => {
     nextTick(() => {
@@ -158,7 +158,7 @@ function handlerTreeData(dataList) {
           "id": (index + 1),
           "name": item.garOrderDisposalCompanyName,
           "label": item.garOrderDisposalCompanyName,
-          "children": item.personnelInfo.map((childrenItem, childrenIndex) => {
+          "children": (item.personnelInfo || []).map((childrenItem, childrenIndex) => {
             return {
               "id": (index + 1) + '-' + (childrenIndex + 1),
               "tel": childrenItem.tel,
@@ -123,7 +123,7 @@ function changeVerify(current, chooseList) {
 function open(dataList) {
   treeData.value = handlerTreeData(dataList)
   treeData.value = treeData.value.filter(item => {
-    return item.children[0].id
+    return item.children && item.children.length > 0 && item.children[0] && item.children[0].id
   })
   setTimeout(() => {
     nextTick(() => {
@@ -140,7 +140,7 @@ function handlerTreeData(dataList) {
           "licensePlateNumber": item.licensePlateNumber,
           "containerVolume": item.containerVolume + "方车",
           "label": item.containerVolume + "方车" + '-' + item.licensePlateNumber,
-          "children": item.personnelInfo.map((childrenItem, childrenIndex) => {
+          "children": (item.personnelInfo || []).map((childrenItem, childrenIndex) => {
             return {
               "id": (index + 1) + '-' + (childrenIndex + 1),
               "garOrderContainerVolume": item.containerVolume,
@@ -347,6 +347,10 @@ export default {
 		},
 		//扁平化树结构
 		_renderTreeList(list = [], rank = 0, parentId = [], parents = []) {
+      if (!Array.isArray(list)) {
+        console.warn('next-tree: _renderTreeList received non-array data:', list);
+        return;
+      }
 			list.forEach(item => {
 				const halfChecked = this.getHalfCheckedFormTreeData(item);
 				let ouputText = '';
@@ -375,24 +379,25 @@ export default {
 					halfChecked,
 					disabled: this.disabledKey && item[this.disabledKey] === true
 				})
-				if (
-					(Array.isArray(item[this.childrenKey]) && item[this.childrenKey].length > 0) ||
-					(this.loadData && Array.isArray(item[this.childrenKey]) && item[this.childrenKey].length === 0)
-				) {
-					let parentid = [...parentId],
-						parentArr = [...parents],
-						childrenid = [];
-					delete parentArr.children
-					parentid.push(item[this.valueKey]);
-					parentArr.push({
-						[this.valueKey]: item[this.valueKey],
-						[this.labelKey]: item[this.labelKey],
-						"data": item
-					})
-					this._renderTreeList(item[this.childrenKey], rank + 1, parentid, parentArr);
-				} else {
-					this.treeList[this.treeList.length - 1].lastRank = true;
-				}
+        const children = item[this.childrenKey];
+        if (
+            (Array.isArray(children) && children.length > 0) ||
+            (this.loadData && Array.isArray(children) && children.length === 0)
+        ) {
+          let parentid = [...parentId],
+              parentArr = [...parents],
+              childrenid = [];
+          delete parentArr.children
+          parentid.push(item[this.valueKey]);
+          parentArr.push({
+            [this.valueKey]: item[this.valueKey],
+            [this.labelKey]: item[this.labelKey],
+            "data": item
+          })
+          this._renderTreeList(children, rank + 1, parentid, parentArr);
+        } else {
+          this.treeList[this.treeList.length - 1].lastRank = true;
+        }
 			})
 		},
 		// 处理默认选择
@@ -522,38 +527,39 @@ export default {
 			} else if (!this.showHalfCheckedTips) {
 				return false
 			} else {
-				if (item[this.childrenKey] && item[this.childrenKey].length) {
-					return item[this.childrenKey].some(it => {
-						if (it.checked === true) {
-							return true;
-						} else if (it[this.childrenKey] && it[this.childrenKey].length) {
-							return this.getHalfCheckedFormTreeData(it);
-						} else {
-							return false;
-						};
-					});
-				} else {
-					return false;
-				}
+        const children = item[this.childrenKey];
+        if (Array.isArray(children) && children.length) {
+          return children.some(it => {
+            if (it.checked === true) {
+              return true;
+            } else if (it[this.childrenKey] && Array.isArray(it[this.childrenKey]) && it[this.childrenKey].length) {
+              return this.getHalfCheckedFormTreeData(it);
+            } else {
+              return false;
+            };
+          });
+        } else {
+          return false;
+        }
 			}
 		},
 		getItemFromTreeData(treeData, id) {
-			if (id) {
-				let item = null;
-				(treeData || []).some(it => {
-					if (it[this.valueKey] === id) {
-						item = it
-						return true
-					} else if (it[this.childrenKey] && it[this.childrenKey].length) {
-						item = this.getItemFromTreeData(it[this.childrenKey], id)
-						return !!item
-					} else {
-						return false
-					}
-				});
-				return item
-			};
-			return null
+      if (id) {
+        let item = null;
+        (treeData || []).some(it => {
+          if (it[this.valueKey] === id) {
+            item = it
+            return true
+          } else if (it[this.childrenKey] && Array.isArray(it[this.childrenKey]) && it[this.childrenKey].length) {
+            item = this.getItemFromTreeData(it[this.childrenKey], id)
+            return !!item
+          } else {
+            return false
+          }
+        });
+        return item
+      };
+      return null
 		},
 		_treeItemSelect(item, _index) {
 			const index = this.treeList.findIndex(it => it.id === item.id);
@@ -598,79 +604,87 @@ export default {
 				this._fixMultiple(index);
 			}
 		},
-		updateParentChecked(index) {
-			const parentId = (this.treeList[index].parentId || []).concat([]).reverse();
-			if (parentId && parentId.length) {
-				parentId.map(id => {
-					const parentTreeDataItem = this.getItemFromTreeData(this.currentTreeData, id);
-					const childrenIds = (parentTreeDataItem[this.childrenKey] || []).map(item => item[this.valueKey]);
-					const bool = this.treeList
-						.filter(it => childrenIds.indexOf(it.id) !== -1)
-						.every(it => it.checked === true);
+    updateParentChecked(index) {
+      const parentId = (this.treeList[index].parentId || []).concat([]).reverse();
+      if (parentId && parentId.length) {
+        parentId.map(id => {
+          const parentTreeDataItem = this.getItemFromTreeData(this.currentTreeData, id);
+          // 添加安全检查：确保parentTreeDataItem和childrenKey存在
+          const children = parentTreeDataItem && parentTreeDataItem[this.childrenKey];
+          if (!Array.isArray(children)) return;
-					const _bool = this.treeList
-						.filter(it => childrenIds.indexOf(it.id) !== -1)
-						.every(it => it.checked === false);
+          const childrenIds = children.map(item => item[this.valueKey]);
+          const bool = this.treeList
+              .filter(it => childrenIds.indexOf(it.id) !== -1)
+              .every(it => it.checked === true);
-					const parentItem = this.treeList.find(it => it.id === id);
-					if (parentItem) {
-						if (this.checkStrictlyModel === 'weak') {
-							if (bool && !parentItem.disabled) {
-								parentItem.checked = true;
-							} else if (_bool && !parentItem.disabled) {
-								parentItem.checked = false;
-							}
-						} else if (this.checkStrictlyModel === 'strong') {
-							if (bool) {
-								parentItem.checked = true;
-							} else {
-								parentItem.checked = false;
-							}
-						}
-					}
-				})
-			}
-		},
-		updateHalfChecked(index) {
-			const _parentId = this.treeList[index].parentId || [];
-			const parentId = _parentId.concat([]).reverse();
-			if (parentId && parentId.length) {
-				parentId.map(id => {
-					const parentTreeDataItem = this.getItemFromTreeData(this.currentTreeData, id);
-					const childrenIds = (parentTreeDataItem[this.childrenKey] || []).map(item => item[this.valueKey]);
+          const _bool = this.treeList
+              .filter(it => childrenIds.indexOf(it.id) !== -1)
+              .every(it => it.checked === false);
-					const bool = this.treeList
-						.filter(it => childrenIds.indexOf(it.id) !== -1)
-						.every(it => it.checked === false && it.halfChecked === false);
+          const parentItem = this.treeList.find(it => it.id === id);
+          if (parentItem) {
+            if (this.checkStrictlyModel === 'weak') {
+              if (bool && !parentItem.disabled) {
+                parentItem.checked = true;
+              } else if (_bool && !parentItem.disabled) {
+                parentItem.checked = false;
+              }
+            } else if (this.checkStrictlyModel === 'strong') {
+              if (bool) {
+                parentItem.checked = true;
+              } else {
+                parentItem.checked = false;
+              }
+            }
+          }
+        })
+      }
+    },
+    updateHalfChecked(index) {
+      const _parentId = this.treeList[index].parentId || [];
+      const parentId = _parentId.concat([]).reverse();
+      if (parentId && parentId.length) {
+        parentId.map(id => {
+          const parentTreeDataItem = this.getItemFromTreeData(this.currentTreeData, id);
+          // 添加安全检查：确保parentTreeDataItem和childrenKey存在
+          const children = parentTreeDataItem && parentTreeDataItem[this.childrenKey];
+          if (!Array.isArray(children)) return;
-					const _bool = this.treeList
-						.filter(it => childrenIds.indexOf(it.id) !== -1)
-						.some(it => it.checked === true || it.halfChecked === true);
+          const childrenIds = children.map(item => item[this.valueKey]);
-					const parentItem = this.treeList.find(it => it.id === id);
-					if (parentItem) {
-						if (!parentItem.checked) {
-							if (bool) {
-								parentItem.halfChecked = false
-							} else if (_bool) {
-								parentItem.halfChecked = true
-							} else {
-								parentItem.halfChecked = false
-							}
-						}
-					}
-				})
-			}
-			if (this.treeList[index].checked == false) {
-				const source = this.treeList[index].source || {};
-				const children = source[this.childrenKey] || [];
-				const checkedKeyList = this.getChildrenKeys(children);
-				const bool = this.treeList.filter(item => checkedKeyList.indexOf(item.id) !== -1).some(item => item.checked);
-				if (bool) {
-					this.treeList[index].halfChecked = true;
-				}
-			}
-		},
+          const bool = this.treeList
+              .filter(it => childrenIds.indexOf(it.id) !== -1)
+              .every(it => it.checked === false && it.halfChecked === false);
+
+          const _bool = this.treeList
+              .filter(it => childrenIds.indexOf(it.id) !== -1)
+              .some(it => it.checked === true || it.halfChecked === true);
+
+          const parentItem = this.treeList.find(it => it.id === id);
+          if (parentItem) {
+            if (!parentItem.checked) {
+              if (bool) {
+                parentItem.halfChecked = false
+              } else if (_bool) {
+                parentItem.halfChecked = true
+              } else {
+                parentItem.halfChecked = false
+              }
+            }
+          }
+        })
+      }
+      if (this.treeList[index].checked == false) {
+        const source = this.treeList[index].source || {};
+        const children = source[this.childrenKey] || [];
+        const checkedKeyList = this.getChildrenKeys(children);
+        const bool = this.treeList.filter(item => checkedKeyList.indexOf(item.id) !== -1).some(item => item.checked);
+        if (bool) {
+          this.treeList[index].halfChecked = true;
+        }
+      }
+    },
 		showHalfChecked(item) {
 			if (this.multiple && !this.checkStrictly && item.halfChecked === true) {
 				return true
@@ -678,16 +692,19 @@ export default {
 				return false
 			}
 		},
-		getChildrenKeys(children) {
-			let keys = [];
-			(children || []).map(item => {
-				keys.push(item[this.valueKey])
-				if (item[this.childrenKey] && item[this.childrenKey].length) {
-					keys = keys.concat(this.getChildrenKeys(item[this.childrenKey]))
-				}
-			})
-			return keys
-		},
+    getChildrenKeys(children) {
+      let keys = [];
+      (children || []).map(item => {
+        // 添加安全检查：确保item和valueKey存在
+        if (item && item[this.valueKey]) {
+          keys.push(item[this.valueKey])
+          if (item[this.childrenKey] && Array.isArray(item[this.childrenKey]) && item[this.childrenKey].length) {
+            keys = keys.concat(this.getChildrenKeys(item[this.childrenKey]))
+          }
+        }
+      })
+      return keys
+    },
 		// 处理单选多选
 		_fixMultiple(index) {
 			if (!this.multiple) {
@@ -619,7 +619,6 @@
 		console.log("----------------------->5");
 		if (!validateParams(params)) {
 			console.log("未通过", params);
-
 			return;
 		}
@@ -97,7 +97,8 @@
 	import {
 		askTransport,
 		scanDetail,
-    queryMileage
+    queryMileage,
+    queryLatitudeLongitude
 	} from '@/apis/order.js';
 	import {
 		onLoad
@@ -158,59 +159,47 @@
         const mileageData = JSON.parse(res.data.data);
         details.value.transportDistance = mileageData.mileage+ ' 公里'; // 米转公里
-        // 使用接口返回的定位信息
-        if (mileageData.endLatitude && mileageData.endLongitude) {
-          location.value = {
-            latitude: mileageData.endLatitude,
-            longitude: mileageData.endLongitude
-          };
-        } else {
-          // 当接口返回的定位信息为空时，调用手机定位
-          console.log("接口返回的定位信息为空，尝试获取手机定位");
-          details.value.transportDistance = "1 公里";
-          getPhoneLocation();
-        }
+        // 统一使用车辆实时定位接口（避免不同接口返回坐标差异）
+        await getLocationFromApi();
       } else {
         console.log("获取运距失败：" + res.data.msg);
-        // 运距获取失败时，尝试获取手机定位
+        // 运距获取失败时，同样使用车辆实时定位接口
         details.value.transportDistance = "1 公里";
-        getPhoneLocation();
+        await getLocationFromApi();
       }
     } catch (error) {
       console.error("调用运距接口出错：", error);
       details.value.transportDistance = "1 公里";
-      // 接口调用异常时，尝试获取手机定位
-      getPhoneLocation();
+      // 接口调用异常时，改为获取车辆实时定位
+      await getLocationFromApi();
     }
   };
-  const getPhoneLocation = () => {
-    // 设置5秒超时
-    const timeout = setTimeout(() => {
-      uni.$u.toast('获取手机定位超时，请检查定位权限');
-    }, 5000);
-
-    // 调用uni.getLocation获取手机GPS定位
-    uni.getLocation({
-      type: 'gcj02',
-      success: (res) => {
-        clearTimeout(timeout);
-        console.log('手机定位获取成功', res);
-        location.value = {
-          latitude: res.latitude,
-          longitude: res.longitude
-        };
-        uni.$u.toast('手机定位获取成功');
-      },
-      fail: (err) => {
-        clearTimeout(timeout);
-        console.error('手机定位获取失败', err);
-        uni.$u.toast('获取手机定位失败，请检查定位权限');
-      },
-      complete: () => {
-        clearTimeout(timeout);
+  // 通过接口获取车辆实时定位（coordinates 由后端/车辆服务统一口径）
+  const getLocationFromApi = async () => {
+    const carNo = details.value?.garHandlerCarCode;
+    if (!carNo) return;
+
+    try {
+      const res = await queryLatitudeLongitude(carNo);
+      if (res?.data?.success) {
+        const data = res.data.data || {};
+        if (typeof data.latitude !== "undefined" && typeof data.longitude !== "undefined") {
+          location.value = {
+            latitude: data.latitude,
+            longitude: data.longitude
+          };
+          uni.$u.toast("车辆位置获取成功");
+        } else {
+          uni.$u.toast("车辆位置返回为空");
+        }
+      } else {
+        uni.$u.toast("车辆位置获取失败");
       }
-    });
+    } catch (err) {
+      console.error("获取车辆位置失败:", err);
+      uni.$u.toast("车辆位置获取异常");
+    }
   };
@@ -144,7 +144,7 @@
             <text class=" order-detail-container-header-title">装车照片：</text>
             <view class="order-detail-container-header-content" style="flex-direction: column;">
-              <view v-for="group in putOnImagesGrouped" :key="group.index" class="image-group">
+              <view v-for="group in putOnImages" :key="group.index" class="image-group">
                 <view class="image-group-header">
                   <view class="image-group-title">{{ group.carName}}第 {{ group.index }} 趟</view>
                   <!-- 根据group.index与真实发车数比较显示状态 -->
@@ -19,12 +19,12 @@
           订单信息
         </view>
         <view class="order-detail-container-header-item"
-          @click.stop="handlerJumpOtherApp(dataGram.garOrderAddress + dataGram.garOrderAddressDetails)">
-          <text class="order-detail-container-header-title">清运地点：</text>
-          <view class="order-detail-container-header-content" style="text-decoration: underline">
-            <text selectable='true'>{{ dataGram.garOrderAddress + dataGram.garOrderAddressDetails }}</text>
-          </view>
+        @click.stop="showNavDialog(dataGram.garLongitude,dataGram.garLatitude, dataGram.garOrderAddressDetails)">
+        <text class="order-detail-container-header-title">清运地点：</text>
+        <view class="order-detail-container-header-content" style="text-decoration: underline">
+          <text selectable='true'>{{ dataGram.garOrderAddress + dataGram.garOrderAddressDetails }}</text>
         </view>
+      </view>
         <view class="order-detail-container-header-item">
           <text class="order-detail-container-header-title">现场图片：</text>
           <view class="order-detail-container-header-content">
@@ -57,7 +57,7 @@
           </view>
         </view>
-      
+
         <view class="order-detail-container-header-item">
           <text class="order-detail-container-header-title">订单号：</text>
           <view class="order-detail-container-header-content">
@@ -448,10 +448,37 @@ const handleContactClick = (val) =&gt; {
   }).catch(err => { });
 }
-const handlerJumpOtherApp = (locationName) => {
-  // 方案一：使用腾讯地图URI API（推荐）
-  // 构建腾讯地图搜索链接，使用更完整的参数
-  window.location.href =`https://apis.map.qq.com/uri/v1/search?keyword=${encodeURIComponent(locationName)}&region=${encodeURIComponent(locationName)}&referer=XICBZ-ALWKT-2KPXZ-VCBL7-XMRYO-2QFS4&policy=1`;
+const showNavDialog = (longitude, latitude, locationName) => {
+  // 校验经纬度有效性
+  if (!longitude || !latitude) {
+    uni.$u.toast('暂无有效导航坐标');
+    return;
+  }
+
+  uni.showActionSheet({
+    itemList: ['高德导航', '百度导航'],
+    success: function (res) {
+      if (res.tapIndex === 0) {
+        // 调用你原来的高德导航方法
+        handlerJumpGaoDeApp(longitude, latitude, locationName);
+      } else if (res.tapIndex === 1) {
+        // 调用你原来的百度导航方法
+        handlerJumpBaiDuApp(longitude, latitude, locationName);
+      }
+    },
+    fail: function (res) {
+      console.log('取消导航选择:', res.errMsg);
+    }
+  });
+};
+// ===== 新增结束 =====
+
+const handlerJumpGaoDeApp = (longitude,latitude,locationName) => {
+  window.location.href =`https://uri.amap.com/marker?position=${longitude},${latitude}&name=${locationName}`;
+}
+
+const handlerJumpBaiDuApp = (longitude,latitude,locationName) => {
+  window.location.href =`http://api.map.baidu.com/marker?location=${longitude},${latitude}&title=${locationName}&output=html`;
 }
@@ -73,7 +73,7 @@
             <u-icon name="map" size="16" color="#19a97c" style="margin-right: 8rpx;"></u-icon>
             <text>清运地点:</text>
           </view>
-          <view class="info-content" @click.stop="handlerJumpOtherApp(dataGram.garLatitude, dataGram.garLongitude, dataGram.garCoordinate)">
+          <view class="info-content" @click.stop="showNavDialog(dataGram.garLongitude,dataGram.garLatitude, dataGram.garOrderAddressDetails)">
             <text class="content-text" selectable='true'>{{ dataGram.garOrderAddress + dataGram.garOrderAddressDetails }}</text>
           </view>
         </view>
@@ -941,20 +941,84 @@ const handleOrderDispatchClick = (orderId) =&gt; {
   // 获取订单车辆数量
   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()
+  // 在调用API前验证token有效性
+  const validateTokenAndCallAPI = async () => {
+    try {
+      // 检查当前token是否存在
+      if (!store.token) {
+        uni.$u.toast("登录已过期，请重新登录");
+        // 跳转到登录页面
+        uni.reLaunch({
+          url: "/pages/login/code",
+        });
+        return;
+      }
+
+      // 获取驾驶员人员 - 添加时间戳避免缓存
+      const timestamp = new Date().getTime();
+
+      // 添加重试机制
+      let retryCount = 0;
+      const maxRetries = 2;
+
+      const attemptRequest = async () => {
+        try {
+          const res = await queryOrderDispatch(`${orderId}?t=${timestamp}`);
+
+          if (res.data.success) {
+            // 过滤车辆  非用户选择的车辆无法选中
+            driverPersonnelList.value = res.data.data;
+            // 恢复原始的open调用方式，只传递dataList
+            clashDriverDispatchRef.value.open(res.data.data);
+            refreshOrderData();
+          } else {
+            uni.$u.toast("驾驶员分配成功！");
+            refreshOrderData();
+          }
+        } catch (error) {
+          console.error('获取驾驶员信息失败:', error);
+
+          // 检查是否是token相关错误
+          if (error.response && (error.response.status === 401 || error.response.status === 403)) {
+            retryCount++;
+
+            if (retryCount <= maxRetries) {
+              console.log(`token可能已过期，正在进行第${retryCount}次重试`);
+
+              // 清除当前token
+              store.token = null;
+              setRequestToken(null);
+              uni.removeStorageSync("Authorization");
+
+              // 跳转重新登录
+              uni.$u.toast("登录已过期，请重新登录");
+              setTimeout(() => {
+                uni.reLaunch({
+                  url: "/pages/login/code",
+                });
+              }, 1500);
+              return;
+            }
+          }
+
+          // 其他错误或重试次数用完
+          uni.$u.toast("获取驾驶员信息失败，请稍后重试");
+        }
+      };
+
+      await attemptRequest();
+
+    } catch (error) {
+      console.error('验证token时发生错误:', error);
+      uni.$u.toast("系统错误，请重新登录");
+      uni.reLaunch({
+        url: "/pages/login/code",
+      });
     }
-  })
+  };
+
+  // 执行验证和API调用
+  validateTokenAndCallAPI();
 }
 const handleDisposalDispatchClick = (orderId) => {
   // 获取处置场所人员
@@ -1575,6 +1639,39 @@ const submitUpdateCarInfo = () =&gt; {
   })
 }
+const showNavDialog = (longitude, latitude, locationName) => {
+  // 校验经纬度有效性
+  if (!longitude || !latitude) {
+    uni.$u.toast('暂无有效导航坐标');
+    return;
+  }
+
+  uni.showActionSheet({
+    itemList: ['高德导航', '百度导航'],
+    success: function (res) {
+      if (res.tapIndex === 0) {
+        // 调用你原来的高德导航方法
+        handlerJumpGaoDeApp(longitude, latitude, locationName);
+      } else if (res.tapIndex === 1) {
+        // 调用你原来的百度导航方法
+        handlerJumpBaiDuApp(longitude, latitude, locationName);
+      }
+    },
+    fail: function (res) {
+      console.log('取消导航选择:', res.errMsg);
+    }
+  });
+};
+// ===== 新增结束 =====
+
+const handlerJumpGaoDeApp = (longitude,latitude,locationName) => {
+  window.location.href =`https://uri.amap.com/marker?position=${longitude},${latitude}&name=${locationName}`;
+}
+
+const handlerJumpBaiDuApp = (longitude,latitude,locationName) => {
+  window.location.href =`http://api.map.baidu.com/marker?location=${longitude},${latitude}&title=${locationName}&output=html`;
+}
+
 const deleteHandler = (handler) => {
   uni.showModal({
 <template>
-	<view class="order-container">
-		<!-- #ifdef H5 -->
-		<z-paging-swiper :fixed="false">
-		<!-- #endif -->
-			<!-- #ifdef MP-WEIXIN -->
-			<z-paging-swiper>
-			<!-- #endif -->
-				<template v-slot:top>
-					<view class="header-box" :style="{
+  <view class="order-container">
+    <!-- #ifdef H5 -->
+    <z-paging-swiper :fixed="false">
+      <!-- #endif -->
+      <!-- #ifdef MP-WEIXIN -->
+      <z-paging-swiper>
+        <!-- #endif -->
+        <template v-slot:top>
+          <view class="header-box" :style="{
       'height': lightHeight, 'line-height': lightHeight,
       'padding-top': topMargin
     }
       ">
-						<view class="header-box-left-message">
-							&nbsp;
-						</view>
-						<view class="header-box-title">
-							{{ title }}
-						</view>
-					</view>
-					<u-tabs lineWidth=" 40" lineColor="#ffffff" lineHeight="6"
-						:activeStyle="{ 'color': '#ffffff', 'font-weight': 'bolder' }"
-						:inactiveStyle="{ color: '#ffffff' }" ref="uTabsElement" :list="displayList" :current="current"
-						@change="tabsChange" :scrollable="false"></u-tabs>
-				</template>
-
-				<swiper class="swiper" :current="swiperCurrent" @translation="translation"
-					@animationfinish="animationfinish">
-					<swiper-item class="swiper-item" v-for="( item, index ) in  list " :key="index">
-						<swiper-list-item :tabIndex="index" :currentIndex="swiperCurrent"></swiper-list-item>
-					</swiper-item>
-				</swiper>
-
-			</z-paging-swiper>
-
-	</view>
-	<view class="scan-box">
+            <view class="header-box-left-message">
+              &nbsp;
+            </view>
+            <view class="header-box-title">
+              {{ title }}
+            </view>
+          </view>
+          <u-tabs lineWidth=" 40" lineColor="#ffffff" lineHeight="6"
+                  :activeStyle="{ 'color': '#ffffff', 'font-weight': 'bolder' }"
+                  :inactiveStyle="{ color: '#ffffff' }" ref="uTabsElement" :list="displayList" :current="current"
+                  @change="tabsChange" :scrollable="false"></u-tabs>
+        </template>
+
+        <swiper class="swiper" :current="swiperCurrent" @translation="translation"
+                @animationfinish="animationfinish">
+          <swiper-item class="swiper-item" v-for="( item, index ) in  list " :key="index">
+            <swiper-list-item :tabIndex="index" :currentIndex="swiperCurrent"></swiper-list-item>
+          </swiper-item>
+        </swiper>
+
+      </z-paging-swiper>
+
+  </view>
+  <view class="scan-box">
     <view class="scan-tip">在此处扫码</view>
-		<view class="scan-btn">
-			<view class="scan-icon">
-				<!-- #ifdef H5 -->
-				<u-icon @click="handleScanH5" name="scan" :size="180" color="#fff"></u-icon>
-				<!-- #endif -->
-			</view>
-		</view>
-	</view>
-	<QrScannerVue v-if="showScan" @decode="onDecodeHandler" @close="qrReaderClose" />
+    <view class="scan-btn">
+      <view class="scan-icon">
+        <!-- #ifdef H5 -->
+        <u-icon @click="handleScanH5" name="scan" :size="180" color="#fff"></u-icon>
+        <!-- #endif -->
+      </view>
+    </view>
+  </view>
+  <QrScannerVue v-if="showScan" @decode="onDecodeHandler" @close="qrReaderClose" />
 </template>
 <script setup>
@@ -115,7 +115,7 @@ const handleScan = () =&gt; {
                 url: `pages/order-info/order-disposal/scan-detail/index`,
                 params: {
                   data: encodeURIComponent(JSON.stringify(res.data
-                    .data))
+                      .data))
                 }
               })
               return
@@ -134,29 +134,36 @@ const handleScan = () =&gt; {
     }
   });
 }
-const takeLocation = () => {
-  window.JsInterface.takeLocation();
-}
-
-// 接收定位结果的回调函数
-const takeLocalCallBack = (lngLat) => {
-  const ll = lngLat.split(",");
-  location.value = {
-    longitude: ll[0],
-    latitude: ll[1]
-  };
-}
-
-// 设置全局回调
-onMounted(() => {
-  window.takeLocationCallBack = takeLocalCallBack
-})
-
-onLoad((options) => {
-  // 获取定位信息
-  takeLocation();
-});
+// 获取手机定位（GCJ-02 坐标系）
+const getPhoneLocation = () => {
+  // 设置 5 秒超时
+  const timeout = setTimeout(() => {
+    uni.$u.toast('获取手机定位超时，请检查定位权限');
+  }, 5000);
+
+  // 调用 uni.getLocation 获取手机 GPS 定位
+  uni.getLocation({
+    type: 'gcj02',
+    success: (res) => {
+      clearTimeout(timeout);
+      console.log('手机定位获取成功', res);
+      location.value = {
+        latitude: res.latitude,
+        longitude: res.longitude
+      };
+      console.log('定位信息：', location.value);
+    },
+    fail: (err) => {
+      clearTimeout(timeout);
+      console.error('手机定位获取失败', err);
+      uni.$u.toast('获取手机定位失败，请检查定位权限');
+    },
+    complete: () => {
+      clearTimeout(timeout);
+    }
+  });
+};
 const handleScanH5 = async () => {
   showScan.value = true;
@@ -174,9 +181,9 @@ const handleScanH5 = async () =&gt; {
   //   if (error.message.includes("用户拒绝")) {
   //     uni.$u.toast("请允许访问位置信息以验证卸货地址");
   //   } else if (error.message.includes("安全来源")) {
-  //     uni.$u.toast("当前环境不支持位置验证，请使用HTTPS访问");
+  //     uni.$u.toast("当前环境不支持位置验证，请使用 HTTPS 访问");
   //   } else {
-  //     uni.$u.toast("位置验证失败: " + error.message);
+  //     uni.$u.toast("位置验证失败：" + error.message);
   //   }
   // }
 }
@@ -199,7 +206,7 @@ const validateUnloadingSite = async (location) =&gt; {
           site.garLongitude   // 使用 garLongitude
       );
       console.log(distance)
-      return distance <= 200; // 200米范围内
+      return distance <= 200; // 200 米范围内
     });
   } catch (error) {
     console.error('验证卸货地址失败:', error);
@@ -221,26 +228,26 @@ const calculateDistance = (lat1, lng1, lat2, lng2) =&gt; {
       )
   );
-  return distance * 6371000; // 地球半径(米)
+  return distance * 6371000; // 地球半径 (米)
 }
 const onDecodeHandler = (data) => {
   showScan.value = false
   try {
-          checkCode(data).then(res => {
-            console.log(res);
-            if (res.data.code == 200) {
-              uni.$u.route({
-                url: `pages/order-info/order-disposal/scan-detail/index`,
-                params: {
-                  data: encodeURIComponent(JSON.stringify(res.data
-                    .data))
-                }
-              })
-              return
-            }
-            alert(res.data.msg);
-          })
+    checkCode(data).then(res => {
+      console.log(res);
+      if (res.data.code == 200) {
+        uni.$u.route({
+          url: `pages/order-info/order-disposal/scan-detail/index`,
+          params: {
+            data: encodeURIComponent(JSON.stringify(res.data
+                .data))
+          }
+        })
+        return
+      }
+      alert(res.data.msg);
+    })
   } catch (error) {
     alert("无法确认当前二维码趟次，请扫描正在进行的运输趟次");
   }
@@ -253,7 +260,7 @@ const getOrderCountByType = (tabIndex) =&gt; {
   const type = tabIndex === 0 ? 1 : 3;
   queryOrderList({ type, pageNo: 1, pageSize: 1 }).then((res) => {
     if (res.data && res.data.data) {
-      // 这里假设接口返回的total是订单总数
+      // 这里假设接口返回的 total 是订单总数
       list.value[tabIndex].count = res.data.data.total || 0;
     }
   }).catch(() => {
@@ -284,6 +291,11 @@ onMounted(() =&gt; {
     getAllOrderCounts();
   })
 })
+
+onLoad((options) => {
+  // 获取定位信息
+  getPhoneLocation();
+});
 </script>
 <style lang="scss" scoped>
 	.scanCode {
@@ -130,6 +130,8 @@ const handleLoginOut = () =&gt; {
       if (res.confirm) {
         loginOut().then(res => {
           if (res.data.success) {
+            // 清除所有缓存
+            clearAllCache();
             store.token = null;
             setRequestToken();
             uni.$u.toast("已退出")
@@ -146,6 +148,77 @@ const handleLoginOut = () =&gt; {
   });
 }
+// 清除所有缓存的函数
+const clearAllCache = () => {
+  try {
+    // 1. 清除Pinia持久化存储
+    store.$reset();
+
+    // 2. 清除所有本地存储
+    const storageKeys = [
+      'cancelFlag',
+      'refreshFlag',
+      'Z-PAGING-CONFIG-STORAGE-KEY'
+    ];
+
+    // 获取所有存储的key并清除
+    const allKeys = getAllStorageKeys();
+    allKeys.forEach(key => {
+      // 保留一些必要的系统key，清除业务相关的key
+      if (!isSystemKey(key)) {
+        uni.removeStorageSync(key);
+      }
+    });
+
+    // 3. 清除z-paging相关缓存
+    clearZPagingCache();
+
+    // 4. 清除请求token
+    setRequestToken();
+
+    console.log('所有缓存已清除');
+  } catch (error) {
+    console.error('清除缓存时发生错误:', error);
+  }
+};
+
+// 获取所有存储的key
+const getAllStorageKeys = () => {
+  const res = uni.getStorageInfoSync();
+  return res.keys || [];
+};
+
+// 判断是否为系统保留的key
+const isSystemKey = (key) => {
+  // 系统保留的key，不要清除
+  const systemKeys = [
+    '__webviewId__',
+    '__uniapp__',
+    '__UNI__',
+    // 可以根据实际情况添加其他系统key
+  ];
+
+  return systemKeys.some(systemKey => key.includes(systemKey));
+};
+
+// 清除z-paging缓存
+const clearZPagingCache = () => {
+  try {
+    // 清除z-paging配置缓存
+    uni.removeStorageSync('Z-PAGING-CONFIG-STORAGE-KEY');
+
+    // 清除所有z-paging缓存前缀的数据
+    const allKeys = getAllStorageKeys();
+    allKeys.forEach(key => {
+      if (key.startsWith('z-paging-cache')) {
+        uni.removeStorageSync(key);
+      }
+    });
+  } catch (error) {
+    console.error('清除z-paging缓存时发生错误:', error);
+  }
+};
+
 </script>
@@ -61,28 +61,38 @@ instance.interceptors.request.use((config) =&gt; {
 });
 // 响应拦截器
 instance.interceptors.response.use((response) => {
-
   // 没有网络时 message的内容为"Network Error"
   if (response.errMsg === "request:fail") {
     uni.$u.toast("网络错误~")
     return response;
   }
+
+  // 特别处理queryOrderDispatch相关的401/403错误
+  const url = response.config?.url || '';
+  const isOrderDispatchRequest = url.includes('/order/queryDispatch/');
+
   if (response.data.code != 200) {
     // 对于匿名访问的页面，不处理401和403错误
-    const url = response.config?.url || '';
     const isGuestAccess = url.startsWith("/order-info/order-other/webDetail/") ||
         url.startsWith("/order-info/order-driver/detail/guest/")||
         url.startsWith("/gar/car/requestStrByEnergyType");
     if (response.data.code == 401 || response.data.code == 403) {
       if (!isGuestAccess) {
+        // 如果是订单分配相关的请求，给出明确提示
+        if (isOrderDispatchRequest) {
+          uni.$u.toast("登录已过期，请重新登录");
+        }
         reSetLoginStatus();
       }
     } else {
-      uni.showToast({
-        title: response.data.msg,
-        icon: "none",
-      });
+      // 非权限错误才显示具体错误信息
+      if (!isOrderDispatchRequest || response.data.code !== 401) {
+        uni.showToast({
+          title: response.data.msg,
+          icon: "none",
+        });
+      }
     }
   }
   return response;
@@ -92,18 +102,32 @@ instance.interceptors.response.use((response) =&gt; {
   const isGuestAccess = url.startsWith("/order-info/order-other/webDetail/") ||
       url.startsWith("/order-info/order-driver/detail/guest/")||
       url.startsWith("/gar/car/requestStrByEnergyType");
+  const isOrderDispatchRequest = url.includes('/order/queryDispatch/');
-  if (error.response.status) {
+  if (error.response && error.response.status) {
     switch (error.response.status) {
       case 401:
       case 403:
         if (!isGuestAccess) {
+          // 订单分配请求的特殊处理
+          if (isOrderDispatchRequest) {
+            uni.$u.toast("登录已过期，请重新登录");
+          }
           reSetLoginStatus();
         }
         break;
       default:
+        // 其他HTTP错误
+        if (!isOrderDispatchRequest) {
+          uni.$u.toast("请求失败，请稍后重试");
+        }
         break;
     }
+  } else {
+    // 网络错误
+    if (!isOrderDispatchRequest) {
+      uni.$u.toast("网络连接异常");
+    }
   }
   return Promise.reject(error)
 });