Compare commits
13 Commits
21dd282943
...
yang
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8d44d5b351 | ||
|
|
5a1ee392a9 | ||
|
|
dee3d7d9be | ||
|
|
2c29c2a792 | ||
|
|
4d69389c99 | ||
|
|
5d08291ef6 | ||
|
|
9ce22a7949 | ||
|
|
9a5ac849a0 | ||
|
|
d7b7f8d111 | ||
|
|
3980aecd56 | ||
|
|
805122c23f | ||
|
|
ba9e1d279d | ||
|
|
4ea7b8abb4 |
@@ -1,5 +1,14 @@
|
||||
<template>
|
||||
<view v-if="show" class="filter-container">
|
||||
<!-- 头部 -->
|
||||
<view class="filter-header">
|
||||
<view class="header-title">筛选</view>
|
||||
<view class="header-close" @click="handleClose">
|
||||
<view class="close-icon"></view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 主体内容 -->
|
||||
<view class="filter-body">
|
||||
<!-- 左侧标签页 -->
|
||||
<view class="filter-tabs">
|
||||
<view
|
||||
@@ -89,22 +98,22 @@
|
||||
</radio-group>
|
||||
</view>
|
||||
|
||||
<!-- 地区 -->
|
||||
<!-- 地区(多选) -->
|
||||
<view v-if="activeTab === 'area'" class="content-section">
|
||||
<radio-group @change="(e) => handleSelect('area', e)">
|
||||
<checkbox-group @change="(e) => handleCheckboxSelect('area', e)">
|
||||
<label
|
||||
v-for="option in areaOptions"
|
||||
:key="option.value"
|
||||
class="radio-item"
|
||||
:class="{ checked: selectedValues['area'] === String(option.value) }"
|
||||
:class="{ checked: isAreaSelected(String(option.value)) }"
|
||||
>
|
||||
<radio
|
||||
<checkbox
|
||||
:value="String(option.value)"
|
||||
:checked="selectedValues['area'] === String(option.value)"
|
||||
:checked="isAreaSelected(String(option.value))"
|
||||
/>
|
||||
<text class="option-label">{{ option.label }}</text>
|
||||
</label>
|
||||
</radio-group>
|
||||
</checkbox-group>
|
||||
</view>
|
||||
|
||||
<!-- 岗位类型 -->
|
||||
@@ -132,6 +141,7 @@
|
||||
<button class="footer-btn confirm-btn" @click="handleConfirm">确认</button>
|
||||
</view>
|
||||
</view>
|
||||
</view><!-- end filter-body -->
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@@ -176,7 +186,7 @@ const selectedValues = reactive({
|
||||
experience: '',
|
||||
salary: '',
|
||||
scale: '',
|
||||
area: '',
|
||||
area: [],
|
||||
jobType: ''
|
||||
});
|
||||
|
||||
@@ -218,21 +228,60 @@ onBeforeMount(async () => {
|
||||
}
|
||||
});
|
||||
|
||||
// 处理选项选择
|
||||
// 处理单选选项选择
|
||||
const handleSelect = (key, e) => {
|
||||
selectedValues[key] = e.detail.value;
|
||||
};
|
||||
|
||||
// 处理多选选项选择(地区)
|
||||
// 兼容不同平台:H5 可能返回逗号分隔字符串,小程序返回数组
|
||||
const handleCheckboxSelect = (key, e) => {
|
||||
let val = e.detail.value;
|
||||
if (typeof val === 'string') {
|
||||
selectedValues[key] = val ? val.split(',').map((s) => s.trim()) : [];
|
||||
} else if (Array.isArray(val)) {
|
||||
selectedValues[key] = val.map((v) => String(v));
|
||||
} else {
|
||||
selectedValues[key] = [];
|
||||
}
|
||||
};
|
||||
|
||||
// 判断地区选项是否被选中(兼容数组和字符串)
|
||||
const isAreaSelected = (value) => {
|
||||
const areaVal = selectedValues.area;
|
||||
if (Array.isArray(areaVal)) {
|
||||
return areaVal.includes(value);
|
||||
}
|
||||
if (typeof areaVal === 'string' && areaVal) {
|
||||
return areaVal.split(',').includes(value);
|
||||
}
|
||||
return false;
|
||||
};
|
||||
|
||||
// 清除所有选择
|
||||
const handleClear = () => {
|
||||
Object.keys(selectedValues).forEach((key) => {
|
||||
if (key === 'area') {
|
||||
selectedValues[key] = [];
|
||||
} else {
|
||||
selectedValues[key] = '';
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
// 确认筛选
|
||||
const handleConfirm = () => {
|
||||
const payload = { ...selectedValues };
|
||||
// 将多选的地区数组转为逗号分隔字符串(兼容各种格式)
|
||||
if (Array.isArray(payload.area) && payload.area.length > 0) {
|
||||
payload.area = payload.area.map((v) => String(v)).join(',');
|
||||
} else if (typeof payload.area === 'string' && payload.area) {
|
||||
// 如果已经是逗号分隔字符串,保持原样
|
||||
payload.area = payload.area;
|
||||
} else {
|
||||
payload.area = '';
|
||||
}
|
||||
console.log('[new-filter-page] area value to emit:', payload.area);
|
||||
// 将选中的薪资区间转换为 minSalary / maxSalary 参数
|
||||
// 始终带上 minSalary / maxSalary(含空值),便于父组件在清除时移除旧值
|
||||
let minSalary = '';
|
||||
@@ -269,22 +318,33 @@ const handleClose = () => {
|
||||
background-color: #fff;
|
||||
z-index: 9999;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.filter-header {
|
||||
height: 96rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
justify-content: center;
|
||||
padding: 0 32rpx;
|
||||
border-bottom: 1rpx solid #eee;
|
||||
background-color: #fff;
|
||||
box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
|
||||
flex-shrink: 0;
|
||||
position: relative;
|
||||
|
||||
.back-btn {
|
||||
font-size: 36rpx;
|
||||
.header-title {
|
||||
font-size: 34rpx;
|
||||
font-weight: 600;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.header-close {
|
||||
position: absolute;
|
||||
right: 32rpx;
|
||||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
width: 48rpx;
|
||||
height: 48rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
@@ -295,13 +355,40 @@ const handleClose = () => {
|
||||
&:active {
|
||||
background-color: rgba(37, 107, 250, 0.1);
|
||||
}
|
||||
|
||||
.close-icon {
|
||||
position: relative;
|
||||
width: 28rpx;
|
||||
height: 28rpx;
|
||||
|
||||
&::before,
|
||||
&::after {
|
||||
content: '';
|
||||
position: absolute;
|
||||
left: 50%;
|
||||
top: 50%;
|
||||
width: 4rpx;
|
||||
height: 28rpx;
|
||||
border-radius: 2rpx;
|
||||
background: #5A5A68;
|
||||
}
|
||||
|
||||
.filter-title {
|
||||
font-size: 34rpx;
|
||||
font-weight: 600;
|
||||
color: #333;
|
||||
&::before {
|
||||
transform: translate(-50%, -50%) rotate(45deg);
|
||||
}
|
||||
|
||||
&::after {
|
||||
transform: translate(-50%, -50%) rotate(-45deg);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.filter-body {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.filter-tabs {
|
||||
|
||||
@@ -21,14 +21,8 @@
|
||||
</view>
|
||||
<view class="card-bottom">
|
||||
<view>{{ job.postingDate }}</view>
|
||||
<view>
|
||||
<convert-distance
|
||||
:alat="job.latitude"
|
||||
:along="job.longitude"
|
||||
:blat="latitude"
|
||||
:blong="longitude"
|
||||
></convert-distance>
|
||||
<dict-Label class="mar_le10" dictType="area" :value="job.jobLocationAreaCode"></dict-Label>
|
||||
<view class="card-bottom-right">
|
||||
<text v-if="job.regionName">地区:{{ job.regionName }}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@@ -63,8 +63,9 @@
|
||||
<header class="head">
|
||||
<view class="main-header">
|
||||
<image src="/static/icon/Hamburger-button.png" @click="toggleDrawer"></image>
|
||||
<!-- <view class="title">{{ config.appInfo.areaName }}岗位推荐</view> -->
|
||||
<!-- <view class="title">{{ config.appInfo.areaName }}岗位推荐</view> -->
|
||||
<view class="back-home-btn" @click="navTo('/pages/index/index')">
|
||||
<text class="back-home-text">返回</text>
|
||||
</view>
|
||||
<image src="/static/icon/Comment-one.png" @click="addNewDialogue"></image>
|
||||
</view>
|
||||
</header>
|
||||
@@ -375,6 +376,19 @@ footer-height = 98rpx
|
||||
image
|
||||
width: 36rpx;
|
||||
height: 37rpx;
|
||||
.back-home-btn
|
||||
display: flex
|
||||
align-items: center
|
||||
justify-content: center
|
||||
padding: 0 20rpx
|
||||
height: 60rpx
|
||||
border-radius: 12rpx
|
||||
&:active
|
||||
background: rgba(0, 0, 0, 0.05)
|
||||
.back-home-text
|
||||
font-size: 30rpx
|
||||
color: #333
|
||||
font-weight: 500
|
||||
|
||||
.chatmain-warpper
|
||||
height: 'calc(100% - %s)' %( header-height + footer-height)
|
||||
|
||||
@@ -227,8 +227,12 @@
|
||||
placeholder-class="inputplaceholder"
|
||||
class="input"
|
||||
@confirm="sendMessage"
|
||||
@click="handleInputClick"
|
||||
@focus="handleInputFocus"
|
||||
:disabled="isTyping"
|
||||
:adjust-position="true"
|
||||
:focus="inputFocused"
|
||||
cursor-spacing="20"
|
||||
placeholder="请输入您想找的岗位信息或就政策信息【比如:设计师、10000-12000、广州】【比如:今年喀什地区高校毕业生有什么就业政策】"
|
||||
v-show="!isVoice"
|
||||
/>
|
||||
@@ -421,6 +425,7 @@ const { speak, pause, resume, isSpeaking, isPaused, cancelAudio } = useTTSPlayer
|
||||
const instance = getCurrentInstance();
|
||||
|
||||
// state
|
||||
const ACTIVE_TAB_KEY = 'chat_active_tab';
|
||||
const activeTab = ref('policy'); // 'policy' or 'job'
|
||||
const queries = ref([]);
|
||||
const guessList = ref([]);
|
||||
@@ -439,6 +444,7 @@ const feebackData = ref(null);
|
||||
// 删除功能相关状态
|
||||
const isSelectMode = ref(false);
|
||||
const selectedMessages = ref([]);
|
||||
const inputFocused = ref(false);
|
||||
// ref for DOM element
|
||||
const voiceBtn = ref(null);
|
||||
const feeback = ref(null);
|
||||
@@ -466,7 +472,16 @@ const audiowaveStyle = computed(() => {
|
||||
: '#f1f1f1';
|
||||
});
|
||||
|
||||
function setActiveTab(tab) {
|
||||
activeTab.value = tab;
|
||||
uni.setStorageSync(ACTIVE_TAB_KEY, tab);
|
||||
}
|
||||
|
||||
onMounted(async () => {
|
||||
const cachedActiveTab = uni.getStorageSync(ACTIVE_TAB_KEY);
|
||||
if (cachedActiveTab === 'policy' || cachedActiveTab === 'job') {
|
||||
activeTab.value = cachedActiveTab;
|
||||
}
|
||||
changeQueries();
|
||||
scrollToBottom();
|
||||
isAudioPermission.value = await requestMicPermission();
|
||||
@@ -541,10 +556,13 @@ const sendMessage = (text) => {
|
||||
if (speechIndex.value !== index) {
|
||||
// 延迟TTS,等待内容更完整
|
||||
// 只有在内容长度超过50个字符或者包含岗位信息时才开始朗读
|
||||
const hasJobInfo = message.displayText.includes('```job-json') ||
|
||||
const hasJobInfo = isJobCardMessage(message) ||
|
||||
message.displayText.includes('岗位') ||
|
||||
message.displayText.includes('公司') ||
|
||||
message.displayText.includes('薪资');
|
||||
if (hasJobInfo) {
|
||||
setActiveTab('job');
|
||||
}
|
||||
|
||||
if (message.displayText.length > 50 || hasJobInfo) {
|
||||
console.log('🎵 Starting streaming TTS for message index:', index);
|
||||
@@ -573,6 +591,9 @@ const sendMessage = (text) => {
|
||||
const lastMessageIndex = messages.value.length - 1;
|
||||
if (lastMessageIndex >= 0) {
|
||||
const lastMessage = messages.value[lastMessageIndex];
|
||||
if (isJobCardMessage(lastMessage)) {
|
||||
setActiveTab('job');
|
||||
}
|
||||
if (!lastMessage.self && lastMessage.displayText && lastMessage.displayText.trim()) {
|
||||
console.log('🎵 Final TTS for complete message');
|
||||
console.log('📝 Final text length:', lastMessage.displayText.length);
|
||||
@@ -1357,6 +1378,22 @@ function closeFile() {
|
||||
showfile.value = false;
|
||||
}
|
||||
|
||||
function handleInputClick() {
|
||||
inputFocused.value = false;
|
||||
nextTick(() => {
|
||||
inputFocused.value = true;
|
||||
});
|
||||
console.log('[键盘] 点击输入框,尝试唤起键盘');
|
||||
}
|
||||
|
||||
function handleInputFocus() {
|
||||
console.log('[键盘] 输入框已获得焦点,键盘应已弹出');
|
||||
$api.msg('输入框已激活');
|
||||
nextTick(() => {
|
||||
scrollToBottom();
|
||||
});
|
||||
}
|
||||
|
||||
function copyMarkdown(value) {
|
||||
$api.copyText(value);
|
||||
}
|
||||
@@ -1481,7 +1518,18 @@ function getRandomJobQueries(queries, count = 2) {
|
||||
|
||||
// 切换tab
|
||||
function switchTab(tab) {
|
||||
activeTab.value = tab;
|
||||
setActiveTab(tab);
|
||||
}
|
||||
|
||||
function isJobCardMessage(msg) {
|
||||
const content = msg?.displayText || '';
|
||||
return (
|
||||
/```\s*job-json/.test(content) ||
|
||||
content.includes('岗位推荐') ||
|
||||
content.includes('推荐岗位') ||
|
||||
content.includes('岗位信息') ||
|
||||
(content.includes('```') && content.includes('公司') && content.includes('薪资'))
|
||||
);
|
||||
}
|
||||
|
||||
// 检查消息是否应该显示在当前tab
|
||||
@@ -1490,26 +1538,10 @@ function shouldShowMessage(msg) {
|
||||
return true; // 用户自己的消息总是显示
|
||||
}
|
||||
|
||||
const isJobCard = isJobCardMessage(msg);
|
||||
if (activeTab.value === 'policy') {
|
||||
// 政策查询tab:显示除了岗位卡片以外的所有内容
|
||||
// 岗位卡片通常包含特定的标记,如```job-json或岗位推荐等关键词
|
||||
const isJobCard = msg.displayText && (
|
||||
msg.displayText.includes('```job-json') ||
|
||||
msg.displayText.includes('岗位推荐') ||
|
||||
msg.displayText.includes('推荐岗位') ||
|
||||
msg.displayText.includes('岗位信息') ||
|
||||
(msg.displayText.includes('```') && msg.displayText.includes('公司') && msg.displayText.includes('薪资'))
|
||||
);
|
||||
return !isJobCard;
|
||||
} else {
|
||||
// 岗位推荐tab:只显示岗位卡片内容
|
||||
const isJobCard = msg.displayText && (
|
||||
msg.displayText.includes('```job-json') ||
|
||||
msg.displayText.includes('岗位推荐') ||
|
||||
msg.displayText.includes('推荐岗位') ||
|
||||
msg.displayText.includes('岗位信息') ||
|
||||
(msg.displayText.includes('```') && msg.displayText.includes('公司') && msg.displayText.includes('薪资'))
|
||||
);
|
||||
return isJobCard;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
|
||||
<view class="nav-hidden hidden-animation" :class="{ 'hidden-height': shouldHideTop }">
|
||||
<view class="container-search" v-if="shouldShowJobSeekerContent">
|
||||
<view class="search-input button-click" @click="navTo('/pages/search/search')">
|
||||
<view class="search-input button-click" @click="navToSearch">
|
||||
<uni-icons class="iconsearch" color="#666666" type="search" size="18"></uni-icons>
|
||||
<text class="inpute">职位名称、薪资要求等</text>
|
||||
</view>
|
||||
@@ -263,12 +263,17 @@
|
||||
{{ item.text }}
|
||||
</view>
|
||||
</view>
|
||||
<view class="btm-right-wrap">
|
||||
<view class="button-click clear-btn" v-if="hasFilterConditions" @click="clearFilter">
|
||||
清除筛选
|
||||
</view>
|
||||
<view class="btm-right button-click" @click="openFilter">
|
||||
筛选
|
||||
<image class="right-sx" :class="{ active: showFilter }" src="@/static/icon/shaixun.png"></image>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="table-list">
|
||||
<scroll-view :scroll-y="true" class="falls-scroll" @scroll="handleScroll" @scrolltolower="scrollBottom"
|
||||
:enable-back-to-top="false" :scroll-with-animation="false">
|
||||
@@ -564,6 +569,12 @@ const shouldShowCompanyContent = computed(() => {
|
||||
return userType === 0;
|
||||
});
|
||||
|
||||
// 判断是否有筛选条件(用于显示/隐藏清除按钮)
|
||||
const hasFilterConditions = computed(() => {
|
||||
const searchKeys = Object.keys(pageState.search).filter((k) => k !== 'order' && pageState.search[k]);
|
||||
return searchKeys.length > 0 || Object.keys(conditionSearch.value).length > 0 || Boolean(selectedCity.value.code);
|
||||
});
|
||||
|
||||
// 判断当前用户是否为招聘者(企业用户)
|
||||
const isRecruiter = computed(() => {
|
||||
if (!hasLogin.value) {
|
||||
@@ -1067,6 +1078,38 @@ function openFilter() {
|
||||
emits('onShowTabbar', false);
|
||||
}
|
||||
|
||||
// 跳转到搜索页,并携带筛选条件
|
||||
function navToSearch() {
|
||||
const query = {};
|
||||
// 携带筛选弹窗中选择的地区(确保是逗号分隔字符串)
|
||||
const areaVal = pageState.search.area;
|
||||
if (areaVal && String(areaVal)) {
|
||||
query.area = String(areaVal);
|
||||
}
|
||||
// 携带城市选择器中选择的regionCode
|
||||
if (conditionSearch.value.regionCode) {
|
||||
query.regionCode = String(conditionSearch.value.regionCode);
|
||||
}
|
||||
console.log('[navToSearch] query params:', query);
|
||||
navTo('/pages/search/search', { query });
|
||||
}
|
||||
|
||||
// 清除所有筛选条件
|
||||
function clearFilter() {
|
||||
// 保留 order 排序方式
|
||||
const currentOrder = pageState.search.order;
|
||||
pageState.search = { order: currentOrder };
|
||||
// 清除城市选择
|
||||
conditionSearch.value = {};
|
||||
selectedCity.value = { code: '', name: '' };
|
||||
// 刷新列表
|
||||
if (state.tabIndex === 'all') {
|
||||
getJobRecommend('refresh');
|
||||
} else {
|
||||
getJobList('refresh');
|
||||
}
|
||||
}
|
||||
|
||||
function handleNewFilterConfirm(values) {
|
||||
pageState.search = {
|
||||
...pageState.search,
|
||||
@@ -1993,6 +2036,16 @@ defineExpose({ loadData });
|
||||
font-weight: 500;
|
||||
font-size: 32rpx;
|
||||
color: #256BFA;
|
||||
.btm-right-wrap
|
||||
display: flex
|
||||
align-items: center
|
||||
.clear-btn
|
||||
font-family: 'PingFangSC-Regular', 'PingFang SC', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif;
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
color: #999;
|
||||
margin-right: 20rpx;
|
||||
white-space: nowrap;
|
||||
.btm-right
|
||||
font-family: 'PingFangSC-Regular', 'PingFang SC', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif;
|
||||
font-weight: 400;
|
||||
|
||||
@@ -1,9 +1,16 @@
|
||||
<template>
|
||||
<view class="container safe-area-top">
|
||||
<!-- 自定义头部搜索框 -->
|
||||
<!-- #ifdef H5 -->
|
||||
<view class="custom-header" :style="{ paddingTop: statusBarHeight + 'px' }">
|
||||
<!-- #endif -->
|
||||
<!-- #ifndef H5 -->
|
||||
<view class="custom-header">
|
||||
<!-- #endif -->
|
||||
<view class="top">
|
||||
<!-- <image class="btnback button-click" src="@/static/icon/back.png" @click="navBack"></image> -->
|
||||
<!-- #ifdef H5 -->
|
||||
<image class="btnback button-click" src="@/static/icon/back.png" @click="navBack"></image>
|
||||
<!-- #endif -->
|
||||
<view class="search-box">
|
||||
<uni-icons
|
||||
class="iconsearch"
|
||||
@@ -55,6 +62,11 @@ import { storeToRefs } from 'pinia';
|
||||
import { useColumnCount } from '@/hook/useColumnCount';
|
||||
import img from '@/static/icon/filter.png';
|
||||
const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
|
||||
const statusBarHeight = ref(0);
|
||||
// #ifdef H5
|
||||
const sysInfo = uni.getSystemInfoSync();
|
||||
statusBarHeight.value = sysInfo.statusBarHeight || 0;
|
||||
// #endif
|
||||
const searchValue = ref('');
|
||||
const historyList = ref([]);
|
||||
const searchParams = ref({});
|
||||
@@ -79,7 +91,16 @@ onLoad((query) => {
|
||||
if (arr) {
|
||||
historyList.value = uni.getStorageSync('searchList');
|
||||
}
|
||||
const {job} = query;
|
||||
const {job, area, regionCode} = query;
|
||||
// 从首页筛选条件传入的地区和区域编码
|
||||
console.log('[search-page] onLoad query:', JSON.stringify(query));
|
||||
if (area) {
|
||||
pageState.search.area = String(area);
|
||||
console.log('[search-page] set area:', pageState.search.area);
|
||||
}
|
||||
if (regionCode) {
|
||||
pageState.search.regionCode = String(regionCode);
|
||||
}
|
||||
if (job) {
|
||||
searchValue.value = job;
|
||||
searchBtn();
|
||||
@@ -161,6 +182,7 @@ function getJobList(type = 'add') {
|
||||
...pageState.search,
|
||||
jobTitle: searchValue.value,
|
||||
};
|
||||
console.log('[search-page] getJobList params:', JSON.stringify(params));
|
||||
|
||||
$api.createRequest('/app/job/list', params, 'GET', true).then((resData) => {
|
||||
const { rows, total } = resData;
|
||||
|
||||
Reference in New Issue
Block a user