Merge branch 'feature_20250114_新增同城分销店增加去下单提示' into uat(dev)

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

src/views/deviceOutside/index.vue

@@ -2057,30 +2057,34 @@ export default {
     onLoad() {
       this.toastLoading(0, '加载中...', true);
       // 授权
-      getTicketFun().then(() => {
-        var postType = localStorage.getItem('postType');
-        if (postType == 'GZ') {
-          this.typeShow = false;
-        } else {
-          this.typeShow = true;
-        }
-        getPosition(true)
-          .then((res) => {
-            let { TXisBD } = res;
-            this.lat = TXisBD.lat;
-            this.lon = TXisBD.lon;
-            if (this.tabVal == '1') {
-              this.getUserOutPlaListFun();
-            } else {
-              this.getUserOrgStoreList();
-            }
-          })
-          .catch((error) => {
-            this.$dialog.alert({
-              message: error,
+      getTicketFun()
+        .then(() => {
+          var postType = localStorage.getItem('postType');
+          if (postType == 'GZ') {
+            this.typeShow = false;
+          } else {
+            this.typeShow = true;
+          }
+          getPosition(true)
+            .then((res) => {
+              let { TXisBD } = res;
+              this.lat = TXisBD.lat;
+              this.lon = TXisBD.lon;
+              if (this.tabVal == '1') {
+                this.getUserOutPlaListFun();
+              } else {
+                this.getUserOrgStoreList();
+              }
+            })
+            .catch((error) => {
+              this.$dialog.alert({
+                message: error,
+              });
             });
-          });
-      });
+        })
+        .catch(() => {
+          this.finished = true;
+        });
     },
     // 跳转好帮手门店详情
     goOtherSystem(item) {