Merge branch 'master' of https://git.nanodreamtech.com/Boss/yizhizan-pc

src/components/header/header.vue

@@ -422,6 +422,11 @@
 									<Setting />
 								</el-icon>设置中心
 							</div>
+							<div @click="dialogVisibleFeedback = true" class="seeting-item flex align-center justify-center">
+								<el-icon :size="18" style="margin-right: 5px;">
+									<Setting />
+								</el-icon>意见反馈
+							</div>
 							<div @click="outLogin()" class="seeting-item flex align-center justify-center">
 								<el-icon :size="18" style="margin-right: 5px;">
 									<SwitchButton />
@@ -634,9 +639,27 @@
 				</div>
 			</div>
 			<!-- <template #footer>
-				
 			</template> -->
 		</el-dialog>
+		<!-- 意见反馈 -->
+		<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="[
+					{ required: true, message: '意见反馈不能为空' },
+				]">
+					<el-input type="textarea" placeholder="请输入内容" maxlength="500" show-word-limit
+						:autosize="{ minRows: 4, maxRows: 10 }" v-model="feedbackForm.feedback"
+						autocomplete="off"></el-input>
+				</el-form-item>
+			</el-form>
+			<template #footer>
+				<span class="dialog-footer">
+					<el-button @click="dialogVisibleFeedback = false">取 消</el-button>
+					<el-button type="primary" @click="submitFeedbackForm">提 交</el-button>
+				</span>
+			</template>
+		</el-dialog>
 		<!-- 协议弹窗 -->
 		<agreement title="会员开通协议" v-if="dialogAgreements" :dialogAgreements="dialogAgreements" typeid="315"
 			@closeAgree="closeAgree" />
@@ -770,7 +793,9 @@
 				dialogImageUrl: '', // 预览图片URL
 				dialogVisible: false, // 预览图片是否可见
 				nonVipInfo: {},
-				endTimeStr:''
+				endTimeStr:'',
+				dialogVisibleFeedback: false,  // 意见反馈
+				feedbackForm: { feedback: '' }
 			}
 		},
 		created() {
@@ -839,6 +864,17 @@
 			},
 		},
 		methods: {
+			// 意见反馈
+			submitFeedbackForm() {
+				this.$refs.feedbackForm.validate((valid) => {
+					if (valid) {
+						// .... 存储
+					} else {
+						console.log('error submit!!')
+						return false
+					}
+				})
+			},
 			// 点击预览
 			handlePreview(file) {
 				this.dialogImageUrl = file.url

src/views/message/index.vue

@@ -3,7 +3,17 @@
 		<!-- 消息主体 -->
 		<div class="content flex align-center justify-between">
 			<!-- 左侧聊天列表 -->
-			<div class="content-l flex align-center justify-center">
+            <div class="content-l">
+                <div class="tabs">
+                    <el-tabs v-model="activeName" @tab-click="handleTabClick">
+                        <el-tab-pane label="全部" name="all"></el-tab-pane>
+                        <el-tab-pane label="已读" name="read"></el-tab-pane>
+                        <el-tab-pane label="未读" name="unread"></el-tab-pane>
+                        <el-tab-pane label="沟通过" name="communicated"></el-tab-pane>
+                        <el-tab-pane label="已邀约" name="invited"></el-tab-pane>
+                        <el-tab-pane label="面试过" name="interviewed"></el-tab-pane>
+                    </el-tabs>
+				</div>
 				<div class="content-l-box flex algin-center justify-center flex-wrap">
 					<div class="content-l-box-items" :class="selectIndex==1?'megActive':''" @click="getSysMsgList(true)"
 						v-for="(item,index) in msgList" :key="index">
@@ -633,7 +643,9 @@
 					1: '在职-月内到岗',
 					2: '在职-考虑机会',
 					3: '在职-暂不考虑'
-				}
+				},
+				activeName: 'all',
+
 			}
 		},
 		computed: {
@@ -662,6 +674,9 @@
 			}, 1000);
 		},
 		methods: {
+			handleTabClick(tab) {
+				this.activeName = tab.props.name
+			},
 			deleteMsg(item){
 				ElMessageBox.confirm(
 					'确定删除这条消息？',
@@ -1624,7 +1639,10 @@
 		height: 80vh;
 		background-color: #ffffff;
 		border-radius: 14px;
-
+        .tabs {
+            padding: 20px;
+            padding-bottom: 0;
+        }
 		.content-l-box {
 			width: 100%;
 			height: calc(80vh - 40px);

vite.config.js

@@ -20,7 +20,7 @@ export default defineConfig({
 		open: true,
 		proxy: {
 		  '^/sqx_fast': {
-			target: 'http://192.168.0.10:7155',
+			target: 'https://www.bosszan.com/',
 			secure: false,
 			changeOrigin: true,
 		  }