From 8fbe09c1337e5000a3d66aa1f2b56f436cfa4ca2 Mon Sep 17 00:00:00 2001
From: icssoa <2570063477@qq.com>
Date: Thu, 25 Mar 2021 18:09:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                     |  2 +-
 src/cool/modules/base/components/menu/topbar.vue | 13 ++++++-------
 src/cool/modules/chat/components/chat.vue        |  2 +-
 src/cool/modules/chat/components/message.vue     |  1 -
 src/cool/modules/upload/components/index.vue     |  3 ++-
 src/service/request.js                           | 10 +++++++---
 6 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index 5690126..e2f77b4 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
 	"dependencies": {
 		"@vue/composition-api": "^1.0.0-rc.5",
 		"axios": "^0.21.1",
-		"cl-admin": "^1.5.1",
+		"cl-admin": "^1.5.3",
 		"cl-admin-crud": "^1.6.4",
 		"cl-admin-theme": "^0.0.5",
 		"clipboard": "^2.0.7",
diff --git a/src/cool/modules/base/components/menu/topbar.vue b/src/cool/modules/base/components/menu/topbar.vue
index c0c4710..bfc39cd 100644
--- a/src/cool/modules/base/components/menu/topbar.vue
+++ b/src/cool/modules/base/components/menu/topbar.vue
@@ -15,8 +15,8 @@
 </template>
 
 <script>
-import { mapMutations, mapGetters } from "vuex";
-import { firstMenu } from "@/cool/modules/base/utils";
+import { mapMutations } from "vuex";
+import { firstMenu } from "../../utils";
 
 export default {
 	name: "cl-menu-topbar",
@@ -28,10 +28,8 @@ export default {
 	},
 
 	computed: {
-		...mapGetters(["menuGroup"]),
-
 		list() {
-			return this.menuGroup.filter(e => e.isShow);
+			return this.$store.getters.menuGroup.filter(e => e.isShow);
 		}
 	},
 
@@ -56,7 +54,7 @@ export default {
 			}
 		};
 
-		this.menuGroup.forEach((e, i) => {
+		this.list.forEach((e, i) => {
 			deep(e, i);
 		});
 	},
@@ -67,7 +65,8 @@ export default {
 		onSelect(index) {
 			this.SET_MENU_LIST(index);
 
-			const url = firstMenu(this.menuGroup[index].children);
+			// 获取第一个菜单地址
+			const url = firstMenu(this.list[index].children);
 			this.$router.push(url);
 		}
 	}
diff --git a/src/cool/modules/chat/components/chat.vue b/src/cool/modules/chat/components/chat.vue
index 5df6733..a14d18d 100644
--- a/src/cool/modules/chat/components/chat.vue
+++ b/src/cool/modules/chat/components/chat.vue
@@ -137,7 +137,7 @@ export default {
 		// 监听消息
 		onMessage(msg) {
 			// 回调
-			this.$emit("message", this.visible);
+			this.$emit("message", msg);
 
 			// 消息通知
 			this.notification(msg);
diff --git a/src/cool/modules/chat/components/message.vue b/src/cool/modules/chat/components/message.vue
index e3bfa51..c45a258 100644
--- a/src/cool/modules/chat/components/message.vue
+++ b/src/cool/modules/chat/components/message.vue
@@ -134,7 +134,6 @@ export default {
 				size: 20,
 				total: 0
 			},
-			player: {},
 			voice: {
 				url: "",
 				timer: null
diff --git a/src/cool/modules/upload/components/index.vue b/src/cool/modules/upload/components/index.vue
index 79b943e..b8fa3b1 100644
--- a/src/cool/modules/upload/components/index.vue
+++ b/src/cool/modules/upload/components/index.vue
@@ -98,7 +98,8 @@
 			title="图片预览"
 			:visible.sync="preview.visible"
 			:props="{
-				width: previewWidth
+				width: previewWidth,
+				'append-to-body': true
 			}"
 		>
 			<img width="100%" :src="preview.url" alt="" />
diff --git a/src/service/request.js b/src/service/request.js
index de3c4ee..21d28f7 100644
--- a/src/service/request.js
+++ b/src/service/request.js
@@ -1,4 +1,5 @@
 import axios from "axios";
+import { Message } from "element-ui";
 import store from "@/store";
 import { isDev } from "@/config/env";
 import { href, storage } from "cl-admin/utils";
@@ -120,8 +121,11 @@ axios.interceptors.response.use(
 					break;
 
 				case 403:
-					console.error(`${config.url} 无权限访问！！`);
-					href("/403");
+					if (isDev) {
+						Message.error(`${config.url} 无权限访问！！`);
+					} else {
+						href("/403");
+					}
 					break;
 
 				case 404:
@@ -135,7 +139,7 @@ axios.interceptors.response.use(
 
 				case 502:
 					if (isDev) {
-						return Promise.reject("服务异常！！");
+						Message.error(`${config.url} 服务异常！！`);
 					} else {
 						href("/502");
 					}