Merge remote-tracking branch 'refs/remotes/origin/master' into feature/bfi-api-rate

# Conflicts:
#	pnpm-lock.yaml
#	src/axios.js
#	src/views/settlement/formal-settlement.vue
#	src/views/vehicle/customer-archive.vue

src/components/address-map-picker/main.vue

@@ -24,10 +24,10 @@
 </template>
 
 <script>
-import { normalizeMapSearchResults } from '@/utils/map-search';
+import { normalizeMapSearchResults, searchAmapPlaceText } from '@/utils/map-search';
 
-const AMAP_KEY = '653b7cf105ad7fb8ec9b2f5198ade315';
-const AMAP_SECURITY_CODE = '5aab65c632e48ebae0d0e28f5b28e21a';
+const AMAP_KEY = '13dcb15bc29bfe9c432d17ecd808b812';
+const AMAP_SECURITY_CODE = 'f9d036ef29e376e15d309e0de5c0f7ab';
 let amapLoader;
 
 export default {
@@ -90,10 +90,24 @@ export default {
     }
   },
   methods: {
+    hasCoordinateValue(value) {
+      return value !== '' && value !== null && value !== undefined;
+    },
     buildInitialSelection() {
+      // Number('') === 0，空字符串不能当有效坐标，否则会落到 [0,0]（非洲附近）
+      if (!this.hasCoordinateValue(this.longitude) || !this.hasCoordinateValue(this.latitude)) {
+        return {};
+      }
       const longitude = Number(this.longitude);
       const latitude = Number(this.latitude);
-      if (!Number.isFinite(longitude) || !Number.isFinite(latitude)) {
+      if (
+        !Number.isFinite(longitude) ||
+        !Number.isFinite(latitude) ||
+        longitude < -180 ||
+        longitude > 180 ||
+        latitude < -90 ||
+        latitude > 90
+      ) {
         return {};
       }
       return {
@@ -131,22 +145,24 @@ export default {
             this.$nextTick(() => {
               if (!this.$refs.map) return resolve(null);
               const initial = this.buildInitialSelection();
-              const center =
-                Number.isFinite(initial.longitude) && Number.isFinite(initial.latitude)
-                  ? [initial.longitude, initial.latitude]
-                  : [116.40769, 39.89945];
+              const hasPoint =
+                Number.isFinite(initial.longitude) && Number.isFinite(initial.latitude);
+              const center = hasPoint
+                ? [initial.longitude, initial.latitude]
+                : [116.40769, 39.89945];
+              const zoom = hasPoint ? 14 : 11;
               if (!this.amap) {
                 this.amap = new window.AMap.Map(this.$refs.map, {
                   center,
-                  zoom: initial.longitude ? 14 : 11,
+                  zoom,
                 });
                 this.amap.on('click', event => this.pickPoint(event.lnglat));
               } else {
                 this.amap.resize();
                 this.clearMarker();
-                this.amap.setZoomAndCenter(initial.longitude ? 14 : 11, center);
+                this.amap.setZoomAndCenter(zoom, center);
               }
-              if (initial.longitude) {
+              if (hasPoint) {
                 const point = new window.AMap.LngLat(initial.longitude, initial.latitude);
                 this.renderMarker(point);
                 this.selected = { ...initial };
@@ -208,18 +224,17 @@ export default {
       this.searchResults = [];
       this.searching = true;
       this.initMap()
-        .then(map => (map ? this.runGeocode('location', keyword) : null))
-        .then(result => {
-          if (!result) return;
-          const geocodes = result.geocodes || (result.location ? [result] : []);
-          this.searchResults = normalizeMapSearchResults(geocodes, keyword);
-          const point = this.searchResults[0]?.location || result.location;
-          if (!point) {
+        .then(map => (map ? searchAmapPlaceText(keyword) : null))
+        .then(pois => {
+          if (!pois) return;
+          this.searchResults = normalizeMapSearchResults(pois, keyword);
+          const first = this.searchResults[0];
+          if (!first?.location) {
             throw new Error('未找到匹配地址');
           }
           return this.$nextTick().then(() => {
             this.amap?.resize();
-            this.pickPoint(point, this.searchResults[0]?.address || keyword);
+            this.pickPoint(first.location, first.address || first.name || keyword);
           });
         })
         .catch(() => {
@@ -236,8 +251,10 @@ export default {
       }
     },
     pickPoint(point, fallbackAddress = '') {
-      const longitude = typeof point.getLng === 'function' ? point.getLng() : point.lng;
-      const latitude = typeof point.getLat === 'function' ? point.getLat() : point.lat;
+      const longitude =
+        typeof point.getLng === 'function' ? point.getLng() : point.lng ?? point.longitude;
+      const latitude =
+        typeof point.getLat === 'function' ? point.getLat() : point.lat ?? point.latitude;
       if (!Number.isFinite(Number(longitude)) || !Number.isFinite(Number(latitude))) {
         this.$message.warning('选点坐标无效');
         return;