Merge branch 'main'

components/new-filter-page/new-filter-page.vue

@@ -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 {
+    .header-title {
-        font-size: 36rpx;
+        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 {
+            &::before {
-        font-size: 34rpx;
+                transform: translate(-50%, -50%) rotate(45deg);
-        font-weight: 600;
-        color: #333;
             }
+
+            &::after {
+                transform: translate(-50%, -50%) rotate(-45deg);
+            }
+        }
+    }
+}
+
+.filter-body {
+    flex: 1;
+    display: flex;
+    flex-direction: row;
+    overflow: hidden;
 }
 
 .filter-tabs {

components/renderJobs/renderJobs.vue

@@ -21,14 +21,8 @@
             </view>
             <view class="card-bottom">
                 <view>{{ job.postingDate }}</view>
-                <view>
+                <view class="card-bottom-right">
-                    <convert-distance
+                    <text v-if="job.regionName">地区：{{ job.regionName }}</text>
-                        :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>
             </view>
         </view>

pages/index/components/index-one.vue

@@ -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;

pages/search/search.vue

@@ -1,9 +1,9 @@
 <template>
     <view class="container safe-area-top">
         <!-- 自定义头部搜索框 -->
-        <view class="custom-header">
+        <view class="custom-header" :style="{ paddingTop: statusBarHeight + 'px' }">
             <view class="top">
-                <!-- <image class="btnback button-click" src="@/static/icon/back.png" @click="navBack"></image> -->
+                <image class="btnback button-click" src="@/static/icon/back.png" @click="navBack"></image>
                 <view class="search-box">
                     <uni-icons
                         class="iconsearch"
@@ -55,6 +55,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 +84,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 +175,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;