flat: 注入全局弹窗

App.vue

@@ -5,13 +5,16 @@ import { IncreaseRevie } from '@/common/all-in-one-listen.js';
 import useUserStore from './stores/useUserStore';
 import usePageAnimation from './hook/usePageAnimation';
 import useDictStore from './stores/useDictStore';
-import { useGlobalInactivity } from '@/hook/useGlobalInactivity';
+import { GlobalInactivityManager } from '@/utils/GlobalInactivityManager';
 const { $api, navTo, appendScriptTagElement, aes_Decrypt, sm2_Decrypt, safeReLaunch } = inject('globalFunction');
 import config from '@/config.js';
 import baseDB from '@/utils/db.js';
+import { $confirm } from '@/utils/modal.js';
 usePageAnimation();
 const appword = 'aKd20dbGdFvmuwrt'; // 固定值
 let uQRListen = null;
+let inactivityManager = null;
+let inactivityModalTimer = null;
 
 onLaunch((options) => {
     useDictStore().getDictData();
@@ -22,13 +25,15 @@ onLaunch((options) => {
         useUserStore().changMachineEnv(false);
         return;
     }
-    if (isY9MachineType()) {
+    if (!isY9MachineType()) {
         console.warn('求职一体机环境');
         baseDB.resetAndReinit(); // 清空indexdb
         useUserStore().logOutApp();
         useUserStore().changMiniProgramAppStatus(true);
         useUserStore().changMachineEnv(true);
         uQRListen = new IncreaseRevie();
+        inactivityManager = new GlobalInactivityManager(handleInactivity, 60 * 1000);
+        inactivityManager.start();
         return;
     }
     // 正式上线去除此方法
@@ -58,30 +63,49 @@ onHide(() => {
     console.log('App Hide');
 });
 
-const { resume, pause } = useGlobalInactivity(() => {
+async function handleInactivity() {
-    console.warn('【全局】60秒无操作，执行安全登出...');
+    console.log('【全局】60秒无操作，执行安全逻辑');
-    uni.showModal({
+    if (inactivityModalTimer) {
-        title: '会话即将过期',
+        clearTimeout(inactivityModalTimer);
-        content: '长时间无操作，是否继续使用？',
+        inactivityModalTimer = null;
-        showCancel: true,
+    }
-        cancelText: '退出',
+    if (useUserStore().hasLogin) {
-        confirmText: '继续',
+        // 示例：弹窗确认
-        success: (res) => {
+        await $confirm({
-            if (res.confirm) {
+            title: '会话即将过期',
-                resume();
+            content: '长时间无操作，是否继续使用？',
-            } else {
+            success: (res) => {
-                handleLogout();
+                if (inactivityModalTimer) {
-            }
+                    clearTimeout(inactivityModalTimer);
-        },
+                    inactivityModalTimer = null;
-    });
+                }
-}, 60 * 1000);
+                if (res.confirm) {
+                    inactivityManager?.resume(); // 恢复监听
+                } else {
+                    performLogout();
+                }
+            },
+            fail: () => {
+                if (inactivityModalTimer) clearTimeout(inactivityModalTimer);
+                performLogout();
+            },
+        });
+    } else {
+        inactivityManager?.resume(); // 恢复监听
+    }
+    // 启动 10 秒自动登出定时器
+    inactivityModalTimer = setTimeout(() => {
+        inactivityModalTimer = null;
+        console.log('【自动登出】用户10秒未操作');
+        performLogout();
+    }, 10000); // 10秒
+}
 
-function handleLogout() {
+function performLogout() {
-    // 清除 token、跳转登录页
     uni.clearStorageSync();
     baseDB.resetAndReinit();
     useUserStore().logOutApp();
-    pause();
+    inactivityManager?.resume(); // 恢复监听
 }
 
 // 一体机环境判断

components/GlobalPopup/GlobalPopup.vue

@@ -0,0 +1,115 @@
+<template>
+    <uni-popup ref="popup" type="dialog" mask-background-color="rgba(0,0,0,0.5)" @change="onPopupChange">
+        <view class="global-confirm-wrapper">
+            <uni-popup-dialog
+                mode="base"
+                :type="state.type"
+                :title="state.title"
+                :content="state.content"
+                :before-close="true"
+                @confirm="onConfirm"
+                @close="onClose"
+            ></uni-popup-dialog>
+        </view>
+    </uni-popup>
+</template>
+
+<script setup>
+import { ref, reactive, onMounted, onUnmounted } from 'vue';
+
+const popup = ref(null);
+const state = reactive({
+    title: '',
+    content: '',
+    type: 'info',
+    resolve: null,
+});
+
+onMounted(() => {
+    uni.$on('show-global-popup', (options) => {
+        state.title = options.title || '提示';
+        state.content = options.content || '';
+        state.type = options.type || 'info';
+        state.resolve = options.resolve;
+        popup.value.open();
+    });
+});
+
+onUnmounted(() => {
+    uni.$off('show-global-popup');
+});
+
+const onConfirm = () => {
+    if (state.resolve) state.resolve(true);
+    popup.value.close();
+};
+
+const onClose = () => {
+    if (state.resolve) state.resolve(false);
+    popup.value.close();
+};
+
+const onPopupChange = (e) => {
+    if (!e.show && state.resolve) {
+        state.resolve(false);
+        state.resolve = null;
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+.global-confirm-wrapper {
+    /* 整个弹窗容器宽度自适应 */
+    width: 600rpx;
+
+    /* 深度覆盖 uni-popup-dialog 内置样式 */
+    :deep(.uni-popup-dialog) {
+        width: 600rpx !important;
+        background-color: #fff;
+        border-radius: 24rpx;
+
+        /* 标题部分 */
+        .uni-dialog-title {
+            padding: 40rpx 0 20rpx;
+            .uni-dialog-title-text {
+                font-size: 36rpx;
+                font-weight: bold;
+            }
+        }
+
+        /* 内容部分 */
+        .uni-dialog-content {
+            padding: 20rpx 40rpx 40rpx;
+            .uni-dialog-content-text {
+                font-size: 30rpx;
+                color: #666;
+                line-height: 1.5;
+            }
+        }
+
+        /* 底部按钮组 */
+        .uni-dialog-button-group {
+            height: 100rpx;
+            border-top: 1rpx solid #f0f0f0;
+
+            .uni-dialog-button {
+                height: 100%;
+                /* 每个按钮的样式 */
+                .uni-dialog-button-text {
+                    font-size: 32rpx;
+                }
+
+                /* 确定按钮颜色（通常是蓝色或主题色） */
+                .uni-button-color {
+                    color: #007aff;
+                }
+            }
+
+            /* 按钮中间的分割线 */
+            .uni-border-left {
+                border-left: 1rpx solid #f0f0f0;
+            }
+        }
+    }
+}
+</style>

config.js

@@ -1,6 +1,6 @@
 export default {
-    // baseUrl: 'https://fw.rc.qingdao.gov.cn/rgpp-api/api', // 内网
+    baseUrl: 'https://fw.rc.qingdao.gov.cn/rgpp-api/api', // 内网
-    baseUrl: 'https://qd.zhaopinzao8dian.com/api', // 测试
+    // baseUrl: 'https://qd.zhaopinzao8dian.com/api', // 测试
     // baseUrl: 'http://192.168.3.29:8081',
     // baseUrl: 'http://10.213.6.207:19010/api',
     // 语音转文字

hook/useGlobalInactivity.js

@@ -1,80 +0,0 @@
-// hook/useGlobalInactivity.js
-import {
-    onMounted,
-    onUnmounted
-} from 'vue'
-
-export function useGlobalInactivity(callback, timeout = 60000) {
-    let timer = null
-    let isPaused = false
-
-    // ===== 高频事件节流 =====
-    let lastActivityTime = 0
-    const THROTTLE_DELAY = 300 // 300ms 内最多响应一次活动
-
-    const handleUserActivity = () => {
-        const now = Date.now()
-        if (now - lastActivityTime > THROTTLE_DELAY) {
-            lastActivityTime = now
-            resetTimer()
-        }
-    }
-
-    // 低频事件（可直接绑定）
-    const lowFreqEvents = ['mousedown', 'click', 'keydown', 'touchstart']
-    // 高频事件（需节流）
-    const highFreqEvents = ['mousemove', 'scroll', 'wheel', 'pointermove']
-
-    const resetTimer = () => {
-        if (isPaused) return
-        if (timer) clearTimeout(timer)
-        timer = setTimeout(() => {
-            callback()
-            pause() // 默认触发后停止
-        }, timeout)
-    }
-
-    const pause = () => {
-        isPaused = true
-        if (timer) {
-            clearTimeout(timer)
-            timer = null
-        }
-        lowFreqEvents.forEach(e => document.removeEventListener(e, resetTimer, true))
-        highFreqEvents.forEach(e => document.removeEventListener(e, handleUserActivity, true))
-        document.removeEventListener('visibilitychange', handleVisibilityChange)
-    }
-
-    const resume = () => {
-        if (!isPaused) return
-        isPaused = false
-        resetTimer()
-        lowFreqEvents.forEach(e => document.addEventListener(e, resetTimer, true))
-        highFreqEvents.forEach(e => document.addEventListener(e, handleUserActivity, true))
-        document.addEventListener('visibilitychange', handleVisibilityChange)
-    }
-
-    const handleVisibilityChange = () => {
-        if (document.hidden) {
-            pause()
-        } else {
-            resume()
-        }
-    }
-
-    const start = () => {
-        if (isPaused) return
-        resetTimer()
-        lowFreqEvents.forEach(e => document.addEventListener(e, resetTimer, true))
-        highFreqEvents.forEach(e => document.addEventListener(e, handleUserActivity, true))
-        document.addEventListener('visibilitychange', handleVisibilityChange)
-    }
-
-    onMounted(start)
-    onUnmounted(pause)
-
-    return {
-        resume,
-        pause
-    }
-}

main.js

@@ -8,6 +8,7 @@ import '@/lib/string-similarity.min.js'
 import similarityJobs from '@/utils/similarity_Job.js';
 import useScreenStore from './stores/useScreenStore'
 
+
 // 组件
 import AppLayout from './components/AppLayout/AppLayout.vue';
 import Empty from './components/empty/empty.vue';
@@ -24,6 +25,7 @@ import renderJobCollectionRecord from '@/components/renderJobCollectionRecord/re
 import renderCompanyCollectionRecord from '@/components/renderCompanyCollectionRecord/renderCompanyCollectionRecord.vue';
 import renderJobViewRecord from '@/components/renderJobViewRecord/renderJobViewRecord.vue';
 import MyIcons from '@/components/My-icons/my-icons.vue';
+import GlobalPopup from '@/components/GlobalPopup/GlobalPopup.vue'
 // import Tabbar from '@/components/tabbar/midell-box.vue'
 // 自动导入 directives 目录下所有指令
 console.log(lightAppJssdk)
@@ -54,7 +56,8 @@ export function createApp() {
     app.component('renderJobCollectionRecord', renderJobCollectionRecord) //渲染岗位收藏记录
     app.component('renderCompanyCollectionRecord', renderCompanyCollectionRecord) //渲染公司收藏记录
     app.component('renderJobViewRecord', renderJobViewRecord) //渲染岗位浏览记录
-    app.component('MyIcons', MyIcons) 
+    app.component('MyIcons', MyIcons)
+    app.component('global-popup', GlobalPopup)
     // app.component('tabbar-custom', Tabbar)
 
     for (const path in directives) {
@@ -68,6 +71,7 @@ export function createApp() {
         ...globalFunction,
         similarityJobs
     });
+
     app.provide('deviceInfo', globalFunction.getdeviceInfo());
 
     app.use(SelectPopupPlugin);

package-lock.json

@@ -0,0 +1,970 @@
+{
+  "name": "qingdao-employment-service",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "devDependencies": {
+        "unplugin-vue-components": "^0.26.0"
+      }
+    },
+    "node_modules/@antfu/utils": {
+      "version": "0.7.10",
+      "resolved": "https://registry.npmmirror.com/@antfu/utils/-/utils-0.7.10.tgz",
+      "integrity": "sha512-+562v9k4aI80m1+VuMHehNJWLOFjBnXn3tdOitzD0il5b7smkSBal4+a3oKiQTbrwMmN/TBUMDvbdoWDehgOww==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
+      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.28.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
+      "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.28.5",
+      "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.28.5.tgz",
+      "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@babel/types": "^7.28.5"
+      },
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/types": {
+      "version": "7.28.5",
+      "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.28.5.tgz",
+      "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.28.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmmirror.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmmirror.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmmirror.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@rollup/pluginutils": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/pluginutils/-/pluginutils-5.3.0.tgz",
+      "integrity": "sha512-5EdhGZtnu3V88ces7s53hhfK5KSASnJZv8Lulpc04cWO3REESroJXg73DFsOmgbU2BhwV0E20bu2IDZb3VKW4Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "^1.0.0",
+        "estree-walker": "^2.0.2",
+        "picomatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@types/estree": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmmirror.com/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@vue/compiler-core": {
+      "version": "3.5.25",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.5.25.tgz",
+      "integrity": "sha512-vay5/oQJdsNHmliWoZfHPoVZZRmnSWhug0BYT34njkYTPqClh3DNWLkZNJBVSjsNMrg0CCrBfoKkjZQPM/QVUw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@babel/parser": "^7.28.5",
+        "@vue/shared": "3.5.25",
+        "entities": "^4.5.0",
+        "estree-walker": "^2.0.2",
+        "source-map-js": "^1.2.1"
+      }
+    },
+    "node_modules/@vue/compiler-dom": {
+      "version": "3.5.25",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.5.25.tgz",
+      "integrity": "sha512-4We0OAcMZsKgYoGlMjzYvaoErltdFI2/25wqanuTu+S4gismOTRTBPi4IASOjxWdzIwrYSjnqONfKvuqkXzE2Q==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@vue/compiler-core": "3.5.25",
+        "@vue/shared": "3.5.25"
+      }
+    },
+    "node_modules/@vue/compiler-sfc": {
+      "version": "3.5.25",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.5.25.tgz",
+      "integrity": "sha512-PUgKp2rn8fFsI++lF2sO7gwO2d9Yj57Utr5yEsDf3GNaQcowCLKL7sf+LvVFvtJDXUp/03+dC6f2+LCv5aK1ag==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@babel/parser": "^7.28.5",
+        "@vue/compiler-core": "3.5.25",
+        "@vue/compiler-dom": "3.5.25",
+        "@vue/compiler-ssr": "3.5.25",
+        "@vue/shared": "3.5.25",
+        "estree-walker": "^2.0.2",
+        "magic-string": "^0.30.21",
+        "postcss": "^8.5.6",
+        "source-map-js": "^1.2.1"
+      }
+    },
+    "node_modules/@vue/compiler-ssr": {
+      "version": "3.5.25",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.5.25.tgz",
+      "integrity": "sha512-ritPSKLBcParnsKYi+GNtbdbrIE1mtuFEJ4U1sWeuOMlIziK5GtOL85t5RhsNy4uWIXPgk+OUdpnXiTdzn8o3A==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@vue/compiler-dom": "3.5.25",
+        "@vue/shared": "3.5.25"
+      }
+    },
+    "node_modules/@vue/reactivity": {
+      "version": "3.5.25",
+      "resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.5.25.tgz",
+      "integrity": "sha512-5xfAypCQepv4Jog1U4zn8cZIcbKKFka3AgWHEFQeK65OW+Ys4XybP6z2kKgws4YB43KGpqp5D/K3go2UPPunLA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@vue/shared": "3.5.25"
+      }
+    },
+    "node_modules/@vue/runtime-core": {
+      "version": "3.5.25",
+      "resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.5.25.tgz",
+      "integrity": "sha512-Z751v203YWwYzy460bzsYQISDfPjHTl+6Zzwo/a3CsAf+0ccEjQ8c+0CdX1WsumRTHeywvyUFtW6KvNukT/smA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@vue/reactivity": "3.5.25",
+        "@vue/shared": "3.5.25"
+      }
+    },
+    "node_modules/@vue/runtime-dom": {
+      "version": "3.5.25",
+      "resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.5.25.tgz",
+      "integrity": "sha512-a4WrkYFbb19i9pjkz38zJBg8wa/rboNERq3+hRRb0dHiJh13c+6kAbgqCPfMaJ2gg4weWD3APZswASOfmKwamA==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@vue/reactivity": "3.5.25",
+        "@vue/runtime-core": "3.5.25",
+        "@vue/shared": "3.5.25",
+        "csstype": "^3.1.3"
+      }
+    },
+    "node_modules/@vue/server-renderer": {
+      "version": "3.5.25",
+      "resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.5.25.tgz",
+      "integrity": "sha512-UJaXR54vMG61i8XNIzTSf2Q7MOqZHpp8+x3XLGtE3+fL+nQd+k7O5+X3D/uWrnQXOdMw5VPih+Uremcw+u1woQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@vue/compiler-ssr": "3.5.25",
+        "@vue/shared": "3.5.25"
+      },
+      "peerDependencies": {
+        "vue": "3.5.25"
+      }
+    },
+    "node_modules/@vue/shared": {
+      "version": "3.5.25",
+      "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.5.25.tgz",
+      "integrity": "sha512-AbOPdQQnAnzs58H2FrrDxYj/TJfmeS2jdfEEhgiKINy+bnOANmVizIEgq1r+C5zsbs6l1CCQxtcj71rwNQ4jWg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/acorn": {
+      "version": "8.15.0",
+      "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.15.0.tgz",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/anymatch/node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/binary-extensions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmmirror.com/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/chokidar": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/csstype": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.2.3.tgz",
+      "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/debug": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmmirror.com/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmmirror.com/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "peer": true,
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/estree-walker": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmmirror.com/estree-walker/-/estree-walker-2.0.2.tgz",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fast-glob": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmmirror.com/fast-glob/-/fast-glob-3.3.3.tgz",
+      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.8"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/fastq": {
+      "version": "1.19.1",
+      "resolved": "https://registry.npmmirror.com/fastq/-/fastq-1.19.1.tgz",
+      "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmmirror.com/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.16.1",
+      "resolved": "https://registry.npmmirror.com/is-core-module/-/is-core-module-2.16.1.tgz",
+      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmmirror.com/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmmirror.com/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/local-pkg": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmmirror.com/local-pkg/-/local-pkg-0.4.3.tgz",
+      "integrity": "sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/magic-string": {
+      "version": "0.30.21",
+      "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.21.tgz",
+      "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.5.5"
+      }
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmmirror.com/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "braces": "^3.0.3",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/micromatch/node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.11",
+      "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.11.tgz",
+      "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "peer": true,
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmmirror.com/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/picocolors": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "dev": true,
+      "license": "ISC",
+      "peer": true
+    },
+    "node_modules/picomatch": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/postcss": {
+      "version": "8.5.6",
+      "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.5.6.tgz",
+      "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "nanoid": "^3.3.11",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmmirror.com/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/resolve": {
+      "version": "1.22.11",
+      "resolved": "https://registry.npmmirror.com/resolve/-/resolve-1.22.11.tgz",
+      "integrity": "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-core-module": "^2.16.1",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/reusify": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/reusify/-/reusify-1.1.0.tgz",
+      "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/unplugin": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmmirror.com/unplugin/-/unplugin-1.16.1.tgz",
+      "integrity": "sha512-4/u/j4FrCKdi17jaxuJA0jClGxB1AvU2hw/IuayPc4ay1XGaJs/rbb4v5WKwAjNifjmXK9PIFyuPiaK8azyR9w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "acorn": "^8.14.0",
+        "webpack-virtual-modules": "^0.6.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/unplugin-vue-components": {
+      "version": "0.26.0",
+      "resolved": "https://registry.npmmirror.com/unplugin-vue-components/-/unplugin-vue-components-0.26.0.tgz",
+      "integrity": "sha512-s7IdPDlnOvPamjunVxw8kNgKNK8A5KM1YpK5j/p97jEKTjlPNrA0nZBiSfAKKlK1gWZuyWXlKL5dk3EDw874LQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@antfu/utils": "^0.7.6",
+        "@rollup/pluginutils": "^5.0.4",
+        "chokidar": "^3.5.3",
+        "debug": "^4.3.4",
+        "fast-glob": "^3.3.1",
+        "local-pkg": "^0.4.3",
+        "magic-string": "^0.30.3",
+        "minimatch": "^9.0.3",
+        "resolve": "^1.22.4",
+        "unplugin": "^1.4.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "@babel/parser": "^7.15.8",
+        "@nuxt/kit": "^3.2.2",
+        "vue": "2 || 3"
+      },
+      "peerDependenciesMeta": {
+        "@babel/parser": {
+          "optional": true
+        },
+        "@nuxt/kit": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vue": {
+      "version": "3.5.25",
+      "resolved": "https://registry.npmmirror.com/vue/-/vue-3.5.25.tgz",
+      "integrity": "sha512-YLVdgv2K13WJ6n+kD5owehKtEXwdwXuj2TTyJMsO7pSeKw2bfRNZGjhB7YzrpbMYj5b5QsUebHpOqR3R3ziy/g==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@vue/compiler-dom": "3.5.25",
+        "@vue/compiler-sfc": "3.5.25",
+        "@vue/runtime-dom": "3.5.25",
+        "@vue/server-renderer": "3.5.25",
+        "@vue/shared": "3.5.25"
+      },
+      "peerDependencies": {
+        "typescript": "*"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-virtual-modules": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmmirror.com/webpack-virtual-modules/-/webpack-virtual-modules-0.6.2.tgz",
+      "integrity": "sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==",
+      "dev": true,
+      "license": "MIT"
+    }
+  }
+}

package.json

@@ -0,0 +1,5 @@
+{
+  "devDependencies": {
+    "unplugin-vue-components": "^0.26.0"
+  }
+}

pages/chat/components/ai-paging.vue

@@ -241,6 +241,7 @@
             </view>
         </view>
         <PopupFeeBack ref="feeback" @onClose="colseFeeBack" @onSend="confirmFeeBack"></PopupFeeBack>
+        <UploadQrcode ref="qrcodeRef"></UploadQrcode>
         <MsgTips ref="feeBackTips" content="已收到反馈，感谢您的关注" title="反馈成功" :icon="successIcon"></MsgTips>
     </view>
 </template>
@@ -263,6 +264,7 @@ import useChatGroupDBStore from '@/stores/userChatGroupStore';
 import MdRender from '@/components/md-render/md-render.vue';
 import CollapseTransition from '@/components/CollapseTransition/CollapseTransition.vue';
 import PopupFeeBack from './popupbadFeeback.vue';
+import UploadQrcode from './uploadQrcode.vue';
 import AudioWave from './AudioWave.vue';
 import WaveDisplay from './WaveDisplay.vue';
 import FileIcon from './fileIcon.vue';
@@ -279,6 +281,8 @@ const { $api, navTo, throttle } = inject('globalFunction');
 const emit = defineEmits(['onConfirm']);
 const { messages, isTyping, textInput, chatSessionID } = storeToRefs(useChatGroupDBStore());
 import successIcon from '@/static/icon/success.png';
+import useUserStore from '@/stores/useUserStore';
+const {isMachineEnv} = storeToRefs(useUserStore());
 // hook
 // 语音识别
 const {
@@ -316,6 +320,7 @@ const feeBackTips = ref(null);
 const state = reactive({
     uploadFileTips: '请根据以上附件，帮我推荐岗位。',
 });
+const qrcodeRef = ref(null);
 
 const statusText = computed(() => {
     switch (status.value) {
@@ -599,6 +604,10 @@ function changeVoice() {
 }
 
 function changeShowFile() {
+    if(isMachineEnv){
+        qrcodeRef.value?.open()
+        return
+    }
     showfile.value = !showfile.value;
 }
 
@@ -1012,6 +1021,7 @@ image-margin-top = 40rpx
     left: 0
     padding: 10rpx 0 10rpx 30rpx
     box-shadow: 0rpx -4rpx 10rpx 0rpx rgba(11,44,112,0.06);
+    z-index:1
     .uploadfiles-scroll
         height: 100%
         .uploadfiles-list

pages/chat/components/uploadQrcode.vue

@@ -0,0 +1,118 @@
+<template>
+  <uni-popup
+    ref="popup"
+    type="center"
+    borderRadius="12px 12px 0 0"
+    @change="changePopup"
+    background-color="#F6F6F6"
+  >
+    <view class="popup-inner">
+      <view class="title">请扫码上传附件</view>
+      <view class="img-box">
+        <canvas canvas-id="qrcode" id="qrcode" />
+      </view>
+      <view class="close-btn" @click="close"></view>
+    </view>
+  </uni-popup>
+</template>
+
+<script setup>
+import uQRCode from '@/static/js/qrcode';
+import { ref, inject, getCurrentInstance } from 'vue';
+const emit = defineEmits(['onSend', 'onClose']);
+const { $api } = inject('globalFunction');
+const instance = getCurrentInstance();
+const popup = ref(null);
+
+function open() {
+  popup.value.open();
+  makeQrcode();
+}
+
+function close() {
+  popup.value.close();
+}
+
+function changePopup(e) {
+  if (e.show) {
+  } else {
+    emit('onClose');
+  }
+}
+
+function makeQrcode() {
+  const code = '111'
+  setTimeout(() => {
+    uQRCode.make({
+      canvasId: 'qrcode',
+      text: code,
+      size: uni.upx2px(300),
+      margin: 0,
+      backgroundColor: '#ffffff',
+      foregroundColor: '#1677ff',
+      fileType: 'png',
+      correctLevel: uQRCode.defaults.correctLevel,
+      success: (res) => {
+        console.log(res,'++');
+      },
+    });
+  }, 100);
+}
+
+defineExpose({ open, close });
+</script>
+
+<style lang="scss" scoped>
+.popup-inner{
+    padding:  30rpx;
+    padding-bottom: 40rpx;
+    width: 400rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+.title{
+    font-size: 30rpx;
+    color: #333;
+    margin-bottom: 30rpx;
+    font-weight: bold;
+}
+.img-box {
+  margin: 0 auto;
+  width: 300rpx;
+  height: 300rpx;
+  canvas {
+    width: 100%;
+    height: 100%;
+  }
+}
+.close-btn {
+  position: absolute;
+  right: 20rpx;
+  top: 20rpx;
+  width: 56rpx;
+  height: 56rpx;
+  &::before {
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    content: '';
+    width: 4rpx;
+    height: 28rpx;
+    border-radius: 2rpx;
+    background: #5a5a68;
+    transform: translate(50%, -50%) rotate(-45deg);
+  }
+  &::after {
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    content: '';
+    width: 4rpx;
+    height: 28rpx;
+    border-radius: 2rpx;
+    background: #5a5a68;
+    transform: translate(50%, -50%) rotate(45deg);
+  }
+}
+</style>

pages/index/index.vue

@@ -48,11 +48,10 @@ import Tabbar from '@/components/tabbar/midell-box.vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
 import IndexRefactor from './components/index-refactor.vue';
 import IndexTwo from './components/index-two.vue';
-import useScreenStore from '@/stores/useScreenStore'
+import useScreenStore from '@/stores/useScreenStore';
-
-const screenStore = useScreenStore()
-const {isWideScreen} = screenStore
 
+const screenStore = useScreenStore();
+const { isWideScreen } = screenStore;
 
 const loadedMap = reactive([false, false]);
 const swiperRefs = [ref(null), ref(null)];
@@ -71,21 +70,20 @@ const THRESHOLD = 5;
 watch(
     () => screenStore.isWideScreen,
     (newVal) => {
-        showTabbar.value = newVal
+        showTabbar.value = newVal;
     },
     { immediate: true }
-)
+);
-
 
 onLoad(() => {
     // 判断浏览器是否有 fristEntry 第一次进入
     let fristEntry = uni.getStorageSync('fristEntry') === false ? false : true; // 默认未读
-    maskFristEntry.value = fristEntry
+    maskFristEntry.value = fristEntry;
     if (fristEntry) {
-        if(!isWideScreen)uni.hideTabBar();
+        if (!isWideScreen) uni.hideTabBar();
-        else showTabbar.value = false
+        else showTabbar.value = false;
-    }else{
+    } else {
-        if(isWideScreen)showTabbar.value = true
+        if (isWideScreen) showTabbar.value = true;
     }
     // 预加载较重页面
     setTimeout(() => {
@@ -147,11 +145,11 @@ function handleTouchMove(e) {
 }
 
 function changeShowTabbar(val) {
-    if(isWideScreen){
+    if (isWideScreen) {
-        showTabbar.value=val
+        showTabbar.value = val;
-    }else{
+    } else {
-        if(val)uni.showTabBar()
+        if (val) uni.showTabBar();
-        else uni.hideTabBar()
+        else uni.hideTabBar();
     }
 }
 
@@ -207,14 +205,14 @@ function changeSwiperMsgType(e) {
 function closeFristEntry() {
     uni.setStorageSync('fristEntry', false);
     maskFristEntry.value = false;
-    if(!isWideScreen)uni.showTabBar();
+    if (!isWideScreen) uni.showTabBar();
-    else showTabbar.value=true
+    else showTabbar.value = true;
 }
 
 function goExperience() {
     closeFristEntry();
-    if(!isWideScreen)uni.showTabBar();
+    if (!isWideScreen) uni.showTabBar();
-    else showTabbar.value = true
+    else showTabbar.value = true;
     state.current = 1;
 }
 </script>
@@ -377,4 +375,4 @@ function goExperience() {
             background: #FFFFFF
             width: 4rpx
             height: 20rpx
-</style>
+</style>

pages/login/login.vue

@@ -1,58 +1,76 @@
 <template>
     <AppLayout title="就业服务程序">
-        <!-- 扫码登录-->
+        <view v-if="isMachineEnv" class="alipay-login-container">
-        <view class="alipay-login-container" v-if="isMachineEnv">
+            <!-- 切换 -->
-            <view class="login-scan-area">
+            <view class="login-method-switch">
-                <view class="login-title">支付宝扫码登录</view>
+                <view
-                <view class="qrcode-container">
+                    class="method-item"
-                    <view class="qrcode-wrapper" @click="refreshQrcode">
+                    :class="{ active: loginMethod === 'face' }"
-                        <view class="qrcode-border">
+                    @click="switchLoginMethod('face')"
-                            <view class="qrcode-content">
+                >
-                                <view class="qrcode-pattern">
+                    扫脸登录
-                                    <image
+                </view>
-                                        class="qrcode-img"
+                <view
-                                        src="@/static/icon/qrcode-example.png"
+                    class="method-item"
-                                        mode="scaleToFill"
+                    :class="{ active: loginMethod === 'qrcode' }"
-                                    />
+                    @click="switchLoginMethod('qrcode')"
-                                    <view class="qrcode-corner top-left"></view>
+                >
-                                    <view class="qrcode-corner top-right"></view>
+                    扫码登录
-                                    <view class="qrcode-corner bottom-left"></view>
+                </view>
-                                    <view class="scan-line" :style="{ top: scanLineTop + 'rpx' }"></view>
+            </view>
-                                </view>
 
-                                <!-- 二维码过期提示 -->
+            <view class="login-scan-area">
-                                <view v-if="qrcodeExpired" class="expired-overlay">
+                <view class="login-title">{{ loginMethod === 'qrcode' ? '扫码登录' : '扫脸登录' }}</view>
-                                    <text class="expired-text">二维码已过期</text>
+                <view class="qrcode-tips">
-                                    <view class="refresh-btn" @click.stop="refreshQrcode">
+                    <text class="tips-text">
-                                        <text class="refresh-text">点击刷新</text>
+                        {{ loginMethod === 'qrcode' ? '请将二维码对准机器下方' : '请将面部对准摄像头区域' }}
-                                    </view>
+                    </text>
-                                </view>
+                </view>
+            </view>
+
+            <!-- 扫码登录 -->
+            <view v-if="loginMethod === 'qrcode'" class="qrcode-container">
+                <view class="qrcode-wrapper">
+                    <view class="qrcode-border">
+                        <view class="qrcode-content">
+                            <view class="qrcode-pattern">
+                                <image class="qrcode-img" src="@/static/icon/qrcode.png" />
+                                <view class="qrcode-corner top-left"></view>
+                                <view class="qrcode-corner top-right"></view>
+                                <view class="qrcode-corner bottom-left"></view>
+                                <view class="qrcode-corner bottom-right"></view>
+                                <view class="scan-line" :style="{ top: scanLineTop + 'rpx' }"></view>
                             </view>
                         </view>
+                    </view>
+                </view>
+            </view>
 
-                        <view class="qrcode-tips">
+            <!-- 扫脸登录 -->
-                            <text class="tips-text">使用支付宝扫一扫登录</text>
+            <view v-else class="face-container">
-                            <text class="tips-subtext">扫一扫后点击确认完成登录</text>
+                <view class="face-wrapper">
+                    <view class="face-border">
+                        <view class="face-content">
+                            <view class="face-pattern">
+                                <image class="face-img" src="@/static/icon/face-icon.png" />
+                                <view class="face-scan-arc arc-1"></view>
+                                <view class="face-scan-arc arc-2"></view>
+                                <view class="face-scan-arc arc-3"></view>
+                                <view class="scan-line" :style="{ top: scanLineTop + 'rpx' }"></view>
+                            </view>
                         </view>
                     </view>
                 </view>
-                <!-- 刷新提示 -->
-                <view class="refresh-tips" v-if="countdown > 0">
-                    <view class="countdown-text">
-                        <span class="countdown-num">{{ countdown }}</span>
-                        秒后二维码过期
-                    </view>
-                </view>
             </view>
-            <!-- 扫码成功提示 -->
+
-            <view v-if="showSuccessTip" class="success-tip">
+            <view class="countdown-container">
-                <view class="success-content">
+                <view class="countdown-wrapper">
-                    <view class="success-icon">✓</view>
+                    <text class="countdown-number">{{ countdown }}</text>
-                    <text class="success-text">登录成功！</text>
+                    <text class="countdown-text">秒后自动返回</text>
                 </view>
+                <view class="cancel-btn" @click="cancelLogin">取消登录</view>
             </view>
         </view>
-
         <!-- 正常登录-->
         <tabcontrolVue v-else :current="tabCurrent">
             <template v-slot:tab0>
@@ -208,14 +226,12 @@ const fromValue = reactive({
     experience: '1',
 });
 
-// 扫码登录相关状态
+// 扫码扫脸登录
-const qrcodeExpired = ref(false);
 const scanLineTop = ref(0);
-const countdown = ref(0);
 let scanInterval = null;
+const countdown = ref(60);
 let countdownTimer = null;
-// 登录成功提示
+const loginMethod = ref('face'); // 'qrcode' / 'face'
-const showSuccessTip = ref(false);
 
 onLoad((parmas) => {
     getTreeselect();
@@ -223,44 +239,62 @@ onLoad((parmas) => {
 });
 
 onMounted(() => {
-    startScanAnimation();
+    if (isMachineEnv) {
-    resetCountdown();
+        startCountdown();
-    // 模拟扫码成功
+        startScanAnimation();
-    setTimeout(() => {
+    }
-        //   showSuccessTip.value=true
-    }, 5000);
 });
 onUnmounted(() => {
-    showSuccessTip.value = false;
     stopScanAnimation();
-    clearInterval(countdownTimer);
+    stopCountdown();
 });
 
-// 刷新二维码
+const startCountdown = () => {
-const refreshQrcode = () => {
+    stopCountdown();
-    qrcodeExpired.value = false;
-    resetCountdown();
-    startScanAnimation();
-    // TODO
-};
-
-// 重置倒计时
-const resetCountdown = () => {
     countdown.value = 60;
-    clearInterval(countdownTimer);
-
     countdownTimer = setInterval(() => {
-        if (countdown.value > 0) {
+        countdown.value--;
-            countdown.value--;
+        if (countdown.value <= 0) {
-        } else {
+            returnToHome();
-            qrcodeExpired.value = true;
-            clearInterval(countdownTimer);
-            stopScanAnimation();
         }
     }, 1000);
 };
 
-// 开始扫描动画
+const stopCountdown = () => {
+    if (countdownTimer) {
+        clearInterval(countdownTimer);
+        countdownTimer = null;
+    }
+};
+
+const resetCountdown = () => {
+    stopCountdown();
+    startCountdown();
+};
+
+// 返回首页
+const returnToHome = () => {
+    stopCountdown();
+    stopScanAnimation();
+    uni.switchTab({
+        url: '/pages/index/index',
+    });
+};
+
+// 取消登录
+const cancelLogin = () => {
+    returnToHome();
+};
+
+// 切换登录方式
+const switchLoginMethod = (method) => {
+    if (loginMethod.value !== method) {
+        loginMethod.value = method;
+        resetCountdown();
+    }
+};
+
+// 开始动画
 const startScanAnimation = () => {
     clearInterval(scanInterval);
 
@@ -269,7 +303,7 @@ const startScanAnimation = () => {
     }, 30);
 };
 
-// 停止扫描动画
+// 停止动画
 const stopScanAnimation = () => {
     clearInterval(scanInterval);
 };
@@ -368,9 +402,6 @@ function loginbackdoor() {
     if (isMachineEnv.value) {
         useUserStore().logOutApp();
         $api.msg('返回首页');
-        // setTimeout(() => {
-        //     window.location.reload();
-        // }, 2000);
         return;
     }
     $api.createRequest('/app/mock/login', {}, 'post').then((resData) => {
@@ -441,7 +472,34 @@ function complete() {
     display: flex;
     flex-direction: column;
     align-items: center;
-    justify-content: center;
+    padding: 40rpx 0;
+    box-sizing: border-box;
+}
+
+/* 登录方式切换 */
+.login-method-switch {
+    display: flex;
+    width: 80%;
+    margin-bottom: 40rpx;
+    background: #f5f5f5;
+    border-radius: 50rpx;
+    padding: 6rpx;
+}
+
+.method-item {
+    flex: 1;
+    text-align: center;
+    padding: 20rpx 0;
+    font-size: 28rpx;
+    color: #666;
+    border-radius: 50rpx;
+    transition: all 0.3s;
+
+    &.active {
+        background: #1677ff;
+        color: #fff;
+        font-weight: 500;
+    }
 }
 
 /* 扫码登录区域样式 */
@@ -457,15 +515,27 @@ function complete() {
     font-size: 36rpx;
     font-weight: 600;
     color: #1677ff;
-    margin-bottom: 40rpx;
+    margin-bottom: 20rpx;
     text-align: center;
 }
 
+.qrcode-tips {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    margin-bottom: 40rpx;
+}
+
+.tips-text {
+    font-size: 28rpx;
+    color: #333;
+}
+
+/* 二维码容器 */
 .qrcode-container {
     width: 100%;
     display: flex;
     justify-content: center;
-    margin-bottom: 40rpx;
 }
 
 .qrcode-wrapper {
@@ -481,7 +551,6 @@ function complete() {
     border-radius: 20rpx;
     padding: 20rpx;
     box-shadow: 0 8rpx 30rpx rgba(22, 119, 255, 0.1);
-    margin-bottom: 30rpx;
     position: relative;
 }
 
@@ -502,7 +571,9 @@ function complete() {
     height: 300rpx;
     background-color: #fff;
     position: relative;
+    padding: 30rpx;
 }
+
 .qrcode-img {
     width: 100%;
     height: 100%;
@@ -537,6 +608,14 @@ function complete() {
         border-top: none;
         border-radius: 0 0 0 10rpx;
     }
+
+    &.bottom-right {
+        bottom: 0;
+        right: 0;
+        border-left: none;
+        border-top: none;
+        border-radius: 0 0 10rpx 0;
+    }
 }
 
 .scan-line {
@@ -545,335 +624,154 @@ function complete() {
     left: 0;
     width: 100%;
     height: 6rpx;
-    background: linear-gradient(90deg, transparent, #1677ff, transparent);
+    background: linear-gradient(90deg, transparent, #217bf9, transparent);
+    box-shadow: 0 -6rpx 4rpx #ffffff;
     z-index: 10;
 }
 
-.expired-overlay {
+/* 扫脸登录样式 */
-    position: absolute;
+.face-container {
-    top: 0;
-    left: 0;
     width: 100%;
-    height: 100%;
-    background-color: rgba(0, 0, 0, 0.7);
-    border-radius: 10rpx;
     display: flex;
-    flex-direction: column;
-    align-items: center;
     justify-content: center;
-    z-index: 20;
 }
 
-.expired-text {
+.face-wrapper {
-    font-size: 32rpx;
-    color: #fff;
-    margin-bottom: 30rpx;
-}
-
-.refresh-btn {
-    padding: 16rpx 40rpx;
-    background-color: #1677ff;
-    border-radius: 50rpx;
-}
-
-.refresh-text {
-    font-size: 28rpx;
-    color: #fff;
-}
-
-.qrcode-tips {
     display: flex;
     flex-direction: column;
     align-items: center;
 }
 
-.tips-text {
+.face-border {
-    font-size: 28rpx;
+    width: 400rpx;
-    color: #333;
+    height: 400rpx;
-    margin-bottom: 10rpx;
+    background-color: #fff;
-}
+    border-radius: 50%;
-
+    padding: 20rpx;
-.tips-subtext {
+    box-shadow: 0 8rpx 30rpx rgba(22, 119, 255, 0.1);
-    font-size: 24rpx;
-    color: #666;
-}
-
-.refresh-tips {
-    margin-bottom: 40rpx;
-}
-
-.countdown-text {
-    font-size: 24rpx;
-    color: #999;
-    display: flex;
-    align-items: center;
-}
-.countdown-num {
-    margin-right: 5rpx;
-    color: #1677ff;
-    font-size: 30rpx;
-}
-
-.switch-method {
-    width: 100%;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 30rpx 0;
-    border-top: 1rpx solid #f0f0f0;
-}
-
-.switch-text {
-    font-size: 28rpx;
-    color: #666;
-}
-
-.switch-btn {
-    display: flex;
-    align-items: center;
-}
-
-.btn-text {
-    font-size: 28rpx;
-    color: #1677ff;
-    margin-right: 10rpx;
-}
-
-.icon-arrow {
-    font-size: 28rpx;
-    color: #1677ff;
-}
-
-/* 账号密码登录区域样式 */
-.login-password-area {
-    width: 100%;
-    display: flex;
-    flex-direction: column;
-    padding: 0 40rpx;
-}
-
-.password-header {
-    display: flex;
-    align-items: center;
-    margin-bottom: 60rpx;
-}
-
-.back-btn {
-    width: 60rpx;
-    height: 60rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    margin-right: 20rpx;
-}
-
-.icon-back {
-    font-size: 36rpx;
-    color: #333;
-}
-
-.login-form {
-    width: 100%;
-}
-
-.form-item {
-    margin-bottom: 40rpx;
     position: relative;
 }
 
-.item-label {
+.face-content {
-    font-size: 28rpx;
-    color: #333;
-    margin-bottom: 20rpx;
-}
-
-.item-input {
     width: 100%;
-    height: 80rpx;
+    height: 100%;
     background-color: #f8f8f8;
-    border-radius: 10rpx;
+    border-radius: 50%;
-    padding: 0 24rpx;
+    display: flex;
-    font-size: 28rpx;
+    align-items: center;
-    color: #333;
+    justify-content: center;
+    position: relative;
+    overflow: hidden;
 }
 
-.input-placeholder {
+.face-pattern {
-    color: #999;
+    width: 300rpx;
-    font-size: 28rpx;
+    height: 300rpx;
+    position: relative;
 }
 
-.forget-password {
+.face-img {
-    position: absolute;
-    right: 0;
-    top: 0;
-    font-size: 26rpx;
-    color: #1677ff;
-}
-
-.login-btn {
     width: 100%;
-    height: 90rpx;
+    height: 100%;
-    background-color: #1677ff;
+}
+
+.face-scan-arc {
+    position: absolute;
+    border: 4rpx solid transparent;
+    border-top-color: #1677ff;
+    border-radius: 50%;
+    width: 300rpx;
+    height: 300rpx;
+    top: 0rpx;
+    left: 0rpx;
+
+    &.arc-1 {
+        animation: faceScanRotate1 3s linear infinite;
+    }
+
+    &.arc-2 {
+        transform: rotate(120deg);
+        animation: faceScanRotate2 3s linear infinite;
+    }
+
+    &.arc-3 {
+        transform: rotate(240deg);
+        animation: faceScanRotate3 3s linear infinite;
+    }
+}
+
+@keyframes faceScanRotate1 {
+    0% {
+        transform: rotate(0deg);
+    }
+    100% {
+        transform: rotate(360deg);
+    }
+}
+@keyframes faceScanRotate2 {
+    0% {
+        transform: rotate(120deg);
+    }
+    100% {
+        transform: rotate(480deg);
+    }
+}
+@keyframes faceScanRotate3 {
+    0% {
+        transform: rotate(240deg);
+    }
+    100% {
+        transform: rotate(600deg);
+    }
+}
+
+/* 底部操作区域 */
+.bottom-action-area {
+    width: 100%;
+    padding: 40rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 30rpx;
+}
+
+.countdown-wrapper {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-top: 20rpx;
+}
+
+.countdown-number {
+    font-size: 40rpx;
+    font-weight: 600;
+    color: #1677ff;
+    min-width: 60rpx;
+    text-align: center;
+}
+
+.countdown-text {
+    font-size: 28rpx;
+    color: #666;
+}
+
+.cancel-btn {
+    margin-top: 20rpx;
+    width: 300rpx;
+    height: 80rpx;
+    background: transparent;
+    border: 2rpx solid #1677ff;
     border-radius: 50rpx;
     display: flex;
     align-items: center;
     justify-content: center;
-    margin-top: 60rpx;
-
-    &.disabled {
-        background-color: #a0cfff;
-    }
-}
-
-.login-btn-text {
     font-size: 32rpx;
-    color: #fff;
-    font-weight: 500;
-}
-
-.agreement {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    margin-top: 40rpx;
-    flex-wrap: wrap;
-}
-
-.agreement-checkbox {
-    margin-right: 10rpx;
-}
-
-.checkbox-icon {
-    width: 32rpx;
-    height: 32rpx;
-    border-radius: 6rpx;
-    border: 2rpx solid #ddd;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    &.checked {
-        background-color: #1677ff;
-        border-color: #1677ff;
-    }
-}
-
-.checkmark {
-    font-size: 24rpx;
-    color: #fff;
-}
-
-.agreement-text {
-    font-size: 24rpx;
-    color: #666;
-    margin-right: 6rpx;
-}
-
-.agreement-link {
-    font-size: 24rpx;
     color: #1677ff;
-    margin-right: 6rpx;
+    font-weight: 500;
-}
+    transition: all 0.3s;
-
+    &:active {
-.other-login {
+        background: rgba(22, 119, 255, 0.1);
-    margin-top: 80rpx;
-}
-
-.other-title {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    margin-bottom: 50rpx;
-}
-
-.title-line {
-    flex: 1;
-    height: 1rpx;
-    background-color: #eee;
-}
-
-.title-text {
-    font-size: 24rpx;
-    color: #999;
-    margin: 0 20rpx;
-}
-
-.login-methods {
-    display: flex;
-    justify-content: center;
-    gap: 100rpx;
-}
-
-.method-item {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-}
-
-.method-icon {
-    width: 100rpx;
-    height: 100rpx;
-    border-radius: 50%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 40rpx;
-    color: #fff;
-    margin-bottom: 20rpx;
-
-    &.scan-icon {
-        background-color: #1677ff;
     }
-
-    &.sms-icon {
-        background-color: #52c41a;
-    }
-}
-
-.method-text {
-    font-size: 24rpx;
-    color: #666;
-}
-
-/* 登录成功提示 */
-.success-tip {
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    background-color: rgba(0, 0, 0, 0.5);
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    z-index: 1000;
-}
-
-.success-content {
-    background-color: #fff;
-    border-radius: 20rpx;
-    padding: 60rpx 80rpx;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-}
-
-.success-icon {
-    width: 120rpx;
-    height: 120rpx;
-    border-radius: 50%;
-    background-color: #52c41a;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 60rpx;
-    color: #fff;
-    margin-bottom: 30rpx;
-}
-
-.success-text {
-    font-size: 32rpx;
-    color: #333;
 }
 </style>
 
@@ -1059,4 +957,4 @@ function complete() {
         color: #FFFFFF;
         text-align: center;
         line-height: 90rpx
-</style>
+</style>

utils/GlobalInactivityManager.js

@@ -0,0 +1,76 @@
+// utils/GlobalInactivityManager.js
+
+export class GlobalInactivityManager {
+    constructor(callback, timeout = 60000) {
+        this.callback = callback
+        this.timeout = timeout
+        this.timer = null
+        this.isPaused = false
+        this.lastActivityTime = 0
+        this.THROTTLE_DELAY = 300
+
+        this.lowFreqEvents = ['mousedown', 'click', 'keydown', 'touchstart']
+        this.highFreqEvents = ['mousemove', 'scroll', 'wheel', 'pointermove']
+    }
+
+    resetTimer = () => {
+        if (this.isPaused) return
+        if (this.timer) clearTimeout(this.timer)
+        this.timer = setTimeout(() => {
+            this.callback()
+            this.pause()
+        }, this.timeout)
+    }
+
+    handleUserActivity = () => {
+        const now = Date.now()
+        if (now - this.lastActivityTime > this.THROTTLE_DELAY) {
+            this.lastActivityTime = now
+            this.resetTimer()
+        }
+    }
+
+    handleVisibilityChange = () => {
+        if (document.hidden) {
+            this.pause()
+        } else {
+            this.resume()
+        }
+    }
+
+    start() {
+        if (this.isPaused) return
+        this.resetTimer()
+
+        this.lowFreqEvents.forEach(event => {
+            document.addEventListener(event, this.resetTimer, true)
+        })
+        this.highFreqEvents.forEach(event => {
+            document.addEventListener(event, this.handleUserActivity, true)
+        })
+        document.addEventListener('visibilitychange', this.handleVisibilityChange)
+    }
+
+    pause() {
+        this.isPaused = true
+        if (this.timer) clearTimeout(this.timer)
+
+        this.lowFreqEvents.forEach(event => {
+            document.removeEventListener(event, this.resetTimer, true)
+        })
+        this.highFreqEvents.forEach(event => {
+            document.removeEventListener(event, this.handleUserActivity, true)
+        })
+        document.removeEventListener('visibilitychange', this.handleVisibilityChange)
+    }
+
+    resume() {
+        this.isPaused = false
+        this.start() // 现在 this 指向正确，事件能正常绑定和触发
+    }
+
+    destroy() {
+        this.pause()
+        this.callback = null
+    }
+}

utils/modal.js

@@ -0,0 +1,46 @@
+/**
+ * 全局弹窗调用工具
+ * @param {Object} options - 配置项 (title, content, type, success, fail, confirmColor...)
+ */
+export const $confirm = (options = {}) => {
+    return new Promise((resolve) => {
+        // 1. 稍微延迟发送，确保注入的页面组件已完成 uni.$on 监听挂载
+        // 如果是用户点击触发，延迟可以设为 0；如果是拦截器自动触发，建议保留 200ms
+        setTimeout(() => {
+            uni.$emit('show-global-popup', {
+                title: options.title || '提示',
+                content: options.content || '',
+                type: options.type || 'info',
+                // 核心：重新包装 resolve 逻辑
+                resolve: (isConfirm) => {
+                    if (isConfirm) {
+                        // 执行成功回调
+                        if (typeof options.success === 'function') {
+                            options.success({
+                                confirm: true,
+                                cancel: false
+                            });
+                        }
+                        resolve(true);
+                    } else {
+                        // 执行失败/取消回调
+                        if (typeof options.fail === 'function') {
+                            options.fail({
+                                confirm: false,
+                                cancel: true
+                            });
+                        }
+                        resolve(false);
+                    }
+                },
+            });
+        }, options.delay || 200);
+    });
+};
+// // 页面中使用
+// import {
+//     $confirm
+// } from '@/utils/modal.js';
+// const ok = await $confirm({
+//     title: '测试'
+// });

vite-inject-popup.js

@@ -0,0 +1,66 @@
+import fs from 'fs';
+import path from 'path';
+
+// 读取并解析 pages.json
+function getPagesConfig() {
+    const pagesJsonPath = path.resolve(__dirname, 'pages.json');
+    let rawContent = fs.readFileSync(pagesJsonPath, 'utf8');
+
+    // 核心修复：使用正则去除 JSON 中的 // 和 /* */ 注释
+    const jsonContent = rawContent.replace(/\/\/.*|\/\*[\s\S]*?\*\//g, "");
+
+    const pagesJson = JSON.parse(jsonContent);
+    const pagePaths = [];
+
+    // 1. 提取主包页面
+    if (pagesJson.pages) {
+        pagesJson.pages.forEach(p => pagePaths.push(p.path));
+    }
+
+    // 2. 提取分包页面
+    if (pagesJson.subPackages) {
+        pagesJson.subPackages.forEach(sub => {
+            if (sub.pages) {
+                sub.pages.forEach(p => {
+                    pagePaths.push(`${sub.root}/${p.path}`);
+                });
+            }
+        });
+    }
+
+    return pagePaths;
+}
+
+const allPages = getPagesConfig();
+
+export default function viteInjectPopup() {
+    return {
+        name: 'vite-inject-popup',
+        enforce: 'pre',
+        transform(code, id) {
+            // 将绝对路径转为相对项目的路径，便于匹配
+            // 例如: /Users/.../pages/index/index.vue -> pages/index/index
+            const relativePath = id.replace(/\\/g, '/').split('.vue')[0];
+
+            // 校验当前文件是否在 pages.json 的定义中
+            const isTargetPage = allPages.some(pagePath => relativePath.endsWith(pagePath));
+
+            if (isTargetPage && !code.includes('global-popup')) {
+                const lastTemplateEndIndex = code.lastIndexOf('</template>');
+                if (lastTemplateEndIndex !== -1) {
+                    const newCode =
+                        code.slice(0, lastTemplateEndIndex) +
+                        '\n  <global-popup />\n' +
+                        code.slice(lastTemplateEndIndex);
+
+                    console.log(`🎯 [精准注入]: ${relativePath}`);
+                    return {
+                        code: newCode,
+                        map: null
+                    };
+                }
+            }
+            return null;
+        }
+    };
+}

vite.config.js

@@ -0,0 +1,13 @@
+import {
+    defineConfig
+} from 'vite';
+import uni from '@dcloudio/vite-plugin-uni';
+import viteInjectPopup from './vite-inject-popup.js'; // 你的自定义插件
+
+export default defineConfig({
+    plugins: [
+        // 只保留这一个自定义插件，它只负责改 template 字符串
+        viteInjectPopup(),
+        uni(),
+    ]
+});