flat: update

App.vue

@@ -2,10 +2,11 @@
 import { reactive, inject, onMounted } from 'vue';
 import { onLaunch, onShow, onHide } from '@dcloudio/uni-app';
 import useUserStore from './stores/useUserStore';
+import usePageAnimation from './hook/usePageAnimation';
 import useDictStore from './stores/useDictStore';
 const { $api, navTo, appendScriptTagElement, aes_Decrypt, sm2_Decrypt } = inject('globalFunction');
 import config from '@/config.js';
-
+usePageAnimation();
 const appword = 'aKd20dbGdFvmuwrt'; // 固定值
 
 onLaunch((options) => {
@@ -124,11 +125,22 @@ function loginCallback(userInfo) {
 /*每个页面公共css */
 @import '@/common/animation.css';
 @import '@/common/common.css';
-/* 修改pages tabbar样式 H5有效 */
+
+/* 修改pages tabbar样式 H5才有效 */
 .uni-tabbar .uni-tabbar__item:nth-child(4) .uni-tabbar__bd .uni-tabbar__icon {
-    height: 110rpx !important;
-    width: 122rpx !important;
-    margin-top: 6rpx;
+    width: 108rpx !important;
+    height: 98rpx !important;
+    margin-top: 0rpx;
+    transition: transform 0.5s cubic-bezier(0.175, 0.885, 0.32, 1.275);
+    transform-origin: center center;
+    /* transition: transform 0.15s ease-in-out; */
+    /* transform-origin: center center; */
+}
+
+.uni-tabbar .uni-tabbar__item:nth-child(4) .uni-tabbar__bd .uni-tabbar__icon:active {
+    transform: scale(0.8);
+    transition: transform 0.1s ease-out;
+    /* animation: jelly 0.5s; */
 }
 
 .uni-tabbar-border {

common/animation.css

@@ -190,4 +190,38 @@
 .btn-rubberBand:active {
     -webkit-animation-name: tada;
     animation-name: tada
+}
+
+@keyframes jelly {
+    0% {
+        transform: scale(1);
+    }
+
+    30% {
+        transform: scale(1.25, 0.75);
+    }
+
+    /* 压扁 */
+    40% {
+        transform: scale(0.75, 1.25);
+    }
+
+    /* 拉长 */
+    50% {
+        transform: scale(1.15, 0.85);
+    }
+
+    /* 稍微压扁 */
+    65% {
+        transform: scale(0.95, 1.05);
+    }
+
+    /* 稍微拉长 */
+    75% {
+        transform: scale(1.05, 0.95);
+    }
+
+    100% {
+        transform: scale(1);
+    }
 }

common/common.css

@@ -468,4 +468,8 @@ html {
 
 .grayscale {
     filter: grayscale(100%) opacity(0.6);
+}
+
+.height-100 {
+    height: 100%;
 }

common/globalFunction.js

@@ -1,6 +1,7 @@
 import '@/lib/encryption/sm4.min.js'
 import useUserStore from "../stores/useUserStore";
 import {
+    createRequestWithCache,
     createRequest,
     uploadFile
 } from "../utils/request";
@@ -624,6 +625,7 @@ export const $api = {
     sendingMiniProgramMessage,
     copyText,
     aes_Decrypt,
+    createRequestWithCache
 }
 
 

components/empty/empty.vue

@@ -1,5 +1,9 @@
 <template>
-    <view class="empty" :style="{ background: bgcolor, marginTop: mrTop + 'rpx' }">
+    <view
+        class="empty"
+        :class="{ 'position-center': isPosition }"
+        :style="{ background: bgcolor, marginTop: mrTop + 'rpx' }"
+    >
         <view class="ty_content" :style="{ paddingTop: pdTop + 'rpx' }">
             <view class="content_top">
                 <!-- <view class="content_top btn-shaky"> -->
@@ -30,18 +34,23 @@ export default {
         pdTop: {
             type: String,
             required: false,
-            default: '80',
+            default: '0',
         },
         mrTop: {
             type: String,
             required: false,
-            default: '20',
+            default: '0',
         },
         pictrue: {
             type: String,
             required: false,
             default: '',
         },
+        isPosition: {
+            type: Boolean,
+            required: false,
+            default: false,
+        },
     },
     methods: {},
 };
@@ -52,19 +61,33 @@ image {
     width: 100%;
     height: 100%;
 }
+.position-center {
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+}
 .empty {
     width: 100%;
-    min-height: 100vh;
-    position: relative;
+    height: 100%;
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    // min-height: 100vh;
+    // height: 400rpx;
+    // position: relative;
     .ty_content {
-        position: absolute;
-        left: 50%;
-        top: 0;
-        transform: translate(-50%, 0);
         display: flex;
         flex-direction: column;
         align-items: center;
         justify-content: center;
+        // position: absolute;
+        // left: 50%;
+        // top: 0;
+        // transform: translate(-50%, 0);
+
         .content_top {
             width: 450rpx;
             height: 322rpx;

components/selectJobs/selectJobs.vue

@@ -165,7 +165,7 @@ function serchforIt(defaultId) {
 
         return;
     }
-    $api.createRequest('/app/common/jobTitle/treeselect', {}, 'GET').then((resData) => {
+    const LoadCache = (resData) => {
         if (userInfo.value.jobTitleId) {
             const ids = userInfo.value.jobTitleId.split(',').map((id) => Number(id));
             count.value = ids.length;
@@ -174,7 +174,8 @@ function serchforIt(defaultId) {
         state.jobTitleId = userInfo.value.jobTitleId;
         state.stations = resData.data;
         state.visible = true;
-    });
+    };
+    $api.createRequestWithCache('/app/common/jobTitle/treeselect', {}, 'GET', false, LoadCache).then(LoadCache);
 }
 
 const reset = () => {

config.js

@@ -4,10 +4,11 @@ export default {
     // baseUrl: 'http://192.168.3.29:8081',
     // baseUrl: 'http://10.213.6.207:19010/api',
     // 语音转文字
-    // vioceBaseURl: 'ws://39.98.44.136:8080/speech-recognition',
-    vioceBaseURl: 'wss://qd.zhaopinzao8dian.com/api/speech-recognition',
+    // vioceBaseURl: 'wss://qd.zhaopinzao8dian.com/api/speech-recognition', 
+    vioceBaseURl: 'wss://qd.zhaopinzao8dian.com/api/system/asr/connect', // 自定义
     // 语音合成
     speechSynthesis: 'wss://qd.zhaopinzao8dian.com/api/speech-synthesis',
+    speechSynthesis2: 'wss://resource.zhuoson.com/synthesis/',
     // indexedDB
     DBversion: 2,
     // 只使用本地缓寸的数据

hook/page-animation.css

@@ -0,0 +1,30 @@
+/* #ifdef H5 */
+uni-page {
+    opacity: 1;
+    will-change: opacity;
+}
+
+/* --- 进场 (Enter) --- */
+uni-page.animation-enter-from {
+    opacity: 0;
+}
+
+uni-page.animation-enter-active {
+    transition: opacity 0.2s ease-out;
+}
+
+/* --- 离场 (Leave) --- */
+uni-page.animation-leave-active {
+    transition: opacity 0.15s ease-in;
+}
+
+uni-page.animation-leave-to {
+    opacity: 0;
+}
+
+/* --- 稳态 --- */
+uni-page.animation-show {
+    opacity: 1;
+}
+
+/* #endif */

hook/usePageAnimation.js

@@ -0,0 +1,66 @@
+import {
+    onLaunch
+} from '@dcloudio/uni-app'
+import {
+    getCurrentInstance
+} from 'vue'
+import './page-animation.css'
+
+const DURATION = 130
+
+export default function usePageAnimation() {
+    // #ifdef H5
+    const show = () => {
+        const page = document.querySelector('uni-page')
+        if (!page) return
+        const cl = page.classList
+
+        cl.add('animation-enter-from')
+        cl.remove('animation-leave-to', 'animation-leave-active')
+
+        requestAnimationFrame(() => {
+            requestAnimationFrame(() => {
+                cl.remove('animation-enter-from')
+                cl.add('animation-enter-active', 'animation-show')
+
+                setTimeout(() => {
+                    cl.remove('animation-enter-active')
+                }, DURATION)
+            })
+        })
+    }
+
+    const hide = (next) => {
+        const page = document.querySelector('uni-page')
+        if (!page) {
+            next()
+            return
+        }
+        const cl = page.classList
+
+        cl.add('animation-leave-active')
+
+        requestAnimationFrame(() => {
+            cl.remove('animation-show')
+            cl.add('animation-leave-to')
+
+            setTimeout(() => {
+                cl.remove('animation-leave-active', 'animation-leave-to')
+                next()
+            }, DURATION - 50)
+        })
+    }
+
+    onLaunch(() => {
+        const instance = getCurrentInstance()
+        const router = instance?.proxy?.$router
+        if (router) {
+            show()
+
+            router.beforeEach((to, from, next) => hide(next))
+
+            router.afterEach(() => show())
+        }
+    })
+    // #endif
+}

hook/useRealtimeRecorder.js

@@ -9,6 +9,7 @@ import {
 
 import config from '@/config'
 
+// Alibaba Cloud
 export function useAudioRecorder() {
     const isRecording = ref(false)
     const isStopping = ref(false)

hook/useRealtimeRecorder2.js

@@ -0,0 +1,348 @@
+import {
+    ref,
+    onUnmounted
+} from 'vue'
+import {
+    $api
+} from '../common/globalFunction'; // 你的请求封装
+import config from '@/config'
+
+// 开源
+export function useAudioRecorder() {
+    // --- 状态定义 ---
+    const isRecording = ref(false)
+    const isSocketConnected = ref(false)
+    const recordingDuration = ref(0)
+    const volumeLevel = ref(0) // 0-100
+    const recognizedText = ref('')
+
+    // --- 内部变量 ---
+    let socketTask = null
+    let durationTimer = null
+
+    // --- APP/小程序 变量 ---
+    let recorderManager = null;
+
+    // --- H5 变量 ---
+    let audioContext = null;
+    let scriptProcessor = null;
+    let mediaStreamSource = null;
+    let h5Stream = null;
+
+    // --- 配置项 ---
+    const RECORD_CONFIG = {
+        duration: 600000,
+        sampleRate: 16000,
+        numberOfChannels: 1,
+        format: 'pcm',
+        frameSize: 4096
+    }
+
+    /**
+     * 获取 WebSocket 地址 (含 Token)
+     */
+    const getWsUrl = async () => {
+        let wsUrl = config.vioceBaseURl
+
+        // 拼接 Token
+        const token = uni.getStorageSync('token') || '';
+        if (token) {
+            const separator = wsUrl.includes('?') ? '&' : '?';
+            wsUrl = `${wsUrl}${separator}token=${encodeURIComponent(token)}`;
+        }
+        return wsUrl;
+    }
+
+    /**
+     * 开始录音 (入口)
+     */
+    const startRecording = async () => {
+        if (isRecording.value) return
+
+        try {
+            recognizedText.value = ''
+            volumeLevel.value = 0
+
+            // #ifdef H5
+            if (location.protocol !== 'https:' && location.hostname !== 'localhost') {
+                uni.showToast({
+                    title: 'H5录音需要HTTPS环境',
+                    icon: 'none'
+                });
+                return;
+            }
+            // #endif
+
+            const url = await getWsUrl()
+            console.log('正在连接 ASR:', url)
+
+            await connectSocket(url);
+
+        } catch (err) {
+            console.error('启动失败:', err);
+            uni.showToast({
+                title: '启动失败: ' + (err.message || ''),
+                icon: 'none'
+            });
+            cleanup();
+        }
+    }
+
+    /**
+     * 连接 WebSocket
+     */
+    const connectSocket = (url) => {
+        return new Promise((resolve, reject) => {
+            socketTask = uni.connectSocket({
+                url: url,
+                success: () => console.log('Socket 连接请求发送'),
+                fail: (err) => reject(err)
+            });
+
+            socketTask.onOpen((res) => {
+                console.log('WebSocket 已连接');
+                isSocketConnected.value = true;
+
+                // #ifdef H5
+                startH5Recording().then(() => resolve()).catch(err => {
+                    socketTask.close();
+                    reject(err);
+                });
+                // #endif
+
+                // #ifndef H5
+                startAppRecording();
+                resolve();
+                // #endif
+            });
+
+            socketTask.onMessage((res) => {
+                // 接收文本结果
+                if (res.data) {
+                    recognizedText.value = res.data;
+                }
+            });
+
+            socketTask.onError((err) => {
+                console.error('Socket 错误:', err);
+                isSocketConnected.value = false;
+                stopRecording();
+            });
+
+            socketTask.onClose(() => {
+                isSocketConnected.value = false;
+                console.log('Socket 已关闭');
+            });
+        })
+    }
+
+    const startH5Recording = async () => {
+        try {
+            // 1. 获取麦克风流
+            const stream = await navigator.mediaDevices.getUserMedia({
+                audio: true
+            });
+            h5Stream = stream;
+
+            // 2. 创建 AudioContext
+            const AudioContext = window.AudioContext || window.webkitAudioContext;
+            audioContext = new AudioContext({
+                sampleRate: 16000
+            });
+
+            mediaStreamSource = audioContext.createMediaStreamSource(stream);
+            scriptProcessor = audioContext.createScriptProcessor(4096, 1, 1);
+
+            scriptProcessor.onaudioprocess = (event) => {
+                if (!isSocketConnected.value || !socketTask) return;
+
+                const inputData = event.inputBuffer.getChannelData(0);
+
+                calculateVolume(inputData, true);
+
+                const buffer = new ArrayBuffer(inputData.length * 2);
+                const view = new DataView(buffer);
+                for (let i = 0; i < inputData.length; i++) {
+                    let s = Math.max(-1, Math.min(1, inputData[i]));
+                    view.setInt16(i * 2, s < 0 ? s * 0x8000 : s * 0x7FFF, true);
+                }
+
+                socketTask.send({
+                    data: buffer,
+                    fail: (e) => console.error('发送音频失败', e)
+                });
+            };
+
+            mediaStreamSource.connect(scriptProcessor);
+            scriptProcessor.connect(audioContext.destination);
+
+            isRecording.value = true;
+            recordingDuration.value = 0;
+            durationTimer = setInterval(() => recordingDuration.value++, 1000);
+
+            console.log('H5 录音已启动');
+
+        } catch (err) {
+            console.error('H5 录音启动失败:', err);
+            throw err;
+        }
+    }
+
+    const stopH5Resources = () => {
+        if (scriptProcessor) scriptProcessor.disconnect();
+        if (mediaStreamSource) mediaStreamSource.disconnect();
+        if (audioContext) audioContext.close();
+        if (h5Stream) h5Stream.getTracks().forEach(track => track.stop());
+
+        scriptProcessor = null;
+        mediaStreamSource = null;
+        audioContext = null;
+        h5Stream = null;
+    }
+
+    const startAppRecording = () => {
+        recorderManager = uni.getRecorderManager();
+
+        recorderManager.onFrameRecorded((res) => {
+            const {
+                frameBuffer
+            } = res;
+
+            calculateVolume(frameBuffer, false);
+
+            if (isSocketConnected.value && socketTask) {
+                socketTask.send({
+                    data: frameBuffer
+                });
+            }
+        });
+
+        recorderManager.onStart(() => {
+            console.log('APP 录音已开始');
+            isRecording.value = true;
+            recordingDuration.value = 0;
+            durationTimer = setInterval(() => recordingDuration.value++, 1000);
+        });
+
+        recorderManager.onError((err) => {
+            console.error('APP 录音报错:', err);
+            cleanup();
+        });
+
+        recorderManager.start(RECORD_CONFIG);
+    }
+    const stopHardwareResource = () => {
+        // APP/小程序停止
+        if (recorderManager) {
+            recorderManager.stop();
+        }
+
+        // H5停止
+        // #ifdef H5
+        if (scriptProcessor) scriptProcessor.disconnect();
+        if (mediaStreamSource) mediaStreamSource.disconnect();
+        if (audioContext) audioContext.close();
+        if (h5Stream) h5Stream.getTracks().forEach(track => track.stop());
+
+        scriptProcessor = null;
+        mediaStreamSource = null;
+        audioContext = null;
+        h5Stream = null;
+        // #endif
+    }
+
+    /**
+     * 停止录音 (通用)
+     */
+    const stopRecording = () => {
+        // 停止 APP 录音
+        if (recorderManager) {
+            recorderManager.stop();
+        }
+
+        // 停止 H5 录音资源
+        // #ifdef H5
+        stopH5Resources();
+        // #endif
+
+        // 关闭 Socket
+        if (socketTask) {
+            socketTask.close();
+        }
+
+        cleanup();
+    }
+
+    const cancelRecording = () => {
+        if (!isRecording.value) return;
+
+        console.log('取消录音 - 丢弃结果');
+
+        // 1. 停止硬件录音
+        stopHardwareResource();
+
+        // 2. 强制关闭 Socket
+        if (socketTask) {
+            socketTask.close();
+        }
+
+        // 3. 关键：清空已识别的文本
+        recognizedText.value = '';
+
+        // 4. 清理资源
+        cleanup();
+    }
+
+    /**
+     * 清理状态
+     */
+    const cleanup = () => {
+        clearInterval(durationTimer);
+        isRecording.value = false;
+        isSocketConnected.value = false;
+        socketTask = null;
+        recorderManager = null;
+        volumeLevel.value = 0;
+    }
+
+    /**
+     * 计算音量 (兼容 Float32 和 Int16/ArrayBuffer)
+     */
+    const calculateVolume = (data, isFloat32) => {
+        let sum = 0;
+        let length = 0;
+
+        if (isFloat32) {
+            length = data.length;
+            for (let i = 0; i < length; i += 10) {
+                sum += Math.abs(data[i]);
+            }
+            volumeLevel.value = Math.min(100, Math.floor((sum / (length / 10)) * 100 * 3));
+        } else {
+            const int16Data = new Int16Array(data);
+            length = int16Data.length;
+            for (let i = 0; i < length; i += 10) {
+                sum += Math.abs(int16Data[i]);
+            }
+            const avg = sum / (length / 10);
+            volumeLevel.value = Math.min(100, Math.floor((avg / 10000) * 100));
+        }
+    }
+
+    onUnmounted(() => {
+        if (isRecording.value) {
+            stopRecording();
+        }
+    })
+
+    return {
+        isRecording,
+        isSocketConnected,
+        recordingDuration,
+        volumeLevel,
+        recognizedText,
+        startRecording,
+        stopRecording,
+        cancelRecording
+    }
+}

hook/useTTSPlayer.js

@@ -9,8 +9,9 @@ import {
     onUnload
 } from '@dcloudio/uni-app'
 import WavDecoder from '@/lib/wav-decoder@1.3.0.js'
+import config from '@/config'
 
-export function useTTSPlayer(wsUrl) {
+export function useTTSPlayer() {
     const isSpeaking = ref(false)
     const isPaused = ref(false)
     const isComplete = ref(false)
@@ -89,12 +90,13 @@ export function useTTSPlayer(wsUrl) {
 
     const initWebSocket = () => {
         const thisPlayId = currentPlayId
-        socket = new WebSocket(wsUrl)
+        socket = new WebSocket(config.speechSynthesis)
         socket.binaryType = 'arraybuffer'
 
         socket.onopen = () => {
             if (pendingText && thisPlayId === activePlayId) {
                 const seepdText = extractSpeechText(pendingText)
+                console.log(seepdText)
                 socket.send(seepdText)
                 pendingText = null
             }

hook/useTTSPlayer2.js

@@ -0,0 +1,333 @@
+import {
+    ref,
+    onUnmounted,
+    onMounted
+} from 'vue'
+// 如果是 uni-app 环境，保留这些导入；如果是纯 Web Vue3，可以移除
+import {
+    onHide,
+    onUnload
+} from '@dcloudio/uni-app'
+import config from '@/config'
+
+/**
+ * Piper TTS 播放钩子 (WebSocket MSE 流式版 - 含 cancelAudio)
+ * 依赖: 后端必须去除 MP3 ID3 标签 (-map_metadata -1)
+ */
+export function useTTSPlayer() {
+    // 状态管理
+    const isSpeaking = ref(false)
+    const isPaused = ref(false)
+    const isLoading = ref(false)
+
+    // 核心对象
+    let audio = null
+    let mediaSource = null
+    let sourceBuffer = null
+    let ws = null
+
+    // 缓冲队列管理
+    let bufferQueue = []
+    let isAppending = false
+    let isStreamEnded = false
+
+    // 初始化 Audio 监听器 (只运行一次)
+    const initAudioElement = () => {
+        if (!audio && typeof window !== 'undefined') {
+            audio = new Audio()
+
+            // 错误监听
+            audio.addEventListener('error', (e) => {
+                // 如果是手动停止导致的 error (src 被置空)，忽略
+                if (!audio.src) return
+                console.error('Audio Player Error:', e)
+                resetState()
+            })
+
+            // 播放结束监听
+            audio.addEventListener('ended', () => {
+                resetState()
+            })
+        }
+    }
+
+    /**
+     * 核心朗读方法 (WebSocket)
+     * @param {string} text - 要朗读的文本
+     */
+    const speak = async (text) => {
+        if (!text) return
+
+        // 1. 提取文本
+        const processedText = extractSpeechText(text)
+        if (!processedText) return
+
+        // 2. 彻底清理旧状态
+        cancelAudio()
+        initAudioElement()
+
+        isLoading.value = true
+        isSpeaking.value = true
+        isPaused.value = false
+        isStreamEnded = false
+
+        // 3. 检查环境
+        if (!window.MediaSource || !window.WebSocket) {
+            console.error('当前环境不支持 MediaSource 或 WebSocket')
+            resetState()
+            return
+        }
+
+        try {
+            // 4. 初始化 MSE
+            mediaSource = new MediaSource()
+            // 绑定 MSE 到 Audio
+            audio.src = URL.createObjectURL(mediaSource)
+
+            // 监听 MSE 打开事件
+            mediaSource.addEventListener('sourceopen', () => {
+                // 防止多次触发
+                if (mediaSource.sourceBuffers.length > 0) return
+                startWebSocketStream(processedText)
+            })
+
+            // 尝试播放 (处理浏览器自动播放策略)
+            const playPromise = audio.play()
+            if (playPromise !== undefined) {
+                playPromise.catch(e => {
+                    console.warn('自动播放被拦截 (需用户交互):', e)
+                    // 保持 isSpeaking 为 true，UI 显示播放按钮，用户点击后调用 resume() 即可
+                })
+            }
+
+        } catch (err) {
+            console.error('TTS Initialization Failed:', err)
+            cancelAudio()
+        }
+    }
+
+    // 启动 WebSocket 流程
+    const startWebSocketStream = (text) => {
+        const mime = 'audio/mpeg'
+
+        // 4.1 创建 SourceBuffer
+        try {
+            sourceBuffer = mediaSource.addSourceBuffer(mime)
+            sourceBuffer.addEventListener('updateend', () => {
+                isAppending = false
+                processQueue()
+            })
+        } catch (e) {
+            console.error('SourceBuffer Create Failed:', e)
+            return
+        }
+
+        // 4.2 计算 WebSocket 地址
+        let baseUrl = config.speechSynthesis2 || ''
+        baseUrl = baseUrl.replace(/\/$/, '')
+        const wsUrl = baseUrl.replace(/^http/, 'ws') + '/ws/synthesize'
+
+        // 4.3 建立连接
+        ws = new WebSocket(wsUrl)
+        ws.binaryType = 'arraybuffer' // 关键
+
+        ws.onopen = () => {
+            // console.log('WS Open')
+            ws.send(JSON.stringify({
+                text: text,
+                speaker_id: 0,
+                length_scale: 1.0,
+                noise_scale: 0.667
+            }))
+            isLoading.value = false
+        }
+
+        ws.onmessage = (event) => {
+            if (event.data instanceof ArrayBuffer) {
+                bufferQueue.push(event.data)
+                processQueue()
+            }
+        }
+
+        ws.onerror = (e) => {
+            console.error('WS Error:', e)
+            cancelAudio()
+        }
+
+        ws.onclose = () => {
+            // console.log('WS Closed')
+            isStreamEnded = true
+            // 检查是否需要结束 MSE 流
+            checkEndOfStream()
+        }
+    }
+
+    // 处理缓冲队列
+    const processQueue = () => {
+        if (!sourceBuffer || sourceBuffer.updating || bufferQueue.length === 0) {
+            // 如果队列空了，且流已结束，尝试结束 MSE
+            if (bufferQueue.length === 0 && isStreamEnded && !sourceBuffer.updating) {
+                checkEndOfStream()
+            }
+            return
+        }
+
+        isAppending = true
+        const chunk = bufferQueue.shift()
+
+        try {
+            sourceBuffer.appendBuffer(chunk)
+        } catch (e) {
+            // console.error('AppendBuffer Error:', e)
+            isAppending = false
+        }
+    }
+
+    // 结束 MSE 流
+    const checkEndOfStream = () => {
+        if (mediaSource && mediaSource.readyState === 'open' && bufferQueue.length === 0 && !sourceBuffer
+            ?.updating) {
+            try {
+                mediaSource.endOfStream()
+            } catch (e) {}
+        }
+    }
+
+    const pause = () => {
+        if (audio && !audio.paused) {
+            audio.pause()
+            isPaused.value = true
+            isSpeaking.value = false
+        }
+    }
+
+    const resume = () => {
+        if (audio && audio.paused) {
+            audio.play()
+            isPaused.value = false
+            isSpeaking.value = true
+        }
+    }
+
+    // === 新增/核心方法：取消并停止 ===
+    const cancelAudio = () => {
+        // 1. 断开 WebSocket (停止数据接收)
+        if (ws) {
+            // 移除监听器防止报错
+            ws.onclose = null
+            ws.onerror = null
+            ws.onmessage = null
+            ws.close()
+            ws = null
+        }
+
+        // 2. 停止音频播放
+        if (audio) {
+            audio.pause()
+            // 释放 Blob URL 内存
+            if (audio.src) {
+                URL.revokeObjectURL(audio.src)
+                audio.removeAttribute('src')
+            }
+            audio.currentTime = 0
+        }
+
+        // 3. 清理 MSE 对象
+        if (mediaSource) {
+            try {
+                if (mediaSource.readyState === 'open') {
+                    mediaSource.endOfStream()
+                }
+            } catch (e) {}
+            mediaSource = null
+        }
+
+        sourceBuffer = null
+        bufferQueue = []
+        isAppending = false
+        isStreamEnded = false
+
+        // 4. 重置 UI 状态
+        resetState()
+    }
+
+    // 只是重置 UI 变量的辅助函数
+    const resetState = () => {
+        isSpeaking.value = false
+        isPaused.value = false
+        isLoading.value = false
+    }
+
+    // 别名 stop -> cancelAudio (保持兼容性)
+    const stop = cancelAudio
+
+    // === 生命周期 ===
+    onMounted(() => {
+        initAudioElement()
+    })
+
+    onUnmounted(() => {
+        cancelAudio()
+        audio = null
+    })
+
+    if (typeof onHide === 'function') onHide(cancelAudio)
+    if (typeof onUnload === 'function') onUnload(cancelAudio)
+
+    return {
+        speak,
+        pause,
+        resume,
+        stop,
+        cancelAudio, // 新增导出
+        isSpeaking,
+        isPaused,
+        isLoading
+    }
+}
+
+/**
+ * 提取文本逻辑
+ */
+function extractSpeechText(markdown) {
+    if (!markdown || markdown.indexOf('job-json') === -1) {
+        return markdown;
+    }
+
+    const jobRegex = /``` job-json\s*({[\s\S]*?})\s*```/g;
+    const jobs = [];
+    let match;
+    let lastJobEndIndex = 0;
+    let firstJobStartIndex = -1;
+
+    while ((match = jobRegex.exec(markdown)) !== null) {
+        const jobStr = match[1];
+        try {
+            const job = JSON.parse(jobStr);
+            jobs.push(job);
+            if (firstJobStartIndex === -1) {
+                firstJobStartIndex = match.index;
+            }
+            lastJobEndIndex = jobRegex.lastIndex;
+        } catch (e) {
+            console.warn('JSON 解析失败', e);
+        }
+    }
+
+    const guideText = firstJobStartIndex > 0 ?
+        markdown.slice(0, firstJobStartIndex).trim() : '';
+
+    const endingText = lastJobEndIndex < markdown.length ?
+        markdown.slice(lastJobEndIndex).trim() : '';
+
+    const jobTexts = jobs.map((job, index) => {
+        return `第 ${index + 1} 个岗位，岗位名称是：${job.jobTitle}，公司是：${job.companyName}，薪资：${job.salary}，地点：${job.location}，学历要求：${job.education}，经验要求：${job.experience}。`;
+    });
+
+    const finalTextParts = [];
+    if (guideText) finalTextParts.push(guideText);
+    finalTextParts.push(...jobTexts);
+    if (endingText) finalTextParts.push(endingText);
+
+    return finalTextParts.join('\n');
+}

index.html

@@ -18,9 +18,14 @@
         </script>
         <title></title>
         <!-- eruda -->
-        <script src="https://cdn.jsdelivr.net/npm/eruda"></script>
+        <!-- <script src="https://cdn.jsdelivr.net/npm/eruda"></script>
         <script>
             eruda.init();
+        </script> -->
+        <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
+        <script>
+            // VConsole 默认会挂载到 `window.VConsole` 上
+            var vConsole = new window.VConsole();
         </script>
         <!-- 爱山东jssdk 本sdk存在性能问题 -->
         <script type="text/javascript" src="https://isdapp.shandong.gov.cn/jmopen/jssdk/index.js"></script>

main.js

@@ -1,8 +1,12 @@
 import App from '@/App'
 import * as Pinia from 'pinia'
+import {
+    createUnistorage
+} from "./uni_modules/pinia-plugin-unistorage";
 import globalFunction from '@/common/globalFunction'
 import '@/lib/string-similarity.min.js'
 import similarityJobs from '@/utils/similarity_Job.js';
+
 // 组件
 import AppLayout from './components/AppLayout/AppLayout.vue';
 import Empty from './components/empty/empty.vue';
@@ -65,7 +69,10 @@ export function createApp() {
     app.provide('deviceInfo', globalFunction.getdeviceInfo());
 
     app.use(SelectPopupPlugin);
-    app.use(Pinia.createPinia());
+
+    const store = Pinia.createPinia();
+    store.use(createUnistorage());
+    app.use(store);
 
     return {
         app,

packageA/pages/Intendedposition/Intendedposition.vue

@@ -1,13 +1,13 @@
 <template>
     <view class="collection-content">
-        <renderDeliveryRecord 
+        <renderDeliveryRecord
             v-if="pageState.list.length"
             seeDate="applyTime"
             :list="pageState.list"
             :longitude="longitudeVal"
-            :latitude="latitudeVal">
-        </renderDeliveryRecord>
-        <empty v-else pdTop="200"></empty>
+            :latitude="latitudeVal"
+        ></renderDeliveryRecord>
+        <empty v-else :is-position="true"></empty>
     </view>
 </template>
 
@@ -53,7 +53,7 @@ function getJobList(type = 'add') {
         current: pageState.page,
         pageSize: pageState.pageSize,
     };
-    $api.createRequest('/app/user/apply/job', params).then((resData) => {
+    const LoadCache = (resData) => {
         const { rows, total } = resData;
         if (type === 'add') {
             const str = pageState.pageSize * (pageState.page - 1);
@@ -66,8 +66,9 @@ function getJobList(type = 'add') {
         // pageState.list = resData.rows;
         pageState.total = resData.total;
         pageState.maxPage = Math.ceil(pageState.total / pageState.pageSize);
-        console.log(pageState.list);
-    });
+    };
+
+    $api.createRequestWithCache('/app/user/apply/job', params, 'GET', false, {}, LoadCache).then(LoadCache);
 }
 </script>
 
@@ -75,7 +76,8 @@ function getJobList(type = 'add') {
 .collection-content{
     padding: 1rpx 28rpx 20rpx 28rpx;
     background: #F4F4F4;
-    height: 100%
+    height: 100%;
     min-height: calc(100vh - var(--window-top) - var(--status-bar-height) - var(--window-bottom));
+    position: relative;
 }
 </style>

packageA/pages/UnitDetails/UnitDetails.vue

@@ -62,7 +62,7 @@
                         :longitude="longitudeVal"
                         :latitude="latitudeVal"
                     ></renderJobs>
-                    <empty v-else pdTop="200"></empty>
+                    <empty v-else :is-position="true"></empty>
                 </view>
             </scroll-view>
         </view>
@@ -93,10 +93,10 @@ const pageOptions = ref({});
 const dataType = ref(1); // 1: 原数据, 2: 第三方数据
 
 onLoad((options) => {
-    console.log(options);
+    // console.log(options);
     dataType.value = options.dataType ? parseInt(options.dataType) : 1;
     pageOptions.value = options;
-    
+
     if (dataType.value === 2) {
         // 第三方数据
         getCompanyInfo(options.companyId, options.zphId);
@@ -145,13 +145,13 @@ function getCompanyInfo(...args) {
     if (dataType.value === 2) {
         // 第三方数据接口
         const [companyId, zphId] = args;
-        $api.createRequest(`/app/internal/companyThirdPart/${companyId}/${zphId}`).then((resData) => {
+        $api.createRequest(`/app/internal/companyThirdPart/${companyId}/${zphId}`, {}, 'GET', true).then((resData) => {
             companyInfo.value = resData.data;
         });
     } else {
         // 原数据接口
         const [companyId] = args;
-        $api.createRequest(`/app/company/${companyId}`).then((resData) => {
+        $api.createRequest(`/app/company/${companyId}`, {}, 'GET', true).then((resData) => {
             companyInfo.value = resData.data;
             getJobsList();
         });
@@ -170,7 +170,7 @@ function getJobsList(type = 'add') {
 
 function getThirdPartyJobsList(type = 'add') {
     const { companyId, companyName, zphId } = pageOptions.value;
-    
+
     if (type === 'refresh') {
         pageState.current = 1;
         pageState.maxPage = 1;
@@ -178,13 +178,18 @@ function getThirdPartyJobsList(type = 'add') {
     if (type === 'add' && pageState.current < pageState.maxPage) {
         pageState.current += 1;
     }
-    
+
     let params = {
         current: pageState.current,
         pageSize: pageState.pageSize,
     };
-    
-    $api.createRequest(`/app/internal/jobThirdPart?gsID=${companyId}&gsmc=${companyName}&zphID=${zphId}`, params).then((resData) => {
+
+    $api.createRequest(
+        `/app/internal/jobThirdPart?gsID=${companyId}&gsmc=${companyName}&zphID=${zphId}`,
+        params,
+        'GET',
+        true
+    ).then((resData) => {
         const { rows, total } = resData;
         handleJobsListResponse(type, rows, total, 'current');
     });
@@ -198,13 +203,13 @@ function getOriginalJobsList(type = 'add') {
     if (type === 'add' && pageState.page < pageState.maxPage) {
         pageState.page += 1;
     }
-    
+
     let params = {
         current: pageState.page,
         pageSize: pageState.pageSize,
     };
-    
-    $api.createRequest(`/app/company/job/${companyInfo.value.companyId}`, params).then((resData) => {
+
+    $api.createRequest(`/app/company/job/${companyInfo.value.companyId}`, params, 'GET', true).then((resData) => {
         const { rows, total } = resData;
         handleJobsListResponse(type, rows, total, 'page');
     });
@@ -322,6 +327,8 @@ image {
     background: #F4F4F4;
     .views{
         padding: 28rpx
+        min-height: calc(100% - 56rpx)
+        position: relative
         .Detail-title{
             font-weight: 600;
             font-size: 32rpx;
@@ -402,4 +409,4 @@ image {
         }
     }
 }
-</style>
+</style>

packageA/pages/addPosition/addPosition.vue

@@ -176,12 +176,13 @@ function complete(values) {
 }
 
 function getTree() {
-    $api.createRequest('/app/common/jobTitle/treeselect', {}, 'GET').then((resData) => {
+    const LoadCache = (resData) => {
         if (resData.code === 200) {
             dataSource.value = flattenTree(resData.data);
             treeDataList.value = resData.data;
         }
-    });
+    };
+    $api.createRequestWithCache('/app/common/jobTitle/treeselect', {}, 'GET', false, LoadCache).then(LoadCache);
 }
 
 function flattenTree(treeData, parentPath = '') {

packageA/pages/browseJob/browseJob.vue

@@ -24,15 +24,14 @@
             </view>
             <scroll-view scroll-y class="main-scroll" @scrolltolower="getJobList('add')">
                 <view class="one-cards">
-                        <renderJobViewRecord
-                            :list="pageState.list"
-                            v-if="pageState.list.length"
-                            :longitude="longitudeVal"
-                            :latitude="latitudeVal"
-                        ></renderJobViewRecord>
-                        <empty v-else pdTop="200"></empty>
-                        <!-- <loadmore ref="loadmoreRef"></loadmore> -->
-         
+                    <renderJobViewRecord
+                        :list="pageState.list"
+                        v-if="pageState.list.length"
+                        :longitude="longitudeVal"
+                        :latitude="latitudeVal"
+                    ></renderJobViewRecord>
+                    <empty v-else></empty>
+                    <!-- <loadmore ref="loadmoreRef"></loadmore> -->
                 </view>
             </scroll-view>
         </view>
@@ -87,8 +86,6 @@ function toSelectDate() {
     });
 }
 
-
-
 function searchCollection(e) {
     const value = e.detail.value;
     pageState.search.jobTitle = value;
@@ -167,9 +164,12 @@ image {
 .collection-content
     height: 100%
     display: flex
-    flex-direction: column
+    flex-direction: column;
+    background: #f4f4f4
+
 .collection-search
     padding: 10rpx 20rpx;
+    background: #FFFFFF;
 
     .search-content
         position: relative
@@ -216,6 +216,6 @@ image {
 .one-cards{
     padding: 0 20rpx 20rpx 20rpx;
     background: #f4f4f4
-
+    height: 100%
 }
-</style>
+</style>

packageA/pages/choiceness/choiceness.vue

@@ -50,10 +50,11 @@ function delCollectionCard(item) {
 }
 
 function getPremiumList() {
-    $api.createRequest('/app/company/card').then((resData) => {
+    const LoadCache = (resData) => {
         const { rows, total } = resData;
         list.value = rows;
-    });
+    };
+    $api.createRequestWithCache('/app/company/card', {}, 'GET', false, {}, LoadCache).then(LoadCache);
 }
 
 function seeDetail(item) {

packageA/pages/choicenessList/choicenessList.vue

@@ -27,7 +27,7 @@
                 :longitude="longitudeVal"
                 :latitude="latitudeVal"
             ></renderCompanys>
-            <empty v-else pdTop="200"></empty>
+            <empty v-else is-position></empty>
         </view>
     </AppLayout>
 </template>
@@ -151,6 +151,8 @@ image {
 }
 .main-list{
     background-color: #F4F4F4;
-    padding: 1rpx 28rpx 28rpx 28rpx
+    padding: 1rpx 28rpx 28rpx 28rpx;
+    min-height: calc(100% - 29rpx);
+    position: relative
 }
 </style>

packageA/pages/collection/collection.vue

@@ -26,7 +26,7 @@
                                     :longitude="longitudeVal"
                                     :latitude="latitudeVal"
                                 ></renderJobCollectionRecord>
-                                <empty v-else pdTop="200"></empty>
+                                <empty v-else></empty>
                             </view>
                         </scroll-view>
                     </swiper-item>
@@ -44,7 +44,7 @@
                                     :longitude="longitudeVal"
                                     :latitude="latitudeVal"
                                 ></renderCompanyCollectionRecord>
-                                <empty v-else pdTop="200"></empty>
+                                <empty v-else></empty>
                             </view>
                         </scroll-view>
                     </swiper-item>
@@ -178,7 +178,8 @@ function getJobList(type = 'add') {
         current: pageState.page,
         pageSize: pageState.pageSize,
     };
-    $api.createRequest('/app/user/collection/job', params).then((resData) => {
+    const LoadCache = (resData) => {
+        console.log(resData);
         const { rows, total } = resData;
         if (type === 'add') {
             const str = pageState.pageSize * (pageState.page - 1);
@@ -191,7 +192,8 @@ function getJobList(type = 'add') {
         // pageState.list = resData.rows;
         pageState.total = resData.total;
         pageState.maxPage = Math.ceil(pageState.total / pageState.pageSize);
-    });
+    };
+    $api.createRequestWithCache('/app/user/collection/job', params, 'GET', false, {}, LoadCache).then(LoadCache);
 }
 
 function getCompanyList(type = 'add') {
@@ -206,7 +208,7 @@ function getCompanyList(type = 'add') {
         current: pageCompanyState.page,
         pageSize: pageCompanyState.pageSize,
     };
-    $api.createRequest('/app/user/collection/company', params).then((resData) => {
+    const LoadCache = (resData) => {
         const { rows, total } = resData;
         if (type === 'add') {
             const str = pageCompanyState.pageSize * (pageCompanyState.page - 1);
@@ -219,7 +221,8 @@ function getCompanyList(type = 'add') {
         // pageCompanyState.list = resData.rows;
         pageCompanyState.total = resData.total;
         pageCompanyState.maxPage = Math.ceil(pageCompanyState.total / pageCompanyState.pageSize);
-    });
+    };
+    $api.createRequestWithCache('/app/user/collection/company', params, 'GET', false, {}, LoadCache).then(LoadCache);
 }
 </script>
 
@@ -262,6 +265,7 @@ function getCompanyList(type = 'add') {
         .swiper{
             height: 100%
             .mian{
+                height: 100%
                 padding: 0 28rpx 28rpx 28rpx
             }
         }

packageA/pages/exhibitors/exhibitors.vue

@@ -83,7 +83,7 @@
                         :longitude="longitudeVal"
                         :latitude="latitudeVal"
                     ></renderCompanysOutData>
-                    <empty v-else pdTop="200"></empty>
+                    <empty v-else is-position></empty>
                 </view>
             </scroll-view>
         </view>
@@ -121,7 +121,7 @@ const pageState = reactive({
     maxPage: 1,
     pageSize: 10,
 });
-const hasnext = ref(true);
+const hasnext = ref(false);
 
 const zphId = ref('');
 const pageOptions = ref({});
@@ -134,7 +134,7 @@ onLoad((options) => {
 });
 
 function getJobFairInfo(id, name) {
-    $api.createRequest(`/app/internal/jobFairThirdPart/${id}`).then((resData) => {
+    $api.createRequest(`/app/internal/jobFairThirdPart/${id}`, {}, 'GET', true).then((resData) => {
         fairInfo.value = resData.data;
         hasAppointment();
     });
@@ -152,21 +152,24 @@ function getCompanyList(type = 'add') {
         current: pageState.current,
         pageSize: pageState.pageSize,
     };
-    $api.createRequest(`/app/internal/companyThirdPart/?zphID=${jobFairId}&zphmc=${jobFairName}`, params).then(
-        (resData) => {
-            const { rows, total } = resData;
-            if (type === 'add') {
-                const str = pageState.pageSize * (pageState.current - 1);
-                const end = pageState.list.length;
-                const reslist = rows;
-                pageState.list.splice(str, end, ...reslist);
-            } else {
-                pageState.list = rows;
-            }
-            pageState.total = resData.total;
-            pageState.maxPage = Math.ceil(pageState.total / pageState.pageSize);
+    $api.createRequest(
+        `/app/internal/companyThirdPart/?zphID=${jobFairId}&zphmc=${jobFairName}`,
+        params,
+        'GET',
+        true
+    ).then((resData) => {
+        const { rows, total } = resData;
+        if (type === 'add') {
+            const str = pageState.pageSize * (pageState.current - 1);
+            const end = pageState.list.length;
+            const reslist = rows;
+            pageState.list.splice(str, end, ...reslist);
+        } else {
+            pageState.list = rows;
         }
-    );
+        pageState.total = resData.total;
+        pageState.maxPage = Math.ceil(pageState.total / pageState.pageSize);
+    });
 }
 
 const hasAppointment = () => {
@@ -433,6 +436,8 @@ image {
     background: #F4F4F4;
     .views{
         padding: 28rpx
+        min-height: calc(100% - 56rpx);
+        position: relative
         .Detail-title{
             font-weight: 600;
             font-size: 32rpx;

packageA/pages/myResume/myResume.vue

@@ -186,7 +186,8 @@ function uploadResume(tempFilePath, loading) {
     header['Authorization'] = encodeURIComponent(Authorization);
     return new Promise((resolve, reject) => {
         uni.uploadFile({
-            url: config.baseUrl + '/app/oss/uploadToObs',
+            url: config.baseUrl + '/app/user/resume/recognition',
+            // url: config.baseUrl + '/app/oss/uploadToObs',
             filePath: tempFilePath,
             name: 'file',
             header,

packageA/pages/newJobPosition/newJobPosition.vue

@@ -24,12 +24,11 @@
             <scroll-view class="scroll-view" scroll-y @scrolltolower="scrollBottom">
                 <view class="list">
                     <renderJobs
-                        :list="pageState.list"
                         v-if="pageState.list.length"
                         :longitude="longitudeVal"
                         :latitude="latitudeVal"
                     ></renderJobs>
-                    <empty v-else pdTop="200"></empty>
+                    <empty v-else></empty>
                 </view>
             </scroll-view>
         </view>
@@ -140,6 +139,7 @@ function getList(type = 'add', loading = true) {
             height: 100%
             .list{
                 padding: 0 28rpx 28rpx 28rpx
+                height: calc(100% - 28rpx)
             }
         }
     }

packageA/pages/post/post.vue

@@ -11,7 +11,7 @@
                 <image src="@/static/icon/collect2.png" v-else @click="jobCollection"></image>
             </view>
         </template>
-        
+
         <!-- 根据 dataType 显示不同内容 -->
         <view class="content" v-show="!isEmptyObject(jobInfo)">
             <!-- 顶部信息区域 -->
@@ -23,7 +23,7 @@
                         :is-month="true"
                     ></Salary-Expectation>
                 </view>
-                <view class="top-salary"  v-else>
+                <view class="top-salary" v-else>
                     <Salary-Expectation
                         :max-salary="jobInfo.maxSalary"
                         :min-salary="jobInfo.minSalary"
@@ -35,17 +35,17 @@
                     <view class="info-img"><image src="/static/icon/post12.png"></image></view>
                     <!-- 第三方数据展示 -->
                     <view class="info-text" v-if="dataType === 2">
-                        {{jobInfo.xlyq == '不限' ? '学历不限' : jobInfo.xlyq}}
+                        {{ jobInfo.xlyq == '不限' ? '学历不限' : jobInfo.xlyq }}
                     </view>
                     <!-- 原数据展示 -->
                     <view class="info-text" v-else>
                         <dict-Label dictType="experience" :value="jobInfo.experience"></dict-Label>
                     </view>
-                    
+
                     <view class="info-img mar_le20"><image src="/static/icon/post13.png"></image></view>
                     <!-- 第三方数据展示 -->
                     <view class="info-text" v-if="dataType === 2">
-                        {{jobInfo.gwgzjy == '不限' ? '经验不限' : jobInfo.gwgzjy}}
+                        {{ jobInfo.gwgzjy == '不限' ? '经验不限' : jobInfo.gwgzjy }}
                     </view>
                     <!-- 原数据展示 -->
                     <view class="info-text" v-else>
@@ -83,12 +83,7 @@
             <view class="content-card">
                 <view class="card-title">
                     <text class="title">公司信息</text>
-                    <text
-                        class="btntext button-click"
-                        @click="handleCompanyDetail"
-                    >
-                        单位详情
-                    </text>
+                    <text class="btntext button-click" @click="handleCompanyDetail">单位详情</text>
                 </view>
                 <view class="company-info">
                     <view class="companyinfo-left">
@@ -103,12 +98,12 @@
                                 :value="jobInfo.company?.industry"
                             ></dict-tree-Label>
                             <span v-if="dataType !== 2 && jobInfo.company?.industry">&nbsp;</span>
-                            <dict-Label 
-                                v-if="dataType !== 2" 
-                                dictType="scale" 
+                            <dict-Label
+                                v-if="dataType !== 2"
+                                dictType="scale"
                                 :value="jobInfo.company?.scale"
                             ></dict-Label>
-                            <span v-if="dataType === 2">{{jobInfo.qyxz}}</span>
+                            <span v-if="dataType === 2">{{ jobInfo.qyxz }}</span>
                         </view>
                         <view class="row2">
                             <text>在招</text>
@@ -128,7 +123,7 @@
             </view>
 
             <!-- 竞争力分析区域 -->
-            <view class="content-card" v-if="dataType !== 2">
+            <view class="content-card" v-if="dataType !== 2 && raderData?.totalApplicants > 2">
                 <view class="card-title">
                     <text class="title">竞争力分析</text>
                 </view>
@@ -156,19 +151,24 @@
                     </view>
                 </view>
             </view>
-            
+
             <view style="height: 24px"></view>
         </view>
 
         <template #footer>
             <view class="footer">
-                <view v-if="dataType==2" class="btn-wq button-click" :class="{'btn-des' : jobInfo.isApply}" @click="jobApply">
-                    <span v-if="jobInfo.isApply"> 已投递 </span>
-                    <span v-if="!jobInfo.isApply"> 立即投递</span>
+                <view
+                    v-if="dataType == 2"
+                    class="btn-wq button-click"
+                    :class="{ 'btn-des': jobInfo.isApply }"
+                    @click="jobApply"
+                >
+                    <span v-if="jobInfo.isApply">已投递</span>
+                    <span v-if="!jobInfo.isApply">立即投递</span>
                 </view>
                 <view v-else class="btn-wq button-click" @click="jobApply">
-                    <span v-if="jobInfo.isApply"> 立即前往</span>
-                    <span v-if="!jobInfo.isApply">立即投递 </span>
+                    <span v-if="jobInfo.isApply">立即前往</span>
+                    <span v-if="!jobInfo.isApply">立即投递</span>
                 </view>
             </view>
         </template>
@@ -232,12 +232,12 @@ function getDetail(jobId) {
     if (dataType.value === 2) {
         // 第三方数据接口
         return new Promise((reslove, reject) => {
-            $api.createRequest(`/app/internal/jobThirdPart/${jobId}`).then((resData) => {
+            $api.createRequest(`/app/internal/jobThirdPart/${jobId}`, {}, 'GET', true).then((resData) => {
                 const { gsID, gsmc, zphID } = resData.data;
                 jobInfo.value = resData.data;
                 reslove(resData.data);
                 getCompanyIsAJobs(gsID, gsmc, zphID);
-                
+
                 if (resData.data.latitude && resData.data.longitude) {
                     initMapCovers(resData.data.latitude, resData.data.longitude, resData.data.gsmc);
                 }
@@ -245,12 +245,12 @@ function getDetail(jobId) {
         });
     } else {
         // 原数据接口
-        $api.createRequest(`/app/job/${jobId}`).then((resData) => {
+        $api.createRequest(`/app/job/${jobId}`, {}, 'GET', true).then((resData) => {
             const { latitude, longitude, companyName, companyId } = resData.data;
             jobInfo.value = resData.data;
             getCompanyIsAJobs(companyId);
             getCompetivetuveness(jobId);
-            
+
             if (latitude && longitude) {
                 initMapCovers(latitude, longitude, companyName);
             }
@@ -315,12 +315,12 @@ function jobApply() {
     if (dataType.value === 2) {
         // 第三方数据申请逻辑
         const params = {
-            jobid:jobInfo.value.id,
-            jobname:jobInfo.value.gwmc
-        }
+            jobid: jobInfo.value.id,
+            jobname: jobInfo.value.gwmc,
+        };
         if (jobInfo.value.isApply) {
             $api.msg('已经投递过该岗位了~');
-            return ;
+            return;
         } else {
             $api.createRequest(`/app/internal/sendResume`, params, 'POST').then((resData) => {
                 $api.msg('投递成功');
@@ -380,7 +380,9 @@ function jobCollection() {
 // 处理公司详情跳转
 function handleCompanyDetail() {
     if (dataType.value === 2) {
-        navTo(`/packageA/pages/UnitDetails/UnitDetails?companyId=${jobInfo.value.gsID}&companyName=${jobInfo.value.gsmc}&zphId=${jobInfo.value.zphID}&dataType=2`);
+        navTo(
+            `/packageA/pages/UnitDetails/UnitDetails?companyId=${jobInfo.value.gsID}&companyName=${jobInfo.value.gsmc}&zphId=${jobInfo.value.zphID}&dataType=2`
+        );
     } else {
         navTo(`/packageA/pages/UnitDetails/UnitDetails?companyId=${jobInfo.value.company.companyId}`);
     }
@@ -660,4 +662,4 @@ for i in 0..100
         box-shadow: 0rpx -4rpx 24rpx 0rpx rgba(11,44,112,0.12);
     }
 }
-</style>
+</style>

packageA/pages/reservation/reservation.vue

@@ -12,10 +12,19 @@
             </view>
         </view>
         <view class="main">
-            <scroll-view scroll-y>
-                <view v-if="pageState.list.length">
+            <scroll-view class="height-100" scroll-y>
+                <view>
                     <view class="card" v-for="(item, index) in pageState.list" :key="index">
-                        <view @click="navTo('/packageA/pages/exhibitors/exhibitors?jobFairId=' + item.zphID + '&jobFairName=' + item.zphmc)">
+                        <view
+                            @click="
+                                navTo(
+                                    '/packageA/pages/exhibitors/exhibitors?jobFairId=' +
+                                        item.zphID +
+                                        '&jobFairName=' +
+                                        item.zphmc
+                                )
+                            "
+                        >
                             <view class="card-row">
                                 <Countdown :startTime="item.zphjbsj" :endTime="item.zphjzsj" />
                             </view>
@@ -37,7 +46,7 @@
                         </view>
                     </view>
                 </view>
-                <empty v-else pdTop="200"></empty>
+                <empty v-if="!pageState.list.length"></empty>
             </scroll-view>
         </view>
     </view>
@@ -72,7 +81,7 @@ const ranOptions = ref([
 ]);
 
 function isTimePassed(timeStr) {
-    if(!timeStr) return false
+    if (!timeStr) return false;
     const targetTime = new Date(timeStr.replace(/-/g, '/')).getTime(); // 兼容格式
     const now = Date.now();
     return now < targetTime;
@@ -95,16 +104,14 @@ function updateCancel(item) {
         content: '确定要取消预约吗?',
         showCancel: true,
         success: ({ confirm, cancel }) => {
-            if(confirm){
-                 $api.createRequest(`/app/fair/collection/${fairId}`, {}, 'DELETE').then((resData) => {
+            if (confirm) {
+                $api.createRequest(`/app/fair/collection/${fairId}`, {}, 'DELETE').then((resData) => {
                     getList('refresh');
                     $api.msg('取消预约成功');
                 });
             }
-        }
-    })
-    
-    
+        },
+    });
 }
 
 function getList(type = 'add', loading = true) {
@@ -120,7 +127,7 @@ function getList(type = 'add', loading = true) {
         pageSize: pageState.pageSize,
         type: ranItem.value.value,
     };
-    $api.createRequest('/app/user/collection/fair', params).then((resData) => {
+    const LoadCache = (resData) => {
         const { rows, total } = resData;
         if (type === 'add') {
             const str = pageState.pageSize * (pageState.page - 1);
@@ -133,7 +140,8 @@ function getList(type = 'add', loading = true) {
         // pageState.list = resData.rows;
         pageState.total = resData.total;
         pageState.maxPage = Math.ceil(pageState.total / pageState.pageSize);
-    });
+    };
+    $api.createRequestWithCache('/app/user/collection/fair', params, 'GET', false, {}, LoadCache).then(LoadCache);
 }
 </script>
 
@@ -178,7 +186,7 @@ function getList(type = 'add', loading = true) {
                     display: flex
                     align-items: center
                 }
-                    
+
             }
             .card-Title{
                 font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;

packageA/pages/selectDate/selectDate.vue

@@ -26,6 +26,7 @@
                         <view
                             class="item button-click"
                             :class="{
+                                optional: item.isThisMonth && hasZphInData(item),
                                 noOptional: !item.isThisMonth,
                                 active: current.date === item.date && item.isThisMonth,
                             }"
@@ -59,6 +60,8 @@ const pages = reactive({
     month: 0,
 });
 
+const hasZphDateArray = ref([]);
+
 onLoad((options) => {
     if (options.date) {
         current.value = {
@@ -77,8 +80,32 @@ onLoad((options) => {
             addMonth();
         });
     }
+    if (options.entrance === 'careerfair') {
+        updateDateArray();
+    }
 });
 
+function hasZphInData(item) {
+    if (!item || typeof item.date !== 'string') {
+        return false;
+    }
+
+    const dateArray = Array.isArray(hasZphDateArray.value) ? hasZphDateArray.value : [];
+
+    return dateArray.some((date) => {
+        return typeof date === 'string' && date === item.date;
+    });
+}
+
+async function updateDateArray() {
+    const LoadCache = (resData) => {
+        if (resData.code === 200) {
+            hasZphDateArray.value = resData.data;
+        }
+    };
+    $api.createRequestWithCache('/app/internal/getDateList', {}, 'GET', false, {}, LoadCache).then(LoadCache);
+}
+
 function backParams() {
     if (isValidDateString(current.value.date)) {
         navBack({

pages.json

@@ -117,7 +117,7 @@
             {
                 "path": "pages/vCard/vCard",
                 "style": {
-                    "navigationBarTitleText": "点子名片",
+                    "navigationBarTitleText": "电子名片",
                     "navigationBarBackgroundColor": "#FFFFFF",
                     "navigationStyle": "custom"
                 }
@@ -227,8 +227,8 @@
         ]
     }],
     "tabBar": {
-        "custom": true,
-        "display": "none",
+        // "custom": true,
+        // "display": "none",
         "color": "#5E5F60",
         "selectedColor": "#256BFA",
         "borderStyle": "black",

pages/careerfair/careerfair copy.vue

@@ -37,7 +37,7 @@
             <!-- 主体内容区域 -->
             <view class="container-main">
                 <scroll-view scroll-y class="main-scroll" @scrolltolower="handleScrollToLower">
-                    <view class="cards" v-if="fairList.length">
+                    <view class="cards">
                         <view
                             class="card press-button"
                             v-for="(item, index) in fairList"
@@ -80,7 +80,7 @@
                             <view class="card-footer">内容简介：{{ item.zphjj }}</view>
                         </view>
                     </view>
-                    <empty v-else pdTop="200"></empty>
+                    <empty v-if="!fairList.length" pdTop="200"></empty>
                 </scroll-view>
             </view>
             <Tabbar :currentpage="1"></Tabbar>
@@ -122,7 +122,7 @@ onLoad(() => {
         startDate: currentDate,
     });
     weekList.value = result;
-    currentDay.value.fullDate = result[0].fullDate
+    currentDay.value.fullDate = result[0].fullDate;
     getFair('refresh');
 });
 
@@ -162,12 +162,11 @@ function seemsg(index) {
 }
 
 const handleScrollToLower = () => {
-    return
+    return;
     getFair();
     console.log('触底');
 };
 
-
 function getFair(type = 'add') {
     if (type === 'refresh') {
         pageState.page = 1;
@@ -194,7 +193,7 @@ function getFair(type = 'add') {
             // const end = fairList.value.length;
             // const reslist = rows;
             // fairList.value.splice(str, end, ...reslist);
-            fairList.value = rows
+            fairList.value = rows;
         } else {
             fairList.value = rows;
         }

pages/careerfair/careerfair.vue

@@ -13,7 +13,14 @@
                 </view>
                 <view class="header-input btn-feel">
                     <uni-icons class="iconsearch" color="#666666" type="search" size="18"></uni-icons>
-                    <input  v-model="pageState.zphmc" confirm-type="search"  @confirm="getFair" class="input" placeholder="招聘会" placeholder-class="inputplace" />
+                    <input
+                        v-model="pageState.zphmc"
+                        confirm-type="search"
+                        @confirm="getFair"
+                        class="input"
+                        placeholder="招聘会"
+                        placeholder-class="inputplace"
+                    />
                 </view>
                 <view class="header-date">
                     <view class="data-week">
@@ -37,12 +44,19 @@
             <!-- 主体内容区域 -->
             <view class="container-main">
                 <scroll-view scroll-y class="main-scroll" @scrolltolower="handleScrollToLower">
-                    <view class="cards" v-if="fairList.length">
+                    <view class="cards">
                         <view
                             class="card press-button"
                             v-for="(item, index) in fairList"
                             :key="index"
-                            @click="navTo('/packageA/pages/exhibitors/exhibitors?jobFairId=' + item.zphID + '&jobFairName=' + item.zphmc)"
+                            @click="
+                                navTo(
+                                    '/packageA/pages/exhibitors/exhibitors?jobFairId=' +
+                                        item.zphID +
+                                        '&jobFairName=' +
+                                        item.zphmc
+                                )
+                            "
                         >
                             <view class="card-title">{{ item.zphmc }}</view>
                             <view class="card-row">
@@ -80,10 +94,10 @@
                             <view class="card-footer">内容简介：{{ item.zphjj }}</view>
                         </view>
                     </view>
-                    <empty v-else pdTop="200"></empty>
+                    <empty v-if="!fairList.length"></empty>
                 </scroll-view>
             </view>
-            <Tabbar :currentpage="1"></Tabbar>
+            <!-- <Tabbar :currentpage="1"></Tabbar> -->
         </view>
     </view>
 </template>
@@ -95,7 +109,7 @@ import Tabbar from '@/components/tabbar/midell-box.vue';
 import useLocationStore from '@/stores/useLocationStore';
 import { storeToRefs } from 'pinia';
 const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
-const { $api, navTo, cloneDeep,debounce } = inject('globalFunction');
+const { $api, navTo, cloneDeep, debounce } = inject('globalFunction');
 const weekList = ref([]);
 const fairList = ref([]);
 const currentDay = ref({});
@@ -108,7 +122,7 @@ const pageState = reactive({
     total: 0,
     maxPage: 2,
     pageSize: 10,
-    zphmc:''
+    zphmc: '',
 });
 
 onLoad(() => {
@@ -122,7 +136,7 @@ onLoad(() => {
         startDate: currentDate,
     });
     weekList.value = result;
-    currentDay.value.fullDate = result[0].fullDate
+    currentDay.value.fullDate = result[0].fullDate;
     getFair('refresh');
 });
 
@@ -130,6 +144,7 @@ function toSelectDate() {
     navTo('/packageA/pages/selectDate/selectDate', {
         query: {
             date: currentDay.value.fullDate,
+            entrance: 'careerfair',
         },
         onBack: (res) => {
             console.log(res);
@@ -162,12 +177,11 @@ function seemsg(index) {
 }
 
 const handleScrollToLower = () => {
-    return
+    return;
     getFair();
     console.log('触底');
 };
 
-
 function getFair(type = 'add') {
     if (type === 'refresh') {
         pageState.page = 1;
@@ -177,7 +191,7 @@ function getFair(type = 'add') {
         pageState.page += 1;
     }
     let params = {
-        zphmc:pageState.zphmc,
+        zphmc: pageState.zphmc,
         // current: pageState.page,
         // pageSize: pageState.pageSize,
     };
@@ -187,14 +201,14 @@ function getFair(type = 'add') {
     if (currentDay.value?.fullDate) {
         params.zphjbsj = currentDay.value.fullDate.replace(/-/g, '');
     }
-    $api.createRequest('/app/internal/jobFairThirdPart', params).then((resData) => {
+    $api.createRequest('/app/internal/jobFairThirdPart', params, 'GET', true).then((resData) => {
         const { rows, total } = resData;
         if (type === 'add') {
             // const str = pageState.pageSize * (pageState.page - 1);
             // const end = fairList.value.length;
             // const reslist = rows;
             // fairList.value.splice(str, end, ...reslist);
-            fairList.value = rows
+            fairList.value = rows;
         } else {
             fairList.value = rows;
         }

pages/chat/chat.vue

@@ -63,9 +63,9 @@
                 <ai-paging ref="paging"></ai-paging>
             </view>
             <!-- 自定义tabbar -->
-            <view class="chatmain-footer" v-show="!isDrawerOpen">
+            <!-- <view class="chatmain-footer" v-show="!isDrawerOpen">
                 <Tabbar :currentpage="2"></Tabbar>
-            </view>
+            </view> -->
         </view>
     </view>
 </template>
@@ -213,27 +213,48 @@ footer-height = 98rpx
     background: #FFFFFF;
     display: flex
     flex-direction: column
-    .drawer-user
-        border-top: 1rpx solid rgba(0,0,0,.1);
-        padding: 20rpx 28rpx
-        display: flex
+    .drawer-user {
+        display: flex;
+        align-items: center;
+        width: 100%;
+        box-sizing: border-box;
+        padding: 24rpx 32rpx;
+        padding-bottom: calc(24rpx + constant(safe-area-inset-bottom));
+        padding-bottom: calc(24rpx + env(safe-area-inset-bottom));
+        border-top: 1rpx solid rgba(0, 0, 0, 0.06);
+        background-color: #ffffff;
+        color: #333333;
         font-weight: 500;
-        align-items: center
-        position: relative
-        margin-bottom: calc( 32rpx + var(--window-bottom)); /*兼容 IOS<11.2*/
-        margin-bottom: calc( 32rpx +var(--window-bottom)); /*兼容 IOS>11.2*/
-        color: #000000
-        .drawer-user-img
-            width: 57.2rpx;
-            height: 57.2rpx
-            margin-right: 20rpx
-        .drawer-user-setting
-            width: 48rpx
-            height: 48rpx
-            position: absolute
-            top: 50%
-            right: 28rpx
-            transform: translate(0,-50%)
+        font-size: 28rpx;
+
+        &:active {
+            background-color: #f9f9f9;
+        }
+
+        .drawer-user-img {
+            width: 60rpx;
+            height: 60rpx;
+            border-radius: 50%;
+            margin-right: 24rpx;
+            background-color: #eee;
+            flex-shrink: 0;
+        }
+
+        .user-name {
+            flex: 1;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            font-size: 30rpx;
+        }
+
+        .drawer-user-setting {
+            width: 48rpx;
+            height: 48rpx;
+            margin-left: auto;
+            opacity: 0.8;
+        }
+    }
     .drawer-title
         height: header-height;
         line-height: header-height;

pages/chat/components/ai-paging.vue

@@ -240,7 +240,7 @@
                 </scroll-view>
             </view>
         </view>
-        <PopupFeeBack ref="feeback" @onSend="confirmFeeBack"></PopupFeeBack>
+        <PopupFeeBack ref="feeback" @onClose="colseFeeBack" @onSend="confirmFeeBack"></PopupFeeBack>
         <MsgTips ref="feeBackTips" content="已收到反馈，感谢您的关注" title="反馈成功" :icon="successIcon"></MsgTips>
     </view>
 </template>
@@ -268,10 +268,10 @@ import WaveDisplay from './WaveDisplay.vue';
 import FileIcon from './fileIcon.vue';
 import FileText from './fileText.vue';
 // 系统功能hook和阿里云hook
-// import { useAudioRecorder } from '@/hook/useRealtimeRecorder.js';
-import { useAudioRecorder } from '@/hook/useSystemSpeechReader.js';
-// import { useTTSPlayer } from '@/hook/useTTSPlayer.js';
-import { useTTSPlayer } from '@/hook/useSystemPlayer.js';
+import { useAudioRecorder } from '@/hook/useRealtimeRecorder2.js';
+// import { useAudioRecorder } from '@/hook/useSystemSpeechReader.js';
+import { useTTSPlayer } from '@/hook/useTTSPlayer2.js';
+// import { useTTSPlayer } from '@/hook/useSystemPlayer.js';
 // 全局
 const { $api, navTo, throttle } = inject('globalFunction');
 const emit = defineEmits(['onConfirm']);
@@ -612,17 +612,23 @@ function userGoodFeedback(msg) {
     // $api.msg('该功能正在开发中，敬请期待后续更新！');
     feeback.value?.open();
     feebackData.value = msg;
+    uni.hideTabBar()
 }
 
 function confirmFeeBack(value) {
     useChatGroupDBStore()
         .badFeedback(feebackData.value, value)
         .then(() => {
+            uni.showTabBar()
             feeback.value?.close();
             feeBackTips.value?.open();
         });
 }
 
+function colseFeeBack() {
+    uni.showTabBar()
+}
+
 function readMarkdown(value, index) {
     speechIndex.value = index;
     if (speechIndex.value !== index) {
@@ -632,7 +638,7 @@ function readMarkdown(value, index) {
     if (isPaused.value) {
         resume();
     } else {
-        console.log(value, speechIndex.value, index, isPaused.value)
+        // console.log(value, speechIndex.value, index, isPaused.value)
         speak(value);
     }
 }

pages/chat/components/popupbadFeeback.vue

@@ -1,5 +1,5 @@
 <template>
-    <uni-popup ref="popup" type="bottom" borderRadius="12px 12px 0 0" background-color="#F6F6F6">
+    <uni-popup ref="popup" type="bottom" borderRadius="12px 12px 0 0" @change="changePopup" background-color="#F6F6F6">
         <view class="feeback">
             <view class="titile">反馈</view>
             <view class="pop-h3">针对问题</view>
@@ -38,7 +38,7 @@
 
 <script setup>
 import { ref, inject } from 'vue';
-const emit = defineEmits(['onSend']);
+const emit = defineEmits(['onSend', 'onClose']);
 const { $api } = inject('globalFunction');
 const popup = ref(null);
 const inputText = ref('');
@@ -66,6 +66,13 @@ function close() {
     popup.value.close();
 }
 
+function changePopup(e) {
+    if (e.show) {
+    } else {
+        emit('onClose');
+    }
+}
+
 function send() {
     const text = getLabel();
     if (text) {

pages/index/components/index-one.vue

@@ -66,7 +66,7 @@
         </view>
         <view class="table-list">
             <scroll-view :scroll-y="true" class="falls-scroll" @scroll="handleScroll" @scrolltolower="scrollBottom">
-                <view class="falls" v-if="list.length">
+                <view class="falls">
                     <custom-waterfalls-flow
                         :column="columnCount"
                         :columnSpace="columnSpace"
@@ -142,7 +142,7 @@
                     </custom-waterfalls-flow>
                     <loadmore ref="loadmoreRef"></loadmore>
                 </view>
-                <empty v-else pdTop="200"></empty>
+                <empty v-if="!list.length"></empty>
             </scroll-view>
         </view>
         <!-- 筛选 -->
@@ -298,6 +298,7 @@ function nextDetail(job) {
 function openFilter() {
     showFilter.value = true;
     emits('onShowTabbar', false);
+    uni.hideTabBar();
     selectFilterModel.value?.open({
         title: '筛选',
         maskClick: true,
@@ -310,10 +311,12 @@ function openFilter() {
             }
             showFilter.value = false;
             getJobList('refresh');
+            uni.showTabBar();
         },
         cancel: () => {
             showFilter.value = false;
             emits('onShowTabbar', true);
+            uni.showTabBar();
         },
     });
 }
@@ -359,7 +362,11 @@ function getJobRecommend(type = 'add') {
         ...pageState.search,
         ...conditionSearch.value,
     };
-    let comd = { recommend: true, jobCategory: '', tip: '确认你的兴趣，为您推荐更多合适的岗位' };
+    let comd = {
+        recommend: true,
+        jobCategory: '',
+        tip: '确认你的兴趣，为您推荐更多合适的岗位',
+    };
     $api.createRequest('/app/job/recommend', params).then((resData) => {
         const { data, total } = resData;
         pageState.total = 0;
@@ -380,7 +387,16 @@ function getJobRecommend(type = 'add') {
 
                     if (question) {
                         comd.jobCategory = question;
-                        data.unshift(comd);
+                        // 生成随机插入位置，排除前两个和最后两个位置
+                        let insertIndex;
+                        if (data.length <= 4) {
+                            // 如果数据长度小于等于4，直接插入到中间位置
+                            insertIndex = Math.floor(data.length / 2);
+                        } else {
+                            // 生成2到data.length-2之间的随机位置
+                            insertIndex = Math.floor(Math.random() * (data.length - 4)) + 2;
+                        }
+                        data.splice(insertIndex, 0, comd);
                     }
                 }
                 const reslist = dataToImg(data);

pages/index/components/index-two.vue

@@ -63,7 +63,8 @@
                             </view>
                         </template>
                     </custom-waterfalls-flow>
-                    <loadmore ref="loadmoreRef"></loadmore>
+                    <empty v-if="!list.length"></empty>
+                    <loadmore v-if="list.length >= pageSize" ref="loadmoreRef"></loadmore>
                 </view>
             </scroll-view>
         </view>
@@ -189,6 +190,7 @@ defineExpose({ loadData });
             text-overflow: clip;
             .scroll-content{
                 padding: 24rpx
+                height: calc(100% - 48rpx)
             }
 
 .nav-filter

pages/index/index.vue

@@ -41,7 +41,7 @@
                 </swiper>
             </view>
 
-            <Tabbar v-show="showTabbar" :currentpage="0"></Tabbar>
+            <!-- <Tabbar v-show="showTabbar" :currentpage="0"></Tabbar> -->
 
             <!-- maskFristEntry -->
             <view class="maskFristEntry" v-if="maskFristEntry">
@@ -49,7 +49,7 @@
                     <text class="text1">左滑查看视频</text>
                     <text class="text2">快去体验吧～</text>
                     <view class="goExperience" @click="goExperience">去体验</view>
-                    <view class="maskFristEntry-Close" @click="closeFristEntry">1</view>
+                    <view class="maskFristEntry-Close" @click="closeFristEntry"></view>
                 </view>
             </view>
         </view>
@@ -80,7 +80,16 @@ onLoad(() => {
     // 判断浏览器是否有 fristEntry 第一次进入
     let fristEntry = uni.getStorageSync('fristEntry') === false ? false : true; // 默认未读
     maskFristEntry.value = fristEntry;
-    // maskFristEntry.value = true;
+    if (fristEntry) {
+        uni.hideTabBar();
+    }
+    // 预加载较重页面
+    setTimeout(() => {
+        uni.preloadPage({ url: '/packageA/pages/post/post' });
+        uni.preloadPage({ url: '/pages/nearby/nearby' });
+        uni.preloadPage({ url: '/pages/chat/chat' });
+        uni.preloadPage({ url: '/packageA/pages/choiceness/choiceness' });
+    }, 3000);
 });
 
 onShow(() => {
@@ -187,10 +196,12 @@ function changeSwiperMsgType(e) {
 function closeFristEntry() {
     uni.setStorageSync('fristEntry', false);
     maskFristEntry.value = false;
+    uni.showTabBar();
 }
 
 function goExperience() {
     closeFristEntry();
+    uni.showTabBar();
     state.current = 1;
 }
 </script>

pages/login/login.vue

@@ -241,9 +241,10 @@ function nextStep() {
 
 // 获取职位
 function getTreeselect() {
-    $api.createRequest('/app/common/jobTitle/treeselect', {}, 'GET').then((resData) => {
+    const LoadCache = (resData) => {
         state.station = resData.data;
-    });
+    };
+    $api.createRequestWithCache('/app/common/jobTitle/treeselect', {}, 'GET', false, LoadCache).then(LoadCache);
 }
 
 function loginbackdoor() {
@@ -312,7 +313,7 @@ function complete() {
 .backdoor{
     position: fixed;
     left: 0;
-    bottom: 200rpx;
+    bottom: 300rpx;
 }
 .input-nx
     position: relative

pages/mine/mine.vue

@@ -95,9 +95,9 @@
                 ></uni-popup-dialog>
             </uni-popup>
         </view>
-        <template #footer>
+        <!-- <template #footer>
             <Tabbar :currentpage="4"></Tabbar>
-        </template>
+        </template> -->
     </AppLayout>
 </template>
 
@@ -110,13 +110,13 @@ import FileUploader from '@/utils/FileUploader.js';
 const { $api, navTo } = inject('globalFunction');
 import useUserStore from '@/stores/useUserStore';
 const popup = ref(null);
-const { userInfo, Completion } = storeToRefs(useUserStore());
-const counts = ref({});
+const { userInfo, Completion, counts } = storeToRefs(useUserStore());
+
 function logOut() {
     popup.value.open();
 }
 onShow(() => {
-    getUserstatistics();
+    useUserStore().getUserstatistics();
 });
 
 function close() {
@@ -129,12 +129,6 @@ function confirm() {
 
 const isAbove90 = (percent) => parseFloat(percent) < 90;
 
-function getUserstatistics() {
-    $api.createRequest('/app/user/statistics').then((resData) => {
-        counts.value = resData.data;
-    });
-}
-
 function selectFile() {
     // FileUploader.showMenuAndUpload({
     //     success: function (res) {

pages/msglog/msglog.vue

@@ -40,7 +40,7 @@
                 </swiper>
             </view>
 
-            <Tabbar :currentpage="3"></Tabbar>
+            <!-- <Tabbar :currentpage="3"></Tabbar> -->
         </view>
     </view>
 </template>

pages/msglog/read.vue

@@ -15,14 +15,15 @@
                     ></image>
                     <image
                         class="card-img-flame"
-                        v-if="item.title === '职位上新'"
+                        v-else-if="item.title === '职位上新'"
                         src="/static/icon/msgtype2.png"
                     ></image>
                     <image
                         class="card-img-flame"
-                        v-if="item.title === '系统通知'"
+                        v-else-if="item.title === '系统通知'"
                         src="/static/icon/msgtype3.png"
                     ></image>
+                    <image class="card-img-flame" v-else src="/static/icon/msgtype3.png"></image>
                     <view class="subscript" v-if="item.notReadCount || !item.isRead">
                         {{ item.notReadCount || '' }}
                     </view>
@@ -35,6 +36,7 @@
                     <view class="info-text line_2">{{ item.subTitle || '消息' }}</view>
                 </view>
             </view>
+            <empty v-if="!msgList.length"></empty>
         </view>
     </scroll-view>
 </template>
@@ -70,6 +72,9 @@ function seeDetail(item, index) {
         case '系统通知':
             navTo('/packageA/pages/systemNotification/systemNotification');
             break;
+        default:
+            useReadMsg().markAsRead(item, index);
+            navTo('/packageA/pages/newJobPosition/newJobPosition');
     }
 }
 
@@ -83,6 +88,7 @@ defineExpose({ loadData });
 }
 .scrollmain{
     padding: 28rpx
+    height: calc(100% - 56rpx)
 }
 .read{
 

pages/msglog/unread.vue

@@ -15,14 +15,15 @@
                     ></image>
                     <image
                         class="card-img-flame"
-                        v-if="item.title === '职位上新'"
+                        v-else-if="item.title === '职位上新'"
                         src="/static/icon/msgtype2.png"
                     ></image>
                     <image
                         class="card-img-flame"
-                        v-if="item.title === '系统通知'"
+                        v-else-if="item.title === '系统通知'"
                         src="/static/icon/msgtype3.png"
                     ></image>
+                    <image class="card-img-flame" v-else src="/static/icon/msgtype3.png"></image>
                     <view class="subscript" v-if="item.notReadCount">{{ item.notReadCount }}</view>
                 </view>
                 <view class="card-info">
@@ -33,6 +34,7 @@
                     <view class="info-text line_2">{{ item.subTitle || '消息' }}</view>
                 </view>
             </view>
+            <empty v-if="!unreadMsgList.length"></empty>
         </view>
     </scroll-view>
 </template>
@@ -57,6 +59,19 @@ async function loadData() {
 
 function seeDetail(item) {
     console.log(item);
+    switch (item.title) {
+        case '职位上新':
+            useReadMsg().markAsRead(item, index);
+            navTo('/packageA/pages/newJobPosition/newJobPosition');
+            break;
+        case '招聘会预约提醒':
+            useReadMsg().markAsRead(item, index);
+            navTo('/packageA/pages/reservation/reservation');
+            break;
+        case '系统通知':
+            navTo('/packageA/pages/systemNotification/systemNotification');
+            break;
+    }
 }
 
 defineExpose({ loadData });
@@ -69,6 +84,7 @@ defineExpose({ loadData });
 }
 .scrollmain{
     padding: 28rpx
+    height: calc(100% - 56rpx)
 }
 .read{
 

pages/nearby/components/four.vue

@@ -69,14 +69,9 @@
                 </view>
             </view>
             <view class="one-cards">
-                <renderJobs
-                    v-if="list.length"
-                    :list="list"
-                    :longitude="longitudeVal"
-                    :latitude="latitudeVal"
-                ></renderJobs>
-                <empty v-else pdTop="60"></empty>
-                <loadmore ref="loadmoreRef"></loadmore>
+                <renderJobs :list="list" :longitude="longitudeVal" :latitude="latitudeVal"></renderJobs>
+                <empty v-if="!list.length"></empty>
+                <loadmore v-show="list.length > pageState.pageSize" ref="loadmoreRef"></loadmore>
             </view>
         </view>
         <!-- 筛选 -->
@@ -340,15 +335,18 @@ defineExpose({ loadData, handleFilterConfirm });
     color:  #4778EC !important
 .nearby-scroll
     overflow: hidden;
+    height: 100%;
+    background: #f4f4f4;
     .two-head
-        margin: 22rpx;
+        padding: 22rpx;
         display: flex;
         flex-direction: column
         flex-wrap: no-wrap
         // grid-template-columns: repeat(4, 1fr);
         // grid-column-gap: 10rpx;
         // grid-row-gap: 24rpx;
-        border-radius: 17rpx 17rpx 17rpx 17rpx;
+        background: #FFFFFF
+        // border-radius: 17rpx 17rpx 17rpx 17rpx;
         .head-all{
             display: flex;
             justify-content: space-between;
@@ -380,15 +378,21 @@ defineExpose({ loadData, handleFilterConfirm });
             border-radius: 12rpx 12rpx 12rpx 12rpx;
 .nearby-list
     border-top: 2rpx solid #EBEBEB;
-    height: 100%
+    min-height: calc(100% - 140rpx)
+    background: #f4f4f4
+    display: flex;
+    flex-direction: column;
     .one-cards{
+        height: 100%
         display: flex;
         flex-direction: column;
         padding: 0 20rpx 20rpx 20rpx;
         background: #f4f4f4
+        flex: 1
     }
     .nav-filter
         padding: 16rpx 28rpx 0 28rpx
+        background: #ffffff
         .filter-top
             display: flex
             justify-content: space-between;
@@ -447,4 +451,4 @@ defineExpose({ loadData, handleFilterConfirm });
                     height: 26rpx;
                 .active
                     transform: rotate(180deg)
-</style>
+</style>

pages/nearby/components/one.vue

@@ -74,14 +74,9 @@
                 </view>
             </view>
             <view class="one-cards">
-                <renderJobs
-                    v-if="list.length"
-                    :list="list"
-                    :longitude="longitudeVal"
-                    :latitude="latitudeVal"
-                ></renderJobs>
-                <empty v-else pdTop="60"></empty>
-                <loadmore ref="loadmoreRef"></loadmore>
+                <renderJobs :list="list" :longitude="longitudeVal" :latitude="latitudeVal"></renderJobs>
+                <empty v-if="!list.length"></empty>
+                <loadmore v-show="list.length > pageState.pageSize" ref="loadmoreRef"></loadmore>
             </view>
         </view>
         <!-- 筛选 -->
@@ -364,20 +359,28 @@ defineExpose({ loadData, handleFilterConfirm });
 }
 .nearby-scroll
     overflow: hidden;
+    height: 100%;
+    background: #f4f4f4;
     .nearby-map
         height: 767rpx;
         background: #e8e8e8;
         overflow: hidden
 .nearby-list
+    min-height: calc(100% - 384rpx)
+    background: #f4f4f4
+    display: flex;
+    flex-direction: column;
     .one-cards{
         display: flex;
         flex-direction: column;
         padding: 0 20rpx 20rpx 20rpx;
         background: #f4f4f4
         height: 100%
+        flex: 1
     }
     .nav-filter
         padding: 16rpx 28rpx 0 28rpx
+        background: #ffffff
         .filter-top
             display: flex
             justify-content: space-between;

pages/nearby/components/three.vue

@@ -95,14 +95,9 @@
                 </view>
             </view>
             <view class="one-cards">
-                <renderJobs
-                    v-if="list.length"
-                    :list="list"
-                    :longitude="longitudeVal"
-                    :latitude="latitudeVal"
-                ></renderJobs>
-                <empty v-else pdTop="60"></empty>
-                <loadmore ref="loadmoreRef"></loadmore>
+                <renderJobs :list="list" :longitude="longitudeVal" :latitude="latitudeVal"></renderJobs>
+                <empty v-if="!list.length"></empty>
+                <loadmore v-show="list.length > pageState.pageSize" ref="loadmoreRef"></loadmore>
             </view>
         </view>
         <!-- 筛选 -->
@@ -359,9 +354,12 @@ defineExpose({ loadData, handleFilterConfirm });
     color:  #4778EC !important;
 .nearby-scroll
     overflow: hidden;
+    background: #f4f4f4;
+    height: 100%
     .three-head
-        margin: 24rpx 0 0 0;
+        // margin: 24rpx 0 0 0;
         padding: 26rpx 0 0 0;
+        background: #FFFFFF;
         border-radius: 17rpx 17rpx 17rpx 17rpx;
         .one-picker
             height: 100%
@@ -482,14 +480,21 @@ defineExpose({ loadData, handleFilterConfirm });
                     z-index: 1;
 .nearby-list
     border-top: 2rpx solid #EBEBEB;
+    min-height: calc(100% - 222rpx)
+    background: #f4f4f4
+    display: flex;
+    flex-direction: column;
     .one-cards{
+        height: 100%
         display: flex;
         flex-direction: column;
         padding: 0 20rpx 20rpx 20rpx;
         background: #f4f4f4
+        flex: 1
     }
     .nav-filter
         padding: 16rpx 28rpx 0 28rpx
+        background: #ffffff
         .filter-top
             display: flex
             justify-content: space-between;

pages/nearby/components/two.vue

@@ -65,14 +65,9 @@
                 </view>
             </view>
             <view class="one-cards">
-                <renderJobs
-                    v-if="list.length"
-                    :list="list"
-                    :longitude="longitudeVal"
-                    :latitude="latitudeVal"
-                ></renderJobs>
-                <empty v-else pdTop="60"></empty>
-                <loadmore ref="loadmoreRef"></loadmore>
+                <renderJobs :list="list" :longitude="longitudeVal" :latitude="latitudeVal"></renderJobs>
+                <empty v-if="!list.length"></empty>
+                <loadmore v-show="list.length > pageState.pageSize" ref="loadmoreRef"></loadmore>
             </view>
         </view>
         <!-- 筛选 -->
@@ -255,10 +250,13 @@ defineExpose({ loadData, handleFilterConfirm });
     color:  #4778EC !important
 .nearby-scroll
     overflow: hidden;
+    height: 100%;
+    background: #f4f4f4;
     .two-head
-        margin: 22rpx;
+        padding: 22rpx;
         display: flex;
         flex-wrap: wrap
+        background: #FFFFFF;
         // grid-template-columns: repeat(4, 1fr);
         // grid-column-gap: 10rpx;
         // grid-row-gap: 24rpx;
@@ -284,14 +282,21 @@ defineExpose({ loadData, handleFilterConfirm });
             border-radius: 12rpx 12rpx 12rpx 12rpx;
 .nearby-list
     border-top: 2rpx solid #EBEBEB;
+    min-height: calc(100% - 252rpx)
+    background: #f4f4f4
+    display: flex;
+    flex-direction: column;
     .one-cards{
         display: flex;
         flex-direction: column;
         padding: 0 20rpx 20rpx 20rpx;
         background: #f4f4f4
+        height: 100%
+        flex: 1
     }
     .nav-filter
         padding: 16rpx 28rpx 0 28rpx
+        background: #ffffff
         .filter-top
             display: flex
             justify-content: space-between;

stores/BaseDBStore.js

@@ -1,73 +0,0 @@
-// BaseStore.js - 基础Store类
-import IndexedDBHelper from '@/common/IndexedDBHelper.js'
-// import UniStorageHelper from '../common/UniStorageHelper'
-import useChatGroupDBStore from './userChatGroupStore'
-import config from '@/config'
-
-
-class BaseStore {
-    db = null
-    isDBReady = false
-    dbName = 'BrowsingHistory'
-    constructor() {
-        this.checkAndInitDB()
-    }
-    checkAndInitDB() {
-        // 获取本地数据库版本
-        if (config.OnlyUseCachedDB) {
-            return this.initDB()
-        }
-        const localVersion = uni.getStorageSync('indexedDBVersion') || 1
-        console.log('DBVersion: ', localVersion, config.DBversion)
-        if (localVersion === config.DBversion) {
-            this.initDB()
-        } else {
-            console.log('清空本地数据库')
-            this.clearDB().then(() => {
-                uni.setStorageSync('indexedDBVersion', config.DBversion);
-                this.initDB();
-            });
-        }
-    }
-    initDB() {
-        // // #ifdef H5
-        this.db = new IndexedDBHelper(this.dbName, config.DBversion);
-        // // #endif
-        // // #ifndef H5
-        // this.db = new UniStorageHelper(this.dbName, config.DBversion);
-        // // #endif
-        this.db.openDB([{
-            name: 'record',
-            keyPath: "id",
-            autoIncrement: true,
-        }, {
-            name: 'messageGroup',
-            keyPath: "id",
-            autoIncrement: true,
-        }, {
-            name: 'messages',
-            keyPath: "id",
-            autoIncrement: true,
-            indexes: [{
-                name: 'parentGroupId',
-                key: 'parentGroupId',
-                unique: false
-            }]
-        }]).then(async () => {
-            useChatGroupDBStore().init()
-            this.isDBReady = true
-        });
-    }
-    async clearDB() {
-        return new Promise((resolve, rejetc) => {
-            new IndexedDBHelper().deleteDB(this.dbName).then(() => {
-                resolve()
-            })
-        })
-    }
-
-}
-
-const baseDB = new BaseStore()
-
-export default baseDB

stores/useReadMsg.js

@@ -12,27 +12,25 @@ import {
     $api,
 } from '../common/globalFunction';
 
-// 控制消息
+// 常量定义：消息在 TabBar 的索引位置
+const TABBAR_INDEX = 3;
+
 export const useReadMsg = defineStore('readMsg', () => {
     const msgList = ref([])
+    // 用于自定义 Tabbar 组件的渲染
     const badges = ref([{
-            count: 0
-        },
-        {
-            count: 0
-        },
-        {
-            count: 0
-        },
-        {
-            count: 0
-        },
-        {
-            count: 0
-        },
-    ])
+        count: 0
+    }, {
+        count: 0
+    }, {
+        count: 0
+    }, {
+        count: 0
+    }, {
+        count: 0
+    }])
 
-    // 计算总未读数量，基于 notReadCount 字段
+    // 计算总未读数量
     const unreadCount = computed(() =>
         msgList.value.reduce((sum, msg) => sum + (msg.notReadCount || 0), 0)
     )
@@ -42,40 +40,49 @@ export const useReadMsg = defineStore('readMsg', () => {
         msgList.value.filter(msg => msg.notReadCount > 0)
     )
 
-
-    // 设置 TabBar 角标
-    function updateTabBarBadge() {
+    function updateBadgeEffect() {
         const count = unreadCount.value
-        const index = 3
-        const countVal = count > 99 ? '99+' : String(count)
-        if (count === 0) {
-            uni.removeTabBarBadge({
-                index
-            }) // 替换为你消息页面的 TabBar index
-            badges.value[index] = {
-                count: 0
+        // 处理显示文本：超过99显示99+
+        const countStr = count > 99 ? '99+' : String(count)
+
+        // 1. 更新内部状态 (用于自定义 UI)
+        if (badges.value[TABBAR_INDEX]) {
+            badges.value[TABBAR_INDEX].count = count === 0 ? 0 : countStr
+        }
+
+        // 2. 更新系统原生 TabBar
+        // 加 try-catch 防止在非 Tabbar 页面或加栽未完成时报错
+        try {
+            if (count > 0) {
+                uni.setTabBarBadge({
+                    index: TABBAR_INDEX,
+                    text: countStr
+                })
+            } else {
+                uni.removeTabBarBadge({
+                    index: TABBAR_INDEX
+                })
             }
-        } else {
-            badges.value[index] = {
-                count: countVal
-            }
-            uni.setTabBarBadge({
-                index,
-                text: countVal
-            })
+        } catch (e) {
+            console.warn('TabBar Badge 更新失败(可能当前非TabBar页面):', e)
         }
     }
 
+    watch(unreadCount, () => {
+        updateBadgeEffect()
+        console.log('value', unreadCount.value)
+    }, {
+        immediate: true
+    })
+
 
     // 拉取消息列表
     async function fetchMessages() {
         try {
-            $api.createRequest('/app/notice/info', {
+            const res = await $api.createRequest('/app/notice/info', {
                 isRead: 1
-            }, "GET").then((res) => {
-                msgList.value = res.data || []
-                updateTabBarBadge()
-            })
+            }, "GET")
+            msgList.value = res.data || []
         } catch (err) {
             console.error('获取消息失败:', err)
         }
@@ -83,17 +90,23 @@ export const useReadMsg = defineStore('readMsg', () => {
 
     // 设置为已读
     async function markAsRead(item, index) {
-        const msg = msgList.value[index]
-        if (!msg || msg.isRead === 1) return
+        const targetMsg = msgList.value[index]
+        if (!targetMsg) return
+
+        // 如果已经是已读，直接返回，避免无效请求
+        // 假设服务端逻辑是：isRead=1 表示已读 (注意检查你的字段定义)
+        // 你的原代码判断是 if (msg.isRead === 1) return，如果是这样，下面请求成功应该设为 1
+        // 但通常未读是0，已读是1。这里维持你原有的逻辑，假设服务端把 notReadCount 清零
 
         try {
             let params = {
-                id: msg.noticeId
+                id: targetMsg.noticeId
             }
-            $api.createRequest('/app/notice/read?id=' + msg.noticeId, params, "POST").then((res) => {
-                msgList.value[index].isRead = 1
-                updateTabBarBadge()
-            })
+            await $api.createRequest('/app/notice/read?id=' + targetMsg.noticeId, params, "POST")
+
+            // 更新本地数据
+            msgList.value[index].notReadCount = 0
+            msgList.value[index].isRead = 1 // 标记已读状态
         } catch (err) {
             console.error('设置消息已读失败:', err)
         }
@@ -106,6 +119,8 @@ export const useReadMsg = defineStore('readMsg', () => {
         unreadCount,
         fetchMessages,
         markAsRead,
-        updateTabBarBadge
+        updateTabBarBadge: updateBadgeEffect
     }
+}, {
+    unistorage: true, // 开启持久化
 })

stores/useRecommedIndexedDBStore.js

@@ -9,7 +9,7 @@ import jobAnalyzer from '@/utils/jobAnalyzer';
 import {
     msg
 } from '@/common/globalFunction.js'
-import baseDB from './BaseDBStore';
+import baseDB from '@/utils/db.js';
 import config from '../config';
 
 class JobRecommendation {

stores/useUserStore.js

@@ -14,6 +14,10 @@ import {
 import {
     useReadMsg
 } from '@/stores/useReadMsg';
+import {
+    msg,
+    $api,
+} from '../common/globalFunction';
 
 // 简历完成度计算
 function getResumeCompletionPercentage(resume) {
@@ -31,6 +35,7 @@ function getResumeCompletionPercentage(resume) {
         'status',
         'jobTitleId',
         'jobTitle',
+        'workExp'
     ];
 
     const totalFields = requiredFields.length;
@@ -51,7 +56,8 @@ const useUserStore = defineStore("user", () => {
     const token = ref('')
     const resume = ref({})
     const Completion = ref('0%')
-    const seesionId = ref(uni.getStorageSync('seesionId') || '')
+    const seesionId = ref('')
+    const counts = ref({})
 
     const login = (value) => {
         hasLogin.value = true;
@@ -127,6 +133,13 @@ const useUserStore = defineStore("user", () => {
         seesionId.value = seesionIdVal
     }
 
+    function getUserstatistics() {
+        $api.createRequest('/app/user/statistics').then((resData) => {
+            counts.value = resData.data;
+        });
+    }
+
+
     // 导入
     return {
         hasLogin,
@@ -139,8 +152,12 @@ const useUserStore = defineStore("user", () => {
         getUserResume,
         initSeesionId,
         seesionId,
-        Completion
+        Completion,
+        getUserstatistics,
+        counts
     }
+}, {
+    unistorage: true,
 })
 
 export default useUserStore;

stores/userChatGroupStore.js

@@ -6,7 +6,7 @@ import {
     ref,
     toRaw
 } from 'vue'
-import baseDB from './BaseDBStore';
+import baseDB from '@/utils/db.js';
 import {
     msg,
     CloneDeep,

uni_modules/pinia-plugin-unistorage/changelog.md

@@ -0,0 +1,31 @@
+## 0.1.2（2024-07-17）
+chore: 移除冗余的 typescript 依赖
+## 0.1.1（2024-07-17）
+fix: 修复 createUnistorage 导出
+## 0.1.0（2024-07-10）
+fix!: 更新 pinia 类型
+## 0.0.21（2024-07-10）
+chore!: 继承 pinia-plugin-persistedstate
+## 0.0.19（2024-01-18）
+
+fix: 重新构建，不需要默认参数
+
+## 0.0.16（2023-05-06）
+
+fix: 修复全局 key 移除
+
+## 0.0.14（2023-04-29）
+
+fix: 修复全局 global key 选项
+
+## 0.0.12（2023-04-07）
+
+- fix: 修复类型错误
+
+## 0.0.11（2023-03-22）
+
+- chore: ts 支持
+
+## 0.0.7（2022-04-29）
+
+- 更新 README

uni_modules/pinia-plugin-unistorage/index.d.ts

@@ -0,0 +1,112 @@
+import * as pinia from 'pinia';
+import { StateTree, PiniaPluginContext, PiniaPlugin } from 'pinia';
+
+type Prettify<T> = {
+    [K in keyof T]: T[K];
+};
+type StorageLike = Pick<Storage, 'getItem' | 'setItem'>;
+interface Serializer {
+    /**
+     * Serializes state into string before storing
+     * @default JSON.stringify
+     */
+    serialize: (value: StateTree) => string;
+    /**
+     * Deserializes string into state before hydrating
+     * @default JSON.parse
+     */
+    deserialize: (value: string) => StateTree;
+}
+interface PersistedStateOptions {
+    /**
+     * Storage key to use.
+     * @default $store.id
+     */
+    key?: string | ((id: string) => string);
+    /**
+     * Where to store persisted state.
+     * @default localStorage
+     */
+    storage?: StorageLike;
+    /**
+     * Dot-notation paths to partially save state. Saves everything if undefined.
+     * @default undefined
+     */
+    paths?: Array<string>;
+    /**
+     * Customer serializer to serialize/deserialize state.
+     */
+    serializer?: Serializer;
+    /**
+     * Hook called before state is hydrated from storage.
+     * @default null
+     */
+    beforeRestore?: (context: PiniaPluginContext) => void;
+    /**
+     * Hook called after state is hydrated from storage.
+     * @default undefined
+     */
+    afterRestore?: (context: PiniaPluginContext) => void;
+    /**
+     * Logs errors in console when enabled.
+     * @default false
+     */
+    debug?: boolean;
+}
+type PersistedStateFactoryOptions = Prettify<Pick<PersistedStateOptions, 'storage' | 'serializer' | 'afterRestore' | 'beforeRestore' | 'debug'> & {
+    /**
+     * Global key generator, allows pre/postfixing store keys.
+     * @default storeKey => storeKey
+     */
+    key?: (storeKey: string) => string;
+    /**
+     * Automatically persists all stores, opt-out individually.
+     * @default false
+     */
+    auto?: boolean;
+}>;
+declare module 'pinia' {
+    interface DefineStoreOptionsBase<S extends StateTree, Store> {
+        /**
+         * Persists store in storage.
+         * @see https://prazdevs.github.io/pinia-plugin-persistedstate
+         */
+        persist?: boolean | PersistedStateOptions | PersistedStateOptions[];
+        unistorage?: boolean | PersistedStateOptions | PersistedStateOptions[];
+    }
+    interface PiniaCustomProperties {
+        /**
+         * Rehydrates store from persisted state
+         * Warning: this is for advances usecases, make sure you know what you're doing.
+         * @see https://prazdevs.github.io/pinia-plugin-persistedstate/guide/advanced.html#forcing-the-rehydration
+         */
+        $hydrate: (opts?: {
+            runHooks?: boolean;
+        }) => void;
+        /**
+         * Persists store into configured storage
+         * Warning: this is for advances usecases, make sure you know what you're doing.
+         * @see https://prazdevs.github.io/pinia-plugin-persistedstate/guide/advanced.html#forcing-the-persistence
+         */
+        $persist: () => void;
+    }
+}
+
+/**
+ * Creates a pinia persistence plugin
+ * @param factoryOptions global persistence options
+ * @returns pinia plugin
+ */
+declare function createPersistedState(factoryOptions?: PersistedStateFactoryOptions): PiniaPlugin;
+
+declare const _default: pinia.PiniaPlugin;
+
+export { PersistedStateFactoryOptions, PersistedStateOptions, Serializer, StorageLike, createPersistedState, _default as default, createUnistorage };
+
+/**
+ * Creates a pinia persistence plugin with uniapp
+ * @param factoryOptions global persistence options
+ * @returns pinia plugin
+ */
+declare function createUnistorage(factoryOptions?: PersistedStateFactoryOptions): PiniaPlugin;
+      

uni_modules/pinia-plugin-unistorage/index.js

@@ -0,0 +1,162 @@
+// src/normalize.ts
+function isObject(v) {
+  return typeof v === "object" && v !== null;
+}
+function normalizeOptions(options, factoryOptions) {
+  options = isObject(options) ? options : /* @__PURE__ */ Object.create(null);
+  return new Proxy(options, {
+    get(target, key, receiver) {
+      if (key === "key")
+        return Reflect.get(target, key, receiver);
+      return Reflect.get(target, key, receiver) || Reflect.get(factoryOptions, key, receiver);
+    }
+  });
+}
+
+// src/pick.ts
+function get(state, path) {
+  return path.reduce((obj, p) => {
+    return obj == null ? void 0 : obj[p];
+  }, state);
+}
+function set(state, path, val) {
+  return path.slice(0, -1).reduce((obj, p) => {
+    if (/^(__proto__)$/.test(p))
+      return {};
+    else
+      return obj[p] = obj[p] || {};
+  }, state)[path[path.length - 1]] = val, state;
+}
+function pick(baseState, paths) {
+  return paths.reduce((substate, path) => {
+    const pathArray = path.split(".");
+    return set(substate, pathArray, get(baseState, pathArray));
+  }, {});
+}
+
+// src/plugin.ts
+function parsePersistence(factoryOptions, store) {
+  return (o) => {
+    var _a;
+    try {
+      const {
+        storage = localStorage,
+        beforeRestore = void 0,
+        afterRestore = void 0,
+        serializer = {
+          serialize: JSON.stringify,
+          deserialize: JSON.parse
+        },
+        key = store.$id,
+        paths = null,
+        debug = false
+      } = o;
+      return {
+        storage,
+        beforeRestore,
+        afterRestore,
+        serializer,
+        key: ((_a = factoryOptions.key) != null ? _a : (k) => k)(typeof key == "string" ? key : key(store.$id)),
+        paths,
+        debug
+      };
+    } catch (e) {
+      if (o.debug)
+        console.error("[pinia-plugin-persistedstate]", e);
+      return null;
+    }
+  };
+}
+function hydrateStore(store, { storage, serializer, key, debug }) {
+  try {
+    const fromStorage = storage == null ? void 0 : storage.getItem(key);
+    if (fromStorage)
+      store.$patch(serializer == null ? void 0 : serializer.deserialize(fromStorage));
+  } catch (e) {
+    if (debug)
+      console.error("[pinia-plugin-persistedstate]", e);
+  }
+}
+function persistState(state, { storage, serializer, key, paths, debug }) {
+  try {
+    const toStore = Array.isArray(paths) ? pick(state, paths) : state;
+    storage.setItem(key, serializer.serialize(toStore));
+  } catch (e) {
+    if (debug)
+      console.error("[pinia-plugin-persistedstate]", e);
+  }
+}
+function createPersistedState(factoryOptions = {}) {
+  return (context) => {
+    const { auto = false } = factoryOptions;
+    const {
+      options: { persist = auto },
+      store,
+      pinia
+    } = context;
+    if (!persist)
+      return;
+    if (!(store.$id in pinia.state.value)) {
+      const original_store = pinia._s.get(store.$id.replace("__hot:", ""));
+      if (original_store)
+        Promise.resolve().then(() => original_store.$persist());
+      return;
+    }
+    const persistences = (Array.isArray(persist) ? persist.map((p) => normalizeOptions(p, factoryOptions)) : [normalizeOptions(persist, factoryOptions)]).map(parsePersistence(factoryOptions, store)).filter(Boolean);
+    store.$persist = () => {
+      persistences.forEach((persistence) => {
+        persistState(store.$state, persistence);
+      });
+    };
+    store.$hydrate = ({ runHooks = true } = {}) => {
+      persistences.forEach((persistence) => {
+        const { beforeRestore, afterRestore } = persistence;
+        if (runHooks)
+          beforeRestore == null ? void 0 : beforeRestore(context);
+        hydrateStore(store, persistence);
+        if (runHooks)
+          afterRestore == null ? void 0 : afterRestore(context);
+      });
+    };
+    persistences.forEach((persistence) => {
+      const { beforeRestore, afterRestore } = persistence;
+      beforeRestore == null ? void 0 : beforeRestore(context);
+      hydrateStore(store, persistence);
+      afterRestore == null ? void 0 : afterRestore(context);
+      store.$subscribe(
+        (_mutation, state) => {
+          persistState(state, persistence);
+        },
+        {
+          detached: true
+        }
+      );
+    });
+  };
+}
+
+function createUnistorage(globalOptions = {}) {
+  const persistedState = createPersistedState({
+    storage: {
+      getItem(key) {
+        return uni.getStorageSync(key);
+      },
+      setItem(key, value) {
+        uni.setStorageSync(key, value);
+      }
+    },
+    serializer: {
+      deserialize: JSON.parse,
+      serialize: JSON.stringify
+    },
+    ...globalOptions
+  });
+  return (ctx) => {
+    if (ctx.options.unistorage) {
+      ctx.options.persist = ctx.options.unistorage;
+    }
+    return persistedState(ctx);
+  };
+}
+
+export { createPersistedState, createUnistorage };

uni_modules/pinia-plugin-unistorage/package.json

@@ -0,0 +1,94 @@
+{
+  "id": "pinia-plugin-unistorage",
+  "displayName": "pinia-plugin-unistorage",
+  "version": "0.1.2",
+  "description": "uniapp 下 pinia 的本地数据缓存插件",
+  "keywords": [
+    "pinia",
+    "uniapp",
+    "storage",
+    "pinia-plugin",
+    "persistence"
+],
+  "type": "module",
+  "main": "./index.js",
+  "types": "./index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./index.js",
+      "types": "./index.d.ts"
+    }
+  },
+  "engines": {
+    "HBuilderX": "^3.4.7"
+  },
+  "dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/pinia-plugin-unistorage",
+    "type": "sdk-js"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y",
+        "alipay": "n"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "y",
+          "vue3": "y"
+        },
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y",
+          "钉钉": "y",
+          "快手": "y",
+          "飞书": "y",
+          "京东": "y"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        }
+      }
+    }
+  }
+}

uni_modules/pinia-plugin-unistorage/readme.md

@@ -0,0 +1,226 @@
+<div align="center">
+    <img width="200px" height="200px" src="https://gitee.com/dishait/pinia-plugin-unistorage/raw/main/static/favicon.png" />
+    <h1>pinia-plugin-unistorage</h1>
+    <p>uniapp 下 pinia 的本地数据缓存插件</p>
+</div>
+
+<br />
+<br />
+
+<div align="center">
+    <img width="100%" height="100%" src="https://gitee.com/dishait/pinia-plugin-unistorage/raw/main/static/pinia-plugin-unistorage.gif" />
+</div>
+
+<br />
+<br />
+
+## 引用
+
+该插件是
+[pinia-plugin-persistedstate](https://github.com/prazdevs/pinia-plugin-persistedstate)
+的 `uniapp` 版本，如果你需要在纯 `vue` 或者 `nuxt` 项目中使用 `pinia`
+的本地数据缓存，请使用
+[pinia-plugin-persistedstate](https://github.com/prazdevs/pinia-plugin-persistedstate)。
+
+<br />
+<br />
+
+## 动机
+
+为了实现多端的更简单的全局本地数据缓存
+
+<br />
+<br />
+
+## 组织 🦔
+
+欢迎关注 **帝莎编程**
+
+- [官网](http://dishaxy.dishait.cn/)
+- [Gitee](https://gitee.com/dishait)
+- [Github](https://github.com/dishait)
+- [网易云课堂](https://study.163.com/provider/480000001892585/index.htm?share=2&shareId=480000001892585)
+
+<br />
+<br />
+
+## 使用
+
+### 安装
+
+#### 1. `cli` 创建的 `uniapp` 项目
+
+```shell
+npm i pinia-plugin-unistorage -D
+```
+
+```js
+// main.js
+import { createSSRApp } from "vue";
+import * as Pinia from "pinia";
+import { createUnistorage } from "pinia-plugin-unistorage";
+
+export function createApp() {
+  const app = createSSRApp(App);
+
+  const store = Pinia.createPinia();
+
+  // 关键代码 👇
+  store.use(createUnistorage());
+
+  app.use(store);
+
+  return {
+    app,
+    Pinia, // 此处必须将 Pinia 返回
+  };
+}
+```
+
+<br />
+
+#### 2. `hbuilderx` 创建的 `uniapp` 项目
+
+直接插件市场安装后引入注册
+
+```js
+// main.js
+import { createSSRApp } from "vue";
+import * as Pinia from "pinia";
+import { createUnistorage } from "./uni_modules/pinia-plugin-unistorage";
+
+export function createApp() {
+  const app = createSSRApp(App);
+
+  const store = Pinia.createPinia();
+
+  // 关键代码 👇
+  store.use(createUnistorage());
+
+  app.use(store);
+
+  return {
+    app,
+    Pinia, // 此处必须将 Pinia 返回
+  };
+}
+```
+
+### 基础
+
+```js
+import { defineStore } from "pinia";
+
+export const useStore = defineStore("main", {
+  state() {
+    return {
+      someState: "hello pinia",
+    };
+  },
+  unistorage: true, // 开启后对 state 的数据读写都将持久化
+});
+```
+
+或者 `setup` 语法也是支持的
+
+```js
+import { defineStore } from "pinia";
+
+export const useStore = defineStore(
+  "main",
+  () => {
+    const someState = ref("hello pinia");
+    return { someState };
+  },
+  {
+    unistorage: true, // 开启后对 state 的数据读写都将持久化
+  },
+);
+```
+
+<br />
+
+### 选项
+
+#### 钩子
+
+```js
+import { defineStore } from "pinia";
+
+export const useStore = defineStore("main", {
+  state() {
+    return {
+      someState: "hello pinia",
+    };
+  },
+  unistorage: {
+    // 初始化恢复前触发
+    beforeRestore(ctx) {},
+    // 初始化恢复后触发
+    afterRestore(ctx) {},
+  },
+});
+```
+
+<br />
+
+#### 序列化
+
+大多数情况下你并不需要了解该选项
+
+```js
+import { defineStore } from "pinia";
+
+export const useStore = defineStore("main", {
+  state() {
+    return {
+      someState: "hello pinia",
+    };
+  },
+  unistorage: {
+    serializer: {
+      // 序列化，默认为 JSON.stringify
+      serialize(v) {
+        return JSON.stringify(v);
+      },
+      // 反序列化，默认为 JSON.parse
+      deserialize(v) {
+        return JSON.parse(v);
+      },
+    },
+  },
+});
+```
+
+<br />
+
+#### 其他
+
+```js
+import { defineStore } from "pinia";
+
+export const useStore = defineStore("main", {
+  state() {
+    return {
+      foo: "foo",
+      nested: {
+        data: "nested pinia",
+      },
+      someState: "hello pinia",
+    };
+  },
+  unistorage: {
+    key: "foo", // 缓存的键，默认为该 store 的 id，这里是 main,
+    paths: ["foo", "nested.data"], // 需要缓存的路径，这里设置 foo 和 nested 下的 data 会被缓存
+  },
+});
+```
+
+<br />
+<br />
+
+## License
+
+Made with [markthree](https://github.com/markthree)
+
+Published under [MIT License](./LICENSE).

uni_modules/pinia-plugin-unistorage/src/index.ts

@@ -0,0 +1,35 @@
+import {
+  createPersistedState,
+  type PersistedStateFactoryOptions,
+} from "pinia-plugin-persistedstate";
+
+export * from "pinia-plugin-persistedstate";
+
+export function createUnistorage(
+  globalOptions: PersistedStateFactoryOptions = {},
+) {
+  const persistedState = createPersistedState({
+    storage: {
+      getItem(key) {
+        // @ts-ignore
+        return uni.getStorageSync(key);
+      },
+      setItem(key, value) {
+        // @ts-ignore
+        uni.setStorageSync(key, value);
+      },
+    },
+    serializer: {
+      deserialize: JSON.parse,
+      serialize: JSON.stringify,
+    },
+    ...globalOptions,
+  });
+  // @ts-ignore
+  return (ctx) => {
+    if (ctx.options.unistorage) {
+      ctx.options.persist = ctx.options.unistorage;
+    }
+    return persistedState(ctx);
+  };
+}

utils/db.js

@@ -0,0 +1,91 @@
+// BaseDBStore.js
+import IndexedDBHelper from '@/common/IndexedDBHelper.js'
+// import UniStorageHelper from '../common/UniStorageHelper'
+import useChatGroupDBStore from '@/stores/userChatGroupStore'
+import config from '@/config'
+
+class BaseStore {
+    db = null
+    isDBReady = false
+    dbName = 'BrowsingHistory' //  'AppMainDB'
+    initPromise = null
+
+    constructor() {
+        this.initPromise = this.checkAndInitDB()
+    }
+
+    async getDB() {
+        if (!this.initPromise) {
+            this.initPromise = this.checkAndInitDB();
+        }
+        await this.initPromise; // 等待初始化完成
+        return this.db;
+    }
+
+    async checkAndInitDB() {
+        if (config.OnlyUseCachedDB) {
+            return this.initDB()
+        }
+        const localVersion = uni.getStorageSync('indexedDBVersion') || 1
+        console.log('DBVersion: ', localVersion, config.DBversion)
+        if (localVersion === config.DBversion) {
+            return this.initDB() // 🟢 记得加 return
+        } else {
+            console.log('清空本地数据库')
+            await this.clearDB() // 🟢 建议用 await
+            uni.setStorageSync('indexedDBVersion', config.DBversion);
+            return this.initDB(); // 🟢 记得加 return
+        }
+    }
+
+    initDB() {
+        // // #ifdef H5
+        this.db = new IndexedDBHelper(this.dbName, config.DBversion);
+        // // #endif
+
+        return this.db.openDB([{
+                name: 'record',
+                keyPath: "id",
+                autoIncrement: true,
+            },
+            {
+                name: 'messageGroup',
+                keyPath: "id",
+                autoIncrement: true,
+            },
+            {
+                name: 'messages',
+                keyPath: "id",
+                autoIncrement: true,
+                indexes: [{
+                    name: 'parentGroupId',
+                    key: 'parentGroupId',
+                    unique: false
+                }]
+            },
+            {
+                name: 'api_cache',
+                keyPath: "cacheKey", // 使用 URL+参数 作为主键
+                indexes: []
+            }
+        ]).then(async () => {
+            // 这里原来的逻辑保留
+            if (useChatGroupDBStore) {
+                useChatGroupDBStore().init()
+            }
+            this.isDBReady = true
+            return this.db;
+        });
+    }
+
+    async clearDB() {
+        return new Promise((resolve, rejetc) => {
+            new IndexedDBHelper().deleteDB(this.dbName).then(() => {
+                resolve()
+            })
+        })
+    }
+}
+
+const baseDB = new BaseStore()
+export default baseDB

utils/request.js

@@ -1,14 +1,15 @@
 import config from "@/config.js"
 import {
     sm2_Decrypt,
-    sm2_Encrypt
-} from '@/common/globalFunction';
-import useUserStore from '@/stores/useUserStore';
-import {
+    sm2_Encrypt,
     sm4Decrypt,
     sm4Encrypt
-} from '../common/globalFunction';
+} from '@/common/globalFunction';
+import IndexedDBHelper from '@/common/IndexedDBHelper';
+import useUserStore from '@/stores/useUserStore';
+import baseDB from '@/utils/db.js';
 
+const CACHE_STORE_NAME = 'api_cache';
 
 const needToEncrypt = [
     ["post", "/app/login"],
@@ -20,6 +21,51 @@ const needToEncrypt = [
     ["get", "/app/user/experience/list"]
 ]
 
+/**
+ * 带缓存的请求方法
+ */
+export async function createRequestWithCache(url, data = {}, method = 'GET', loading = false, headers = {},
+    onCacheLoad = null) {
+    // 是分页接口的话， 只缓存第一页的数据
+    if (data.current && data.current > 1) {
+        return createRequest(url, data, method, loading, headers);
+    }
+    const cacheKey = `${method.toUpperCase()}:${url}:${JSON.stringify(data)}`;
+
+    baseDB.getDB().then(async (dbHelper) => {
+        try {
+            const cachedRecord = await dbHelper.get(CACHE_STORE_NAME, cacheKey);
+
+            if (cachedRecord && cachedRecord.response && typeof onCacheLoad === 'function') {
+                onCacheLoad(cachedRecord.response);
+            }
+        } catch (e) {
+            console.error('读取缓存失败', e);
+        }
+    });
+
+    // 3. 发起网络请求
+    try {
+        const networkResponse = await createRequest(url, data, method, loading, headers);
+        baseDB.getDB().then(async (dbHelper) => {
+            try {
+                await dbHelper.update(CACHE_STORE_NAME, {
+                    cacheKey: cacheKey,
+                    response: networkResponse,
+                    timestamp: Date.now()
+                });
+                console.log('💾 [BaseDB] 缓存更新:', url);
+            } catch (e) {
+                console.error('更新缓存失败', e);
+            }
+        });
+
+        return networkResponse;
+    } catch (error) {
+        throw error;
+    }
+}
+
 /**
  * @param url  String，请求的地址，默认：none
  * @param data  Object，请求的参数，默认：{}
@@ -35,13 +81,16 @@ export function createRequest(url, data = {}, method = 'GET', loading = false, h
             mask: true
         })
     }
-    let Authorization = ''
-    if (useUserStore().token) {
-        Authorization = `${useUserStore().token}`
-    }
+    let header = {
+        ...headers
+    };
+    const userStore = useUserStore();
+    const token = userStore.token;
 
-    const header = headers || {};
-    header["Authorization"] = encodeURIComponent(Authorization);
+    if (token) {
+        // 确保 Authorization 不会被覆盖，且进行编码
+        header["Authorization"] = encodeURIComponent(token);
+    }
 
     // ------------------------------------------------------------------
     // 检查当前请求是否需要加密
@@ -88,10 +137,12 @@ export function createRequest(url, data = {}, method = 'GET', loading = false, h
                         resolve(resData.data)
                         return
                     }
-                    uni.showToast({
-                        title: msg,
-                        icon: 'none'
-                    })
+                    if (msg) {
+                        uni.showToast({
+                            title: msg,
+                            icon: 'none'
+                        })
+                    }
                 }
                 if (resData.data?.code === 401 || resData.data?.code === 402) {
                     useUserStore().logOut()