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,426 @@
+<template>
+    <view v-if="show" class="filter-container">
+        <!-- 左侧标签页 -->
+        <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-right">
+            <!-- 内容区域 -->
+            <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>
+    </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: row;
+}
+
+.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 {
+    width: 200rpx;
+    border-right: 1rpx solid #eee;
+    background-color: #f8f8f8;
+    display: flex;
+    flex-direction: column;
+
+    .tab-item {
+        height: 100rpx;
+        line-height: 100rpx;
+        text-align: center;
+        font-size: 28rpx;
+        color: #666;
+        position: relative;
+        transition: all 0.3s ease;
+
+        &.active {
+            color: #256BFA;
+            font-weight: 600;
+            background-color: #fff;
+            
+            &::after {
+                content: '';
+                position: absolute;
+                left: 0;
+                top: 25%;
+                width: 4rpx;
+                height: 50%;
+                background-color: #256BFA;
+                border-radius: 2rpx;
+            }
+        }
+
+        &:active {
+            background-color: rgba(37, 107, 250, 0.05);
+        }
+    }
+}
+
+.filter-right {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    position: relative;
+}
+
+.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/chat/chat.vue

@@ -25,16 +25,20 @@
                 <scroll-view scroll-y :show-scrollbar="false" class="chat-scroll">
                     <view
                         class="drawer-rows"
-                        @click="changeDialogue(item)"
                         v-for="(item, index) in filteredList"
                         :key="item.id"
                     >
-                        <view
+                        <view v-if="!item.isTitle" class="drawer-row-container">
-                            v-if="!item.isTitle"
+                            <view
-                            class="drawer-row-list"
+                                class="drawer-row-list"
-                            :class="{ 'drawer-row-active': item.sessionId === chatSessionID }"
+                                :class="{ 'drawer-row-active': item.sessionId === chatSessionID }"
-                        >
+                                @click="changeDialogue(item)"
-                            {{ item.title }}
+                            >
+                                {{ item.title }}
+                            </view>
+                            <view class="drawer-row-delete" @click.stop="deleteDialogue(item)">
+                                <uni-icons type="trash" size="24" color="#FF4D4F"></uni-icons>
+                            </view>
                         </view>
                         <view class="drawer-row-title" v-else>
                             {{ item.title }}
@@ -166,6 +170,21 @@ const changeDialogue = (item) => {
         });
     }
 };
+
+const deleteDialogue = (item) => {
+    if (item.sessionId) {
+        uni.showModal({
+            content: '确定删除该会话吗？',
+            success(res) {
+                if (res.confirm) {
+                    useChatGroupDBStore().deleteDialogue(item.sessionId);
+                    $api.msg('会话删除成功');
+                }
+            }
+        });
+    }
+};
+
 function updateSetting() {
     $api.msg('该功能正在开发中，敬请期待后续更新！');
 }
@@ -271,33 +290,56 @@ footer-height = 98rpx
         flex: 1
         overflow: hidden
     .drawer-rows
-        padding: 0 28rpx;
+            padding: 0 28rpx;
-        // border-bottom: 2rpx dashed #e8e8e8
+            // border-bottom: 2rpx dashed #e8e8e8
-        overflow:hidden; //超出的文本隐藏
+            overflow:hidden; //超出的文本隐藏
-        text-overflow:ellipsis; //溢出用省略号显示
+            text-overflow:ellipsis; //溢出用省略号显示
-        white-space:nowrap; //溢出不换行
+            white-space:nowrap; //溢出不换行
-        .drawer-row-title
+            .drawer-row-title
-            color: #A6A6A6;
+                color: #A6A6A6;
-            font-weight: 500;
+                font-weight: 500;
-            font-weight: bold;
+                font-weight: bold;
-            font-size: 28rpx
+                font-size: 28rpx
-            padding: 0 24rpx
+                padding: 0 24rpx
-            margin-top: 50rpx
+                margin-top: 50rpx
-            margin-bottom: 16rpx
+                margin-bottom: 16rpx
-        .drawer-row-list
+            .drawer-row-container
-            height: 66rpx;
+                display: flex
-            line-height: 66rpx
+                align-items: center
-            font-size: 28rpx
+                justify-content: space-between
-            overflow: hidden
+                padding: 0 24rpx
-            text-overflow: ellipsis
+                height: 66rpx
-            font-weight: 500;
+            
-            color: #595959;
+            .drawer-row-list
-            padding: 0 24rpx
+                flex: 1
-        .drawer-row-active
+                height: 66rpx
-        .drawer-row-list:active
+                line-height: 66rpx
-            color: #333333;
+                font-size: 28rpx
-            background: #F6F6F6;
+                overflow: hidden
-            border-radius: 16rpx 16rpx 16rpx 16rpx;
+                text-overflow: ellipsis
+                font-weight: 500;
+                color: #595959;
+            
+            .drawer-row-delete
+                margin-left: 20rpx
+                display: flex
+                align-items: center
+                justify-content: center
+                padding: 10rpx
+                opacity: 0.6
+                &:hover
+                &:active
+                    opacity: 1
+            
+            .drawer-row-active
+                color: #333333;
+                background: #F6F6F6;
+                border-radius: 16rpx 16rpx 16rpx 16rpx;
+            
+            .drawer-row-list:active
+                color: #333333;
+                background: #F6F6F6;
+                border-radius: 16rpx 16rpx 16rpx 16rpx;
 
 
 /* 主要内容区域 */

packageA/pages/chat/components/ai-paging.vue

@@ -1,7 +1,18 @@
 <template>
     <view class="chat-container">
+        <!-- 选择模式操作栏 -->
+        <view v-if="isSelectMode" class="select-mode-header">
+            <view class="select-header-left">
+                <view class="select-count">{{ selectedMessages.length }} 条已选择</view>
+                <view class="select-all" @click="selectAllMessages">全选</view>
+            </view>
+            <view class="select-header-right">
+                <view class="cancel-btn" @click="exitSelectMode">取消</view>
+                <view class="delete-btn" @click="deleteSelectedMessages" :disabled="selectedMessages.length === 0">删除</view>
+            </view>
+        </view>
         <!-- Tab切换 -->
-        <view class="tab-container">
+        <view v-else class="tab-container">
             <view 
                 class="tab-item" 
                 :class="{ active: activeTab === 'policy' }"
@@ -74,7 +85,15 @@
                     :id="'msg-' + index"
                     class="chat-item"
                     :class="{ self: msg.self }"
+                    @longpress="handleLongPress(msg, index)"
+                    @click="isSelectMode ? toggleSelectMessage(index) : null"
                 >
+                    <!-- 选择框 -->
+                    <view v-if="isSelectMode" class="message-checkbox">
+                        <view class="checkbox" :class="{ checked: selectedMessages.includes(index) }">
+                            <uni-icons v-if="selectedMessages.includes(index)" type="success" size="24" color="#FFFFFF"></uni-icons>
+                        </view>
+                    </view>
                     <view class="message" v-if="msg.self">
                         <view class="msg-filecontent" v-if="msg.files.length">
                             <view
@@ -96,7 +115,7 @@
                                 :content="msg.displayText"
                                 :typing="isTyping && messages.length - 1 === index"
                             ></md-render>
-                            <view class="message-controll" v-show="showControll(index)">
+                            <view class="message-controll" v-show="showControll(index) && !isSelectMode">
                                 <view class="controll-left">
                                     <image
                                         class="controll-icon btn-light"
@@ -134,7 +153,7 @@
                         <!-- guess -->
                         <view
                             class="guess"
-                            v-if="showGuess && !msg.self && messages.length - 1 === index && msg.displayText"
+                            v-if="showGuess && !msg.self && messages.length - 1 === index && msg.displayText && !isSelectMode"
                         >
                             <view class="gulist">
                                 <view
@@ -198,7 +217,7 @@
                     class="input"
                     @confirm="sendMessage"
                     :disabled="isTyping"
-                    :adjust-position="false"
+                    :adjust-position="true"
                     placeholder="请输入您的职位名称、薪资要求、岗位地址"
                     v-show="!isVoice"
                 />
@@ -386,6 +405,9 @@ const cancelThreshold = 100;
 const speechIndex = ref(0);
 const isAudioPermission = ref(false);
 const feebackData = ref(null);
+// 删除功能相关状态
+const isSelectMode = ref(false);
+const selectedMessages = ref([]);
 // ref for DOM element
 const voiceBtn = ref(null);
 const feeback = ref(null);
@@ -942,6 +964,88 @@ function shouldShowMessage(msg) {
     }
 }
 
+// 长按事件处理函数
+function handleLongPress(msg, index) {
+    isSelectMode.value = true;
+    selectedMessages.value = [index];
+    
+    // 如果长按的是用户消息，同时选中对应的AI回复
+    if (msg.self) {
+        const nextIndex = index + 1;
+        if (nextIndex < messages.value.length && !messages.value[nextIndex].self) {
+            selectedMessages.value.push(nextIndex);
+        }
+    }
+}
+
+// 选择/取消选择消息
+function toggleSelectMessage(index) {
+    const msg = messages.value[index];
+    const idx = selectedMessages.value.indexOf(index);
+    
+    if (idx > -1) {
+        // 取消选择
+        selectedMessages.value.splice(idx, 1);
+        
+        // 如果取消选择的是用户消息，同时取消选择对应的AI回复
+        if (msg.self) {
+            const nextIndex = index + 1;
+            if (nextIndex < messages.value.length && !messages.value[nextIndex].self) {
+                const aiIdx = selectedMessages.value.indexOf(nextIndex);
+                if (aiIdx > -1) {
+                    selectedMessages.value.splice(aiIdx, 1);
+                }
+            }
+        }
+        
+        if (selectedMessages.value.length === 0) {
+            isSelectMode.value = false;
+        }
+    } else {
+        // 选择消息
+        selectedMessages.value.push(index);
+        
+        // 如果选择的是用户消息，同时选择对应的AI回复
+        if (msg.self) {
+            const nextIndex = index + 1;
+            if (nextIndex < messages.value.length && !messages.value[nextIndex].self) {
+                if (!selectedMessages.value.includes(nextIndex)) {
+                    selectedMessages.value.push(nextIndex);
+                }
+            }
+        }
+    }
+}
+
+// 退出选择模式
+function exitSelectMode() {
+    isSelectMode.value = false;
+    selectedMessages.value = [];
+}
+
+// 全选消息
+function selectAllMessages() {
+    selectedMessages.value = messages.value.map((_, index) => index);
+}
+
+// 删除选中消息
+function deleteSelectedMessages() {
+    if (selectedMessages.value.length === 0) return;
+    
+    uni.showModal({
+        content: `确定删除${selectedMessages.value.length}条消息吗？`,
+        success(res) {
+            if (res.confirm) {
+                // 调用store中的删除方法
+                useChatGroupDBStore().deleteMessages(selectedMessages.value);
+                // 退出选择模式
+                exitSelectMode();
+                $api.msg('消息删除成功');
+            }
+        }
+    });
+}
+
 defineExpose({ scrollToBottom, closeGuess, closeFile, changeQueries, handleTouchCancel, switchTab });
 </script>
 
@@ -1473,4 +1577,88 @@ image-margin-top = 40rpx
 .tab-item:active {
     background-color: #F5F5F5;
 }
+
+/* 选择模式样式 */
+.select-mode-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 44rpx;
+    height: 88rpx;
+    background: #FFFFFF;
+    border-bottom: 2rpx solid #F4F4F4;
+    z-index: 10;
+}
+
+.select-header-left {
+    display: flex;
+    align-items: center;
+    gap: 24rpx;
+}
+
+.select-count {
+    font-size: 28rpx;
+    color: #333333;
+    font-weight: 500;
+}
+
+.select-all {
+    font-size: 28rpx;
+    color: #256BFA;
+    font-weight: 500;
+}
+
+.select-header-right {
+    display: flex;
+    align-items: center;
+    gap: 32rpx;
+}
+
+.cancel-btn {
+    font-size: 28rpx;
+    color: #666666;
+    font-weight: 500;
+}
+
+.delete-btn {
+    font-size: 28rpx;
+    color: #FF4444;
+    font-weight: 500;
+}
+
+.delete-btn:disabled {
+    color: #CCCCCC;
+}
+
+/* 消息选择框样式 */
+.message-checkbox {
+    margin-right: 12rpx;
+    display: flex;
+    align-items: flex-start;
+    padding-top: 8rpx;
+}
+
+.checkbox {
+    width: 40rpx;
+    height: 40rpx;
+    border: 2rpx solid #CCCCCC;
+    border-radius: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.checkbox.checked {
+    background-color: #256BFA;
+    border-color: #256BFA;
+}
+
+/* 调整消息项布局，为选择框留出空间 */
+.chat-item {
+    position: relative;
+}
+
+.chat-item .message {
+    flex: 1;
+}
 </style>

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) {

packageA/pages/post/post.vue

@@ -102,7 +102,7 @@
                 </view>
             </view>
             <!-- 公司信息 -->
-            <view class="content-card">
+            <view class="content-card" v-if="jobInfo.companyId">
                 <view class="card-title">
                     <text class="title">公司信息</text>
                     <text

packageB/priority/recordsManagement.vue

@@ -78,7 +78,10 @@
 						</view>
 						<view class="search-item">
 						  <text class="label">所属区域：</text>
-						  <uni-data-select v-model="formData.filterSelectDeptIds" :localdata="executeDeptOptions" placeholder="请选择所属区域" @change="onExecuteDeptChange"></uni-data-select>
+						  <uni-data-picker ref="picker" class="picker" placeholder="请选择所属区域" popup-title="请选择所属区域" :localdata="regions" v-model="formData.deptTags"
+						  					  @change="onchange" >
+						  </uni-data-picker>
+						  <!-- <uni-data-select v-model="formData.filterSelectDeptIds" :localdata="executeDeptOptions" placeholder="请选择所属区域" @change="onExecuteDeptChange"></uni-data-select> -->
 						</view>
 						<view class="search-item">
 						  <text class="label">帮扶时间：</text>
@@ -255,6 +258,9 @@ const getBackgroundStyle = (imageName) => ({
     backgroundPosition: 'center', // 居中
     backgroundRepeat: 'no-repeat'
 });
+// 所属区域选项（可根据实际替换为动态数据）
+const regions = ref([])
+const picker = ref(null)
 function listNotParam(){
 	let header={
 		'Authorization':uni.getStorageSync('Padmin-Token'),
@@ -263,14 +269,15 @@ function listNotParam(){
 	let params={}
 	$api.myRequest('/dispatch/dept/listNotParam',params,'get',9100,header).then((resData) => {
 		if(resData && resData.code == 200){
-			resData.data.forEach(item=>{
+			loadLevelData(resData.data[0].parentId);
-				const obj = {
+			// resData.data.forEach(item=>{
-				    value: item.deptId,
+			// 	const obj = {
-				    text: item.deptName,
+			// 	    value: item.deptId,
-					ancestors:item.ancestors
+			// 	    text: item.deptName,
-				}
+			// 		ancestors:item.ancestors
-				executeDeptOptions.value.push(obj)
+			// 	}
-			})
+			// 	executeDeptOptions.value.push(obj)
+			// })
 		}
 	});
 }
@@ -348,7 +355,8 @@ function onExecuteDeptChange(e){
 	formData.executeDeptId=e
 }
 function handleSearch(){
-	formData.pageSize=1
+	formData.pageNum=1
+	console.log("formData",formData)
 	dataList.value=[]
 	getDataList()
 }
@@ -358,6 +366,7 @@ function getDataList(){
 		'Content-Type': "application/x-www-form-urlencoded"
 	}
 	$api.myRequest('/dispatch/assist/records/pageRecords',formData,'get',9100,header).then((resData) => {
+		console.log("resData",resData)
 		resData.rows.forEach(item=>{
 			item.task_type=getabelByValue(item.task_type,taskTypeOptions)
 		})
@@ -422,6 +431,86 @@ function scrollBottom(){
 		formData.pageNum++
 		getDataList()
 	}
+}
+ // 加载某一级的数据（parentId 为空表示根）
+async function loadLevelData(parentId,node) {
+    let header = {
+		'Authorization': uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	};
+	let params = { parentId };
+
+	try {
+		const resData = await $api.myRequest('/dispatch/dept/list', params, 'get', 9100, header);
+		if(resData.data.length==0){
+			picker.value.hide()
+			return
+		}
+		const formatted = (resData.data || []).map(item => ({
+			text: item.deptName, 
+			value: item.tags,
+			deptId: item.deptId,
+			children: [] 
+		}));
+		if(node){
+			injectChildren(parentId, formatted);
+		}else{
+			regions.value=formatted
+		}
+	} catch (error) {
+		console.error("加载部门数据失败:", error);
+		// uni.showToast({ title: '加载失败', icon: 'none' });
+	}
+}
+// 将子级数据注入到对应的父节点
+function injectChildren(parentValue, childrenData) {
+    const findAndInject = (nodes) => {
+		for (let node of nodes) {
+			if (node.deptId === parentValue) {
+				// 如果 children 已存在且非空，避免重复加载
+				if (!node.children || node.children.length === 0) {
+					node.children = childrenData;
+				}
+				return true;
+			}
+			if (node.children && node.children.length > 0) {
+				if (findAndInject(node.children)) return true;
+			}
+		}
+		return false;
+	}
+
+	findAndInject(regions.value);
+  // 强制更新
+}
+// 当用户选择时触发（注意：change 在每级选择后都会触发）
+function onchange(e) {
+	const selectedValues = e.detail.value;
+	// formData.deptId=selectedValues.map(item => item.value).join(',');
+	if (selectedValues.length === 0) return;
+	// 获取最后一级选中的 value
+	const lastSelectedValue = selectedValues[selectedValues.length - 1];
+	// 查找该节点是否有 children，如果没有则尝试加载
+	const node = findNodeByValue(regions.value, lastSelectedValue);
+	if (node && (!node.children || node.children.length === 0)) {
+		// 检查接口是否还有下一级（可通过接口返回判断，或先尝试加载）
+		// 这里我们直接尝试加载下一级
+		loadLevelData(node.deptId , node);
+		picker.value.show()
+	}
+}
+// 工具函数：根据 value 查找节点
+function findNodeByValue(nodes, value) {
+	for (let node of nodes) {
+		if (node.value === value.value) {
+			return node;
+		}
+		if (node.children && node.children.length > 0) {
+			const found = findNodeByValue(node.children, value);
+			if (found) return found;
+		}
+	}
+	return null;
 }
 onShow(()=>{
 })

packageB/priority/targetPersonnelChoice.vue

@@ -28,7 +28,10 @@
 						</view>
 						<view class="search-item">
 						  <text class="label">所属区域：</text>
-						  <uni-data-select v-model="formData.deptTags" :localdata="taskTypeOptions" placeholder="请选择所属区域" @change="onTaskTypeChange"></uni-data-select>
+						  <uni-data-picker ref="picker" class="picker" placeholder="请选择所属区域" popup-title="请选择所属区域" :localdata="regions" v-model="formData.deptTags"
+						  					  @change="onchange" >
+						  </uni-data-picker>
+						  <!-- <uni-data-select v-model="formData.deptTags" :localdata="taskTypeOptions" placeholder="请选择所属区域" @change="onTaskTypeChange"></uni-data-select> -->
 						</view>	
 					</view>
 				</view>
@@ -221,6 +224,109 @@ const getBackgroundStyle = (imageName) => ({
     backgroundRepeat: 'no-repeat'
 });
 const emit = defineEmits(['update:showVue'])
+// 所属区域选项（可根据实际替换为动态数据）
+const regions = ref([])
+const picker = ref(null)
+function listNotParam(){
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={}
+	$api.myRequest('/dispatch/dept/listNotParam',params,'get',9100,header).then((resData) => {
+		if(resData && resData.code == 200){
+			loadLevelData(resData.data[0].parentId);
+			// resData.data.forEach(item=>{
+			// 	const obj = {
+			// 	    value: item.deptId,
+			// 	    text: item.deptName,
+			// 		ancestors:item.ancestors
+			// 	}
+			// 	executeDeptOptions.value.push(obj)
+			// })
+		}
+	});
+}
+ // 加载某一级的数据（parentId 为空表示根）
+async function loadLevelData(parentId,node) {
+    let header = {
+		'Authorization': uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	};
+	let params = { parentId };
+
+	try {
+		const resData = await $api.myRequest('/dispatch/dept/list', params, 'get', 9100, header);
+		if(resData.data.length==0){
+			picker.value.hide()
+			return
+		}
+		const formatted = (resData.data || []).map(item => ({
+			text: item.deptName, 
+			value: item.tags,
+			deptId: item.deptId,
+			children: [] 
+		}));
+		if(node){
+			injectChildren(parentId, formatted);
+		}else{
+			regions.value=formatted
+		}
+	} catch (error) {
+		console.error("加载部门数据失败:", error);
+		// uni.showToast({ title: '加载失败', icon: 'none' });
+	}
+}
+// 将子级数据注入到对应的父节点
+function injectChildren(parentValue, childrenData) {
+    const findAndInject = (nodes) => {
+		for (let node of nodes) {
+			if (node.deptId === parentValue) {
+				// 如果 children 已存在且非空，避免重复加载
+				if (!node.children || node.children.length === 0) {
+					node.children = childrenData;
+				}
+				return true;
+			}
+			if (node.children && node.children.length > 0) {
+				if (findAndInject(node.children)) return true;
+			}
+		}
+		return false;
+	}
+
+	findAndInject(regions.value);
+  // 强制更新
+}
+// 当用户选择时触发（注意：change 在每级选择后都会触发）
+function onchange(e) {
+	const selectedValues = e.detail.value;
+	// formData.deptId=selectedValues.map(item => item.value).join(',');
+	if (selectedValues.length === 0) return;
+	// 获取最后一级选中的 value
+	const lastSelectedValue = selectedValues[selectedValues.length - 1];
+	// 查找该节点是否有 children，如果没有则尝试加载
+	const node = findNodeByValue(regions.value, lastSelectedValue);
+	if (node && (!node.children || node.children.length === 0)) {
+		// 检查接口是否还有下一级（可通过接口返回判断，或先尝试加载）
+		// 这里我们直接尝试加载下一级
+		loadLevelData(node.deptId , node);
+		picker.value.show()
+	}
+}
+// 工具函数：根据 value 查找节点
+function findNodeByValue(nodes, value) {
+	for (let node of nodes) {
+		if (node.value === value.value) {
+			return node;
+		}
+		if (node.children && node.children.length > 0) {
+			const found = findNodeByValue(node.children, value);
+			if (found) return found;
+		}
+	}
+	return null;
+}
 function getDictionary(){
 	$api.myRequest('/system/public/dict/data/type/person_database_status').then((resData) => {
 		if(resData && resData.code == 200){
@@ -348,6 +454,7 @@ function scrollBottom(){
 	}
 }
 onLoad((options) => {
+	listNotParam()
 	if(options.allocationId){
 		formData.allocationId=options.allocationId
 	}

packageCa/job/index.vue

@@ -47,7 +47,6 @@
 			return {
 				kw: "", //搜索关键
 				user: uni.getStorageSync("CAuserInfo").user,
-				winHeight: wx.getWindowInfo().windowHeight,
 				jobDataList: [],
 				jobList,
 				scrollTop: 0, //tab标题的滚动条位置

packageCa/search/search.vue

@@ -8,10 +8,10 @@
 						<text class="icon icon-101"></text>
 						<text class="title">职业测评</text>
 					</view>
-					<view  class="item" @click="navDetail(2)">
+					<!-- <view  class="item" @click="navDetail(2)">
 						<text class="icon icon-102"></text>
 						<text class="title">测评报告</text>
-					</view>
+					</view> -->
 				</view>
 				<view class="head-title">探索中心</view>
 				<view class="nav-block">
@@ -68,8 +68,7 @@
 			// 演示入
 			navDetail(index){
 				switch (index){
-					case 1:
+					case 1: {
-					case 2: {
 						uni.navigateTo({
 							url: "/packageCa/pagesTest/testList"
 						})

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">
@@ -32,12 +32,13 @@
 					class="popupList"
 					v-for="(item, index) in newCkeckData"
 					:key="index"
+					v-show="!item.hidden"
 				>
 					<view class="tabTitle">
 						{{ item.name }}
 					</view>
 					<view
-						class="dispalyF"
+						class="dispalyF filter-options-container"
 						:style="[
 							{
 								position: 'sticky',
@@ -47,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">
 						清空
@@ -77,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>
 
@@ -102,7 +94,8 @@ export default {
 			params: "",
 			fijItem: "",
 			outData: [],
-			nickName: ''
+			nickName: '',
+			isH5: false
 		};
 	},
 	watch: {
@@ -114,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: {
@@ -256,7 +257,7 @@ export default {
 	overflow: hidden;
 	flex-wrap: nowrap;
 	width: 100%;
-	z-index: 9;
+	z-index: 105; /* 增加层级，确保在筛选条上方而不被遮挡 */
 
 	.tabItem {
 		line-height: 56rpx;
@@ -279,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 {
@@ -308,7 +309,6 @@ export default {
 		border: 1rpx solid #CAD4E2;
 		box-sizing: border-box;
 	}
-
 	.popupItem-active {
 		padding: 0 32rpx;
 		text-align: center;
@@ -328,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;
@@ -371,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" 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() {
@@ -133,6 +140,8 @@ onMounted(()=>{
   getPolicy();
 })
 
+
+
 function goCa(){
     if (checkLogin()) {
         const userInfo = uni.getStorageSync('userInfo')
@@ -240,6 +249,14 @@ function nextDetail(job) {
 </script>
 
 <style lang="less" scoped>
+/* 隐藏滚动条 */
+::-webkit-scrollbar {
+  display: none;
+  width: 0 !important;
+  height: 0 !important;
+  -webkit-appearance: none;
+  background: transparent;
+}
 view{box-sizing: border-box;display: block;}
 .container{
   background-color: #F4F4F4;background-position: top center;background-size: 100% auto;
@@ -331,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;
@@ -414,4 +431,114 @@ view{box-sizing: border-box;display: block;}
     transform: translateX(50%);
   }
 }
+
+/* #ifdef H5 */
+.h5-pc-container {
+  & > view {
+    width: 100% !important;
+    margin: 0 auto !important;
+    padding-left: 32px !important;
+    padding-right: 32px !important;
+    padding-top: 0 !important; /* 彻底移除顶部补白 */
+    box-sizing: border-box !important;
+  }
+
+  .showtab {
+    margin-top: 0 !important; /* 移除卡片顶部间距 */
+    margin-bottom: 120rpx;
+    height: 340rpx;
+    .tabItem {
+      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 {
+      width: 33.3% !important;
+      line-height: 120rpx !important;
+      font-size: 20px !important;
+      border-radius: 16rpx !important;
+    }
+  }
+
+  .titles {
+    margin-top: 40rpx;
+    margin-bottom: 60rpx;
+    .title-item {
+      font-size: 24px !important;
+      font-weight: 600;
+      margin-right: 100rpx !important;
+      >view {
+        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 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: 24px !important;
+    font-weight: 600;
+    margin-bottom: 24rpx !important;
+  }
+  .infos view {
+    font-size: 20px !important;
+    line-height: 1.5 !important;
+    padding: 10rpx 24rpx !important;
+    margin-bottom: 12rpx;
+    background: #f5f5f5 !important;
+    border-radius: 12rpx !important;
+  }
+  .salary {
+    font-size: 24px !important;
+    font-weight: 600;
+  }
+  .time {
+    font-size: 20px !important; /* 发布日期字号放大 */
+  }
+  .bottom-line {
+    font-size: 20px !important;
+    margin-top: 20rpx !important;
+  }
+  .view-more-btn {
+    font-size: 24px !important; /* 查看更多字号放大 */
+    padding: 20rpx 80rpx !important;
+    border-radius: 60rpx !important;
+  }
+}
+/* #endif */
 </style>

packageRc/pages/policy/policyDetail.vue

@@ -1,6 +1,6 @@
 <template>
-	<view class="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;">
+    <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;">
         <view class="basic-info-content-main" v-if="!loading">
@@ -31,8 +31,8 @@
                 class="main-ceontent-list-item"
                 v-if="policyDetail.applicableObjects"
               >
-                <view class="main-ceontent-list-item-title">政策对象</view>
+                <view :class="['main-ceontent-list-item-title', isPc ? 'pc-main-ceontent-list-item-title' : '']">政策对象</view>
-                <view class="main-ceontent-list-item-content">
+                <view :class="['main-ceontent-list-item-content', isPc ? 'pc-main-ceontent-list-item-content' : '']">
                   <span
                     v-if="policyDetail.applicableObjects"
                     v-html="policyDetail.applicableObjects"
@@ -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() {
@@ -113,6 +119,23 @@ import { getPolicyDetail } from "@/packageRc/apiRc/policy";
 			getPolicy(id) {
         getPolicyDetail({id}).then(res => {
           this.policyDetail = res.data
+        }).catch(err => {
+          // #ifdef H5 || APP-PLUS
+          // 仅在测试环境下，注入大段文本验证排版
+          this.policyDetail = {
+            zcmc: '【条件编译测试】支持高校毕业生在本地创业就业的若干激励措施(接口失败模拟)',
+            zcLevel: '省级重点',
+            sourceUnit: '人社测试局',
+            publishTime: '2026-03-10',
+            viewNum: 9999,
+            applicableObjects: '1. 本市户籍的高校毕业生；<br/>2. 创业青年群体。',
+            policyExplanation: '本政策旨在吸引更多高素质人才留在本市发展。',
+            applyCondition: '具有全日制本科及以上学历且毕业在5年内。',
+            zczc: '最高50万元奖励，办公场地免租3年。',
+            btbz: '本科5000元/月，硕士10000元/月，连续发放3年。',
+            jbqd: '政务中心2楼窗口、线上小程序入口。'
+          }
+          // #endif
         })
 			},
 			getDictLabel(value, list) {
@@ -130,6 +153,14 @@ import { getPolicyDetail } from "@/packageRc/apiRc/policy";
 </script>
 
 <style lang="scss" scoped>
+/* 隐藏滚动条 */
+::-webkit-scrollbar {
+  display: none;
+  width: 0 !important;
+  height: 0 !important;
+  -webkit-appearance: none;
+  background: transparent;
+}
 	.page {
 		background-color: #f4f4f4 !important;
 		height: 100vh;
@@ -323,4 +354,64 @@ import { getPolicyDetail } from "@/packageRc/apiRc/policy";
     );
   }
 }
+
+/* #ifdef H5 */
+.h5-pc-page {
+	width: 100% !important;
+
+	.input-outer-part {
+		width: 80% !important;
+		margin: 0 auto !important;
+		padding-left: 0 !important;
+		padding-right: 0 !important;
+	}
+	.title-line {
+		font-size: 24px !important;
+    font-weight: 600;
+    line-height: 1.4 !important;
+	}
+	.infos {
+		font-size: 20px !important;
+    line-height: 1.8 !important;
+    .info {
+      margin-top: 10rpx !important;
+    }
+	}
+	.main-ceontent-list-item-title {
+		font-size: 24px !important;
+    font-weight: 600;
+		line-height: 1.6 !important;
+    margin-bottom: 24rpx !important;
+	}
+	.main-ceontent-list-item-content {
+		font-size: 20px !important;
+		line-height: 1.6 !important;
+    padding: 24rpx !important;
+	}
+	.tag {
+		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"
+    class="page" :class="{'h5-pc-page': isH5}"
     style="
       background-image: url(../../../packageRc/static/pageBg.png);
     "
@@ -22,18 +22,36 @@
           @click="search()"
         />
       </view>
+      <view
+        class="inner"
+        :style="{
+          width: 'calc(100% + 64rpx)',
+          marginLeft: '-32rpx',
+          height: zctopShow ? 'auto' : '122rpx',
+          position: 'relative',
+          zIndex: zctopShow ? 100 : 2,
+        }"
+      >
+        <PopupList
+          :checkData="checkData"
+          @searchCheck="search"
+          ref="PopupList"
+          @popupSearch="popupSearch"
+        />
+      </view>
       <view
         v-if="total"
         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
         :scroll-y="true"
-        style="height: calc(100vh - 232rpx); position: relative; z-index: 1"
+        style="height: calc(100vh - 354rpx); position: relative; z-index: 1"
         @scrolltolower="getBottomList"
+        :show-scrollbar="false"
       >
         <view
           style="margin-bottom: 24rpx; border-radius: 16rpx"
@@ -51,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">
@@ -67,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"
@@ -91,12 +106,15 @@
 <script>
 import PopupList from "/packageRc/components/PopupLists.vue";
 import { getPolicyList } from "@/packageRc/apiRc/policy";
+import { getDicts } from "@/packageRc/apiRc/system/dict";
 export default {
   components: {
     PopupList,
   },
   data() {
     return {
+      uniIconSize: 18,
+      isH5: false,
       queryParams: {
         pageNum: 1,
         pageSize: 10,
@@ -105,15 +123,126 @@ export default {
       showMorePage: true,
       tableData: [],
       loading: false,
+      checkData: [],
+      zctopShow: false,
+      policyTypeMList: [],
     };
   },
   onLoad(options) {
+    // #ifdef H5
+    this.uniIconSize = 20;
+    this.isH5 = true;
+    // #endif
     this.queryParams.zclx = options.zclx;
+    this.getCheckData();
   },
   onShow() {
     this.search();
   },
+  watch: {
+    "checkData": {
+      handler(newVal) {
+        if (!newVal || newVal.length < 3 || !this.policyTypeMList.length) return;
+        const typeL = newVal[0].data[newVal[0].activeIndex].dictValue;
+
+        // 政策类型不选时，不显示二级分类
+        const isHidden = !typeL;
+        if (newVal[1].hidden !== isHidden) {
+          this.$set(newVal[1], "hidden", isHidden);
+        }
+
+        // 政策类型不选时，确保二级分类已选索引重置为0（全部）
+        if (isHidden && newVal[1].activeIndex !== 0) {
+          this.$set(newVal[1], "activeIndex", 0);
+        }
+
+        let filtered = [];
+        if (typeL) {
+          filtered = this.policyTypeMList.filter((item) =>
+            item.dictValue.startsWith(typeL)
+          );
+        } else {
+          filtered = this.policyTypeMList;
+        }
+
+        // Only update if data changed to avoid infinite loop
+        const newData = [{ dictLabel: "全部", dictValue: "" }].concat(filtered);
+        if (JSON.stringify(newVal[1].data) !== JSON.stringify(newData)) {
+          this.$set(newVal[1], "data", newData);
+          this.$set(newVal[1], "activeIndex", 0);
+        }
+      },
+      deep: true,
+    },
+  },
   methods: {
+    async getCheckData() {
+      const resLevel = await getDicts("zc_level");
+      const resType1 = await getDicts("policy_type1");
+      const resType2 = await getDicts("policy_type2");
+      this.policyTypeMList = resType2.data;
+
+      const type1Data = [{ dictLabel: "全部", dictValue: "" }].concat(
+        resType1.data || []
+      );
+      // policyTypeL 与 zclx 不相关，不再使用 zclx 初始化
+      const initialTypeLIndex = type1Data.findIndex(
+        (item) => item.dictValue == this.queryParams.policyTypeL
+      );
+
+      this.checkData = [
+        {
+          name: "政策类型",
+          type: "policyTypeL",
+          data: type1Data,
+          activeIndex: initialTypeLIndex > -1 ? initialTypeLIndex : 0,
+        },
+        {
+          name: "二级分类",
+          type: "policyTypeM",
+          data: [{ dictLabel: "全部", dictValue: "" }].concat(resType2.data || []),
+          activeIndex: 0,
+          hidden: true,
+        },
+        {
+          name: "政策级别",
+          type: "zcLevel",
+          data: [{ dictLabel: "全部", dictValue: "" }].concat(resLevel.data || []),
+          activeIndex: 0,
+        },
+      ];
+    },
+    popupSearch(data) {
+      // 获取此次提交前，旧的政策类型值
+      const oldTypeL = this.queryParams.policyTypeL || "";
+
+      // 获取弹窗提交的实时选值
+      const selections = {};
+      data.forEach((item) => {
+        const active = item.data[item.activeIndex];
+        selections[item.type] = active.dictLabel === "全部" ? "" : active.dictValue;
+      });
+
+      // 核心判定逻辑：
+      // 如果发现“政策类型(policyTypeL)”发生了变化
+      if (selections.policyTypeL !== oldTypeL) {
+        // 如果改变成了具体的分类，且二级分类传过来的不是该分类下的子类（说明是残留选项没来得及重置）
+        // 或者是变回了“全部”
+        // 那么必须强制清空二级分类
+        if (!selections.policyTypeL || (selections.policyTypeM && !selections.policyTypeM.startsWith(selections.policyTypeL))) {
+            selections.policyTypeM = "";
+            const typeMItem = data.find((it) => it.type === "policyTypeM");
+            if (typeMItem) typeMItem.activeIndex = 0;
+        }
+      }
+
+      // 将最终确定的值同步到查询参数中
+      Object.keys(selections).forEach((key) => {
+        this.$set(this.queryParams, key, selections[key]);
+      });
+
+      this.search();
+    },
     goPolicyDetail(item) {
       uni.navigateTo({
         url: `/packageRc/pages/policy/policyDetail?id=${item.id}`,
@@ -162,8 +291,16 @@ export default {
         this.total = res.total;
       } else {
         this.loading = false;
+        // #ifdef H5 || APP-PLUS
+        // 接口返回非 200 或失败时展示测试数据 (条件编译)
+        this.tableData = [
+          { id: '1', zcmc: '测试政策001：关于进一步支持人才发展的若干措施（条件编译测试数据）', publishTime: '2026-03-10', viewNum: 888, zcLevel: '省级', sourceUnit: '模拟测试部' },
+          { id: '2', zcmc: '测试政策002：高校毕业生创业补贴申请指南（条件编译测试数据）', publishTime: '2026-03-10', viewNum: 666, zcLevel: '市级', sourceUnit: '人力资源局' }
+        ];
+        this.total = 2;
+        // #endif
         uni.showToast({
-          title: res.msg,
+          title: res.msg || '获取列表失败',
           icon: "none",
         });
       }
@@ -173,6 +310,14 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+/* 隐藏滚动条 */
+::-webkit-scrollbar {
+  display: none;
+  width: 0 !important;
+  height: 0 !important;
+  -webkit-appearance: none;
+  background: transparent;
+}
 .page {
   background-color: #f4f4f4 !important;
   height: 100vh;
@@ -191,7 +336,7 @@ export default {
   display: flex;
   align-items: center;
   position: relative;
-  z-index: 1;
+  z-index: 110;
   margin-top: 24rpx;
 
   .search-icon {
@@ -520,4 +665,69 @@ export default {
     margin-top: 12rpx;
   }
 }
+
+/* #ifdef H5 */
+.h5-pc-page {
+  width: 100% !important;
+
+  .input-outer-part {
+    width: 100% !important;
+    margin: 0 auto !important;
+    padding-left: 32px !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: 24px !important;
+    font-weight: 600;
+    margin-bottom: 16px !important;
+  }
+  .infos {
+    margin-bottom: 16px !important;
+    view {
+      font-size: 18px !important;
+      line-height: 1.6 !important;
+      padding: 4px 12px !important;
+      margin-right: 12px !important;
+    }
+  }
+  .bottom-line {
+    font-size: 18px !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: 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 */
 </style>

pages/careerfair/careerfair.vue

@@ -87,12 +87,13 @@
 					<view class="cards" v-if="fairList.length">
 						<view class="card press-button" v-for="(item, index) in fairList" :key="index"
 							@click="goDetail(item.jobFairId)">
+							<view class="center-date"
+								:style="{ color: getTimeStatus(item.jobFairStartTime, item.jobFairEndTime).color,borderColor: getTimeStatus(item.jobFairStartTime, item.jobFairEndTime).color  }">
+								{{ getTimeStatus(item.jobFairStartTime, item.jobFairEndTime).statusText }}
+							</view>
 							<view class="card-title">
 								{{ item.jobFairTitle }}
-								<view class="center-date"
+								
-									:style="{ color: getTimeStatus(item.jobFairStartTime, item.jobFairEndTime).color,borderColor: getTimeStatus(item.jobFairStartTime, item.jobFairEndTime).color  }">
-									{{ getTimeStatus(item.jobFairStartTime, item.jobFairEndTime).statusText }}
-								</view>
 							</view>
 							<view class="card-row">
 								<text class="">{{ item.jobFairAddress }}</text>
@@ -514,7 +515,6 @@
 		} else {
 			$api.msg('请先登录');
 		}
-
 	}
 
 	function getFair(type = "add") {
@@ -1012,10 +1012,21 @@
 
 	.cards .card {
 		margin-top: 28rpx;
-		padding: 32rpx;
+		padding: 45rpx 32rpx 32rpx 32rpx;
 		background: linear-gradient(to bottom, #e3efff 0%, #fbfdff 100%);
 		box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0, 0, 0, 0.04);
 		border-radius: 20rpx;
+		position: relative;
+		.center-date {
+			font-weight: 400;
+			font-size: 24rpx;
+			position: absolute;
+			right: 0;
+			top: 0;
+			border: 1rpx solid;
+			padding: 5rpx 10rpx;
+			margin-left: 10rpx;
+		}
 	}
 
 	.cards .card-title {
@@ -1041,16 +1052,7 @@
 			transform: translate(-50%, -50%);
 		}
 
-		.center-date {
+		
-			font-weight: 400;
-			font-size: 24rpx;
-			// position: absolute;
-			// right: 0;
-			// top: 0;
-			border: 1rpx solid;
-			padding: 5rpx 10rpx;
-			margin-left: 10rpx;
-		}
 	}
 
 	.cards .card-row {

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

stores/userChatGroupStore.js

@@ -335,6 +335,72 @@ const useChatGroupDBStore = defineStore("messageGroup", () => {
         }))
     }
 
+    // 删除消息
+    async function deleteMessages(indices) {
+        // 按索引从大到小排序，避免删除时索引变化
+        const sortedIndices = [...indices].sort((a, b) => b - a);
+        
+        // 从内存中删除消息
+        for (const index of sortedIndices) {
+            const message = messages.value[index];
+            if (message && message.id) {
+                // 从本地数据库中删除
+                await baseDB.db.delete(massageName.value, message.id);
+            }
+            messages.value.splice(index, 1);
+        }
+    }
+
+    // 删除会话
+    async function deleteDialogue(sessionId) {
+        if (!baseDB.isDBReady) await baseDB.initDB();
+        
+        // 删除会话下的所有消息
+        const messageList = await baseDB.db.queryByField(massageName.value, 'parentGroupId', sessionId);
+        for (const message of messageList) {
+            if (message.id) {
+                await baseDB.db.delete(massageName.value, message.id);
+            }
+        }
+        
+        // 删除会话本身
+        const sessionList = await baseDB.db.queryByField(tableName.value, 'sessionId', sessionId);
+        for (const session of sessionList) {
+            if (session.id) {
+                await baseDB.db.delete(tableName.value, session.id);
+            }
+        }
+        
+        // 重新获取所有会话并重新分组
+        const allSessions = await baseDB.db.getAll(tableName.value);
+        if (allSessions.length) {
+            const [result, lastData] = insertSortData(allSessions);
+            tabeList.value = result;
+        } else {
+            tabeList.value = [];
+        }
+        
+        // 如果删除的是当前会话，切换到第一个会话或清空
+        if (chatSessionID.value === sessionId) {
+            if (tabeList.value.length > 0) {
+                // 找到第一个非标题的会话
+                const firstSession = tabeList.value.find(item => !item.isTitle);
+                if (firstSession) {
+                    chatSessionID.value = firstSession.sessionId;
+                    await initMessage(firstSession.sessionId);
+                } else {
+                    // 没有会话了
+                    chatSessionID.value = '';
+                    messages.value = [];
+                }
+            } else {
+                // 没有会话了
+                chatSessionID.value = '';
+                messages.value = [];
+            }
+        }
+    }
+
     return {
         messages,
         isTyping,
@@ -348,7 +414,9 @@ const useChatGroupDBStore = defineStore("messageGroup", () => {
         changeDialogue,
         getStearm,
         getHistory,
-        badFeedback
+        badFeedback,
+        deleteMessages,
+        deleteDialogue
     };
 });
 

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', // 开发环境