Merge branch 'feature_20260401_完美门店入口修改' into uat(dev)

src/views/deviceOutside/index.vue

@@ -1282,10 +1282,6 @@ export default {
     getUserOrgStoreList() {
       this.storeType = localStorage.getItem('storeType');
       this.endShow = false;
-      if (this.refreshing) {
-        this.list = [];
-        this.refreshing = false;
-      }
       var that = this;
       this.disabled = true;
       this.toastLoading(0, '加载中...', true);
@@ -1303,6 +1299,9 @@ export default {
         genDate: this.genDate,
       }).then((res) => {
         this.disabled = false;
+        if (this.refreshing) {
+          this.refreshing = false;
+        }
         this.toastLoading().clear();
         if (res.code == 200) {
           this.loading = false;
@@ -1330,6 +1329,7 @@ export default {
             this.showPopoverZ.push({ showPopover: false });
           });
         } else {
+          this.list = [];
           this.$toast(res.msg);
         }
       });
@@ -1366,10 +1366,6 @@ export default {
         forbidClick: true,
       });
       this.endShow = false;
-      if (this.refreshing) {
-        this.list = [];
-        this.refreshing = false;
-      }
       getUserOutPlaList({
         lat: that.lat,
         lon: that.lon,
@@ -1384,6 +1380,9 @@ export default {
         genDate: this.genDate,
       }).then((res) => {
         this.disabled = false;
+        if (this.refreshing) {
+          this.refreshing = false;
+        }
         if (res.code == 200) {
           loading3.clear();
           this.loading = false;
@@ -1407,6 +1406,7 @@ export default {
             this.showPopoverZ.push({ showPopover: false });
           });
         } else {
+          this.list = [];
           this.$toast(res.msg);
         }
       });

src/views/deviceWithin/index.vue

@@ -940,7 +940,6 @@ export default {
   },
   methods: {
     onRefresh() {
-      this.list = [];
       this.getUserInPlanList();
     },
     closePopup(flag, filterParams) {
@@ -1172,9 +1171,6 @@ export default {
     },
     getUserInPlanListFun(TXisBD) {
       this.toastLoading(0, '加载中...', true);
-      if (this.refreshing) {
-        this.refreshing = false;
-      }
       getUserInPlanList({
         storeName: this.storeName.trim(),
         genDate: this.genDate,
@@ -1183,6 +1179,9 @@ export default {
         ...this.filterParams,
       }).then((res) => {
         this.toastLoading().clear();
+        if (this.refreshing) {
+          this.refreshing = false;
+        }
         if (res.code == 200) {
           this.list = res.data;
           this.list.forEach((item) => {