Merge branch 'fix/indexofdevice-add-first-get' into 'main_dev'

fix: 修复首页和设备tabs切换得时候没有请求数据

See merge request yunteng/thingskit-app!152

@@ -64,9 +64,7 @@
 			if (getApp().getBindNot()) {
 				return
 			}
-			if (!e.deviceState) {
-				this.loadData(1);
-			} else {
+			if (e.deviceState) {
 				let params = JSON.parse(e.deviceState);
 				this.conditions = {
 					deviceState: params
@@ -87,7 +85,9 @@
 				this.conditions = {
 					organizationId: this.ordId
 				}
+				return
 			}
+			this.loadData(1);
 		},
 		methods: {
 			inputChanged(e) {

@@ -45,6 +45,7 @@ import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/me
 import api from '@/api/index.js'
 import { useNavigateTo } from '@/plugins/utils.js'
 import headerOrg from '@/components/common/header-org.vue'
+import store from '@/store'
 
 export default {
 	mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
@@ -78,6 +79,9 @@ export default {
 	onHide() {
 		this.ordId = ''
 	},
+	onUnload(){
+		store.commit('setLoadingShow', false)
+	},
 	onLoad() {
 		// 隐藏原生的tabbar
 		uni.hideTabBar()

@@ -82,6 +82,8 @@
 		onLoad() {
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
+		},
+		onShow(){	
 			if (getApp().getBindNot()) {
 				this.basicStatistics.map(item=>{
 						const { key, value } = item