flat:合并冲突

App.vue

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

common/animation.css

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

common/common.css

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

components/Salary-Expectation/Salary-Expectation.vue

@@ -1,17 +1,37 @@
 <template>
-    <view>{{ salaryText }}</view>
+  <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>
 </template>
 
 <script setup>
-import { inject, computed } from 'vue';
-import useDictStore from '../../stores/useDictStore';
-const { minSalary, maxSalary, isMonth } = defineProps(['minSalary', 'maxSalary', 'isMonth']);
-
-const salaryText = computed(() => {
-    if (!minSalary || !maxSalary) return '面议';
-    if (isMonth) {
-        return `${minSalary}-${maxSalary}/月`;
-    }
-    return `${minSalary / 1000}k-${maxSalary / 1000}k`;
-});
+import { inject, computed } from "vue";
+import useDictStore from "../../stores/useDictStore";
+const { minSalary, maxSalary } = defineProps(["minSalary", "maxSalary"]);
 </script>
+
+<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>

components/empty/empty.vue

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

components/selectJobs/selectJobs.vue

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

hook/page-animation.css

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

hook/usePageAnimation.js

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

hook/usePagination.js

@@ -86,8 +86,7 @@ export function usePagination(
             const res = await requestFn(params)
 
             const rawData = res[dataKey]
-            const total = res[totalKey] || 99999999
-            console.log(total, rawData)
+            
             const data = typeof transformFn === 'function' ? transformFn(rawData) : rawData
 
             if (type === 'refresh') {
@@ -96,9 +95,9 @@ export function usePagination(
                 list.value.push(...data)
             }
 
+            const total = res[totalKey] || list.value?.length
             pageState.total = total
             pageState.maxPage = Math.ceil(total / pageState.pageSize)
-
             finished.value = list.value.length >= total
             empty.value = list.value.length === 0
         } catch (err) {

index.html

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

manifest.json

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

packageA/pages/Intendedposition/Intendedposition.vue

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

packageA/pages/UnitDetails/UnitDetails.vue

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

packageA/pages/addPosition/addPosition.vue

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

packageA/pages/browseJob/browseJob.vue

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

packageA/pages/choicenessList/choicenessList.vue

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

packageA/pages/collection/collection.vue

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

packageA/pages/exhibitors/exhibitors.vue

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

packageA/pages/newJobPosition/newJobPosition.vue

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

packageA/pages/post/post.vue

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

packageA/pages/reservation/reservation.vue

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

packageA/pages/selectDate/selectDate.vue

@@ -59,10 +59,10 @@ const pages = reactive({
     year: 0,
     month: 0,
 });
-
 const hasZphDateArray = ref([]);
 
 onLoad((options) => {
+    updateDateArray();
     if (options.date) {
         current.value = {
             date: options?.date || null,

pages.json

@@ -227,8 +227,8 @@
         ]
     }],
     "tabBar": {
-        "custom": true,
-        "display": "none",
+        // "custom": true,
+        // "display": "none",
         "color": "#5E5F60",
         "selectedColor": "#256BFA",
         "borderStyle": "black",

pages/careerfair/careerfair copy.vue

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

pages/careerfair/careerfair.vue

@@ -44,7 +44,7 @@
             <!-- 主体内容区域 -->
             <view class="container-main">
                 <scroll-view scroll-y class="main-scroll" @scrolltolower="handleScrollToLower">
-                    <view class="cards" v-if="fairList.length">
+                    <view class="cards">
                         <view
                             class="card press-button"
                             v-for="(item, index) in fairList"
@@ -94,10 +94,10 @@
                             <view class="card-footer">内容简介：{{ item.zphjj }}</view>
                         </view>
                     </view>
-                    <empty v-else pdTop="200"></empty>
+                    <empty v-if="!fairList.length"></empty>
                 </scroll-view>
             </view>
-            <Tabbar :currentpage="1"></Tabbar>
+            <!-- <Tabbar :currentpage="1"></Tabbar> -->
         </view>
     </view>
 </template>
@@ -201,7 +201,7 @@ function getFair(type = 'add') {
     if (currentDay.value?.fullDate) {
         params.zphjbsj = currentDay.value.fullDate.replace(/-/g, '');
     }
-    $api.createRequest('/app/internal/jobFairThirdPart', params).then((resData) => {
+    $api.createRequest('/app/internal/jobFairThirdPart', params, 'GET', true).then((resData) => {
         const { rows, total } = resData;
         if (type === 'add') {
             // const str = pageState.pageSize * (pageState.page - 1);

pages/chat/chat.vue

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

pages/chat/components/ai-paging.vue

@@ -268,10 +268,10 @@ import WaveDisplay from './WaveDisplay.vue';
 import FileIcon from './fileIcon.vue';
 import FileText from './fileText.vue';
 // 系统功能hook和阿里云hook
-// import { useAudioRecorder } from '@/hook/useRealtimeRecorder.js';
-import { useAudioRecorder } from '@/hook/useSystemSpeechReader.js';
-// import { useTTSPlayer } from '@/hook/useTTSPlayer.js';
-import { useTTSPlayer } from '@/hook/useSystemPlayer.js';
+import { useAudioRecorder } from '@/hook/useRealtimeRecorder.js';
+// import { useAudioRecorder } from '@/hook/useSystemSpeechReader.js';
+import { useTTSPlayer } from '@/hook/useTTSPlayer.js';
+// import { useTTSPlayer } from '@/hook/useSystemPlayer.js';
 // 全局
 const { $api, navTo, throttle } = inject('globalFunction');
 const emit = defineEmits(['onConfirm']);
@@ -632,7 +632,7 @@ function readMarkdown(value, index) {
     if (isPaused.value) {
         resume();
     } else {
-        console.log(value, speechIndex.value, index, isPaused.value)
+        // console.log(value, speechIndex.value, index, isPaused.value)
         speak(value);
     }
 }

pages/index/components/AIMatch.vue

@@ -0,0 +1,371 @@
+<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,
+        tailColor: 0xffe1e1,
+        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,
+        tailColor: 0xb9d3ff,
+        fontColor: 0x1d71ef,
+        size: 12,
+        opacity: 1,
+        angle: Math.PI / 120,
+        radius: 130,
+        tailRotation: (3 * Math.PI) / 3.4,
+    },
+    {
+        name: '程序员',
+        bgColor: 0xffd4b6,
+        fontColor: 0xffffff,
+        size: 14,
+        opacity: 1,
+        angle: Math.PI / 7,
+        radius: 120,
+        tailRotation: (5 * Math.PI) / 4,
+    },
+    {
+        name: '摄影师',
+        bgColor: 0xd8e5fe,
+        tailColor: 0xb9d3ff,
+        fontColor: 0x1d71ef,
+        size: 11,
+        opacity: 1,
+        angle: Math.PI / 3,
+        radius: 79,
+        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,
+        tailColor: 0xb9d3ff,
+        fontColor: 0x1d71ef,
+        size: 10.5,
+        opacity: 1,
+        angle: (5.4 * Math.PI) / 6,
+        radius: 110,
+        tailRotation:(3 *  Math.PI) /1.78,
+    },
+    {
+        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,
+    });
+    app.view.style.touchAction = 'auto';
+
+    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.tailColor || 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;
+    color: #b9d3ff;
+}
+</style>

pages/index/components/index-one.vue

@@ -66,7 +66,7 @@
         </view>
         <view class="table-list">
             <scroll-view :scroll-y="true" class="falls-scroll" @scroll="handleScroll" @scrolltolower="scrollBottom">
-                <view class="falls" v-if="list.length">
+                <view class="falls">
                     <custom-waterfalls-flow
                         :column="columnCount"
                         :columnSpace="columnSpace"
@@ -142,20 +142,20 @@
                     </custom-waterfalls-flow>
                     <loadmore ref="loadmoreRef"></loadmore>
                 </view>
-                <empty v-else pdTop="200"></empty>
+                <empty v-if="!list.length"></empty>
             </scroll-view>
         </view>
         <!-- 筛选 -->
         <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(false);
+const maskFristEntry = ref(true);
 const state = reactive({
     tabIndex: 'all',
 });
@@ -298,6 +298,7 @@ function nextDetail(job) {
 function openFilter() {
     showFilter.value = true;
     emits('onShowTabbar', false);
+    uni.hideTabBar();
     selectFilterModel.value?.open({
         title: '筛选',
         maskClick: true,
@@ -310,10 +311,12 @@ function openFilter() {
             }
             showFilter.value = false;
             getJobList('refresh');
+            uni.showTabBar();
         },
         cancel: () => {
             showFilter.value = false;
             emits('onShowTabbar', true);
+            uni.showTabBar();
         },
     });
 }

pages/index/components/index-two.vue

@@ -35,7 +35,6 @@
                         ref="waterfallsFlowRef"
                         :column="columnCount"
                         :columnSpace="columnSpace"
-                        @loaded="imageloaded"
                         :value="list"
                     >
                         <template v-slot:default="job">
@@ -93,7 +92,7 @@ const state = reactive({
 // 响应式搜索条件（可以被修改）
 const searchParams = ref({});
 const pageSize = ref(10);
-const { list, loading, refresh, loadMore } = usePagination(
+const { list, loading, refresh, loadMore,finished } = usePagination(
     (params) => $api.createRequest('/app/job/littleVideo', params),
     dataToImg, // 转换函数
     {
@@ -105,10 +104,25 @@ const { list, loading, refresh, loadMore } = usePagination(
         },
     }
 );
+watch(()=>finished.value, (newVal) => {
+  if (newVal) {
+    // 确保瀑布流组件知道数据已加载完成
+    loadmoreRef.value?.change('noMore')
+  }else{
+    loadmoreRef.value?.change('more')
+  }
+})
 
-function imageloaded() {
-    loadmoreRef.value?.change('more');
-}
+// function imageloaded() {
+//     nextTick(() => {
+//         console.log('触发',finished.value)
+//         if (finished.value) {
+//           loadmoreRef.value?.change('noMore')
+//         } else {
+//           loadmoreRef.value?.change('more')
+//         }
+//     })
+// }
 
 const { columnCount, columnSpace } = useColumnCount(() => {
     pageSize.value = 10 * (columnCount.value - 1);

pages/index/index.vue

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

pages/login/login.vue

@@ -241,9 +241,10 @@ function nextStep() {
 
 // 获取职位
 function getTreeselect() {
-    $api.createRequest('/app/common/jobTitle/treeselect', {}, 'GET').then((resData) => {
+    const LoadCache = (resData) => {
         state.station = resData.data;
-    });
+    };
+    $api.createRequestWithCache('/app/common/jobTitle/treeselect', {}, 'GET', false, LoadCache).then(LoadCache);
 }
 
 function loginbackdoor() {

pages/mine/mine.vue

@@ -95,9 +95,9 @@
                 ></uni-popup-dialog>
             </uni-popup>
         </view>
-        <template #footer>
+        <!-- <template #footer>
             <Tabbar :currentpage="4"></Tabbar>
-        </template>
+        </template> -->
     </AppLayout>
 </template>
 

pages/msglog/msglog.vue

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

pages/msglog/read.vue

@@ -1,6 +1,6 @@
 <template>
     <scroll-view scroll-y class="main-scroll">
-        <view class="scrollmain">
+        <view v-if="msgList.length" class="scrollmain">
             <view
                 class="list-card press-button"
                 v-for="(item, index) in msgList"
@@ -35,7 +35,9 @@
                     <view class="info-text line_2">{{ item.subTitle || '消息' }}</view>
                 </view>
             </view>
+            <empty v-if="!msgList.length"></empty>
         </view>
+        <empty v-else pdTop="200" content="暂无消息~"></empty>
     </scroll-view>
 </template>
 
@@ -83,6 +85,7 @@ defineExpose({ loadData });
 }
 .scrollmain{
     padding: 28rpx
+    height: calc(100% - 56rpx)
 }
 .read{
 

pages/msglog/unread.vue

@@ -1,6 +1,6 @@
 <template>
     <scroll-view scroll-y class="main-scroll">
-        <view class="scrollmain">
+        <view v-if="unreadMsgList.length" class="scrollmain">
             <view
                 class="list-card press-button"
                 v-for="(item, index) in unreadMsgList"
@@ -33,7 +33,9 @@
                     <view class="info-text line_2">{{ item.subTitle || '消息' }}</view>
                 </view>
             </view>
+            <empty v-if="!unreadMsgList.length"></empty>
         </view>
+        <empty v-else pdTop="200" content="暂无消息~"></empty>
     </scroll-view>
 </template>
 
@@ -69,6 +71,7 @@ defineExpose({ loadData });
 }
 .scrollmain{
     padding: 28rpx
+    height: calc(100% - 56rpx)
 }
 .read{
 

pages/nearby/components/four.vue

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

pages/nearby/components/one.vue

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

pages/nearby/components/three.vue

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

pages/nearby/components/two.vue

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

stores/useReadMsg.js

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

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

@@ -26,6 +26,10 @@ const needToEncrypt = [
  */
 export async function createRequestWithCache(url, data = {}, method = 'GET', loading = false, headers = {},
     onCacheLoad = null) {
+    // 是分页接口的话， 只缓存第一页的数据
+    if (data.current && data.current > 1) {
+        return createRequest(url, data, method, loading, headers);
+    }
     const cacheKey = `${method.toUpperCase()}:${url}:${JSON.stringify(data)}`;
 
     baseDB.getDB().then(async (dbHelper) => {
@@ -77,13 +81,16 @@ export function createRequest(url, data = {}, method = 'GET', loading = false, h
             mask: true
         })
     }
-    let Authorization = ''
-    if (useUserStore().token) {
-        Authorization = `${useUserStore().token}`
-    }
+    let header = {
+        ...headers
+    };
+    const userStore = useUserStore();
+    const token = userStore.token;
 
-    const header = headers || {};
-    header["Authorization"] = encodeURIComponent(Authorization);
+    if (token) {
+        // 确保 Authorization 不会被覆盖，且进行编码
+        header["Authorization"] = encodeURIComponent(token);
+    }
 
     // ------------------------------------------------------------------
     // 检查当前请求是否需要加密
@@ -130,10 +137,12 @@ export function createRequest(url, data = {}, method = 'GET', loading = false, h
                         resolve(resData.data)
                         return
                     }
-                    uni.showToast({
-                        title: msg,
-                        icon: 'none'
-                    })
+                    if (msg) {
+                        uni.showToast({
+                            title: msg,
+                            icon: 'none'
+                        })
+                    }
                 }
                 if (resData.data?.code === 401 || resData.data?.code === 402) {
                     useUserStore().logOut()