Merge remote-tracking branch 'origin/master'

pages/mobile/user/index.vue

@@ -444,9 +444,8 @@
               this.EnterprisePage = res.data.totalPages
             })
           } else if (val === 'mystore') {
-            if (this.$store.state.option.storeStatus.data.uuid) {
-              this.$router.push(`/mobile/shop/${this.shopuuid.uuid}`)
-            }
+            // alert(1)
+            this.$router.push(`/mobile/shop/${this.shopuuid.uuid}`)
           }
         }
       }
@@ -472,6 +471,7 @@
               this.reloadData()
             }
           })
+          this.$store.dispatch('loadStoreStatus', { op: 'check' })
         })
       },
       setShowEnterpriseToggle (flag, e) {
@@ -848,8 +848,8 @@
       // 是否展示空数据
       StateNone() {
         if (this.activeType === 'provider') {
-          return this.GetEnterpriseListData.length === 0
-        } else if (this.activeType === 'oppor') {
+          return this.GetEnterpriseListData.length === 0 && this.EnterprisePage === 0
+        } else if (this.activeType === 'oppor' || this.activeType === 'mystore') {
           return false
         } else {
           return (this.activeType !== 'seek') && ((this.collectSave.totalElements === 0 && this.activeType === 'comp') || (this.focusPage.totalElements === 0 && this.activeType === 'store') || (this.collectSave.totalElements === 0 && this.focusPage.totalElements === 0) || this.GetEnterpriseListData.totalElements === 0)