wkw 6 месяцев назад
Родитель
Сommit
651d73b9de

+ 1 - 1
comment/socket.js

@@ -53,7 +53,7 @@ export function connectSocket(userId, store, router) {
     /** 接收消息 */
     WSS.onmessage = (event) => {
         console.log('收到消息:', event.data)
-        if (event.data === 'HeartBeat' || event.data === 'Pong') return
+        if (event.data === 'HeartBeat' || event.data === 'Pong') return;
         let msg
         try {
             msg = JSON.parse(event.data)

+ 1 - 4
src/App.vue

@@ -10,10 +10,7 @@
 
 <template>
 	<div>
-		<keep-alive>
-			<router-view v-if="$route.meta.keepAlive" />
-		</keep-alive>
-		<router-view v-if="!$route.meta.keepAlive" />
+		<router-view></router-view>
 	</div>
 </template>
 <style>

+ 2 - 2
src/components/header/header.vue

@@ -583,7 +583,7 @@
 		<postPush @closePostPush="closePostPush" v-if="dialogPostPush" :dialogPostPushs="dialogPostPush" />
 		<!-- 开通会员 -->
 		<!-- @close="closevip()" -->
-		<el-dialog z-index="3000" @close="closeVip()" :destroy-on-close="true" v-model="dialogVisiblevip" title="开通会员"
+		<el-dialog :z-index="3000" @close="closeVip()" :destroy-on-close="true" v-model="dialogVisiblevip" title="开通会员"
 			width="40%">
 			<template #header>
 				<div class="my-header flex align-center">
@@ -636,7 +636,7 @@
 			</template> -->
 		</el-dialog>
 		<!-- 意见反馈 -->
-		<el-dialog z-index="3000" @close="dialogVisibleFeedback = false" :destroy-on-close="true"
+		<el-dialog :z-index="3000" @close="dialogVisibleFeedback = false" :destroy-on-close="true"
 			v-model="dialogVisibleFeedback" title="意见反馈">
 			<el-form :model="feedbackForm" v-if="dialogVisibleFeedback" ref="feedbackForm" label-width="100px" class="demo-ruleForm">
 				<el-form-item label="意见反馈" prop="feedback" :rules="[

+ 18 - 3
src/components/messageCom/messageCom.vue

@@ -257,8 +257,7 @@
 				<div class="message-btom flex align-center justify-center">
 					<div class="messageCon">
 						<div class="message-btom-content">
-							<el-input @keyup.enter.prevent="sendMessage(1)" style="margin-top: 10px;" resize="none"
-								:input-style="inputStyles" v-model="content" :autosize="{ minRows: 4, maxRows: 4 }"
+							<el-input @keyup.enter.prevent="sendMessage(1)" style="margin-top: 10px;" resize="none" v-model="content" :autosize="{ minRows: 4, maxRows: 4 }"
 								type="textarea" placeholder="请输入内容" />
 						</div>
 						<div class="message-btom-btn flex align-center justify-between">
@@ -1366,7 +1365,8 @@
 			//监听接收到消息的回调
 			websocketonmessage(event) {
 				this.webSocketState = true
-				// console.log(event, '收到消息')
+				if (event.data === 'HeartBeat' || event.data === 'Pong') return;
+				console.log(event, '收到消息')
 				//收到消息后再获取聊天记录
 				this.getCHarList()
 			},
@@ -1414,6 +1414,12 @@
 		background: linear-gradient(45deg, #f2fffa, #FFFFFF);
 		border-radius: 14px 14px 0 0;
 	}
+	:deep(.el-dialog__footer) {
+		text-align: right;
+		padding-top: 0;
+		padding-bottom: 16px;
+		padding-right: 16px;
+	}
 
 	.messageCom {
 		.el-textarea {
@@ -1688,4 +1694,13 @@
 		border-radius: 50%;
 		background: #d9d9d9;
 	}
+	.avatar-img {
+		width: 50px;
+		height: 50px;
+		border-radius: 50%;
+	}
+
+	.avatorm-box-item {
+		line-height: 30px;
+	}
 </style>

+ 1 - 1
src/router.js

@@ -29,7 +29,7 @@ const routes = [{
 		path: '/indexCompany',
 		name: 'indexCompany',
 		component: () => import("./views/index/indexCompany.vue"), //引入企业端首页页面
-		meta: { keepAlive: true }
+		meta: { keepAlive: false }
 	}, {
 		path: '/enterpriseList',
 		name: 'enterpriseList',

+ 6 - 1
src/views/home.vue

@@ -6,7 +6,12 @@
 			</div>
 		</el-affix>
 		<div class="content">
-			<router-view></router-view>
+			<router-view v-slot="{ Component }">
+				<keep-alive>
+					<component :is="Component" v-if="$route.meta.keepAlive" :key="$route.fullPath" />
+				</keep-alive>
+				<component :is="Component" v-if="!$route.meta.keepAlive" :key="$route.fullPath" />
+			</router-view>
 		</div>
 		<!-- 底部版权信息 -->
 		<copyright />

+ 2 - 3
src/views/message/index.vue

@@ -806,12 +806,11 @@
 				return /<[^>]+>/.test(str);
 			}
 		},
-		beforeDestroy() {
+		beforeUnmount() {
 			clearInterval(this.recordsInter)
 			this.recordsInter = null
 			clearInterval(this.time)
 			this.time = null
-			removeSocketListener(this.msgCallback)
 		},
 		mounted() {
 			this.screenHeight = window.innerHeight
@@ -1284,7 +1283,7 @@
 					// 获取用户是否有面试记录
 					this.recordsInter = setInterval(() => {
 						this.getInterviewList()
-					}, 2000)
+					}, 2500)
 				} else { //招聘者
 					this.byUserId = item.userId
 					this.resumesId = item.resumesId