Merge branch 'feautre_20240909_地图poi选择确定问题' into uat

# Conflicts:
#	src/views/storeManagement/storeDetail.vue

src/views/storeManagement/newTMap.vue

@@ -54,16 +54,16 @@
 </template>
 
 <script>
-import { getMapPoi, getkeywordPoi } from "@/utils/getPosition";
+import { getMapPoi, getkeywordPoi } from '@/utils/TXApiFun';
 
 export default {
   data() {
     return {
-      searchValue: "",
+      searchValue: '',
       searchSHow: false,
       mapsearchlist: [],
       showmap: false,
-      addresssb: "",
+      addresssb: '',
       shows: true,
       maplist: [],
     };
@@ -77,7 +77,7 @@ export default {
       };
       /* eslint-disable */
       let center = new TMap.LatLng(latlng.lat, latlng.lon);
-      this.map = new TMap.Map("allmap1", {
+      this.map = new TMap.Map('allmap1', {
         center: center, //设置地图中心点坐标
         zoom: 17, //设置地图缩放级别
         // viewMode: "3D",
@@ -92,17 +92,17 @@ export default {
       this.initPointMultiMarker(this.map, center);
       // 添加搜索出的poi点
       this.addMarkerLayer(this.map, mapPointlist);
-      this.map.on("click", this.clickMap);
+      this.map.on('click', this.clickMap);
     },
     initPointMultiMarker(mapNode, center) {
       let initPoint = {
-        id: "marker",
-        styleId: "marker",
+        id: 'marker',
+        styleId: 'marker',
         position: center,
       };
       /* eslint-disable */
       new TMap.MultiMarker({
-        id: "pointId",
+        id: 'pointId',
         map: mapNode,
         geometries: [initPoint],
         styles: {
@@ -110,7 +110,7 @@ export default {
             width: 32,
             height: 40,
             anchor: { x: 16, y: 32 },
-            src: "https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/marker-pink.png",
+            src: 'https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/marker-pink.png',
           }),
         },
       });
@@ -124,12 +124,12 @@ export default {
       for (let i = 0; i < len; i++) {
         markerLayerArr.push({
           id: mapPointlist[i].id,
-          styleId: "marker",
+          styleId: 'marker',
           position: new TMap.LatLng(mapPointlist[i].location.lat, mapPointlist[i].location.lng),
         });
       }
       new TMap.MultiMarker({
-        id: "otherPointId",
+        id: 'otherPointId',
         map: mapNode,
         geometries: markerLayerArr,
         styles: {
@@ -137,7 +137,7 @@ export default {
             width: 32,
             height: 40,
             anchor: { x: 16, y: 32 },
-            src: "https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/marker_blue.png",
+            src: 'https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/marker_blue.png',
           }),
         },
       });
@@ -148,16 +148,16 @@ export default {
     clickMap(evt) {
       var lat = evt.latLng.getLat().toFixed(6);
       var lng = evt.latLng.getLng().toFixed(6);
-      console.log("您点击的的坐标是：" + lat + "," + lng);
+      console.log('您点击的的坐标是：' + lat + ',' + lng);
     },
     mapBindEvent(map) {
       // 监听地图平移开始
-      map.on("pan", () => {
-        console.log("监听地图平移开始");
+      map.on('pan', () => {
+        console.log('监听地图平移开始');
       });
       // 监听地图平移结束
-      map.on("panend", () => {
-        console.log("监听地图平移结束");
+      map.on('panend', () => {
+        console.log('监听地图平移结束');
       });
     },
     searchFn() {
@@ -184,8 +184,8 @@ export default {
         that.map.setCenter(new TMap.LatLng(val.location.lat, val.location.lng));
         that.markers1.updateGeometries([
           {
-            id: "marker",
-            styleId: "marker",
+            id: 'marker',
+            styleId: 'marker',
             position: new TMap.LatLng(val.location.lat, val.location.lng),
           },
         ]);
@@ -232,8 +232,8 @@ export default {
       if (val > -1) {
         this.markers.updateGeometries([
           {
-            id: "markers1",
-            styleId: "abc",
+            id: 'markers1',
+            styleId: 'abc',
             position: new TMap.LatLng(
               this.maplist[val].location.lat,
               this.maplist[val].location.lng

src/views/storeManagement/storeDetail.vue

@@ -407,7 +407,7 @@ import axios from 'axios';
 import { updateStoreAddress, valid } from '@/api/visitstore';
 import uploadImg from '@/components/viewaddreddUploadImg.vue';
 import helpPage from './helpPage.vue';
-import { getPosition, getMapPoi, getkeywordPoi, getTicketFun } from '@/utils/getPosition';
+import { getPosition, getMapPoi, getkeywordPoi, getTicketFun } from '@/utils/TXApiFun';
 export default {
   components: { uploadImg, mapmarker, viewUploadImg, helpPage },
   data() {