Merge branch 'feature_20260123_建潜在客户时-潜在客户类型，不要默认选中' into uat(dev)

# Conflicts:
#	src/views/deviceOutside/index.vue

src/views/deviceOutside/index.vue

@@ -863,7 +863,7 @@ export default {
       },
       {
         passive: false,
-      }
+      },
     );
   },
   methods: {
@@ -928,7 +928,7 @@ export default {
                     if (res.err_msg == 'launchMiniprogram:ok') {
                     } else {
                     }
-                  }
+                  },
                 );
               },
               fail: function (res) {
@@ -1452,7 +1452,7 @@ export default {
           location.lat,
           location.lon,
           location.lat,
-          location.lon
+          location.lon,
         ).toFixed(2);
         // GZ:工装店铺 直接进入拜访
         if (localStorage.getItem('postType') == 'GZ' || /^FSQ/.test(val.storeCode)) {

src/views/storeManagement/competingStoresAdd.vue

@@ -453,8 +453,8 @@ export default {
       qzStoreCategory().then((res) => {
         if (res.code == 200) {
           this.storeCategoryList = res.data;
-          this.fromData.storeCategoryName = this.storeCategoryList[0].dictLabel;
-          this.fromData.storeCategory = this.storeCategoryList[0].dictValue;
+          // this.fromData.storeCategoryName = this.storeCategoryList[0].dictLabel;
+          // this.fromData.storeCategory = this.storeCategoryList[0].dictValue;
         }
       });
     },
@@ -510,7 +510,7 @@ export default {
           this.location.lat1 +
           ',' +
           this.location.lon1 +
-          ',1000,0)&page_size=10&page_index=1&orderby=_distance&output=jsonp&key=WLCBZ-HRM6L-YOMPV-ME62B-AQOG6-JUBW6'
+          ',1000,0)&page_size=10&page_index=1&orderby=_distance&output=jsonp&key=WLCBZ-HRM6L-YOMPV-ME62B-AQOG6-JUBW6',
       ).then((res) => {
         this.maplist = res.data;
         setTimeout(() => {
@@ -543,7 +543,7 @@ export default {
             val.location.lat +
             ',' +
             val.location.lng +
-            ',1000,0)&page_size=20&page_index=1&orderby=_distance&output=jsonp&key=WLCBZ-HRM6L-YOMPV-ME62B-AQOG6-JUBW6'
+            ',1000,0)&page_size=20&page_index=1&orderby=_distance&output=jsonp&key=WLCBZ-HRM6L-YOMPV-ME62B-AQOG6-JUBW6',
         ).then((res) => {
           that.maplist = res.data;
           that.marker.setGeometries([]);
@@ -571,7 +571,7 @@ export default {
           this.location.lat1 +
           ',' +
           this.location.lon1 +
-          '&output=jsonp&key=WLCBZ-HRM6L-YOMPV-ME62B-AQOG6-JUBW6&page_size=20&region_fix=1'
+          '&output=jsonp&key=WLCBZ-HRM6L-YOMPV-ME62B-AQOG6-JUBW6&page_size=20&region_fix=1',
       ).then((res) => {
         this.searchSHow = true;
         that.mapsearchlist = res.data;
@@ -585,7 +585,7 @@ export default {
             styleId: 'abc',
             position: new TMap.LatLng(
               this.maplist[val].location.lat,
-              this.maplist[val].location.lng
+              this.maplist[val].location.lng,
             ),
           },
         ]);
@@ -766,7 +766,7 @@ export default {
           } else {
             this.$toast.fail('请求超时');
           }
-        }
+        },
       );
     },
     PickerDept() {