Merge branch 'main'

.codegraph/.gitignore

@@ -1,16 +0,0 @@
-# CodeGraph data files
-# These are local to each machine and should not be committed
-
-# Database
-*.db
-*.db-wal
-*.db-shm
-
-# Cache
-cache/
-
-# Logs
-*.log
-
-# Hook markers
-.dirty

.codegraph/daemon.pid

@@ -1,6 +0,0 @@
-{
-  "pid": 37252,
-  "version": "0.9.9",
-  "socketPath": "\\\\.\\pipe\\codegraph-27b009ff71560217",
-  "startedAt": 1784169684502
-}

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

@@ -26,6 +26,24 @@
         <view class="filter-right">
             <!-- 内容区域 -->
             <view class="filter-content">
+                <!-- 薪资 -->
+                <view v-if="activeTab === 'salary'" class="content-section">
+                    <radio-group @change="(e) => handleSelect('salary', e)">
+                        <label
+                            v-for="option in salaryOptions"
+                            :key="option.value"
+                            class="radio-item"
+                            :class="{ checked: selectedValues['salary'] === String(option.value) }"
+                        >
+                            <radio
+                                :value="String(option.value)"
+                                :checked="selectedValues['salary'] === String(option.value)"
+                            />
+                            <text class="option-label">{{ option.label }}</text>
+                        </label>
+                    </radio-group>
+                </view>
+
                 <!-- 学历要求 -->
                 <view v-if="activeTab === 'education'" class="content-section">
                     <radio-group @change="(e) => handleSelect('education', e)">
@@ -62,24 +80,6 @@
                     </radio-group>
                 </view>
 
-                <!-- 薪资 -->
-                <view v-if="activeTab === 'salary'" class="content-section">
-                    <radio-group @change="(e) => handleSelect('salary', e)">
-                        <label
-                            v-for="option in salaryOptions"
-                            :key="option.value"
-                            class="radio-item"
-                            :class="{ checked: selectedValues['salary'] === String(option.value) }"
-                        >
-                            <radio
-                                :value="String(option.value)"
-                                :checked="selectedValues['salary'] === 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)">
@@ -135,97 +135,6 @@
                 </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 === '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 v-if="activeTab === 'area'" class="content-section">
-                <checkbox-group @change="(e) => handleAreaSelect(e)">
-                    <label
-                        v-for="option in areaOptions"
-                        :key="option.value"
-                        class="radio-item"
-                        :class="{ checked: selectedValues['area'].includes(String(option.value)) }"
-                    >
-                        <checkbox
-                            :value="String(option.value)"
-                            :checked="selectedValues['area'].includes(String(option.value))"
-                        />
-                        <text class="option-label">{{ option.label }}</text>
-                    </label>
-                </checkbox-group>
-            </view>
             <!-- 底部按钮 -->
             <view class="filter-footer">
                 <button class="footer-btn clear-btn" @click="handleClear">清除</button>
@@ -237,9 +146,10 @@
 </template>
 
 <script setup>
-import { ref, reactive, onBeforeMount, watch } from 'vue';
+import { ref, reactive, onBeforeMount } from 'vue';
 import useDictStore from '@/stores/useDictStore';
-const { getTransformChildren } = useDictStore();
+const dictStore = useDictStore();
+const { getTransformChildren } = dictStore;
 
 const props = defineProps({
     show: Boolean,
@@ -259,6 +169,7 @@ const getJobTypeData = () => {
 
 // 标签页数据
 const tabs = [
+    { key: 'salary', label: '薪资' },
     { key: 'education', label: '学历要求' },
     { key: 'experience', label: '工作经验' },
     { key: 'scale', label: '公司规模' },
@@ -267,42 +178,53 @@ const tabs = [
 ];
 
 // 当前激活的标签
-const activeTab = ref('education');
+const activeTab = ref('salary');
 
 // 存储已选中的值
 const selectedValues = reactive({
     education: '',
     experience: '',
+    salary: '',
     scale: '',
-    jobType: '',
+    area: [],
-    area: []
+    jobType: ''
 });
 
 // 从字典获取的选项数据
 const educationOptions = ref([]);
 const experienceOptions = ref([]);
 const scaleOptions = ref([]);
-const jobTypeOptions = ref([]);
 const areaOptions = ref([]);
+const jobTypeOptions = ref([]);
+
+// 薪资区间数据（单位：元/月），min/max 为空表示该侧不设限
+const salaryOptions = ref([
+    { label: '3K以下', value: '0-3000', min: '', max: 3000 },
+    { label: '3-5K', value: '3000-5000', min: 3000, max: 5000 },
+    { label: '5-10K', value: '5000-10000', min: 5000, max: 10000 },
+    { label: '10-20K', value: '10000-20000', min: 10000, max: 20000 },
+    { label: '20-50K', value: '20000-50000', min: 20000, max: 50000 },
+    { label: '50K以上', value: '50000-0', min: 50000, max: '' },
+]);
+
+// 加载状态
+const loading = ref(true);
 
 // 初始化获取数据
-const initData = () => {
+onBeforeMount(async () => {
-    educationOptions.value = getTransformChildren('education', '学历要求').options || [];
+    try {
-    experienceOptions.value = getTransformChildren('experience', '工作经验').options || [];
+        // 先获取字典数据
-    scaleOptions.value = getTransformChildren('scale', '公司规模').options || [];
+        await dictStore.getDictData();
-    jobTypeOptions.value = getJobTypeData();
+        // 再初始化选项数据
-    areaOptions.value = getTransformChildren('area', '地区').options || [];
+        educationOptions.value = getTransformChildren('education', '学历要求').options || [];
-};
+        experienceOptions.value = getTransformChildren('experience', '工作经验').options || [];
-
+        scaleOptions.value = getTransformChildren('scale', '公司规模').options || [];
-// 组件挂载时初始化数据
+        areaOptions.value = getTransformChildren('area', '地区').options || [];
-onBeforeMount(() => {
+        jobTypeOptions.value = getJobTypeData();
-    initData();
+    } catch (error) {
-});
+        console.error('获取字典数据失败:', error);
-
+    } finally {
-// 监听组件显示状态，当显示时重新初始化数据
+        loading.value = false;
-watch(() => props.show, (newVal) => {
-    if (newVal) {
-        initData();
     }
 });
 
@@ -312,23 +234,24 @@ const handleSelect = (key, e) => {
 };
 
 // 处理多选选项选择（地区）
-// 兼容不同平台：H5 返回逗号分隔字符串，小程序返回数组，统一规范化为逗号分隔字符串
+// 兼容不同平台：H5 可能返回逗号分隔字符串，小程序返回数组
 const handleCheckboxSelect = (key, e) => {
     let val = e.detail.value;
     if (typeof val === 'string') {
-        // H5 平台返回逗号分隔字符串，直接使用
+        selectedValues[key] = val ? val.split(',').map((s) => s.trim()) : [];
-        selectedValues[key] = val || '';
     } else if (Array.isArray(val)) {
-        // 小程序返回数组，转为逗号分隔字符串
+        selectedValues[key] = val.map((v) => String(v));
-        selectedValues[key] = val ? val.join(',') : '';
     } else {
-        selectedValues[key] = '';
+        selectedValues[key] = [];
     }
 };
 
-// 判断地区选项是否被选中（area 统一为逗号分隔字符串）
+// 判断地区选项是否被选中（兼容数组和字符串）
 const isAreaSelected = (value) => {
     const areaVal = selectedValues.area;
+    if (Array.isArray(areaVal)) {
+        return areaVal.includes(value);
+    }
     if (typeof areaVal === 'string' && areaVal) {
         return areaVal.split(',').includes(value);
     }
@@ -339,7 +262,7 @@ const isAreaSelected = (value) => {
 const handleClear = () => {
     Object.keys(selectedValues).forEach((key) => {
         if (key === 'area') {
-            selectedValues[key] = '';
+            selectedValues[key] = [];
         } else {
             selectedValues[key] = '';
         }
@@ -349,7 +272,15 @@ const handleClear = () => {
 // 确认筛选
 const handleConfirm = () => {
     const payload = { ...selectedValues };
-    // area 已统一为逗号分隔字符串，无需额外转换
+    // 将多选的地区数组转为逗号分隔字符串（兼容各种格式）
+    if (Array.isArray(payload.area) && payload.area.length > 0) {
+        payload.area = payload.area.map((v) => String(v)).join(',');
+    } else if (typeof payload.area === 'string' && payload.area) {
+        // 如果已经是逗号分隔字符串，保持原样
+        payload.area = payload.area;
+    } else {
+        payload.area = '';
+    }
     console.log('[new-filter-page] area value to emit:', payload.area);
     // 将选中的薪资区间转换为 minSalary / maxSalary 参数
     // 始终带上 minSalary / maxSalary（含空值），便于父组件在清除时移除旧值
@@ -391,7 +322,7 @@ const handleClose = () => {
 }
 
 .filter-header {
-    height: 88rpx;
+    height: 96rpx;
     display: flex;
     align-items: center;
     justify-content: center;
@@ -451,33 +382,6 @@ const handleClose = () => {
             }
         }
     }
-
-    .header-close-btn {
-        display: flex;
-        align-items: center;
-        gap: 8rpx;
-        padding: 12rpx 24rpx;
-        border-radius: 8rpx;
-        border: 1rpx solid #256BFA;
-        background: rgba(37, 107, 250, 0.08);
-
-        .close-text {
-            font-size: 39rpx;
-            color: #256BFA;
-        }
-
-        &:active {
-            background: rgba(37, 107, 250, 0.18);
-            transform: scale(0.96);
-        }
-    }
-}
-
-.filter-body {
-    flex: 1;
-    display: flex;
-    flex-direction: row;
-    overflow: hidden;
 }
 
 .filter-body {
@@ -488,40 +392,35 @@ const handleClose = () => {
 }
 
 .filter-tabs {
+    width: 200rpx;
+    border-right: 1rpx solid #eee;
+    background-color: #f8f8f8;
     display: flex;
     flex-direction: column;
-    width: 250rpx;
-    border-right: 1rpx solid #eee;
-    background-color: #f9f9f9;
-    box-shadow: 3rpx 0 15rpx rgba(0, 0, 0, 0.05);
-    height: 100%;
-    box-sizing: border-box;
 
     .tab-item {
-        height: 130rpx;
+        height: 100rpx;
-        line-height: 130rpx;
+        line-height: 100rpx;
         text-align: center;
-        font-size: 42rpx;
+        font-size: 28rpx;
         color: #666;
         position: relative;
         transition: all 0.3s ease;
-        border-bottom: 1rpx solid #f0f0f0;
 
         &.active {
             color: #256BFA;
             font-weight: 600;
             background-color: #fff;
-            box-shadow: 3rpx 0 10rpx rgba(37, 107, 250, 0.1);
             
             &::after {
                 content: '';
                 position: absolute;
-                right: 0;
+                left: 0;
                 top: 25%;
-                width: 6rpx;
+                width: 4rpx;
                 height: 50%;
                 background-color: #256BFA;
-                border-radius: 3rpx 0 0 3rpx;
+                border-radius: 2rpx;
             }
         }
 
@@ -531,23 +430,24 @@ const handleClose = () => {
     }
 }
 
-.filter-content {
+.filter-right {
     flex: 1;
-    padding: 30rpx 0rpx;
     display: flex;
     flex-direction: column;
-    padding-bottom: 160rpx;
+    position: relative;
-    box-sizing: border-box;
+}
+
+.filter-content {
+    flex: 1;
+    padding: 40rpx 32rpx;
+    overflow-y: auto;
 }
 
 .content-section {
-    padding: 0 4%;
-    overflow-y: auto;
-    flex: 12;
     .radio-item {
             display: flex;
             align-items: center;
-            padding: 45rpx 0;
+            padding: 30rpx 0;
             border-bottom: 1rpx solid #f0f0f0;
             transition: all 0.3s ease;
             position: relative;
@@ -561,9 +461,9 @@ const handleClose = () => {
             }
 
             radio {
-                width: 42rpx;
+                width: 28rpx;
-                height: 42rpx;
+                height: 28rpx;
-                margin-right: 36rpx;
+                margin-right: 24rpx;
                 transform: scale(1);
                 display: flex;
                 align-items: center;
@@ -571,10 +471,10 @@ const handleClose = () => {
             }
 
             radio .wx-radio-input {
-                width: 42rpx;
+                width: 28rpx;
-                height: 42rpx;
+                height: 28rpx;
                 border-radius: 50%;
-                border: 3rpx solid #ccc;
+                border: 2rpx solid #ccc;
                 background: transparent;
             }
 
@@ -584,11 +484,11 @@ const handleClose = () => {
             }
 
             radio .wx-radio-input::before {
-                width: 24rpx;
+                width: 16rpx;
-                height: 24rpx;
+                height: 16rpx;
-                line-height: 24rpx;
+                line-height: 16rpx;
                 text-align: center;
-                font-size: 18rpx;
+                font-size: 12rpx;
                 color: #fff;
                 background: transparent;
                 transform: translate(-50%, -50%) scale(0);
@@ -601,40 +501,38 @@ const handleClose = () => {
             }
 
             .option-label {
-                font-size: 45rpx;
+                font-size: 30rpx;
                 color: #333;
                 flex: 1;
                 font-weight: 400;
-                line-height: 60rpx;
+                line-height: 40rpx;
             }
         }
 }
 
 .filter-footer {
-    height: 200rpx;
+    height: 160rpx;
-    flex: 1;
     display: flex;
     border-top: 1rpx solid #eee;
     background-color: #fff;
-    box-shadow: 0 -3rpx 15rpx rgba(0, 0, 0, 0.05);
+    box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.05);
-    padding: 30rpx 0;
+    padding: 20rpx 32rpx 100rpx;
     flex-shrink: 0;
+    position: relative;
     z-index: 10;
-    margin-top: auto;
-    box-sizing: border-box;
 
     .footer-btn {
         flex: 1;
-        margin: 0 40rpx;
+        margin: 0;
-        border-radius: 24rpx;
+        border-radius: 16rpx;
-        height: 100rpx;
+        height: 80rpx;
-        line-height: 100rpx;
+        line-height: 80rpx;
-        font-size: 45rpx;
+        font-size: 32rpx;
         transition: all 0.3s ease;
         font-weight: 500;
 
         &:first-child {
-            margin-right: 30rpx;
+            margin-right: 20rpx;
             background-color: #f5f5f5;
             color: #666;
             border: 1rpx solid #e0e0e0;

packageA/pages/chat/chat.vue

@@ -63,8 +63,9 @@
             <header class="head">
                 <view class="main-header">
                     <image src="/static/icon/Hamburger-button.png" @click="toggleDrawer"></image>
-                    <!-- <view class="title">{{ config.appInfo.areaName }}岗位推荐</view> -->
+                    <view class="back-home-btn" @click="navTo('/pages/index/index')">
-                    <!-- <view class="title">{{ config.appInfo.areaName }}岗位推荐</view> -->
+                        <text class="back-home-text">返回</text>
+                    </view>
                     <image src="/static/icon/Comment-one.png" @click="addNewDialogue"></image>
                 </view>
             </header>
@@ -375,6 +376,19 @@ footer-height = 98rpx
         image
             width: 36rpx;
             height: 37rpx;
+        .back-home-btn
+            display: flex
+            align-items: center
+            justify-content: center
+            padding: 0 20rpx
+            height: 60rpx
+            border-radius: 12rpx
+            &:active
+                background: rgba(0, 0, 0, 0.05)
+            .back-home-text
+                font-size: 30rpx
+                color: #333
+                font-weight: 500
 
 .chatmain-warpper
     height: 'calc(100% - %s)' %( header-height + footer-height)

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

@@ -227,8 +227,12 @@
                     placeholder-class="inputplaceholder"
                     class="input"
                     @confirm="sendMessage"
+                    @click="handleInputClick"
+                    @focus="handleInputFocus"
                     :disabled="isTyping"
                     :adjust-position="true"
+                    :focus="inputFocused"
+                    cursor-spacing="20"
                     placeholder="请输入您想找的岗位信息或就政策信息【比如:设计师、10000-12000、广州】【比如:今年喀什地区高校毕业生有什么就业政策】"
                     v-show="!isVoice"
                 />
@@ -421,6 +425,7 @@ const { speak, pause, resume, isSpeaking, isPaused, cancelAudio } = useTTSPlayer
 const instance = getCurrentInstance();
 
 // state
+const ACTIVE_TAB_KEY = 'chat_active_tab';
 const activeTab = ref('policy'); // 'policy' or 'job'
 const queries = ref([]);
 const guessList = ref([]);
@@ -439,6 +444,7 @@ const feebackData = ref(null);
 // 删除功能相关状态
 const isSelectMode = ref(false);
 const selectedMessages = ref([]);
+const inputFocused = ref(false);
 // ref for DOM element
 const voiceBtn = ref(null);
 const feeback = ref(null);
@@ -466,7 +472,16 @@ const audiowaveStyle = computed(() => {
         : '#f1f1f1';
 });
 
+function setActiveTab(tab) {
+    activeTab.value = tab;
+    uni.setStorageSync(ACTIVE_TAB_KEY, tab);
+}
+
 onMounted(async () => {
+    const cachedActiveTab = uni.getStorageSync(ACTIVE_TAB_KEY);
+    if (cachedActiveTab === 'policy' || cachedActiveTab === 'job') {
+        activeTab.value = cachedActiveTab;
+    }
     changeQueries();
     scrollToBottom();
     isAudioPermission.value = await requestMicPermission();
@@ -541,10 +556,13 @@ const sendMessage = (text) => {
                             if (speechIndex.value !== index) {
                                 // 延迟TTS，等待内容更完整
                                 // 只有在内容长度超过50个字符或者包含岗位信息时才开始朗读
-                                const hasJobInfo = message.displayText.includes('```job-json') || 
+                                const hasJobInfo = isJobCardMessage(message) ||
                                                  message.displayText.includes('岗位') ||
                                                  message.displayText.includes('公司') ||
                                                  message.displayText.includes('薪资');
+                                if (hasJobInfo) {
+                                    setActiveTab('job');
+                                }
                                 
                                 if (message.displayText.length > 50 || hasJobInfo) {
                                     console.log('🎵 Starting streaming TTS for message index:', index);
@@ -573,6 +591,9 @@ const sendMessage = (text) => {
                         const lastMessageIndex = messages.value.length - 1;
                         if (lastMessageIndex >= 0) {
                             const lastMessage = messages.value[lastMessageIndex];
+                            if (isJobCardMessage(lastMessage)) {
+                                setActiveTab('job');
+                            }
                             if (!lastMessage.self && lastMessage.displayText && lastMessage.displayText.trim()) {
                                 console.log('🎵 Final TTS for complete message');
                                 console.log('📝 Final text length:', lastMessage.displayText.length);
@@ -1357,6 +1378,22 @@ function closeFile() {
     showfile.value = false;
 }
 
+function handleInputClick() {
+    inputFocused.value = false;
+    nextTick(() => {
+        inputFocused.value = true;
+    });
+    console.log('[键盘] 点击输入框，尝试唤起键盘');
+}
+
+function handleInputFocus() {
+    console.log('[键盘] 输入框已获得焦点，键盘应已弹出');
+    $api.msg('输入框已激活');
+    nextTick(() => {
+        scrollToBottom();
+    });
+}
+
 function copyMarkdown(value) {
     $api.copyText(value);
 }
@@ -1481,7 +1518,18 @@ function getRandomJobQueries(queries, count = 2) {
 
 // 切换tab
 function switchTab(tab) {
-    activeTab.value = tab;
+    setActiveTab(tab);
+}
+
+function isJobCardMessage(msg) {
+    const content = msg?.displayText || '';
+    return (
+        /```\s*job-json/.test(content) ||
+        content.includes('岗位推荐') ||
+        content.includes('推荐岗位') ||
+        content.includes('岗位信息') ||
+        (content.includes('```') && content.includes('公司') && content.includes('薪资'))
+    );
 }
 
 // 检查消息是否应该显示在当前tab
@@ -1490,26 +1538,10 @@ function shouldShowMessage(msg) {
         return true; // 用户自己的消息总是显示
     }
     
+    const isJobCard = isJobCardMessage(msg);
     if (activeTab.value === 'policy') {
-        // 政策查询tab：显示除了岗位卡片以外的所有内容
-        // 岗位卡片通常包含特定的标记，如```job-json或岗位推荐等关键词
-        const isJobCard = msg.displayText && (
-            msg.displayText.includes('```job-json') ||
-            msg.displayText.includes('岗位推荐') ||
-            msg.displayText.includes('推荐岗位') ||
-            msg.displayText.includes('岗位信息') ||
-            (msg.displayText.includes('```') && msg.displayText.includes('公司') && msg.displayText.includes('薪资'))
-        );
         return !isJobCard;
     } else {
-        // 岗位推荐tab：只显示岗位卡片内容
-        const isJobCard = msg.displayText && (
-            msg.displayText.includes('```job-json') ||
-            msg.displayText.includes('岗位推荐') ||
-            msg.displayText.includes('推荐岗位') ||
-            msg.displayText.includes('岗位信息') ||
-            (msg.displayText.includes('```') && msg.displayText.includes('公司') && msg.displayText.includes('薪资'))
-        );
         return isJobCard;
     }
 }

pages/search/search.vue

@@ -1,9 +1,16 @@
 <template>
     <view class="container safe-area-top">
         <!-- 自定义头部搜索框 -->
+        <!-- #ifdef H5 -->
         <view class="custom-header" :style="{ paddingTop: statusBarHeight + 'px' }">
+        <!-- #endif -->
+        <!-- #ifndef H5 -->
+        <view class="custom-header">
+        <!-- #endif -->
             <view class="top">
+                <!-- #ifdef H5 -->
                 <image class="btnback button-click" src="@/static/icon/back.png" @click="navBack"></image>
+                <!-- #endif -->
                 <view class="search-box">
                     <uni-icons
                         class="iconsearch"

stores/useDictStore.js

@@ -11,6 +11,8 @@ import {
 
 //  静态树 O(1) 超快查询！！！！！
 let IndustryMap = null
+// 复用同一批字典请求，避免 App 启动和页面组件同时初始化时产生竞态。
+let dictDataPromise = null
 //  构建索引
 function buildIndex(tree) {
     const map = new Map();
@@ -50,46 +52,54 @@ const useDictStore = defineStore("dict", () => {
                 return data
             })
         }
-        if (complete.value) return
+        if (complete.value) return Promise.resolve()
-        if (dictLoading.value) return
+        // App.vue 会在启动时加载字典，页面组件也可能同时加载。
-        dictLoading.value = true
+        // 不能在请求进行中直接 return，否则调用方会把当时的空 state 复制下来。
-        try {
+        if (dictDataPromise) return dictDataPromise
-            const [education, experience, area, scale, sex, affiliation, nature, noticeType] = 
-            await Promise.all([
-                getDictSelectOption('education'),
-                getDictSelectOption('experience'),
-                getDictSelectOption('area', true),
-                getDictSelectOption('scale'),
-                getDictSelectOption('app_sex'),
-                getDictSelectOption('political_affiliation'),
-                getDictSelectOption('company_nature'),
-                getDictSelectOption('sys_notice_type'),
-            ]);
 
-            state.education = education;
+        dictLoading.value = true
-            state.experience = experience;
+        dictDataPromise = (async () => {
-            state.area = area;
+            try {
-            state.scale = scale;
+                const [education, experience, area, scale, sex, affiliation, nature, noticeType] =
-            state.sex = sex;
+                await Promise.all([
-            state.affiliation = affiliation;
+                    getDictSelectOption('education'),
-            state.nature = nature
+                    getDictSelectOption('experience'),
-            state.noticeType = noticeType
+                    getDictSelectOption('area', true),
-            complete.value = true
+                    getDictSelectOption('scale'),
-            getIndustryDict() // 获取行业
+                    getDictSelectOption('app_sex'),
-        } catch (error) {
+                    getDictSelectOption('political_affiliation'),
-            console.error('Error fetching dictionary data:', error);
+                    getDictSelectOption('company_nature'),
-            // 确保即使出错也能返回空数组
+                    getDictSelectOption('sys_notice_type'),
-            state.education = [];
+                ]);
-            state.experience = [];
+
-            state.area = [];
+                state.education = education;
-            state.scale = [];
+                state.experience = experience;
-            state.sex = [];
+                state.area = area;
-            state.affiliation = [];
+                state.scale = scale;
-            state.nature = [];
+                state.sex = sex;
-            state.noticeType = [];
+                state.affiliation = affiliation;
-        } finally {
+                state.nature = nature
-            dictLoading.value = false
+                state.noticeType = noticeType
-        }
+                complete.value = true
+                getIndustryDict() // 获取行业
+            } catch (error) {
+                console.error('Error fetching dictionary data:', error);
+                // 确保即使出错也能返回空数组
+                state.education = [];
+                state.experience = [];
+                state.area = [];
+                state.scale = [];
+                state.sex = [];
+                state.affiliation = [];
+                state.nature = [];
+                state.noticeType = [];
+            } finally {
+                dictLoading.value = false
+                dictDataPromise = null
+            }
+        })()
+
+        return dictDataPromise
     };
 
     async function getIndustryDict() {