From 3d7cb0c561c3215e0dd8497e84da20106ff1221f Mon Sep 17 00:00:00 2001
From: Apcallover <1503963513@qq.com>
Date: Mon, 29 Sep 2025 11:53:10 +0800
Subject: [PATCH] =?UTF-8?q?flat:=20=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store                                     | Bin 10244 -> 10244 bytes
 App.vue                                       |   5 +
 common/globalFunction.js                      | 330 ++++++++++++++++
 components/.DS_Store                          | Bin 8196 -> 8196 bytes
 components/renderJobs/renderJobsCheckBox.vue  | 267 +++++++++++++
 config.js                                     |   2 +-
 main.js                                       |   4 +-
 packageA/.DS_Store                            | Bin 0 -> 6148 bytes
 packageA/pages/.DS_Store                      | Bin 0 -> 8196 bytes
 packageA/pages/choiceness/choiceness.vue      |   4 +-
 packageA/pages/collection/collection.vue      |  77 +++-
 packageA/pages/collection/compare.vue         | 208 ++++++++++
 packageA/pages/jobExpect/jobExpect.vue        |   4 +-
 .../pages/myResume/corporateInformation.vue   |  97 +++++
 packageA/pages/myResume/myResume.vue          | 371 +++++++++++++++++-
 packageA/pages/personalInfo/personalInfo.vue  |   6 +
 packageA/pages/post/post.vue                  | 182 ++++++++-
 pages.json                                    |  14 +
 pages/chat/chat.vue                           |   5 +-
 pages/chat/components/ai-paging.vue           |   8 +-
 pages/index/components/index-one.vue          |  13 +-
 pages/index/index.vue                         | 103 +----
 pages/login/login.vue                         |  37 +-
 pages/mine/mine.vue                           |   9 +-
 pages/nearby/components/four.vue              |   1 +
 pages/nearby/components/one.vue               |   1 +
 pages/nearby/components/three.vue             |   1 +
 pages/nearby/components/two.vue               |   1 +
 pages/nearby/nearby.vue                       |   2 +-
 pages/search/search.vue                       |  99 +----
 stores/useUserStore.js                        |   2 +-
 unpackage/.DS_Store                           | Bin 6148 -> 6148 bytes
 unpackage/dist/.DS_Store                      | Bin 6148 -> 6148 bytes
 unpackage/dist/build/.DS_Store                | Bin 6148 -> 6148 bytes
 34 files changed, 1617 insertions(+), 236 deletions(-)
 create mode 100644 components/renderJobs/renderJobsCheckBox.vue
 create mode 100644 packageA/.DS_Store
 create mode 100644 packageA/pages/.DS_Store
 create mode 100644 packageA/pages/collection/compare.vue
 create mode 100644 packageA/pages/myResume/corporateInformation.vue

diff --git a/.DS_Store b/.DS_Store
index 7e6cd5e5552652596461862fc32fb3c19c60dd7f..e36dfc651fecb996d3eeb0c2902e24f78d405da7 100644
GIT binary patch
delta 25
gcmZn(XbIR5Bg0{6WTc~DY+*jRK~j2iy-X`N0A(fzfdBvi

delta 25
gcmZn(XbIR5Bg0{0V4|a7YG6FMK~j2iy-X`N0A%k6dH?_b

diff --git a/App.vue b/App.vue
index 87487b0..c672275 100644
--- a/App.vue
+++ b/App.vue
@@ -18,6 +18,11 @@ onLaunch((options) => {
             .loginSetToken(token)
             .then(() => {
                 $api.msg('登录成功');
+            })
+            .catch(() => {
+                uni.redirectTo({
+                    url: '/pages/login/login',
+                });
             });
     } else {
         uni.redirectTo({
diff --git a/common/globalFunction.js b/common/globalFunction.js
index 97dc8c3..899de44 100644
--- a/common/globalFunction.js
+++ b/common/globalFunction.js
@@ -542,6 +542,335 @@ function isInWechatMiniProgramWebview() {
 function isEmptyObject(obj) {
     return obj && typeof obj === 'object' && !Array.isArray(obj) && Object.keys(obj).length === 0;
 }
+/**
+ * 身份证号码校验工具
+ * 支持15位和18位身份证号码校验
+ * 提供详细的校验结果和错误信息
+ */
+export const IdCardValidator = {
+    // 每位加权因子
+    powers: ['7', '9', '10', '5', '8', '4', '2', '1', '6', '3', '7', '9', '10', '5', '8', '4', '2'],
+
+    // 第18位校检码
+    parityBit: ['1', '0', 'X', '9', '8', '7', '6', '5', '4', '3', '2'],
+
+    // 省市地区码映射
+    provinceAndCitys: {
+        11: '北京',
+        12: '天津',
+        13: '河北',
+        14: '山西',
+        15: '内蒙古',
+        21: '辽宁',
+        22: '吉林',
+        23: '黑龙江',
+        31: '上海',
+        32: '江苏',
+        33: '浙江',
+        34: '安徽',
+        35: '福建',
+        36: '江西',
+        37: '山东',
+        41: '河南',
+        42: '湖北',
+        43: '湖南',
+        44: '广东',
+        45: '广西',
+        46: '海南',
+        50: '重庆',
+        51: '四川',
+        52: '贵州',
+        53: '云南',
+        54: '西藏',
+        61: '陕西',
+        62: '甘肃',
+        63: '青海',
+        64: '宁夏',
+        65: '新疆',
+        71: '台湾',
+        81: '香港',
+        82: '澳门',
+        91: '国外'
+    },
+
+    /**
+     * 验证身份证号码
+     * @param {string} idCardNo - 身份证号码
+     * @returns {Object} 校验结果 { valid: boolean, message: string, info: Object }
+     */
+    validate(idCardNo) {
+        // 检查是否为空
+        if (this._isEmpty(idCardNo)) {
+            return this._createResult(false, '身份证号码不能为空');
+        }
+
+        // 去除空格
+        idCardNo = idCardNo.trim();
+
+        // 检查长度，支持15位和18位
+        if (idCardNo.length === 15) {
+            return this._validate15IdCardNo(idCardNo);
+        } else if (idCardNo.length === 18) {
+            return this._validate18IdCardNo(idCardNo);
+        } else {
+            return this._createResult(false, '身份证号码长度必须是15位或18位');
+        }
+    },
+
+    /**
+     * 验证18位身份证号码
+     * @param {string} idCardNo - 18位身份证号码
+     * @returns {Object} 校验结果
+     */
+    _validate18IdCardNo(idCardNo) {
+        // 18位身份证号码的基本格式校验
+        if (!/^[1-9]\d{5}[1-9]\d{3}((0[1-9])|(1[0-2]))((0[1-9])|([1-2][0-9])|(3[0-1]))\d{3}(\d|x|X)$/.test(
+                idCardNo)) {
+            return this._createResult(false, '身份证号码格式不正确');
+        }
+
+        // 校验地址码
+        const addressCode = idCardNo.substring(0, 6);
+        const addressResult = this._checkAddressCode(addressCode);
+        if (!addressResult.valid) {
+            return addressResult;
+        }
+
+        // 校验日期码
+        const birDayCode = idCardNo.substring(6, 14);
+        const birthResult = this._checkBirthDayCode(birDayCode);
+        if (!birthResult.valid) {
+            return birthResult;
+        }
+
+        // 验证校检码
+        if (!this._checkParityBit(idCardNo)) {
+            return this._createResult(false, '身份证号码校验码错误');
+        }
+
+        // 提取身份证信息
+        const info = this._extractInfo(idCardNo, 18);
+
+        return this._createResult(true, '身份证号码校验通过', info);
+    },
+
+    /**
+     * 验证15位身份证号码
+     * @param {string} idCardNo - 15位身份证号码
+     * @returns {Object} 校验结果
+     */
+    _validate15IdCardNo(idCardNo) {
+        // 15位身份证号码的基本格式校验
+        if (!/^[1-9]\d{5}\d{2}((0[1-9])|(1[0-2]))((0[1-9])|([1-2][0-9])|(3[0-1]))\d{3}$/.test(idCardNo)) {
+            return this._createResult(false, '身份证号码格式不正确');
+        }
+
+        // 校验地址码
+        const addressCode = idCardNo.substring(0, 6);
+        const addressResult = this._checkAddressCode(addressCode);
+        if (!addressResult.valid) {
+            return addressResult;
+        }
+
+        // 校验日期码（15位身份证年份是两位，这里转换为四位）
+        const year = `19${idCardNo.substring(6, 8)}`; // 15位身份证一般是1900年以后出生
+        const month = idCardNo.substring(8, 10);
+        const day = idCardNo.substring(10, 12);
+        const birDayCode = `${year}${month}${day}`;
+
+        const birthResult = this._checkBirthDayCode(birDayCode);
+        if (!birthResult.valid) {
+            return birthResult;
+        }
+
+        // 提取身份证信息
+        const info = this._extractInfo(idCardNo, 15);
+
+        return this._createResult(true, '身份证号码校验通过', info);
+    },
+
+    /**
+     * 校验地址码
+     * @param {string} addressCode - 地址码
+     * @returns {Object} 校验结果
+     */
+    _checkAddressCode(addressCode) {
+        if (!/^[1-9]\d{5}$/.test(addressCode)) {
+            return this._createResult(false, '地址码格式不正确');
+        }
+
+        const provinceCode = parseInt(addressCode.substring(0, 2));
+        if (!this.provinceAndCitys[provinceCode]) {
+            return this._createResult(false, '地址码对应的地区不存在');
+        }
+
+        return this._createResult(true);
+    },
+
+    /**
+     * 校验日期码
+     * @param {string} birDayCode - 日期码 (格式：YYYYMMDD)
+     * @returns {Object} 校验结果
+     */
+    _checkBirthDayCode(birDayCode) {
+        if (!/^[1-9]\d{3}((0[1-9])|(1[0-2]))((0[1-9])|([1-2][0-9])|(3[0-1]))$/.test(birDayCode)) {
+            return this._createResult(false, '出生日期格式不正确');
+        }
+
+        const year = parseInt(birDayCode.substring(0, 4), 10);
+        const month = parseInt(birDayCode.substring(4, 6), 10);
+        const day = parseInt(birDayCode.substring(6), 10);
+
+        // 检查年份范围（合理的出生年份范围）
+        const currentYear = new Date().getFullYear();
+        if (year < 1900 || year > currentYear) {
+            return this._createResult(false, '出生年份超出合理范围');
+        }
+
+        // 检查日期有效性
+        const date = new Date(year, month - 1, day);
+        if (
+            date.getFullYear() !== year ||
+            date.getMonth() !== month - 1 ||
+            date.getDate() !== day
+        ) {
+            return this._createResult(false, '出生日期无效');
+        }
+
+        // 检查是否为未来日期
+        if (date > new Date()) {
+            return this._createResult(false, '出生日期不能是未来日期');
+        }
+
+        return this._createResult(true);
+    },
+
+    /**
+     * 验证校检码
+     * @param {string} idCardNo - 18位身份证号码
+     * @returns {boolean} 校验结果
+     */
+    _checkParityBit(idCardNo) {
+        const parityBit = idCardNo.charAt(17).toUpperCase();
+        return this._getParityBit(idCardNo) === parityBit;
+    },
+
+    /**
+     * 计算校检码
+     * @param {string} idCardNo - 18位身份证号码
+     * @returns {string} 校检码
+     */
+    _getParityBit(idCardNo) {
+        const id17 = idCardNo.substring(0, 17);
+        let power = 0;
+
+        for (let i = 0; i < 17; i++) {
+            power += parseInt(id17.charAt(i), 10) * parseInt(this.powers[i], 10);
+        }
+
+        const mod = power % 11;
+        return this.parityBit[mod];
+    },
+
+    /**
+     * 提取身份证信息
+     * @param {string} idCardNo - 身份证号码
+     * @param {number} type - 类型 15或18
+     * @returns {Object} 身份证信息
+     */
+    _extractInfo(idCardNo, type) {
+        let addressCode, birthYear, birthMonth, birthDay, genderCode, gender;
+
+        // 地址码
+        addressCode = idCardNo.substring(0, 6);
+        const provinceCode = parseInt(addressCode.substring(0, 2));
+        const province = this.provinceAndCitys[provinceCode] || '';
+
+        // 出生日期
+        if (type === 18) {
+            birthYear = idCardNo.substring(6, 10);
+            birthMonth = idCardNo.substring(10, 12);
+            birthDay = idCardNo.substring(12, 14);
+            genderCode = idCardNo.substring(14, 17);
+        } else {
+            birthYear = `19${idCardNo.substring(6, 8)}`;
+            birthMonth = idCardNo.substring(8, 10);
+            birthDay = idCardNo.substring(10, 12);
+            genderCode = idCardNo.substring(12, 15);
+        }
+
+        // 性别
+        gender = parseInt(genderCode, 10) % 2 === 1 ? '男' : '女';
+
+        return {
+            addressCode,
+            province,
+            birthday: `${birthYear}-${birthMonth}-${birthDay}`,
+            gender,
+            length: type
+        };
+    },
+
+    /**
+     * 检查是否为空
+     * @param {*} value - 要检查的值
+     * @returns {boolean} 是否为空
+     */
+    _isEmpty(value) {
+        return value === null || value === undefined || value === '';
+    },
+
+    /**
+     * 创建校验结果对象
+     * @param {boolean} valid - 是否有效
+     * @param {string} message - 消息
+     * @param {Object} info - 附加信息
+     * @returns {Object} 校验结果
+     */
+    _createResult(valid, message = '', info = {}) {
+        return {
+            valid,
+            message,
+            info
+        };
+    },
+
+    /**
+     * 将15位身份证升级为18位
+     * @param {string} idCardNo - 15位身份证号码
+     * @returns {string|boolean} 18位身份证号码或false(无效的15位身份证)
+     */
+    upgrade15To18(idCardNo) {
+        if (idCardNo.length !== 15) {
+            return false;
+        }
+
+        // 先验证15位身份证是否有效
+        const validateResult = this._validate15IdCardNo(idCardNo);
+        if (!validateResult.valid) {
+            return false;
+        }
+
+        // 转换出生年份为4位
+        const year = `19${idCardNo.substring(6, 8)}`;
+        const rest = idCardNo.substring(8);
+
+        // 拼接17位
+        const id17 = `${idCardNo.substring(0, 6)}${year}${rest}`;
+
+        // 计算校验码
+        let power = 0;
+        for (let i = 0; i < 17; i++) {
+            power += parseInt(id17.charAt(i), 10) * parseInt(this.powers[i], 10);
+        }
+        const mod = power % 11;
+        const parityBit = this.parityBit[mod];
+
+        // 拼接18位身份证
+        return `${id17}${parityBit}`;
+    }
+};
+
 
 
 export const $api = {
@@ -567,6 +896,7 @@ export default {
     navBack,
     cloneDeep,
     formatDate,
+    IdCardValidator,
     getdeviceInfo,
     checkingPhoneRegExp,
     checkingEmailRegExp,
diff --git a/components/.DS_Store b/components/.DS_Store
index 1ef8e1f3b24125515ce6d862866892fbe16e144e..509ea416454496b34bfe62367f8b3ef85f1ffbfe 100644
GIT binary patch
delta 560
zcmZp1XmOa}FDlKzz`)4BAi%(o$WY0U&rr%x;+eCta2or>2Hwr=94s8hAQhYpjtm7r
z=!2{(KRGEUKM5!c)C`noV9@&y1`G_7c?5pSvofSI<O21SFjRWxAgg7R1*zTqOTeGe
zpO2vks4R~m1xOY#I0GF3(vk=isbnZd)7A~tHV<Y6kj;gn*9)jOY4QOf5d}s*0*XY0
zPby;3%urkwT$GoSpO+3aoN=?8&}~L<9)@C|%W{A?8R!u=hD;#41msp!w}HIRSchUQ
zvOb90J_w33)=l;iQQB-F63D2?#t;HDE*nVZGi0M02MQse(mGMq&Fm82SSA|^e;8<&
GC;<Q~9gIo<

delta 86
zcmV-c0IC0kK!iY$PZbgX0003101yBGVE}Lda{y%kQ~+|Zah3;>fDN+;2m}ZL5|cg<
s`LkgWL;<rE6xacij}{lRa28Pkv37m}vj-UV1e0$S7L!XCcCmJQ0;LuhPXGV_

diff --git a/components/renderJobs/renderJobsCheckBox.vue b/components/renderJobs/renderJobsCheckBox.vue
new file mode 100644
index 0000000..da50a5d
--- /dev/null
+++ b/components/renderJobs/renderJobsCheckBox.vue
@@ -0,0 +1,267 @@
+<template>
+    <view v-for="job in listData" :key="job.id">
+        <view
+            v-if="!job.isTitle"
+            class="cards"
+            @click="handleCardClick(job, $event)"
+            :class="{ 'card-selected': selectedJobs.includes(job.jobId) }"
+        >
+            <!-- 新增复选框 -->
+
+            <view class="card-content">
+                <view class="card-company">
+                    <view class="company">{{ job.jobTitle }}</view>
+                    <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="card-tag">
+                        <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="custom-checkbox" :class="{ checked: selectedJobs.includes(job.jobId) }">
+                        <view
+                            class="check-icon"
+                            @click.stop="toggleSelect(job.jobId)"
+                            :checked="selectedJobs.includes(job.jobId)"
+                            color="#4C6EFB"
+                        />
+                    </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, ref, defineExpose } from 'vue';
+const { insertSortData, navTo, vacanciesTo } = inject('globalFunction');
+import { useRecommedIndexedDBStore } from '@/stores/useRecommedIndexedDBStore.js';
+const recommedIndexDb = useRecommedIndexedDBStore();
+// 选中的岗位ID集合
+const selectedJobs = ref([]);
+const props = defineProps({
+    list: {
+        type: Array,
+        default: '标题',
+    },
+    longitude: {
+        type: Number,
+        default: 120.382665,
+    },
+    latitude: {
+        type: Number,
+        default: 36.066938,
+    },
+    seeDate: {
+        type: String,
+        default: '',
+    },
+});
+const emit = defineEmits(['update:selected']);
+
+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.jobId)}`);
+}
+
+function toggleSelect(jobId) {
+    const index = selectedJobs.value.indexOf(jobId);
+    if (index > -1) {
+        selectedJobs.value.splice(index, 1);
+    } else {
+        selectedJobs.value.push(jobId);
+    }
+    emit('update:selected', selectedJobs.value);
+}
+
+// 修改：卡片点击事件，避免点击复选框时触发跳转
+function handleCardClick(job, e) {
+    if (job.jobCategory) {
+        const recordData = recommedIndexDb.JobParameter(job);
+        recommedIndexDb.addRecord(recordData);
+    }
+    navTo(`/packageA/pages/post/post?jobId=${btoa(job.jobId)}`);
+}
+
+// 新增：提供选中状态和切换方法给父组件
+defineExpose({
+    selectedJobs,
+    toggleSelect,
+});
+</script>
+
+<style lang="stylus" scoped>
+// 新增样式
+.cards {
+    position: relative;
+    padding-left: 60rpx; /* 给复选框留出空间 */
+}
+
+.checkbox {
+    // position: absolute;
+    // left: 20rpx;
+    // top: 50%;
+    // transform: translateY(-50%);
+    // z-index: 10;
+}
+
+.card-content {
+    width: 100%;
+}
+
+// 选中状态样式
+.card-selected {
+    border: 2rpx solid #4C6EFB;
+    background-color: #F0F5FF;
+}
+
+.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;
+            flex: 1
+        }
+        .salary{
+            font-family: DIN-Medium;
+            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
+        justify-content: space-between
+    }
+    .card-tag{
+        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;
+    }
+}
+
+/* 复选框容器样式 */
+.checkbox {
+    /* 保留之前的定位样式，确保复选框在正确位置 */
+    position: absolute;
+    left: 20rpx;
+    top: 50%;
+    transform: translateY(-50%);
+    z-index: 10;
+}
+
+/* 自定义圆形复选框样式 */
+.custom-checkbox {
+    width: 40rpx;       /* 宽度 */
+    height: 40rpx;      /* 高度（与宽度一致形成圆形） */
+    border-radius: 50%; /* 圆角设为50%变成圆形 */
+    border: 2rpx solid #ccc; /* 未选中时的边框 */
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background-color: #fff; /* 背景色 */
+    transition: all 0.3s; /* 过渡动画 */
+}
+
+/* 选中状态样式 */
+.custom-checkbox.checked {
+    border-color: #4C6EFB; /* 选中时的边框颜色 */
+    background-color: #4C6EFB; /* 选中时的背景色 */
+}
+/* 选中时的对勾图标 */
+.check-icon {
+    margin-top: -4rpx;
+    width: 20rpx;
+    height: 10rpx;
+    border-bottom: 3rpx solid #fff; /* 对勾下边框 */
+    border-left: 3rpx solid #fff;   /* 对勾左边框 */
+    transform: rotate(-45deg);      /* 旋转形成对勾形状 */
+}
+</style>
diff --git a/config.js b/config.js
index 51753af..7e15146 100644
--- a/config.js
+++ b/config.js
@@ -21,7 +21,7 @@ export default {
         // 应用名称
         name: "青岛市就业服务",
         // 地区名
-        areaName: '青岛市',
+        areaName: '喀什',
         // AI名称
         AIName: '小红',
         // 应用版本
diff --git a/main.js b/main.js
index 8ae9e2a..d8ed6af 100644
--- a/main.js
+++ b/main.js
@@ -3,6 +3,7 @@ import * as Pinia from 'pinia'
 import globalFunction from '@/common/globalFunction'
 import '@/lib/string-similarity.min.js'
 import similarityJobs from '@/utils/similarity_Job.js';
+import config from '@/config.js';
 // 组件
 import AppLayout from './components/AppLayout/AppLayout.vue';
 import Empty from './components/empty/empty.vue';
@@ -47,7 +48,8 @@ export function createApp() {
 
     app.provide('globalFunction', {
         ...globalFunction,
-        similarityJobs
+        similarityJobs,
+        config
     });
     app.provide('deviceInfo', globalFunction.getdeviceInfo());
 
diff --git a/packageA/.DS_Store b/packageA/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..3ce9dd10aa59164d02db1068318f7fba98b7bd17
GIT binary patch
literal 6148
zcmeHKI|>3Z5S{S@f{mqRuHX%V=n1@lf?^{oiq>0sE|2D$PqQp`S}1Q|@{-BCguG&B
zM?`df+s;HLA~J#-%EN}P*}i$ldKpn59A{kbtIP3lI_^8U?*hgh%2_tDmtBi*J2Wal
z1*iZOpaN9j(+XsT9gRPIFwdg`RN&_ou<t{G8`i`o&_5j*yafOb5O%}ddkJ8%0I()D
zfr!8~sKB6Vwip_8#7pMY#3nH4qS<_C-mKZ7sNatBi>Hg$K#o*^3bYmI$8uuze+hrn
z|F=n8Q2{FOR|@E0v0BXWq^zx-$62i{@HO0Wo^UhFor1y3G0@8~7FLd@o)me-=Gd=^
UO`y{ecRG+i1Evd&3Vd6E7yp<P$p8QV

literal 0
HcmV?d00001

diff --git a/packageA/pages/.DS_Store b/packageA/pages/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..f98d6c5f82e7b369c25ea117d953ef2f422b7dac
GIT binary patch
literal 8196
zcmeHM%Wl&^6ur}i)@h)MP?5Spvc$H6LU{<W2_an+A%q$p3qU2VU25ujqS$Gus!CbI
zKky4|`4awx6`Xr#T5LB(s0##QCYm`D`<{86xnt)}h)A`E;dP=#BJz+Kn++5b65r>1
zB2C#V3qS=vk*17d%8~U6Yj?pZ;1qBQI0c*nPJzEc0lc$0d8fSh&0SYI1)Ku^r2_nX
z@R1o?7RLtV(Sbrj0ALN5C83TuKsdg|mc_9_p`uL_Jt#|6HpEbdj{82F16vly1`VB*
zp_8&bD;uFG=^Z>@%t^Hjy3#4&6ga5>$L<a4QHalzQv9B-C3-VRbN~z9RQHjuewTzA
zQJn%BfH6YMAJIe9f(qkvg)v8)v<<r$7*UFxQC8-t%N5T2Bn~}78yV#l?#Bw3`_q)*
z6QO2KB`UL0-+qS^jIzE};!Ds^;w)cY{;H;?Yv*QWy;-l}z3y)7Q8(}9!>rvKyyS0B
zwN8SgdM|h$N287A!ULV=y*P~qLWsi%Ca+$^X{bkSJxs$)xLtF@t9$j0=HkJ@&6SlU
z|K^=rhfDs!-5blOuiQR7tb3QPT)Vfvv6Jkk`UB>Hr0nC7E|~AfC2KQLkG<|7O?3K}
z$zl`Hd#qB7)#Z~MjWw>U(G=SjJ)uc!Sj}A4G(;IvAH1I@K^4u#lRlL^=^g9?T1C%&
zvsUGmCHABu!=qgpnf1Hs2*r!4_WQJswlf-n8<pEvtWME>Uc7T;y!zMsLOiI*Juh>B
zY8YXPot20>Tcpc<ii$;E&8k-MYF10l7u0HCMR*<&a1ZTI^lMhE#F`Vv(N5?Huc`v}
zUWs!NoPA_o*<E^!`EXxb$eXA2%Sx8om=VqnN=-Xu1z5R~ZG)acG4{F+dd$&B4D}{>
zUxDS`|8QNGoC0T1VA^mN8^G1m&;QTRvZFW!oC5!f0;<;OcG?*2(T~UKz&Y0Tk>4P5
qV!N?Hp`eg(94O&9@c0iy)P0yTr)6<$5Lb}gL4e5M3a7vyRp19VJyH1p

literal 0
HcmV?d00001

diff --git a/packageA/pages/choiceness/choiceness.vue b/packageA/pages/choiceness/choiceness.vue
index 16f89af..be17991 100644
--- a/packageA/pages/choiceness/choiceness.vue
+++ b/packageA/pages/choiceness/choiceness.vue
@@ -8,7 +8,7 @@
         <view class="main">
             <view class="main-header">
                 <view class="header-title btn-feel">企业推荐站</view>
-                <view class="header-text btn-feel">AI智联青岛，岗位触手可“职”！</view>
+                <view class="header-text btn-feel">AI智联{{ config.appInfo.areaName }}，岗位触手可“职”！</view>
                 <image class="header-img btn-shaky" src="/static/icon/companyBG.png"></image>
             </view>
             <view class="main-content">
@@ -24,7 +24,7 @@
 <script setup>
 import { inject, ref, reactive } from 'vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
-const { $api, navBack, navTo } = inject('globalFunction');
+const { $api, navBack, navTo, config } = inject('globalFunction');
 import { storeToRefs } from 'pinia';
 import useUserStore from '@/stores/useUserStore';
 const { getUserResume } = useUserStore();
diff --git a/packageA/pages/collection/collection.vue b/packageA/pages/collection/collection.vue
index 928dd70..0129863 100644
--- a/packageA/pages/collection/collection.vue
+++ b/packageA/pages/collection/collection.vue
@@ -15,12 +15,14 @@
                     <swiper-item class="list">
                         <scroll-view scroll-y class="main-scroll" @scrolltolower="handleScrollToLower">
                             <view class="mian">
-                                <renderJobs
+                                <renderJobsCheckBox
+                                    ref="jobListRef"
                                     :list="pageState.list"
                                     v-if="pageState.list.length"
                                     :longitude="longitudeVal"
                                     :latitude="latitudeVal"
-                                ></renderJobs>
+                                    @update:selected="updateSelectedCount"
+                                ></renderJobsCheckBox>
                                 <empty v-else pdTop="200"></empty>
                             </view>
                         </scroll-view>
@@ -41,18 +43,28 @@
                 </swiper>
             </view>
         </view>
+        <template #footer>
+            <view v-if="selectedJobCount > 0 && type === 0" class="compare-bar">
+                <view class="selected-count">已选中 {{ selectedJobCount }} 个岗位</view>
+                <button class="compare-btn" @click="handleCompare">岗位对比</button>
+            </view>
+        </template>
     </AppLayout>
 </template>
 
 <script setup>
-import { inject, ref, reactive } from 'vue';
+import { inject, ref, reactive, nextTick } from 'vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
 import { storeToRefs } from 'pinia';
 import useLocationStore from '@/stores/useLocationStore';
+import renderJobsCheckBox from '@/components/renderJobs/renderJobsCheckBox.vue';
 const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
-const { $api, navBack } = inject('globalFunction');
+const { $api, navBack, navTo } = inject('globalFunction');
 const type = ref(0);
-
+// 新增：获取renderJobs组件实例
+const jobListRef = ref(null);
+// 新增：选中的岗位数量
+const selectedJobCount = ref(0);
 const pageState = reactive({
     page: 0,
     list: [],
@@ -83,6 +95,32 @@ function changeType(e) {
     type.value = e;
 }
 
+// 监听选中数量变化
+function updateSelectedCount() {
+    nextTick(() => {
+        if (jobListRef.value) {
+            selectedJobCount.value = jobListRef.value.selectedJobs.length;
+        }
+    });
+}
+
+// 新增：对比按钮点击事件
+function handleCompare() {
+    if (selectedJobCount.value < 2) {
+        uni.showToast({
+            title: '请至少选择2个岗位进行对比',
+            icon: 'none',
+        });
+        return;
+    }
+    // 获取选中的岗位数据
+    const selectedJobs = jobListRef.value.selectedJobs;
+    const selectedJobData = pageState.list.filter((job) => selectedJobs.includes(job.jobId));
+    uni.setStorageSync('compare', selectedJobData);
+    // 跳转到对比页面（假设已创建对比页面）
+    navTo('/packageA/pages/collection/compare');
+}
+
 function handleScrollToLower() {
     getJobList();
 }
@@ -149,6 +187,35 @@ function getCompanyList(type = 'add') {
 </script>
 
 <style lang="stylus" scoped>
+// 新增底部对比栏样式
+.compare-bar {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 20rpx 30rpx;
+    background-color: #fff;
+    border-top: 1rpx solid #eee;
+    box-shadow: 0 -2rpx 10rpx rgba(0,0,0,0.05);
+
+    .selected-count {
+        font-size: 28rpx;
+        color: #333;
+    }
+
+    .compare-btn {
+        width: 200rpx;
+        height: 60rpx;
+        line-height: 60rpx;
+        background-color: #4C6EFB;
+        color: #fff;
+        border-radius: 30rpx;
+        font-size: 28rpx;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        margin: 0
+    }
+}
 .btn {
     display: flex;
     justify-content: space-between;
diff --git a/packageA/pages/collection/compare.vue b/packageA/pages/collection/compare.vue
new file mode 100644
index 0000000..d4a1ecb
--- /dev/null
+++ b/packageA/pages/collection/compare.vue
@@ -0,0 +1,208 @@
+<template>
+    <view class="job-comparison-container">
+        <scroll-view class="horizontal-scroll" scroll-x="true">
+            <view class="comparison-table">
+                <view class="table-row table-header">
+                    <view class="table-cell fixed-column"></view>
+                    <view v-for="(job, index) in jobs" :key="index" class="table-cell job-title-cell">
+                        <text>{{ job.jobTitle }}</text>
+                        <text class="company">{{ job.company }}</text>
+                    </view>
+                </view>
+
+                <view class="table-row">
+                    <view class="table-cell fixed-column detail-label">
+                        <text>薪资</text>
+                    </view>
+                    <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
+                        <view>
+                            <Salary-Expectation
+                                :max-salary="job.maxSalary"
+                                :min-salary="job.minSalary"
+                                :is-month="true"
+                            ></Salary-Expectation>
+                        </view>
+                    </view>
+                </view>
+
+                <view class="table-row">
+                    <view class="table-cell fixed-column detail-label">
+                        <text>公司名称</text>
+                    </view>
+                    <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
+                        <view>{{ job.companyName }}</view>
+                    </view>
+                </view>
+
+                <view class="table-row">
+                    <view class="table-cell fixed-column detail-label">
+                        <text>学历</text>
+                    </view>
+                    <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
+                        <view><dict-Label dictType="education" :value="job.education"></dict-Label></view>
+                    </view>
+                </view>
+
+                <view class="table-row">
+                    <view class="table-cell fixed-column detail-label">
+                        <text>经验</text>
+                    </view>
+                    <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
+                        <view><dict-Label dictType="experience" :value="job.experience"></dict-Label></view>
+                    </view>
+                </view>
+
+                <view class="table-row">
+                    <view class="table-cell fixed-column detail-label">
+                        <text>工作地点</text>
+                    </view>
+                    <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
+                        <view>{{ job.jobLocation }}</view>
+                    </view>
+                </view>
+
+                <view class="table-row">
+                    <view class="table-cell fixed-column detail-label">
+                        <text>来源</text>
+                    </view>
+                    <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
+                        <view>{{ job.dataSource }}</view>
+                    </view>
+                </view>
+
+                <view class="table-row">
+                    <view class="table-cell fixed-column detail-label">
+                        <text>职位描述</text>
+                    </view>
+                    <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
+                        <view>{{ job.description }}</view>
+                    </view>
+                </view>
+                <view class="table-row">
+                    <view class="table-cell fixed-column detail-label">
+                        <text>工业</text>
+                    </view>
+                    <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
+                        <view>
+                            <dict-tree-Label
+                                v-if="jobInfo.company && jobInfo.company.industry"
+                                dictType="industry"
+                                :value="jobInfo.company.industry"
+                            ></dict-tree-Label>
+                        </view>
+                    </view>
+                </view>
+                <view class="table-row">
+                    <view class="table-cell fixed-column detail-label">
+                        <text>企业规模</text>
+                    </view>
+                    <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
+                        <view>
+                            <dict-Label dictType="scale" :value="jobInfo.company?.scale"></dict-Label>
+                        </view>
+                    </view>
+                </view>
+                <view class="table-row">
+                    <view class="table-cell fixed-column detail-label">
+                        <text>热门</text>
+                    </view>
+                    <view v-for="(job, index) in jobs" :key="index" class="table-cell detail-content">
+                        <view>
+                            {{ job.isHot ? '是' : '否' }}
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </scroll-view>
+    </view>
+</template>
+
+<script setup>
+import { inject, ref, computed, nextTick } from 'vue';
+import { onLoad, onShow } from '@dcloudio/uni-app';
+import useDictStore from '@/stores/useDictStore';
+const jobs = ref([]);
+
+onLoad(() => {
+    let compareData = uni.getStorageSync('compare');
+    jobs.value = compareData;
+});
+</script>
+
+<style scoped>
+.job-comparison-container {
+    padding: 10px;
+    background-color: #f8f8f8;
+}
+
+.horizontal-scroll {
+    width: 100%;
+    white-space: nowrap; /* 保持 flex 子项在同一行 */
+}
+
+.comparison-table {
+    display: flex;
+    flex-direction: column;
+    width: fit-content;
+}
+
+.table-row {
+    display: flex;
+    border-bottom: 1px solid #e0e0e0;
+}
+
+.table-row:first-child {
+    border-bottom: 2px solid #ccc;
+}
+
+.table-cell {
+    flex-shrink: 0;
+    padding: 15px 10px;
+    border-right: 1px solid #e0e0e0;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    width: 150px;
+    white-space: normal;
+    word-break: break-all;
+}
+
+.table-cell:last-child {
+    border-right: none;
+}
+
+.fixed-column {
+    position: sticky;
+    left: 0;
+    z-index: 10;
+    background-color: #fff;
+    border-right: 2px solid #ccc;
+    width: 120px; /* 固定左侧列的宽度 */
+    text-align: left;
+}
+
+.table-header {
+    background-color: #f1f1f1;
+    font-weight: bold;
+}
+
+.job-title-cell {
+    text-align: center;
+}
+
+.company {
+    font-weight: normal;
+    font-size: 12px;
+    color: #666;
+}
+
+.detail-label {
+    font-weight: bold;
+    color: #333;
+}
+
+.detail-content {
+    text-align: center;
+}
+</style>
diff --git a/packageA/pages/jobExpect/jobExpect.vue b/packageA/pages/jobExpect/jobExpect.vue
index 9414cde..8c74219 100644
--- a/packageA/pages/jobExpect/jobExpect.vue
+++ b/packageA/pages/jobExpect/jobExpect.vue
@@ -47,7 +47,7 @@
 import { reactive, inject, watch, ref, onMounted, computed } from 'vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
 import SelectJobs from '@/components/selectJobs/selectJobs.vue';
-const { $api, navTo, navBack } = inject('globalFunction');
+const { $api, navTo, navBack, config } = inject('globalFunction');
 const openSelectPopup = inject('openSelectPopup');
 import { storeToRefs } from 'pinia';
 import useUserStore from '@/stores/useUserStore';
@@ -137,7 +137,7 @@ function changeArea() {
         data: [oneDictData('area')],
         success: (_, [value]) => {
             fromValue.area = value.value;
-            state.areaText = '青岛市-' + value.label;
+            state.areaText = config.appInfo.areaName + '-' + value.label;
         },
     });
 }
diff --git a/packageA/pages/myResume/corporateInformation.vue b/packageA/pages/myResume/corporateInformation.vue
new file mode 100644
index 0000000..7e213a3
--- /dev/null
+++ b/packageA/pages/myResume/corporateInformation.vue
@@ -0,0 +1,97 @@
+<template>
+    <view class="container">
+        <view class="info-card">
+            <view class="card-title">企业基本信息</view>
+            <view class="info-item">
+                <text class="label">企业名称</text>
+                <text class="value">泰科电子(上海)有限公司</text>
+            </view>
+            <view class="info-item">
+                <text class="label">法人名称</text>
+                <text class="value">李某</text>
+            </view>
+            <view class="info-item">
+                <text class="label">统一社会信用代码</text>
+                <text class="value">913100007504791552</text>
+            </view>
+        </view>
+
+        <view class="info-card">
+            <view class="card-title">营业执照</view>
+            <view class="info-item">
+                <text class="label">营业执照图片</text>
+                <image class="license-image" src="/static/business-license.png" mode="aspectFit"></image>
+            </view>
+        </view>
+
+        <view class="info-card">
+            <view class="card-title">企业联系人</view>
+            <view class="info-item">
+                <text class="label">联系人</text>
+                <text class="value">张三</text>
+            </view>
+            <view class="info-item">
+                <text class="label">联系人电话</text>
+                <text class="value">13812345678</text>
+            </view>
+        </view>
+    </view>
+</template>
+
+<style scoped>
+.container {
+    padding: 20rpx; /* 使用 rpx 适配不同屏幕 */
+    background-color: #f5f5f5; /* 页面背景色 */
+    min-height: 100vh;
+}
+
+.info-card {
+    background-color: #fff;
+    border-radius: 12rpx;
+    box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.05);
+    margin-bottom: 24rpx;
+    padding: 30rpx;
+}
+
+.card-title {
+    font-size: 36rpx;
+    font-weight: bold;
+    color: #333;
+    margin-bottom: 30rpx;
+    padding-bottom: 20rpx;
+    border-bottom: 1rpx solid #eee;
+}
+
+.info-item {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 15rpx 0;
+    border-bottom: 1rpx solid #f0f0f0;
+}
+
+.info-item:last-child {
+    border-bottom: none;
+}
+
+.label {
+    font-size: 30rpx;
+    color: #666;
+    flex-shrink: 0;
+    margin-right: 20rpx;
+}
+
+.value {
+    font-size: 30rpx;
+    color: #333;
+    text-align: right;
+    word-break: break-all;
+}
+
+.license-image {
+    width: 100%;
+    height: auto;
+    min-height: 300rpx; /* 设置最小高度以保证布局 */
+    margin-top: 20rpx;
+}
+</style>
diff --git a/packageA/pages/myResume/myResume.vue b/packageA/pages/myResume/myResume.vue
index 9ad5638..cdc0c94 100644
--- a/packageA/pages/myResume/myResume.vue
+++ b/packageA/pages/myResume/myResume.vue
@@ -55,7 +55,7 @@
             </view>
             <view class="mys-text">
                 <text>期望工作地：</text>
-                <text>青岛市-</text>
+                <text>{{ config.appInfo.areaName }}-</text>
                 <dict-Label dictType="area" :value="Number(userInfo.area)"></dict-Label>
             </view>
             <view class="mys-list">
@@ -64,12 +64,92 @@
                 </view>
             </view>
         </view>
+        <!-- 工作经历 -->
+        <view class="work-experience-container">
+            <!-- 标题栏：标题 + 编辑/添加按钮 -->
+            <view class="exp-header">
+                <text class="exp-title">工作经历</text>
+                <button class="exp-edit-btn" @click="handleEditOrAdd" size="mini" type="primary">
+                    <!-- <text>  {{ workExperiences.length > 0 ? '编辑' : '添加经历' }}</text> -->
+                    添加经历
+                </button>
+            </view>
+
+            <!-- 工作经历列表 -->
+            <view class="exp-list" v-if="workExperiences.length > 0">
+                <view class="exp-item" v-for="(item, index) in workExperiences" :key="item.id">
+                    <!-- 公司名称 + 职位 -->
+                    <view class="exp-company-row">
+                        <text class="exp-company">{{ item.companyName }}</text>
+                        <text class="exp-position">{{ item.position }}</text>
+                    </view>
+
+                    <!-- 工作时间 -->
+                    <view class="exp-date-row">
+                        <text class="exp-label">工作时间：</text>
+                        <text class="exp-date">{{ item.startDate }} - {{ item.endDate || '至今' }}</text>
+                    </view>
+
+                    <!-- 工作描述（支持多行） -->
+                    <view class="exp-desc-row" v-if="item.description">
+                        <text class="exp-label">工作描述：</text>
+                        <text class="exp-desc">{{ item.description }}</text>
+                    </view>
+
+                    <!-- 操作按钮（编辑/删除） -->
+                    <view class="exp-op-btn-row">
+                        <button class="exp-op-btn edit-btn" size="mini" @click.stop="handleEditItem(item)">编辑</button>
+                        <button
+                            class="exp-op-btn delete-btn"
+                            size="mini"
+                            type="warn"
+                            @click.stop="handleDeleteItem(index)"
+                        >
+                            删除
+                        </button>
+                    </view>
+
+                    <!-- 分隔线（最后一项不显示） -->
+                    <view class="exp-divider" v-if="index !== workExperiences.length - 1"></view>
+                </view>
+            </view>
+
+            <!-- 空状态提示（无工作经历时显示） -->
+            <view class="exp-empty" v-else>
+                <image class="empty-img" src="/static/icons/empty-work.png" mode="widthFix"></image>
+                <text class="empty-text">暂无工作经历，点击"添加经历"完善信息</text>
+            </view>
+        </view>
+
+        <!-- 4. 新增：简历上传区域（固定在页面底部） -->
+        <view class="resume-upload-section">
+            <!-- 上传按钮 -->
+            <button class="upload-btn" @click="handleResumeUpload" :loading="isUploading" :disabled="isUploading">
+                <uni-icons type="cloud-upload" size="20"></uni-icons>
+                <!-- <image class="upload-icon" src="/static/icons/upload-file.png" mode="widthFix"></image> -->
+                <text class="upload-text">
+                    {{ uploadedResumeName || '上传简历' }}
+                </text>
+                <!-- 已上传时显示“重新上传”文字 -->
+                <text class="reupload-text" v-if="uploadedResumeName">（重新上传）</text>
+            </button>
+
+            <!-- 上传说明 -->
+            <text class="upload-tip">支持 PDF、Word 格式，文件大小不超过 20MB</text>
+
+            <!-- 已上传文件信息（可选） -->
+            <view class="uploaded-file-info" v-if="uploadedResumeName">
+                <image class="file-icon" src="/static/icons/file-icon.png" mode="widthFix"></image>
+                <text class="file-name">{{ uploadedResumeName }}</text>
+                <button class="delete-file-btn" size="mini" @click.stop="handleDeleteResume">删除</button>
+            </view>
+        </view>
     </view>
 </template>
 
 <script setup>
 import { reactive, inject, watch, ref, onMounted, computed } from 'vue';
-const { $api, navTo } = inject('globalFunction');
+const { $api, navTo, config } = inject('globalFunction');
 import { onLoad, onShow } from '@dcloudio/uni-app';
 import { storeToRefs } from 'pinia';
 import useUserStore from '@/stores/useUserStore';
@@ -77,6 +157,77 @@ import useDictStore from '@/stores/useDictStore';
 const { userInfo } = storeToRefs(useUserStore());
 const { getUserResume } = useUserStore();
 const { getDictData, oneDictData } = useDictStore();
+
+const isUploading = ref(false); // 上传中状态
+const uploadedResumeName = ref(''); // 已上传简历文件名
+const uploadedResumeUrl = ref(''); // 已上传
+const workExperiences = ref([
+    {
+        id: 1, // 唯一标识（实际项目用后端返回ID）
+        companyName: 'XX科技有限公司', // 公司名称
+        position: '前端开发工程师', // 职位
+        startDate: '2021-07', // 开始日期（格式：YYYY-MM）
+        endDate: '2023-09', // 结束日期（空/undefined 表示“至今”）
+        description:
+            '1. 负责公司小程序及H5页面开发，基于UniApp+Vue3技术栈；2. 优化前端性能，首屏加载时间减少30%；3. 参与封装通用组件库，提升团队开发效率。', // 工作描述
+    },
+    {
+        id: 2,
+        companyName: 'YY互联网公司',
+        position: '实习前端工程师',
+        startDate: '2020-12',
+        endDate: '2021-06',
+        description: '1. 协助完成后台管理系统页面开发；2. 修复页面兼容性问题，适配多浏览器；3. 整理前端开发文档。',
+    },
+]);
+
+// 页面加载时可从接口拉取数据
+onLoad(() => {
+    // 实际项目中替换为接口请求：
+    // getWorkExperiences().then(res => {
+    //   workExperiences.value = res.data;
+    // }).catch(err => {
+    //   showToast({ title: '数据加载失败', icon: 'none' });
+    // });
+});
+
+// 整体编辑/添加（跳转编辑页）
+const handleEditOrAdd = () => {
+    // 跳转至“批量编辑”或“添加经历”页面（根据实际需求设计编辑页）
+    // router.push({
+    //   path: '/pages/workExperience/edit',
+    //   query: { type: workExperiences.value.length > 0 ? 'edit' : 'add' }
+    // });
+};
+
+// 编辑单个经历
+const handleEditItem = (item) => {
+    // 跳转至单个编辑页，并携带当前经历数据
+    // router.push({
+    //   path: '/pages/workExperience/editItem',
+    //   query: { item: JSON.stringify(item) } // 复杂数据需转JSON字符串（UniApp路由query不支持直接传对象）
+    // });
+};
+
+// 删除单个经历（带确认弹窗）
+const handleDeleteItem = (index) => {
+    uni.showModal({
+        title: '确认删除',
+        content: '此操作将删除该工作经历，是否继续？',
+        success: (res) => {
+            if (res.confirm) {
+                workExperiences.value.splice(index, 1); // 删除本地数据
+                $api.msg('删除成功');
+            }
+        },
+    });
+};
+
+// 简历上传核心逻辑
+const handleResumeUpload = () => {};
+
+// 删除已上传的简历
+const handleDeleteResume = () => {};
 </script>
 
 <style lang="stylus" scoped>
@@ -85,6 +236,8 @@ image{
     height: 100%
 }
 .mys-container{
+	padding-bottom: constant(safe-area-inset-bottom);
+	padding-bottom: env(safe-area-inset-bottom);
     .mys-tops{
         display: flex
         justify-content: space-between
@@ -179,4 +332,218 @@ image{
         }
     }
 }
+
+
+/* 容器样式（适配多端，用rpx做单位） */
+.work-experience-container {
+  padding: 20rpx 30rpx;
+  background-color: #fff;
+  border-radius: 16rpx;
+  margin: 20rpx;
+  box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+}
+
+/* 标题栏：两端对齐 */
+.exp-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 25rpx;
+}
+
+.exp-title {
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #333;
+}
+
+/* 编辑/添加按钮（UniApp按钮样式重置） */
+.exp-edit-btn {
+  padding: 0 20rpx;
+  height: 44rpx;
+  line-height: 44rpx;
+  font-size: 24rpx;
+  margin: 0
+}
+
+/* 经历列表容器 */
+.exp-list {
+  margin-top: 10rpx;
+}
+
+/* 单个经历卡片 */
+.exp-item {
+  padding: 20rpx 0;
+}
+
+/* 公司名称 + 职位（横向排列，职位右对齐） */
+.exp-company-row {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 15rpx;
+}
+
+.exp-company {
+  font-size: 28rpx;
+  font-weight: 500;
+  color: #333;
+}
+
+.exp-position {
+  font-size: 26rpx;
+  color: #666;
+}
+
+/* 工作时间/描述：标签+内容横向排列 */
+.exp-date-row, .exp-desc-row {
+  display: flex;
+  margin-bottom: 12rpx;
+  line-height: 1.6;
+}
+
+/* 标签样式（固定宽度，统一对齐） */
+.exp-label {
+  font-size: 26rpx;
+  color: #999;
+  min-width: 160rpx;
+}
+
+/* 内容样式 */
+.exp-date, .exp-desc {
+  font-size: 26rpx;
+  color: #333;
+  flex: 1; /* 内容占满剩余宽度，支持换行 */
+}
+
+/* 工作描述（支持多行换行） */
+.exp-desc {
+  word-break: break-all;
+}
+
+/* 操作按钮行（编辑+删除） */
+.exp-op-btn-row {
+  display: flex;
+  gap: 15rpx;
+  margin-top: 15rpx;
+  justify-content: flex-end;
+}
+
+.exp-op-btn {
+  padding: 0 15rpx;
+  height: 40rpx;
+  line-height: 40rpx;
+  font-size: 22rpx;
+  margin: 0
+}
+
+.edit-btn {
+  background-color: #e8f3ff;
+  color: #1677ff;
+}
+
+/* 分隔线 */
+.exp-divider {
+  height: 1rpx;
+  background-color: #f5f5f5;
+  margin-top: 20rpx;
+}
+
+/* 空状态样式 */
+.exp-empty {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 80rpx 0;
+  color: #999;
+}
+
+.empty-img {
+  width: 140rpx;
+  height: auto;
+  margin-bottom: 25rpx;
+  opacity: 0.6;
+}
+
+.empty-text {
+  font-size: 26rpx;
+  text-align: center;
+  line-height: 1.5;
+}
+
+
+/* 新增：简历上传区域样式 */
+.resume-upload-section {
+  margin-top: 30rpx;
+  padding-top: 25rpx;
+  border-top: 1px dashed #eee; /* 分隔线区分内容区域 */
+  display: flex;
+  flex-direction: column;
+  gap: 15rpx;
+  align-items: center;
+}
+
+/* 上传按钮 */
+.upload-btn {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 10rpx;
+  padding: 0 30rpx;
+  background-color: #f5f7fa;
+  color: #1677ff;
+  border-radius: 8rpx;
+  font-size: 26rpx;
+}
+
+.upload-icon {
+  width: 30rpx;
+  height: 30rpx;
+}
+
+.reupload-text {
+  font-size: 22rpx;
+  color: #666;
+}
+
+/* 上传说明文字 */
+.upload-tip {
+  font-size: 20rpx;
+  color: #999;
+  text-align: center;
+  line-height: 1.4;
+}
+
+/* 已上传文件信息 */
+.uploaded-file-info {
+  display: flex;
+  align-items: center;
+  gap: 15rpx;
+  padding: 15rpx 20rpx;
+  background-color: #fafafa;
+  border-radius: 8rpx;
+  margin-top: 10rpx;
+}
+
+.file-icon {
+  width: 36rpx;
+  height: 36rpx;
+}
+
+.file-name {
+  font-size: 24rpx;
+  color: #333;
+  max-width: 400rpx;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.delete-file-btn {
+  padding: 0 15rpx;
+  height: 36rpx;
+  line-height: 36rpx;
+  font-size: 22rpx;
+  color: #ff4d4f;
+  background-color: transparent;
+}
 </style>
diff --git a/packageA/pages/personalInfo/personalInfo.vue b/packageA/pages/personalInfo/personalInfo.vue
index cd2a968..9babd41 100644
--- a/packageA/pages/personalInfo/personalInfo.vue
+++ b/packageA/pages/personalInfo/personalInfo.vue
@@ -50,6 +50,10 @@
                     placeholder="请选择您的政治面貌"
                 />
             </view>
+            <view class="content-input">
+                <view class="input-titile">身份证</view>
+                <input class="input-con" v-model="fromValue.idcard" placeholder="空" />
+            </view>
             <view class="content-input">
                 <view class="input-titile">手机号码</view>
                 <input class="input-con" v-model="fromValue.phone" placeholder="请输入您的手机号码" />
@@ -81,6 +85,7 @@ const fromValue = reactive({
     birthDate: '',
     education: '',
     politicalAffiliation: '',
+    idcard: '',
 });
 onLoad(() => {
     initLoad();
@@ -101,6 +106,7 @@ function initLoad() {
     fromValue.birthDate = userInfo.value.birthDate;
     fromValue.education = userInfo.value.education;
     fromValue.politicalAffiliation = userInfo.value.politicalAffiliation;
+    fromValue.idcard = userInfo.value.idcard;
     // 回显
     state.educationText = dictLabel('education', userInfo.value.education);
     state.politicalAffiliationText = dictLabel('affiliation', userInfo.value.politicalAffiliation);
diff --git a/packageA/pages/post/post.vue b/packageA/pages/post/post.vue
index 5223077..fdef61a 100644
--- a/packageA/pages/post/post.vue
+++ b/packageA/pages/post/post.vue
@@ -56,6 +56,7 @@
                     {{ jobInfo.description }}
                 </view>
             </view>
+            <!-- 公司信息 -->
             <view class="content-card">
                 <view class="card-title">
                     <text class="title">公司信息</text>
@@ -97,7 +98,7 @@
                     ></map>
                 </view>
             </view>
-            <view class="content-card">
+            <view class="content-card" v-if="!userInfo.isCompanyUser">
                 <view class="card-title">
                     <text class="title">竞争力分析</text>
                 </view>
@@ -125,8 +126,52 @@
                     </view>
                 </view>
             </view>
-            <view style="height: 24px"></view>
+            <view class="content-card" v-else>
+                <view class="card-title">
+                    <view class="title">申请人列表</view>
+                </view>
+                <view class="applicant-list">
+                    <view v-for="applicant in applicants" :key="applicant.userId" class="applicant-item">
+                        <view class="item-header">
+                            <view class="name">{{ applicant.name }}</view>
+                            <view class="right-header">
+                                <view class="matching-degree">匹配度：{{ applicant.matchingDegree }}</view>
+                                <button class="resume-button" @click="viewResume(applicant.userId)">查看简历</button>
+                            </view>
+                        </view>
+                        <view class="item-details">
+                            <view class="detail-text">
+                                <view class="label">年龄：{{ applicant.age }}</view>
+                            </view>
+                            <view class="detail-text">
+                                <view class="label">
+                                    学历：
+                                    <dict-Label dictType="education" :value="applicant.education"></dict-Label>
+                                </view>
+                            </view>
+                            <view class="detail-text">
+                                <view class="label">
+                                    经验：
+                                    <dict-Label dictType="experience" :value="applicant.experience"></dict-Label>
+                                </view>
+                            </view>
+                            <view class="detail-text">
+                                <view class="label">
+                                    期望薪资：
+                                    <Salary-Expectation
+                                        style="display: inline-block"
+                                        :max-salary="applicant.maxSalary"
+                                        :min-salary="applicant.minSalary"
+                                        :is-month="true"
+                                    ></Salary-Expectation>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
         </view>
+        <view style="height: 34px"></view>
         <template #footer>
             <view class="footer">
                 <view class="btn-wq button-click" @click="jobApply">立即前往</view>
@@ -143,6 +188,9 @@ 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';
+import { storeToRefs } from 'pinia';
+import useUserStore from '@/stores/useUserStore';
+const { userInfo } = storeToRefs(useUserStore());
 const { $api, navTo, getLenPx, parseQueryParams, navBack, isEmptyObject } = inject('globalFunction');
 import config from '@/config.js';
 const matchingDegree = ref(['一般', '良好', '优秀', '极好']);
@@ -156,6 +204,33 @@ const raderData = ref({});
 const videoPalyerRef = ref(null);
 const explainUrlRef = ref('');
 
+const applicants = ref([
+    {
+        createTime: null,
+        userId: 1,
+        name: '青岛测试账号331',
+        age: '28', // 假设年龄有值
+        sex: '1',
+        birthDate: null,
+        education: '4',
+        politicalAffiliation: '',
+        phone: '',
+        avatar: '',
+        salaryMin: '10000',
+        salaryMax: '15000',
+        area: '3',
+        status: '0',
+        loginIp: '',
+        loginDate: null,
+        jobTitleId: '157,233,373',
+        experience: '3',
+        isRecommend: 1,
+        jobTitle: ['人力资源专员/助理', 'Java', '运维工程师'],
+        applyDate: '2025-09-26',
+        matchingDegree: 1,
+    },
+]);
+
 onLoad((option) => {
     if (option.jobId) {
         initLoad(option);
@@ -188,11 +263,14 @@ function seeExplain() {
 function getDetail(jobId) {
     return new Promise((reslove, reject) => {
         $api.createRequest(`/app/job/${jobId}`).then((resData) => {
-            const { latitude, longitude, companyName, companyId } = resData.data;
+            const { latitude, longitude, companyName, companyId, isCompanyUser } = resData.data;
             jobInfo.value = resData.data;
             reslove(resData.data);
             getCompanyIsAJobs(companyId);
-            getCompetivetuveness(jobId);
+            if (isCompanyUser) {
+                getCompetivetuveness(jobId);
+            }
+            // getCompetivetuveness(jobId);
             if (latitude && longitude) {
                 mapCovers.value = [
                     {
@@ -565,4 +643,100 @@ for i in 0..100
         line-height: 90rpx
     }
 }
+
+
+.content-card {
+    background-color: #fff;
+    border-radius: 8px;
+    margin: 10px;
+    padding: 15px;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+.card-title {
+    padding-bottom: 10px;
+    border-bottom: 1px solid #eee;
+    margin-bottom: 10px;
+}
+
+.title {
+    font-size: 18px;
+    font-weight: bold;
+    color: #333;
+}
+
+.applicant-list {
+    display: flex;
+    flex-direction: column;
+    gap: 15px;
+}
+
+.applicant-item {
+    padding: 15px;
+    background-color: #fafafa;
+    border-radius: 8px;
+    border: 1px solid #f0f0f0;
+}
+
+.item-header {
+    display: flex;
+    justify-content: space-between; /* 名字和右侧部分分开 */
+    align-items: center;
+    margin-bottom: 10px;
+}
+
+.right-header {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+}
+
+.name {
+    font-size: 16px;
+    font-weight: bold;
+    max-width: 100px; /* 限制名字的最大宽度，根据你的布局调整 */
+    overflow: hidden; /* 隐藏超出部分 */
+    white-space: nowrap; /* 不换行 */
+    text-overflow: ellipsis; /* 显示省略号 */
+}
+
+.matching-degree {
+    font-size: 14px;
+    color: #4CAF50;
+    font-weight: 500;
+}
+
+.resume-button {
+    font-size: 12px;
+    padding: 5px 10px;
+    border-radius: 20px;
+    border: 1px solid #007aff;
+    color: #007aff;
+    background-color: transparent;
+    line-height: 1;
+    height: auto;
+}
+
+.resume-button::after {
+    border: none;
+}
+
+.item-details {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 10px;
+}
+
+.detail-text {
+    font-size: 14px;
+    color: #666;
+    /* 确保标签和值在同一行 */
+    display: flex;
+    white-space: nowrap;
+}
+
+.label {
+    font-weight: bold;
+    color: #333;
+}
 </style>
diff --git a/pages.json b/pages.json
index 03570eb..6b48c5b 100644
--- a/pages.json
+++ b/pages.json
@@ -201,6 +201,20 @@
                     "navigationBarTitleText": "更多岗位",
                     "navigationBarBackgroundColor": "#FFFFFF"
                 }
+            },
+            {
+                "path": "pages/collection/compare",
+                "style": {
+                    "navigationBarTitleText": " 岗位对比",
+                    "navigationBarBackgroundColor": "#FFFFFF"
+                }
+            },
+            {
+                "path": "pages/myResume/corporateInformation",
+                "style": {
+                    "navigationBarTitleText": " 企业详情",
+                    "navigationBarBackgroundColor": "#FFFFFF"
+                }
             }
         ]
     }],
diff --git a/pages/chat/chat.vue b/pages/chat/chat.vue
index 591a30c..6173a35 100644
--- a/pages/chat/chat.vue
+++ b/pages/chat/chat.vue
@@ -55,7 +55,7 @@
             <header class="head">
                 <view class="main-header">
                     <image src="/static/icon/Hamburger-button.png" @click="toggleDrawer"></image>
-                    <view class="title">青岛市岗位推荐</view>
+                    <view class="title">{{ config.appInfo.areaName }}岗位推荐</view>
                     <image src="/static/icon/Comment-one.png" @click="addNewDialogue"></image>
                 </view>
             </header>
@@ -72,7 +72,7 @@
 
 <script setup>
 import { ref, inject, nextTick, computed } from 'vue';
-const { $api, navTo, insertSortData } = inject('globalFunction');
+const { $api, navTo, insertSortData, config } = inject('globalFunction');
 import { onLoad, onShow, onHide } from '@dcloudio/uni-app';
 import Tabbar from '@/components/tabbar/midell-box.vue';
 import useChatGroupDBStore from '@/stores/userChatGroupStore';
@@ -83,7 +83,6 @@ const { isTyping, tabeList, chatSessionID } = storeToRefs(useChatGroupDBStore())
 const { userInfo } = storeToRefs(useUserStore());
 const isDrawerOpen = ref(false);
 const scrollIntoView = ref(false);
-import config from '@/config';
 
 const searchText = ref('');
 const paging = ref(null);
diff --git a/pages/chat/components/ai-paging.vue b/pages/chat/components/ai-paging.vue
index 295b130..d08a0ae 100644
--- a/pages/chat/components/ai-paging.vue
+++ b/pages/chat/components/ai-paging.vue
@@ -7,9 +7,9 @@
         <view class="chat-background" v-fade:600="!messages.length">
         <!-- #endif -->
             <image class="backlogo" src="/static/icon/backAI.png"></image>
-            <view class="back-rowTitle">嗨！欢迎使用青岛AI智能求职</view>
+            <view class="back-rowTitle">嗨！欢迎使用{{ config.appInfo.areaName }}AI智能求职</view>
             <view class="back-rowText">
-                我可以根据您的简历和求职需求，帮你精准匹配青岛市互联网招聘信息，对比招聘信息的优缺点，提供面试指导等，请把你的任务交给我吧~
+                我可以根据您的简历和求职需求，帮你精准匹配{{ config.appInfo.areaName }}互联网招聘信息，对比招聘信息的优缺点，提供面试指导等，请把你的任务交给我吧~
             </view>
             <view class="back-rowh3">猜你所想</view>
             <view
@@ -259,7 +259,7 @@ import {
     watch,
 } from 'vue';
 import { storeToRefs } from 'pinia';
-import config from '@/config.js';
+// import config from '@/config.js';
 import useChatGroupDBStore from '@/stores/userChatGroupStore';
 import MdRender from '@/components/md-render/md-render.vue';
 import CollapseTransition from '@/components/CollapseTransition/CollapseTransition.vue';
@@ -271,7 +271,7 @@ import FileText from './fileText.vue';
 import { useAudioRecorder } from '@/hook/useRealtimeRecorder.js';
 import { useTTSPlayer } from '@/hook/useTTSPlayer.js';
 // 全局
-const { $api, navTo, throttle } = inject('globalFunction');
+const { $api, navTo, throttle, config } = inject('globalFunction');
 const emit = defineEmits(['onConfirm']);
 const { messages, isTyping, textInput, chatSessionID } = storeToRefs(useChatGroupDBStore());
 import successIcon from '@/static/icon/success.png';
diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue
index 138ae78..9948e24 100644
--- a/pages/index/components/index-one.vue
+++ b/pages/index/components/index-one.vue
@@ -6,9 +6,9 @@
                     <uni-icons class="iconsearch" color="#666666" type="search" size="18"></uni-icons>
                     <text class="inpute">职位名称、薪资要求等</text>
                 </view>
-                <view class="chart button-click">职业图谱</view>
+                <!-- <view class="chart button-click">职业图谱</view> -->
             </view>
-            <view class="cards">
+            <view class="cards" v-if="userInfo.isCompanyUser">
                 <view class="card press-button" @click="navTo('/pages/nearby/nearby')">
                     <view class="card-title">附近工作</view>
                     <view class="card-text">好岗职等你来</view>
@@ -19,7 +19,7 @@
                 </view>
             </view>
         </view>
-        <view class="nav-filter">
+        <view class="nav-filter" v-if="userInfo.isCompanyUser">
             <view class="filter-top" @touchmove.stop.prevent>
                 <scroll-view :scroll-x="true" :show-scrollbar="false" class="tab-scroll">
                     <view class="jobs-left">
@@ -96,7 +96,7 @@
                                         </view>
                                     </view>
                                     <view class="falls-card-company">
-                                        青岛
+                                        {{ config.appInfo.areaName }}
                                         <dict-Label dictType="area" :value="job.jobLocationAreaCode"></dict-Label>
                                     </view>
                                     <view class="falls-card-pepleNumber">
@@ -163,7 +163,7 @@
 import { reactive, inject, watch, ref, onMounted, watchEffect, nextTick } from 'vue';
 import img from '@/static/icon/filter.png';
 import dictLabel from '@/components/dict-Label/dict-Label.vue';
-const { $api, navTo, vacanciesTo, formatTotal } = inject('globalFunction');
+const { $api, navTo, vacanciesTo, formatTotal, config } = inject('globalFunction');
 import { onLoad, onShow } from '@dcloudio/uni-app';
 import { storeToRefs } from 'pinia';
 import useUserStore from '@/stores/useUserStore';
@@ -178,7 +178,7 @@ import { useColumnCount } from '@/hook/useColumnCount';
 const { isScrollingDown, handleScroll } = useScrollDirection();
 const recommedIndexDb = useRecommedIndexedDBStore();
 const emits = defineEmits(['onShowTabbar']);
-
+console.log(userInfo.value);
 const waterfallsFlowRef = ref(null);
 const loadmoreRef = ref(null);
 const conditionSearch = ref({});
@@ -205,6 +205,7 @@ const rangeOptions = ref([
     { value: 0, text: '推荐' },
     { value: 1, text: '最热' },
     { value: 2, text: '最新发布' },
+    { value: 3, text: '疆外' },
 ]);
 const isLoaded = ref(false);
 
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 209ee71..46e0c9a 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -3,42 +3,10 @@
         <view class="app-container">
             <!-- 主体内容区域 -->
             <view class="container-main">
-                <swiper class="swiper" :current="state.current" @change="changeSwiperType">
-                    <swiper-item class="swiper-item" v-for="(_, index) in 2" :key="index">
-                        <!-- #ifndef MP-WEIXIN -->
-                        <component
-                            :is="components[index]"
-                            @onShowTabbar="changeShowTabbar"
-                            :ref="(el) => handelComponentsRef(el, index)"
-                        />
-                        <!-- #endif -->
-                        <!-- #ifdef MP-WEIXIN -->
-                        <IndexOne
-                            v-show="currentIndex === 0"
-                            @onShowTabbar="changeShowTabbar"
-                            :ref="(el) => handelComponentsRef(el, index)"
-                        />
-                        <IndexTwo
-                            v-show="currentIndex === 1"
-                            @onShowTabbar="changeShowTabbar"
-                            :ref="(el) => handelComponentsRef(el, index)"
-                        />
-                        <!-- #endif -->
-                    </swiper-item>
-                </swiper>
+                <IndexOne @onShowTabbar="changeShowTabbar" />
             </view>
 
-            <Tabbar v-show="showTabbar" :currentpage="0"></Tabbar>
-
-            <!-- maskFristEntry -->
-            <view class="maskFristEntry" v-if="maskFristEntry">
-                <view class="entry-content">
-                    <text class="text1">左滑查看视频</text>
-                    <text class="text2">快去体验吧～</text>
-                    <view class="goExperience" @click="goExperience">去体验</view>
-                    <view class="maskFristEntry-Close" @click="closeFristEntry">1</view>
-                </view>
-            </view>
+            <Tabbar :currentpage="0"></Tabbar>
         </view>
     </view>
 </template>
@@ -48,79 +16,14 @@ import { reactive, inject, watch, ref, onMounted } from 'vue';
 import Tabbar from '@/components/tabbar/midell-box.vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
 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];
+// import IndexTwo from './components/index-two.vue';
 import { storeToRefs } from 'pinia';
 import { useReadMsg } from '@/stores/useReadMsg';
 const { unreadCount } = storeToRefs(useReadMsg());
-const showTabbar = ref(true);
-const maskFristEntry = ref(false);
 
 onLoad(() => {
-    // 判断浏览器是否有 fristEntry 第一次进入
-    let fristEntry = uni.getStorageSync('fristEntry') === false ? false : true; // 默认未读
-    maskFristEntry.value = fristEntry;
-    // maskFristEntry.value = true;
-});
-
-onShow(() => {
-    // 获取消息列表
     useReadMsg().fetchMessages();
 });
-
-const state = reactive({
-    current: 0,
-    all: [{}],
-});
-
-onMounted(() => {
-    handleTabChange(state.current);
-});
-
-const handelComponentsRef = (el, index) => {
-    if (el) {
-        swiperRefs[index].value = el;
-    }
-};
-
-function changeShowTabbar(val) {
-    showTabbar.value = val;
-}
-
-//1  查看消息类型
-function changeSwiperType(e) {
-    const index = e.detail.current;
-    state.current = index;
-    handleTabChange(index);
-}
-function changeType(index) {
-    state.current = index;
-    handleTabChange(index);
-}
-
-function handleTabChange(index) {
-    if (!loadedMap[index]) {
-        swiperRefs[index].value?.loadData();
-        loadedMap[index] = true;
-    }
-}
-
-function changeSwiperMsgType(e) {
-    const currented = e.detail.current;
-    state.current = currented;
-}
-// mask
-function closeFristEntry() {
-    uni.setStorageSync('fristEntry', false);
-    maskFristEntry.value = false;
-}
-
-function goExperience() {
-    closeFristEntry();
-    state.current = 1;
-}
 </script>
 
 <style lang="stylus" scoped>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 9b2e06d..f9593ec 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -8,7 +8,7 @@
                 </view>
                 <view class="btns">
                     <button class="wxlogin" @click="loginTest">内测登录</button>
-                    <view class="wxaddress">青岛市公共就业和人才服务中心</view>
+                    <view class="wxaddress">{{ config.appInfo.areaName }}公共就业和人才服务中心</view>
                 </view>
             </template>
             <template v-slot:tab1>
@@ -56,6 +56,10 @@
                             <view class="input-titile">学历</view>
                             <input class="input-con" v-model="state.educationText" disabled placeholder="本科" />
                         </view>
+                        <view class="content-input">
+                            <view class="input-titile">身份证</view>
+                            <input class="input-con2" v-model="fromValue.idcard" maxlength="18" placeholder="本科" />
+                        </view>
                     </view>
                     <view class="next-btn" @tap="nextStep">下一步</view>
                 </view>
@@ -119,10 +123,11 @@ import { reactive, inject, watch, ref, onMounted } from 'vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
 import useUserStore from '@/stores/useUserStore';
 import useDictStore from '@/stores/useDictStore';
-const { $api, navTo } = inject('globalFunction');
+const { $api, navTo, config, IdCardValidator } = inject('globalFunction');
 const { loginSetToken, getUserResume } = useUserStore();
 const { getDictSelectOption, oneDictData } = useDictStore();
 const openSelectPopup = inject('openSelectPopup');
+// console.log(config.appInfo.areaName);
 // status
 const selectJobsModel = ref();
 const tabCurrent = ref(0);
@@ -146,6 +151,7 @@ const fromValue = reactive({
     area: 0,
     jobTitleId: '',
     experience: '1',
+    idcard: '',
 });
 
 onLoad((parmas) => {
@@ -192,7 +198,7 @@ function changeArea() {
         data: [oneDictData('area')],
         success: (_, [value]) => {
             fromValue.area = value.value;
-            state.areaText = '青岛市-' + value.label;
+            state.areaText = config.appInfo.areaName + '-' + value.label;
         },
     });
 }
@@ -278,13 +284,19 @@ function loginTest() {
 }
 
 function complete() {
-    $api.createRequest('/app/user/resume', fromValue, 'post').then((resData) => {
-        $api.msg('完成');
-        getUserResume();
-        uni.reLaunch({
-            url: '/pages/index/index',
+    const result = IdCardValidator.validate(fromValue.idcard);
+    if (result.valid) {
+        $api.createRequest('/app/user/resume', fromValue, 'post').then((resData) => {
+            $api.msg('完成');
+            getUserResume();
+            uni.reLaunch({
+                url: '/pages/index/index',
+            });
         });
-    });
+    } else {
+        $api.msg('身份证校验失败');
+        console.log('验证失败:', result.message);
+    }
 }
 </script>
 
@@ -401,6 +413,13 @@ function complete() {
             font-weight: 400;
             font-size: 28rpx;
             color: #6A6A6A;
+        .input-con2
+            font-weight: 400;
+            font-size: 32rpx;
+            color: #333333;
+            line-height: 80rpx;
+            height: 80rpx;
+            border-bottom: 2rpx solid #EBEBEB
         .input-con
             font-weight: 400;
             font-size: 32rpx;
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index e3b7321..300bb5a 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -1,6 +1,6 @@
 <template>
     <AppLayout title="我的" back-gorund-color="#F4F4F4">
-        <view class="mine-userinfo btn-feel" @click="navTo('/packageA/pages/myResume/myResume')">
+        <view class="mine-userinfo btn-feel" @click="seeDetail">
             <view class="userindo-head">
                 <image class="userindo-head-img" v-if="userInfo.sex === '0'" src="/static/icon/boy.png"></image>
                 <image class="userindo-head-img" v-else src="/static/icon/girl.png"></image>
@@ -135,6 +135,13 @@ function getUserstatistics() {
         counts.value = resData.data;
     });
 }
+function seeDetail() {
+    if (userInfo.isCompanyUser) {
+        navTo('/packageA/pages/myResume/corporateInformation');
+    } else {
+        navTo('/packageA/pages/myResume/myResume');
+    }
+}
 </script>
 
 <style lang="stylus" scoped>
diff --git a/pages/nearby/components/four.vue b/pages/nearby/components/four.vue
index e2860bb..1cf2833 100644
--- a/pages/nearby/components/four.vue
+++ b/pages/nearby/components/four.vue
@@ -118,6 +118,7 @@ const rangeOptions = ref([
     { value: 0, text: '推荐' },
     { value: 1, text: '最热' },
     { value: 2, text: '最新发布' },
+    { value: 3, text: '疆外' },
 ]);
 
 function choosePosition(index) {
diff --git a/pages/nearby/components/one.vue b/pages/nearby/components/one.vue
index 53c3adc..5c159bf 100644
--- a/pages/nearby/components/one.vue
+++ b/pages/nearby/components/one.vue
@@ -145,6 +145,7 @@ const rangeOptions = ref([
     { value: 0, text: '推荐' },
     { value: 1, text: '最热' },
     { value: 2, text: '最新发布' },
+    { value: 3, text: '疆外' },
 ]);
 
 function changeRangeShow() {
diff --git a/pages/nearby/components/three.vue b/pages/nearby/components/three.vue
index 973ca51..00717aa 100644
--- a/pages/nearby/components/three.vue
+++ b/pages/nearby/components/three.vue
@@ -159,6 +159,7 @@ const rangeOptions = ref([
     { value: 0, text: '推荐' },
     { value: 1, text: '最热' },
     { value: 2, text: '最新发布' },
+    { value: 3, text: '疆外' },
 ]);
 onLoad(() => {
     getSubway();
diff --git a/pages/nearby/components/two.vue b/pages/nearby/components/two.vue
index 2ffc419..f544bd0 100644
--- a/pages/nearby/components/two.vue
+++ b/pages/nearby/components/two.vue
@@ -122,6 +122,7 @@ const rangeOptions = ref([
     { value: 0, text: '推荐' },
     { value: 1, text: '最热' },
     { value: 2, text: '最新发布' },
+    { value: 3, text: '疆外' },
 ]);
 
 function choosePosition(index) {
diff --git a/pages/nearby/nearby.vue b/pages/nearby/nearby.vue
index 44833ad..3e97cda 100644
--- a/pages/nearby/nearby.vue
+++ b/pages/nearby/nearby.vue
@@ -9,7 +9,7 @@
             <view class="nearby-head">
                 <view class="head-item" :class="{ actived: state.current === 0 }" @click="changeType(0)">附近工作</view>
                 <view class="head-item" :class="{ actived: state.current === 1 }" @click="changeType(1)">区县工作</view>
-                <view class="head-item" :class="{ actived: state.current === 2 }" @click="changeType(2)">地铁周边</view>
+                <view class="head-item" :class="{ actived: state.current === 2 }" @click="changeType(2)">公交周边</view>
                 <view class="head-item" :class="{ actived: state.current === 3 }" @click="changeType(3)">商圈附近</view>
             </view>
             <view class="nearby-content">
diff --git a/pages/search/search.vue b/pages/search/search.vue
index 513227f..e99ce3f 100644
--- a/pages/search/search.vue
+++ b/pages/search/search.vue
@@ -23,46 +23,11 @@
                 </view>
                 <view class="search-btn button-click" @click="searchBtn">搜索</view>
             </view>
-            <view class="view-top" v-show="listCom.length || list.length">
-                <view class="top-item" @click="changeType(0)" :class="{ active: currentTab === 0 }">综合</view>
-                <view class="top-item" @click="changeType(1)" :class="{ active: currentTab === 1 }">视频</view>
-            </view>
         </view>
         <scroll-view scroll-y class="Detailscroll-view" v-show="listCom.length" @scrolltolower="choosePosition">
-            <view class="cards-box" v-show="currentTab === 0">
+            <view class="cards-box">
                 <renderJobs :list="listCom" :longitude="longitudeVal" :latitude="latitudeVal"></renderJobs>
             </view>
-            <view class="cards-box" style="padding-top: 24rpx" v-show="currentTab === 1">
-                <custom-waterfalls-flow
-                    ref="waterfallsFlowRef"
-                    :column="columnCount"
-                    :columnSpace="columnSpace"
-                    @loaded="imageloaded"
-                    :value="list"
-                >
-                    <template v-slot:default="job">
-                        <view class="slot-item">
-                            <view class="job-image btn-feel" @click="nextVideo(job)">
-                                <image class="cover-image" :src="job.cover" mode="aspectFill"></image>
-                                <view class="cover-triangle"></view>
-                            </view>
-                            <view class="job-info" @click="nextDetail(job)">
-                                <view class="salary">
-                                    <Salary-Expectation
-                                        :max-salary="job.maxSalary"
-                                        :min-salary="job.minSalary"
-                                        :is-month="true"
-                                    ></Salary-Expectation>
-                                    <image v-if="job.isHot" class="flame" src="/static/icon/flame.png"></image>
-                                </view>
-                                <view class="title">{{ job.jobTitle }}</view>
-                                <view class="desc">{{ job.companyName }}</view>
-                            </view>
-                        </view>
-                    </template>
-                </custom-waterfalls-flow>
-                <loadmore ref="loadmoreRef"></loadmore>
-            </view>
         </scroll-view>
         <view class="main-content" v-show="!listCom.length">
             <view class="content-top">
@@ -93,6 +58,7 @@ import img from '@/static/icon/filter.png';
 const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
 const searchValue = ref('');
 const historyList = ref([]);
+const searchParams = ref({});
 const listCom = ref([]);
 const pageState = reactive({
     page: 0,
@@ -103,51 +69,12 @@ const pageState = reactive({
         order: 0,
     },
 });
-const isLoaded = ref(false);
-const waterfallsFlowRef = ref(null);
-const loadmoreRef = ref(null);
-const currentTab = ref(0);
 // 响应式搜索条件（可以被修改）
-const searchParams = ref({});
-const pageSize = ref(10);
-
-const { list, loading, refresh, loadMore } = usePagination(
-    (params) => $api.createRequest('/app/job/littleVideo', params, 'GET', true),
-    dataToImg, // 转换函数
-    {
-        pageSize: pageSize,
-        search: searchParams,
-        dataKey: 'data',
-        autoWatchSearch: true,
-        onBeforeRequest: () => {
-            loadmoreRef.value?.change('loading');
-        },
-        onAfterRequest: () => {
-            loadmoreRef.value?.change('more');
-        },
-    }
-);
 
 async function choosePosition(index) {
-    if (currentTab.value === 0) {
-        getJobList('add');
-    } else {
-        loadMore();
-    }
+    getJobList('add');
 }
 
-function imageloaded() {
-    loadmoreRef.value?.change('more');
-}
-
-const { columnCount, columnSpace } = useColumnCount(() => {
-    pageSize.value = 10 * (columnCount.value - 1);
-    nextTick(() => {
-        waterfallsFlowRef.value?.refresh?.();
-        useLocationStore().getLocation();
-    });
-});
-
 onLoad(() => {
     let arr = uni.getStorageSync('searchList');
     if (arr) {
@@ -156,18 +83,7 @@ onLoad(() => {
 });
 
 function changeType(type) {
-    if (currentTab.value === type) return;
-    switch (type) {
-        case 0:
-            currentTab.value = 0;
-            getJobList('refresh');
-            break;
-        case 1:
-            currentTab.value = 1;
-            refresh();
-            waterfallsFlowRef.value?.refresh?.();
-            break;
-    }
+    getJobList('refresh');
 }
 function searchFn(item) {
     searchValue.value = item;
@@ -184,12 +100,7 @@ function searchBtn() {
     searchParams.value = {
         jobTitle: searchValue,
     };
-    if (currentTab.value === 0) {
-        getJobList('refresh');
-    } else {
-        refresh();
-        waterfallsFlowRef.value?.refresh?.();
-    }
+    getJobList('refresh');
 }
 
 function searchCollection(e) {
diff --git a/stores/useUserStore.js b/stores/useUserStore.js
index 646a226..c76adc0 100644
--- a/stores/useUserStore.js
+++ b/stores/useUserStore.js
@@ -93,7 +93,7 @@ const useUserStore = defineStore("user", () => {
                 similarityJobs.setUserInfo(resume.data)
                 setUserInfo(resume);
                 reslove(resume)
-            });
+            }).catch(() => reject());
         })
     }
 
diff --git a/unpackage/.DS_Store b/unpackage/.DS_Store
index 20830e3beef54731f66cbc62c69443c877c9dd50..bf448a38651e118577d9bab9aec2a59f087c58fb 100644
GIT binary patch
delta 21
ccmZoMXffDufQ7@*$Vf-Q*us4C2^Je+07;|<HUIzs

delta 21
ccmZoMXffDufQ7@vz(hyE)WCT22^Je+07;1kF8}}l

diff --git a/unpackage/dist/.DS_Store b/unpackage/dist/.DS_Store
index d59376b6d30efd9ad20bfca0447518b7736c2299..94e7767d38ab8e26c0ca5000fea954a0063908db 100644
GIT binary patch
delta 21
ccmZoMXffDugo(q@$Vf-Q*us4C872!+07=RQH~;_u

delta 21
ccmZoMXffDugo(q%z(hyE)WCT2872!+07<U~F#rGn

diff --git a/unpackage/dist/build/.DS_Store b/unpackage/dist/build/.DS_Store
index ebaec99ee7b82acfcf04dd24d3559cc005dfe9cf..3207f1f23a83e79dce49eaa0f506ff3c44f30a46 100644
GIT binary patch
delta 72
zcmZoMXfc=|#>CJzu~2NHo+2aT!~knX#>qTPnw!;_AF^yVU@m0Z%+A5j0aUVCk@-9G
aWPTA{PDTa>h66y%FxiGjdUK4(5@rCLXc001

delta 305
zcmZoMXfc=|#>B)qu~2NHo+2aj!~pA!2O1cGj2_K;W`=TxREDIa^5TM|octsP28JC;
z1v#0;B?bo97@3$^SlQS)*g3d4VuLgC%Y#c2OG=BK5{sfiypa6-oFo`KF)1uFwLD%x
z#5q5&Br!8DwFs;sGbI(MBqlsFFD1X+DZex?r5LO?7$U)u#L2-KFCbA}ZDL@eqhM-a
zT&tr{ZE0knqhMleR$I%-A*!rz9TcCPlbe^{1#}z`Ffu}D23{x)qq>0%sCUYOi}G^v
w^U{GLj2kz8WZBHl!OsB<f{h!$Gf(Ch(G>yd0h!YPp}|IO4iVYFJh6cV0HM-OPyhe`