flat: 暂存

App.vue

@@ -3,26 +3,29 @@ import { reactive, inject, onMounted } from 'vue';
 import { onLaunch, onShow, onHide } from '@dcloudio/uni-app';
 import useUserStore from './stores/useUserStore';
 import useDictStore from './stores/useDictStore';
-const { $api, navTo, appendScriptTagElement } = inject('globalFunction');
+const { $api, navTo, appendScriptTagElement, aes_Decrypt, sm2_Decrypt } = inject('globalFunction');
 import config from '@/config.js';
 
+const appword = 'aKd20dbGdFvmuwrt'; // 固定值
+
 onLaunch((options) => {
-    useUserStore().initSeesionId(); //更新
+    getUserInfo();
+    // useUserStore().initSeesionId(); //更新
     useDictStore().getDictData();
-    uni.hideTabBar();
+    // uni.hideTabBar();
     // 登录
-    let token = uni.getStorageSync('token') || ''; // 同步获取 缓存信息
-    if (token) {
-        useUserStore()
-            .loginSetToken(token)
-            .then(() => {
-                $api.msg('登录成功');
-            });
-    } else {
-        uni.redirectTo({
-            url: '/pages/login/login',
-        });
-    }
+    // let token = uni.getStorageSync('token') || ''; // 同步获取 缓存信息
+    // if (token) {
+    //     useUserStore()
+    //         .loginSetToken(token)
+    //         .then(() => {
+    //             $api.msg('登录成功');
+    //         });
+    // } else {
+    //     uni.redirectTo({
+    //         url: '/pages/login/login',
+    //     });
+    // }
 });
 
 onMounted(() => {});
@@ -34,6 +37,87 @@ onShow(() => {
 onHide(() => {
     console.log('App Hide');
 });
+
+function getUserInfo() {
+    lightAppJssdk.user.getUserInfoWithEncryptedParamByAppId({
+        appId: 'qdsrgznrgpp', // 接入方在成功创建应用后自动生成
+        success: function (data) {
+            if (data == '未登录') onLoginApp();
+            else {
+                if (typeof data == 'string') data = JSON.parse(data);
+
+                const sm2_privateKey = '7e14966df4ecd4241ed082ef716d82b52113cb5899ebdc704a98844d0a32b0dc';
+                let sm2_encrypt_result = data.data;
+                let sm2_decrypt_result = sm2_Decrypt(sm2_encrypt_result, sm2_privateKey);
+
+                if (typeof sm2_decrypt_result == 'string') sm2_decrypt_result = JSON.parse(sm2_decrypt_result);
+
+                // 其次,对sm2解密后的结果进行 aes解密
+                // aes解密需要用到 appword , 为固定值,使用示例代码中的即可
+                let aes_encrypt_result = sm2_decrypt_result.data;
+                let aes_decrypt_result = aes_Decrypt(aes_encrypt_result, appword);
+
+                // 加密
+                loginCallback(aes_decrypt_result);
+            }
+        },
+        fail: function (data) {
+            console.log('err', data);
+        },
+    });
+}
+
+/**
+ * 使用jssdk调用登录页面
+ */
+function onLoginApp() {
+    lightAppJssdk.user.loginapp({
+        success: function (data) {
+            if (data == '未登录') {
+                //取消登录或登录失败，关闭页面
+                oncloseWindow();
+            } else {
+                getUserInfo();
+            }
+        },
+        fail: function (data) {
+            //关闭页面
+            oncloseWindow();
+        },
+    });
+}
+
+/**
+ * 关闭容器
+ */
+function oncloseWindow() {
+    lightAppJssdk.navigation.close({
+        success: function (data) {},
+        fail: function (data) {},
+    });
+}
+
+function loginCallback(userInfo) {
+    let params = {
+        username: userInfo,
+    };
+    $api.createRequest('/app/login', params, 'post').then((resData) => {
+        useUserStore()
+            .loginSetToken(resData.token)
+            .then((resume) => {
+                if (resume.data.jobTitleId) {
+                    useUserStore().initSeesionId();
+                    uni.reLaunch({
+                        url: '/pages/index/index',
+                    });
+                } else {
+                    uni.redirectTo({
+                        url: '/pages/login/login',
+                    });
+                }
+            });
+    });
+}
 </script>
 
 <style>

common/globalFunction.js

@@ -1,5 +1,6 @@
 import useUserStore from "../stores/useUserStore";
 import {
+    request,
     createRequest,
     uploadFile
 } from "../utils/request";
@@ -7,9 +8,6 @@ import streamRequest, {
     chatRequest
 } from "../utils/streamRequest.js";
 
-const sm4 = typeof window.sm4 !== 'undefined' ? window.sm4 :
-    (typeof window.smCrypto !== 'undefined' ? window.smCrypto.sm4 : null);
-
 export const CloneDeep = (props) => {
     if (typeof props !== 'object' || props === null) {
         return props
@@ -554,52 +552,31 @@ function isEmptyObject(obj) {
     return obj && typeof obj === 'object' && !Array.isArray(obj) && Object.keys(obj).length === 0;
 }
 
-
-export function sm4Decrypt(key, value, mode = "hex") {
-    try {
-        if (key.length !== 32) {
-            alert('密钥必须是32位16进制字符串（128位）');
-            return;
-        }
-        const decrypted = sm4.decrypt(value, key, {
-            mode: 'ecb',
-            cipherType: mode === 'hex' ? 'hex' : 'base64',
-            padding: 'pkcs#5'
-        });
-
-        return decrypted
-
-    } catch (e) {
-        console.log('解密失败')
-    }
+function aes_Decrypt(word, key) {
+    var key = CryptoJS.enc.Utf8.parse(key) //转为128bit
+    var srcs = CryptoJS.enc.Hex.parse(word) //转为16进制
+    var str = CryptoJS.enc.Base64.stringify(srcs) //变为Base64编码的字符串
+    var decrypt = CryptoJS.AES.decrypt(str, key, {
+        mode: CryptoJS.mode.ECB,
+        spadding: CryptoJS.pad.Pkcs7
+    })
+    return decrypt.toString(CryptoJS.enc.Utf8)
 }
 
-export function sm4Encrypt(key, value, mode = "hex") {
-    try {
 
-        if (key.length !== 32) {
-            alert('密钥必须是32位16进制字符串（128位）');
-            return;
-        }
-
-        const encrypted = sm4.encrypt(value, key, {
-            mode: 'ecb',
-            cipherType: mode === 'hex' ? 'hex' : 'base64',
-            padding: 'pkcs#5'
-        });
-
-        return encrypted
-
-    } catch (e) {
-        console.log('加密失败')
-    }
+export function sm2_Decrypt(word, key) {
+    return SM.decrypt(word, key);
 }
 
+export function sm2_Encrypt(word, key) {
+    return SM.encrypt(word, key);
+}
 
 export const $api = {
     msg,
     prePage,
     sleep,
+    request,
     createRequest,
     streamRequest,
     chatRequest,
@@ -607,7 +584,8 @@ export const $api = {
     uploadFile,
     formatFileSize,
     sendingMiniProgramMessage,
-    copyText
+    copyText,
+    aes_Decrypt,
 }
 
 
@@ -637,5 +615,7 @@ export default {
     insertSortData,
     isInWechatMiniProgramWebview,
     isEmptyObject,
-    sm4Decrypt,
+    aes_Decrypt,
+    sm2_Decrypt,
+    sm2_Encrypt
 }

components/Salary-Expectation/Salary-Expectation.vue

@@ -1,37 +1,17 @@
 <template>
-  <view>
-    <view v-if="!minSalary || !maxSalary">面议</view>
-    <view v-else class="texts">
-      <text class="num">{{ minSalary / 1000 }}</text>
-      <text class="unit">k</text>
-      <text class="gap">~</text>
-      <text class="num">{{ maxSalary / 1000 }}</text>
-      <text class="unit">k</text>
-    </view>
-  </view>
+    <view>{{ salaryText }}</view>
 </template>
 
 <script setup>
-import { inject, computed } from "vue";
-import useDictStore from "../../stores/useDictStore";
-const { minSalary, maxSalary } = defineProps(["minSalary", "maxSalary"]);
-</script>
+import { inject, computed } from 'vue';
+import useDictStore from '../../stores/useDictStore';
+const { minSalary, maxSalary, isMonth } = defineProps(['minSalary', 'maxSalary', 'isMonth']);
 
-<style lang="scss" scoped>
-.texts{
-    letter-spacing: 1rpx;
-}
-.num{
-    font-size: 32rpx;
-    font-weight: 500;
-}
-.unit{
-    font-size: 24rpx;
-    font-weight: 500;
-}
-.gap{
-    font-size: 32rpx;
-    font-weight: 500;
-    margin-left: 5rpx;
-}
-</style>
+const salaryText = computed(() => {
+    if (!minSalary || !maxSalary) return '面议';
+    if (isMonth) {
+        return `${minSalary}-${maxSalary}/月`;
+    }
+    return `${minSalary / 1000}k-${maxSalary / 1000}k`;
+});
+</script>

components/tabbar/midell-box.vue

@@ -19,7 +19,7 @@
 </template>
 
 <script setup>
-import { ref, onMounted, computed } from 'vue';
+import { ref, defineProps, onMounted, computed } from 'vue';
 import { useReadMsg } from '@/stores/useReadMsg';
 const props = defineProps({
     currentpage: {

config.js

@@ -1,9 +1,8 @@
 export default {
-    // baseUrl: 'http://39.98.44.136:8080', // 测试
-    baseUrl: 'https://qd.zhaopinzao8dian.com/api', // 测试
-    // baseUrl: 'http://10.133.17.161:8080/api', // 测试
-    // baseUrl: 'http://192.168.3.19:8080', // 测试
-    // baseUrl: 'http://39.98.44.136:6009', // 测试
+    baseUrl: 'https://fw.rc.qingdao.gov.cn/rgpp-api/api', // 内网
+    // baseUrl: 'https://qd.zhaopinzao8dian.com/api', // 测试
+    // baseUrl: "http://192.168.98.110:18181",
+    // baseUrl: "http://192.168.3.19:8080",
     // sseAI+
     // StreamBaseURl: 'http://39.98.44.136:8000',
     StreamBaseURl: 'https://qd.zhaopinzao8dian.com/ai',
@@ -19,6 +18,10 @@ export default {
     OnlyUseCachedDB: false,
     // 使用模拟定位
     UsingSimulatedPositioning: true,
+    // 私钥
+    pubilcKey: '',
+    // 公钥
+    privateKey: '',
     // 应用信息
     appInfo: {
         // 应用名称
@@ -72,11 +75,5 @@ export default {
         title: '找工作，用 AI 更高效｜青岛市智能求职平台',
         desc: '融合海量岗位、智能简历匹配、竞争力分析，助你精准锁定理想职位！',
         imgUrl: 'https://qd.zhaopinzao8dian.com/file/csn/qd_shareLogo.jpg',
-    },
-    sm4Config: {
-        key: '86C63180C1306ABC4D8F989E0A0BC9F3',
-        mode: 'ECB', // default
-        iv: 'UISwD9fW6cFh9SNS', // default is null
-        cipherType: 'base64' // default is base64
     }
 }

hook/useSystemPlayer.js

@@ -49,6 +49,7 @@ export function useTTSPlayer() {
         const newUtterance = new SpeechSynthesisUtterance(filteredText); // Use filtered text
         utteranceRef.value = newUtterance;
 
+        newUtterance.lang = 'zh-CN';
         newUtterance.rate = options.rate || 1;
         newUtterance.pitch = options.pitch || 1;
         if (options.voice) {

index.html

@@ -18,17 +18,17 @@
         </script>
         <title></title>
         <!-- vconsole -->
-        <!--        <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
+        <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
         <script>
             var vConsole = new window.VConsole();
             vConsole.destroy();
-        </script> -->
+        </script>
         <!-- 爱山东jssdk -->
-        <!-- <script type="text/javascript" src="https://isdapp.shandong.gov.cn/jmopen/jssdk/index.js"></script> -->
+        <script type="text/javascript" src="https://isdapp.shandong.gov.cn/jmopen/jssdk/index.js"></script>
 
-        <script type="text/javascript" src="./static/js/sm4.min.js"></script>
+        <script type="text/javascript" src="./static/encryption/aes.js"></script>
 
-        <script type="text/javascript" src="./static/js/pixi.min.js"></script>
+        <script type="text/javascript" src="./static/encryption/SM.js"></script>
     </head>
     <!-- <body> -->
     <div id="app"><!--app-html--></div>

manifest.json

@@ -80,7 +80,7 @@
     "locale": "zh-Hans",
     "h5": {
         "router": {
-            "base": "/app/",
+            "base": "./",
             "mode": "hash"
         },
         "title": "青岛智慧就业服务",
@@ -97,6 +97,9 @@
                     "serviceHost": ""
                 }
             }
+        },
+        "devServer": {
+            "https": false
         }
     }
 }

packageA/pages/vCard/vCard.vue

@@ -37,8 +37,8 @@
         </view>
         <view class="des-card" style="margin-top: 24rpx">
           <view class="fl_box fl_justbet">
-            <view style="white-space:nowrap">求职意向岗位</view>
-            <view class="line_1" style="padding-left:40rpx" >{{ userInfo.jobIntention || userInfo.jobTitle?.join(',') || '-' }}</view>
+            <view>求职意向岗位</view>
+            <view>{{ userInfo.jobIntention || "-" }}</view>
           </view>
           <view class="fl_box fl_justbet">
             <view>毕业学校</view>

pages.json

@@ -1,284 +1,288 @@
 {
-    "pages": [
-        //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+  "pages": [
+    //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+    {
+      "path": "pages/index/index",
+      "style": {
+        "navigationBarTitleText": "青岛智慧就业平台",
+        // #ifdef H5
+        "navigationStyle": "custom"
+        // #endif
+      }
+    },
+    {
+      "path": "pages/mine/mine",
+      "style": {
+        "navigationBarTitleText": "我的",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/msglog/msglog",
+      "style": {
+        "navigationBarTitleText": "消息",
+        "navigationStyle": "custom",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/careerfair/careerfair",
+      "style": {
+        "navigationBarTitleText": "招聘会",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/login/login",
+      "style": {
+        "navigationBarTitleText": "AI+就业服务程序",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/nearby/nearby",
+      "style": {
+        "navigationBarTitleText": "附近",
+        "navigationBarBackgroundColor": "#4778EC",
+        "navigationBarTextStyle": "white",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/chat/chat",
+      "style": {
+        "navigationBarTitleText": "AI+",
+        "navigationBarBackgroundColor": "#4778EC",
+        "navigationBarTextStyle": "white",
+        "enablePullDownRefresh": false,
+        // #ifdef H5
+        "navigationStyle": "custom"
+        //#endif
+      }
+    },
+    {
+      "path": "pages/search/search",
+      "style": {
+        "navigationBarTitleText": "",
+        "navigationStyle": "custom"
+      }
+    }
+  ],
+  "subpackages": [
+    {
+      "root": "packageA",
+      "pages": [
         {
-            "path": "pages/index/index",
-            "style": {
-                "navigationBarTitleText": "青岛智慧就业平台",
-                // #ifdef H5
-                "navigationStyle": "custom"
-                // #endif
-            }
+          "path": "pages/choiceness/choiceness",
+          "style": {
+            "navigationBarTitleText": "精选",
+            "navigationBarBackgroundColor": "#4778EC",
+            "navigationBarTextStyle": "white",
+            "navigationStyle": "custom"
+          }
         },
         {
-            "path": "pages/mine/mine",
-            "style": {
-                "navigationBarTitleText": "我的",
-                "navigationStyle": "custom"
-            }
+          "path": "pages/post/post",
+          "style": {
+            "navigationBarTitleText": "职位详情",
+            "navigationBarBackgroundColor": "#4778EC",
+            "navigationBarTextStyle": "white",
+            "navigationStyle": "custom"
+          }
         },
         {
-            "path": "pages/msglog/msglog",
-            "style": {
-                "navigationBarTitleText": "消息",
-                "navigationStyle": "custom",
-                "enablePullDownRefresh": false
-            }
+          "path": "pages/UnitDetails/UnitDetails",
+          "style": {
+            "navigationBarTitleText": "单位详情",
+            "navigationBarBackgroundColor": "#4778EC",
+            "navigationBarTextStyle": "white",
+            "navigationStyle": "custom"
+          }
         },
         {
-            "path": "pages/careerfair/careerfair",
-            "style": {
-                "navigationBarTitleText": "招聘会",
-                "navigationStyle": "custom"
-            }
+          "path": "pages/exhibitors/exhibitors",
+          "style": {
+            "navigationBarTitleText": "参展单位",
+            "navigationBarBackgroundColor": "#4778EC",
+            "navigationBarTextStyle": "white",
+            "navigationStyle": "custom"
+          }
         },
         {
-            "path": "pages/login/login",
-            "style": {
-                "navigationBarTitleText": "AI+就业服务程序",
-                "navigationStyle": "custom"
-            }
+          "path": "pages/myResume/myResume",
+          "style": {
+            "navigationBarTitleText": "我的简历",
+            "navigationBarBackgroundColor": "#FFFFFF",
+            "navigationStyle": "custom"
+          }
         },
         {
-            "path": "pages/nearby/nearby",
-            "style": {
-                "navigationBarTitleText": "附近",
-                "navigationBarBackgroundColor": "#4778EC",
-                "navigationBarTextStyle": "white",
-                "navigationStyle": "custom"
-            }
+          "path": "pages/vCard/vCard",
+          "style": {
+            "navigationBarTitleText": "点子名片",
+            "navigationBarBackgroundColor": "#FFFFFF",
+            "navigationStyle": "custom"
+          }
         },
         {
-            "path": "pages/chat/chat",
-            "style": {
-                "navigationBarTitleText": "AI+",
-                "navigationBarBackgroundColor": "#4778EC",
-                "navigationBarTextStyle": "white",
-                "enablePullDownRefresh": false,
-                // #ifdef H5
-                "navigationStyle": "custom"
-                //#endif
-            }
+          "path": "pages/Intendedposition/Intendedposition",
+          "style": {
+            "navigationBarTitleText": "投递记录",
+            "navigationBarBackgroundColor": "#FFFFFF"
+          }
         },
         {
-            "path": "pages/search/search",
-            "style": {
-                "navigationBarTitleText": "",
-                "navigationStyle": "custom"
-            }
+          "path": "pages/collection/collection",
+          "style": {
+            "navigationBarTitleText": "我的收藏",
+            "navigationBarBackgroundColor": "#FFFFFF",
+            "navigationStyle": "custom"
+          }
+        },
+        {
+          "path": "pages/browseJob/browseJob",
+          "style": {
+            "navigationBarTitleText": "我的浏览",
+            "navigationBarBackgroundColor": "#FFFFFF",
+            "navigationStyle": "custom"
+          }
+        },
+        {
+          "path": "pages/addPosition/addPosition",
+          "style": {
+            "navigationBarTitleText": "添加岗位",
+            "navigationStyle": "custom"
+          }
+        },
+        {
+          "path": "pages/selectDate/selectDate",
+          "style": {
+            "navigationBarTitleText": "",
+            "navigationStyle": "custom"
+          }
+        },
+        {
+          "path": "pages/personalInfo/personalInfo",
+          "style": {
+            "navigationBarTitleText": "个人信息",
+            "navigationStyle": "custom"
+          }
+        },
+        {
+          "path": "pages/jobExpect/jobExpect",
+          "style": {
+            "navigationBarTitleText": "求职期望",
+            "navigationStyle": "custom"
+          }
+        },
+        {
+          "path": "pages/workExp/workExp",
+          "style": {
+            "navigationBarTitleText": "工作经历",
+            "navigationStyle": "custom"
+          }
+        },
+        {
+          "path": "pages/reservation/reservation",
+          "style": {
+            "navigationBarTitleText": "我的预约",
+            "navigationBarBackgroundColor": "#FFFFFF"
+          }
+        },
+        {
+          "path": "pages/choicenessList/choicenessList",
+          "style": {
+            "navigationBarTitleText": "精选企业",
+            "navigationBarBackgroundColor": "#FFFFFF",
+            "navigationStyle": "custom"
+          }
+        },
+        {
+          "path": "pages/newJobPosition/newJobPosition",
+          "style": {
+            "navigationBarTitleText": "新职位推荐",
+            "navigationBarBackgroundColor": "#FFFFFF"
+          }
+        },
+        {
+          "path": "pages/systemNotification/systemNotification",
+          "style": {
+            "navigationBarTitleText": "系统通知",
+            "navigationBarBackgroundColor": "#FFFFFF"
+          }
+        },
+        {
+          "path": "pages/tiktok/tiktok",
+          "style": {
+            "navigationBarTitleText": "",
+            "navigationBarBackgroundColor": "#FFFFFF",
+            "navigationStyle": "custom"
+          }
+        },
+        {
+          "path": "pages/moreJobs/moreJobs",
+          "style": {
+            "navigationBarTitleText": "更多岗位",
+            "navigationBarBackgroundColor": "#FFFFFF"
+          }
         }
-    ],
-    "subpackages": [{
-        "root": "packageA",
-        "pages": [{
-                "path": "pages/choiceness/choiceness",
-                "style": {
-                    "navigationBarTitleText": "精选",
-                    "navigationBarBackgroundColor": "#4778EC",
-                    "navigationBarTextStyle": "white",
-                    "navigationStyle": "custom"
-                }
-            },
-            {
-                "path": "pages/post/post",
-                "style": {
-                    "navigationBarTitleText": "职位详情",
-                    "navigationBarBackgroundColor": "#4778EC",
-                    "navigationBarTextStyle": "white",
-                    "navigationStyle": "custom"
-                }
-            },
-            {
-                "path": "pages/UnitDetails/UnitDetails",
-                "style": {
-                    "navigationBarTitleText": "单位详情",
-                    "navigationBarBackgroundColor": "#4778EC",
-                    "navigationBarTextStyle": "white",
-                    "navigationStyle": "custom"
-                }
-            },
-            {
-                "path": "pages/exhibitors/exhibitors",
-                "style": {
-                    "navigationBarTitleText": "参展单位",
-                    "navigationBarBackgroundColor": "#4778EC",
-                    "navigationBarTextStyle": "white",
-                    "navigationStyle": "custom"
-                }
-            },
-            {
-                "path": "pages/myResume/myResume",
-                "style": {
-                    "navigationBarTitleText": "我的简历",
-                    "navigationBarBackgroundColor": "#FFFFFF",
-                    "navigationStyle": "custom"
-                }
-            },
-            {
-                "path": "pages/vCard/vCard",
-                "style": {
-                    "navigationBarTitleText": "点子名片",
-                    "navigationBarBackgroundColor": "#FFFFFF",
-                    "navigationStyle": "custom"
-                }
-            },
-            {
-                "path": "pages/Intendedposition/Intendedposition",
-                "style": {
-                    "navigationBarTitleText": "投递记录",
-                    "navigationBarBackgroundColor": "#FFFFFF"
-                }
-            },
-            {
-                "path": "pages/collection/collection",
-                "style": {
-                    "navigationBarTitleText": "我的收藏",
-                    "navigationBarBackgroundColor": "#FFFFFF",
-                    "navigationStyle": "custom"
-                }
-            },
-            {
-                "path": "pages/browseJob/browseJob",
-                "style": {
-                    "navigationBarTitleText": "我的浏览",
-                    "navigationBarBackgroundColor": "#FFFFFF",
-                    "navigationStyle": "custom"
-                }
-            },
-            {
-                "path": "pages/addPosition/addPosition",
-                "style": {
-                    "navigationBarTitleText": "添加岗位",
-                    "navigationStyle": "custom"
-                }
-            },
-            {
-                "path": "pages/selectDate/selectDate",
-                "style": {
-                    "navigationBarTitleText": "",
-                    "navigationStyle": "custom"
-                }
-            },
-            {
-                "path": "pages/personalInfo/personalInfo",
-                "style": {
-                    "navigationBarTitleText": "个人信息",
-                    "navigationStyle": "custom"
-                }
-            },
-            {
-                "path": "pages/jobExpect/jobExpect",
-                "style": {
-                    "navigationBarTitleText": "求职期望",
-                    "navigationStyle": "custom"
-                }
-            },
-            {
-                "path": "pages/workExp/workExp",
-                "style": {
-                    "navigationBarTitleText": "工作经历",
-                    "navigationStyle": "custom"
-                }
-            },
-            {
-                "path": "pages/reservation/reservation",
-                "style": {
-                    "navigationBarTitleText": "我的预约",
-                    "navigationBarBackgroundColor": "#FFFFFF"
-                }
-            },
-            {
-                "path": "pages/choicenessList/choicenessList",
-                "style": {
-                    "navigationBarTitleText": "精选企业",
-                    "navigationBarBackgroundColor": "#FFFFFF",
-                    "navigationStyle": "custom"
-                }
-            },
-            {
-                "path": "pages/newJobPosition/newJobPosition",
-                "style": {
-                    "navigationBarTitleText": "新职位推荐",
-                    "navigationBarBackgroundColor": "#FFFFFF"
-                }
-            },
-            {
-                "path": "pages/systemNotification/systemNotification",
-                "style": {
-                    "navigationBarTitleText": "系统通知",
-                    "navigationBarBackgroundColor": "#FFFFFF"
-                }
-            },
-            {
-                "path": "pages/tiktok/tiktok",
-                "style": {
-                    "navigationBarTitleText": "",
-                    "navigationBarBackgroundColor": "#FFFFFF",
-                    "navigationStyle": "custom"
-                }
-            },
-            {
-                "path": "pages/moreJobs/moreJobs",
-                "style": {
-                    "navigationBarTitleText": "更多岗位",
-                    "navigationBarBackgroundColor": "#FFFFFF"
-                }
-            }
-        ]
-    }],
-    "tabBar": {
-        "custom": true,
-        "display": "none",
-        "color": "#5E5F60",
-        "selectedColor": "#256BFA",
-        "borderStyle": "black",
-        "backgroundColor": "#ffffff",
-        "midButton": {
-            "width": "50px",
-            "height": "50px",
-            "backgroundImage": "static/tabbar/logo2copy.png"
-        },
-        "list": [{
-                "pagePath": "pages/index/index",
-                "iconPath": "static/tabbar/calendar.png",
-                "selectedIconPath": "static/tabbar/calendared.png",
-                "text": "职位"
-            },
-            {
-                "pagePath": "pages/careerfair/careerfair",
-                "iconPath": "static/tabbar/post.png",
-                "selectedIconPath": "static/tabbar/posted.png",
-                "text": "招聘会"
-            },
-            {
-                "pagePath": "pages/chat/chat",
-                "iconPath": "static/tabbar/logo3.png",
-                "selectedIconPath": "static/tabbar/logo3.png"
-            },
-            {
-                "pagePath": "pages/msglog/msglog",
-                "iconPath": "static/tabbar/chat4.png",
-                "selectedIconPath": "static/tabbar/chat4ed.png",
-                "text": "消息"
-            },
-            {
-                "pagePath": "pages/mine/mine",
-                "iconPath": "static/tabbar/mine.png",
-                "selectedIconPath": "static/tabbar/mined.png",
-                "text": "我的"
-            }
-        ]
+      ]
+    }
+  ],
+  "tabBar": {
+    "custom": true,
+    "display": "none",
+    "color": "#5E5F60",
+    "selectedColor": "#256BFA",
+    "borderStyle": "black",
+    "backgroundColor": "#ffffff",
+    "midButton": {
+      "width": "50px",
+      "height": "50px",
+      "backgroundImage": "static/tabbar/logo2copy.png"
     },
-    "globalStyle": {
-        "navigationBarTextStyle": "black",
-        "navigationBarTitleText": "uni-app",
-        "navigationBarBackgroundColor": "#F8F8F8",
-        "backgroundColor": "#F8F8F8",
-        // "enablePullDownRefresh": false,
-        // "navigationStyle": "custom",
-        "rpxCalcBaseDeviceWidth": 375,
-        "rpxCalcMaxDeviceWidth": 750,
-        "rpxCalcIncludeWidth": 750
-    },
-    "uniIdRouter": {}
+    "list": [
+      {
+        "pagePath": "pages/index/index",
+        "iconPath": "static/tabbar/calendar.png",
+        "selectedIconPath": "static/tabbar/calendared.png",
+        "text": "职位"
+      },
+      {
+        "pagePath": "pages/careerfair/careerfair",
+        "iconPath": "static/tabbar/post.png",
+        "selectedIconPath": "static/tabbar/posted.png",
+        "text": "招聘会"
+      },
+      {
+        "pagePath": "pages/chat/chat",
+        "iconPath": "static/tabbar/logo3.png",
+        "selectedIconPath": "static/tabbar/logo3.png"
+      },
+      {
+        "pagePath": "pages/msglog/msglog",
+        "iconPath": "static/tabbar/chat4.png",
+        "selectedIconPath": "static/tabbar/chat4ed.png",
+        "text": "消息"
+      },
+      {
+        "pagePath": "pages/mine/mine",
+        "iconPath": "static/tabbar/mine.png",
+        "selectedIconPath": "static/tabbar/mined.png",
+        "text": "我的"
+      }
+    ]
+  },
+  "globalStyle": {
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "uni-app",
+    "navigationBarBackgroundColor": "#F8F8F8",
+    "backgroundColor": "#F8F8F8",
+    // "enablePullDownRefresh": false,
+    // "navigationStyle": "custom",
+    "rpxCalcBaseDeviceWidth": 375,
+    "rpxCalcMaxDeviceWidth": 750,
+    "rpxCalcIncludeWidth": 750
+  },
+  "uniIdRouter": {}
 }

pages/chat/components/ai-paging.vue

@@ -250,6 +250,8 @@ import {
     ref,
     inject,
     nextTick,
+    defineProps,
+    defineEmits,
     onMounted,
     onUnmounted,
     toRaw,
@@ -446,7 +448,7 @@ const scrollToBottom = throttle(function () {
 }, 500);
 
 function getGuess() {
-    $api.chatRequest('/app/chat/guest', { sessionId: chatSessionID.value }, 'POST').then((res) => {
+    $api.chatRequest('/guest', { sessionId: chatSessionID.value }, 'POST').then((res) => {
         guessList.value = res.data;
         showGuess.value = true;
         nextTick(() => {

pages/chat/components/popupbadFeeback.vue

@@ -37,7 +37,7 @@
 </template>
 
 <script setup>
-import { ref, inject } from 'vue';
+import { ref, inject, defineEmits } from 'vue';
 const emit = defineEmits(['onSend']);
 const { $api } = inject('globalFunction');
 const popup = ref(null);

pages/index/components/AIMatch.vue

@@ -1,365 +0,0 @@
-<template>
-    <view class="container" id="pixi-box" ref="pixiContainerRef"></view>
-</template>
-
-<script setup>
-import { onMounted, onUnmounted, ref, nextTick } from 'vue';
-const emit = defineEmits(['tag-click']);
-
-// DOM Ref
-const pixiContainerRef = ref(null);
-
-// PIXI 变量
-let app = null;
-let tagsContainer = null;
-let activeTagInstances = [];
-
-// 配置数据
-const mockTags = [
-    { name: '医生', bgColor: 0x0069fe, fontColor: 0xffffff, size: 17, opacity: 1.0, angle: 0, radius: 0 },
-    {
-        name: '工程师',
-        bgColor: 0x87e2ec,
-        fontColor: 0xffffff,
-        size: 14,
-        opacity: 1,
-        angle: -Math.PI / 2,
-        radius: 68,
-        tailRotation: Math.PI / 2,
-    },
-    {
-        name: '建筑师',
-        bgColor: 0xffebeb,
-        fontColor: 0xff6969,
-        size: 11.5,
-        opacity: 1,
-        angle: -Math.PI / 4.2,
-        radius: 125,
-        tailRotation: (3 * Math.PI) / 4,
-    },
-    {
-        name: '律师',
-        bgColor: 0x21ea85,
-        fontColor: 0xffffff,
-        size: 15,
-        opacity: 1,
-        angle: -Math.PI / 10,
-        radius: 130,
-        tailRotation: (3 * Math.PI) / 4,
-    },
-    {
-        name: '记者',
-        bgColor: 0xebf3ff,
-        fontColor: 0x1d71ef,
-        size: 12,
-        opacity: 1,
-        angle: Math.PI / 120,
-        radius: 130,
-        tailRotation: Math.PI,
-    },
-    {
-        name: '程序员',
-        bgColor: 0xffd4b6,
-        fontColor: 0xffffff,
-        size: 14.5,
-        opacity: 1,
-        angle: Math.PI / 9,
-        radius: 120,
-        tailRotation: (5 * Math.PI) / 4,
-    },
-    {
-        name: '摄影师',
-        bgColor: 0xd8e5fe,
-        fontColor: 0x1d71ef,
-        size: 11,
-        opacity: 1,
-        angle: Math.PI / 3,
-        radius: 75,
-        tailRotation: (3 * Math.PI) / 2,
-    },
-    {
-        name: '设计师',
-        bgColor: 0xff9400,
-        fontColor: 0xffffff,
-        size: 14,
-        opacity: 1,
-        angle: (2 * Math.PI) / 3,
-        radius: 92,
-        tailRotation: (7 * Math.PI) / 4,
-    },
-    {
-        name: '心理咨询师',
-        bgColor: 0xebf3ff,
-        fontColor: 0x1d71ef,
-        size: 10.5,
-        opacity: 1,
-        angle: (5.4 * Math.PI) / 6,
-        radius: 110,
-        tailRotation: 0,
-    },
-    {
-        name: '护士',
-        bgColor: 0xff6969,
-        fontColor: 0xffffff,
-        size: 15,
-        opacity: 1,
-        angle: (6.3 * Math.PI) / 5.9,
-        radius: 110,
-        tailRotation: Math.PI / 4,
-    },
-    {
-        name: '会计',
-        bgColor: 0xfce9c9,
-        fontColor: 0xfbc55f,
-        size: 13,
-        opacity: 1,
-        angle: (7.2 * Math.PI) / 5.9,
-        radius: 120,
-        tailRotation: Math.PI / 4,
-    },
-];
-
-onMounted(async () => {
-    await nextTick();
-    setTimeout(() => {
-        initPixi();
-    }, 100);
-    window.addEventListener('resize', handleResize);
-});
-
-onUnmounted(() => {
-    window.removeEventListener('resize', handleResize);
-    if (app) {
-        app.destroy(true, { children: true, texture: true, baseTexture: true });
-        app = null;
-    }
-});
-
-const getContainerDOM = () => {
-    const refVal = pixiContainerRef.value;
-    if (!refVal) return document.getElementById('pixi-box');
-    if (refVal.$el) return refVal.$el;
-    return refVal;
-};
-
-const clamp = (num, min, max) => Math.min(Math.max(num, min), max);
-
-const initPixi = () => {
-    const container = getContainerDOM();
-    if (!container) return;
-
-    const width = container.clientWidth || 300;
-    const height = container.clientHeight || 300;
-
-    if (app) return;
-
-    app = new PIXI.Application({
-        width: width,
-        height: height,
-        backgroundAlpha: 0,
-        backgroundColor: 0xf5f7fa,
-        antialias: true,
-        resolution: window.devicePixelRatio || 1,
-        autoDensity: true,
-    });
-
-    container.appendChild(app.view);
-
-    tagsContainer = new PIXI.Container();
-    app.stage.addChild(tagsContainer);
-
-    renderScene(width, height);
-};
-
-const renderScene = (sw, sh) => {
-    tagsContainer.removeChildren();
-    activeTagInstances = [];
-
-    const baseSize = 375;
-    const scaleFactor = (Math.min(sw, sh) / baseSize) * 0.9;
-
-    mockTags.forEach((data, index) => {
-        const scaledRadius = data.radius * (scaleFactor < 1 ? 1 : scaleFactor * 0.8);
-
-        let x = sw / 2 + scaledRadius * Math.cos(data.angle);
-        let y = sh / 2 + scaledRadius * Math.sin(data.angle);
-
-        const tag = createTag(data, index);
-
-        tagsContainer.addChild(tag);
-
-        const safeW = tag.width / 2 + 10;
-        const safeH = tag.height / 2 + 10;
-
-        // 强制修正 x 和 y，使其不超出屏幕
-        x = clamp(x, safeW, sw - safeW);
-        y = clamp(y, safeH, sh - safeH);
-
-        tag.x = x;
-        tag.y = y;
-
-        // 4. 保存元数据
-        tag.userData = {
-            originalX: x,
-            originalY: y,
-            angle: data.angle,
-            radius: scaledRadius,
-            floatOffset: Math.random() * Math.PI * 2,
-            floatSpeed: 0.01 + Math.random() * 0.02,
-            floatRange: 2 + Math.random() * 2,
-            safeH: safeH,
-        };
-
-        if (data.radius > 0) {
-            const tail = createCometTail(data.bgColor, data.tailRotation, tag.width);
-            tag.addChildAt(tail, 0);
-            tag.updateTail = () => tail.updateAnim();
-        }
-
-        activeTagInstances.push(tag);
-    });
-
-    // 动画循环
-    app.ticker.add(() => {
-        const screenH = app.screen.height;
-
-        activeTagInstances.forEach((tag) => {
-            const meta = tag.userData;
-            if (meta) {
-                // 计算新的浮动位置
-                meta.floatOffset += meta.floatSpeed;
-                let nextY = meta.originalY + Math.sin(meta.floatOffset) * meta.floatRange;
-
-                // 再次进行边界检查
-                if (nextY < meta.safeH) nextY = meta.safeH;
-                if (nextY > screenH - meta.safeH) nextY = screenH - meta.safeH;
-
-                tag.y = nextY;
-
-                if (tag.updateTail) tag.updateTail();
-            }
-        });
-    });
-};
-
-const createTag = (tagData, index) => {
-    const tagGroup = new PIXI.Container();
-    tagGroup.eventMode = 'static';
-    tagGroup.cursor = 'pointer';
-
-    tagGroup.on('pointertap', () => emit('tag-click', tagData));
-
-    const text = new PIXI.Text(tagData.name, {
-        fontFamily: ['PingFang SC', 'Microsoft YaHei', 'Arial'],
-        fontSize: tagData.size,
-        fill: tagData.fontColor,
-        padding: 4,
-        resolution: 2,
-    });
-    text.anchor.set(0.5);
-
-    const paddingH = 26;
-    const paddingV = 10;
-    let bgWidth = text.width + paddingH;
-    let bgHeight = text.height + paddingV;
-
-    if (index === 0) bgWidth = Math.max(bgWidth, tagData.size * 4.5);
-
-    const bg = new PIXI.Graphics();
-    bg.beginFill(tagData.bgColor, tagData.opacity ?? 1);
-    bg.drawRoundedRect(-bgWidth / 2, -bgHeight / 2, bgWidth, bgHeight, bgHeight / 2);
-    bg.endFill();
-
-    tagGroup.addChild(bg);
-    tagGroup.addChild(text);
-
-    return tagGroup;
-};
-
-const createCometTail = (bgColor, tailRotation, parentWidth) => {
-    const tailGroup = new PIXI.Container();
-    const graphics = new PIXI.Graphics();
-    tailGroup.addChild(graphics);
-
-    const baseLength = 45;
-    const startWidth = parentWidth * 0.6;
-    const endWidth = 20;
-
-    let breathPhase = Math.random() * Math.PI * 2;
-    const breathSpeed = 0.04;
-
-    tailGroup.updateAnim = () => {
-        breathPhase += breathSpeed;
-        const breathScale = 0.85 + 0.15 * Math.sin(breathPhase);
-        graphics.clear();
-        const currentLength = baseLength * breathScale;
-
-        const cos = Math.cos(tailRotation);
-        const sin = Math.sin(tailRotation);
-        const perpX = -sin;
-        const perpY = cos;
-
-        const p1 = { x: perpX * (startWidth / 2), y: perpY * (startWidth / 2) };
-        const p2 = { x: -perpX * (startWidth / 2), y: -perpY * (startWidth / 2) };
-        const endCX = cos * currentLength;
-        const endCY = sin * currentLength;
-        const p3 = { x: endCX - perpX * (endWidth / 2), y: endCY - perpY * (endWidth / 2) };
-        const p4 = { x: endCX + perpX * (endWidth / 2), y: endCY + perpY * (endWidth / 2) };
-
-        const segments = 8;
-        for (let i = 0; i < segments; i++) {
-            const t1 = i / segments;
-            const t2 = (i + 1) / segments;
-            const alpha = 0.4 * (1 - t1);
-            const sp1 = { x: p1.x + (p4.x - p1.x) * t1, y: p1.y + (p4.y - p1.y) * t1 };
-            const sp2 = { x: p2.x + (p3.x - p2.x) * t1, y: p2.y + (p3.y - p2.y) * t1 };
-            const ep1 = { x: p1.x + (p4.x - p1.x) * t2, y: p1.y + (p4.y - p1.y) * t2 };
-            const ep2 = { x: p2.x + (p3.x - p2.x) * t2, y: p2.y + (p3.y - p2.y) * t2 };
-            graphics.beginFill(bgColor, alpha);
-            graphics.moveTo(sp1.x, sp1.y);
-            graphics.lineTo(sp2.x, sp2.y);
-            graphics.lineTo(ep2.x, ep2.y);
-            graphics.lineTo(ep1.x, ep1.y);
-            graphics.endFill();
-        }
-    };
-    tailGroup.updateAnim();
-    return tailGroup;
-};
-
-const handleResize = () => {
-    const container = getContainerDOM();
-    if (!app || !container) return;
-
-    const w = container.clientWidth || 300;
-    const h = container.clientHeight || 300;
-
-    app.renderer.resize(w, h);
-
-    activeTagInstances.forEach((tag) => {
-        const meta = tag.userData;
-        if (!meta) return;
-
-        let newX = w / 2 + meta.radius * Math.cos(meta.angle);
-        let newY = h / 2 + meta.radius * Math.sin(meta.angle);
-
-        const safeW = tag.width / 2 + 10;
-        const safeH = tag.height / 2 + 10;
-
-        meta.originalX = clamp(newX, safeW, w - safeW);
-        meta.originalY = clamp(newY, safeH, h - safeH);
-        meta.safeH = safeH; // 更新安全高度
-
-        tag.x = meta.originalX;
-    });
-};
-</script>
-
-<style scoped>
-.container {
-    width: 100%;
-    height: 500rpx;
-    position: relative;
-    overflow: hidden;
-}
-</style>

pages/index/components/index-one.vue

@@ -148,14 +148,14 @@
         <!-- 筛选 -->
         <select-filter ref="selectFilterModel"></select-filter>
 
-               <view class="maskFristEntry" v-if="maskFristEntry">
+        <!--        <view class="maskFristEntry" v-if="maskFristEntry">
             <view class="entry-content">
                 <text class="text1">左滑查看视频</text>
                 <text class="text2">左滑查看视频</text>
                 <view class="goExperience">去体验</view>
                 <view class="maskFristEntry-Close" @click="closeFristEntry">1</view>
             </view>
-        </view>
+        </view> -->
     </view>
 </template>
 
@@ -183,7 +183,7 @@ const waterfallsFlowRef = ref(null);
 const loadmoreRef = ref(null);
 const conditionSearch = ref({});
 const waterfallcolumn = ref(2);
-const maskFristEntry = ref(true);
+const maskFristEntry = ref(false);
 const state = reactive({
     tabIndex: 'all',
 });

pages/index/index.vue

@@ -47,13 +47,11 @@
 import { reactive, inject, watch, ref, onMounted } from 'vue';
 import Tabbar from '@/components/tabbar/midell-box.vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
-import IndexRefactor from './components/index-refactor.vue';
 import IndexOne from './components/index-one.vue';
 import IndexTwo from './components/index-two.vue';
 const loadedMap = reactive([false, false]);
 const swiperRefs = [ref(null), ref(null)];
-// const components = [IndexOne, IndexTwo];
-const components = [IndexRefactor, IndexTwo];
+const components = [IndexOne, IndexTwo];
 import { storeToRefs } from 'pinia';
 import { useReadMsg } from '@/stores/useReadMsg';
 const { unreadCount } = storeToRefs(useReadMsg());
@@ -69,7 +67,7 @@ onLoad(() => {
 
 onShow(() => {
     // 获取消息列表
-    useReadMsg().fetchMessages();
+    // useReadMsg().fetchMessages();
 });
 
 const state = reactive({

pages/login/login.vue

@@ -109,7 +109,6 @@
             </template>
         </tabcontrolVue>
         <SelectJobs ref="selectJobsModel"></SelectJobs>
-        <view class="backdoor" @click="loginbackdoor">后门</view>
     </AppLayout>
 </template>
 
@@ -126,7 +125,7 @@ const { getDictSelectOption, oneDictData } = useDictStore();
 const openSelectPopup = inject('openSelectPopup');
 // status
 const selectJobsModel = ref();
-const tabCurrent = ref(0);
+const tabCurrent = ref(1);
 const salay = [2, 5, 10, 15, 20, 25, 30, 50, 80, 100];
 const state = reactive({
     station: [],
@@ -150,7 +149,8 @@ const fromValue = reactive({
 });
 
 onLoad((parmas) => {
-    // getTreeselect();
+    console.log(parmas);
+    getTreeselect();
 });
 
 onMounted(() => {});
@@ -244,23 +244,6 @@ function getTreeselect() {
     });
 }
 
-function loginbackdoor() {
-    $api.createRequest('/app/mock/login', {}, 'post').then((resData) => {
-        $api.msg('模拟帐号密码测试登录成功');
-        loginSetToken(resData.token).then((resume) => {
-            if (resume.data.jobTitleId) {
-                // 设置推荐列表，每次退出登录都需要更新
-                useUserStore().initSeesionId();
-                uni.reLaunch({
-                    url: '/pages/index/index',
-                });
-            } else {
-                nextStep();
-            }
-        });
-    });
-}
-
 // 登录
 function loginTest() {
     // uni.share({
@@ -307,12 +290,6 @@ function complete() {
 </script>
 
 <style lang="stylus" scoped>
-.backdoor{
-    position: fixed;
-    left: 0;
-    top: 500rpx;
-    background: red
-}
 .input-nx
     position: relative
     border-bottom: 2rpx solid #EBEBEB

pages/mine/mine.vue

@@ -45,7 +45,9 @@
                         <text v-if="userInfo.jobTitle.length - 1 !== index">|</text>
                     </text>
                 </view>
-                <view class="top-btn button-click">电子名片</view>
+                <view class="top-btn button-click" >
+                    电子名片
+                </view>
             </view>
             <view class="card-main">
                 <view class="main-title">服务专区</view>
@@ -130,6 +132,7 @@ const isAbove90 = (percent) => parseFloat(percent) < 90;
 
 function getUserstatistics() {
     $api.createRequest('/app/user/statistics').then((resData) => {
+        console.log(resData);
         counts.value = resData.data;
     });
 }

stores/userChatGroupStore.js

@@ -180,7 +180,7 @@ const useChatGroupDBStore = defineStore("messageGroup", () => {
                     resolve();
                 }
 
-                $api.streamRequest('/app/chat/chat', params, onDataReceived, onError, onComplete);
+                $api.streamRequest('/chat', params, onDataReceived, onError, onComplete);
             } catch (err) {
                 console.log(err);
                 reject(err);
@@ -230,7 +230,7 @@ const useChatGroupDBStore = defineStore("messageGroup", () => {
 
     // 云端数据
     function getHistory() {
-        $api.chatRequest('/app/chat/getHistory').then((res) => {
+        $api.chatRequest('/getHistory').then((res) => {
             if (!res.data.list.length) return
             let tabel = parseHistory(res.data.list)
             if (tabel && tabel.length) {
@@ -250,7 +250,7 @@ const useChatGroupDBStore = defineStore("messageGroup", () => {
         const params = {
             sessionId: chatSessionID.value
         }
-        $api.chatRequest('/app/chat/detail', params, 'GET', loading).then((res) => {
+        $api.chatRequest('/detail', params, 'GET', loading).then((res) => {
             let list = parseHistoryDetail(res.data.list, chatSessionID.value)
             if (list.length) {
                 baseDB.db.add(massageName.value, list).then((ids) => {

uni_modules/custom-waterfalls-flow/components/custom-waterfalls-flow/custom-waterfalls-flow.vue

@@ -3,7 +3,7 @@
         <view
             v-for="(item, index) in data.column"
             :key="index"
-            class="waterfalls-flow-column "
+            class="waterfalls-flow-column"
             :id="`waterfalls_flow_column_${index + 1}`"
             :msg="msg"
             :style="{ width: w, 'margin-left': index == 0 ? 0 : m }"

utils/request.js

@@ -1,20 +1,76 @@
 import config from "@/config.js"
-import useUserStore from '@/stores/useUserStore';
 import {
-    sm4Decrypt,
-    sm4Encrypt
-} from '../common/globalFunction';
+    sm2_Decrypt,
+    sm2_Encrypt
+} from '@/common/globalFunction';
+import useUserStore from '@/stores/useUserStore';
 
 
-const needToEncrypt = [
-    ["post", "/app/login"],
-    ["get", "/app/user/resume"],
-    ["post", "/app/user/resume"],
-    ["post", "/app/user/experience/edit"],
-    ["post", "/app/user/experience/delete"],
-    ["get", "/app/user/experience/getSingle/{value}"],
-    ["get", "/app/user/experience/list"]
-]
+
+export function request({
+    url,
+    method = 'GET',
+    data = {},
+    load = false,
+    header = {}
+} = {}) {
+
+    return new Promise((resolve, reject) => {
+        if (load) {
+            uni.showLoading({
+                title: '请稍候',
+                mask: true
+            });
+        }
+        let Authorization = ''
+        if (useUserStore().token) {
+            Authorization = `${useUserStore().userInfo.token}${useUserStore().token}`
+        }
+        uni.request({
+            url: config.baseUrl + url,
+            method,
+            data: data,
+            header: {
+                'Authorization': Authorization || '',
+            },
+            success: resData => {
+                // 响应拦截
+                if (resData.statusCode === 200) {
+                    const {
+                        code,
+                        msg
+                    } = resData.data
+                    if (code === 200) {
+                        resolve(resData.data)
+                        return
+                    }
+                    uni.showToast({
+                        title: msg,
+                        icon: 'none'
+                    })
+                }
+                if (resData.data?.code === 401 || resData.data?.code === 402) {
+                    useUserStore().logOut()
+                    uni.showToast({
+                        title: '登录过期，请重新登录',
+                        icon: 'none'
+                    })
+                    return
+                }
+                const err = new Error('请求出现异常，请联系工作人员')
+                err.error = resData
+                reject(err)
+            },
+            fail: err => reject(err),
+            complete() {
+                if (load) {
+                    uni.hideLoading();
+                }
+            }
+        })
+    })
+}
+
 
 /**
  * @param url  String，请求的地址，默认：none
@@ -38,44 +94,15 @@ export function createRequest(url, data = {}, method = 'GET', loading = false, h
 
     const header = headers || {};
     header["Authorization"] = encodeURIComponent(Authorization);
-
-    // ------------------------------------------------------------------
-    // 检查当前请求是否需要加密
-    const isEncrypt = needToEncrypt.some(item => {
-        const matchMethod = item[0].toLowerCase() === method.toLowerCase();
-        const matchUrl = item[1].includes('{') ?
-            url.startsWith(item[1].split('/{')[0]) // 检查动态路径的前缀
-            :
-            item[1] === url; // 检查静态路径
-        return matchMethod && matchUrl;
-    });
-
-    let requestData = data;
-
-    if (isEncrypt) {
-        const jsonData = JSON.stringify(data);
-        const encryptedBody = sm4Encrypt(config.sm4Config.key, jsonData);
-        requestData = {
-            encrypted: true,
-            encryptedData: encryptedBody,
-            timestamp: Date.now()
-        };
-    }
-    // ------------------------------------------------------------------
     return new Promise((resolve, reject) => {
         uni.request({
             url: config.baseUrl + url,
             method: method,
-            data: requestData,
+            data: data,
             header,
             success: resData => {
                 // 响应拦截
                 if (resData.statusCode === 200) {
-                    if (resData.data.encrypted) {
-                        const decryptedData = sm4Decrypt(config
-                            .sm4Config.key, resData.data.encryptedData)
-                        resData.data = JSON.parse(decryptedData)
-                    }
                     const {
                         code,
                         msg

utils/streamRequest.js

@@ -17,7 +17,7 @@ export default function StreamRequest(url, data = {}, onDataReceived, onError, o
     };
     return new Promise(async (resolve, reject) => {
         try {
-            const response = await fetch(config.baseUrl + url, {
+            const response = await fetch(config.StreamBaseURl + url, {
                 method: "POST",
                 headers,
                 body: JSON.stringify(data)
@@ -46,7 +46,6 @@ export default function StreamRequest(url, data = {}, onDataReceived, onError, o
                 let lines = buffer.split("\n");
                 buffer = lines.pop(); // 可能是不完整的 JSON 片段，留待下次解析
                 for (let line of lines) {
-                    line = line.slice(5).trim()
                     if (line.startsWith("data: ")) {
                         const jsonData = line.slice(6).trim();
                         if (jsonData === "[DONE]") {
@@ -105,7 +104,7 @@ export function chatRequest(url, data = {}, method = 'GET', loading = false, hea
     header["Authorization"] = encodeURIComponent(Authorization);
     return new Promise((resolve, reject) => {
         uni.request({
-            url: config.baseUrl + url,
+            url: config.StreamBaseURl + url,
             method: method,
             data: data,
             header,