Merge branch 'v3' into liuqiang

src/router/index.js

@@ -88,6 +88,16 @@ export const constantRoutes = [{
 		},
 	},
 	{
+		path: 'reindex',
+		component: () => import('@/views/liveChat/index.vue'),
+		name: 'reindex',
+		meta: {
+			title: '返回',
+			icon: 'dashboard',
+			affix: true
+		},
+	},
+	{
 	    path: '/user/profile',
 	    component: () => import('@/views/system/user/profile/index'),
 	    name: 'Profile',
@@ -97,11 +107,6 @@ export const constantRoutes = [{
 	    }
 	},
 	{
-		path: 'reindex',
-		component: () => import('@/views/liveChat/index.vue'),
-		name: 'reindex',
-	},
-	{
 		path: 'swagger',
 		component: () => import('@/views/tool/swagger/index.vue'),
 		name: 'swagger',
@@ -367,22 +372,6 @@ export const constantRoutes = [{
 //     // }
 //   ]
 // },
-
-// {
-// 	path: '/user',
-// 	component: Layout,
-// 	hidden: true,
-// 	redirect: 'noredirect',
-// 	children: [{
-// 		path: 'profile',
-// 		component: () => import('@/views/system/user/profile/index'),
-// 		name: 'Profile',
-// 		meta: {
-// 			title: '个人中心',
-// 			icon: 'user'
-// 		}
-// 	},]
-// },
 	// {
 	//   path: '/indexCommons',
 	//   hidden: true,

src/views/liveChat/index.vue

@@ -646,7 +646,7 @@ onMounted(() => {
           <!-- 聊天 -->
           <el-main
             class="right-container"
-            @mousewheel="handleScroll"
+            @wheel="handleScroll"
             ref="mainContainer"
           >
             <div v-loading="loading"></div>