Merge branch 'feature_20240926_计划内进入拜访初始化不请求拜访任务'

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

src/views/deviceOutside/index.vue

@@ -1613,8 +1613,8 @@ export default {
             storeId: val.storeId,
             lat: location.lat,
             lon: location.lon,
-          }).then((res) => {
-            if (res.code == 200) {
+          }).then((response) => {
+            if (response.code == 200) {
               this.$dialog
                 .alert({
                   title: '系统提示',
@@ -1627,7 +1627,7 @@ export default {
               localStorage.setItem('ORGName', val.deptName);
               localStorage.setItem('chainNameR', val.storeName);
             } else {
-              this.$toast(res.msg);
+              this.$toast(response.msg);
             }
           });
         });

src/views/deviceOutside/topStore.vue

@@ -1757,8 +1757,8 @@ export default {
             storeId: val.storeId,
             lat: location.lat,
             lon: location.lon,
-          }).then((res) => {
-            if (res.code == 200) {
+          }).then((response) => {
+            if (response.code == 200) {
               this.$dialog
                 .alert({
                   title: '系统提示',
@@ -1771,7 +1771,7 @@ export default {
               localStorage.setItem('ORGName', val.deptName);
               localStorage.setItem('chainNameR', val.storeName);
             } else {
-              this.$toast(res.msg);
+              this.$toast(response.msg);
             }
           });
         });

src/views/deviceWithin/index.vue

@@ -705,9 +705,6 @@ export default {
               lat = val.lat;
               lon = val.lon;
             }
-            // var location=that.CJ02BD(res.latitude,res.longitude)
-            // that.location = location;
-            // checkStoreAddressFun(val,res,location)
             this.$router.push({
               path: '/storeVisitpage',
               query: {
@@ -1061,8 +1058,8 @@ export default {
             storeId: val.storeId,
             lat: location.lat,
             lon: location.lon,
-          }).then((res) => {
-            if (res.code == 200) {
+          }).then((response) => {
+            if (response.code == 200) {
               this.$dialog
                 .alert({
                   title: '系统提示',
@@ -1075,10 +1072,11 @@ export default {
               localStorage.setItem('ORGName', val.deptName);
               localStorage.setItem('chainNameR', val.storeName);
             } else {
-              this.$toast(res.msg);
+              this.$toast(response.msg);
             }
           });
-        });
+        })
+        .catch(() => {});
     },
     // 进入拜访 router.push
     toSuishenbangOutstoreVisit(res, val, location, PointSumval) {