flat: 暂存

App.vue

@@ -6,34 +6,25 @@ import useUserStore from './stores/useUserStore';
 import usePageAnimation from './hook/usePageAnimation';
 import useDictStore from './stores/useDictStore';
 import { GlobalInactivityManager } from '@/utils/GlobalInactivityManager';
-const {
+const { $api, navTo, appendScriptTagElement, aes_Decrypt, sm2_Decrypt, safeReLaunch } = inject('globalFunction');
-    $api,
-    navTo,
-    appendScriptTagElement,
-    aes_Decrypt,
-    sm2_Decrypt,
-    safeReLaunch,
-    isY9MachineType,
-    isAsdMachineType,
-} = inject('globalFunction');
 import config from '@/config.js';
 import baseDB from '@/utils/db.js';
 import { $confirm } from '@/utils/modal.js';
 import useLocationStore from '@/stores/useLocationStore';
+usePageAnimation();
 const appword = 'aKd20dbGdFvmuwrt'; // 固定值
 let uQRListen = null;
 let inactivityManager = null;
 let inactivityModalTimer = null;
 
-usePageAnimation();
 onLaunch((options) => {
     useDictStore().getDictData();
-    if (isAsdMachineType()) {
+    if (lightAppJssdk.user) {
         console.warn('爱山东环境');
         getUserInfo();
         useUserStore().changMiniProgramAppStatus(false);
         useUserStore().changMachineEnv(false);
-        useLocationStore().getLocationLoop(); //循环获取定位
+        useLocationStore().getLocationLoop()//循环获取定位
         return;
     }
     if (isY9MachineType()) {
@@ -43,19 +34,17 @@ onLaunch((options) => {
         useUserStore().changMiniProgramAppStatus(true);
         useUserStore().changMachineEnv(true);
         (function loop() {
-            console.log('📍一体机尝试获取定位');
+            console.log('📍一体机尝试获取定位')
-            useLocationStore()
+            useLocationStore().getLocation().then(({longitude,latitude})=>{
-                .getLocation()
+                console.log(`✅一体机获取定位成功:lng:${longitude},lat${latitude}`)
-                .then(({ longitude, latitude }) => {
+            })
-                    console.log(`✅一体机获取定位成功:lng:${longitude},lat${latitude}`);
+            .catch(err=>{
-                })
+                console.log('❌一体机获取定位失败,30s后尝试重新获取')
-                .catch((err) => {
+                setTimeout(() => {
-                    console.log('❌一体机获取定位失败,30s后尝试重新获取');
+                   loop()
-                    setTimeout(() => {
+                }, 3000);
-                        loop();
+            })
-                    }, 3000);
+        })()
-                });
-        })();
         uQRListen = new IncreaseRevie();
         inactivityManager = new GlobalInactivityManager(handleInactivity, 60 * 1000);
         inactivityManager.start();
@@ -63,7 +52,7 @@ onLaunch((options) => {
     }
     // 正式上线去除此方法
     console.warn('浏览器环境');
-    useLocationStore().getLocationLoop(); //循环获取定位
+    useLocationStore().getLocationLoop()//循环获取定位
     useUserStore().changMiniProgramAppStatus(true);
     useUserStore().changMachineEnv(false);
     useUserStore().initSeesionId(); //更新
@@ -81,6 +70,7 @@ onLaunch((options) => {
 
 onMounted(() => {});
 
+
 onShow(() => {
     console.log('App Show');
 });
@@ -143,6 +133,13 @@ function performLogout() {
     inactivityManager?.resume(); // 恢复监听
 }
 
+// 一体机环境判断
+function isY9MachineType() {
+    const ua = navigator.userAgent;
+    const isY9Machine = /Y9-ZYYH/i.test(ua); // 匹配机器型号
+    return isY9Machine;
+}
+
 // 爱山东环境登录
 function getUserInfo() {
     lightAppJssdk.user.getUserInfoWithEncryptedParamByAppId({

common/all-in-one-listen.js

@@ -1,6 +1,5 @@
 import {
-    $api,
+    $api
-    safeReLaunch
 } from "./globalFunction";
 import baseDB from '@/utils/db.js';
 import useUserStore from '@/stores/useUserStore';
@@ -44,23 +43,21 @@ export class IncreaseRevie {
 
     async handleDebouncedCallback(res) {
         if (res.data) {
-            const code = res.data.qrCode
+            const code = res.data.qrQode
-            if (/^\d{6}$/.test(String(code))) {
+            console.log('二维码code', code);
-                // 把code给到后端，后端拿code兑换用户信息，给前端返回token进行登录
+            // 把code给到后端，后端拿code兑换用户信息，给前端返回token进行登录
-                // 一体机用户需要清空indexDB
+            // 一体机用户需要清空indexDB
-                $api.createRequest(`/app/qrcodeLogin/${code}`, {}, 'get').then((resData) => {
+            // useUserStore()
-                    useUserStore()
+            //     .loginSetToken(resData.token)
-                        .loginSetToken(resData.token)
+            //     .then((resume) => {
-                        .then((resume) => {
+            //         if (resume.data.jobTitleId) {
-                            if (resume.data.jobTitleId) {
+            //             useUserStore().initSeesionId();
-                                useUserStore().initSeesionId();
+            //             safeReLaunch('/pages/index/index');
-                                safeReLaunch('/pages/index/index');
+            //         } else {
-                            } else {
+            //             safeReLaunch('/pages/login/login');
-                                safeReLaunch('/pages/login/login');
+            //         }
-                            }
+            //     });
-                        });
+            // baseDB.resetAndReinit(); // 清空indexdb 
-                });
-            }
         } else {
             $api.msg('识别失败')
         }

common/globalFunction.js

@@ -634,20 +634,6 @@ export function reloadBrowser() {
     window.location.reload()
 }
 
-// 一体机环境判断
-export function isY9MachineType() {
-    const ua = navigator.userAgent;
-    const isY9Machine = /Y9-ZYYH/i.test(ua); // 匹配机器型号
-    return isY9Machine;
-}
-
-// 一体机环境判断
-export function isAsdMachineType() {
-    const ua = navigator.userAgent;
-    const isY9Machine = /asd_hanweb/i.test(ua); // 匹配机器型号
-    return isY9Machine;
-}
-
 
 export const $api = {
     msg,
@@ -698,7 +684,5 @@ export default {
     sm2_Decrypt,
     sm2_Encrypt,
     safeReLaunch,
-    reloadBrowser,
+    reloadBrowser
-    isAsdMachineType,
-    isY9MachineType
 }

config.js

@@ -1,11 +1,11 @@
 export default {
-    // baseUrl: 'https://fw.rc.qingdao.gov.cn/rgpp-api/api', // 内网
+    baseUrl: 'http://36.105.163.21:30081/rgpp/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',
     // 语音转文字
-    // vioceBaseURl: 'wss://qd.zhaopinzao8dian.com/api/app/asr/connect', // 自定义 
+    vioceBaseURl: 'wss://qd.zhaopinzao8dian.com/api/app/asr/connect', // 自定义 
-    vioceBaseURl: 'wss://fw.rc.qingdao.gov.cn/rgpp-api/api/app/asr/connect', // 内网 
+    // vioceBaseURl: 'wss://fw.rc.qingdao.gov.cn/rgpp-api/api/app/asr/connect', // 内网 
     // 语音合成
     // speechSynthesis: 'wss://qd.zhaopinzao8dian.com/api/speech-synthesis',
     // speechSynthesis2: 'wss://resource.zhuoson.com/synthesis/', //直接替换即可

pages/index/components/AIMatch.vue

@@ -219,7 +219,7 @@ const renderScene = (sw, sh) => {
             radius: scaledRadius,
             floatOffset: Math.random() * Math.PI * 2,
             floatSpeed: 0.01 + Math.random() * 0.02,
-            floatRange: 2 * ratio + Math.random() * 2,
+            floatRange: 2 + Math.random() * 2,
             safeH: safeH,
         };