flat: 备份

App.vue

@@ -9,23 +9,26 @@ import config from '@/config.js';
 const appword = 'aKd20dbGdFvmuwrt'; // 固定值
 
 onLaunch((options) => {
-    getUserInfo();
-    // useUserStore().initSeesionId(); //更新
-    useDictStore().getDictData();
     // uni.hideTabBar();
-    // 登录
-    // let token = uni.getStorageSync('token') || ''; // 同步获取 缓存信息
-    // if (token) {
-    //     useUserStore()
-    //         .loginSetToken(token)
-    //         .then(() => {
-    //             $api.msg('登录成功');
-    //         });
-    // } else {
-    //     uni.redirectTo({
-    //         url: '/pages/login/login',
-    //     });
-    // }
+    useDictStore().getDictData();
+    try {
+        getUserInfo();
+    } catch {
+        console.log('不是爱山东平台，使用测试登陆');
+        useUserStore().initSeesionId(); //更新
+        let token = uni.getStorageSync('token') || ''; // 同步获取 缓存信息
+        if (token) {
+            useUserStore()
+                .loginSetToken(token)
+                .then(() => {
+                    $api.msg('登录成功');
+                });
+        } else {
+            uni.redirectTo({
+                url: '/pages/login/login',
+            });
+        }
+    }
 });
 
 onMounted(() => {});
@@ -40,23 +43,21 @@ onHide(() => {
 
 function getUserInfo() {
     lightAppJssdk.user.getUserInfoWithEncryptedParamByAppId({
-        appId: 'qdsrgznrgpp', // 接入方在成功创建应用后自动生成
+        appId: config.appInfo.loveShandong, // 接入方在成功创建应用后自动生成
         success: function (data) {
             if (data == '未登录') onLoginApp();
             else {
                 if (typeof data == 'string') data = JSON.parse(data);
-
-                const sm2_privateKey = '7e14966df4ecd4241ed082ef716d82b52113cb5899ebdc704a98844d0a32b0dc';
+                const sm2_privateKey = config.appInfo.sm2PrivateKey;
                 let sm2_encrypt_result = data.data;
                 let sm2_decrypt_result = sm2_Decrypt(sm2_encrypt_result, sm2_privateKey);
-
+                console.log(sm2_decrypt_result);
                 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);
             }

common/globalFunction.js

@@ -1,6 +1,6 @@
+import '@/lib/encryption/sm4.min.js'
 import useUserStore from "../stores/useUserStore";
 import {
-    request,
     createRequest,
     uploadFile
 } from "../utils/request";
@@ -562,8 +562,6 @@ function aes_Decrypt(word, key) {
     })
     return decrypt.toString(CryptoJS.enc.Utf8)
 }
-
-
 export function sm2_Decrypt(word, key) {
     return SM.decrypt(word, key);
 }
@@ -572,11 +570,51 @@ export function sm2_Encrypt(word, key) {
     return SM.encrypt(word, key);
 }
 
+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('解密失败', e)
+    }
+}
+
+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 const $api = {
     msg,
     prePage,
     sleep,
-    request,
     createRequest,
     streamRequest,
     chatRequest,
@@ -615,6 +653,7 @@ export default {
     insertSortData,
     isInWechatMiniProgramWebview,
     isEmptyObject,
+    sm4Decrypt,
     aes_Decrypt,
     sm2_Decrypt,
     sm2_Encrypt

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/renderCompanyCollectionRecord/renderCompanyCollectionRecord.vue

@@ -0,0 +1,157 @@
+<template>
+    <view v-for="company in listData" :key="company.id">
+        <view v-if="company.dataType==2" class="cards" @click="nextDetail(company)">
+            <view class="card-company">
+                <text class="company line_1">{{ company.name }}</text>
+            </view>
+            <view class="card-bottom ">
+                <view class="fl_box fs_14">
+                    <view class="mar_ri10">{{company.industry}}</view>
+                    <view>{{company.scale  }}</view>
+                </view>
+                <view class="ris">
+                    <text class="fs_14">
+                        在招职位·
+                        <text class="color_256BFA">{{ company.totalRecruitment || '-' }}</text>
+                        个
+                    </text>
+                </view>
+            </view>
+            <view class="card-tags">
+                <view class="tag" v-if="company.nature">
+                    {{company.nature}}
+                </view>
+            </view>
+        </view>
+        <view v-else class="cards" @click="nextDetail(company)">
+            <view class="card-company">
+                <text class="company line_1">{{ company.name }}</text>
+            </view>
+            <view class="card-bottom">
+                <view class="fl_box fs_14">
+                    <view class="mar_ri10">{{company.industry}}</view>
+                    <view>{{company.scale }}</view>
+                </view>
+                <view class="ris">
+                    <text class="fs_14">
+                        在招职位·
+                        <text class="color_256BFA">{{ company.totalRecruitment || '-' }}</text>
+                        个
+                    </text>
+                </view>
+            </view>
+            <view class="card-tags">
+                <view class="tag" v-if="company.nature">
+                    {{company.nature}}
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import { inject, computed, toRaw } from 'vue';
+const { insertSortData, navTo, vacanciesTo } = inject('globalFunction');
+import { useRecommedIndexedDBStore } from '@/stores/useRecommedIndexedDBStore.js';
+const recommedIndexDb = useRecommedIndexedDBStore();
+const props = defineProps({
+    list: {
+        type: Array,
+        default: '标题',
+    },
+    longitude: {
+        type: Number,
+        default: 120.382665,
+    },
+    latitude: {
+        type: Number,
+        default: 36.066938,
+    },
+    seeDate: {
+        type: String,
+        default: '',
+    },
+});
+
+const listData = computed(() => {
+    return props.list;
+});
+
+function nextDetail(company) {
+    if(company.dataType == 2){
+        navTo(`/packageA/pages/UnitDetails/UnitDetails?companyId=${company.gsID}&companyName=${company.name}&zphId=${company.zphID}&dataType=2`);
+    }else{
+        navTo(`/packageA/pages/UnitDetails/UnitDetails?companyId=${company.companyId}`);
+    }
+}
+</script>
+
+<style lang="stylus" scoped>
+.date-jobTitle{
+    font-weight: 400;
+    font-size: 28rpx;
+    color: #495265;
+    padding: 28rpx 0 0 20rpx
+}
+.cards{
+    padding: 32rpx;
+    background: #FFFFFF;
+    box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04);
+    border-radius: 20rpx 20rpx 20rpx 20rpx;
+    margin-top: 22rpx;
+    .card-company{
+        display: flex
+        justify-content: space-between
+        align-items: flex-start
+        .company{
+            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+            font-weight: 500;
+            font-size: 32rpx;
+            color: #333333;
+        }
+        .salary{
+            font-weight: 500;
+            font-size: 28rpx;
+            color: #4C6EFB;
+            white-space: nowrap
+            line-height: 48rpx
+        }
+    }
+    .card-companyName{
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #6C7282;
+    }
+    .card-tags{
+        display: flex
+        flex-wrap: wrap
+        .tag{
+            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+            width: fit-content;
+            height: 30rpx;
+            background: #F4F4F4;
+            border-radius: 4rpx;
+            padding: 6rpx 20rpx;
+            line-height: 30rpx;
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #6C7282;
+            text-align: center;
+            margin-top: 14rpx;
+            white-space: nowrap
+            margin-right: 20rpx
+        }
+    }
+    .card-bottom{
+        margin-top: 15rpx
+        margin-bottom: 10rpx
+        display: flex
+        justify-content: space-between
+        font-size: 28rpx;
+        color: #6C7282;
+    }
+}
+.ris{
+    font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+}
+</style>

components/renderCompanys/renderCompanys.vue

@@ -130,4 +130,4 @@ function nextDetail(company) {
 .ris{
     font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
 }
-</style>
+</style>

components/renderCompanysOutData/renderCompanysOutData.vue

@@ -0,0 +1,142 @@
+<template>
+    <view v-for="job in listData" :key="job.id">
+        <view class="cards" @click="nextDetail(job)">
+            <view class="card-company">
+                <text class="company line_1">{{ job.gsmc }}</text>
+            </view>
+            <view class="card-bottom" >
+                <view class="fl_box fs_14" >
+                    <!-- <dict-tree-Label class="mar_ri10" dictType="industry" :value="job.industry"></dict-tree-Label>
+                    <dict-Label dictType="scale" :value="job.scale"></dict-Label> -->
+                    <view>{{job.gsxy}}</view>
+                </view>
+                <view class="ris" >
+                    <text class="fs_14">
+                        在招职位·
+                        <text class="color_256BFA">{{ job.zzgwsl || '-' }}</text>
+                        个
+                    </text>
+                </view>
+            </view>
+            <view class="card-tags">
+                <view class="tag" v-if="job.nature">
+                    <dict-Label dictType="nature" :value="job.nature"></dict-Label>
+                    <dict-Label  dictType="nature" :value="job.nature"></dict-Label>
+                </view>
+                <view class="tag">
+                    {{ vacanciesTo(job.vacancies) }}
+                </view>
+                 <view class="tag" v-if="job.qyxz">
+                  {{job.qyxz}}
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import { inject, computed, toRaw } from 'vue';
+const { insertSortData, navTo, vacanciesTo } = inject('globalFunction');
+import { useRecommedIndexedDBStore } from '@/stores/useRecommedIndexedDBStore.js';
+const recommedIndexDb = useRecommedIndexedDBStore();
+const props = defineProps({
+    list: {
+        type: Array,
+        default: '标题',
+    },
+    longitude: {
+        type: Number,
+        default: 120.382665,
+    },
+    latitude: {
+        type: Number,
+        default: 36.066938,
+    },
+    seeDate: {
+        type: String,
+        default: '',
+    },
+    zphId: {
+        type: String,
+        default: '',
+    },
+});
+
+const listData = computed(() => {
+    return props.list;
+});
+
+function nextDetail(company) {
+    navTo(`/packageA/pages/UnitDetails/UnitDetails?companyId=${company.gsID}&companyName=${company.gsmc}&zphId=${props.zphId}&dataType=2`);
+}
+</script>
+
+<style lang="stylus" scoped>
+.date-jobTitle{
+    font-weight: 400;
+    font-size: 28rpx;
+    color: #495265;
+    padding: 28rpx 0 0 20rpx
+}
+.cards{
+    padding: 32rpx;
+    background: #FFFFFF;
+    box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04);
+    border-radius: 20rpx 20rpx 20rpx 20rpx;
+    margin-top: 22rpx;
+    .card-company{
+        display: flex
+        justify-content: space-between
+        align-items: flex-start
+        .company{
+            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+            font-weight: 500;
+            font-size: 32rpx;
+            color: #333333;
+        }
+        .salary{
+            font-weight: 500;
+            font-size: 28rpx;
+            color: #4C6EFB;
+            white-space: nowrap
+            line-height: 48rpx
+        }
+    }
+    .card-companyName{
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #6C7282;
+    }
+    .card-tags{
+        display: flex
+        flex-wrap: wrap
+        .tag{
+            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+            width: fit-content;
+            height: 30rpx;
+            background: #F4F4F4;
+            border-radius: 4rpx;
+            padding: 6rpx 20rpx;
+            line-height: 30rpx;
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #6C7282;
+            text-align: center;
+            margin-top: 14rpx;
+            white-space: nowrap
+            margin-right: 20rpx
+        }
+    }
+    .card-bottom{
+        margin-top: 15rpx
+        margin-bottom: 10rpx
+        display: flex
+        justify-content: space-between
+        font-size: 28rpx;
+        color: #6C7282;
+    }
+}
+.ris{
+    font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+}
+</style>

components/renderDeliveryRecord/renderDeliveryRecord.vue

@@ -0,0 +1,201 @@
+<template>
+    <view v-for="job in listData" :key="job.id">
+        <view v-if="!job.isTitle" class="cards" @click="nextDetail(job)">
+            <!-- 数据类型2的完整模块 -->
+            <view v-if="job.dataType == 2">
+                <view class="card-company">
+                    <text class="company">{{ job.jobTitle }}</text>
+                    <view class="salary">
+                        <Salary-Expectation :max-salary="job.maxSalary" :min-salary="job.minSalary"></Salary-Expectation>
+                    </view>
+                </view>
+                <view class="card-companyName">{{ job.companyName }}</view>
+                <view class="card-tags">
+                    <view class="tag">
+                        {{job.education == '不限' ? '学历不限' : job.education}}
+                    </view>
+                    <view class="tag">
+                     {{job.experience == '不限' ? '经验不限' : job.experience}}
+                    </view>
+                    <view class="tag">
+                       {{ vacanciesTo(job.vacancies) }}
+                    </view>
+                </view>
+                <view class="card-bottom">
+                    <view>{{ parseDateTime(job.createTime).date }}</view>
+                    <view>
+                        <!-- <convert-distance
+                            :alat="job.latitude"
+                            :along="job.longitude"
+                            :blat="latitude"
+                            :blong="longitude"
+                        ></convert-distance>
+                        <dict-Label class="mar_le10" dictType="area" :value="job.jobLocationAreaCode"></dict-Label> -->
+                    </view>
+                </view>
+            </view>
+            
+            <!-- 数据类型1的完整模块 -->
+            <view v-else>
+                <view class="card-company">
+                    <text class="company">{{ job.jobTitle }}</text>
+                    <view class="salary">
+                        <Salary-Expectation :max-salary="job.maxSalary" :min-salary="job.minSalary"></Salary-Expectation>
+                    </view>
+                </view>
+                <view class="card-companyName">{{ job.companyName }}</view>
+                <view class="card-tags">
+                    <view class="tag">
+                        <dict-Label dictType="education" :value="job.education"></dict-Label>
+                    </view>
+                    <view class="tag">
+                        <dict-Label dictType="experience" :value="job.experience"></dict-Label>
+                    </view>
+                    <view class="tag">
+                        {{ vacanciesTo(job.vacancies) }}
+                    </view>
+                </view>
+                <view class="card-bottom">
+                    <view>{{ job.postingDate }}</view>
+                    <view>
+                        <convert-distance
+                            :alat="job.latitude"
+                            :along="job.longitude"
+                            :blat="latitude"
+                            :blong="longitude"
+                        ></convert-distance>
+                        <dict-Label class="mar_le10" dictType="area" :value="job.jobLocationAreaCode"></dict-Label>
+                    </view>
+                </view>
+            </view>
+        </view>
+        <view class="date-jobTitle" v-else>
+            {{ job.title }}
+        </view>
+    </view>
+</template>
+
+<script setup>
+import { inject, computed, toRaw } from 'vue';
+const { insertSortData, navTo, vacanciesTo } = inject('globalFunction');
+import { useRecommedIndexedDBStore } from '@/stores/useRecommedIndexedDBStore.js';
+const recommedIndexDb = useRecommedIndexedDBStore();
+const props = defineProps({
+    list: {
+        type: Array,
+        default: '标题',
+    },
+    longitude: {
+        type: Number,
+        default: 120.382665,
+    },
+    latitude: {
+        type: Number,
+        default: 36.066938,
+    },
+    seeDate: {
+        type: String,
+        default: '',
+    },
+});
+
+const listData = computed(() => {
+    if (props.seeDate && props.list.length) {
+        const ulist = toRaw(props.list);
+        const [reslist, lastDate] = insertSortData(ulist, props.seeDate);
+        return reslist;
+    }
+    return props.list;
+});
+
+// 解析日期时间（用于数据类型2）
+function parseDateTime(datetimeStr) {
+    if (!datetimeStr) return { time: '', date: '' };
+
+    const dateObj = new Date(datetimeStr);
+
+    if (isNaN(dateObj.getTime())) return { time: '', date: '' }; // 无效时间
+
+    const year = dateObj.getFullYear();
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0');
+    const day = String(dateObj.getDate()).padStart(2, '0');
+    const hours = String(dateObj.getHours()).padStart(2, '0');
+    const minutes = String(dateObj.getMinutes()).padStart(2, '0');
+
+    return {
+        time: `${hours}:${minutes}`,
+        date: `${year}-${month}-${day}`,
+    };
+}
+
+function nextDetail(job) {
+    navTo(`/packageA/pages/post/post?jobId=${btoa(job.jobId)}`);
+}
+</script>
+
+<style lang="stylus" scoped>
+.date-jobTitle{
+    font-weight: 400;
+    font-size: 28rpx;
+    color: #495265;
+    padding: 28rpx 0 0 20rpx
+}
+.cards{
+    padding: 32rpx;
+    background: #FFFFFF;
+    box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04);
+    border-radius: 20rpx 20rpx 20rpx 20rpx;
+    margin-top: 22rpx;
+    .card-company{
+        display: flex
+        justify-content: space-between
+        align-items: flex-start
+        .company{
+            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+            font-weight: 500;
+            font-size: 30rpx;
+            color: #333333;
+        }
+        .salary{
+            font-family: DIN-Medium;
+            font-weight: 500;
+            font-size: 26rpx;
+            color: #4C6EFB;
+            white-space: nowrap
+            line-height: 48rpx
+        }
+    }
+    .card-companyName{
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #6C7282;
+    }
+    .card-tags{
+        display: flex
+        flex-wrap: wrap
+        .tag{
+            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+            width: fit-content;
+            height: 30rpx;
+            background: #F4F4F4;
+            border-radius: 4rpx;
+            padding: 6rpx 20rpx;
+            line-height: 30rpx;
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #6C7282;
+            text-align: center;
+            margin-top: 14rpx;
+            white-space: nowrap
+            margin-right: 20rpx
+        }
+    }
+    .card-bottom{
+        margin-top: 32rpx
+        display: flex
+        justify-content: space-between
+        font-size: 28rpx;
+        color: #6C7282;
+    }
+}
+</style>

components/renderJobCollectionRecord/renderJobCollectionRecord.vue

@@ -0,0 +1,202 @@
+<template>
+    <view v-for="job in listData" :key="job.id">
+        <view v-if="!job.isTitle" class="cards" @click="nextDetail(job)">
+            <!-- 数据类型2的完整模块 -->
+            <view v-if="job.dataType == 2">
+                <view class="card-company">
+                    <text class="company">{{ job.jobTitle }}</text>
+                    <view class="salary">
+                        <Salary-Expectation :max-salary="job.maxSalary" :min-salary="job.minSalary"></Salary-Expectation>
+                    </view>
+                </view>
+                <view class="card-companyName">{{ job.companyName }}</view>
+                <view class="card-tags">
+                    <view class="tag">
+                        {{job.education == '不限' ? '学历不限' : job.education}}
+                    </view>
+                    <view class="tag">
+                     {{job.experience == '不限' ? '经验不限' : job.experience}}
+                    </view>
+                    <view class="tag">
+                        {{ vacanciesTo(job.vacancies) }}
+                    </view>
+                </view>
+                <view class="card-bottom">
+                    <view>{{ parseDateTime(job.createTime).date }}</view>
+                    <view>
+                        <!-- <convert-distance
+                            :alat="job.latitude"
+                            :along="job.longitude"
+                            :blat="latitude"
+                            :blong="longitude"
+                        ></convert-distance>
+                        <dict-Label class="mar_le10" dictType="area" :value="job.jobLocationAreaCode"></dict-Label> -->
+                    </view>
+                </view>
+            </view>
+            
+            <!-- 数据类型1的完整模块 -->
+            <view v-else>
+                <view class="card-company">
+                    <text class="company">{{ job.jobTitle }}</text>
+                    <view class="salary">
+                        <Salary-Expectation :max-salary="job.maxSalary" :min-salary="job.minSalary"></Salary-Expectation>
+                    </view>
+                </view>
+                <view class="card-companyName">{{ job.companyName }}</view>
+                <view class="card-tags">
+                    <view class="tag">
+                        {{job.education == '不限' ? '学历不限' : job.education}}
+                    </view>
+                    <view class="tag">
+                     {{job.experience == '不限' ? '经验不限' : job.experience}}
+                    </view>
+                    <view class="tag">
+                        {{ vacanciesTo(job.vacancies) }}
+                    </view>
+                </view>
+                <view class="card-bottom">
+                    <view>{{ job.postingDate }}</view>
+                    <view>
+                        <convert-distance
+                            :alat="job.latitude"
+                            :along="job.longitude"
+                            :blat="latitude"
+                            :blong="longitude"
+                        ></convert-distance>
+                        <dict-Label class="mar_le10" dictType="area" :value="job.jobLocationAreaCode"></dict-Label>
+                    </view>
+                </view>
+            </view>
+        </view>
+        <view class="date-jobTitle" v-else>
+            {{ job.title }}
+        </view>
+    </view>
+</template>
+
+<script setup>
+import { inject, computed, toRaw } from 'vue';
+const { insertSortData, navTo, vacanciesTo } = inject('globalFunction');
+import { useRecommedIndexedDBStore } from '@/stores/useRecommedIndexedDBStore.js';
+const recommedIndexDb = useRecommedIndexedDBStore();
+const props = defineProps({
+    list: {
+        type: Array,
+        default: '标题',
+    },
+    longitude: {
+        type: Number,
+        default: 120.382665,
+    },
+    latitude: {
+        type: Number,
+        default: 36.066938,
+    },
+    seeDate: {
+        type: String,
+        default: '',
+    },
+});
+
+const listData = computed(() => {
+    if (props.seeDate && props.list.length) {
+        const ulist = toRaw(props.list);
+        const [reslist, lastDate] = insertSortData(ulist, props.seeDate);
+        return reslist;
+    }
+    return props.list;
+});
+
+// 解析日期时间（用于数据类型2）
+function parseDateTime(datetimeStr) {
+    if (!datetimeStr) return { time: '', date: '' };
+
+    const dateObj = new Date(datetimeStr);
+
+    if (isNaN(dateObj.getTime())) return { time: '', date: '' }; // 无效时间
+
+    const year = dateObj.getFullYear();
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0');
+    const day = String(dateObj.getDate()).padStart(2, '0');
+    const hours = String(dateObj.getHours()).padStart(2, '0');
+    const minutes = String(dateObj.getMinutes()).padStart(2, '0');
+
+    return {
+        time: `${hours}:${minutes}`,
+        date: `${year}-${month}-${day}`,
+    };
+}
+
+function nextDetail(job) {
+    // 根据数据类型跳转到不同的详情页
+    navTo(`/packageA/pages/post/post?jobId=${btoa(job.jobId)}&dataType=${job.dataType}`);
+}
+</script>
+
+<style lang="stylus" scoped>
+.date-jobTitle{
+    font-weight: 400;
+    font-size: 28rpx;
+    color: #495265;
+    padding: 28rpx 0 0 20rpx
+}
+.cards{
+    padding: 32rpx;
+    background: #FFFFFF;
+    box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04);
+    border-radius: 20rpx 20rpx 20rpx 20rpx;
+    margin-top: 22rpx;
+    .card-company{
+        display: flex
+        justify-content: space-between
+        align-items: flex-start
+        .company{
+            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+            font-weight: 500;
+            font-size: 30rpx;
+            color: #333333;
+        }
+        .salary{
+            font-family: DIN-Medium;
+            font-weight: 500;
+            font-size: 26rpx;
+            color: #4C6EFB;
+            white-space: nowrap
+            line-height: 48rpx
+        }
+    }
+    .card-companyName{
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #6C7282;
+    }
+    .card-tags{
+        display: flex
+        flex-wrap: wrap
+        .tag{
+            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+            width: fit-content;
+            height: 30rpx;
+            background: #F4F4F4;
+            border-radius: 4rpx;
+            padding: 6rpx 20rpx;
+            line-height: 30rpx;
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #6C7282;
+            text-align: center;
+            margin-top: 14rpx;
+            white-space: nowrap
+            margin-right: 20rpx
+        }
+    }
+    .card-bottom{
+        margin-top: 32rpx
+        display: flex
+        justify-content: space-between
+        font-size: 28rpx;
+        color: #6C7282;
+    }
+}
+</style>

components/renderJobViewRecord/renderJobViewRecord.vue

@@ -0,0 +1,201 @@
+<template>
+    <view v-for="job in listData" :key="job.id">
+        <view v-if="!job.isTitle" class="cards" @click="nextDetail(job)">
+            <!-- 数据类型2的完整模块 -->
+            <view v-if="job.dataType == 2">
+                <view class="card-company">
+                    <text class="company">{{ job.jobTitle }}</text>
+                    <view class="salary">
+                        <Salary-Expectation :max-salary="job.maxSalary" :min-salary="job.minSalary"></Salary-Expectation>
+                    </view>
+                </view>
+                <view class="card-companyName">{{ job.companyName }}</view>
+                <view class="card-tags">
+                    <view class="tag">
+                        {{job.education == '不限' ? '学历不限' : job.education}}
+                    </view>
+                    <view class="tag">
+                     {{job.experience == '不限' ? '经验不限' : job.experience}}
+                    </view>
+                    <view class="tag">
+                       {{ vacanciesTo(job.vacancies) }}
+                    </view>
+                </view>
+                <view class="card-bottom">
+                    <view>{{ parseDateTime(job.createTime).date }}</view>
+                    <view>
+                        <!-- <convert-distance
+                            :alat="job.latitude"
+                            :along="job.longitude"
+                            :blat="latitude"
+                            :blong="longitude"
+                        ></convert-distance>
+                        <dict-Label class="mar_le10" dictType="area" :value="job.jobLocationAreaCode"></dict-Label> -->
+                    </view>
+                </view>
+            </view>
+            
+            <!-- 数据类型1的完整模块 -->
+            <view v-else>
+                <view class="card-company">
+                    <text class="company">{{ job.jobTitle }}</text>
+                    <view class="salary">
+                        <Salary-Expectation :max-salary="job.maxSalary" :min-salary="job.minSalary"></Salary-Expectation>
+                    </view>
+                </view>
+                <view class="card-companyName">{{ job.companyName }}</view>
+                <view class="card-tags">
+                    <view class="tag">
+                        {{job.education == '不限' ? '学历不限' : job.education}}
+                    </view>
+                    <view class="tag">
+                     {{job.experience == '不限' ? '经验不限' : job.experience}}
+                    </view>
+                    <view class="tag">
+                        {{ vacanciesTo(job.vacancies) }}
+                    </view>
+                </view>
+                <view class="card-bottom">
+                    <view>{{ job.postingDate }}</view>
+                    <view>
+                        <convert-distance
+                            :alat="job.latitude"
+                            :along="job.longitude"
+                            :blat="latitude"
+                            :blong="longitude"
+                        ></convert-distance>
+                        <dict-Label class="mar_le10" dictType="area" :value="job.jobLocationAreaCode"></dict-Label>
+                    </view>
+                </view>
+            </view>
+        </view>
+        <view class="date-jobTitle" v-else>
+            {{ job.title }}
+        </view>
+    </view>
+</template>
+
+<script setup>
+import { inject, computed, toRaw } from 'vue';
+const { insertSortData, navTo, vacanciesTo } = inject('globalFunction');
+import { useRecommedIndexedDBStore } from '@/stores/useRecommedIndexedDBStore.js';
+const recommedIndexDb = useRecommedIndexedDBStore();
+const props = defineProps({
+    list: {
+        type: Array,
+        default: '标题',
+    },
+    longitude: {
+        type: Number,
+        default: 120.382665,
+    },
+    latitude: {
+        type: Number,
+        default: 36.066938,
+    },
+    seeDate: {
+        type: String,
+        default: '',
+    },
+});
+
+const listData = computed(() => {
+    if (props.seeDate && props.list.length) {
+        const ulist = toRaw(props.list);
+        const [reslist, lastDate] = insertSortData(ulist, props.seeDate);
+        return reslist;
+    }
+    return props.list;
+});
+
+// 解析日期时间（用于数据类型2）
+function parseDateTime(datetimeStr) {
+    if (!datetimeStr) return { time: '', date: '' };
+
+    const dateObj = new Date(datetimeStr);
+
+    if (isNaN(dateObj.getTime())) return { time: '', date: '' }; // 无效时间
+
+    const year = dateObj.getFullYear();
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0');
+    const day = String(dateObj.getDate()).padStart(2, '0');
+    const hours = String(dateObj.getHours()).padStart(2, '0');
+    const minutes = String(dateObj.getMinutes()).padStart(2, '0');
+
+    return {
+        time: `${hours}:${minutes}`,
+        date: `${year}-${month}-${day}`,
+    };
+}
+
+function nextDetail(job) {
+    navTo(`/packageA/pages/post/post?jobId=${btoa(job.jobId)}&dataType=${job.dataType}`);
+}
+</script>
+
+<style lang="stylus" scoped>
+.date-jobTitle{
+    font-weight: 400;
+    font-size: 28rpx;
+    color: #495265;
+    padding: 28rpx 0 0 20rpx
+}
+.cards{
+    padding: 32rpx;
+    background: #FFFFFF;
+    box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04);
+    border-radius: 20rpx 20rpx 20rpx 20rpx;
+    margin-top: 22rpx;
+    .card-company{
+        display: flex
+        justify-content: space-between
+        align-items: flex-start
+        .company{
+            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+            font-weight: 500;
+            font-size: 30rpx;
+            color: #333333;
+        }
+        .salary{
+            font-family: DIN-Medium;
+            font-weight: 500;
+            font-size: 26rpx;
+            color: #4C6EFB;
+            white-space: nowrap
+            line-height: 48rpx
+        }
+    }
+    .card-companyName{
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #6C7282;
+    }
+    .card-tags{
+        display: flex
+        flex-wrap: wrap
+        .tag{
+            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+            width: fit-content;
+            height: 30rpx;
+            background: #F4F4F4;
+            border-radius: 4rpx;
+            padding: 6rpx 20rpx;
+            line-height: 30rpx;
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #6C7282;
+            text-align: center;
+            margin-top: 14rpx;
+            white-space: nowrap
+            margin-right: 20rpx
+        }
+    }
+    .card-bottom{
+        margin-top: 32rpx
+        display: flex
+        justify-content: space-between
+        font-size: 28rpx;
+        color: #6C7282;
+    }
+}
+</style>

components/renderJobs/renderJobs.vue

@@ -7,7 +7,7 @@
                     <Salary-Expectation :max-salary="job.maxSalary" :min-salary="job.minSalary"></Salary-Expectation>
                 </view>
             </view>
-            <view class="card-companyName">{{ job.companyName }}</view>
+            <view class="card-companyName">{{ job.gwmc }}</view>
             <view class="card-tags">
                 <view class="tag">
                     <dict-Label dictType="education" :value="job.education"></dict-Label>
@@ -77,7 +77,7 @@ function nextDetail(job) {
         const recordData = recommedIndexDb.JobParameter(job);
         recommedIndexDb.addRecord(recordData);
     }
-    navTo(`/packageA/pages/post/post?jobId=${btoa(job.jobId)}`);
+    navTo(`/packageA/pages/post/post?jobId=${btoa(job.jobId)}&dataType=1`);
 }
 </script>
 

components/renderJobsOutData/renderJobsOutData.vue

@@ -0,0 +1,167 @@
+<template>
+    <view v-for="job in listData" :key="job.id">
+        <view v-if="!job.isTitle" class="cards" @click="nextDetail(job)">
+            <view class="card-company">
+                <text class="company">{{ job.gwmc }}</text>
+                <view class="salary">
+                    <Salary-Expectation :max-salary="job.maxSalary" :min-salary="job.minSalary"></Salary-Expectation>
+                </view>
+            </view>
+            <view class="card-companyName">{{ job.gsmc }}</view>
+            <view class="card-tags">
+                <view class="tag">
+                    {{job.xlyq == '不限' ? '学历不限' : job.xlyq}}
+                </view>
+                <view class="tag">
+                 {{job.gwgzjy == '不限' ? '经验不限' : job.gwgzjy}}
+                </view>
+                <view class="tag">
+                    {{ vacanciesTo(job.zprs) }}
+                </view>
+            </view>
+            <view class="card-bottom">
+                <view>{{ parseDateTime(job.createTime).date }}</view>
+                <view>
+                    <!-- <convert-distance
+                        :alat="job.latitude"
+                        :along="job.longitude"
+                        :blat="latitude"
+                        :blong="longitude"
+                    ></convert-distance>
+                    <dict-Label class="mar_le10" dictType="area" :value="job.jobLocationAreaCode"></dict-Label> -->
+                </view>
+            </view>
+        </view>
+        <view class="date-jobTitle" v-else>
+            {{ job.title }}
+        </view>
+    </view>
+</template>
+
+<script setup>
+import { inject, computed, toRaw } from 'vue';
+const { insertSortData, navTo, vacanciesTo } = inject('globalFunction');
+import { useRecommedIndexedDBStore } from '@/stores/useRecommedIndexedDBStore.js';
+const recommedIndexDb = useRecommedIndexedDBStore();
+const props = defineProps({
+    list: {
+        type: Array,
+        default: '标题',
+    },
+    longitude: {
+        type: Number,
+        default: 120.382665,
+    },
+    latitude: {
+        type: Number,
+        default: 36.066938,
+    },
+    seeDate: {
+        type: String,
+        default: '',
+    },
+});
+
+const listData = computed(() => {
+    if (props.seeDate && props.list.length) {
+        const ulist = toRaw(props.list);
+        const [reslist, lastDate] = insertSortData(ulist, props.seeDate);
+        return reslist;
+    }
+    return props.list;
+});
+
+function nextDetail(job) {
+    // 记录岗位类型，用作数据分析
+    if (job.jobCategory) {
+        const recordData = recommedIndexDb.JobParameter(job);
+        recommedIndexDb.addRecord(recordData);
+    }
+    navTo(`/packageA/pages/post/post?jobId=${btoa(job.id)}&dataType=2`);
+}
+function parseDateTime(datetimeStr) {
+    if (!datetimeStr) return { time: '', date: '' };
+
+    const dateObj = new Date(datetimeStr);
+
+    if (isNaN(dateObj.getTime())) return { time: '', date: '' }; // 无效时间
+
+    const year = dateObj.getFullYear();
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0');
+    const day = String(dateObj.getDate()).padStart(2, '0');
+    const hours = String(dateObj.getHours()).padStart(2, '0');
+    const minutes = String(dateObj.getMinutes()).padStart(2, '0');
+
+    return {
+        time: `${hours}:${minutes}`,
+        date: `${year}-${month}-${day}`,
+    };
+}
+</script>
+
+<style lang="stylus" scoped>
+.date-jobTitle{
+    font-weight: 400;
+    font-size: 28rpx;
+    color: #495265;
+    padding: 28rpx 0 0 20rpx
+}
+.cards{
+    padding: 32rpx;
+    background: #FFFFFF;
+    box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04);
+    border-radius: 20rpx 20rpx 20rpx 20rpx;
+    margin-top: 22rpx;
+    .card-company{
+        display: flex
+        justify-content: space-between
+        align-items: flex-start
+        .company{
+            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+            font-weight: 500;
+            font-size: 30rpx;
+            color: #333333;
+        }
+        .salary{
+            font-family: DIN-Medium;
+            font-weight: 500;
+            font-size: 26rpx;
+            color: #4C6EFB;
+            white-space: nowrap
+            line-height: 48rpx
+        }
+    }
+    .card-companyName{
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #6C7282;
+    }
+    .card-tags{
+        display: flex
+        flex-wrap: wrap
+        .tag{
+            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+            width: fit-content;
+            height: 30rpx;
+            background: #F4F4F4;
+            border-radius: 4rpx;
+            padding: 6rpx 20rpx;
+            line-height: 30rpx;
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #6C7282;
+            text-align: center;
+            margin-top: 14rpx;
+            white-space: nowrap
+            margin-right: 20rpx
+        }
+    }
+    .card-bottom{
+        margin-top: 32rpx
+        display: flex
+        justify-content: space-between
+        font-size: 28rpx;
+        color: #6C7282;
+    }
+}
+</style>

components/tabbar/midell-box.vue

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

config.js

@@ -1,8 +1,7 @@
 export default {
-    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",
+    // baseUrl: 'https://fw.rc.qingdao.gov.cn/rgpp-api/api', // 内网
+    baseUrl: 'https://qd.zhaopinzao8dian.com/api', // 测试
+    // baseUrl: 'http://192.168.3.29:8081',
     // sseAI+
     // StreamBaseURl: 'http://39.98.44.136:8000',
     StreamBaseURl: 'https://qd.zhaopinzao8dian.com/ai',
@@ -18,14 +17,14 @@ export default {
     OnlyUseCachedDB: false,
     // 使用模拟定位
     UsingSimulatedPositioning: true,
-    // 私钥
-    pubilcKey: '',
-    // 公钥
-    privateKey: '',
     // 应用信息
     appInfo: {
         // 应用名称
         name: "青岛市就业服务",
+        // 爱山东应用标识
+        loveShandong: 'szjxrgznqzzp',
+        // 爱山东应用Key
+        sm2PrivateKey: '0d152c849f10e4469f2af8cedea62004e4f1db7be23c2f7270c1441d8050799d',
         // 地区名
         areaName: '青岛市',
         // AI名称
@@ -75,5 +74,11 @@ 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
     }
 }

index.html

@@ -17,21 +17,20 @@
             })();
         </script>
         <title></title>
-        <!-- vconsole -->
-        <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
+        <!-- eruda -->
+        <script src="https://cdn.jsdelivr.net/npm/eruda"></script>
         <script>
-            var vConsole = new window.VConsole();
-            vConsole.destroy();
+            eruda.init();
         </script>
-        <!-- 爱山东jssdk -->
+        <!-- 爱山东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>
 
-        <script type="text/javascript" src="./static/encryption/aes.js"></script>
-
-        <script type="text/javascript" src="./static/encryption/SM.js"></script>
     </head>
-    <!-- <body> -->
-    <div id="app"><!--app-html--></div>
-    <script type="module" src="/main.js"></script>
+    <body>
+        <div id="app"><!--app-html--></div>
+        <script type="module" src="/main.js"></script>
     </body>
 </html>

main.js

@@ -12,6 +12,12 @@ import SelectPopup from '@/components/selectPopup/selectPopup.vue'
 import SelectPopupPlugin from '@/components/selectPopup/selectPopupPlugin';
 import RenderJobs from '@/components/renderJobs/renderJobs.vue';
 import RenderCompanys from '@/components/renderCompanys/renderCompanys.vue';
+import RenderJobsOutData from '@/components/renderJobsOutData/renderJobsOutData.vue';
+import RenderCompanysOutData from '@/components/renderCompanysOutData/renderCompanysOutData.vue';
+import renderDeliveryRecord from '@/components/renderDeliveryRecord/renderDeliveryRecord.vue';
+import renderJobCollectionRecord from '@/components/renderJobCollectionRecord/renderJobCollectionRecord.vue';
+import renderCompanyCollectionRecord from '@/components/renderCompanyCollectionRecord/renderCompanyCollectionRecord.vue';
+import renderJobViewRecord from '@/components/renderJobViewRecord/renderJobViewRecord.vue';
 // import Tabbar from '@/components/tabbar/midell-box.vue'
 // 自动导入 directives 目录下所有指令
 const directives = import.meta.glob('./directives/*.js', {
@@ -36,6 +42,12 @@ export function createApp() {
     app.component('SelectPopup', SelectPopup)
     app.component('RenderJobs', RenderJobs)
     app.component('RenderCompanys', RenderCompanys)
+    app.component('RenderJobsOutData', RenderJobsOutData) //渲染外部岗位数据列表
+    app.component('RenderCompanysOutData', RenderCompanysOutData) //渲染外部公司数据列表
+    app.component('renderDeliveryRecord', renderDeliveryRecord) //渲染岗位投递记录
+    app.component('renderJobCollectionRecord', renderJobCollectionRecord) //渲染岗位收藏记录
+    app.component('renderCompanyCollectionRecord', renderCompanyCollectionRecord) //渲染公司收藏记录
+    app.component('renderJobViewRecord', renderJobViewRecord) //渲染岗位浏览记录
     // app.component('tabbar-custom', Tabbar)
 
     for (const path in directives) {

packageA/pages/Intendedposition/Intendedposition.vue

@@ -1,12 +1,12 @@
 <template>
     <view class="collection-content">
-        <renderJobs
-            seeDate="applyTime"
+        <renderDeliveryRecord 
             v-if="pageState.list.length"
+            seeDate="applyTime"
             :list="pageState.list"
             :longitude="longitudeVal"
-            :latitude="latitudeVal"
-        ></renderJobs>
+            :latitude="latitudeVal">
+        </renderDeliveryRecord>
         <empty v-else pdTop="200"></empty>
     </view>
 </template>
@@ -41,9 +41,7 @@ onReachBottom(() => {
     getJobList();
 });
 
-function navToPost(jobId) {
-    navTo(`/packageA/pages/post/post?jobId=${btoa(jobId)}`);
-}
+
 
 function getJobList(type = 'add') {
     if (type === 'refresh') {

packageA/pages/UnitDetails/UnitDetails.vue

@@ -21,7 +21,7 @@
                     <image src="@/static/icon/companyIcon.png" mode=""></image>
                 </view>
                 <view class="companyinfo-right">
-                    <view class="row1">{{ companyInfo?.name }}</view>
+                    <view class="row1">{{ dataType === 2 ? companyInfo?.gsmc : companyInfo?.name }}</view>
                     <view class="row2">
                         <dict-tree-Label
                             v-if="companyInfo?.industry"
@@ -30,14 +30,13 @@
                         ></dict-tree-Label>
                         <span v-if="companyInfo?.industry">&nbsp;</span>
                         <dict-Label dictType="scale" :value="companyInfo?.scale"></dict-Label>
+                        <span v-if="dataType === 2">{{ companyInfo.gsxy }}</span>
                     </view>
                 </view>
             </view>
             <view class="conetent-info" :class="{ expanded: isExpanded }">
                 <view class="info-title">公司介绍</view>
-                <view class="info-desirption">{{ companyInfo.description }}</view>
-                <!-- <view class="info-title title2">公司地址</view>
-                <view class="locationCompany"></view> -->
+                <view class="info-desirption">{{ dataType === 2 ? companyInfo.qyxz : companyInfo.description }}</view>
             </view>
             <view class="expand" @click="expand">
                 <text>{{ isExpanded ? '收起' : '展开' }}</text>
@@ -50,8 +49,15 @@
             <scroll-view scroll-y class="Detailscroll-view" @scrolltolower="getJobsList('add')">
                 <view class="views">
                     <view class="Detail-title"><text class="title">在招职位</text></view>
+                    <!-- 根据 dataType 使用不同的职位列表组件 -->
+                    <renderJobsOutData
+                        v-if="dataType === 2 && pageState.list.length"
+                        :list="pageState.list"
+                        :longitude="longitudeVal"
+                        :latitude="latitudeVal"
+                    ></renderJobsOutData>
                     <renderJobs
-                        v-if="pageState.list.length"
+                        v-else-if="dataType !== 2 && pageState.list.length"
                         :list="pageState.list"
                         :longitude="longitudeVal"
                         :latitude="latitudeVal"
@@ -75,6 +81,7 @@ const { $api, navTo, vacanciesTo, navBack } = inject('globalFunction');
 
 const isExpanded = ref(false);
 const pageState = reactive({
+    current: 0,
     page: 0,
     list: [],
     total: 0,
@@ -82,35 +89,108 @@ const pageState = reactive({
     pageSize: 10,
 });
 const companyInfo = ref({});
+const pageOptions = ref({});
+const dataType = ref(1); // 1: 原数据, 2: 第三方数据
 
 onLoad((options) => {
     console.log(options);
-    getCompanyInfo(options.companyId || options.bussinessId);
+    dataType.value = options.dataType ? parseInt(options.dataType) : 1;
+    pageOptions.value = options;
+    
+    if (dataType.value === 2) {
+        // 第三方数据
+        getCompanyInfo(options.companyId, options.zphId);
+        getJobsList('refresh');
+    } else {
+        // 原数据
+        getCompanyInfo(options.companyId || options.bussinessId);
+    }
 });
 
 function companyCollection() {
-    const companyId = companyInfo.value.companyId;
-    if (companyInfo.value.isCollection) {
-        $api.createRequest(`/app/company/collection/${companyId}`, {}, 'DELETE').then((resData) => {
-            getCompanyInfo(companyId);
-            $api.msg('取消收藏成功');
+    if (dataType.value === 2) {
+        // 第三方数据收藏逻辑
+        const id = companyInfo.value.id;
+        const companyId = companyInfo.value.gsID;
+        const zphId = companyInfo.value.zphID;
+        if (companyInfo.value.isCollection) {
+            $api.createRequest(`/app/company/collection/${id}/2`, {}, 'DELETE').then((resData) => {
+                getCompanyInfo(companyId, zphId);
+                $api.msg('取消收藏成功');
+            });
+        } else {
+            $api.createRequest(`/app/company/collection/${id}/2`, {}, 'POST').then((resData) => {
+                getCompanyInfo(companyId, zphId);
+                $api.msg('收藏成功');
+            });
+        }
+    } else {
+        // 原数据收藏逻辑
+        const companyId = companyInfo.value.companyId;
+        if (companyInfo.value.isCollection) {
+            $api.createRequest(`/app/company/collection/${companyId}/1`, {}, 'DELETE').then((resData) => {
+                getCompanyInfo(companyId);
+                $api.msg('取消收藏成功');
+            });
+        } else {
+            $api.createRequest(`/app/company/collection/${companyId}/1`, {}, 'POST').then((resData) => {
+                getCompanyInfo(companyId);
+                $api.msg('收藏成功');
+            });
+        }
+    }
+}
+
+function getCompanyInfo(...args) {
+    if (dataType.value === 2) {
+        // 第三方数据接口
+        const [companyId, zphId] = args;
+        $api.createRequest(`/app/internal/companyThirdPart/${companyId}/${zphId}`).then((resData) => {
+            companyInfo.value = resData.data;
         });
     } else {
-        $api.createRequest(`/app/company/collection/${companyId}`, {}, 'POST').then((resData) => {
-            getCompanyInfo(companyId);
-            $api.msg('收藏成功');
+        // 原数据接口
+        const [companyId] = args;
+        $api.createRequest(`/app/company/${companyId}`).then((resData) => {
+            companyInfo.value = resData.data;
+            getJobsList();
         });
     }
 }
 
-function getCompanyInfo(id) {
-    $api.createRequest(`/app/company/${id}`).then((resData) => {
-        companyInfo.value = resData.data;
-        getJobsList();
+function getJobsList(type = 'add') {
+    if (dataType.value === 2) {
+        // 第三方数据职位列表
+        getThirdPartyJobsList(type);
+    } else {
+        // 原数据职位列表
+        getOriginalJobsList(type);
+    }
+}
+
+function getThirdPartyJobsList(type = 'add') {
+    const { companyId, companyName, zphId } = pageOptions.value;
+    
+    if (type === 'refresh') {
+        pageState.current = 1;
+        pageState.maxPage = 1;
+    }
+    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) => {
+        const { rows, total } = resData;
+        handleJobsListResponse(type, rows, total, 'current');
     });
 }
 
-function getJobsList(type = 'add') {
+function getOriginalJobsList(type = 'add') {
     if (type === 'refresh') {
         pageState.page = 1;
         pageState.maxPage = 1;
@@ -118,25 +198,31 @@ function getJobsList(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) => {
         const { rows, total } = resData;
-        if (type === 'add') {
-            const str = pageState.pageSize * (pageState.page - 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);
+        handleJobsListResponse(type, rows, total, 'page');
     });
 }
 
+function handleJobsListResponse(type, rows, total, pageKey) {
+    if (type === 'add') {
+        const str = pageState.pageSize * (pageState[pageKey] - 1);
+        const end = pageState.list.length;
+        const reslist = rows;
+        pageState.list.splice(str, end, ...reslist);
+    } else {
+        pageState.list = rows;
+    }
+    pageState.total = total;
+    pageState.maxPage = Math.ceil(pageState.total / pageState.pageSize);
+}
+
 function expand() {
     isExpanded.value = !isExpanded.value;
 }
@@ -174,7 +260,6 @@ image {
             margin-right: 24rpx
         }
         .companyinfo-right{
-
             .row1{
                 font-weight: 500;
                 font-size: 32rpx;
@@ -210,7 +295,7 @@ image {
         }
     }
     .expanded {
-        max-height: 1000rpx; // 足够显示完整内容
+        max-height: 1000rpx;
     }
     .expand{
         display: flex
@@ -285,7 +370,7 @@ image {
             }
             .card-companyName{
                 font-weight: 400;
-                font-size: 28rpx;
+                    font-size: 28rpx;
                 color: #6C7282;
             }
             .card-tags{
@@ -317,4 +402,4 @@ image {
         }
     }
 }
-</style>
+</style>

packageA/pages/browseJob/browseJob.vue

@@ -25,12 +25,12 @@
             <scroll-view scroll-y class="main-scroll" @scrolltolower="getJobList('add')">
                 <view class="one-cards">
                     <view class="mian">
-                        <renderJobs
+                        <renderJobViewRecord
                             :list="pageState.list"
                             v-if="pageState.list.length"
                             :longitude="longitudeVal"
                             :latitude="latitudeVal"
-                        ></renderJobs>
+                        ></renderJobViewRecord>
                         <empty v-else pdTop="200"></empty>
                         <!-- <loadmore ref="loadmoreRef"></loadmore> -->
                     </view>
@@ -88,9 +88,7 @@ function toSelectDate() {
     });
 }
 
-function navToPost(jobId) {
-    navTo(`/packageA/pages/post/post?jobId=${btoa(jobId)}`);
-}
+
 
 function searchCollection(e) {
     const value = e.detail.value;

packageA/pages/collection/collection.vue

@@ -15,12 +15,12 @@
                     <swiper-item class="list">
                         <scroll-view scroll-y class="main-scroll" @scrolltolower="handleScrollToLower">
                             <view class="mian">
-                                <renderJobs
-                                    :list="pageState.list"
+                                 <renderJobCollectionRecord 
                                     v-if="pageState.list.length"
+                                    :list="pageState.list"
                                     :longitude="longitudeVal"
-                                    :latitude="latitudeVal"
-                                ></renderJobs>
+                                    :latitude="latitudeVal">
+                                    </renderJobCollectionRecord>
                                 <empty v-else pdTop="200"></empty>
                             </view>
                         </scroll-view>
@@ -28,12 +28,12 @@
                     <swiper-item class="list">
                         <scroll-view scroll-y class="main-scroll" @scrolltolower="handleScrollToLowerCompany">
                             <view class="mian">
-                                <renderCompanys
+                                <renderCompanyCollectionRecord
                                     :list="pageCompanyState.list"
                                     v-if="pageCompanyState.list.length"
                                     :longitude="longitudeVal"
                                     :latitude="latitudeVal"
-                                ></renderCompanys>
+                                ></renderCompanyCollectionRecord>
                                 <empty v-else pdTop="200"></empty>
                             </view>
                         </scroll-view>

packageA/pages/exhibitors/exhibitors.vue

@@ -11,15 +11,15 @@
                     <image src="@/static/icon/companyIcon.png" mode=""></image>
                 </view>
                 <view class="companyinfo-right">
-                    <view class="row1 line_2">{{ fairInfo?.name }}</view>
+                    <view class="row1 line_2">{{ fairInfo?.zphmc }}</view>
                     <view class="row2">
-                        <text>{{ fairInfo.location }}</text>
-                        <convert-distance
+                        <text>{{ fairInfo.jbf }}</text>
+                        <!-- <convert-distance
                             :alat="fairInfo.latitude"
                             :along="fairInfo.longitude"
                             :blat="latitudeVal"
                             :blong="longitudeVal"
-                        ></convert-distance>
+                        ></convert-distance> -->
                     </view>
                 </view>
             </view>
@@ -27,36 +27,36 @@
                 <image class="location-img" src="/static/icon/mapLine.png"></image>
                 <view class="location-info">
                     <view class="info">
-                        <text class="info-title">{{ fairInfo.address }}</text>
-                        <text class="info-text">位置</text>
+                        <text class="info-title">{{ fairInfo.zphdz }}</text>
+                        <!-- <text class="info-text">位置</text> -->
                     </view>
                 </view>
             </view>
             <view class="conetent-info" :class="{ expanded: isExpanded }">
                 <view class="info-title">内容描述</view>
-                <view class="info-desirption">{{ fairInfo.description }}</view>
+                <view class="info-desirption">{{ fairInfo.zphjj }}</view>
                 <!-- <view class="info-title title2">公司地址</view>
                 <view class="locationCompany"></view> -->
                 <view class="company-times">
                     <view class="info-title">内容描述</view>
                     <view class="card-times">
                         <view class="time-left">
-                            <view class="left-date">{{ parseDateTime(fairInfo.startTime).time }}</view>
-                            <view class="left-dateDay">{{ parseDateTime(fairInfo.startTime).date }}</view>
+                            <view class="left-date">{{ parseDateTime(fairInfo.zphjbsj).time }}</view>
+                            <view class="left-dateDay">{{ parseDateTime(fairInfo.zphjbsj).date }}</view>
                         </view>
                         <view class="line"></view>
                         <view class="time-center">
                             <view class="center-date">
-                                {{ getTimeStatus(fairInfo.startTime, fairInfo.endTime).statusText }}
+                                {{ getTimeStatus(fairInfo.zphjbsj, fairInfo.zphjzsj).statusText }}
                             </view>
                             <view class="center-dateDay">
-                                {{ getHoursBetween(fairInfo.startTime, fairInfo.endTime) }}小时
+                                {{ getHoursBetween(fairInfo.zphjbsj, fairInfo.zphjzsj) }}小时
                             </view>
                         </view>
                         <view class="line"></view>
                         <view class="time-right">
-                            <view class="left-date">{{ parseDateTime(fairInfo.endTime).time }}</view>
-                            <view class="left-dateDay">{{ parseDateTime(fairInfo.endTime).date }}</view>
+                            <view class="left-date">{{ parseDateTime(fairInfo.zphjzsj).time }}</view>
+                            <view class="left-dateDay">{{ parseDateTime(fairInfo.zphjzsj).date }}</view>
                         </view>
                     </view>
                 </view>
@@ -69,17 +69,18 @@
                     src="@/static/icon/downs.png"
                 ></image>
             </view>
-            <scroll-view scroll-y class="Detailscroll-view">
+            <scroll-view scroll-y class="Detailscroll-view" @scrolltolower="getCompanyList('add')">
                 <view class="views">
                     <view class="Detail-title">
-                        <text class="title">参会单位（{{ companyList.length }}）</text>
+                        <text class="title">参会单位（{{ pageState.total }}）</text>
                     </view>
-                    <renderCompanys
-                        v-if="companyList.length"
-                        :list="companyList"
+                    <renderCompanysOutData
+                        v-if="pageState.list.length"
+                        :zphId="zphId"
+                        :list="pageState.list"
                         :longitude="longitudeVal"
                         :latitude="latitudeVal"
-                    ></renderCompanys>
+                    ></renderCompanysOutData>
                     <empty v-else pdTop="200"></empty>
                 </view>
             </scroll-view>
@@ -110,28 +111,69 @@ const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
 
 const isExpanded = ref(false);
 const fairInfo = ref({});
-const companyList = ref([]);
+
+const pageState = reactive({
+    current: 0,
+    list: [],
+    total: 0,
+    maxPage: 1,
+    pageSize: 10,
+});
 const hasnext = ref(true);
+
+const zphId = ref('');
+const pageOptions = ref({})
+
 onLoad((options) => {
-    getCompanyInfo(options.jobFairId);
+    zphId.value = options.jobFairId
+    pageOptions.value = options
+    getJobFairInfo(options.jobFairId, options.jobFairName);
+    getCompanyList('refresh');
 });
 
-function getCompanyInfo(id) {
-    $api.createRequest(`/app/fair/${id}`).then((resData) => {
+function getJobFairInfo(id,name) {
+    $api.createRequest(`/app/internal/jobFairThirdPart/${id}`).then((resData) => {
         fairInfo.value = resData.data;
-        companyList.value = resData.data.companyList;
         hasAppointment();
     });
 }
+function getCompanyList(type='add') {
+    const { jobFairId,jobFairName} = pageOptions.value
+    if (type === 'refresh') {
+        pageState.current = 1;
+        pageState.maxPage = 1;
+    }
+    if (type === 'add' && pageState.current < pageState.maxPage) {
+        pageState.current += 1;
+    }
+    let params = {
+        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);
+    });
+}
 
 const hasAppointment = () => {
     const isTimePassed = (timeStr) => {
+        if(!timeStr) return false
         const targetTime = new Date(timeStr.replace(/-/g, '/')).getTime(); // 兼容格式
         const now = Date.now();
         return now < targetTime;
     };
 
-    hasnext.value = isTimePassed(fairInfo.value.startTime);
+    hasnext.value = isTimePassed(fairInfo.value.zphjbsj);
 };
 
 function openMap(lat, lng, name = '位置') {
@@ -149,16 +191,16 @@ function expand() {
 
 // 取消/收藏岗位
 function applyExhibitors() {
-    const fairId = fairInfo.value.jobFairId;
+    const fairId = fairInfo.value.zphID;
     if (fairInfo.value.isCollection) {
-        // $api.createRequest(`/app/fair/collection/${fairId}`, {}, 'DELETE').then((resData) => {
-        //     getCompanyInfo(fairId);
-        //     $api.msg('取消预约成功');
-        // });
+        $api.createRequest(`/app/fair/collection/${fairId}`, {}, 'DELETE').then((resData) => {
+            getJobFairInfo(fairId);
+            $api.msg('取消预约成功');
+        });
         $api.msg('已预约成功');
     } else {
         $api.createRequest(`/app/fair/collection/${fairId}`, {}, 'POST').then((resData) => {
-            getCompanyInfo(fairId);
+            getJobFairInfo(fairId);
             $api.msg('预约成功');
         });
     }

packageA/pages/myResume/myResume.vue

@@ -5,33 +5,65 @@
         <image src="@/static/icon/back-white.png" @click="navBack"></image>
       </view>
     </template>
+    <view v-if="userInfo.resumeOcrStatus && showNotice" class="notice-line" :class="userInfo.resumeOcrStatus?.includes('成功')?'green':'blue'">
+      <image v-if="userInfo.resumeOcrStatus?.includes('成功')" class="icon" src="@/static/icon/notice-green.png" />
+      <image v-else class="icon" src="@/static/icon/notice-blue.png" />
+      <view class="text">{{userInfo.resumeOcrStatus}}</view>
+      <image @click="closeNotice" v-if="userInfo.resumeOcrStatus?.includes('成功')" class="close" src="@/static/icon/close-green.png" />
+      <image @click="closeNotice" v-else class="close" src="@/static/icon/close-blue.png" />
+    </view>
     <view class="mys-container">
       <!-- 个人信息 -->
-      <view class="card-top" style="margin-top: 12rpx; padding: 0; background: none">
+      <view
+        class="card-top"
+        style="margin-top: 12rpx; padding: 0; background: none"
+      >
         <view class="mys-tops btn-feel">
           <view class="tops-left">
             <view class="name">
               <text>{{ userInfo.name || "编辑用户名" }}</text>
               <view class="edit-icon mar_le10">
-                <image class="button-click" src="@/static/icon/edit1.png" @click="navTo('/packageA/pages/personalInfo/personalInfo')"></image>
+                <image
+                  class="button-click"
+                  src="@/static/icon/edit1.png"
+                  @click="navTo('/packageA/pages/personalInfo/personalInfo')"
+                ></image>
               </view>
             </view>
             <view class="subName">
-              <dict-Label class="mar_ri10" dictType="sex" :value="userInfo.sex"></dict-Label>
+              <dict-Label
+                class="mar_ri10"
+                dictType="sex"
+                :value="userInfo.sex"
+              ></dict-Label>
               <text class="mar_ri10">{{ userInfo.age }}岁</text>
-              <dict-Label class="mar_ri10" dictType="education" :value="userInfo.education"></dict-Label>
-              <dict-Label class="mar_ri10" dictType="affiliation" :value="userInfo.politicalAffiliation"></dict-Label>
+              <dict-Label
+                class="mar_ri10"
+                dictType="education"
+                :value="userInfo.education"
+              ></dict-Label>
+              <dict-Label
+                class="mar_ri10"
+                dictType="affiliation"
+                :value="userInfo.politicalAffiliation"
+              ></dict-Label>
             </view>
             <view class="subName">{{ userInfo.phone }}</view>
           </view>
           <view class="tops-right">
             <view class="right-imghead">
               <image v-if="userInfo.avatar" :src="userInfo.avatar"></image>
-              <image v-else-if="userInfo.sex == '0'" src="@/static/icon/boy.png"></image>
+              <image
+                v-else-if="userInfo.sex == '0'"
+                src="@/static/icon/boy.png"
+              ></image>
               <image v-else src="@/static/icon/girl.png"></image>
             </view>
             <view class="right-sex">
-              <image v-if="userInfo.sex === '0'" src="@/static/icon/boy1.png"></image>
+              <image
+                v-if="userInfo.sex === '0'"
+                src="@/static/icon/boy1.png"
+              ></image>
               <image v-else src="@/static/icon/girl1.png"></image>
             </view>
           </view>
@@ -43,19 +75,34 @@
         <view class="mys-info btn-feel">
           <view class="mys-h4">
             <view>求职期望</view>
-            <image class="icon" src="@/static/icon/edit1.png" @click="navTo('/packageA/pages/jobExpect/jobExpect')"></image>
+            <image
+              class="icon"
+              src="@/static/icon/edit1.png"
+              @click="navTo('/packageA/pages/jobExpect/jobExpect')"
+            ></image>
           </view>
           <view class="mys-text">
             <text>期望薪资：</text>
-            <text>{{ userInfo.salaryMin / 1000 }}k-{{ userInfo.salaryMax / 1000 }}k</text>
+            <text
+              >{{ userInfo.salaryMin / 1000 }}k-{{
+                userInfo.salaryMax / 1000
+              }}k</text
+            >
           </view>
           <view class="mys-text">
             <text>期望工作地：</text>
             <text>青岛市-</text>
-            <dict-Label dictType="area" :value="Number(userInfo.area)"></dict-Label>
+            <dict-Label
+              dictType="area"
+              :value="Number(userInfo.area)"
+            ></dict-Label>
           </view>
           <view class="mys-list">
-            <view class="cards button-click" v-for="(title, index) in userInfo.jobTitle" :key="index">
+            <view
+              class="cards button-click"
+              v-for="(title, index) in userInfo.jobTitle"
+              :key="index"
+            >
               {{ title }}
             </view>
           </view>
@@ -65,19 +112,35 @@
         <view class="mys-info" style="padding: 0">
           <view class="mys-h4 btn-feel">
             <text>工作经历</text>
-            <view class="mys-edit-icon btn-feel" @click="navTo('/packageA/pages/workExp/workExp')">
-              <image class="icon button-click btn-feel" src="@/static/icon/plus.png"></image>
+            <view
+              class="mys-edit-icon btn-feel"
+              @click="navTo('/packageA/pages/workExp/workExp')"
+            >
+              <image
+                class="icon button-click btn-feel"
+                src="@/static/icon/plus.png"
+              ></image>
               <view class="txt">添加</view>
             </view>
           </view>
-          <view class="exp-item btn-feel" v-for="item in userInfo.workExp" :key="item.id">
+          <view
+            class="exp-item btn-feel"
+            v-for="item in userInfo.workExp"
+            :key="item.id"
+          >
             <view class="fl_box fl_justbet mar_top15">
               <view class="fs_16">{{ item.company }}</view>
-              <image class="icon btn-feel" src="@/static/icon/edit1.png" @click="navTo(`/packageA/pages/workExp/workExp?id=${item.id}`)"></image>
+              <image
+                class="icon btn-feel"
+                src="@/static/icon/edit1.png"
+                @click="navTo(`/packageA/pages/workExp/workExp?id=${item.id}`)"
+              ></image>
             </view>
             <view class="mys-text fl_box fl_justbet">
               <text class="color_333333 fs_14">{{ item.position }}</text>
-              <text class="datetext">{{ item.startTime }}--{{ item.endTime || "至今" }}</text>
+              <text class="datetext"
+                >{{ item.startTime }}--{{ item.endTime || "至今" }}</text
+              >
             </view>
             <view class="mys-text">
               <text>{{ item.duty }}</text>
@@ -88,7 +151,9 @@
     </view>
     <template #footer>
       <view class="footer-container">
-        <view class="footer-button btn-feel">上传简历</view>
+        <view class="footer-button btn-feel" @click="chooseResume"
+          >上传简历</view
+        >
       </view>
     </template>
   </AppLayout>
@@ -104,6 +169,74 @@ import useDictStore from "@/stores/useDictStore";
 const { userInfo } = storeToRefs(useUserStore());
 const { getUserResume } = useUserStore();
 const { getDictData, oneDictData } = useDictStore();
+import config from "@/config.js";
+
+const showNotice = ref(true)
+onLoad(() => {
+  getUserResume();
+});
+
+function closeNotice() {
+  showNotice.value=false
+}
+
+function chooseResume() {
+  uni.chooseImage({
+    sizeType: ["original", "compressed"],
+    sourceType: ["album", "camera"],
+    count: 1,
+    success: ({ tempFilePaths, tempFiles }) => {
+      uploadResume(tempFilePaths[0], true)
+        .then((res) => {
+          res = JSON.parse(res);
+          getUserResume();
+          $api.msg("上传成功");
+        })
+        .catch((err) => {
+          $api.msg("上传失败");
+        });
+    },
+    fail: (error) => {},
+  });
+}
+
+function uploadResume(tempFilePath, loading) {
+  if (loading) {
+    uni.showLoading({
+      title: "请稍后",
+      mask: true,
+    });
+  }
+  let Authorization = "";
+  if (useUserStore().token) {
+    Authorization = `${useUserStore().token}`;
+  }
+  const header = {};
+  header["Authorization"] = encodeURIComponent(Authorization);
+  return new Promise((resolve, reject) => {
+    uni.uploadFile({
+      url: config.baseUrl + "/app/oss/uploadToObs",
+      filePath: tempFilePath,
+      name: "file",
+      header,
+      success: (uploadFileRes) => {
+        if (uploadFileRes.statusCode === 200) {
+          resolve(uploadFileRes.data);
+        } else {
+          reject();
+        }
+      },
+      fail: (err) => {
+        reject(err);
+      },
+      complete: () => {
+        if (loading) {
+          uni.hideLoading();
+        }
+      },
+    });
+  });
+}
 </script>
 
 <style lang="stylus" scoped>
@@ -133,6 +266,36 @@ const { getDictData, oneDictData } = useDictStore();
         text-align: center;
     }
 }
+
+.notice-line
+  width 100%;
+  height:60rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  box-sizing: border-box;
+  padding:0 30rpx
+  margin-bottom: 20rpx
+  .icon
+    width:35rpx;
+    height:35rpx;
+  .text
+    flex: 1;
+    overflow hidden
+    padding:0 25rpx
+  .close
+    width:25rpx;
+    height:25rpx;
+  
+.notice-line.blue{
+  background: #E8F1FF
+  color: #1677ff
+}
+.notice-line.green{
+  background: #D4FFF1
+  color: #38bb8f
+}
+
 image{
     width: 100%;
     height: 100%

packageA/pages/post/component/radarMap.vue

@@ -28,9 +28,12 @@ watch(
     () => props.value,
     (newVal) => {
         if (newVal && Object.keys(newVal).length > 0) {
-            const { skill, experience, education, salary, age, location } = newVal.radarChart;
-            const labels = ['学历', '年龄', '工作地', '技能', '工作经验', '期望薪资'];
-            const data = [education, age, location, skill, experience, salary].map((item) => item * 0.05);
+            // const { skill, experience, education, salary, age, location } = newVal.radarChart;
+            const { experience, education, salary, age, location } = newVal.radarChart;
+            // const labels = ['学历', '年龄', '工作地', '技能', '工作经验', '期望薪资'];
+            const labels = ['学历', '年龄', '工作地',  '工作经验', '期望薪资'];
+            // const data = [education, age, location, skill, experience, salary].map((item) => item * 0.05);
+            const data = [education, age, location,  experience, salary].map((item) => item * 0.05);
             rawRadarChart(labels, data);
         }
     },
@@ -43,10 +46,8 @@ function rawRadarChart(labels, data) {
     const height = 80;
     const centerX = 150;
     const centerY = 125;
-    // const data = [2, 3.5, 5, 3.5, 5, 3.5]; // 示例数据
-    // const labels = ['火烧', '泡水', '事故', '外观', '部件', '火烧'];
     const colors = ['#F5F5F5', '#F5F5F5', '#F5F5F5', '#F5F5F5', '#F5F5F5'];
-    const maxScore = 5; // 数据最大值
+    const maxScore = 5;
 
     const angleStep = (2 * Math.PI) / labels.length;
 
@@ -62,9 +63,8 @@ function rawRadarChart(labels, data) {
     ctx.fill();
 
     //多边形圈
-    // 多边形圈
     for (let i = 5; i > 0; i--) {
-        ctx.setStrokeStyle(colors[i - 1]); // 设置边框颜色
+        ctx.setStrokeStyle(colors[i - 1]);
         ctx.beginPath();
         labels.forEach((label, index) => {
             const x = centerX + (width / 5) * i * Math.cos(angleStep * index - Math.PI / 2);
@@ -76,19 +76,20 @@ function rawRadarChart(labels, data) {
             }
         });
         ctx.closePath();
-        ctx.stroke(); // 只描边，不填充
+        ctx.stroke();
     }
 
-    // //竖线
+    //竖线
     labels.forEach((label, index) => {
         ctx.setStrokeStyle('#F5F5F5');
         ctx.setFillStyle('#F5F5F5');
         ctx.beginPath();
 
-        const x1 = centerX + width * 0.6 * Math.sin(angleStep * index);
-        const y1 = centerY + height * 0.6 * Math.cos(angleStep * index);
-        const x = centerX + width * Math.sin(angleStep * index);
-        const y = centerY + height * Math.cos(angleStep * index);
+        // 修改坐标计算，使用与多边形圈相同的角度计算方式
+        const x1 = centerX + width * 0.6 * Math.cos(angleStep * index - Math.PI / 2);
+        const y1 = centerY + height * 0.6 * Math.sin(angleStep * index - Math.PI / 2);
+        const x = centerX + width * Math.cos(angleStep * index - Math.PI / 2);
+        const y = centerY + height * Math.sin(angleStep * index - Math.PI / 2);
 
         ctx.moveTo(x1, y1);
         ctx.lineTo(x, y);
@@ -102,11 +103,11 @@ function rawRadarChart(labels, data) {
     ctx.setFillStyle('rgba(37,107,250, 0.24)');
     ctx.setLineWidth(2);
     ctx.beginPath();
-    const pointList = []; // 记录每个点的位置，等会画小圆点
+    const pointList = [];
     data.forEach((score, index) => {
         const x = centerX + width * (score / maxScore) * Math.cos(angleStep * index - Math.PI / 2);
         const y = centerY + height * (score / maxScore) * Math.sin(angleStep * index - Math.PI / 2);
-        pointList.push({ x, y }); // 保存位置
+        pointList.push({ x, y });
         if (index === 0) {
             ctx.moveTo(x, y);
         } else {
@@ -118,15 +119,16 @@ function rawRadarChart(labels, data) {
     ctx.stroke();
 
     // 绘制每个小圆点
-    ctx.setFillStyle('#256BFA'); // 小圆点颜色（你可以改）
+    ctx.setFillStyle('#256BFA');
     pointList.forEach((point) => {
         ctx.beginPath();
-        ctx.arc(point.x, point.y, 4, 0, 2 * Math.PI); // 半径 4，可以自己调大小
+        ctx.arc(point.x, point.y, 4, 0, 2 * Math.PI);
         ctx.fill();
     });
 
-    // 绘制标签
+    // 绘制标签 
     ctx.setTextAlign('center');
+    ctx.setTextBaseline('middle');
 
     labels.forEach((label, index) => {
         const x = centerX + (width + 30) * Math.cos(angleStep * index - Math.PI / 2);
@@ -137,30 +139,9 @@ function rawRadarChart(labels, data) {
         ctx.setFontSize(12);
         ctx.font = 'bold 12px sans-serif';
         ctx.fillText(label, x, y);
-
-        // ctx.setFillStyle('#A2A4A2');
-        // ctx.font = '12px sans-serif';
-        // ctx.setFontSize(12);
-        // ctx.fillText(data[index], x, y + 16);
     });
 
     ctx.draw();
-
-    //转图片
-
-    // uni.canvasToTempFilePath({
-    //     x: 0,
-    //     y: 0,
-    //     width: 320,
-    //     height: 320,
-    //     destWidth: 840,
-    //     destHeight: 840,
-    //     canvasId: 'radarCanvas',
-    //     success: (res) => {
-    //         // 在H5平台下，tempFilePath 为 base64
-    //         src = res.tempFilePath;
-    //     },
-    // });
 }
 </script>
 

packageA/pages/post/post.vue

@@ -6,39 +6,59 @@
             </view>
         </template>
         <template #headerright>
-            <!-- <view class="btnshare">
-                <image src="@/static/icon/share.png" @click="shareJob"></image>
-            </view> -->
             <view class="btn mar_ri10">
                 <image src="@/static/icon/collect3.png" v-if="!jobInfo.isCollection" @click="jobCollection"></image>
                 <image src="@/static/icon/collect2.png" v-else @click="jobCollection"></image>
             </view>
         </template>
+        
+        <!-- 根据 dataType 显示不同内容 -->
         <view class="content" v-show="!isEmptyObject(jobInfo)">
+            <!-- 顶部信息区域 -->
             <view class="content-top btn-feel">
-                <view class="top-salary">
+                <view class="top-salary" v-if="jobInfo.maxSalary">
                     <Salary-Expectation
                         :max-salary="jobInfo.maxSalary"
                         :min-salary="jobInfo.minSalary"
                         :is-month="true"
                     ></Salary-Expectation>
                 </view>
-                <view class="top-name">{{ jobInfo.jobTitle }}</view>
+                <view class="top-salary"  v-else>
+                    <Salary-Expectation
+                        :max-salary="jobInfo.maxSalary"
+                        :min-salary="jobInfo.minSalary"
+                        :is-month="true"
+                    ></Salary-Expectation>
+                </view>
+                <view class="top-name">{{ dataType === 2 ? jobInfo.gwmc : jobInfo.jobTitle }}</view>
                 <view class="top-info">
                     <view class="info-img"><image src="/static/icon/post12.png"></image></view>
-                    <view class="info-text">
+                    <!-- 第三方数据展示 -->
+                    <view class="info-text" v-if="dataType === 2">
+                        {{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">
+                    <!-- 第三方数据展示 -->
+                    <view class="info-text" v-if="dataType === 2">
+                        {{jobInfo.gwgzjy == '不限' ? '经验不限' : jobInfo.gwgzjy}}
+                    </view>
+                    <!-- 原数据展示 -->
+                    <view class="info-text" v-else>
                         <dict-Label dictType="education" :value="jobInfo.education"></dict-Label>
                     </view>
                 </view>
                 <view class="position-source">
                     <text>来源&nbsp;</text>
-                    {{ jobInfo.dataSource }}
+                    {{ dataType === 2 ? '青岛人才网' : jobInfo.dataSource }}
                 </view>
             </view>
+
+            <!-- AI讲解区域 -->
             <view class="ai-explain" v-if="jobInfo.isExplain">
                 <view class="exbg">
                     <view class="explain-left btn-shaky">
@@ -48,20 +68,24 @@
                     <view class="explain-right button-click" @click="seeExplain">点击查看</view>
                 </view>
             </view>
+
+            <!-- 职位描述区域 -->
             <view class="content-card">
                 <view class="card-title">
                     <text class="title">职位描述</text>
                 </view>
                 <view class="description" :style="{ whiteSpace: 'pre-wrap' }">
-                    {{ jobInfo.description }}
+                    {{ dataType === 2 ? jobInfo.gwms : jobInfo.description }}
                 </view>
             </view>
+
+            <!-- 公司信息区域 -->
             <view class="content-card">
                 <view class="card-title">
                     <text class="title">公司信息</text>
                     <text
                         class="btntext button-click"
-                        @click="navTo(`/packageA/pages/UnitDetails/UnitDetails?companyId=${jobInfo.company.companyId}`)"
+                        @click="handleCompanyDetail"
                     >
                         单位详情
                     </text>
@@ -71,15 +95,20 @@
                         <image src="@/static/icon/companyIcon.png" mode=""></image>
                     </view>
                     <view class="companyinfo-right">
-                        <view class="row1">{{ jobInfo.company?.name }}</view>
+                        <view class="row1">{{ dataType === 2 ? jobInfo.gsmc : jobInfo.company?.name }}</view>
                         <view class="row2">
                             <dict-tree-Label
-                                v-if="jobInfo.company?.industry"
+                                v-if="dataType !== 2 && jobInfo.company?.industry"
                                 dictType="industry"
                                 :value="jobInfo.company?.industry"
                             ></dict-tree-Label>
-                            <span v-if="jobInfo.company?.industry">&nbsp;</span>
-                            <dict-Label dictType="scale" :value="jobInfo.company?.scale"></dict-Label>
+                            <span v-if="dataType !== 2 && jobInfo.company?.industry">&nbsp;</span>
+                            <dict-Label 
+                                v-if="dataType !== 2" 
+                                dictType="scale" 
+                                :value="jobInfo.company?.scale"
+                            ></dict-Label>
+                            <span v-if="dataType === 2">{{jobInfo.qyxz}}</span>
                         </view>
                         <view class="row2">
                             <text>在招</text>
@@ -97,14 +126,16 @@
                     ></map>
                 </view>
             </view>
-            <view class="content-card">
+
+            <!-- 竞争力分析区域 -->
+            <view class="content-card" v-if="dataType !== 2">
                 <view class="card-title">
                     <text class="title">竞争力分析</text>
                 </view>
                 <view class="description">
-                    三个月内共15位求职者申请，你的简历匹配度为{{ raderData.matchScore }}分，排名位于第{{
-                        raderData.rank
-                    }}位，超过{{ raderData.percentile }}%的竞争者，处在优秀位置。
+                    三个月内共{{ raderData.totalApplicants }}位求职者申请，你的简历匹配度为{{
+                        raderData.matchScore
+                    }}分，排名位于第{{ raderData.rank }}位，超过{{ raderData.percentile }}%的竞争者，处在优秀位置。
                 </view>
                 <RadarMap :value="raderData"></RadarMap>
 
@@ -125,11 +156,15 @@
                     </view>
                 </view>
             </view>
+            
             <view style="height: 24px"></view>
         </view>
+
         <template #footer>
             <view class="footer">
-                <view class="btn-wq button-click" @click="jobApply">立即前往</view>
+                <view class="btn-wq button-click" @click="jobApply">
+                    {{ dataType === 2 ? '立即投递' : '立即前往' }}
+                </view>
             </view>
         </template>
         <VideoPlayer ref="videoPalyerRef" />
@@ -143,8 +178,10 @@ import { reactive, inject, watch, ref, onMounted, computed } from 'vue';
 import { onLoad, onShow, onHide } from '@dcloudio/uni-app';
 import dictLabel from '@/components/dict-Label/dict-Label.vue';
 import RadarMap from './component/radarMap.vue';
+
 const { $api, navTo, getLenPx, parseQueryParams, navBack, isEmptyObject } = inject('globalFunction');
 import config from '@/config.js';
+
 const matchingDegree = ref(['一般', '良好', '优秀', '极好']);
 const currentStep = ref(1);
 const companyCount = ref(0);
@@ -155,9 +192,11 @@ const jobIdRef = ref();
 const raderData = ref({});
 const videoPalyerRef = ref(null);
 const explainUrlRef = ref('');
+const dataType = ref(1); // 1: 原数据, 2: 第三方数据
 
 onLoad((option) => {
     if (option.jobId) {
+        dataType.value = option.dataType ? parseInt(option.dataType) : 1;
         initLoad(option);
     }
 });
@@ -165,6 +204,7 @@ onLoad((option) => {
 onShow(() => {
     const option = parseQueryParams(); // 兼容微信内置浏览器
     if (option.jobId) {
+        dataType.value = option.dataType ? parseInt(option.dataType) : 1;
         initLoad(option);
     }
 });
@@ -180,91 +220,165 @@ function initLoad(option) {
 function seeExplain() {
     if (jobInfo.value.explainUrl) {
         videoPalyerRef.value?.open(jobInfo.value.explainUrl);
-        // console.log(jobInfo.value.explainUrl);
-        // explainUrlRef.value = jobInfo.value.explainUrl;
     }
 }
 
 function getDetail(jobId) {
-    return new Promise((reslove, reject) => {
+    if (dataType.value === 2) {
+        // 第三方数据接口
+        return new Promise((reslove, reject) => {
+            $api.createRequest(`/app/internal/jobThirdPart/${jobId}`).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);
+                }
+            });
+        });
+    } else {
+        // 原数据接口
         $api.createRequest(`/app/job/${jobId}`).then((resData) => {
             const { latitude, longitude, companyName, companyId } = resData.data;
             jobInfo.value = resData.data;
-            reslove(resData.data);
             getCompanyIsAJobs(companyId);
             getCompetivetuveness(jobId);
+            
             if (latitude && longitude) {
-                mapCovers.value = [
-                    {
-                        latitude: latitude,
-                        longitude: longitude,
-                        iconPath: point,
-                        label: {
-                            content: companyName,
-                            textAlign: 'center',
-                            padding: 3,
-                            fontSize: 12,
-                            bgColor: '#FFFFFF',
-                            anchorX: getTextWidth(companyName), // X 轴调整，负数向左
-                            borderRadius: 5,
-                        },
-                        width: 34,
-                    },
-                ];
+                initMapCovers(latitude, longitude, companyName);
             }
         });
-    });
+    }
 }
 
-function getCompanyIsAJobs(companyId) {
-    $api.createRequest(`/app/company/count/${companyId}`).then((resData) => {
-        companyCount.value = resData.data;
-    });
+function initMapCovers(latitude, longitude, companyName) {
+    mapCovers.value = [
+        {
+            latitude: latitude,
+            longitude: longitude,
+            iconPath: point,
+            label: {
+                content: companyName,
+                textAlign: 'center',
+                padding: 3,
+                fontSize: 12,
+                bgColor: '#FFFFFF',
+                anchorX: getTextWidth(companyName),
+                borderRadius: 5,
+            },
+            width: 34,
+        },
+    ];
+}
+
+function getCompanyIsAJobs(...args) {
+    if (dataType.value === 2) {
+        // 第三方数据获取公司职位数量
+        const [gsID, gsmc, zphID] = args;
+        $api.createRequest(`/app/internal/jobThirdPart?gsID=${gsID}&gsmc=${gsmc}&zphID=${zphID}`).then((resData) => {
+            companyCount.value = resData.total;
+        });
+    } else {
+        // 原数据获取公司职位数量
+        const [companyId] = args;
+        $api.createRequest(`/app/company/count/${companyId}`).then((resData) => {
+            companyCount.value = resData.data;
+        });
+    }
 }
 
 function getTextWidth(text, size = 12) {
     const canvas = document.createElement('canvas');
     const context = canvas.getContext('2d');
     context.font = `${12}px Arial`;
-    return -(context.measureText(text).width / 2) - 20; // 计算文字中心点
+    return -(context.measureText(text).width / 2) - 20;
 }
 
 function getCompetivetuveness(jobId) {
-    $api.createRequest(`/app/job/competitiveness/${jobId}`, {}, 'GET').then((resData) => {
-        raderData.value = resData.data;
-        currentStep.value = resData.data.matchScore * 0.04;
-    });
+    if (dataType.value !== 2) {
+        $api.createRequest(`/app/job/competitiveness/${jobId}`, {}, 'GET').then((resData) => {
+            raderData.value = resData.data;
+            currentStep.value = resData.data.matchScore * 0.04;
+        });
+    }
 }
 
 // 申请岗位
 function jobApply() {
-    const jobId = jobInfo.value.jobId;
-    if (jobInfo.value.isApply) {
-        const jobUrl = jobInfo.value.jobUrl;
-        return window.open(jobUrl);
-    } else {
-        $api.createRequest(`/app/job/apply/${jobId}`, {}, 'GET').then((resData) => {
-            getDetail(jobId);
-            $api.msg('申请成功');
+    if (dataType.value === 2) {
+        $api.msg('敬请期待');
+        return
+        // 第三方数据申请逻辑
+        const jobId = jobInfo.value.id;
+        if (jobInfo.value.isApply) {
             const jobUrl = jobInfo.value.jobUrl;
             return window.open(jobUrl);
-        });
+        } else {
+            $api.createRequest(`/app/job/apply/${jobId}`, {}, 'GET').then((resData) => {
+                getDetail(jobIdRef.value);
+                $api.msg('投递成功');
+                const jobUrl = jobInfo.value.jobUrl;
+                return window.open(jobUrl);
+            });
+        }
+    } else {
+        // 原数据申请逻辑
+        const jobId = jobInfo.value.jobId;
+        if (jobInfo.value.isApply) {
+            const jobUrl = jobInfo.value.jobUrl;
+            return window.open(jobUrl);
+        } else {
+            $api.createRequest(`/app/job/apply/${jobId}`, {}, 'GET').then((resData) => {
+                getDetail(jobId);
+                $api.msg('申请成功');
+                const jobUrl = jobInfo.value.jobUrl;
+                return window.open(jobUrl);
+            });
+        }
     }
 }
 
 // 取消/收藏岗位
 function jobCollection() {
-    const jobId = jobInfo.value.jobId;
-    if (jobInfo.value.isCollection) {
-        $api.createRequest(`/app/job/collection/${jobId}`, {}, 'DELETE').then((resData) => {
-            getDetail(jobId);
-            $api.msg('取消收藏成功');
-        });
+    if (dataType.value === 2) {
+        // 第三方数据收藏逻辑
+        const id = jobInfo.value.id;
+        if (jobInfo.value.isCollection) {
+            $api.createRequest(`/app/job/collection/${id}/2`, {}, 'DELETE').then((resData) => {
+                getDetail(jobIdRef.value);
+                $api.msg('取消收藏成功');
+            });
+        } else {
+            $api.createRequest(`/app/job/collection/${id}/2`, {}, 'POST').then((resData) => {
+                getDetail(jobIdRef.value);
+                $api.msg('收藏成功');
+            });
+        }
     } else {
-        $api.createRequest(`/app/job/collection/${jobId}`, {}, 'POST').then((resData) => {
-            getDetail(jobId);
-            $api.msg('收藏成功');
-        });
+        // 原数据收藏逻辑
+        const jobId = jobInfo.value.jobId;
+        if (jobInfo.value.isCollection) {
+            $api.createRequest(`/app/job/collection/${jobId}/1`, {}, 'DELETE').then((resData) => {
+                getDetail(jobId);
+                $api.msg('取消收藏成功');
+            });
+        } else {
+            $api.createRequest(`/app/job/collection/${jobId}/1`, {}, 'POST').then((resData) => {
+                getDetail(jobId);
+                $api.msg('收藏成功');
+            });
+        }
+    }
+}
+
+// 处理公司详情跳转
+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`);
+    } else {
+        navTo(`/packageA/pages/UnitDetails/UnitDetails?companyId=${jobInfo.value.company.companyId}`);
     }
 }
 
@@ -285,6 +399,7 @@ function getClass(index) {
 </script>
 
 <style lang="stylus" scoped>
+/* 样式保持不变，与现在的post页面相同 */
 .btnback{
     width: 64rpx;
     height: 64rpx;
@@ -308,15 +423,14 @@ image {
 .progress-container {
   display: flex;
   align-items: center;
-  gap: 8rpx; /* 间距 */
+  gap: 8rpx;
   margin-top: 24rpx
-
 }
 .progress-text{
     margin-top: 8rpx
     display: flex;
     align-items: center;
-    gap: 8rpx; /* 间距 */
+    gap: 8rpx;
     justify-content: space-around
     width: 100%
     font-weight: 400;
@@ -335,12 +449,10 @@ image {
     transition: background-color 0.3s;
 }
 
-/* 完整激活格子 */
 .progress-item.active {
   background: linear-gradient(to right, #256bfa, #8c68ff);
 }
 
-/* 当前进度进行中的格子 */
 for i in 0..100
     .progress-item.half{i}::before
         content ''
@@ -352,36 +464,12 @@ for i in 0..100
         background linear-gradient(to right, #256bfa (i)%, #eaeaea (i)%)
         border-radius 24rpx
 
-
-
 .card-footer{
     .footer-title{
         font-weight: 600;
         font-size: 28rpx;
         color: #000000;
     }
-
-    .footer-content{
-        .content-line{
-            display: grid
-            grid-template-columns: repeat(4, 1fr)
-            background: linear-gradient( to left, #9E74FD 0%, #256BFA 100%);
-            border-radius: 10rpx
-            .line-pargrah{
-                height: 20rpx;
-                position: relative
-            }
-            .line-pargrah::after{
-                position: absolute;
-                content: '';
-                right: 10
-                top: 0
-                width: 6rpx
-                height: 20rpx
-                background: #FFFFFF
-            }
-        }
-    }
 }
 // ai
 .ai-explain{
@@ -527,7 +615,6 @@ for i in 0..100
                 margin-right: 24rpx
             }
             .companyinfo-right{
-
                 .row1{
                     font-weight: 500;
                     font-size: 32rpx;
@@ -565,4 +652,4 @@ for i in 0..100
         line-height: 90rpx
     }
 }
-</style>
+</style>

packageA/pages/reservation/reservation.vue

@@ -15,24 +15,24 @@
             <scroll-view scroll-y>
                 <view v-if="pageState.list.length">
                     <view class="card" v-for="(item, index) in pageState.list" :key="index">
-                        <view @click="navTo('/packageA/pages/exhibitors/exhibitors?jobFairId=' + item.jobFairId)">
+                        <view @click="navTo('/packageA/pages/exhibitors/exhibitors?jobFairId=' + item.zphID + '&jobFairName=' + item.zphmc)">
                             <view class="card-row">
-                                <Countdown startTime="item.startTime" :endTime="item.endTime" />
+                                <Countdown :startTime="item.zphjbsj" :endTime="item.zphjzsj" />
                             </view>
-                            <view class="card-Title">{{ item.name }}</view>
+                            <view class="card-Title">{{ item.zphmc }}</view>
                             <view class="card-row">
-                                <view class="rowleft">{{ item.location }}</view>
-                                <view class="rowright">
-                                    <convert-distance
+                                <view class="rowleft">{{ item.zphdz }}</view>
+                                <view class="rowright" style="white-space: nowrap">
+                                    <!-- <convert-distance
                                         :alat="item.latitude"
                                         :along="item.longitude"
                                         :blat="latitudeVal"
                                         :blong="longitudeVal"
-                                    ></convert-distance>
+                                    ></convert-distance> -->
                                 </view>
                             </view>
                         </view>
-                        <view class="footer" v-if="isTimePassed(item.startTime)">
+                        <view class="footer" v-if="isTimePassed(item.zphjbsj)">
                             <view class="card_cancel" @click="updateCancel(item)">取消预约</view>
                         </view>
                     </view>
@@ -72,6 +72,7 @@ const ranOptions = ref([
 ]);
 
 function isTimePassed(timeStr) {
+    if(!timeStr) return false
     const targetTime = new Date(timeStr.replace(/-/g, '/')).getTime(); // 兼容格式
     const now = Date.now();
     return now < targetTime;
@@ -88,11 +89,22 @@ function chnageRanOption(item) {
 }
 
 function updateCancel(item) {
-    const fairId = item.jobFairId;
-    $api.createRequest(`/app/fair/collection/${fairId}`, {}, 'DELETE').then((resData) => {
-        getList('refresh');
-        $api.msg('取消预约成功');
-    });
+    const fairId = item.zphID;
+    uni.showModal({
+        title: '提示',
+        content: '确定要取消预约吗?',
+        showCancel: true,
+        success: ({ confirm, cancel }) => {
+            if(confirm){
+                 $api.createRequest(`/app/fair/collection/${fairId}`, {}, 'DELETE').then((resData) => {
+                    getList('refresh');
+                    $api.msg('取消预约成功');
+                });
+            }
+        }
+    })
+    
+    
 }
 
 function getList(type = 'add', loading = true) {
@@ -166,6 +178,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/vCard/vCard.vue

@@ -32,22 +32,23 @@
           </view>
         </view>
         <view class="info-bottom">
-          <view>到岗：2025-11-02</view>
+          <!-- <view>到岗：2025-11-02</view> -->
+          <view></view>
           <view>地点：青岛市-<dict-Label dictType="area" :value="Number(userInfo.area)"></dict-Label></view>
         </view>
         <view class="des-card" style="margin-top: 24rpx">
           <view class="fl_box fl_justbet">
-            <view>求职意向岗位</view>
-            <view>{{ userInfo.jobIntention || "-" }}</view>
+            <view style="white-space:nowrap">求职意向岗位</view>
+            <view class="line_1" style="padding-left:40rpx" >{{ userInfo.jobIntention || userInfo.jobTitle?.join(',') || '-' }}</view>
           </view>
           <view class="fl_box fl_justbet">
             <view>毕业学校</view>
             <view>{{ userInfo.graduationSchool || "-" }}</view>
           </view>
-          <view class="fl_box fl_justbet">
+          <!-- <view class="fl_box fl_justbet">
             <view>当前状态</view>
             <view>在职 看工作机会</view>
-          </view>
+          </view> -->
         </view>
       </view>
 

pages.json

@@ -1,288 +1,284 @@
 {
-  "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": [
+    "pages": [
+        //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
         {
-          "path": "pages/choiceness/choiceness",
-          "style": {
-            "navigationBarTitleText": "精选",
-            "navigationBarBackgroundColor": "#4778EC",
-            "navigationBarTextStyle": "white",
-            "navigationStyle": "custom"
-          }
+            "path": "pages/index/index",
+            "style": {
+                "navigationBarTitleText": "青岛智慧就业平台",
+                // #ifdef H5
+                "navigationStyle": "custom"
+                // #endif
+            }
         },
         {
-          "path": "pages/post/post",
-          "style": {
-            "navigationBarTitleText": "职位详情",
-            "navigationBarBackgroundColor": "#4778EC",
-            "navigationBarTextStyle": "white",
-            "navigationStyle": "custom"
-          }
+            "path": "pages/mine/mine",
+            "style": {
+                "navigationBarTitleText": "我的",
+                "navigationStyle": "custom"
+            }
         },
         {
-          "path": "pages/UnitDetails/UnitDetails",
-          "style": {
-            "navigationBarTitleText": "单位详情",
-            "navigationBarBackgroundColor": "#4778EC",
-            "navigationBarTextStyle": "white",
-            "navigationStyle": "custom"
-          }
+            "path": "pages/msglog/msglog",
+            "style": {
+                "navigationBarTitleText": "消息",
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": false
+            }
         },
         {
-          "path": "pages/exhibitors/exhibitors",
-          "style": {
-            "navigationBarTitleText": "参展单位",
-            "navigationBarBackgroundColor": "#4778EC",
-            "navigationBarTextStyle": "white",
-            "navigationStyle": "custom"
-          }
+            "path": "pages/careerfair/careerfair",
+            "style": {
+                "navigationBarTitleText": "招聘会",
+                "navigationStyle": "custom"
+            }
         },
         {
-          "path": "pages/myResume/myResume",
-          "style": {
-            "navigationBarTitleText": "我的简历",
-            "navigationBarBackgroundColor": "#FFFFFF",
-            "navigationStyle": "custom"
-          }
+            "path": "pages/login/login",
+            "style": {
+                "navigationBarTitleText": "AI+就业服务程序",
+                "navigationStyle": "custom"
+            }
         },
         {
-          "path": "pages/vCard/vCard",
-          "style": {
-            "navigationBarTitleText": "点子名片",
-            "navigationBarBackgroundColor": "#FFFFFF",
-            "navigationStyle": "custom"
-          }
+            "path": "pages/nearby/nearby",
+            "style": {
+                "navigationBarTitleText": "附近",
+                "navigationBarBackgroundColor": "#4778EC",
+                "navigationBarTextStyle": "white",
+                "navigationStyle": "custom"
+            }
         },
         {
-          "path": "pages/Intendedposition/Intendedposition",
-          "style": {
-            "navigationBarTitleText": "投递记录",
-            "navigationBarBackgroundColor": "#FFFFFF"
-          }
+            "path": "pages/chat/chat",
+            "style": {
+                "navigationBarTitleText": "AI+",
+                "navigationBarBackgroundColor": "#4778EC",
+                "navigationBarTextStyle": "white",
+                "enablePullDownRefresh": false,
+                // #ifdef H5
+                "navigationStyle": "custom"
+                //#endif
+            }
         },
         {
-          "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"
-          }
+            "path": "pages/search/search",
+            "style": {
+                "navigationBarTitleText": "",
+                "navigationStyle": "custom"
+            }
         }
-      ]
-    }
-  ],
-  "tabBar": {
-    "custom": true,
-    "display": "none",
-    "color": "#5E5F60",
-    "selectedColor": "#256BFA",
-    "borderStyle": "black",
-    "backgroundColor": "#ffffff",
-    "midButton": {
-      "width": "50px",
-      "height": "50px",
-      "backgroundImage": "static/tabbar/logo2copy.png"
+    ],
+    "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": "我的"
+            }
+        ]
     },
-    "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": {}
-}
+    "globalStyle": {
+        "navigationBarTextStyle": "black",
+        "navigationBarTitleText": "uni-app",
+        "navigationBarBackgroundColor": "#F8F8F8",
+        "backgroundColor": "#F8F8F8",
+        // "enablePullDownRefresh": false,
+        // "navigationStyle": "custom",
+        "rpxCalcBaseDeviceWidth": 375,
+        "rpxCalcMaxDeviceWidth": 750,
+        "rpxCalcIncludeWidth": 750
+    },
+    "uniIdRouter": {}
+}

pages/careerfair/careerfair copy.vue

@@ -0,0 +1,545 @@
+<template>
+    <view class="app-custom-root">
+        <view class="app-container">
+            <!-- 顶部头部区域 -->
+            <view class="container-header">
+                <view class="header-top">
+                    <view class="header-btnLf button-click" @click="seemsg(0)" :class="{ active: state.current === 0 }">
+                        现场招聘
+                    </view>
+                    <view class="header-btnLf button-click" @click="seemsg(1)" :class="{ active: state.current === 1 }">
+                        VR虚拟招聘会
+                    </view>
+                </view>
+                <view class="header-input btn-feel">
+                    <uni-icons class="iconsearch" color="#666666" type="search" size="18"></uni-icons>
+                    <input class="input" placeholder="招聘会" placeholder-class="inputplace" />
+                </view>
+                <view class="header-date">
+                    <view class="data-week">
+                        <view
+                            class="weel-days button-click"
+                            :class="{ active: currentDay.fullDate === item.fullDate }"
+                            v-for="(item, index) in weekList"
+                            :key="index"
+                            @click="selectDate(item)"
+                        >
+                            <view class="label">{{ item.day }}</view>
+                            <view class="day">{{ item.date }}</view>
+                        </view>
+                    </view>
+                    <view class="data-all">
+                        <image class="allimg button-click" @click="toSelectDate" src="/static/icon/date1.png"></image>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 主体内容区域 -->
+            <view class="container-main">
+                <scroll-view scroll-y class="main-scroll" @scrolltolower="handleScrollToLower">
+                    <view class="cards" v-if="fairList.length">
+                        <view
+                            class="card press-button"
+                            v-for="(item, index) in fairList"
+                            :key="index"
+                            @click="navTo('/packageA/pages/exhibitors/exhibitors?jobFairId=' + item.jobFairId)"
+                        >
+                            <view class="card-title">{{ item.zphmc }}</view>
+                            <view class="card-row">
+                                <text class="">{{ item.zphdz }}</text>
+                                <text class="">
+                                    <convert-distance
+                                        :alat="item.latitude"
+                                        :along="item.longitude"
+                                        :blat="latitudeVal"
+                                        :blong="longitudeVal"
+                                    ></convert-distance>
+                                </text>
+                            </view>
+                            <view class="card-times">
+                                <view class="time-left">
+                                    <view class="left-date">{{ parseDateTime(item.zphjbsj).time }}</view>
+                                    <view class="left-dateDay">{{ parseDateTime(item.zphjbsj).date }}</view>
+                                </view>
+                                <view class="line"></view>
+                                <view class="time-center">
+                                    <view class="center-date">
+                                        {{ getTimeStatus(item.zphjbsj, item.zphjzsj).statusText }}
+                                    </view>
+                                    <view class="center-dateDay">
+                                        {{ getHoursBetween(item.zphjbsj, item.zphjzsj) }}小时
+                                    </view>
+                                </view>
+                                <view class="line"></view>
+                                <view class="time-right">
+                                    <view class="left-date">{{ parseDateTime(item.zphjzsj).time }}</view>
+                                    <view class="left-dateDay">{{ parseDateTime(item.zphjzsj).date }}</view>
+                                </view>
+                            </view>
+                            <view class="recommend-card-line"></view>
+                            <view class="card-footer">内容简介：{{ item.zphjj }}</view>
+                        </view>
+                    </view>
+                    <empty v-else pdTop="200"></empty>
+                </scroll-view>
+            </view>
+            <Tabbar :currentpage="1"></Tabbar>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import { reactive, inject, watch, ref, onMounted } from 'vue';
+import { onLoad, onShow } from '@dcloudio/uni-app';
+import Tabbar from '@/components/tabbar/midell-box.vue';
+import useLocationStore from '@/stores/useLocationStore';
+import { storeToRefs } from 'pinia';
+const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
+const { $api, navTo, cloneDeep } = inject('globalFunction');
+const weekList = ref([]);
+const fairList = ref([]);
+const currentDay = ref({});
+const state = reactive({
+    current: 0,
+    all: [{}],
+});
+const pageState = reactive({
+    page: 0,
+    total: 0,
+    maxPage: 2,
+    pageSize: 10,
+    search: {},
+});
+
+onLoad(() => {
+    const today = new Date();
+    const year = today.getFullYear();
+    const month = String(today.getMonth() + 1).padStart(2, '0');
+    const day = String(today.getDate()).padStart(2, '0');
+
+    const currentDate = `${year}-${month}-${day}`;
+    const result = getNextDates({
+        startDate: currentDate,
+    });
+    weekList.value = result;
+    currentDay.value.fullDate = result[0].fullDate
+    getFair('refresh');
+});
+
+function toSelectDate() {
+    navTo('/packageA/pages/selectDate/selectDate', {
+        query: {
+            date: currentDay.value.fullDate,
+        },
+        onBack: (res) => {
+            console.log(res);
+            const result = getNextDates({
+                startDate: res.date,
+            });
+            const formattedDate = res.date.slice(5); // MM-DD
+            const dateFull = {
+                date: res.date.slice(5),
+                day: '周' + res.week,
+                fullDate: res.date,
+            };
+            currentDay.value = dateFull;
+            weekList.value = result;
+            getFair('refresh');
+        },
+    });
+}
+// 查看消息类型
+function changeSwiperMsgType(e) {
+    const currented = e.detail.current;
+    state.current = currented;
+}
+
+function seemsg(index) {
+    if (index === 1) {
+        return $api.msg('功能确定中');
+    }
+    state.current = index;
+}
+
+const handleScrollToLower = () => {
+    return
+    getFair();
+    console.log('触底');
+};
+
+
+function getFair(type = 'add') {
+    if (type === 'refresh') {
+        pageState.page = 1;
+        pageState.maxPage = 1;
+    }
+    if (type === 'add' && pageState.page < pageState.maxPage) {
+        pageState.page += 1;
+    }
+    let params = {
+        ...pageState.search,
+        // current: pageState.page,
+        // pageSize: pageState.pageSize,
+    };
+    // if (currentDay.value?.fullDate) {
+    //     params.queryDate = currentDay.value.fullDate;
+    // }
+    if (currentDay.value?.fullDate) {
+        params.zphjbsj = currentDay.value.fullDate.replace(/-/g, '');
+    }
+    $api.createRequest('/app/internal/jobFairThirdPart', params).then((resData) => {
+        const { rows, total } = resData;
+        if (type === 'add') {
+            // const str = pageState.pageSize * (pageState.page - 1);
+            // const end = fairList.value.length;
+            // const reslist = rows;
+            // fairList.value.splice(str, end, ...reslist);
+            fairList.value = rows
+        } else {
+            fairList.value = rows;
+        }
+        // pageState.list = resData.rows;
+        pageState.total = resData.total;
+        pageState.maxPage = Math.ceil(pageState.total / pageState.pageSize);
+    });
+}
+
+function parseDateTime(datetimeStr) {
+    if (!datetimeStr) return { time: '', date: '' };
+
+    const dateObj = new Date(datetimeStr);
+
+    if (isNaN(dateObj.getTime())) return { time: '', date: '' }; // 无效时间
+
+    const year = dateObj.getFullYear();
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0');
+    const day = String(dateObj.getDate()).padStart(2, '0');
+    const hours = String(dateObj.getHours()).padStart(2, '0');
+    const minutes = String(dateObj.getMinutes()).padStart(2, '0');
+
+    return {
+        time: `${hours}:${minutes}`,
+        date: `${year}年${month}月${day}日`,
+    };
+}
+
+function getTimeStatus(startTimeStr, endTimeStr) {
+    const now = new Date();
+    const startTime = new Date(startTimeStr);
+    const endTime = new Date(endTimeStr);
+
+    // 判断状态：0 开始中，1 过期，2 待开始
+    let status = 0;
+    let statusText = '开始中';
+    if (now < startTime) {
+        status = 2; // 待开始
+        statusText = '待开始';
+    } else if (now > endTime) {
+        status = 1; // 已过期
+        statusText = '已过期';
+    } else {
+        status = 0; // 进行中
+        statusText = '进行中';
+    }
+    return {
+        status, // 0: 进行中，1: 已过期，2: 待开始
+        statusText,
+    };
+}
+
+function getHoursBetween(startTimeStr, endTimeStr) {
+    const start = new Date(startTimeStr);
+    const end = new Date(endTimeStr);
+
+    const diffMs = end - start;
+    const diffHours = diffMs / (1000 * 60 * 60);
+
+    return +diffHours.toFixed(2); // 保留 2 位小数
+}
+
+const selectDate = (item) => {
+    if (currentDay.value?.fullDate === item.fullDate) {
+        currentDay.value = {};
+        getFair('refresh');
+        return;
+    }
+    currentDay.value = item;
+    getFair('refresh');
+};
+
+function getNextDates({ startDate = '', count = 6 }) {
+    const baseDate = startDate ? new Date(startDate) : new Date(); // 指定起点或今天
+    const dates = [];
+    const dayNames = ['日', '一', '二', '三', '四', '五', '六'];
+
+    for (let i = 0; i < count; i++) {
+        const date = new Date(baseDate);
+        date.setDate(baseDate.getDate() + i);
+
+        const fullDate = date.toISOString().slice(0, 10); // YYYY-MM-DD
+        const formattedDate = fullDate.slice(5); // MM-DD
+        const dayOfWeek = dayNames[date.getDay()];
+
+        dates.push({
+            date: formattedDate,
+            fullDate,
+            day: '周' + dayOfWeek,
+        });
+    }
+
+    // 可选设置默认选中项
+    // currentDay.value = dates[0];
+
+    return dates;
+}
+</script>
+
+<style lang="stylus" scoped>
+.app-custom-root {
+    position: fixed;
+    z-index: 10;
+    width: 100vw;
+    height: calc(100% - var(--window-bottom));
+    overflow: hidden;
+}
+.app-container {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    width: 100%;
+    .container-header {
+        background: url('@/static/icon/background2.png') 0 0 no-repeat;
+        background-size: 100% 400rpx;
+        .header-top{
+            display: flex;
+            line-height: calc(88rpx - 14rpx);
+            padding: 16rpx 44rpx 14rpx 44rpx;
+            .header-btnLf {
+                display: flex;
+                width: fit-content;
+                white-space: nowrap
+                justify-content: flex-start;
+                align-items: center;
+                width: calc(60rpx * 3);
+                font-weight: 500;
+                font-size: 40rpx;
+                color: #696969;
+                margin-right: 44rpx;
+                position: relative;
+                .btns-wd{
+                    position: absolute
+                    top: 2rpx;
+                    right: 2rpx
+                    width: 16rpx;
+                    height: 16rpx;
+                    background: #F73636;
+                    border-radius: 50%;
+                    border: 4rpx solid #EEEEFF;
+                }
+            }
+            .active {
+                font-weight: 600;
+                font-size: 40rpx;
+                color: #000000;
+            }
+        }
+        .header-input{
+            padding: 0 24rpx
+            width: calc(100% - 48rpx);
+            position: relative
+            .iconsearch{
+                position: absolute
+                left: 50rpx;
+                top: 50%
+                transform: translate(0, -50%)
+            }
+            .input{
+                padding: 0 30rpx 0 80rpx
+                height: 80rpx;
+                background: #FFFFFF;
+                border-radius: 75rpx 75rpx 75rpx 75rpx;
+                font-size: 28rpx;
+            }
+            .inputplace{
+                font-weight: 400;
+                font-size: 28rpx;
+                color: #B5B5B5;
+            }
+
+        }
+        .header-date{
+            padding: 28rpx
+            display: flex
+            justify-content: space-between
+            align-items: center
+            .data-week{
+                flex: 1
+                display: flex
+                justify-content: space-between
+                flex-wrap: nowrap
+                overflow: hidden
+                .weel-days{
+                    font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+                    display: flex
+                    justify-content: center
+                    flex-direction: column
+                    text-align: center
+                    font-weight: 400;
+                    font-size: 24rpx;
+                    color: #333333;
+                    width: 96rpx;
+                    height: 88rpx;
+
+                    .label{}
+                    .day{
+                        font-weight: 500;
+                    }
+                }
+                .active{
+                    background: rgba(37,107,250,0.1);
+                    border-radius: 12rpx 12rpx 12rpx 12rpx;
+                    color: #256BFA;
+                }
+            }
+            .data-all{
+                width: 66rpx;
+                height: 66rpx;
+                margin-left: 18rpx
+                .allimg{
+                    width: 100%;
+                    height: 100%
+                }
+            }
+        }
+    }
+}
+
+.container-main {
+    flex: 1;
+    overflow: hidden;
+    background-color: #f4f4f4;
+}
+.main-scroll {
+    width: 100%
+    height: 100%;
+}
+.cards{
+    padding: 28rpx 28rpx 28rpx 28rpx;
+    .card{
+        margin-top: 28rpx
+        padding: 32rpx;
+        background: #FFFFFF
+        background: #FFFFFF;
+        box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04);
+        border-radius: 20rpx 20rpx 20rpx 20rpx;
+        .card-title{
+            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+            font-weight: 500;
+            font-size: 32rpx;
+            color: #333333;
+        }
+        .card-row{
+            display: flex
+            justify-content: space-between
+            font-weight: 400;
+            font-size: 28rpx;
+            color: #495265;
+            margin-top: 4rpx
+        }
+        .card-times{
+            display: flex;
+            justify-content: space-between
+            align-items: center
+            margin-top: 24rpx
+            .time-left,
+            .time-right{
+                text-align: center
+                .left-date{
+                    font-weight: 500;
+                    font-size: 48rpx;
+                    color: #333333;
+                    font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+                }
+                .left-dateDay{
+                    font-weight: 400;
+                    font-size: 24rpx;
+                    color: #333333;
+                    margin-top: 12rpx
+                }
+            }
+            .line{
+                width: 40rpx;
+                height: 0rpx;
+                border: 2rpx solid #D4D4D4;
+                margin-top: 64rpx
+            }
+            .time-center{
+                text-align: center;
+                display: flex
+                flex-direction: column
+                justify-content: center
+                align-items: center
+                .center-date{
+                    font-weight: 400;
+                    font-size: 28rpx;
+                    color: #FF881A;
+                    padding-top: 10rpx
+                }
+                .center-dateDay{
+                    font-weight: 400;
+                    font-size: 24rpx;
+                    color: #333333;
+                    margin-top: 6rpx
+                    line-height: 48rpx;
+                    width: 104rpx;
+                    height: 48rpx;
+                    background: #F9F9F9;
+                    border-radius: 8rpx 8rpx 8rpx 8rpx;
+                }
+            }
+        }
+        .recommend-card-line{
+            width: calc(100%);
+            height: 0rpx;
+            border-radius: 0rpx 0rpx 0rpx 0rpx;
+            border: 2rpx dashed rgba(0,0,0,0.14);
+            margin-top: 32rpx
+            position: relative
+        }
+
+        .recommend-card-line::before{
+            position: absolute
+            content: ''
+            left: 0
+            top: 0
+            transform: translate(-50% - 110rpx, -50%)
+            width: 28rpx;
+            height: 28rpx;
+            background: #F4F4F4;
+            border-radius: 50%;
+        }
+
+        .recommend-card-line::after{
+            position: absolute
+            content: ''
+            right: 0
+            top: 0
+            transform: translate(50% + 100rpx, -50%)
+            width: 28rpx;
+            height: 28rpx;
+            background: #F4F4F4;
+            border-radius: 50%;
+        }
+        .card-footer{
+            margin-top: 32rpx
+            min-height: 50rpx;
+            font-weight: 400;
+            font-size: 28rpx;
+            color: #6C7282;
+        }
+    }
+    .card:first-child{
+        margin-top: 0
+    }
+}
+</style>

pages/careerfair/careerfair.vue

@@ -13,7 +13,7 @@
                 </view>
                 <view class="header-input btn-feel">
                     <uni-icons class="iconsearch" color="#666666" type="search" size="18"></uni-icons>
-                    <input class="input" placeholder="招聘会" placeholder-class="inputplace" />
+                    <input  v-model="pageState.zphmc" confirm-type="search"  @confirm="getFair" class="input" placeholder="招聘会" placeholder-class="inputplace" />
                 </view>
                 <view class="header-date">
                     <view class="data-week">
@@ -42,42 +42,42 @@
                             class="card press-button"
                             v-for="(item, index) in fairList"
                             :key="index"
-                            @click="navTo('/packageA/pages/exhibitors/exhibitors?jobFairId=' + item.jobFairId)"
+                            @click="navTo('/packageA/pages/exhibitors/exhibitors?jobFairId=' + item.zphID + '&jobFairName=' + item.zphmc)"
                         >
-                            <view class="card-title">{{ item.name }}</view>
+                            <view class="card-title">{{ item.zphmc }}</view>
                             <view class="card-row">
-                                <text class="">{{ item.location }}</text>
+                                <text class="">{{ item.jbf }}</text>
                                 <text class="">
-                                    <convert-distance
+                                    <!-- <convert-distance
                                         :alat="item.latitude"
                                         :along="item.longitude"
                                         :blat="latitudeVal"
                                         :blong="longitudeVal"
-                                    ></convert-distance>
+                                    ></convert-distance> -->
                                 </text>
                             </view>
                             <view class="card-times">
                                 <view class="time-left">
-                                    <view class="left-date">{{ parseDateTime(item.startTime).time }}</view>
-                                    <view class="left-dateDay">{{ parseDateTime(item.startTime).date }}</view>
+                                    <view class="left-date">{{ parseDateTime(item.zphjbsj).time }}</view>
+                                    <view class="left-dateDay">{{ parseDateTime(item.zphjbsj).date }}</view>
                                 </view>
                                 <view class="line"></view>
                                 <view class="time-center">
                                     <view class="center-date">
-                                        {{ getTimeStatus(item.startTime, item.endTime).statusText }}
+                                        {{ getTimeStatus(item.zphjbsj, item.zphjzsj).statusText }}
                                     </view>
                                     <view class="center-dateDay">
-                                        {{ getHoursBetween(item.startTime, item.endTime) }}小时
+                                        {{ getHoursBetween(item.zphjbsj, item.zphjzsj) }}小时
                                     </view>
                                 </view>
                                 <view class="line"></view>
                                 <view class="time-right">
-                                    <view class="left-date">{{ parseDateTime(item.endTime).time }}</view>
-                                    <view class="left-dateDay">{{ parseDateTime(item.endTime).date }}</view>
+                                    <view class="left-date">{{ parseDateTime(item.zphjzsj).time }}</view>
+                                    <view class="left-dateDay">{{ parseDateTime(item.zphjzsj).date }}</view>
                                 </view>
                             </view>
                             <view class="recommend-card-line"></view>
-                            <view class="card-footer">内容简介：{{ item.description }}</view>
+                            <view class="card-footer">内容简介：{{ item.zphjj }}</view>
                         </view>
                     </view>
                     <empty v-else pdTop="200"></empty>
@@ -95,7 +95,7 @@ import Tabbar from '@/components/tabbar/midell-box.vue';
 import useLocationStore from '@/stores/useLocationStore';
 import { storeToRefs } from 'pinia';
 const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
-const { $api, navTo, cloneDeep } = inject('globalFunction');
+const { $api, navTo, cloneDeep,debounce } = inject('globalFunction');
 const weekList = ref([]);
 const fairList = ref([]);
 const currentDay = ref({});
@@ -108,7 +108,7 @@ const pageState = reactive({
     total: 0,
     maxPage: 2,
     pageSize: 10,
-    search: {},
+    zphmc:''
 });
 
 onLoad(() => {
@@ -122,6 +122,7 @@ onLoad(() => {
         startDate: currentDate,
     });
     weekList.value = result;
+    currentDay.value.fullDate = result[0].fullDate
     getFair('refresh');
 });
 
@@ -161,10 +162,12 @@ function seemsg(index) {
 }
 
 const handleScrollToLower = () => {
+    return
     getFair();
     console.log('触底');
 };
 
+
 function getFair(type = 'add') {
     if (type === 'refresh') {
         pageState.page = 1;
@@ -174,21 +177,24 @@ function getFair(type = 'add') {
         pageState.page += 1;
     }
     let params = {
-        ...pageState.search,
-        current: pageState.page,
-        pageSize: pageState.pageSize,
+        zphmc:pageState.zphmc,
+        // current: pageState.page,
+        // pageSize: pageState.pageSize,
     };
+    // if (currentDay.value?.fullDate) {
+    //     params.queryDate = currentDay.value.fullDate;
+    // }
     if (currentDay.value?.fullDate) {
-        params.queryDate = currentDay.value.fullDate;
+        params.zphjbsj = currentDay.value.fullDate.replace(/-/g, '');
     }
-    $api.createRequest('/app/fair', params).then((resData) => {
+    $api.createRequest('/app/internal/jobFairThirdPart', params).then((resData) => {
         const { rows, total } = resData;
-        console.log(rows);
         if (type === 'add') {
-            const str = pageState.pageSize * (pageState.page - 1);
-            const end = fairList.value.length;
-            const reslist = rows;
-            fairList.value.splice(str, end, ...reslist);
+            // const str = pageState.pageSize * (pageState.page - 1);
+            // const end = fairList.value.length;
+            // const reslist = rows;
+            // fairList.value.splice(str, end, ...reslist);
+            fairList.value = rows
         } else {
             fairList.value = rows;
         }

pages/chat/components/ai-paging.vue

@@ -250,8 +250,6 @@ import {
     ref,
     inject,
     nextTick,
-    defineProps,
-    defineEmits,
     onMounted,
     onUnmounted,
     toRaw,
@@ -448,7 +446,7 @@ const scrollToBottom = throttle(function () {
 }, 500);
 
 function getGuess() {
-    $api.chatRequest('/guest', { sessionId: chatSessionID.value }, 'POST').then((res) => {
+    $api.chatRequest('/app/chat/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, defineEmits } from 'vue';
+import { ref, inject } from 'vue';
 const emit = defineEmits(['onSend']);
 const { $api } = inject('globalFunction');
 const popup = ref(null);

pages/index/components/AIMatch.vue

@@ -0,0 +1,370 @@
+<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,
+    });
+
+    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

@@ -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(false);
+const maskFristEntry = ref(true);
 const state = reactive({
     tabIndex: 'all',
 });

pages/index/index.vue

@@ -47,11 +47,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());

pages/login/login.vue

@@ -109,6 +109,7 @@
             </template>
         </tabcontrolVue>
         <SelectJobs ref="selectJobsModel"></SelectJobs>
+        <view class="backdoor" @click="loginbackdoor">后门</view>
     </AppLayout>
 </template>
 
@@ -149,7 +150,6 @@ const fromValue = reactive({
 });
 
 onLoad((parmas) => {
-    console.log(parmas);
     getTreeselect();
 });
 
@@ -244,6 +244,23 @@ 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({
@@ -290,6 +307,12 @@ 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,9 +45,7 @@
                         <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>
@@ -132,7 +130,6 @@ 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('/chat', params, onDataReceived, onError, onComplete);
+                $api.streamRequest('/app/chat/chat', params, onDataReceived, onError, onComplete);
             } catch (err) {
                 console.log(err);
                 reject(err);
@@ -230,7 +230,7 @@ const useChatGroupDBStore = defineStore("messageGroup", () => {
 
     // 云端数据
     function getHistory() {
-        $api.chatRequest('/getHistory').then((res) => {
+        $api.chatRequest('/app/chat/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('/detail', params, 'GET', loading).then((res) => {
+        $api.chatRequest('/app/chat/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

@@ -4,73 +4,21 @@ import {
     sm2_Encrypt
 } from '@/common/globalFunction';
 import useUserStore from '@/stores/useUserStore';
+import {
+    sm4Decrypt,
+    sm4Encrypt
+} from '../common/globalFunction';
 
 
-
-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();
-                }
-            }
-        })
-    })
-}
-
+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"]
+]
 
 /**
  * @param url  String，请求的地址，默认：none
@@ -94,15 +42,44 @@ 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: data,
+            data: requestData,
             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.StreamBaseURl + url, {
+            const response = await fetch(config.baseUrl + url, {
                 method: "POST",
                 headers,
                 body: JSON.stringify(data)
@@ -46,6 +46,7 @@ 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]") {
@@ -104,7 +105,7 @@ export function chatRequest(url, data = {}, method = 'GET', loading = false, hea
     header["Authorization"] = encodeURIComponent(Authorization);
     return new Promise((resolve, reject) => {
         uni.request({
-            url: config.StreamBaseURl + url,
+            url: config.baseUrl + url,
             method: method,
             data: data,
             header,