Merge branch 'main' of http://124.243.245.42:3000/sdz/ks-app-employment-service

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

@@ -0,0 +1,424 @@
+<template>
+    <view v-if="show" class="filter-container">
+        <!-- 头部 -->
+        <!-- <view class="filter-header">
+            <text class="back-btn" @click="handleClose">
+                <uni-icons type="left" size="24"></uni-icons>
+            </text>
+            <text class="filter-title">喀什智慧就业平台</text>
+            <view class="back-btn"></view>
+        </view> -->
+
+        <!-- 标签页 -->
+        <view class="filter-tabs">
+            <view
+                v-for="(tab, index) in tabs"
+                :key="index"
+                class="tab-item"
+                :class="{ active: activeTab === tab.key }"
+                @click="activeTab = tab.key"
+            >
+                {{ tab.label }}
+            </view>
+        </view>
+
+        <!-- 内容区域 -->
+        <view class="filter-content">
+            <!-- 学历要求 -->
+            <view v-if="activeTab === 'education'" class="content-section">
+                <radio-group @change="(e) => handleSelect('education', e)">
+                    <label
+                        v-for="option in educationOptions"
+                        :key="option.value"
+                        class="radio-item"
+                        :class="{ checked: selectedValues['education'] === String(option.value) }"
+                    >
+                        <radio
+                            :value="String(option.value)"
+                            :checked="selectedValues['education'] === String(option.value)"
+                        />
+                        <text class="option-label">{{ option.label }}</text>
+                    </label>
+                </radio-group>
+            </view>
+
+            <!-- 工作经验 -->
+            <view v-if="activeTab === 'experience'" class="content-section">
+                <radio-group @change="(e) => handleSelect('experience', e)">
+                    <label
+                        v-for="option in experienceOptions"
+                        :key="option.value"
+                        class="radio-item"
+                        :class="{ checked: selectedValues['experience'] === String(option.value) }"
+                    >
+                        <radio
+                            :value="String(option.value)"
+                            :checked="selectedValues['experience'] === String(option.value)"
+                        />
+                        <text class="option-label">{{ option.label }}</text>
+                    </label>
+                </radio-group>
+            </view>
+
+            <!-- 公司规模 -->
+            <view v-if="activeTab === 'scale'" class="content-section">
+                <radio-group @change="(e) => handleSelect('scale', e)">
+                    <label
+                        v-for="option in scaleOptions"
+                        :key="option.value"
+                        class="radio-item"
+                        :class="{ checked: selectedValues['scale'] === String(option.value) }"
+                    >
+                        <radio
+                            :value="String(option.value)"
+                            :checked="selectedValues['scale'] === String(option.value)"
+                        />
+                        <text class="option-label">{{ option.label }}</text>
+                    </label>
+                </radio-group>
+            </view>
+
+            <!-- 地区 -->
+            <view v-if="activeTab === 'area'" class="content-section">
+                <radio-group @change="(e) => handleSelect('area', e)">
+                    <label
+                        v-for="option in areaOptions"
+                        :key="option.value"
+                        class="radio-item"
+                        :class="{ checked: selectedValues['area'] === String(option.value) }"
+                    >
+                        <radio
+                            :value="String(option.value)"
+                            :checked="selectedValues['area'] === String(option.value)"
+                        />
+                        <text class="option-label">{{ option.label }}</text>
+                    </label>
+                </radio-group>
+            </view>
+
+            <!-- 岗位类型 -->
+            <view v-if="activeTab === 'jobType'" class="content-section">
+                <radio-group @change="(e) => handleSelect('jobType', e)">
+                    <label
+                        v-for="option in jobTypeOptions"
+                        :key="option.value"
+                        class="radio-item"
+                        :class="{ checked: selectedValues['jobType'] === String(option.value) }"
+                    >
+                        <radio
+                            :value="String(option.value)"
+                            :checked="selectedValues['jobType'] === String(option.value)"
+                        />
+                        <text class="option-label">{{ option.label }}</text>
+                    </label>
+                </radio-group>
+            </view>
+        </view>
+
+        <!-- 底部按钮 -->
+        <view class="filter-footer">
+            <button class="footer-btn clear-btn" @click="handleClear">清除</button>
+            <button class="footer-btn confirm-btn" @click="handleConfirm">确认</button>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import { ref, reactive, onBeforeMount } from 'vue';
+import useDictStore from '@/stores/useDictStore';
+const dictStore = useDictStore();
+const { getTransformChildren } = dictStore;
+
+const props = defineProps({
+    show: Boolean,
+});
+
+const emit = defineEmits(['confirm', 'close', 'update:show']);
+
+// 岗位类型数据
+const getJobTypeData = () => {
+    return [
+        { label: '常规岗位', value: 0, text: '常规岗位' },
+        { label: '就业见习岗位', value: 1, text: '就业见习岗位' },
+        { label: '实习实训岗位', value: 2, text: '实习实训岗位' },
+        { label: '社区实践岗位', value: 3, text: '社区实践岗位' }
+    ];
+};
+
+// 标签页数据
+const tabs = [
+    { key: 'education', label: '学历要求' },
+    { key: 'experience', label: '工作经验' },
+    { key: 'scale', label: '公司规模' },
+    { key: 'jobType', label: '岗位类型' },
+    { key: 'area', label: '地区' }
+];
+
+// 当前激活的标签
+const activeTab = ref('education');
+
+// 存储已选中的值
+const selectedValues = reactive({
+    education: '',
+    experience: '',
+    scale: '',
+    area: '',
+    jobType: ''
+});
+
+// 从字典获取的选项数据
+const educationOptions = ref([]);
+const experienceOptions = ref([]);
+const scaleOptions = ref([]);
+const areaOptions = ref([]);
+const jobTypeOptions = ref([]);
+
+// 加载状态
+const loading = ref(true);
+
+// 初始化获取数据
+onBeforeMount(async () => {
+    try {
+        // 先获取字典数据
+        await dictStore.getDictData();
+        // 再初始化选项数据
+        educationOptions.value = getTransformChildren('education', '学历要求').options || [];
+        experienceOptions.value = getTransformChildren('experience', '工作经验').options || [];
+        scaleOptions.value = getTransformChildren('scale', '公司规模').options || [];
+        areaOptions.value = getTransformChildren('area', '地区').options || [];
+        jobTypeOptions.value = getJobTypeData();
+    } catch (error) {
+        console.error('获取字典数据失败:', error);
+    } finally {
+        loading.value = false;
+    }
+});
+
+// 处理选项选择
+const handleSelect = (key, e) => {
+    selectedValues[key] = e.detail.value;
+};
+
+// 清除所有选择
+const handleClear = () => {
+    Object.keys(selectedValues).forEach((key) => {
+        selectedValues[key] = '';
+    });
+};
+
+// 确认筛选
+const handleConfirm = () => {
+    console.log('selectedValues:', selectedValues);
+    emit('confirm', selectedValues);
+    handleClose();
+};
+
+// 关闭弹窗
+const handleClose = () => {
+    emit('update:show', false);
+    emit('close');
+};
+</script>
+
+<style lang="scss" scoped>
+.filter-container {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100vw;
+    height: 100vh;
+    background-color: #fff;
+    z-index: 9999;
+    display: flex;
+    flex-direction: column;
+}
+
+.filter-header {
+    height: 96rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 32rpx;
+    border-bottom: 1rpx solid #eee;
+    background-color: #fff;
+    box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+
+    .back-btn {
+        font-size: 36rpx;
+        width: 48rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        padding: 10rpx;
+        border-radius: 50%;
+        transition: all 0.3s ease;
+
+        &:active {
+            background-color: rgba(37, 107, 250, 0.1);
+        }
+    }
+
+    .filter-title {
+        font-size: 34rpx;
+        font-weight: 600;
+        color: #333;
+    }
+}
+
+.filter-tabs {
+    display: flex;
+    border-bottom: 1rpx solid #eee;
+    background-color: #fff;
+    box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+
+    .tab-item {
+        flex: 1;
+        height: 90rpx;
+        line-height: 90rpx;
+        text-align: center;
+        font-size: 30rpx;
+        color: #666;
+        position: relative;
+        transition: all 0.3s ease;
+
+        &.active {
+            color: #256BFA;
+            font-weight: 600;
+            
+            &::after {
+                content: '';
+                position: absolute;
+                bottom: 0;
+                left: 25%;
+                width: 50%;
+                height: 4rpx;
+                background-color: #256BFA;
+                border-radius: 2rpx;
+            }
+        }
+
+        &:active {
+            background-color: rgba(37, 107, 250, 0.05);
+        }
+    }
+}
+
+.filter-content {
+    flex: 1;
+    padding: 40rpx 32rpx;
+    overflow-y: auto;
+}
+
+.content-section {
+    .radio-item {
+            display: flex;
+            align-items: center;
+            padding: 30rpx 0;
+            border-bottom: 1rpx solid #f0f0f0;
+            transition: all 0.3s ease;
+            position: relative;
+
+            &:last-child {
+                border-bottom: none;
+            }
+
+            &:active {
+                background-color: rgba(37, 107, 250, 0.05);
+            }
+
+            radio {
+                width: 28rpx;
+                height: 28rpx;
+                margin-right: 24rpx;
+                transform: scale(1);
+                display: flex;
+                align-items: center;
+                justify-content: center;
+            }
+
+            radio .wx-radio-input {
+                width: 28rpx;
+                height: 28rpx;
+                border-radius: 50%;
+                border: 2rpx solid #ccc;
+                background: transparent;
+            }
+
+            radio .wx-radio-input.wx-radio-input-checked {
+                border-color: #256BFA !important;
+                background: #256BFA !important;
+            }
+
+            radio .wx-radio-input::before {
+                width: 16rpx;
+                height: 16rpx;
+                line-height: 16rpx;
+                text-align: center;
+                font-size: 12rpx;
+                color: #fff;
+                background: transparent;
+                transform: translate(-50%, -50%) scale(0);
+                -webkit-transform: translate(-50%, -50%) scale(0);
+            }
+
+            radio .wx-radio-input.wx-radio-input-checked::before {
+                transform: translate(-50%, -50%) scale(1);
+                -webkit-transform: translate(-50%, -50%) scale(1);
+            }
+
+            .option-label {
+                font-size: 30rpx;
+                color: #333;
+                flex: 1;
+                font-weight: 400;
+                line-height: 40rpx;
+            }
+        }
+}
+
+.filter-footer {
+    height: 160rpx;
+    display: flex;
+    border-top: 1rpx solid #eee;
+    background-color: #fff;
+    box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.05);
+    padding: 20rpx 32rpx 100rpx;
+    flex-shrink: 0;
+    position: relative;
+    z-index: 10;
+
+    .footer-btn {
+        flex: 1;
+        margin: 0;
+        border-radius: 16rpx;
+        height: 80rpx;
+        line-height: 80rpx;
+        font-size: 32rpx;
+        transition: all 0.3s ease;
+        font-weight: 500;
+
+        &:first-child {
+            margin-right: 20rpx;
+            background-color: #f5f5f5;
+            color: #666;
+            border: 1rpx solid #e0e0e0;
+
+            &:active {
+                background-color: #e0e0e0;
+                transform: scale(0.98);
+            }
+        }
+
+        &:last-child {
+            background-color: #256BFA;
+            color: #fff;
+            border: none;
+
+            &:active {
+                background-color: #1a56d9;
+                transform: scale(0.98);
+            }
+        }
+    }
+}
+</style>

hook/useColumnCount.js

@@ -32,25 +32,21 @@ export function useColumnCount(onChange = () => {}) {
         // #endif
 
         let count = 2
+        // #ifdef H5
+        // H5端固定显示2列
+        count = 2
+        // #endif
+        // #ifndef H5
         if (width >= 1000) {
-            // #ifdef H5
-            count = 3 // H5端最多显示3列
-            // #endif
-            // #ifndef H5
             count = 5
-            // #endif
         } else if (width >= 750) {
-            // #ifdef H5
-            count = 3 // H5端最多显示3列
-            // #endif
-            // #ifndef H5
             count = 4
-            // #endif
         } else if (width >= 500) {
             count = 3
         } else {
             count = 2
         }
+        // #endif
 
         if (count !== columnCount.value) {
             columnCount.value = count

packageA/pages/nearby/components/four.vue

@@ -120,7 +120,7 @@ const rangeOptions = ref([
     { value: 0, text: '推荐' },
     { value: 1, text: '最热' },
     { value: 2, text: '最新发布' },
-    { value: 3, text: '疆外' },
+    // { value: 3, text: '疆外' },
 ]);
 
 function choosePosition(index) {

packageA/pages/nearby/components/one.vue

@@ -160,7 +160,7 @@ const rangeOptions = ref([
     { value: 0, text: '推荐' },
     { value: 1, text: '最热' },
     { value: 2, text: '最新发布' },
-    { value: 3, text: '疆外' },
+    // { value: 3, text: '疆外' },
 ]);
 
 function changeRangeShow() {

packageA/pages/nearby/components/three.vue

@@ -190,7 +190,7 @@ const rangeOptions = ref([
     { value: 0, text: '推荐' },
     { value: 1, text: '最热' },
     { value: 2, text: '最新发布' },
-    { value: 3, text: '疆外' },
+    // { value: 3, text: '疆外' },
 ]);
 onLoad(() => {
     getSubway();

packageA/pages/nearby/components/two.vue

@@ -134,7 +134,7 @@ const rangeOptions = ref([
     { value: 0, text: '推荐' },
     { value: 1, text: '最热' },
     { value: 2, text: '最新发布' },
-    { value: 3, text: '疆外' },
+    // { value: 3, text: '疆外' },
 ]);
 
 function choosePosition(index) {

packageRc/components/PopupLists.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view :class="{'h5-pc-page': isH5}">
 		<view class="popupAll">
 			<view class="tabList dispalyF" v-if="!allCheckShow">
 				<scroll-view scroll-x style="white-space: nowrap;width: calc(100% - 144rpx);margin-left: 32rpx">
@@ -38,7 +38,7 @@
 						{{ item.name }}
 					</view>
 					<view
-						class="dispalyF"
+						class="dispalyF filter-options-container"
 						:style="[
 							{
 								position: 'sticky',
@@ -48,29 +48,20 @@
 							},
 						]"
 					>
-						<template>
+						<template v-for="(itm, idx) in item.data">
-							<template v-for="(itm, idx) in item.data">
+							<view :key="idx" v-if="!itm.mode"
-								<view :key="idx" v-if="!itm.mode"
+								@click="getActive(itm, index, idx)"
-									@click="getActive(itm, index, idx)"
+								:class="
-									:class="
+									idx == item.activeIndex
-										idx == item.activeIndex
+									? 'popupItem-active'
-										? 'popupItem-active'
+									: 'popupItem'
-										: 'popupItem'
+									"
-										"
+							>
-									style="margin-right: 20rpx"
+								{{ itm.dictLabel }}
-								>
+							</view>
-									{{ itm.dictLabel }}
-								</view>
-								<!-- <view v-if="itm.mode == 'timerange'">
-									{{itm.start||'开始时间'}} - {{ item.end||'结束时间' }}
-								</view> -->
-							</template>
 						</template>
 					</view>
 				</view>
-				<!-- <view class="search_btn" @click="search">
-					查询
-				</view> -->
 				<view class="bottom-search">
 					<view class="search-left" @click="clearAll">
 						清空
@@ -78,7 +69,7 @@
 					<view class="search-right" @click="search">查询</view>
 				</view>
 				<view class="popupPic" @click="close">
-					<u-icon name="arrow-up"></u-icon>
+					<uni-icons type="arrow-up" color="#c0c4cc" :size="isH5 ? 20 : 16"></uni-icons>
 				</view>
 			</view>
 
@@ -103,7 +94,8 @@ export default {
 			params: "",
 			fijItem: "",
 			outData: [],
-			nickName: ''
+			nickName: '',
+			isH5: false
 		};
 	},
 	watch: {
@@ -115,9 +107,17 @@ export default {
 		},
 	},
 	mounted() {
-    if (uni.getStorageSync("userInfo")) {
+    // #ifdef H5
-      let userInfo = JSON.parse(uni.getStorageSync("userInfo"));
+    this.isH5 = true;
-      this.nickName = userInfo.userName ? userInfo.userName : "";
+    // #endif
+    const rawUserInfo = uni.getStorageSync("userInfo");
+    if (rawUserInfo) {
+      try {
+        let userInfo = typeof rawUserInfo === 'string' ? JSON.parse(rawUserInfo) : rawUserInfo;
+        this.nickName = userInfo.userName || userInfo.name || "";
+      } catch (e) {
+        console.error("解析用户信息失败", e);
+      }
     }
 	},
 	methods: {
@@ -257,7 +257,7 @@ export default {
 	overflow: hidden;
 	flex-wrap: nowrap;
 	width: 100%;
-	z-index: 9;
+	z-index: 105; /* 增加层级，确保在筛选条上方而不被遮挡 */
 
 	.tabItem {
 		line-height: 56rpx;
@@ -280,7 +280,7 @@ export default {
 		right: 0;
 		width: 87rpx;
 		height: 56rpx;
-		// background: linear-gradient(270deg, #2A51DF 0%, rgba(66, 110, 230, 0) 100%);
+    z-index: 100; /* 确保图标可点击 */
 	}
 
 	.tabrightBtn {
@@ -309,7 +309,6 @@ export default {
 		border: 1rpx solid #CAD4E2;
 		box-sizing: border-box;
 	}
-
 	.popupItem-active {
 		padding: 0 32rpx;
 		text-align: center;
@@ -329,15 +328,6 @@ export default {
 	}
 }
 
-.dispalyF {
-	display: flex;
-	align-items: center;
-}
-
-.rightView :last-child {
-	margin-right: 100rpx !important;
-}
-
 .bottom-search {
 	margin-top:56rpx;
 	display: flex;
@@ -372,4 +362,73 @@ export default {
 		justify-content: center;
 	}
 }
+
+/* #ifdef H5 */
+.h5-pc-page {
+  .tabList {
+    padding: 12px 0 !important;
+    background: #f5f7fa !important;
+    border-radius: 12px !important;
+    white-space: nowrap !important;
+    overflow: hidden !important;
+    display: flex !important;
+  }
+  .tabList .tabItem {
+    display: inline-block !important;
+    font-size: 20px !important;
+    line-height: 48px !important;
+    height: 48px !important;
+    padding: 0 24px !important;
+    border-radius: 24px !important;
+    width: auto !important;
+    min-width: 100px !important; /* 减小最小宽度，防止溢出 */
+    margin-right: 12px !important;
+    vertical-align: middle;
+    background-color: #ffffff !important;
+    flex-shrink: 0 !important;
+    box-sizing: border-box !important;
+  }
+  .tabItem.popupItem-active {
+    background-color: #1a62ce !important;
+    color: #fff !important;
+  }
+  .tabTitle {
+    font-size: 20px !important;
+    margin: 16px 0 12px !important;
+    font-weight: 600;
+    display: block !important;
+  }
+  .filter-options-container {
+    display: flex !important;
+    flex-wrap: wrap !important;
+    margin-top: 8px !important;
+    min-height: 40px !important; 
+  }
+  /* 仅针对展开后的筛选列表应用网格项样式，避免影响顶部 Tab */
+  .popupList .popupItem, 
+  .popupList .popupItem-active {
+    display: inline-flex !important;
+    align-items: center !important;
+    justify-content: center !important;
+    font-size: 20px !important;
+    line-height: 1.2 !important;
+    padding: 10px 24px !important;
+    margin: 0 16px 16px 0 !important;
+    border-radius: 8px !important;
+    border: 1px solid #CAD4E2 !important;
+    min-width: 140px !important;
+    height: auto !important;
+  }
+  .popupItem-active {
+    background-color: #1a62ce !important;
+    color: #fff !important;
+    border-color: #1a62ce !important;
+  }
+  .bottom-search .search-left, .bottom-search .search-right {
+    font-size: 20px !important;
+    height: 54px !important;
+    line-height: 54px !important;
+  }
+}
+/* #endif */
 </style>

packageRc/pages/index/index.vue

@@ -5,7 +5,7 @@
 -->
 <template>
   <!-- @scroll="handleScroll" @scrolltolower="scrollBottom" -->
-  <scroll-view :scroll-y="true" class="container h5-pc-container" :show-scrollbar="false" style="background-image: url(../../../packageRc/static/pageBgIndex.png);">
+  <scroll-view :scroll-y="true" class="container" :class="{'h5-pc-container': isH5}" :show-scrollbar="false" style="background-image: url(../../../packageRc/static/pageBgIndex.png);">
     <view style="padding: 40rpx 28rpx;">
          <!-- #ifdef MP-WEIXIN -->
       <view class="kinggang">
@@ -54,7 +54,7 @@
           <view v-for="(item, index) in jobList" :key="index" @click="nextDetail(item)" class="job-list">
           <view class="top-line">
             <view class="salary">{{item.minSalary}}-{{item.maxSalary}}/月</view>
-            <view class="time"><uni-icons color="#A2A2A2" type="info" size="12"></uni-icons>发布日期：{{ item.postingDate }}</view>
+            <view class="time"><uni-icons color="#A2A2A2" type="info" :size="uniIconSize"></uni-icons>发布日期：{{ item.postingDate }}</view>
           </view>
           <view class="title">{{ item.jobTitle }}</view>
           <view class="infos">
@@ -67,7 +67,7 @@
             <view>{{ item.jobLocation }}</view>
           </view>
           <view class="bottom-line">
-            <view><uni-icons color="#A2A2A2" type="person" size="12"></uni-icons>{{item.vacancies}}人</view>
+            <view><uni-icons color="#A2A2A2" type="person" :size="uniIconSize"></uni-icons>{{item.vacancies}}人</view>
             <view>{{ item.companyName }}</view>
           </view>
         </view>
@@ -78,7 +78,7 @@
       <template v-else>
         <view class="titles" style="justify-content: space-between;">
           <view class="title-item active"><view>政策专区</view></view>
-          <view @click="toPolicyList">{{'查看更多 >'}}</view>
+          <view class="more-link" @click="toPolicyList">{{'查看更多 >'}}</view>
         </view>
         <view v-for="(item, index) in policyList" :key="index" class="job-list" @click="toPolicyDetail(item)">
           <view class="sign">推荐</view>
@@ -90,8 +90,8 @@
             <view v-if="item.sourceUnit">{{item.sourceUnit}}</view>
           </view>
           <view class="bottom-line">
-            <view><uni-icons color="#A2A2A2" type="info" size="12"></uni-icons>发布日期：{{item.createTime}}</view>
+            <view class="time"><uni-icons color="#A2A2A2" type="info" :size="uniIconSize"></uni-icons>发布日期：{{item.createTime}}</view>
-            <view><uni-icons color="#A2A2A2" type="eye" size="12"></uni-icons>浏览量：{{item.viewNum || 0}}</view>
+            <view><uni-icons color="#A2A2A2" type="eye" :size="uniIconSize"></uni-icons>浏览量：{{item.viewNum || 0}}</view>
           </view>
         </view>
       </template>
@@ -103,6 +103,13 @@
 import { reactive, inject, watch, ref, onMounted, watchEffect, nextTick } from 'vue';
 const { $api, navTo, vacanciesTo, formatTotal, config } = inject('globalFunction');
 
+const isH5 = ref(false);
+const uniIconSize = ref(18);
+// #ifdef H5
+isH5.value = true;
+uniIconSize.value = 20;
+// #endif
+
 import { getPolicyList } from '@/packageRc/apiRc/policy';
 let policyList = ref([])
 function getPolicy() {
@@ -341,10 +348,10 @@ view{box-sizing: border-box;display: block;}
   position: relative;
   .sign{
     position: absolute;
-    font-size: 24rpx;
+    font-size: 28rpx;
     right: 0;
     top: 0;
-    padding: 4rpx 14rpx;
+    padding: 8rpx 20rpx;
     border: 1rpx solid #EC4827;
     background: rgba(227, 79, 49, 0.09);
     border-top-right-radius: 24rpx;
@@ -428,65 +435,109 @@ view{box-sizing: border-box;display: block;}
 /* #ifdef H5 */
 .h5-pc-container {
   & > view {
-    width: 80% !important;
+    width: 100% !important;
     margin: 0 auto !important;
-    padding-left: 0 !important;
+    padding-left: 32px !important;
-    padding-right: 0 !important;
+    padding-right: 32px !important;
+    padding-top: 0 !important; /* 彻底移除顶部补白 */
+    box-sizing: border-box !important;
   }
 
   .showtab {
-    margin-bottom: 80rpx;
+    margin-top: 0 !important; /* 移除卡片顶部间距 */
-    height: 300rpx;
+    margin-bottom: 120rpx;
+    height: 340rpx;
     .tabItem {
-      height: 300rpx !important;
+      height: 340rpx !important;
       image:first-child {
         width: 100%;
         height: 100%;
         object-fit: contain;
       }
     }
+    .activeImg {
+      width: 160rpx !important;
+      height: 20rpx !important;
+      bottom: -40rpx !important;
+    }
   }
 
   .tabs {
     margin-bottom: 80rpx;
     height: 120rpx;
+    border-radius: 20rpx !important;
+    background: #f8faff !important;
+    box-shadow: 0px 4rpx 15rpx rgba(0, 0, 0, 0.04);
     .tab {
-      line-height: 112rpx !important;
+      width: 33.3% !important;
-      font-size: 38rpx !important;
+      line-height: 120rpx !important;
-      font-weight: bold;
+      font-size: 20px !important;
+      border-radius: 16rpx !important;
     }
   }
 
   .titles {
-    margin-bottom: 80rpx;
+    margin-top: 40rpx;
+    margin-bottom: 60rpx;
     .title-item {
-      font-size: 42rpx !important;
+      font-size: 24px !important;
-      margin-right: 80rpx !important;
+      font-weight: 600;
+      margin-right: 100rpx !important;
       >view {
-        padding: 0 24rpx !important;
+        padding: 0 16rpx !important;
       }
+      &::after {
+        height: 24rpx !important;
+        bottom: -12rpx !important;
+        width: 110% !important;
+      }
+    }
+    .more-link {
+       font-size: 20px !important;
+       color: #A2A2A2;
     }
   }
 
   .job-list {
-    padding: 48rpx !important;
+    padding: 48rpx 40rpx !important;
-    margin-bottom: 40rpx !important;
+    margin-bottom: 32rpx !important;
+    border-radius: 24rpx !important;
+    border: 1px solid #f0f0f0;
+    box-shadow: 0px 2rpx 10rpx rgba(0, 0, 0, 0.02);
+    .sign {
+      font-size: 20px !important;
+      padding: 8rpx 20rpx !important;
+    }
   }
 
   .title {
-    font-size: 42rpx !important;
+    font-size: 24px !important;
+    font-weight: 600;
+    margin-bottom: 24rpx !important;
   }
   .infos view {
-    font-size: 34rpx !important;
+    font-size: 20px !important;
-    line-height: 56rpx !important;
+    line-height: 1.5 !important;
-    padding: 8rpx 24rpx !important;
+    padding: 10rpx 24rpx !important;
+    margin-bottom: 12rpx;
+    background: #f5f5f5 !important;
+    border-radius: 12rpx !important;
   }
   .salary {
-    font-size: 40rpx !important;
+    font-size: 24px !important;
+    font-weight: 600;
+  }
+  .time {
+    font-size: 20px !important; /* 发布日期字号放大 */
   }
   .bottom-line {
-    font-size: 32rpx !important;
+    font-size: 20px !important;
-    margin-top: 24rpx !important;
+    margin-top: 20rpx !important;
+  }
+  .view-more-btn {
+    font-size: 24px !important; /* 查看更多字号放大 */
+    padding: 20rpx 80rpx !important;
+    border-radius: 60rpx !important;
   }
 }
 /* #endif */

packageRc/pages/policy/policyDetail.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="page h5-pc-page" style="background-image: url(../../../packageRc/static/pageBg.png);">
+	<view class="page" :class="{'h5-pc-page': isH5}" style="background-image: url(../../../packageRc/static/pageBg.png);">
     <scroll-view :scroll-y="true" style="height: 100vh;position: relative;z-index: 1;" :show-scrollbar="false">
       <view class="input-outer-part"
         style="padding: 24rpx 32rpx 0;max-height: unset;">
@@ -102,9 +102,15 @@ import { getPolicyDetail } from "@/packageRc/apiRc/policy";
 			return {
         policyDetail: {},
 				loading: false,
+				isH5: false,
+				isPc: false,
 			}
 		},
 		onLoad(options) {
+			// #ifdef H5
+			this.isH5 = true;
+			this.isPc = true;
+			// #endif
       this.getPolicy(options.id);
 		},
 		onShow() {
@@ -360,29 +366,52 @@ import { getPolicyDetail } from "@/packageRc/apiRc/policy";
 		padding-right: 0 !important;
 	}
 	.title-line {
-		font-size: 52rpx !important;
+		font-size: 24px !important;
+    font-weight: 600;
     line-height: 1.4 !important;
 	}
 	.infos {
-		font-size: 38rpx !important;
+		font-size: 20px !important;
     line-height: 1.8 !important;
     .info {
       margin-top: 10rpx !important;
     }
 	}
 	.main-ceontent-list-item-title {
-		font-size: 42rpx !important;
+		font-size: 24px !important;
-		line-height: 60rpx !important;
+    font-weight: 600;
+		line-height: 1.6 !important;
     margin-bottom: 24rpx !important;
 	}
 	.main-ceontent-list-item-content {
-		font-size: 38rpx !important;
+		font-size: 20px !important;
-		line-height: 56rpx !important;
+		line-height: 1.6 !important;
     padding: 24rpx !important;
 	}
 	.tag {
-		font-size: 34rpx !important;
+		font-size: 20px !important;
 	}
+  .main-ceontent-list-title {
+    font-size: 24px !important;
+    font-weight: 600 !important;
+  }
+  .part-title {
+    font-size: 24px !important;
+    font-weight: 600 !important;
+  }
+  .part-info {
+    font-size: 20px !important;
+  }
+  .notice-list .title {
+    font-size: 24px !important;
+    font-weight: 600 !important;
+  }
+  .notice-content {
+    font-size: 20px !important;
+  }
+  .enclosure-item {
+    font-size: 20px !important;
+  }
 }
 /* #endif */
 </style>

packageRc/pages/policy/policyList.vue

@@ -1,6 +1,6 @@
 <template>
   <view
-    class="page h5-pc-page"
+    class="page" :class="{'h5-pc-page': isH5}"
     style="
       background-image: url(../../../packageRc/static/pageBg.png);
     "
@@ -44,7 +44,7 @@
         style="position: relative; padding: 32rpx 0; color: #000"
       >
         <!-- <view v-if="total" style="position: relative;padding-bottom: 16px;color: #000;"> -->
-        <text>共 {{ total }} 条</text>
+        <text class="total-count">共 {{ total }} 条</text>
       </view>
       <!-- <scroll-view :scroll-y="true" style="height: calc(100vh - 342rpx);position: relative;z-index: 1;" -->
       <scroll-view
@@ -69,14 +69,14 @@
             <view v-if="item.sourceUnit">{{ item.sourceUnit }}</view>
           </view>
           <view class="bottom-line">
-            <view
+            <view>
-              ><uni-icons color="#A2A2A2" type="info" size="12"></uni-icons
+              <uni-icons color="#A2A2A2" type="info" :size="uniIconSize"></uni-icons>
-              >发文日期：{{ item.publishTime }}</view
+              发文日期：{{ item.publishTime }}
-            >
+            </view>
-            <view
+            <view>
-              ><uni-icons color="#A2A2A2" type="eye" size="12"></uni-icons
+              <uni-icons color="#A2A2A2" type="eye" :size="uniIconSize"></uni-icons>
-              >浏览量：{{ item.viewNum || 0 }}</view
+              浏览量：{{ item.viewNum || 0 }}
-            >
+            </view>
           </view>
         </view>
         <view style="padding-bottom: 24rpx">
@@ -85,11 +85,8 @@
             src="https://rc.jinan.gov.cn/qcwjyH5/static/images/person/empty.png"
             style="width: 100%; display: block; margin: 0 auto"
           />
-          <view v-if="loading"
+          <view v-if="loading">
-            ><u-loading-icon></u-loading-icon>
+            <uni-load-more status="loading" :content-text="{contentrefresh: '加载中~'}"></uni-load-more>
-            <view style="text-align: center; color: #8e8e8e; font-size: 24rpx"
-              >加载中~</view
-            >
           </view>
           <view
             v-else-if="showMorePage"
@@ -116,6 +113,8 @@ export default {
   },
   data() {
     return {
+      uniIconSize: 18,
+      isH5: false,
       queryParams: {
         pageNum: 1,
         pageSize: 10,
@@ -130,6 +129,10 @@ export default {
     };
   },
   onLoad(options) {
+    // #ifdef H5
+    this.uniIconSize = 20;
+    this.isH5 = true;
+    // #endif
     this.queryParams.zclx = options.zclx;
     this.getCheckData();
   },
@@ -668,25 +671,62 @@ export default {
   width: 100% !important;
 
   .input-outer-part {
-    width: 80% !important;
+    width: 100% !important;
     margin: 0 auto !important;
-    padding-left: 0 !important;
+    padding-left: 32px !important;
-    padding-right: 0 !important;
+    padding-right: 32px !important;
+    box-sizing: border-box !important;
+  }
+
+  .total-count {
+    font-size: 20px !important;
+    margin: 20px 0 !important;
+    display: block;
+  }
+  .policy-list {
+    margin-bottom: 24px !important;
+    padding: 32px !important;
   }
   .title {
-    font-size: 48rpx !important;
+    font-size: 24px !important;
-    margin-bottom: 24rpx !important;
+    font-weight: 600;
+    margin-bottom: 16px !important;
   }
-  .infos view {
+  .infos {
-    font-size: 36rpx !important;
+    margin-bottom: 16px !important;
-    line-height: 56rpx !important;
+    view {
+      font-size: 18px !important;
+      line-height: 1.6 !important;
+      padding: 4px 12px !important;
+      margin-right: 12px !important;
+    }
   }
   .bottom-line {
-    font-size: 34rpx !important;
+    font-size: 18px !important;
-    margin-top: 24rpx !important;
+    margin-top: 16px !important;
+    display: flex;
+    align-items: center;
+    border-top: 1px solid #f0f0f0;
+    padding-top: 16px;
+  }
+  .bottom-line uni-icons {
+    font-size: 20px !important;
+    margin-right: 8rpx;
   }
   input {
-    font-size: 36rpx !important;
+    font-size: 20px !important;
+    height: 48px !important;
+  }
+  .search-line {
+    height: 80rpx !important;
+  }
+  .policy-list .title image {
+    width: 56rpx !important;
+    height: 56rpx !important;
+    margin-right: 16rpx !important;
+  }
+  .loading-text {
+    font-size: 20px !important;
   }
 }
 /* #endif */

pages/index/components/index-one.vue

@@ -478,6 +478,13 @@
         </view>
         <!-- 筛选 -->
         <select-filter ref="selectFilterModel" />
+        <!-- 新筛选页面 -->
+        <new-filter-page 
+            :show="showNewFilter" 
+            @confirm="handleNewFilterConfirm" 
+            @close="handleNewFilterClose"
+            @update:show="(value) => showNewFilter = value"
+        />
 
         <!-- 微信授权登录弹窗 -->
         <WxAuthLogin ref="wxAuthLoginRef" @success="handleLoginSuccess" />
@@ -601,6 +608,7 @@ import useDictStore from '@/stores/useDictStore';
 const { getTransformChildren, oneDictData, dictLabel: getDictLabel, industryLabel } = useDictStore();
 import useLocationStore from '@/stores/useLocationStore';
 import selectFilter from '@/components/selectFilter/selectFilter.vue';
+import newFilterPage from '@/components/new-filter-page/new-filter-page.vue';
 import { useRecommedIndexedDBStore, jobRecommender } from '@/stores/useRecommedIndexedDBStore.js';
 import { useScrollDirection } from '@/hook/useScrollDirection';
 import { useColumnCount } from '@/hook/useColumnCount';
@@ -724,6 +732,7 @@ const inputText = ref('');
 const showFilter = ref(false);
 const selectFilterModel = ref(null);
 const showModel = ref(false);
+const showNewFilter = ref(false);
 // 选中的城市
 const selectedCity = ref({ code: '', name: '' });
 const rangeOptions = ref([
@@ -882,14 +891,7 @@ const handleLoginSuccess = () => {
     getIsFourLevelLinkagePurview()
 };
 // H5环境下从URL获取token并自动登录
-onLoad(() => {
+// onLoad 函数已移至下方，包含筛选参数处理
-    // #ifdef H5
-        const token = uni.getStorageSync('zkr-token');
-        if (token) {
-            useUserStore().loginSetToken(token);
-        }
-    // #endif
-});
 
 // 处理附近工作点击
 const handleNearbyClick = (options  ) => {
@@ -1088,34 +1090,65 @@ function navToService(serviceType) {
 
 function openFilter() {
     isInteractingWithFilter.value = true;
-    showFilter.value = true;
+    showNewFilter.value = true;
     emits('onShowTabbar', false);
-    selectFilterModel.value?.open({
+}
-        title: '筛选',
+
-        maskClick: true,
+function handleNewFilterConfirm(values) {
-        success: (values) => {
+    pageState.search = {
-            pageState.search = {
+        ...pageState.search,
-                ...pageState.search,
+    };
-            };
+    for (const [key, value] of Object.entries(values)) {
-            for (const [key, value] of Object.entries(values)) {
+        // 特殊处理岗位类型，直接传递数字值
-                // 特殊处理岗位类型，直接传递数字值
+        if (key === 'jobType') {
+            pageState.search.type = value;
+        } else if (value) {
+            pageState.search[key] = value;
+        } else {
+            // 如果值为空，删除该搜索条件
+            delete pageState.search[key];
+        }
+    }
+    showNewFilter.value = false;
+    getJobList('refresh');
+    // 短暂延迟后解除交互锁，避免数据刷新导致顶部区域回弹
+    setTimeout(() => { isInteractingWithFilter.value = false; }, 400);
+    emits('onShowTabbar', true);
+}
+
+// 监听页面加载，接收筛选参数
+onLoad((options) => {
+    // #ifdef H5
+        const token = uni.getStorageSync('zkr-token');
+        if (token) {
+            useUserStore().loginSetToken(token);
+        }
+    // #endif
+    
+    // 接收从筛选页面传递过来的参数
+    if (options.filterParams) {
+        try {
+            const filterParams = JSON.parse(options.filterParams);
+            console.log('filterParams:', filterParams);
+            for (const [key, value] of Object.entries(filterParams)) {
                 if (key === 'jobType') {
-                    pageState.search.type = value.join(',');
+                    pageState.search.type = value;
-                } else {
+                } else if (value) {
-                    pageState.search[key] = value.join(',');
+                    pageState.search[key] = value;
                 }
             }
-            showFilter.value = false;
+            console.log('pageState.search:', pageState.search);
             getJobList('refresh');
-            // 短暂延迟后解除交互锁，避免数据刷新导致顶部区域回弹
+        } catch (error) {
-            setTimeout(() => { isInteractingWithFilter.value = false; }, 400);
+            console.error('解析筛选参数失败:', error);
-        },
+        }
-        cancel: () => {
+    }
-            showFilter.value = false;
+});
-            emits('onShowTabbar', true);
+
-            setTimeout(() => { isInteractingWithFilter.value = false; }, 200);
+function handleNewFilterClose() {
-        },
+    showNewFilter.value = false;
-    });
+    emits('onShowTabbar', true);
+    setTimeout(() => { isInteractingWithFilter.value = false; }, 200);
 }
 
 function handleFilterConfirm(e) {

stores/useDictStore.js

@@ -74,6 +74,17 @@ const useDictStore = defineStore("dict", () => {
             getIndustryDict() // 获取行业
         } catch (error) {
             console.error('Error fetching dictionary data:', error);
+            // 确保即使出错也能返回空数组
+            if (!dictType && !dictName) {
+                state.education = [];
+                state.experience = [];
+                state.area = [];
+                state.scale = [];
+                state.sex = [];
+                state.affiliation = [];
+                state.nature = [];
+                state.noticeType = [];
+            }
         }
     };
 
@@ -129,7 +140,7 @@ const useDictStore = defineStore("dict", () => {
             return {
                 label: title,
                 key: key || dictType,
-                options: state[dictType],
+                options: state[dictType] || [],
             }
         }
         return null

utilsRc/config.js

@@ -11,6 +11,7 @@ let exports = {
 	// ========== baseUrl 配置方式选择 ==========
 	// 方式1：硬编码baseUrl（main分支使用，合并到main时不会影响现有功能）
 	baseUrl: 'https://www.xjksly.cn/sdrc-api', // 正式环境在济南人才上部署（不要轻易连接）
+	// baseUrl: 'http://cffe7966.natappfree.cc', // 正式环境在济南人才上部署（不要轻易连接）
 	// baseUrl: 'http://10.160.0.5:8907', // 开发环境
 	// baseUrl: 'http://172.20.1.48:8903', // 开发环境