From a1f0f0db025fe0b6e474d6913857a47fdf328895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A3=8E=E8=8A=B1=E4=B8=80=E4=B8=96=E6=9C=88?=
 <1149505133@qq.com>
Date: Mon, 5 Aug 2024 22:00:50 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=89=A9=E8=81=94=E7=BD=91):=20=E6=AF=8F?=
 =?UTF-8?q?=E6=AC=A1=E8=BF=9B=E5=85=A5=E5=B7=A5=E4=BD=9C=E5=8F=B0=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E8=8F=9C=E5=8D=95=E3=80=81=E8=A7=86=E9=A2=91=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E4=B8=BA=E7=A9=BA=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json              | 4 ++--
 pages/tabbar/workbench.vue | 3 ++-
 pages/video/video-list.vue | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/manifest.json b/manifest.json
index 168d4b9..a543344 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "物联网可视化",
     "appid" : "__UNI__604B8F1",
     "description" : "",
-    "versionName" : "1.0.31",
-    "versionCode" : 1031,
+    "versionName" : "1.0.32",
+    "versionCode" : 1032,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/tabbar/workbench.vue b/pages/tabbar/workbench.vue
index ef8a653..ae947f5 100644
--- a/pages/tabbar/workbench.vue
+++ b/pages/tabbar/workbench.vue
@@ -108,11 +108,12 @@
 				}
 			})
 			this.getUserInfo();
-			this.getUserMenu();
+			
 			this.tabIndex = 1;
 			this.tabIndex = 0;
 		},
 		onShow() {
+			this.getUserMenu();
 			this.getUnreadNewNum();
 		},
 		mounted() {
diff --git a/pages/video/video-list.vue b/pages/video/video-list.vue
index b469e7e..4e1a7f3 100644
--- a/pages/video/video-list.vue
+++ b/pages/video/video-list.vue
@@ -129,7 +129,7 @@
 				this.$api.videoApi.getVideoList(params).then(res => {
 					console.log("getVideoList",res);
 					if(res.code === 0){
-						let curPageData = res.data && res.data.list;
+						let curPageData = res.data && res.data.list || [];
 						let curPageLen = curPageData && curPageData.length || 0;
 						let totalSize = res.data.totalCount;
 						curPageData.forEach((item,index)=>{