diff --git a/apiRc/jobRecommend.js b/apiRc/jobRecommend.js
deleted file mode 100644
index 59f9282..0000000
--- a/apiRc/jobRecommend.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * @Date: 2025-11-12
- * @Description: 职业推荐相关接口
- */
-import request from '@/utilsRc/request'
-
-function createFormData(payload = {}) {
-  if (typeof FormData !== 'undefined') {
-    const formData = new FormData()
-    Object.keys(payload).forEach(key => {
-      const value = payload[key]
-      if (value !== undefined && value !== null && value !== '') {
-        formData.append(key, value)
-      }
-    })
-    return formData
-  }
-  return payload
-}
-
-export function recommendJob(data) {
-  const params = {};
-  if (data?.jobName !== undefined && data?.jobName !== null && data?.jobName !== '') {
-    params.jobName = String(data.jobName);
-  }
-
-  return request({
-    url: '/job/recommendJobByJobName',
-    method: 'get',
-    params: params,
-    baseUrlType: 'zytp'
-  })
-}
diff --git a/apiRc/jobSkill.js b/apiRc/jobSkill.js
deleted file mode 100644
index 8741153..0000000
--- a/apiRc/jobSkill.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * @Date: 2025-11-12
- * @Description: 职业技能相关接口
- */
-import request from '@/utilsRc/request'
-
-export function getJobSkillDetail(params) {
-  return request({
-    url: '/jobSkillDet/getJobSkillDet',
-    method: 'get',
-    params,
-    baseUrlType: 'zytp'
-  })
-}
-
-// 获取技能权重
-export function getJobSkillWeight(params) {
-  return request({
-    url: '/jobSkillDet/getJobSkillWeight',
-    method: 'get',
-    params,
-    baseUrlType: 'zytp'
-  })
-}
-
-// 暂未使用 - 如果需要在 CareerPath.vue 中点击路径职位查看详细技能信息时使用
-// 使用场景：获取职业路径中某个职位的详细技能信息（包含技能分数、类型等）
-// export function getJobPathSkill(data) {
-//   let formData
-//   if (typeof FormData !== 'undefined') {
-//     formData = new FormData()
-//     if (data?.pathId !== undefined && data?.pathId !== null) {
-//       formData.append('pathId', data.pathId)
-//     }
-//     if (data?.currentJobName !== undefined && data?.currentJobName !== null) {
-//       formData.append('currentJobName', data.currentJobName)
-//     }
-//   } else {
-//     formData = {
-//       pathId: data?.pathId ?? '',
-//       currentJobName: data?.currentJobName ?? ''
-//     }
-//   }
-
-//   return request({
-//     url: '/jobSkillDet/getJobPathSkill',
-//     method: 'post',
-//     data: formData,
-//     baseUrlType: 'zytp',
-//     header: {
-//       'content-type': 'multipart/form-data'
-//     }
-//   })
-// }
-
diff --git a/apiRc/login.js b/apiRc/login.js
index eb70902..53af344 100644
--- a/apiRc/login.js
+++ b/apiRc/login.js
@@ -83,3 +83,15 @@ export function getInfo() {
     method: 'get'
   })
 }
+
+// 重新发送验证码
+export function sendSmsAgain(data) {
+  return request({
+    method: 'post',
+    url: '/app/sendSmsAgain',
+    data,
+    headers: {
+      isToken: false
+    }
+  })
+}
diff --git a/apiRc/service/careerPath.js b/apiRc/service/careerPath.js
new file mode 100644
index 0000000..09bbf6c
--- /dev/null
+++ b/apiRc/service/careerPath.js
@@ -0,0 +1,37 @@
+/*
+ * @Date: 2024-09-25 11:14:29
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-12-23 17:40:11
+ * @Description: 职业路径相关接口
+ */
+import request from '@/utilsRc/request'
+
+// 获取当前职位
+export function getCurrentPosition(query) {
+  return request({
+    url: '/jobPath/getJob',
+    method: 'get',
+    params: query,
+    baseUrlType: 'zytp'
+  })
+}
+
+// 获取路径列表
+export function getPath(query) {
+  return request({
+    url: '/jobPath/getJobPathList',
+    method: 'get',
+    params: query,
+    baseUrlType: 'zytp'
+  })
+}
+
+// 获取路径详情
+export function getPathDetail(query) {
+  return request({
+    url: '/jobPath/getJobPathById',
+    method: 'get',
+    params: query,
+    baseUrlType: 'zytp'
+  })
+}
diff --git a/apiRc/service/careerRecommendation.js b/apiRc/service/careerRecommendation.js
new file mode 100644
index 0000000..67e0247
--- /dev/null
+++ b/apiRc/service/careerRecommendation.js
@@ -0,0 +1,37 @@
+/*
+ * @Date: 2024-09-25 11:14:29
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-12-23 17:40:11
+ * @Description: 职业推荐相关接口
+ */
+import request from '@/utilsRc/request'
+
+// 获取职业列表
+export function getProfessions(query) {
+  return request({
+    url: '/jobSimilarity/getJob',
+    method: 'get',
+    params: query,
+    baseUrlType: 'zytp'
+  })
+}
+
+// 获取技能标签
+export function getSkillTags(query) {
+  return request({
+    url: '/jobSkillDet/getJobSkill',
+    method: 'get',
+    params: query,
+    baseUrlType: 'zytp'
+  })
+}
+
+// 获取推荐职业
+export function getRecommend(query) {
+  return request({
+    url: '/jobSimilarity/recommendJobByJobName',
+    method: 'get',
+    params: query,
+    baseUrlType: 'zytp'
+  })
+}
diff --git a/apiRc/jobPath.js b/apiRc/service/jobPath.js
similarity index 100%
rename from apiRc/jobPath.js
rename to apiRc/service/jobPath.js
diff --git a/apiRc/service/jobRecommend.js b/apiRc/service/jobRecommend.js
index 92c7170..e3654e3 100644
--- a/apiRc/service/jobRecommend.js
+++ b/apiRc/service/jobRecommend.js
@@ -76,11 +76,16 @@ export function getAddedJobs(params) {
   })
 }
 
-// // 获取推荐岗位
-// export function getAddedJobs(params) {
-//   return request({
-//     url: '/personnel/personBaseInfo/postRecommend',
-//     method: 'get',
-//     params,
-//   })
-// }
+export function recommendJob(data) {
+    const params = {};
+    if (data?.jobName !== undefined && data?.jobName !== null && data?.jobName !== '') {
+        params.jobName = String(data.jobName);
+    }
+
+    return request({
+        url: '/job/recommendJobByJobName',
+        method: 'get',
+        params: params,
+        baseUrlType: 'zytp'
+    })
+}
diff --git a/apiRc/service/jobSkill.js b/apiRc/service/jobSkill.js
new file mode 100644
index 0000000..38583d2
--- /dev/null
+++ b/apiRc/service/jobSkill.js
@@ -0,0 +1,24 @@
+/*
+ * @Date: 2025-11-12
+ * @Description: 职业技能相关接口
+ */
+import request from '@/utilsRc/request'
+
+export function getJobSkillDetail(params) {
+  return request({
+    url: '/jobSkillDet/getJobSkillDet',
+    method: 'get',
+    params,
+    baseUrlType: 'zytp'
+  })
+}
+
+// 获取技能权重
+export function getJobSkillWeight(params) {
+  return request({
+    url: '/jobSkillDet/getJobSkillWeight',
+    method: 'get',
+    params,
+    baseUrlType: 'zytp'
+  })
+}
diff --git a/apiRc/service/skillDevelopment.js b/apiRc/service/skillDevelopment.js
new file mode 100644
index 0000000..a8d190d
--- /dev/null
+++ b/apiRc/service/skillDevelopment.js
@@ -0,0 +1,27 @@
+/*
+ * @Date: 2024-09-25 11:14:29
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2025-12-23 17:40:11
+ * @Description: 技能发展相关接口
+ */
+import request from '@/utilsRc/request'
+
+// 获取技能信息
+export function getCareerPath(query) {
+  return request({
+    url: '/jobPath/getJobPathJobList',
+    method: 'get',
+    params: query,
+    baseUrlType: 'zytp'
+  })
+}
+
+// 获取技能信息
+export function getSkillResult(query) {
+  return request({
+    url: '/jobDimScore/getJobDimScoreList',
+    method: 'get',
+    params: query,
+    baseUrlType: 'zytp'
+  })
+}
diff --git a/common/common.css b/common/common.css
index 4572eda..f4744f1 100644
--- a/common/common.css
+++ b/common/common.css
@@ -417,6 +417,136 @@ html {
     background-color: #ffffff !important;
 }
 
+/* #ifdef H5 */
+/* H5端字体和边距调整 - 放大1.5倍 */
+html, body {
+    font-size: 150% !important;
+}
+
+/* 调整页面基础字体大小 */
+page {
+    font-size: 42rpx !important;
+}
+
+/* 调整特定类的字体大小 */
+.fs_10 {
+    font-size: 30rpx !important;
+}
+
+.fs_12 {
+    font-size: 36rpx !important;
+}
+
+.fs_14 {
+    font-size: 42rpx !important;
+}
+
+.fs_16 {
+    font-size: 48rpx !important;
+}
+
+.fs_18 {
+    font-size: 54rpx !important;
+}
+
+.fs_20 {
+    font-size: 60rpx !important;
+}
+
+.fs_22 {
+    font-size: 66rpx !important;
+}
+
+.fs_24 {
+    font-size: 72rpx !important;
+}
+
+.fs_26 {
+    font-size: 78rpx !important;
+}
+
+.fs_28 {
+    font-size: 84rpx !important;
+}
+
+.fs_30 {
+    font-size: 90rpx !important;
+}
+
+.fs_32 {
+    font-size: 96rpx !important;
+}
+
+/* 调整边距类 */
+.mar_le30 {
+    margin-left: 90rpx !important;
+}
+
+.mar_le25 {
+    margin-left: 75rpx !important;
+}
+
+.mar_le20 {
+    margin-left: 60rpx !important;
+}
+
+.mar_le15 {
+    margin-left: 45rpx !important;
+}
+
+.mar_le10 {
+    margin-left: 30rpx !important;
+}
+
+.mar_le5 {
+    margin-left: 15rpx !important;
+}
+
+.mar_ri5 {
+    margin-right: 15rpx !important;
+}
+
+.mar_ri10 {
+    margin-right: 30rpx !important;
+}
+
+.mar_ri15 {
+    margin-right: 45rpx !important;
+}
+
+.mar_ri20 {
+    margin-right: 60rpx !important;
+}
+
+.mar_ri25 {
+    margin-right: 75rpx !important;
+}
+
+.mar_top0 {
+    margin-top: 0 !important;
+}
+
+.mar_top5 {
+    margin-top: 15rpx !important;
+}
+
+.mar_top10 {
+    margin-top: 30rpx !important;
+}
+
+.mar_top15 {
+    margin-top: 45rpx !important;
+}
+
+.mar_top20 {
+    margin-top: 60rpx !important;
+}
+
+.mar_top25 {
+    margin-top: 75rpx !important;
+}
+/* #endif */
+
 
 
 /* 弹性布局 */
diff --git a/common/globalFunction.js b/common/globalFunction.js
index 8a183eb..de59a3b 100644
--- a/common/globalFunction.js
+++ b/common/globalFunction.js
@@ -72,18 +72,18 @@ export const navTo = function(url, {
         const pages = getCurrentPages();
         if (pages.length >= 10) {
             uni.redirectTo({
-                url: '/pages/complete-info/complete-info',
+                url: '/packageA/pages/complete-info/complete-info',
                 fail: (err) => {
                     console.error('页面跳转失败:', err);
                 }
             });
         } else {
             uni.navigateTo({
-                url: '/pages/complete-info/complete-info',
+                url: '/packageA/pages/complete-info/complete-info',
                 fail: (err) => {
                     console.error('页面跳转失败:', err);
                     uni.redirectTo({
-                        url: '/pages/complete-info/complete-info',
+                        url: '/packageA/pages/complete-info/complete-info',
                         fail: (err2) => {
                             console.error('redirectTo也失败:', err2);
                         }
@@ -584,6 +584,86 @@ function isInWechatMiniProgramWebview() {
 function isEmptyObject(obj) {
     return obj && typeof obj === 'object' && !Array.isArray(obj) && Object.keys(obj).length === 0;
 }
+
+/**
+ * 农历日期工具
+ * 提供公历转农历日期的中文表示
+ */
+export const LunarUtil = {
+    /**
+     * 获取农历日期的中文表示
+     * @param {number} year - 公历年
+     * @param {number} month - 公历月 (1-12)
+     * @param {number} day - 公历日
+     * @returns {string} 农历日期的中文表示（初一、初二...三十）
+     */
+    getLunarDayInChinese(year, month, day) {
+        // 这里使用简化的农历转换算法
+        // 实际项目中可以根据需要扩展更完整的农历功能
+        const lunarDays = this.solarToLunar(year, month, day);
+        return this.getDayInChinese(lunarDays.day);
+    },
+    
+    /**
+     * 简化的公历转农历日期算法
+     * 注意：这是一个简化版，实际农历计算更复杂
+     * 仅用于生成初一到三十的日期表示
+     */
+    solarToLunar(year, month, day) {
+        // 这里使用简化算法，实际项目中可以使用更精确的算法
+        // 对于本项目，我们只需要生成初一到三十的序列
+        // 实际的农历计算需要考虑节气、闰月等因素
+        const daysInMonth = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+        
+        // 处理闰年
+        if ((year % 4 === 0 && year % 100 !== 0) || year % 400 === 0) {
+            daysInMonth[1] = 29;
+        }
+        
+        // 计算当年已过天数
+        let dayOfYear = 0;
+        for (let i = 0; i < month - 1; i++) {
+            dayOfYear += daysInMonth[i];
+        }
+        dayOfYear += day;
+        
+        // 简化的农历月份计算（实际农历月份计算更复杂）
+        const lunarMonth = Math.ceil(dayOfYear / 29.5);
+        const lunarDay = (dayOfYear % 29) || 29;
+        
+        return {
+            month: lunarMonth,
+            day: lunarDay
+        };
+    },
+    
+    /**
+     * 将农历日期转换为中文表示
+     * @param {number} day - 农历日
+     * @returns {string} 中文表示（初一、初二...三十）
+     */
+    getDayInChinese(day) {
+        if (day === 1) {
+            return '初一';
+        } else if (day === 15) {
+            return '十五';
+        } else if (day === 30) {
+            return '三十';
+        } else {
+            const digits = ['', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十'];
+            if (day <= 10) {
+                return '初' + digits[day];
+            } else if (day <= 19) {
+                return '十' + (day === 10 ? '' : digits[day - 10]);
+            } else if (day <= 29) {
+                return '廿' + (day === 20 ? '' : digits[day - 20]);
+            } else {
+                return '三十';
+            }
+        }
+    }
+};
+
 /**
  * 身份证号码校验工具
  * 支持15位和18位身份证号码校验
@@ -941,6 +1021,7 @@ export default {
     cloneDeep,
     formatDate,
     IdCardValidator,
+    LunarUtil,
     getdeviceInfo,
     checkingPhoneRegExp,
     checkingEmailRegExp,
diff --git a/components/CollapseTransition/CollapseTransition.vue b/components/CollapseTransition/CollapseTransition.vue
index 9ea5df4..2407431 100644
--- a/components/CollapseTransition/CollapseTransition.vue
+++ b/components/CollapseTransition/CollapseTransition.vue
@@ -8,7 +8,7 @@
 </template>
 
 <script setup>
-import { ref, watch, nextTick } from 'vue';
+import { ref, watch, nextTick, getCurrentInstance } from 'vue';
 
 const props = defineProps({
     show: Boolean,
@@ -26,11 +26,18 @@ const wrapStyle = ref({
 });
 
 const contentRef = ref(null);
+const instance = getCurrentInstance();
 
 // 获取高度（兼容 H5 + 小程序）
 function getContentHeight() {
     return new Promise((resolve) => {
-        const query = uni.createSelectorQuery().in(this ? this : undefined);
+        let query;
+        // #ifdef MP-WEIXIN
+        query = uni.createSelectorQuery().in(instance);
+        // #endif
+        // #ifndef MP-WEIXIN
+        query = uni.createSelectorQuery();
+        // #endif
         query
             .select('.content-inner')
             .boundingClientRect((data) => {
diff --git a/components/CustomTabBar/CustomTabBar.vue b/components/CustomTabBar/CustomTabBar.vue
index 70661ca..5e21f93 100644
--- a/components/CustomTabBar/CustomTabBar.vue
+++ b/components/CustomTabBar/CustomTabBar.vue
@@ -4,14 +4,17 @@
             class="tabbar-item" 
             v-for="(item, index) in tabbarList" 
             :key="index"
+            :class="{ 'center-item': item.centerItem }"
             @click.stop="switchTab(item, index)"
             @tap.stop="switchTab(item, index)"
         >
             <view class="tabbar-icon">
-                <image 
-                    :src="currentItem === item.id ? item.selectedIconPath : item.iconPath"
-                    mode="aspectFit"
-                />
+                <view class="icon-container">
+                    <image 
+                        :src="currentItem === item.id ? item.selectedIconPath : item.iconPath"
+                        mode="aspectFit"
+                    />
+                </view>
             </view>
             <view class="badge" v-if="item.badge && item.badge > 0">{{ item.badge }}</view>
             <view class="tabbar-text" :class="{ 'active': currentItem === item.id }">
@@ -59,22 +62,13 @@ const generateTabbarList = () => {
         },
         {
             id: 2,
-            text: 'AI+',
-            path: '/pages/chat/chat',
-            iconPath: '/static/tabbar/logo3.png',
-            selectedIconPath: '/static/tabbar/logo3.png',
+            text: '',
+            path: '/packageA/pages/chat/chat',
+            iconPath: '/static/tabbar/robot2.png',
+            selectedIconPath: '/static/tabbar/robot2.png',
             centerItem: true,
             badge: readMsg.badges[2]?.count || 0,
         },
-        {
-            id: 3,
-            text: '消息',
-            path: '/pages/msglog/msglog',
-            iconPath: '/static/tabbar/chat4.png',
-            selectedIconPath: '/static/tabbar/chat4ed.png',
-            centerItem: false,
-            badge: readMsg.badges[3]?.count || 0,
-        },
         {
             id: 4,
             text: '我的',
@@ -104,7 +98,7 @@ const generateTabbarList = () => {
         baseItems.splice(1, 0, {
             id: 1,
             text: '发布岗位',
-            path: '/pages/job/publishJob',
+            path: '/packageA/pages/job/publishJob',
             iconPath: '/static/tabbar/post.png',
             selectedIconPath: '/static/tabbar/posted.png',
             centerItem: false,
@@ -126,7 +120,8 @@ const generateTabbarList = () => {
         // #endif
     }
     if (userType === 0) {
-        baseItems.splice(2, 0, {
+        // 企业用户：将招聘会添加到第1个位置，AI图标保持在中间
+        baseItems.splice(1, 0, {
             id: 5,
             text: '招聘会',
             path: '/pages/careerfair/careerfair',
@@ -135,6 +130,14 @@ const generateTabbarList = () => {
             centerItem: false,
             badge: 0,
         });
+        // 调整AI图标的位置到中间（索引2）
+        const aiItem = baseItems.find(item => item.id === 2);
+        if (aiItem) {
+            // 移除AI图标
+            baseItems.splice(baseItems.indexOf(aiItem), 1);
+            // 将AI图标插入到中间位置
+            baseItems.splice(2, 0, aiItem);
+        }
     }
     return baseItems;
 };
@@ -173,9 +176,10 @@ const switchTab = (item, index) => {
     
     // 检查是否为需要登录的页面
     const loginRequiredPages = [
-        '/pages/job/publishJob',
+        '/packageA/pages/job/publishJob',
         '/pages/mine/mine',
-        '/pages/mine/company-mine'
+        '/pages/mine/company-mine',
+        '/pages/msglog/msglog'
     ];
     
     if (loginRequiredPages.includes(item.path)) {
@@ -190,7 +194,7 @@ const switchTab = (item, index) => {
         }
         
         // 已登录，处理特定页面的逻辑
-        if (item.path === '/pages/job/publishJob') {
+        if (item.path === '/packageA/pages/job/publishJob') {
             // 检查企业信息是否完整
             const cachedUserInfo = uni.getStorageSync('userInfo') || {};
             const storeUserInfo = userInfo.value || {};
@@ -199,13 +203,13 @@ const switchTab = (item, index) => {
             // 判断企业信息字段company是否为null或undefined
             if (!currentUserInfo.company || currentUserInfo.company === null) {
                 // 企业信息为空，跳转到企业信息补全页面
-                uni.navigateTo({
-                    url: '/pages/complete-info/company-info',
+                uni.redirectTo({
+                    url: '/packageA/pages/complete-info/company-info',
                 });
             } else {
                 // 企业信息完整，跳转到发布岗位页面
-                uni.navigateTo({
-                    url: '/pages/job/publishJob',
+                uni.redirectTo({
+                    url: '/packageA/pages/job/publishJob',
                 });
             }
             
@@ -233,7 +237,7 @@ const switchTab = (item, index) => {
             }
             
             // 跳转到对应的页面
-            uni.navigateTo({
+            uni.redirectTo({
                 url: targetPath,
             });
             
@@ -242,26 +246,10 @@ const switchTab = (item, index) => {
         }
     }
     
-    // 判断是否为 tabBar 页面
-    const tabBarPages = [
-        '/pages/index/index',
-        '/pages/careerfair/careerfair',
-        '/pages/chat/chat',
-        '/pages/msglog/msglog',
-        '/pages/mine/mine'
-    ];
-    
-    if (tabBarPages.includes(item.path)) {
-        // TabBar 页面使用 redirectTo 避免页面栈溢出
-        uni.redirectTo({
-            url: item.path,
-        });
-    } else {
-        // 非 TabBar 页面使用 navigateTo
-        uni.navigateTo({
-            url: item.path,
-        });
-    }
+    // 所有页面都使用 redirectTo 避免页面栈溢出
+    uni.redirectTo({
+        url: item.path,
+    });
     
     currentItem.value = item.id;
 };
@@ -274,14 +262,42 @@ onMounted(() => {
 </script>
 
 <style lang="scss" scoped>
+/* 动画定义 */
+@keyframes pulse {
+    0% {
+        transform: scale(1.6);
+        box-shadow: 0 0 10rpx #256BFA;
+        border-color: #256BFA;
+    }
+    50% {
+        transform: scale(1.7);
+        box-shadow: 0 0 20rpx #256BFA, 0 0 30rpx rgba(37, 107, 250, 0.5);
+        border-color: #4A89FF;
+    }
+    100% {
+        transform: scale(1.6);
+        box-shadow: 0 0 10rpx #256BFA;
+        border-color: #256BFA;
+    }
+}
+
+@keyframes bounce {
+    0%, 100% {
+        transform: scale(1);
+    }
+    50% {
+        transform: scale(1.1);
+    }
+}
+
 .custom-tabbar {
     position: fixed;
     bottom: 0;
     left: 0;
     right: 0;
-    height: 88rpx;
+    height: 100rpx;
     background-color: #ffffff;
-    border-top: 1rpx solid #e5e5e5;
+    // border-top: 1rpx solid #e5e5e5;
     display: flex;
     align-items: center;
     padding-bottom: env(safe-area-inset-bottom);
@@ -303,11 +319,15 @@ onMounted(() => {
     cursor: pointer;
     pointer-events: auto;
     -webkit-tap-highlight-color: transparent;
+    .icon-container{
+        width: 50rpx;
+        height: 50rpx;
+    }
 }
 
 .tabbar-icon {
-    width: 44rpx;
-    height: 44rpx;
+    width: 50rpx;
+    height: 50rpx;
     margin-bottom: 4rpx;
     position: relative;
 }
@@ -318,7 +338,7 @@ onMounted(() => {
 }
 
 .tabbar-text {
-    font-size: 20rpx;
+    font-size: 22rpx;
     line-height: 1;
     transition: color 0.3s ease;
 }
@@ -332,24 +352,42 @@ onMounted(() => {
     position: absolute;
     top: 4rpx;
     right: 20rpx;
-    min-width: 30rpx;
-    height: 30rpx;
+    min-width: 32rpx;
+    height: 32rpx;
     background-color: #ff4444;
     color: #fff;
-    font-size: 18rpx;
-    border-radius: 15rpx;
+    font-size: 19rpx;
+    border-radius: 16rpx;
     text-align: center;
-    line-height: 30rpx;
+    line-height: 32rpx;
     padding: 0 10rpx;
     transform: scale(0.8);
 }
 
 /* 中间按钮特殊样式 */
-.tabbar-item:has(.center-item) {
+.tabbar-item.center-item {
+
     .tabbar-icon {
         width: 60rpx;
         height: 60rpx;
         margin-bottom: 0;
     }
+    .tabbar-icon image {
+        // margin-top: -25rpx;
+        width: 80%;
+        animation: bounce 2s ease-in-out infinite;
+    }
+    .icon-container{
+        width: 50rpx;
+        height: 50rpx;
+        text-align: center;
+        border-radius: 50%;
+        border: 2rpx solid #256BFA;
+        box-shadow: 0 0 10rpx #256BFA;
+        transform: scale(1.6);
+        position: relative;
+        top: 5rpx;
+        animation: pulse 2s ease-in-out infinite;
+    }
 }
 </style>
diff --git a/components/md-render/md-render.vue b/components/md-render/md-render.vue
index 4cc4e90..7568564 100644
--- a/components/md-render/md-render.vue
+++ b/components/md-render/md-render.vue
@@ -1,13 +1,45 @@
 <template>
     <view class="markdown-body">
-        <rich-text class="markdownRich" id="markdown-content" :nodes="renderedHtml" @itemclick="handleItemClick" />
-        <!-- <view class="markdown-body" v-html="renderedHtml"></view> -->
+        <!-- 根据不同平台使用不同的渲染方式 -->
+        <!-- #ifdef MP-WEIXIN -->
+        <!-- 微信小程序端：使用v-for遍历岗位卡片列表，每个卡片单独渲染，支持点击事件 -->
+        <scroll-view class="markdownRich" id="markdown-content">
+            <!-- 渲染普通markdown内容 -->
+            <rich-text :nodes="renderedHtml" />
+            
+            <!-- 单独渲染岗位卡片，支持点击事件 -->
+            <view v-if="localJobCardsList.length > 0" class="job-cards-container">
+                <view 
+                    v-for="(card, index) in localJobCardsList" 
+                    :key="index"
+                    class="custom-card"
+                    @tap="navigateToJobDetail(card.jobId)"
+                >
+                    <view class="card-title">
+                        <text class="title-text">{{ card.jobTitle }}</text>
+                        <view class="card-salary">{{ card.salary }}</view>
+                    </view>
+                    <view class="card-company">{{ card.location }}·{{ card.companyName }}</view>
+                    <view class="card-info">
+                        <view class="info-item">
+                            <view class="card-tag">{{ card.education }}</view>
+                            <view class="card-tag">{{ card.experience }}</view>
+                        </view>
+                        <view class="info-item">查看详情<view class="position-nav"></view></view>
+                    </view>
+                </view>
+            </view>
+        </scroll-view>
+        <!-- #endif -->
+        <!-- #ifndef MP-WEIXIN -->
+        <view class="markdown-body" v-html="renderedHtml" @click="handleH5Click"></view>
+        <!-- #endif -->
     </view>
 </template>
 
 <script setup>
-import { computed, onMounted, inject } from 'vue';
-import { parseMarkdown, codeDataList } from '@/utils/markdownParser';
+import { computed, onMounted, inject, ref, watch, nextTick } from 'vue';
+import { parseMarkdown, codeDataList, jobCardsList } from '@/utils/markdownParser';
 const { navTo } = inject('globalFunction');
 const props = defineProps({
     content: {
@@ -21,30 +53,191 @@ const props = defineProps({
 });
 
 const renderedHtml = computed(() => parseMarkdown(props.content));
+const markdownContainer = ref(null);
+// 响应式岗位卡片列表，用于微信小程序端单独渲染
+const localJobCardsList = ref([]);
 
-const handleItemClick = (e) => {
-    let { attrs } = e.detail.node;
-    console.log(attrs);
-    let { 'data-copy-index': codeDataIndex, 'data-job-id': jobId, class: className } = attrs;
-    switch (className) {
-        case 'custom-card':
-            return navTo('/packageA/pages/post/post?jobId=' + jobId);
-        case 'custom-more':
-            return navTo('/packageA/pages/moreJobs/moreJobs?jobId=' + jobId);
-        case 'copy-btn':
-            uni.setClipboardData({
-                data: codeDataList[codeDataIndex],
-                showToast: false,
-                success() {
-                    uni.showToast({
-                        title: '复制成功',
-                        icon: 'none',
-                    });
-                },
-            });
-            break;
+// 监听content的变化，当内容更新时，解析岗位卡片
+watch(() => props.content, (newContent) => {
+    if (newContent) {
+        // 直接调用parseMarkdown来触发jobCardsList的更新
+        parseMarkdown(newContent);
+        // 将解析器生成的岗位卡片列表赋值给响应式数据
+        localJobCardsList.value = [...jobCardsList];
+        console.log('Content changed, jobCardsList updated:', localJobCardsList.value);
+    }
+}, { immediate: true });
+
+// 同时监听renderedHtml的变化作为备份
+watch(() => renderedHtml.value, (newVal) => {
+    console.log('renderedHtml changed, jobCardsList from parser:', jobCardsList);
+    // 将解析器生成的岗位卡片列表赋值给响应式数据
+    localJobCardsList.value = [...jobCardsList];
+});
+
+// 微信小程序端导航到岗位详情页面
+const navigateToJobDetail = (jobId) => {
+    console.log('navigateToJobDetail called with jobId:', jobId);
+    if (jobId && jobId !== 'undefined' && jobId !== 'null') {
+        // 跳转到岗位详情页面
+        uni.navigateTo({
+            url: `/packageA/pages/post/post?jobId=${jobId}`,
+            success: (res) => {
+                console.log('navigateTo success:', res);
+            },
+            fail: (err) => {
+                console.error('navigateTo failed:', err);
+                // 如果navigateTo失败，尝试redirectTo
+                uni.redirectTo({
+                    url: `/packageA/pages/post/post?jobId=${jobId}`,
+                    success: (res2) => {
+                        console.log('redirectTo success:', res2);
+                    },
+                    fail: (err2) => {
+                        console.error('redirectTo also failed:', err2);
+                        // 如果还是失败，显示错误提示
+                        uni.showToast({
+                            title: '跳转失败，请稍后重试',
+                            icon: 'none'
+                        });
+                    }
+                });
+            }
+        });
+    } else {
+        console.error('Invalid jobId:', jobId);
+        uni.showToast({
+            title: '岗位信息不完整',
+            icon: 'none'
+        });
     }
 };
+
+// 微信小程序端点击事件处理已移除，改用v-for遍历岗位卡片列表，每个卡片单独渲染，支持点击事件
+// 微信小程序端和H5端的jobId取值方式一致，都是从JSON数据的appJobUrl字段提取
+// 不同的是，微信小程序端现在使用v-for遍历渲染，而H5端使用v-html渲染
+
+// H5平台点击事件处理
+// 微信小程序端和H5端的jobId取值方式一致，都是从JSON数据的appJobUrl字段提取
+// 不同的是，H5端可以直接从DOM属性获取，而微信小程序端使用v-for遍历渲染
+const handleH5Click = (e) => {
+    console.log('H5 click event triggered:', e.target);
+    let target = e.target;
+    // 查找最接近的带有class的元素
+    while (target && target.tagName !== 'BODY') {
+        console.log('Checking target:', target, 'className:', target.className, 'tagName:', target.tagName);
+        
+        // 直接使用closest方法查找，不依赖className
+        const cardElement = target.closest('.custom-card');
+        const moreElement = target.closest('.custom-more');
+        
+        console.log('Found elements:', { cardElement, moreElement });
+        
+        if (cardElement) {
+            // 尝试多种方式获取jobId
+            let jobId = cardElement.getAttribute('data-job-id');
+            console.log('Found custom-card, data-job-id attribute:', jobId);
+            
+            // 如果data-job-id为空，尝试从onclick事件中提取jobId
+            if (!jobId) {
+                const onclick = cardElement.getAttribute('onclick');
+                if (onclick) {
+                    const match = onclick.match(/jobId=(\w+)/);
+                    if (match && match[1]) {
+                        jobId = match[1];
+                        console.log('Extracted jobId from onclick:', jobId);
+                    }
+                }
+            }
+            
+            if (jobId) {
+                console.log('Final jobId for navigation:', jobId);
+                try {
+                    // 直接使用uni.navigateTo，避免navTo函数的潜在问题
+                    uni.navigateTo({
+                        url: `/packageA/pages/post/post?jobId=${jobId}`,
+                        success: (res) => {
+                            console.log('navigateTo success:', res);
+                        },
+                        fail: (err) => {
+                            console.error('navigateTo failed:', err);
+                            // 如果navigateTo失败，尝试redirectTo
+                            uni.redirectTo({
+                                url: `/packageA/pages/post/post?jobId=${jobId}`,
+                                success: (res2) => {
+                                    console.log('redirectTo success:', res2);
+                                },
+                                fail: (err2) => {
+                                    console.error('redirectTo also failed:', err2);
+                                }
+                            });
+                        }
+                    });
+                } catch (error) {
+                    console.error('Navigation error:', error);
+                }
+                return;
+            } else {
+                console.error('No jobId found for custom-card');
+            }
+        } else if (moreElement) {
+            // 尝试多种方式获取jobId
+            let jobId = moreElement.getAttribute('data-job-id');
+            console.log('Found custom-more, data-job-id attribute:', jobId);
+            
+            // 如果data-job-id为空，尝试从onclick事件中提取jobId
+            if (!jobId) {
+                const onclick = moreElement.getAttribute('onclick');
+                if (onclick) {
+                    const match = onclick.match(/jobId=(\w+)/);
+                    if (match && match[1]) {
+                        jobId = match[1];
+                        console.log('Extracted jobId from onclick:', jobId);
+                    }
+                }
+            }
+            
+            if (jobId) {
+                console.log('Final jobId for more jobs:', jobId);
+                try {
+                    // 直接使用uni.navigateTo，避免navTo函数的潜在问题
+                    uni.navigateTo({
+                        url: `/packageA/pages/moreJobs/moreJobs?jobId=${jobId}`,
+                        success: (res) => {
+                            console.log('navigateTo success:', res);
+                        },
+                        fail: (err) => {
+                            console.error('navigateTo failed:', err);
+                            // 如果navigateTo失败，尝试redirectTo
+                            uni.redirectTo({
+                                url: `/packageA/pages/moreJobs/moreJobs?jobId=${jobId}`,
+                                success: (res2) => {
+                                    console.log('redirectTo success:', res2);
+                                },
+                                fail: (err2) => {
+                                    console.error('redirectTo also failed:', err2);
+                                }
+                            });
+                        }
+                    });
+                } catch (error) {
+                    console.error('Navigation error:', error);
+                }
+                return;
+            } else {
+                console.error('No jobId found for custom-more');
+            }
+        }
+        
+        target = target.parentElement;
+    }
+};
+
+// 移除旧的事件监听逻辑，改用全局点击处理
+
+onMounted(() => {
+    console.log('onMounted called');
+});
 </script>
 
 <style lang="scss">
@@ -267,7 +460,7 @@ ol {
 </style>
 
 <style lang="stylus">
-.custom-more{
+.custom-more
     display: flex
     justify-content: center
     align-items: center
@@ -282,15 +475,16 @@ ol {
     transition: all 0.3s ease
     position: relative
     overflow: hidden
-    .more-icon{
-        width: 32rpx;
-        height: 32rpx;
-        background: url('@/static/svg/seemore.svg') center center no-repeat;
+    
+    .more-icon
+        width: 32rpx
+        height: 32rpx
+        background: url('@/static/svg/seemore.svg') center center no-repeat
         background-size: 100% 100%
         margin-left: 12rpx
         filter: brightness(0) invert(1)
-    }
-    &::before {
+    
+    &::before
         content: ''
         position: absolute
         top: 0
@@ -299,93 +493,492 @@ ol {
         height: 100%
         background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.2), transparent)
         transition: left 0.5s ease
-    }
-    &:active {
+    
+    &:active
         transform: translateY(2rpx)
         box-shadow: 0rpx 4rpx 16rpx rgba(37, 107, 250, 0.4)
-    }
-    &:active::before {
+    
+    &:active::before
         left: 100%
+
+/* 为小程序专门优化的样式 */
+/* #ifdef MP-WEIXIN */
+.rich-text-container
+    padding: 0 20rpx
+
+.markdownRich
+    padding: 0
+/* #endif */
+
+/* H5端和小程序端样式优化 */
+.custom-card
+    background: #FFFFFF !important
+    box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04) !important
+    border-radius: 20rpx !important
+    padding: 28rpx 24rpx !important
+    font-weight: 400 !important
+    font-size: 28rpx !important
+    color: #333333 !important
+    margin-bottom: 22rpx !important
+    position: relative !important
+    display: block !important
+    flex-direction: column !important
+    /* 确保在所有平台中边距正确应用 */
+    margin-left: auto !important
+    margin-right: auto !important
+    width: 100% !important
+    box-sizing: border-box !important
+    text-decoration: none !important
+    overflow: hidden !important
+
+.custom-card .card-title
+    font-weight: 600 !important
+    display: flex !important
+    align-items: center !important
+    justify-content: space-between !important
+    margin-bottom: 16rpx !important
+
+.custom-card .card-title .title-text
+    font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif !important
+    max-width: calc(100% - 160rpx) !important
+    overflow: hidden !important
+    text-overflow: ellipsis !important
+    font-size: 32rpx !important
+    line-height: 1.4 !important
+    white-space: nowrap !important
+    margin-bottom: 0 !important
+
+.custom-card .card-title .card-salary
+    font-family: DIN-Medium !important
+    font-size: 32rpx !important
+    color: #4C6EFB !important
+    line-height: 1.4 !important
+    font-weight: 500 !important
+    margin-bottom: 0 !important
+
+.custom-card .card-company
+    margin-bottom: 18rpx !important
+    max-width: 100% !important
+    overflow: hidden !important
+    text-overflow: ellipsis !important
+    color: #6C7282 !important
+    line-height: 1.4 !important
+    white-space: nowrap !important
+    font-size: 28rpx !important
+    margin-top: 0 !important
+    display: block !important
+
+.custom-card .card-tags
+    display: flex !important
+    flex-wrap: wrap !important
+    margin-bottom: 24rpx !important
+
+.custom-card .card-tag
+    font-weight: 400 !important
+    font-size: 24rpx !important
+    color: #6C7282 !important
+    width: fit-content !important
+    background: #F4F4F4 !important
+    border-radius: 4rpx !important
+    padding: 6rpx 20rpx !important
+    margin-right: 20rpx !important
+    margin-bottom: 14rpx !important
+    display: inline-flex !important
+    align-items: center !important
+    justify-content: center !important
+    height: 30rpx !important
+    line-height: 30rpx !important
+
+.custom-card .card-bottom
+    display: flex !important
+    justify-content: space-between !important
+    font-size: 24rpx !important
+    color: #6C7282 !important
+    margin-top: 0 !important
+    margin-bottom: 0 !important
+
+.custom-card .card-bottom .info-item
+    display: flex !important
+    align-items: center !important
+    justify-content: center !important
+    margin-bottom: 0 !important
+
+.custom-card .card-info
+    display: flex !important
+    align-items: center !important
+    justify-content: space-between !important
+    padding-right: 40rpx !important
+
+.custom-card .card-info .info-item
+    display: flex !important
+    position: relative !important
+    align-items: center !important
+
+.custom-card .card-info .info-item:last-child
+    color: #256BFA !important
+    font-size: 28rpx !important
+    padding-right: 10rpx !important
+
+.custom-card .position-nav
+    position: absolute !important
+    right: -10rpx !important
+    top: 50% !important
+    transform: translateY(-50%) !important
+
+.custom-card .position-nav::before
+    position: absolute !important
+    left: 0 !important
+    top: -4rpx !important
+    content: '' !important
+    width: 4rpx !important
+    height: 16rpx !important
+    border-radius: 2rpx !important
+    background: #256BFA !important
+    transform: translate(0, -50%) rotate(-45deg) !important
+
+.custom-card .position-nav::after
+    position: absolute !important
+    left: 0 !important
+    top: -4rpx !important
+    content: '' !important
+    width: 4rpx !important
+    height: 16rpx !important
+    border-radius: 2rpx !important
+    background: #256BFA !important
+    transform: rotate(45deg) !important
+
+/* 为微信小程序专门优化的样式选择器 */
+/* #ifdef MP-WEIXIN */
+.job-cards-container .custom-card
+    background: #FFFFFF !important
+    box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04) !important
+    border-radius: 20rpx !important
+    padding: 28rpx 24rpx !important
+    font-weight: 400 !important
+    font-size: 28rpx !important
+    color: #333333 !important
+    margin-bottom: 22rpx !important
+    position: relative !important
+    display: block !important
+    flex-direction: column !important
+    margin-left: auto !important
+    margin-right: auto !important
+    width: 100% !important
+    box-sizing: border-box !important
+    text-decoration: none !important
+    overflow: hidden !important
+
+.job-cards-container .custom-card .card-title
+    font-weight: 600 !important
+    display: flex !important
+    align-items: center !important
+    justify-content: space-between !important
+    margin-bottom: 16rpx !important
+
+.job-cards-container .custom-card .card-title .title-text
+    font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif !important
+    max-width: calc(100% - 160rpx) !important
+    overflow: hidden !important
+    text-overflow: ellipsis !important
+    font-size: 32rpx !important
+    line-height: 1.4 !important
+    white-space: nowrap !important
+    margin-bottom: 0 !important
+
+.job-cards-container .custom-card .card-title .card-salary
+    font-family: DIN-Medium !important
+    font-size: 32rpx !important
+    color: #4C6EFB !important
+    line-height: 1.4 !important
+    font-weight: 500 !important
+    margin-bottom: 0 !important
+
+.job-cards-container .custom-card .card-company
+    margin-bottom: 18rpx !important
+    max-width: 100% !important
+    overflow: hidden !important
+    text-overflow: ellipsis !important
+    color: #6C7282 !important
+    line-height: 1.4 !important
+    white-space: nowrap !important
+    font-size: 28rpx !important
+    margin-top: 0 !important
+    display: block !important
+
+.job-cards-container .custom-card .card-info
+    display: flex !important
+    align-items: center !important
+    justify-content: space-between !important
+    padding-right: 40rpx !important
+
+.job-cards-container .custom-card .card-info .info-item
+    display: flex !important
+    position: relative !important
+    align-items: center !important
+
+.job-cards-container .custom-card .card-info .info-item:last-child
+    color: #256BFA !important
+    font-size: 28rpx !important
+    padding-right: 10rpx !important
+
+.job-cards-container .custom-card .card-info .info-item .card-tag
+    font-weight: 400 !important
+    font-size: 24rpx !important
+    color: #6C7282 !important
+    width: fit-content !important
+    background: #F4F4F4 !important
+    border-radius: 4rpx !important
+    padding: 6rpx 20rpx !important
+    margin-right: 20rpx !important
+    margin-bottom: 14rpx !important
+    display: inline-flex !important
+    align-items: center !important
+    justify-content: center !important
+    height: 30rpx !important
+    line-height: 30rpx !important
+
+.job-cards-container .custom-card .position-nav
+    position: absolute !important
+    right: -10rpx !important
+    top: 50% !important
+    transform: translateY(-50%) !important
+
+.job-cards-container .custom-card .position-nav::before
+    position: absolute !important
+    left: 0 !important
+    top: -4rpx !important
+    content: '' !important
+    width: 4rpx !important
+    height: 16rpx !important
+    border-radius: 2rpx !important
+    background: #256BFA !important
+    transform: translate(0, -50%) rotate(-45deg) !important
+
+.job-cards-container .custom-card .position-nav::after
+    position: absolute !important
+    left: 0 !important
+    top: -4rpx !important
+    content: '' !important
+    width: 4rpx !important
+    height: 16rpx !important
+    border-radius: 2rpx !important
+    background: #256BFA !important
+    transform: rotate(45deg) !important
+/* #endif */
+
+/* 额外的H5端样式优化 */
+/* #ifndef MP-WEIXIN */
+/* 确保样式能正确应用到v-html生成的内容 */
+.markdown-body {
+    /* 重置v-html容器样式 */
+    display: block !important;
+    
+    /* 为v-html生成的a.custom-card标签添加基础样式 */
+    a.custom-card {
+        display: flex !important;
+        flex-direction: column !important;
+        margin-bottom: 22rpx !important;
+        background: #FFFFFF !important;
+        box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04) !important;
+        border-radius: 20rpx !important;
+        padding: 28rpx 24rpx !important;
+        font-weight: 400 !important;
+        font-size: 28rpx !important;
+        color: #333333 !important;
+        text-decoration: none !important;
+        overflow: hidden !important;
+        box-sizing: border-box !important;
+        width: calc(100% - 0rpx) !important;
+        max-width: 100% !important;
+    }
+    
+    /* 卡片标题样式 */
+    a.custom-card .card-title {
+        font-weight: 600 !important;
+        display: flex !important;
+        align-items: center !important;
+        justify-content: space-between !important;
+        margin-bottom: 16rpx !important;
+    }
+    
+    a.custom-card .card-title .title-text {
+        font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif !important;
+        font-size: 32rpx !important;
+        line-height: 1.4 !important;
+        color: #333333 !important;
+        max-width: calc(100% - 160rpx) !important;
+        overflow: hidden !important;
+        text-overflow: ellipsis !important;
+        white-space: nowrap !important;
+        margin-bottom: 0 !important;
+    }
+    
+    a.custom-card .card-title .card-salary {
+        font-family: DIN-Medium !important;
+        font-size: 32rpx !important;
+        color: #4C6EFB !important;
+        line-height: 1.4 !important;
+        font-weight: 500 !important;
+        margin-bottom: 0 !important;
+    }
+    
+    /* 公司信息样式 */
+    a.custom-card .card-company {
+        margin-bottom: 18rpx !important;
+        font-size: 28rpx !important;
+        color: #6C7282 !important;
+        line-height: 1.4 !important;
+        max-width: 100% !important;
+        overflow: hidden !important;
+        text-overflow: ellipsis !important;
+        white-space: nowrap !important;
+        margin-top: 0 !important;
+        display: block !important;
+    }
+    
+    /* 标签容器样式 */
+    a.custom-card .card-tags {
+        display: flex !important;
+        flex-wrap: wrap !important;
+        margin-bottom: 24rpx !important;
+    }
+    
+    /* 单个标签样式 */
+    a.custom-card .card-tag {
+        font-weight: 400 !important;
+        font-size: 24rpx !important;
+        color: #6C7282 !important;
+        width: fit-content !important;
+        background: #F4F4F4 !important;
+        border-radius: 4rpx !important;
+        padding: 6rpx 20rpx !important;
+        margin-right: 20rpx !important;
+        margin-bottom: 14rpx !important;
+        display: inline-flex !important;
+        align-items: center !important;
+        justify-content: center !important;
+        height: 30rpx !important;
+        line-height: 30rpx !important;
+    }
+    
+    /* 卡片底部样式 */
+    a.custom-card .card-bottom {
+        display: flex !important;
+        justify-content: space-between !important;
+        font-size: 24rpx !important;
+        color: #6C7282 !important;
+        margin-top: 0 !important;
+        margin-bottom: 0 !important;
+    }
+    
+    a.custom-card .card-bottom .info-item {
+        display: flex !important;
+        align-items: center !important;
+        justify-content: center !important;
+        margin-bottom: 0 !important;
+    }
+    
+    /* 卡片信息区域样式 */
+    a.custom-card .card-info {
+        display: flex !important;
+        align-items: center !important;
+        justify-content: space-between !important;
+        padding-right: 40rpx !important;
+    }
+    
+    a.custom-card .card-info .info-item {
+        display: flex !important;
+        align-items: center !important;
+    }
+    
+    a.custom-card .card-info .info-item:last-child {
+        color: #256BFA !important;
+        font-size: 28rpx !important;
+        padding-right: 10rpx !important;
+        position: relative !important;
+    }
+    
+    /* 查看详情箭头样式 */
+    a.custom-card .position-nav {
+        position: absolute !important;
+        right: -10rpx !important;
+        top: 50% !important;
+        transform: translateY(-50%) !important;
+    }
+    
+    a.custom-card .position-nav::before {
+        position: absolute !important;
+        left: 0 !important;
+        top: -4rpx !important;
+        content: '' !important;
+        width: 4rpx !important;
+        height: 16rpx !important;
+        border-radius: 2rpx !important;
+        background: #256BFA !important;
+        transform: translate(0, -50%) rotate(-45deg) !important;
+    }
+    
+    a.custom-card .position-nav::after {
+        position: absolute !important;
+        left: 0 !important;
+        top: -4rpx !important;
+        content: '' !important;
+        width: 4rpx !important;
+        height: 16rpx !important;
+        border-radius: 2rpx !important;
+        background: #256BFA !important;
+        transform: rotate(45deg) !important;
+    }
+    
+    /* 查看更多按钮样式 */
+    a.custom-more {
+        display: flex !important;
+        justify-content: center !important;
+        align-items: center !important;
+        color: #FFFFFF !important;
+        background: linear-gradient(135deg, #256BFA 0%, #9E74FD 100%) !important;
+        border-radius: 50rpx !important;
+        padding: 20rpx 32rpx !important;
+        margin: 20rpx 0 !important;
+        font-size: 28rpx !important;
+        font-weight: 600 !important;
+        box-shadow: 0rpx 8rpx 24rpx rgba(37, 107, 250, 0.3) !important;
+        transition: all 0.3s ease !important;
+        position: relative !important;
+        overflow: hidden !important;
+        text-decoration: none !important;
+        box-sizing: border-box !important;
+        width: 100% !important;
+    }
+    
+    a.custom-more .more-icon {
+        width: 32rpx !important;
+        height: 32rpx !important;
+        background: url('@/static/svg/seemore.svg') center center no-repeat !important;
+        background-size: 100% 100% !important;
+        margin-left: 12rpx !important;
+        filter: brightness(0) invert(1) !important;
+    }
+    
+    a.custom-more::before {
+        content: '' !important;
+        position: absolute !important;
+        top: 0 !important;
+        left: -100% !important;
+        width: 100% !important;
+        height: 100% !important;
+        background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.2), transparent) !important;
+        transition: left 0.5s ease !important;
+    }
+    
+    a.custom-more:active {
+        transform: translateY(2rpx) !important;
+        box-shadow: 0rpx 4rpx 16rpx rgba(37, 107, 250, 0.4) !important;
+    }
+    
+    a.custom-more:active::before {
+        left: 100% !important;
     }
 }
-.custom-card
-    background: #FFFFFF;
-    box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04);
-    border-radius: 20rpx 20rpx 20rpx 20rpx;
-    padding: 28rpx 24rpx;
-    font-weight: 400;
-    font-size: 28rpx;
-    color: #333333;
-    margin-bottom: 20rpx;
-    position: relative;
-    display: flex;
-    flex-direction: column
-    .card-title
-        font-weight: 600;
-        display: flex;
-        align-items: center;
-        justify-content: space-between
-        .title-text
-            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
-            max-width: calc(100% - 160rpx);
-            overflow: hidden
-            text-overflow: ellipsis
-            font-size: 30rpx
-        .card-salary
-            font-family: DIN-Medium;
-            font-size: 28rpx;
-            color: #FF6E1C;
-
-    .card-company
-        margin-top: 16rpx;
-        max-width: calc(100%);
-        overflow: hidden;
-        text-overflow: ellipsis
-        color: #6C7282;
-    .card-info
-        margin-top: 22rpx;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        padding-right: 40rpx;
-        .info-item
-            display: flex;
-            position: relative;
-            align-items: center;
-            color: #256BFA;
-            font-size: 28rpx;
-            padding-right: 10rpx
-    .position-nav
-        position: absolute;
-        right: -10rpx;
-        top: 50%;
-    .position-nav::before
-        position: absolute;
-        left: 0;
-        top: -4rpx;
-        content: '';
-        width: 4rpx;
-        height: 16rpx;
-        border-radius: 2rpx
-        background: #256BFA;
-        transform: translate(0, -50%) rotate(-45deg) ;
-    .position-nav::after
-        position: absolute;
-        left: 0;
-        top: -4rpx;
-        content: '';
-        width: 4rpx;
-        height: 16rpx;
-        border-radius: 2rpx
-        background: #256BFA;
-        transform: rotate(45deg)
-    .card-tag
-        font-weight: 500;
-        font-size: 24rpx;
-        color: #333333;
-        width: fit-content;
-        background: #F4F4F4;
-        border-radius: 4rpx 4rpx 4rpx 4rpx;
-        padding: 4rpx 20rpx;
-        margin-right: 16rpx;
+/* #endif */
 </style>
diff --git a/components/new-filter-page/new-filter-page.vue b/components/new-filter-page/new-filter-page.vue
new file mode 100644
index 0000000..2694d2f
--- /dev/null
+++ b/components/new-filter-page/new-filter-page.vue
@@ -0,0 +1,426 @@
+<template>
+    <view v-if="show" class="filter-container">
+        <!-- 左侧标签页 -->
+        <view class="filter-tabs">
+            <view
+                v-for="(tab, index) in tabs"
+                :key="index"
+                class="tab-item"
+                :class="{ active: activeTab === tab.key }"
+                @click="activeTab = tab.key"
+            >
+                {{ tab.label }}
+            </view>
+        </view>
+
+        <!-- 右侧内容区域 -->
+        <view class="filter-right">
+            <!-- 内容区域 -->
+            <view class="filter-content">
+                <!-- 学历要求 -->
+                <view v-if="activeTab === 'education'" class="content-section">
+                    <radio-group @change="(e) => handleSelect('education', e)">
+                        <label
+                            v-for="option in educationOptions"
+                            :key="option.value"
+                            class="radio-item"
+                            :class="{ checked: selectedValues['education'] === String(option.value) }"
+                        >
+                            <radio
+                                :value="String(option.value)"
+                                :checked="selectedValues['education'] === String(option.value)"
+                            />
+                            <text class="option-label">{{ option.label }}</text>
+                        </label>
+                    </radio-group>
+                </view>
+
+                <!-- 工作经验 -->
+                <view v-if="activeTab === 'experience'" class="content-section">
+                    <radio-group @change="(e) => handleSelect('experience', e)">
+                        <label
+                            v-for="option in experienceOptions"
+                            :key="option.value"
+                            class="radio-item"
+                            :class="{ checked: selectedValues['experience'] === String(option.value) }"
+                        >
+                            <radio
+                                :value="String(option.value)"
+                                :checked="selectedValues['experience'] === String(option.value)"
+                            />
+                            <text class="option-label">{{ option.label }}</text>
+                        </label>
+                    </radio-group>
+                </view>
+
+                <!-- 公司规模 -->
+                <view v-if="activeTab === 'scale'" class="content-section">
+                    <radio-group @change="(e) => handleSelect('scale', e)">
+                        <label
+                            v-for="option in scaleOptions"
+                            :key="option.value"
+                            class="radio-item"
+                            :class="{ checked: selectedValues['scale'] === String(option.value) }"
+                        >
+                            <radio
+                                :value="String(option.value)"
+                                :checked="selectedValues['scale'] === String(option.value)"
+                            />
+                            <text class="option-label">{{ option.label }}</text>
+                        </label>
+                    </radio-group>
+                </view>
+
+                <!-- 地区 -->
+                <view v-if="activeTab === 'area'" class="content-section">
+                    <radio-group @change="(e) => handleSelect('area', e)">
+                        <label
+                            v-for="option in areaOptions"
+                            :key="option.value"
+                            class="radio-item"
+                            :class="{ checked: selectedValues['area'] === String(option.value) }"
+                        >
+                            <radio
+                                :value="String(option.value)"
+                                :checked="selectedValues['area'] === String(option.value)"
+                            />
+                            <text class="option-label">{{ option.label }}</text>
+                        </label>
+                    </radio-group>
+                </view>
+
+                <!-- 岗位类型 -->
+                <view v-if="activeTab === 'jobType'" class="content-section">
+                    <radio-group @change="(e) => handleSelect('jobType', e)">
+                        <label
+                            v-for="option in jobTypeOptions"
+                            :key="option.value"
+                            class="radio-item"
+                            :class="{ checked: selectedValues['jobType'] === String(option.value) }"
+                        >
+                            <radio
+                                :value="String(option.value)"
+                                :checked="selectedValues['jobType'] === String(option.value)"
+                            />
+                            <text class="option-label">{{ option.label }}</text>
+                        </label>
+                    </radio-group>
+                </view>
+            </view>
+
+            <!-- 底部按钮 -->
+            <view class="filter-footer">
+                <button class="footer-btn clear-btn" @click="handleClear">清除</button>
+                <button class="footer-btn confirm-btn" @click="handleConfirm">确认</button>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import { ref, reactive, onBeforeMount } from 'vue';
+import useDictStore from '@/stores/useDictStore';
+const dictStore = useDictStore();
+const { getTransformChildren } = dictStore;
+
+const props = defineProps({
+    show: Boolean,
+});
+
+const emit = defineEmits(['confirm', 'close', 'update:show']);
+
+// 岗位类型数据
+const getJobTypeData = () => {
+    return [
+        { label: '常规岗位', value: 0, text: '常规岗位' },
+        { label: '就业见习岗位', value: 1, text: '就业见习岗位' },
+        { label: '实习实训岗位', value: 2, text: '实习实训岗位' },
+        { label: '社区实践岗位', value: 3, text: '社区实践岗位' }
+    ];
+};
+
+// 标签页数据
+const tabs = [
+    { key: 'education', label: '学历要求' },
+    { key: 'experience', label: '工作经验' },
+    { key: 'scale', label: '公司规模' },
+    { key: 'jobType', label: '岗位类型' },
+    { key: 'area', label: '地区' }
+];
+
+// 当前激活的标签
+const activeTab = ref('education');
+
+// 存储已选中的值
+const selectedValues = reactive({
+    education: '',
+    experience: '',
+    scale: '',
+    area: '',
+    jobType: ''
+});
+
+// 从字典获取的选项数据
+const educationOptions = ref([]);
+const experienceOptions = ref([]);
+const scaleOptions = ref([]);
+const areaOptions = ref([]);
+const jobTypeOptions = ref([]);
+
+// 加载状态
+const loading = ref(true);
+
+// 初始化获取数据
+onBeforeMount(async () => {
+    try {
+        // 先获取字典数据
+        await dictStore.getDictData();
+        // 再初始化选项数据
+        educationOptions.value = getTransformChildren('education', '学历要求').options || [];
+        experienceOptions.value = getTransformChildren('experience', '工作经验').options || [];
+        scaleOptions.value = getTransformChildren('scale', '公司规模').options || [];
+        areaOptions.value = getTransformChildren('area', '地区').options || [];
+        jobTypeOptions.value = getJobTypeData();
+    } catch (error) {
+        console.error('获取字典数据失败:', error);
+    } finally {
+        loading.value = false;
+    }
+});
+
+// 处理选项选择
+const handleSelect = (key, e) => {
+    selectedValues[key] = e.detail.value;
+};
+
+// 清除所有选择
+const handleClear = () => {
+    Object.keys(selectedValues).forEach((key) => {
+        selectedValues[key] = '';
+    });
+};
+
+// 确认筛选
+const handleConfirm = () => {
+    console.log('selectedValues:', selectedValues);
+    emit('confirm', selectedValues);
+    handleClose();
+};
+
+// 关闭弹窗
+const handleClose = () => {
+    emit('update:show', false);
+    emit('close');
+};
+</script>
+
+<style lang="scss" scoped>
+.filter-container {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100vw;
+    height: 100vh;
+    background-color: #fff;
+    z-index: 9999;
+    display: flex;
+    flex-direction: row;
+}
+
+.filter-header {
+    height: 96rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 32rpx;
+    border-bottom: 1rpx solid #eee;
+    background-color: #fff;
+    box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+
+    .back-btn {
+        font-size: 36rpx;
+        width: 48rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        padding: 10rpx;
+        border-radius: 50%;
+        transition: all 0.3s ease;
+
+        &:active {
+            background-color: rgba(37, 107, 250, 0.1);
+        }
+    }
+
+    .filter-title {
+        font-size: 34rpx;
+        font-weight: 600;
+        color: #333;
+    }
+}
+
+.filter-tabs {
+    width: 200rpx;
+    border-right: 1rpx solid #eee;
+    background-color: #f8f8f8;
+    display: flex;
+    flex-direction: column;
+
+    .tab-item {
+        height: 100rpx;
+        line-height: 100rpx;
+        text-align: center;
+        font-size: 28rpx;
+        color: #666;
+        position: relative;
+        transition: all 0.3s ease;
+
+        &.active {
+            color: #256BFA;
+            font-weight: 600;
+            background-color: #fff;
+            
+            &::after {
+                content: '';
+                position: absolute;
+                left: 0;
+                top: 25%;
+                width: 4rpx;
+                height: 50%;
+                background-color: #256BFA;
+                border-radius: 2rpx;
+            }
+        }
+
+        &:active {
+            background-color: rgba(37, 107, 250, 0.05);
+        }
+    }
+}
+
+.filter-right {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    position: relative;
+}
+
+.filter-content {
+    flex: 1;
+    padding: 40rpx 32rpx;
+    overflow-y: auto;
+}
+
+.content-section {
+    .radio-item {
+            display: flex;
+            align-items: center;
+            padding: 30rpx 0;
+            border-bottom: 1rpx solid #f0f0f0;
+            transition: all 0.3s ease;
+            position: relative;
+
+            &:last-child {
+                border-bottom: none;
+            }
+
+            &:active {
+                background-color: rgba(37, 107, 250, 0.05);
+            }
+
+            radio {
+                width: 28rpx;
+                height: 28rpx;
+                margin-right: 24rpx;
+                transform: scale(1);
+                display: flex;
+                align-items: center;
+                justify-content: center;
+            }
+
+            radio .wx-radio-input {
+                width: 28rpx;
+                height: 28rpx;
+                border-radius: 50%;
+                border: 2rpx solid #ccc;
+                background: transparent;
+            }
+
+            radio .wx-radio-input.wx-radio-input-checked {
+                border-color: #256BFA !important;
+                background: #256BFA !important;
+            }
+
+            radio .wx-radio-input::before {
+                width: 16rpx;
+                height: 16rpx;
+                line-height: 16rpx;
+                text-align: center;
+                font-size: 12rpx;
+                color: #fff;
+                background: transparent;
+                transform: translate(-50%, -50%) scale(0);
+                -webkit-transform: translate(-50%, -50%) scale(0);
+            }
+
+            radio .wx-radio-input.wx-radio-input-checked::before {
+                transform: translate(-50%, -50%) scale(1);
+                -webkit-transform: translate(-50%, -50%) scale(1);
+            }
+
+            .option-label {
+                font-size: 30rpx;
+                color: #333;
+                flex: 1;
+                font-weight: 400;
+                line-height: 40rpx;
+            }
+        }
+}
+
+.filter-footer {
+    height: 160rpx;
+    display: flex;
+    border-top: 1rpx solid #eee;
+    background-color: #fff;
+    box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.05);
+    padding: 20rpx 32rpx 100rpx;
+    flex-shrink: 0;
+    position: relative;
+    z-index: 10;
+
+    .footer-btn {
+        flex: 1;
+        margin: 0;
+        border-radius: 16rpx;
+        height: 80rpx;
+        line-height: 80rpx;
+        font-size: 32rpx;
+        transition: all 0.3s ease;
+        font-weight: 500;
+
+        &:first-child {
+            margin-right: 20rpx;
+            background-color: #f5f5f5;
+            color: #666;
+            border: 1rpx solid #e0e0e0;
+
+            &:active {
+                background-color: #e0e0e0;
+                transform: scale(0.98);
+            }
+        }
+
+        &:last-child {
+            background-color: #256BFA;
+            color: #fff;
+            border: none;
+
+            &:active {
+                background-color: #1a56d9;
+                transform: scale(0.98);
+            }
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/components/renderJobs/renderJobs.vue b/components/renderJobs/renderJobs.vue
index 29ff2e8..3354ce2 100644
--- a/components/renderJobs/renderJobs.vue
+++ b/components/renderJobs/renderJobs.vue
@@ -77,7 +77,7 @@ function nextDetail(job) {
         const recordData = recommedIndexDb.JobParameter(job);
         recommedIndexDb.addRecord(recordData);
     }
-    navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(job.jobId)}`);
+    navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(job.jobId)}&encryptJobId=${encodeURIComponent(job.encryptJobId)}`);
 }
 </script>
 
diff --git a/components/renderJobs/renderJobsCheckBox.vue b/components/renderJobs/renderJobsCheckBox.vue
index c45a053..f163442 100644
--- a/components/renderJobs/renderJobsCheckBox.vue
+++ b/components/renderJobs/renderJobsCheckBox.vue
@@ -103,7 +103,7 @@ function nextDetail(job) {
         const recordData = recommedIndexDb.JobParameter(job);
         recommedIndexDb.addRecord(recordData);
     }
-    navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(job.jobId)}`);
+    navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(job.jobId)}&encryptJobId=${encodeURIComponent(job.encryptJobId)}`);
 }
 
 function toggleSelect(jobId) {
@@ -122,7 +122,7 @@ function handleCardClick(job, e) {
         const recordData = recommedIndexDb.JobParameter(job);
         recommedIndexDb.addRecord(recordData);
     }
-    navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(job.jobId)}`);
+    navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(job.jobId)}&encryptJobId=${encodeURIComponent(job.encryptJobId)}`);
 }
 
 // 新增：提供选中状态和切换方法给父组件
diff --git a/components/tabbar/midell-box.vue b/components/tabbar/midell-box.vue
index 6df2aaa..fd18b2e 100644
--- a/components/tabbar/midell-box.vue
+++ b/components/tabbar/midell-box.vue
@@ -76,7 +76,7 @@ const generateTabbarList = () => {
         {
             id: 2,
             text: 'AI+',
-            path: '/pages/chat/chat',
+            path: '/packageA/pages/chat/chat',
             iconPath: '../../static/tabbar/logo3.png',
             selectedIconPath: '../../static/tabbar/logo3.png',
             centerItem: true,
@@ -110,7 +110,7 @@ const generateTabbarList = () => {
         baseItems.splice(1, 0, {
             id: 1,
             text: '发布岗位',
-            path: '/pages/job/publishJob',
+            path: '/packageA/pages/job/publishJob',
             iconPath: '../../static/tabbar/post.png',
             selectedIconPath: '../../static/tabbar/posted.png',
             centerItem: false,
@@ -148,7 +148,7 @@ const changeItem = (item) => {
     const tabBarPages = [
         '/pages/index/index',
         '/pages/careerfair/careerfair', 
-        '/pages/chat/chat',
+        '/packageA/pages/chat/chat',
         '/pages/msglog/msglog',
         '/pages/mine/mine'
     ];
diff --git a/components/wxAuthLogin/WxAuthLogin.vue b/components/wxAuthLogin/WxAuthLogin.vue
index 0664095..283022c 100644
--- a/components/wxAuthLogin/WxAuthLogin.vue
+++ b/components/wxAuthLogin/WxAuthLogin.vue
@@ -40,6 +40,22 @@
                     </view>
                 </view>
                 
+                <!-- 机构类型选择（仅单位角色显示） -->
+                <view v-if="userType === 0" class="org-type-select">
+                    <view class="org-type-title">请选择机构类型</view>
+                    <view class="org-type-options">
+                        <view 
+                            v-for="option in orgTypeOptions" 
+                            :key="option.value"
+                            class="org-type-item"
+                            :class="{ active: orgType === option.value }"
+                            @click="selectOrgType(option.value)"
+                        >
+                            <view class="org-type-text">{{ option.label }}</view>
+                        </view>
+                    </view>
+                </view>
+                
                 <!-- 授权说明 -->
                 <view class="auth-tips">
                     <view class="tip-item">
@@ -87,33 +103,74 @@
                 </view>
                 
                 <!-- 用户协议 -->
-                <!-- <view class="auth-agreement">
-                    <text>登录即表示同意</text>
-                    <text class="link" @click="openAgreement('user')">《用户协议》</text>
-                    <text>和</text>
-                    <text class="link" @click="openAgreement('privacy')">《隐私政策》</text>
-                </view> -->
+                <view class="auth-agreement">
+                    <view class="agreement-checkbox" @click="toggleAgreement">
+                        <uni-icons 
+                            :type="agreedToAgreement ? 'checkbox-filled' : 'circle'" 
+                            size="20" 
+                            :color="agreedToAgreement ? '#256BFA' : '#999'"
+                        ></uni-icons>
+                        <text class="agreement-text">我已阅读并同意</text>
+                    </view>
+                    <text class="link" @click="openAgreement('user')">《隐私协议》</text>
+                    <!-- <text>和</text>
+                    <text class="link" @click="openAgreement('privacy')">《隐私政策》</text> -->
+                </view>
             </view>
         </view>
     </uni-popup>
 </template>
 
 <script setup>
-import { ref, inject } from 'vue';
+import { ref, inject, onMounted } from 'vue';
 import useUserStore from '@/stores/useUserStore';
+import useDictStore from '@/stores/useDictStore';
 import { tabbarManager } from '@/utils/tabbarManager';
 
 const { $api } = inject('globalFunction');
 const { loginSetToken } = useUserStore();
+const dictStore = useDictStore();
 
 const popup = ref(null);
 const userType = ref(null); // 用户角色：1-求职者，0-企业
+const orgType = ref(null); // 机构类型
+const orgTypeOptions = ref([]); // 机构类型选项
+const agreedToAgreement = ref(false); // 是否同意用户协议
 const emit = defineEmits(['success', 'cancel']);
 
+// 获取机构类型字典
+const getOrgTypeDict = async () => {
+    try {
+        const options = await dictStore.getDictSelectOption('org_type');
+        orgTypeOptions.value = options;
+    } catch (error) {
+        console.error('获取机构类型字典失败：', error);
+        // 使用备用数据
+        orgTypeOptions.value = [
+            { label: '有限责任公司', value: '1' },
+            { label: '股份有限公司', value: '2' },
+            { label: '个人独资企业', value: '3' },
+            { label: '合伙企业', value: '4' },
+            { label: '外商投资企业', value: '5' },
+            { label: '其他', value: '6' }
+        ];
+    }
+};
+
+// 组件挂载时获取字典数据
+onMounted(() => {
+    getOrgTypeDict();
+});
+
 // 打开弹窗
 const open = () => {
     popup.value?.open();
     userType.value = null; // 重置角色选择
+    orgType.value = null; // 重置机构类型选择
+    
+    // 检查是否已同意协议
+    const agreed = uni.getStorageSync('agreedToUserAgreement');
+    agreedToAgreement.value = !!agreed;
 };
 
 // 关闭弹窗
@@ -125,6 +182,12 @@ const close = () => {
 // 选择角色
 const selectRole = (type) => {
     userType.value = type;
+    orgType.value = null; // 切换角色时重置机构类型选择
+};
+
+// 选择机构类型
+const selectOrgType = (type) => {
+    orgType.value = type;
 };
 
 // 验证角色是否已选择
@@ -133,20 +196,32 @@ const validateRole = () => {
         $api.msg('请先选择您的角色');
         return false;
     }
+    
+    // 验证机构类型是否已选择（仅单位角色）
+    if (userType.value === 0 && orgType.value === null) {
+        $api.msg('请选择机构类型');
+        return false;
+    }
+    
+    // 验证是否同意用户协议
+    if (!agreedToAgreement.value) {
+        $api.msg('请先阅读并同意隐私协议');
+        return false;
+    }
+    
     return true;
 };
 
 const getPhoneNumber = (e) => {
     console.log('获取手机号：', e);
     console.log('userType.value', userType.value)
-    // 验证角色是否已选择
     
+    // 验证角色、机构类型和隐私协议
+    if (!validateRole()) {
+        return;
+    }
     
     if (e.detail.errMsg === 'getPhoneNumber:ok') {
-        if (userType.value === null) {
-            $api.msg('请先选择您的角色');
-            return true;
-        }
         uni.login({
 			provider: 'weixin',
 			success: (loginRes) => {
@@ -161,7 +236,8 @@ const getPhoneNumber = (e) => {
 					code,
 					encryptedData,
 					iv,
-					userType: userType.value
+					userType: userType.value,
+					orgType: orgType.value
 				}, 'post').then((resData) => {
 					uni.hideLoading();
 					console.log(resData, 'resume.idCard');
@@ -188,12 +264,12 @@ const getPhoneNumber = (e) => {
 								if (userType.value === 1 && !resData.idCard) {
 									// 求职者跳转到个人信息补全页面
 									uni.navigateTo({
-										url: '/pages/complete-info/complete-info?step=1'
+										url: '/packageA/pages/complete-info/complete-info?step=1'
 									});
 								} else if (userType.value === 0 && !resData.idCard) {
 									// 招聘者跳转到企业信息补全页面
 									uni.navigateTo({
-										url: '/pages/complete-info/company-info'
+										url: '/packageA/pages/complete-info/company-info'
 									});
 								}
 							}
@@ -201,7 +277,8 @@ const getPhoneNumber = (e) => {
 							$api.msg('获取用户信息失败');
 						});
 					} else {
-						$api.msg('登录失败，请重试');
+						// $api.msg('登录失败，请重试');
+                        $api.msg(resData.msg || '登录失败，请重试');
 					}
 				}).catch((err) => {
 					uni.hideLoading();
@@ -250,7 +327,8 @@ const wxLogin = () => {
                         // 调用后端接口进行登录
                         $api.createRequest('/app/appLogin', {
                             code: loginRes.code,
-                            userType: userType.value
+                            userType: userType.value,
+                            orgType: orgType.value
                         }, 'post').then((resData) => {
                             if (resData.token) {
                                 loginSetToken(resData.token).then((resume) => {
@@ -271,12 +349,12 @@ const wxLogin = () => {
                                         if (userType.value === 1) {
                                             // 求职者跳转到个人信息补全页面
                                             uni.navigateTo({
-                                                url: '/pages/complete-info/complete-info?step=1'
+                                                url: '/packageA/pages/complete-info/complete-info?step=1'
                                             });
                                         } else if (userType.value === 0) {
                                             // 招聘者跳转到企业信息补全页面
                                             uni.navigateTo({
-                                                url: '/pages/complete-info/company-info'
+                                                url: '/packageA/pages/complete-info/company-info'
                                             });
                                         }
                                     }
@@ -297,6 +375,11 @@ const wxLogin = () => {
 
 // 测试账号登录（仅开发环境）
 const testLogin = () => {
+    // 验证角色、机构类型和隐私协议
+    if (!validateRole()) {
+        return;
+    }
+    
     uni.showLoading({ title: '登录中...' });
     
     const params = {
@@ -325,12 +408,12 @@ const testLogin = () => {
                 if (userType.value === 1) {
                     // 求职者跳转到个人信息补全页面
                     uni.navigateTo({
-                        url: '/pages/complete-info/complete-info?step=1'
+                        url: '/packageA/pages/complete-info/complete-info?step=1'
                     });
                 } else if (userType.value === 0) {
                     // 招聘者跳转到企业信息补全页面
                     uni.navigateTo({
-                        url: '/pages/complete-info/company-info'
+                        url: '/packageA/pages/complete-info/company-info'
                     });
                 }
             }
@@ -343,18 +426,21 @@ const testLogin = () => {
     });
 };
 
+// 切换协议同意状态
+const toggleAgreement = () => {
+    agreedToAgreement.value = !agreedToAgreement.value;
+};
+
 // 打开用户协议
 const openAgreement = (type) => {
     const urls = {
-        user: '/pages/agreement/user',
-        privacy: '/pages/agreement/privacy'
+        user: '/packageA/pages/agreement/user',
+        privacy: '/packageA/pages/agreement/privacy'
     };
     
-    if (urls[type]) {
-        uni.navigateTo({
-            url: urls[type]
-        });
-    }
+    uni.navigateTo({
+        url: urls[type]
+    });
 };
 
 // 暴露方法供父组件调用
@@ -372,7 +458,7 @@ defineExpose({
     overflow: hidden
     
     .modal-content
-        padding: 60rpx 40rpx 40rpx
+        padding: 40rpx 40rpx 40rpx
         position: relative
         
         .close-btn
@@ -388,11 +474,11 @@ defineExpose({
         
         .auth-header
             text-align: center
-            margin-bottom: 40rpx
+            margin-bottom: 20rpx
             
             .auth-logo
-                width: 120rpx
-                height: 120rpx
+                width: 90rpx
+                height: 90rpx
                 margin: 0 auto 24rpx
             
             .auth-title
@@ -407,7 +493,6 @@ defineExpose({
         
         .role-select
             margin-bottom: 32rpx
-            
             .role-title
                 font-size: 28rpx
                 font-weight: 500
@@ -446,6 +531,41 @@ defineExpose({
                         color: #333333
                         font-weight: 500
         
+        .org-type-select
+            margin-bottom: 22rpx
+            
+            .org-type-title
+                font-size: 28rpx
+                font-weight: 500
+                color: #333333
+                margin-bottom: 20rpx
+                text-align: center
+            
+            .org-type-options
+                display: flex
+                flex-wrap: wrap
+                gap: 16rpx
+                
+                .org-type-item
+                    display:inline-block
+                    background: #F7F8FA
+                    border: 2rpx solid #E5E5E5
+                    border-radius: 10rpx
+                    padding: 10rpx 10rpx
+                    transition: all 0.3s ease
+                    cursor: pointer
+                    text-align: center
+                    
+                    &.active
+                        background: #F0F5FF
+                        border-color: #256BFA
+                        box-shadow: 0 4rpx 12rpx rgba(37, 107, 250, 0.15)
+                    
+                    .org-type-text
+                        font-size: 22rpx
+                        color: #333333
+                        font-weight: 500
+        
         .auth-tips
             background: #F7F8FA
             border-radius: 16rpx
@@ -496,10 +616,23 @@ defineExpose({
                     margin-left: 12rpx
         
         .auth-agreement
-            text-align: center
+            display: flex
+            align-items: center
+            justify-content: center
             font-size: 24rpx
             color: #999999
             line-height: 1.6
+            flex-wrap: wrap
+            gap: 8rpx
+            
+            .agreement-checkbox
+                display: flex
+                align-items: center
+                cursor: pointer
+                
+                .agreement-text
+                    margin-left: 8rpx
+                    color: #666666
             
             .link
                 color: #256BFA
diff --git a/config.js b/config.js
index 972541c..43388d2 100644
--- a/config.js
+++ b/config.js
@@ -1,32 +1,34 @@
 /*
- * @Descripttion: 
+ * @Descripttion:
  * @Author: lip
  * @Date: 2025-12-04 13:40:08
  * @LastEditors: lip
  */
 export default {
     // baseUrl: 'http://39.98.44.136:8080', // 测试
-    baseUrl: 'https://www.xjksly.cn/api/ks', // 测试
-    // baseUrl: 'https://www.xjksly.cn/api/ks', // 测试
+    baseUrl: 'https://www.xjksly.cn/api/ks', // 正式环境
     // baseUrl: 'http://ks.zhaopinzao8dian.com/api/ks', // 测试
 
 	// LCBaseUrl:'http://10.110.145.145:9100',//内网端口
 	// LCBaseUrlInner:'http://10.110.145.145:10100',//招聘、培训、帮扶
 	// imgBaseUrl:'http://10.110.145.145/images', //图片基础url
 	// trainVideoImgUrl:'http://10.110.145.145:9100/file/file/minio',
+    jobRecommendUrl:'http://222.80.110.161:11111/api', //岗位推荐的三方url
+    policyRecommendUrl:'http://222.80.110.161:11111/sdrc-api', //政策推荐的三方url
 	LCBaseUrl:'https://www.xjksly.cn/prod-api',//内网端口
 	LCBaseUrlInner:'https://www.xjksly.cn/prod-psout-api',//招聘、培训、帮扶
 	imgBaseUrl:'https://www.xjksly.cn/images', //图片基础url
 	trainVideoImgUrl:'https://www.xjksly.cn/prod-api/file/file/minio',
     // sseAI+
     // StreamBaseURl: 'http://39.98.44.136:8000',
-    StreamBaseURl: 'https://qd.zhaopinzao8dian.com/ai',
+    StreamBaseURl: 'https://www.xjksly.cn/api/ks/app/chat',
     // StreamBaseURl: 'https://qd.zhaopinzao8dian.com/ai/test',
     // 语音转文字
-    // vioceBaseURl: 'ws://39.98.44.136:8080/speech-recognition',
-    vioceBaseURl: 'wss://qd.zhaopinzao8dian.com/api/speech-recognition',
+    vioceBaseURl: 'https://www.xjksly.cn/api/ks/app/speech/asr',
+    // vioceBaseURl: 'wss://qd.zhaopinzao8dian.com/api/speech-recognition',
     // 语音合成
-    speechSynthesis: 'wss://qd.zhaopinzao8dian.com/api/speech-synthesis',
+    speechSynthesis: 'https://www.xjksly.cn/api/ks/app/speech/tts',
+    // speechSynthesis: 'wss://qd.zhaopinzao8dian.com/api/speech-synthesis',
     // indexedDB
     DBversion: 2,
     // 只使用本地缓寸的数据
diff --git a/docs/职业图谱接口说明.md b/docs/职业图谱接口说明.md
index 7615a1c..038131c 100644
--- a/docs/职业图谱接口说明.md
+++ b/docs/职业图谱接口说明.md
@@ -45,7 +45,7 @@
 
 ---
 
-### 2. ``getJobPathById`- 根据职业路径ID获取详情
+### 2. `getJobPathById`- 根据职业路径ID获取详情
 - **接口路径**: `/jobPath/getJobPathById`
 - **请求方法**: `GET`
 - **接口类型**: `zytp`
diff --git a/hook/useColumnCount.js b/hook/useColumnCount.js
index d96017e..9a25388 100644
--- a/hook/useColumnCount.js
+++ b/hook/useColumnCount.js
@@ -19,47 +19,36 @@ export function useColumnCount(onChange = () => {}) {
     //         columnCount.value = count < 2 ? 2 : count
     //     }
     // }
-    const calcColumn = () => {
-        // 使用新的API替代已废弃的getSystemInfoSync
-        let width
-        // #ifdef MP-WEIXIN
-        const mpSystemInfo = uni.getWindowInfo()
-        width = mpSystemInfo.windowWidth
-        // #endif
-        // #ifndef MP-WEIXIN
-        const otherSystemInfo = uni.getSystemInfoSync()
-        width = otherSystemInfo.windowWidth
-        // #endif
-
-        let count = 2
-        if (width >= 1000) {
-            // #ifdef H5
-            count = 3 // H5端最多显示3列
-            // #endif
-            // #ifndef H5
-            count = 5
-            // #endif
-        } else if (width >= 750) {
-            // #ifdef H5
-            count = 3 // H5端最多显示3列
-            // #endif
-            // #ifndef H5
-            count = 4
-            // #endif
-        } else if (width >= 500) {
-            count = 3
-        } else {
-            count = 2
-        }
-
-        if (count !== columnCount.value) {
-            columnCount.value = count
-        }
-
-        // 计算间距：count=2 => 1，count=5 => 2，中间线性插值
-        const spacing = 2 - (count - 2) * (1 / 3)
-        // console.log('列数:', count, '间距:', spacing.toFixed(2))
-        columnSpace.value = spacing
+    const calcColumn = () => {
+        // 使用新的API替代已废弃的getSystemInfoSync
+        let width
+        // #ifdef MP-WEIXIN
+        const mpSystemInfo = uni.getWindowInfo()
+        width = mpSystemInfo.windowWidth
+        // #endif
+        // #ifndef MP-WEIXIN
+        const otherSystemInfo = uni.getSystemInfoSync()
+        width = otherSystemInfo.windowWidth
+        // #endif
+
+        let count = 2
+        // #ifdef H5
+        // H5端固定显示2列
+        count = 2
+        // #endif
+        // #ifndef H5
+        // 小程序端固定显示1列
+        count = 1
+        // #endif
+
+        if (count !== columnCount.value) {
+            columnCount.value = count
+        }
+
+        // 计算间距：count=2 => 1，count=5 => 2，中间线性插值
+        const spacing = 2 - (count - 2) * (1 / 3)
+        // console.log('列数:', count, '间距:', spacing.toFixed(2))
+        columnSpace.value = spacing
     }
 
     onMounted(() => {
diff --git a/hook/useRealtimeRecorder.js b/hook/useRealtimeRecorder.js
index 43bbc15..b0833ad 100644
--- a/hook/useRealtimeRecorder.js
+++ b/hook/useRealtimeRecorder.js
@@ -20,6 +20,7 @@ export function useAudioRecorder() {
 
     const recognizedText = ref('')
     const lastFinalText = ref('')
+    const isRecognizing = ref(false) // 识别状态，暴露给外部
 
     let audioStream = null
     let audioContext = null
@@ -132,11 +133,15 @@ export function useAudioRecorder() {
                     }
                     case 'TranscriptionCompleted': {
                         lastFinalText.value = ''
+                        isRecognizing.value = false // 识别完成，重置状态
                         // console.log('识别全部完成')
+                        cleanup()
                         break
                     }
                     case 'TaskFailed': {
                         console.error('识别失败:', msg?.header?.status_text)
+                        isRecognizing.value = false // 识别失败，重置状态
+                        cleanup()
                         break
                     }
                     default:
@@ -151,7 +156,104 @@ export function useAudioRecorder() {
         if (isRecording.value) return
         
         // #ifdef MP-WEIXIN
-        $api.msg('小程序暂不支持语音识别功能');
+        try {
+            recognizedText.value = ''
+            lastFinalText.value = ''
+            // 开始录音时不设置isRecognizing为true，只有在停止录音后才保持isRecognizing为true
+            
+            const recorderManager = uni.getRecorderManager()
+            
+            // 监听录音完成事件
+            recorderManager.onStop(async (res) => {
+                console.log('小程序录音完成:', res)
+                try {
+                    // 停止录音后设置isRecognizing为true，显示loading
+                    isRecognizing.value = true
+                    
+                    // 打印请求配置，便于调试
+                    console.log('准备上传语音识别请求配置:', {
+                        url: config.vioceBaseURl,
+                        name: 'file',
+                        method: 'POST',
+                        fileType: 'audio',
+                        filePath: res.tempFilePath
+                    })
+                    
+                    // 上传录音文件到服务器进行语音识别
+                    const uploadResult = await uni.uploadFile({
+                        url: config.vioceBaseURl,
+                        filePath: res.tempFilePath,
+                        name: 'file',
+                        fileType: 'audio',
+                        method: 'POST' // 显式设置为POST请求
+                    })
+                    
+                    console.log('语音识别上传结果:', uploadResult)
+                    
+                    if (uploadResult.statusCode === 200) {
+                        try {
+                            const result = JSON.parse(uploadResult.data)
+                            console.log('语音识别结果:', result)
+                            if (result.code === 200 && result.data) {
+                                recognizedText.value = result.data
+                                console.log('语音识别成功，识别结果:', recognizedText.value)
+                                // 语音识别成功后，自动发送消息
+                                // 这里需要触发一个事件，让父组件知道识别成功
+                                // 或者直接调用发送消息的方法
+                                isRecognizing.value = false // 识别成功，重置状态
+                            } else {
+                                console.error('语音识别返回错误:', result.message || '未知错误')
+                                $api.msg('语音识别失败，请重试')
+                                isRecognizing.value = false // 识别失败，重置状态
+                            }
+                        } catch (parseErr) {
+                            console.error('语音识别结果解析失败:', parseErr)
+                            $api.msg('语音识别失败，请重试')
+                            isRecognizing.value = false // 解析失败，重置状态
+                        }
+                    } else {
+                        console.error('语音识别请求失败，状态码:', uploadResult.statusCode)
+                        $api.msg('语音识别失败，请重试')
+                        isRecognizing.value = false // 请求失败，重置状态
+                    }
+                } catch (err) {
+                    console.error('语音识别上传失败:', err)
+                    $api.msg('语音识别失败，请重试')
+                    isRecognizing.value = false // 上传失败，重置状态
+                }
+            })
+            
+            // 监听录音错误事件
+            recorderManager.onError((err) => {
+                console.error('小程序录音错误:', err)
+                $api.msg('录音失败，请重试');
+                cleanup()
+            })
+            
+            // 微信小程序录音API
+            await recorderManager.start({
+                duration: 60000, // 最长录音60秒
+                sampleRate: 16000,
+                numberOfChannels: 1,
+                encodeBitRate: 96000,
+                format: 'mp3'
+            })
+            
+            isRecording.value = true
+            recordingDuration.value = 0
+            durationTimer = setInterval(() => recordingDuration.value++, 1000)
+            
+            // 监听录音事件（可选）
+            recorderManager.onFrameRecorded((res) => {
+                // 更新音量显示
+                volumeLevel.value = res.volume || 0
+                audioDataForDisplay.value = Array(16).fill(volumeLevel.value)
+            })
+        } catch (err) {
+            console.error('小程序录音启动失败:', err)
+            $api.msg('录音启动失败，请重试');
+            cleanup()
+        }
         return;
         // #endif
         
@@ -164,6 +266,7 @@ export function useAudioRecorder() {
             
             recognizedText.value = ''
             lastFinalText.value = ''
+            // 开始录音时不设置isRecognizing为true，只有在停止录音后才保持isRecognizing为true
             await connectWebSocket()
 
             audioStream = await navigator.mediaDevices.getUserMedia({
@@ -201,6 +304,7 @@ export function useAudioRecorder() {
             durationTimer = setInterval(() => recordingDuration.value++, 1000)
         } catch (err) {
             console.error('启动失败:', err)
+            isRecognizing.value = false // 启动失败，重置状态
             cleanup()
         }
         // #endif
@@ -210,6 +314,12 @@ export function useAudioRecorder() {
         if (!isRecording.value || isStopping.value) return
         isStopping.value = true
 
+        // #ifdef MP-WEIXIN
+        uni.getRecorderManager().stop()
+        // 小程序中录音停止后会触发onStop事件，在onStop事件中处理识别结果和状态重置
+        // #endif
+        
+        // #ifdef H5
         if (websocket?.readyState === WebSocket.OPEN) {
             websocket.send(JSON.stringify({
                 header: {
@@ -218,18 +328,39 @@ export function useAudioRecorder() {
                     message_id: generateUUID()
                 }
             }))
-            websocket.close()
+            // H5中不立即调用cleanup，等待识别完成
         }
+        // #endif
 
-        cleanup()
+        // 只清理录音相关资源，不重置识别状态
+        clearInterval(durationTimer)
+        audioStream?.getTracks().forEach(track => track.stop())
+        audioContext?.close()
+        audioStream = null
+        audioContext = null
+        audioInput = null
+        scriptProcessor = null
+        
+        isRecording.value = false
+        isSocketConnected.value = false
         isStopping.value = false
     }
 
     const cancelRecording = () => {
         if (!isRecording.value || isStopping.value) return
         isStopping.value = true
+        
+        // #ifdef MP-WEIXIN
+        uni.getRecorderManager().stop()
+        // #endif
+        
+        // #ifdef H5
         websocket?.close()
+        // #endif
+        
+        // 取消录音时重置所有状态
         cleanup()
+        isRecognizing.value = false
         isStopping.value = false
     }
 
@@ -249,16 +380,22 @@ export function useAudioRecorder() {
 
         isRecording.value = false
         isSocketConnected.value = false
+        isRecognizing.value = false // 停止录音，重置识别状态
     }
 
     onUnmounted(() => {
         if (isRecording.value) stopRecording()
     })
 
+    const reset = () => {
+        cleanup()
+    }
+
     return {
         isRecording,
         isStopping,
         isSocketConnected,
+        isRecognizing,
         recordingDuration,
         audioDataForDisplay,
         volumeLevel,
@@ -266,6 +403,7 @@ export function useAudioRecorder() {
         lastFinalText,
         startRecording,
         stopRecording,
-        cancelRecording
+        cancelRecording,
+        reset
     }
 }
\ No newline at end of file
diff --git a/hook/useTTSPlayer.js b/hook/useTTSPlayer.js
index b11ff3a..9f95f3b 100644
--- a/hook/useTTSPlayer.js
+++ b/hook/useTTSPlayer.js
@@ -1,372 +1,639 @@
-import {
-    ref,
-    onUnmounted,
-    onBeforeUnmount,
-    onMounted
-} from 'vue'
-import {
-    onHide,
-    onUnload
-} from '@dcloudio/uni-app'
-import WavDecoder from '@/lib/wav-decoder@1.3.0.js'
-
-export function useTTSPlayer(wsUrl) {
-    const isSpeaking = ref(false)
-    const isPaused = ref(false)
-    const isComplete = ref(false)
-
-    // #ifdef H5
-    const audioContext = typeof window !== 'undefined' && (window.AudioContext || window.webkitAudioContext) 
-        ? new(window.AudioContext || window.webkitAudioContext)() 
-        : null
-    // #endif
-    
-    // #ifdef MP-WEIXIN
-    const audioContext = null // 微信小程序不支持 AudioContext
-    // #endif
-    
-    let playTime = audioContext ? audioContext.currentTime : 0
-    let sourceNodes = []
-    let socket = null
-    let sampleRate = 16000
-    let numChannels = 1
-    let isHeaderDecoded = false
-    let pendingText = null
-
-    let currentPlayId = 0
-    let activePlayId = 0
-
-    const speak = (text) => {
-        if (!audioContext) {
-            console.warn('⚠️ TTS not supported in current environment');
-            return;
-        }
-        
-        console.log('🎤 TTS speak function called');
-        console.log('📝 Text to synthesize:', text ? text.substring(0, 100) + '...' : 'No text');
-        console.log('🔗 WebSocket URL:', wsUrl);
-        
-        currentPlayId++
-        const myPlayId = currentPlayId
-        console.log('🆔 Play ID:', myPlayId);
-        
-        reset()
-        pendingText = text
-        activePlayId = myPlayId
-        
-        console.log('✅ Speak function setup complete');
-    }
-
-    const pause = () => {
-        if (!audioContext) {
-            console.warn('⚠️ TTS not supported in current environment');
-            return;
-        }
-        
-        console.log('⏸️ TTS pause called');
-        console.log('🔊 AudioContext state:', audioContext.state);
-        console.log('🔊 Is speaking before pause:', isSpeaking.value);
-        console.log('⏸️ Is paused before pause:', isPaused.value);
-        
-        if (audioContext.state === 'running') {
-            audioContext.suspend()
-            isPaused.value = true
-            // 不要设置 isSpeaking.value = false，保持当前状态
-            console.log('✅ Audio paused successfully');
-        } else {
-            console.log('⚠️ AudioContext is not running, cannot pause');
-        }
-        
-        console.log('🔊 Is speaking after pause:', isSpeaking.value);
-        console.log('⏸️ Is paused after pause:', isPaused.value);
-    }
-
-    const resume = () => {
-        if (!audioContext) {
-            console.warn('⚠️ TTS not supported in current environment');
-            return;
-        }
-        
-        console.log('▶️ TTS resume called');
-        console.log('🔊 AudioContext state:', audioContext.state);
-        console.log('🔊 Is speaking before resume:', isSpeaking.value);
-        console.log('⏸️ Is paused before resume:', isPaused.value);
-        
-        if (audioContext.state === 'suspended') {
-            audioContext.resume()
-            isPaused.value = false
-            isSpeaking.value = true
-            console.log('✅ Audio resumed successfully');
-        } else {
-            console.log('⚠️ AudioContext is not suspended, cannot resume');
-        }
-        
-        console.log('🔊 Is speaking after resume:', isSpeaking.value);
-        console.log('⏸️ Is paused after resume:', isPaused.value);
-    }
-
-    const cancelAudio = () => {
-        stop()
-    }
-
-    const stop = () => {
-        isSpeaking.value = false
-        isPaused.value = false
-        isComplete.value = false
-        playTime = audioContext ? audioContext.currentTime : 0
-
-        sourceNodes.forEach(node => {
-            try {
-                node.stop()
-                node.disconnect()
-            } catch (e) {}
-        })
-        sourceNodes = []
-
-        if (socket) {
-            socket.close()
-            socket = null
-        }
-
-        isHeaderDecoded = false
-        pendingText = null
-    }
-
-    const reset = () => {
-        stop()
-        isSpeaking.value = false
-        isPaused.value = false
-        isComplete.value = false
-        playTime = audioContext ? audioContext.currentTime : 0
-        initWebSocket()
-    }
-
-    const initWebSocket = () => {
-        if (!audioContext) {
-            console.warn('⚠️ WebSocket TTS not supported in current environment');
-            return;
-        }
-        
-        const thisPlayId = currentPlayId
-        console.log('🔌 Initializing WebSocket connection');
-        console.log('🔗 WebSocket URL:', wsUrl);
-        console.log('🆔 This play ID:', thisPlayId);
-        
-        socket = new WebSocket(wsUrl)
-        socket.binaryType = 'arraybuffer'
-        
-        // 设置心跳检测，避免超时
-        const heartbeatInterval = setInterval(() => {
-            if (socket && socket.readyState === WebSocket.OPEN) {
-                socket.send(JSON.stringify({ type: 'ping' }));
-            }
-        }, 30000); // 每30秒发送一次心跳
-
-        socket.onopen = () => {
-            console.log('✅ WebSocket connection opened');
-            if (pendingText && thisPlayId === activePlayId) {
-                const seepdText = extractSpeechText(pendingText)
-                console.log('📤 Sending text to TTS server:', seepdText.substring(0, 100) + '...');
-                socket.send(seepdText)
-                pendingText = null
-            } else {
-                console.log('❌ No pending text or play ID mismatch');
-                console.log('📝 Pending text exists:', !!pendingText);
-                console.log('🆔 Play ID match:', thisPlayId === activePlayId);
-            }
-        }
-        
-        socket.onerror = (error) => {
-            console.error('❌ WebSocket error:', error);
-        }
-        
-        socket.onclose = (event) => {
-            console.log('🔌 WebSocket connection closed:', event.code, event.reason);
-            clearInterval(heartbeatInterval);
-        }
-
-        socket.onmessage = async (e) => {
-            if (thisPlayId !== activePlayId) return // 忽略旧播放的消息
-
-            if (typeof e.data === 'string') {
-                try {
-                    const msg = JSON.parse(e.data)
-                    console.log('📨 TTS server message:', msg);
-                    if (msg.status === 'complete') {
-                        console.log('✅ TTS synthesis completed');
-                        isComplete.value = true
-                        // 计算剩余播放时间，确保播放完整
-                        const remainingTime = audioContext ? Math.max(0, (playTime - audioContext.currentTime) * 1000) : 0;
-                        console.log('⏱️ Remaining play time:', remainingTime + 'ms');
-                        setTimeout(() => {
-                            if (thisPlayId === activePlayId) {
-                                console.log('🔇 TTS playback finished, setting isSpeaking to false');
-                                isSpeaking.value = false
-                            }
-                        }, remainingTime + 500) // 额外500ms缓冲时间
-                    }
-                } catch (e) {
-                    console.log('[TTSPlayer] 文本消息:', e.data)
-                }
-            } else if (e.data instanceof ArrayBuffer) {
-                if (!isHeaderDecoded) {
-                    try {
-                        const decoded = await WavDecoder.decode(e.data)
-                        sampleRate = decoded.sampleRate
-                        numChannels = decoded.channelData.length
-                        decoded.channelData.forEach((channel, i) => {
-                            const audioBuffer = audioContext.createBuffer(1, channel.length,
-                                sampleRate)
-                            audioBuffer.copyToChannel(channel, 0)
-                            playBuffer(audioBuffer)
-                        })
-                        isHeaderDecoded = true
-                    } catch (err) {
-                        console.error('WAV 解码失败:', err)
-                    }
-                } else {
-                    const pcm = new Int16Array(e.data)
-                    const audioBuffer = pcmToAudioBuffer(pcm, sampleRate, numChannels)
-                    playBuffer(audioBuffer)
-                }
-            }
-        }
-    }
-
-    const pcmToAudioBuffer = (pcm, sampleRate, numChannels) => {
-        if (!audioContext) return null;
-        
-        const length = pcm.length / numChannels
-        const audioBuffer = audioContext.createBuffer(numChannels, length, sampleRate)
-        for (let ch = 0; ch < numChannels; ch++) {
-            const channelData = audioBuffer.getChannelData(ch)
-            for (let i = 0; i < length; i++) {
-                const sample = pcm[i * numChannels + ch]
-                channelData[i] = sample / 32768
-            }
-        }
-        return audioBuffer
-    }
-
-    const playBuffer = (audioBuffer) => {
-        if (!audioContext || !audioBuffer) return;
-        
-        console.log('🎵 playBuffer called, duration:', audioBuffer.duration + 's');
-        if (!isSpeaking.value) {
-            playTime = audioContext.currentTime
-            console.log('🎵 Starting new audio playback at time:', playTime);
-        }
-        const source = audioContext.createBufferSource()
-        source.buffer = audioBuffer
-        source.connect(audioContext.destination)
-        source.start(playTime)
-        sourceNodes.push(source)
-        playTime += audioBuffer.duration
-        isSpeaking.value = true
-        console.log('🎵 Audio scheduled, new playTime:', playTime);
-        
-        // 添加音频播放结束监听
-        source.onended = () => {
-            console.log('🎵 Audio buffer finished playing');
-        }
-    }
-
-    onUnmounted(() => {
-        stop()
-    })
-
-    // 页面刷新/关闭时
-    onMounted(() => {
-        if (typeof window !== 'undefined') {
-            window.addEventListener('beforeunload', cancelAudio)
-        }
-    })
-
-    onBeforeUnmount(() => {
-        cancelAudio()
-        if (typeof window !== 'undefined') {
-            window.removeEventListener('beforeunload', cancelAudio)
-        }
-    })
-
-    onHide(cancelAudio)
-    onUnload(cancelAudio)
-
-    // 只在支持 AudioContext 的环境中初始化 WebSocket
-    if (audioContext) {
-        initWebSocket()
-    }
-
-    return {
-        speak,
-        pause,
-        resume,
-        cancelAudio,
-        isSpeaking,
-        isPaused,
-        isComplete
-    }
-}
-
-function extractSpeechText(markdown) {
-    console.log('🔍 extractSpeechText called');
-    console.log('📝 Input markdown length:', markdown ? markdown.length : 0);
-    console.log('📝 Input markdown preview:', markdown ? markdown.substring(0, 200) + '...' : 'No markdown');
-    
-    const jobRegex = /``` job-json\s*({[\s\S]*?})\s*```/g;
-    const jobs = [];
-    let match;
-    let lastJobEndIndex = 0;
-    let firstJobStartIndex = -1;
-
-    // 提取岗位 json 数据及前后位置
-    while ((match = jobRegex.exec(markdown)) !== null) {
-        const jobStr = match[1];
-        try {
-            const job = JSON.parse(jobStr);
-            jobs.push(job);
-            if (firstJobStartIndex === -1) {
-                firstJobStartIndex = match.index;
-            }
-            lastJobEndIndex = jobRegex.lastIndex;
-            console.log('✅ Found job:', job.jobTitle);
-        } catch (e) {
-            console.warn('JSON 解析失败', e);
-        }
-    }
-
-    console.log('📊 Jobs found:', jobs.length);
-    console.log('📍 First job start index:', firstJobStartIndex);
-    console.log('📍 Last job end index:', lastJobEndIndex);
-
-    // 提取引导语（第一个 job-json 之前的文字）
-    const guideText = firstJobStartIndex > 0 ?
-        markdown.slice(0, firstJobStartIndex).trim() :
-        '';
-
-    // 提取结束语（最后一个 job-json 之后的文字）
-    const endingText = lastJobEndIndex < markdown.length ?
-        markdown.slice(lastJobEndIndex).trim() :
-        '';
-
-    console.log('📝 Guide text:', guideText);
-    console.log('📝 Ending text:', endingText);
-
-    // 岗位信息格式化为语音文本
-    const jobTexts = jobs.map((job, index) => {
-        return `第 ${index + 1} 个岗位，岗位名称是：${job.jobTitle}，公司是：${job.companyName}，薪资：${job.salary}，地点：${job.location}，学历要求：${job.education}，经验要求：${job.experience}。`;
-    });
-
-    // 拼接总语音内容
-    const finalTextParts = [];
-    if (guideText) finalTextParts.push(guideText);
-    finalTextParts.push(...jobTexts);
-    if (endingText) finalTextParts.push(endingText);
-
-    const finalText = finalTextParts.join('\n');
-    console.log('🎤 Final TTS text length:', finalText.length);
-    console.log('🎤 Final TTS text preview:', finalText.substring(0, 200) + '...');
-    console.log('🎤 Final TTS text parts count:', finalTextParts.length);
-
-    return finalText;
+import {
+    ref,
+    onUnmounted,
+    onBeforeUnmount,
+    onMounted
+} from 'vue'
+import {
+    onHide,
+    onUnload
+} from '@dcloudio/uni-app'
+
+// 创建单例实例
+let ttsInstance = null
+
+// 创建音频播放器类
+class TTSPlayer {
+    constructor(httpUrl) {
+        this.httpUrl = httpUrl
+        this.isSpeaking = ref(false)
+        this.isPaused = ref(false)
+        this.isComplete = ref(false)
+        
+        // #ifdef H5
+        this.audioContext = null
+        this.htmlAudioElement = null
+        this.abortController = null
+        // #endif
+        
+        // #ifdef MP-WEIXIN
+        this.backgroundAudioManager = null
+        this.innerAudioContext = null
+        // #endif
+        
+        this.currentAudioBuffer = null
+        this.currentSource = null
+        this.playTimeOffset = 0
+        this.isProcessingRequest = false
+    }
+    
+    // 初始化微信小程序音频上下文
+    initAudioManager() {
+        try {
+            console.log('📱 微信小程序：创建背景音频管理器')
+            this.backgroundAudioManager = uni.getBackgroundAudioManager()
+            
+            // 设置默认配置
+            this.backgroundAudioManager.title = 'AI语音播报'
+            this.backgroundAudioManager.singer = 'KS AI'
+            this.backgroundAudioManager.coverImgUrl = '/static/icon/logo.png'
+            this.backgroundAudioManager.volume = 1.0
+            
+            this.backgroundAudioManager.onPlay(() => {
+                console.log('🎵 微信小程序背景音频播放开始')
+                this.isSpeaking.value = true
+                this.isPaused.value = false
+            })
+            
+            this.backgroundAudioManager.onPause(() => {
+                console.log('⏸️ 微信小程序背景音频播放暂停')
+                this.isPaused.value = true
+            })
+            
+            this.backgroundAudioManager.onStop(() => {
+                console.log('⏹️ 微信小程序背景音频播放停止')
+                this.isSpeaking.value = false
+                this.isComplete.value = true
+            })
+            
+            this.backgroundAudioManager.onEnded(() => {
+                console.log('🎵 微信小程序背景音频播放结束')
+                this.isSpeaking.value = false
+                this.isComplete.value = true
+            })
+            
+            this.backgroundAudioManager.onError((res) => {
+                console.error('❌ 微信小程序背景音频播放错误:', res.errMsg, '错误码:', res.errCode)
+                this.isSpeaking.value = false
+                this.isComplete.value = false
+            })
+            
+            this.backgroundAudioManager.onCanplay(() => {
+                console.log('🎵 微信小程序背景音频可以播放了')
+            })
+            
+            console.log('✅ 微信小程序背景音频管理器初始化成功')
+            return true
+        } catch (e) {
+            console.error('❌ 微信小程序背景音频管理器初始化失败:', e)
+            // 降级使用InnerAudioContext
+            console.log('🔄 微信小程序：背景音频不可用，降级使用InnerAudioContext')
+            
+            if (!this.innerAudioContext) {
+                this.innerAudioContext = uni.createInnerAudioContext()
+                this.innerAudioContext.autoplay = false
+                this.innerAudioContext.obeyMuteSwitch = false
+                
+                this.innerAudioContext.onPlay(() => {
+                    console.log('🎵 微信小程序InnerAudioContext播放开始')
+                    this.isSpeaking.value = true
+                    this.isPaused.value = false
+                })
+                
+                this.innerAudioContext.onPause(() => {
+                    console.log('⏸️ 微信小程序InnerAudioContext播放暂停')
+                    this.isPaused.value = true
+                })
+                
+                this.innerAudioContext.onStop(() => {
+                    console.log('⏹️ 微信小程序InnerAudioContext播放停止')
+                    this.isSpeaking.value = false
+                    this.isComplete.value = true
+                })
+                
+                this.innerAudioContext.onEnded(() => {
+                    console.log('🎵 微信小程序InnerAudioContext播放结束')
+                    this.isSpeaking.value = false
+                    this.isComplete.value = true
+                })
+                
+                this.innerAudioContext.onError((res) => {
+                    console.error('❌ 微信小程序InnerAudioContext错误:', res.errMsg, '错误码:', res.errCode)
+                    this.isSpeaking.value = false
+                    this.isComplete.value = false
+                })
+                
+                this.innerAudioContext.onCanplay(() => {
+                    console.log('🎵 微信小程序InnerAudioContext可以播放了')
+                    if (this.isSpeaking.value && !this.isPaused.value) {
+                        this.innerAudioContext.play()
+                    }
+                })
+            }
+            return false
+        }
+    }
+    
+    // H5环境播放解码后的音频
+    playDecodedAudio(decoded) {
+        // #ifdef H5
+        if (!this.audioContext) return;
+        
+        // 创建音频源
+        this.currentSource = this.audioContext.createBufferSource()
+        this.currentSource.buffer = decoded
+        this.currentSource.connect(this.audioContext.destination)
+        
+        // 监听播放结束
+        this.currentSource.onended = () => {
+            console.log('🎵 Audio playback completed');
+            this.isSpeaking.value = false
+            this.isComplete.value = true
+        }
+        
+        // 开始播放
+        this.currentSource.start()
+        this.isSpeaking.value = true
+        this.isPaused.value = false
+        this.isComplete.value = false
+        console.log('🎵 Audio playback started');
+        // #endif
+    }
+    
+    // 降级处理：创建一个简单的音频缓冲区
+    createFallbackAudio(arrayBuffer) {
+        // #ifdef H5
+        console.log('🔄 使用降级方案创建音频');
+        
+        // 创建一个简单的音频缓冲区，生成提示音
+        const sampleRate = 44100
+        const duration = 1 // 1秒
+        const frameCount = sampleRate * duration
+        
+        const audioBuffer = this.audioContext.createBuffer(1, frameCount, sampleRate)
+        const channelData = audioBuffer.getChannelData(0)
+        
+        // 生成一个简单的提示音（正弦波）
+        for (let i = 0; i < frameCount; i++) {
+            const t = i / sampleRate
+            channelData[i] = Math.sin(2 * Math.PI * 440 * t) * 0.1 // 440Hz正弦波，音量0.1
+        }
+        
+        this.playDecodedAudio(audioBuffer)
+        // #endif
+    }
+    
+    // 暂停播放
+    pause() {
+        console.log('⏸️ TTS pause called');
+        
+        // #ifdef MP-WEIXIN
+        // 优先使用背景音频管理器
+        if (this.backgroundAudioManager) {
+            try {
+                this.backgroundAudioManager.pause()
+                console.log('⏸️ 微信小程序背景音频暂停');
+                return
+            } catch (e) {
+                console.error('❌ 微信小程序背景音频暂停失败:', e);
+            }
+        }
+        
+        // 降级使用InnerAudioContext
+        if (this.innerAudioContext && this.isSpeaking.value && !this.isPaused.value) {
+            try {
+                this.innerAudioContext.pause()
+                console.log('⏸️ 微信小程序InnerAudioContext暂停');
+                return
+            } catch (e) {
+                console.error('❌ 微信小程序InnerAudioContext暂停失败:', e);
+            }
+        }
+        // #endif
+        
+        // #ifdef H5
+        if (this.audioContext && !this.isSpeaking.value || this.isPaused.value) {
+            console.warn('⚠️ Cannot pause TTS playback');
+            return;
+        }
+        
+        if (this.audioContext.state === 'running') {
+            this.audioContext.suspend()
+            this.isPaused.value = true
+            // 保存当前播放位置
+            this.playTimeOffset = this.audioContext.currentTime
+            console.log('✅ H5 Audio paused successfully');
+        }
+        // #endif
+    }
+    
+    // 恢复播放
+    resume() {
+        console.log('▶️ TTS resume called');
+        
+        // #ifdef MP-WEIXIN
+        // 优先使用背景音频管理器
+        if (this.backgroundAudioManager) {
+            try {
+                this.backgroundAudioManager.play()
+                console.log('▶️ 微信小程序背景音频恢复播放');
+                return
+            } catch (e) {
+                console.error('❌ 微信小程序背景音频恢复失败:', e);
+            }
+        }
+        
+        // 降级使用InnerAudioContext
+        if (this.innerAudioContext && this.isSpeaking.value && this.isPaused.value) {
+            try {
+                this.innerAudioContext.play()
+                console.log('▶️ 微信小程序InnerAudioContext恢复播放');
+                return
+            } catch (e) {
+                console.error('❌ 微信小程序InnerAudioContext恢复失败:', e);
+            }
+        }
+        // #endif
+        
+        // #ifdef H5
+        if (this.audioContext && !this.isSpeaking.value || !this.isPaused.value) {
+            console.warn('⚠️ Cannot resume TTS playback');
+            return;
+        }
+        
+        if (this.audioContext.state === 'suspended') {
+            this.audioContext.resume()
+            this.isPaused.value = false
+            console.log('✅ H5 Audio resumed successfully');
+        }
+        // #endif
+    }
+    
+    // 停止播放
+    stop() {
+        console.log('⏹️ TTS stop called');
+        
+        // #ifdef MP-WEIXIN
+        // 优先使用背景音频管理器
+        if (this.backgroundAudioManager) {
+            try {
+                this.backgroundAudioManager.stop()
+                console.log('✅ 微信小程序背景音频停止');
+            } catch (e) {
+                console.error('❌ 微信小程序背景音频停止失败:', e);
+            }
+        }
+        
+        // 降级使用InnerAudioContext
+        if (this.innerAudioContext) {
+            try {
+                this.innerAudioContext.stop()
+                console.log('✅ 微信小程序InnerAudioContext停止');
+                this.innerAudioContext.destroy()
+                this.innerAudioContext = null
+            } catch (e) {
+                console.error('❌ 微信小程序InnerAudioContext停止错误:', e);
+            }
+        }
+        // #endif
+        
+        // #ifdef H5
+        // 取消正在进行的fetch请求
+        if (this.abortController) {
+            try {
+                this.abortController.abort();
+                this.abortController = null;
+                console.log('✅ H5 fetch request aborted');
+            } catch (e) {
+                console.error('❌ Error aborting H5 fetch request:', e);
+            }
+        }
+        
+        if (this.currentSource) {
+            try {
+                this.currentSource.stop()
+                this.currentSource.disconnect()
+            } catch (e) {
+                console.error('❌ Error stopping H5 audio source:', e);
+            }
+            this.currentSource = null
+        }
+        
+        // 停止并清理HTML5 Audio元素
+        if (this.htmlAudioElement) {
+            try {
+                this.htmlAudioElement.pause();
+                this.htmlAudioElement.src = '';
+                this.htmlAudioElement = null;
+                console.log('✅ H5 HTML5 Audio element stopped and cleaned up');
+            } catch (e) {
+                console.error('❌ Error stopping H5 HTML5 Audio element:', e);
+            }
+        }
+        
+        if (this.audioContext && this.audioContext.state === 'running') {
+            try {
+                this.audioContext.suspend()
+            } catch (e) {
+                console.error('❌ Error suspending H5 audio context:', e);
+            }
+        }
+        // #endif
+        
+        this.isSpeaking.value = false
+        this.isPaused.value = false
+        this.isComplete.value = false
+        this.currentAudioBuffer = null
+        this.playTimeOffset = 0
+        this.isProcessingRequest = false
+        
+        console.log('✅ TTS playback stopped');
+    }
+    
+    // 取消音频播放
+    cancelAudio() {
+        this.stop()
+    }
+    
+    // 合成并播放语音
+    async speak(text) {
+        // 停止当前播放和处理中的请求
+        this.stop()
+        
+        try {
+            // 标记开始处理请求
+            this.isProcessingRequest = true
+            
+            // 提取要合成的文本
+            const speechText = extractSpeechText(text)
+            console.log('📤 Sending text to TTS server via GET:', speechText.substring(0, 100) + '...');
+            
+            // 构建GET请求URL
+            const url = `${this.httpUrl}?text=${encodeURIComponent(speechText)}`
+            console.log('🔗 Final GET URL:', url);
+            
+            // #ifdef MP-WEIXIN
+            // 微信小程序环境，使用背景音频管理器
+            const isBackgroundAudioAvailable = this.initAudioManager()
+            
+            // 重置音频状态，但不立即设置为正在播放，等待实际播放时再设置
+            this.isPaused.value = false
+            this.isComplete.value = false
+            
+            if (isBackgroundAudioAvailable && this.backgroundAudioManager) {
+                console.log('🎵 微信小程序：使用背景音频管理器播放，URL:', url);
+                
+                // 设置背景音频参数
+                this.backgroundAudioManager.title = 'AI语音播报'
+                this.backgroundAudioManager.singer = 'KS AI'
+                this.backgroundAudioManager.coverImgUrl = '/static/icon/logo.png'
+                
+                // 直接设置src并播放
+                this.backgroundAudioManager.src = url
+                console.log('🎵 微信小程序背景音频开始加载');
+            } else {
+                // 降级方案：使用InnerAudioContext
+                console.log('🔄 微信小程序：背景音频不可用，降级使用InnerAudioContext');
+                
+                // 如果已有音频上下文，先销毁再重新创建
+                if (this.innerAudioContext) {
+                    this.innerAudioContext.destroy()
+                    this.innerAudioContext = null
+                }
+                
+                this.innerAudioContext = uni.createInnerAudioContext()
+                this.innerAudioContext.autoplay = true // 设置自动播放，等音频加载完成后自动开始
+                this.innerAudioContext.obeyMuteSwitch = false
+                this.innerAudioContext.volume = 1.0
+                
+                this.innerAudioContext.onPlay(() => {
+                    console.log('🎵 微信小程序InnerAudioContext播放开始')
+                    this.isSpeaking.value = true
+                    this.isPaused.value = false
+                })
+                
+                this.innerAudioContext.onPause(() => {
+                    console.log('⏸️ 微信小程序InnerAudioContext播放暂停')
+                    this.isPaused.value = true
+                })
+                
+                this.innerAudioContext.onStop(() => {
+                    console.log('⏹️ 微信小程序InnerAudioContext播放停止')
+                    this.isSpeaking.value = false
+                    this.isComplete.value = true
+                })
+                
+                this.innerAudioContext.onEnded(() => {
+                    console.log('🎵 微信小程序InnerAudioContext播放结束')
+                    this.isSpeaking.value = false
+                    this.isComplete.value = true
+                })
+                
+                this.innerAudioContext.onError((res) => {
+                    console.error('❌ 微信小程序InnerAudioContext错误:', res.errMsg, '错误码:', res.errCode)
+                    this.isSpeaking.value = false
+                    this.isComplete.value = false
+                })
+                
+                this.innerAudioContext.onCanplay(() => {
+                    console.log('🎵 微信小程序InnerAudioContext可以播放了')
+                    // 不需要手动调用play，因为已经设置了autoplay
+                })
+                
+                this.innerAudioContext.src = url
+                console.log('🎵 微信小程序InnerAudioContext开始加载');
+            }
+            // #endif
+            
+            // #ifdef H5
+            // H5环境，使用 AudioContext
+            try {
+                // 创建新的AbortController，用于取消当前请求
+                this.abortController = new AbortController();
+                const signal = this.abortController.signal;
+                
+                // 确保AudioContext已创建
+                if (!this.audioContext) {
+                    console.log('🎵 H5: 创建新的AudioContext');
+                    this.audioContext = new (window.AudioContext || window.webkitAudioContext)();
+                }
+                
+                // 检查并恢复AudioContext状态（浏览器安全策略要求用户交互后才能播放音频）
+                if (this.audioContext.state === 'suspended') {
+                    console.log('🎵 H5: 恢复挂起的AudioContext');
+                    await this.audioContext.resume();
+                    console.log('✅ H5: AudioContext已恢复，状态:', this.audioContext.state);
+                }
+                
+                // 发送GET请求获取语音数据，添加signal支持取消
+                const response = await fetch(url, { signal })
+                if (!response.ok) {
+                    throw new Error(`HTTP error! status: ${response.status}`)
+                }
+                
+                // 获取二进制数据
+                const arrayBuffer = await response.arrayBuffer()
+                console.log('✅ H5: Received audio data, size:', arrayBuffer.byteLength + ' bytes');
+                
+                try {
+                    // 直接使用 audioContext.decodeAudioData 解码，不依赖外部库
+                    const decoded = await this.audioContext.decodeAudioData(arrayBuffer)
+                    console.log('✅ H5: Audio decoded, sampleRate:', decoded.sampleRate, 'channels:', decoded.numberOfChannels);
+                    
+                    // 播放音频
+                    this.playDecodedAudio(decoded)
+                } catch (decodeError) {
+                    console.error('❌ H5: AudioContext decodeAudioData failed:', decodeError);
+                    // 降级处理：创建一个简单的音频缓冲区
+                    this.createFallbackAudio(arrayBuffer)
+                }
+            } catch (h5Error) {
+                // 检查是否是取消请求导致的错误
+                if (h5Error.name === 'AbortError') {
+                    console.log('✅ H5: Fetch request aborted as requested');
+                    this.isSpeaking.value = false;
+                    this.isComplete.value = false;
+                    return;
+                }
+                
+                console.error('❌ H5: Audio playback failed:', h5Error);
+                // 尝试使用HTML5 Audio元素作为最终降级方案
+                try {
+                    console.log('🔄 H5: 尝试使用HTML5 Audio元素播放');
+                    
+                    // 如果已有Audio元素，先停止并销毁
+                    if (this.htmlAudioElement) {
+                        this.htmlAudioElement.pause();
+                        this.htmlAudioElement.src = '';
+                        this.htmlAudioElement = null;
+                    }
+                    
+                    const audio = new Audio(url);
+                    this.htmlAudioElement = audio;
+                    audio.play();
+                    console.log('✅ H5: HTML5 Audio元素开始播放');
+                    
+                    // 设置音频状态
+                    this.isSpeaking.value = true;
+                    this.isPaused.value = false;
+                    this.isComplete.value = false;
+                    
+                    // 监听播放结束
+                    audio.onended = () => {
+                        console.log('🎵 H5: HTML5 Audio播放结束');
+                        this.isSpeaking.value = false;
+                        this.isComplete.value = true;
+                        this.htmlAudioElement = null;
+                    };
+                    
+                    // 监听播放错误
+                    audio.onerror = (error) => {
+                        console.error('❌ H5: HTML5 Audio播放错误:', error);
+                        this.isSpeaking.value = false;
+                        this.isComplete.value = false;
+                        this.htmlAudioElement = null;
+                    };
+                } catch (audioError) {
+                    console.error('❌ H5: HTML5 Audio播放也失败了:', audioError);
+                    this.isSpeaking.value = false;
+                    this.isComplete.value = false;
+                    this.htmlAudioElement = null;
+                }
+            } finally {
+                // 清除AbortController，因为请求已经完成（无论成功还是失败）
+                this.abortController = null;
+            }
+            // #endif
+            
+        } catch (error) {
+            console.error('❌ TTS synthesis failed:', error);
+            this.isSpeaking.value = false
+            this.isComplete.value = false
+        } finally {
+            // 标记请求处理完成
+            this.isProcessingRequest = false
+        }
+    }
+}
+
+// 导出单例hook
+export function useTTSPlayer(httpUrl) {
+    // 如果已经有实例，直接返回
+    if (!ttsInstance) {
+        ttsInstance = new TTSPlayer(httpUrl)
+    }
+    
+    // 返回实例的方法和状态
+    return {
+        speak: ttsInstance.speak.bind(ttsInstance),
+        pause: ttsInstance.pause.bind(ttsInstance),
+        resume: ttsInstance.resume.bind(ttsInstance),
+        cancelAudio: ttsInstance.cancelAudio.bind(ttsInstance),
+        isSpeaking: ttsInstance.isSpeaking,
+        isPaused: ttsInstance.isPaused,
+        isComplete: ttsInstance.isComplete
+    }
+}
+
+function extractSpeechText(markdown) {
+    console.log('🔍 extractSpeechText called');
+    console.log('📝 Input markdown length:', markdown ? markdown.length : 0);
+    console.log('📝 Input markdown preview:', markdown ? markdown.substring(0, 200) + '...' : 'No markdown');
+    
+    const jobRegex = /``` job-json\s*({[\s\S]*?})\s*```/g;
+    const jobs = [];
+    let match;
+    let lastJobEndIndex = 0;
+    let firstJobStartIndex = -1;
+
+    // 提取岗位 json 数据及前后位置
+    while ((match = jobRegex.exec(markdown)) !== null) {
+        const jobStr = match[1];
+        try {
+            const job = JSON.parse(jobStr);
+            jobs.push(job);
+            if (firstJobStartIndex === -1) {
+                firstJobStartIndex = match.index;
+            }
+            lastJobEndIndex = jobRegex.lastIndex;
+            console.log('✅ Found job:', job.jobTitle);
+        } catch (e) {
+            console.warn('JSON 解析失败', e);
+        }
+    }
+
+    console.log('📊 Jobs found:', jobs.length);
+    console.log('📍 First job start index:', firstJobStartIndex);
+    console.log('📍 Last job end index:', lastJobEndIndex);
+
+    // 提取引导语（第一个 job-json 之前的文字）
+    const guideText = firstJobStartIndex > 0 ?
+        markdown.slice(0, firstJobStartIndex).trim() :
+        '';
+
+    // 提取结束语（最后一个 job-json 之后的文字）
+    const endingText = lastJobEndIndex < markdown.length ?
+        markdown.slice(lastJobEndIndex).trim() :
+        '';
+
+    console.log('📝 Guide text:', guideText);
+    console.log('📝 Ending text:', endingText);
+
+    // 岗位信息格式化为语音文本
+    const jobTexts = jobs.map((job, index) => {
+        return `第 ${index + 1} 个岗位，岗位名称是：${job.jobTitle}，公司是：${job.companyName}，薪资：${job.salary}，地点：${job.location}，学历要求：${job.education}，经验要求：${job.experience}。`;
+    });
+
+    // 拼接总语音内容
+    const finalTextParts = [];
+    if (guideText) finalTextParts.push(guideText);
+    finalTextParts.push(...jobTexts);
+    if (endingText) finalTextParts.push(endingText);
+
+    const finalText = finalTextParts.join('\n');
+    console.log('🎤 Final TTS text length:', finalText.length);
+    console.log('🎤 Final TTS text preview:', finalText.substring(0, 200) + '...');
+    console.log('🎤 Final TTS text parts count:', finalTextParts.length);
+
+    return finalText;
 }
\ No newline at end of file
diff --git a/main.js b/main.js
index 45663a1..94b4446 100644
--- a/main.js
+++ b/main.js
@@ -9,20 +9,13 @@ import globalFunction from '@/common/globalFunction'
 import '@/lib/string-similarity.min.js'
 import similarityJobs from '@/utils/similarity_Job.js';
 import config from '@/config.js';
+import shareMixin from './mixins/share.js';
 // 组件
 import AppLayout from './components/AppLayout/AppLayout.vue';
 import Empty from './components/empty/empty.vue';
 import NoBouncePage from '@/components/NoBouncePage/NoBouncePage.vue'
 import MsgTips from '@/components/MsgTips/MsgTips.vue'
-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 uniIcons from './uni_modules/uni-icons/components/uni-icons/uni-icons.vue'
-import uniPopup from './uni_modules/uni-popup/components/uni-popup/uni-popup.vue'
-import uniDataSelect from './uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue'
-import uniSwipeAction from './uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.vue'
-import uniSwipeActionItem from './uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue'
 import storeRc from './utilsRc/store/index.js'
 import {processFileUrl,} from '@/utilsRc/common.js'
 // iconfont.css 已在 App.vue 中通过 @import 引入，无需在此处重复引入
@@ -44,20 +37,15 @@ import { getDict } from '@/apiRc/system/dict.js';
 export function createApp() {
     const app = createSSRApp(App)
 
+    // 注册全局分享混入
+    app.mixin(shareMixin)
+
     app.component('AppLayout', AppLayout)
     app.component('Empty', Empty)
     app.component('NoBouncePage', NoBouncePage)
     app.component('MsgTips', MsgTips)
-    app.component('SelectPopup', SelectPopup)
-    app.component('RenderJobs', RenderJobs)
-    app.component('RenderCompanys', RenderCompanys)
-    app.component('uni-icons', uniIcons)
-    app.component('uni-popup', uniPopup)
-    app.component('uni-data-select', uniDataSelect)
-    app.component('uni-swipe-action', uniSwipeAction)
-    app.component('uni-swipe-action-item', uniSwipeActionItem)
-    
-    
+
+
     app.config.globalProperties.$processFileUrl = processFileUrl;
     app.config.globalProperties.$getDict = getDict;
     app.config.globalProperties.$store = storeRc;
@@ -94,4 +82,4 @@ export function createApp() {
         app,
         Pinia
     }
-}
\ No newline at end of file
+}
diff --git a/mixins/share.js b/mixins/share.js
new file mode 100644
index 0000000..e575ed4
--- /dev/null
+++ b/mixins/share.js
@@ -0,0 +1,16 @@
+export default {
+  onShareAppMessage() {
+    return {
+      title: '喀什智慧就业平台',
+      path: '/pages/index/index',
+      imageUrl: ''
+    };
+  },
+  onShareTimeline() {
+    return {
+      title: '喀什智慧就业平台',
+      path: '/pages/index/index',
+      imageUrl: ''
+    };
+  }
+};
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 2db0b7d..0471f43 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,35 +1,52 @@
 {
-  "name": "ks-app-employment-service",
-  "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "dependencies": {
         "@dcloudio/uni-ui": "^1.5.11",
         "dayjs": "^1.11.19",
+        "mp-html": "^2.5.2",
         "sm-crypto": "^0.3.13"
+      },
+      "devDependencies": {
+        "crypto-js": "^4.2.0"
       }
     },
     "node_modules/@dcloudio/uni-ui": {
+  "lockfileVersion": 1,
+  "dependencies": {
+    "@dcloudio/uni-ui": {
       "version": "1.5.11",
-      "resolved": "https://registry.npmjs.org/@dcloudio/uni-ui/-/uni-ui-1.5.11.tgz",
+      "resolved": "https://registry.npmmirror.com/@dcloudio/uni-ui/-/uni-ui-1.5.11.tgz",
       "integrity": "sha512-DBtk046ofmeFd82zRI7d89SoEwrAxYzUN3WVPm1DIBkpLPG5F5QDNkHMnZGu2wNrMEmGBjBpUh3vqEY1L3jaMw=="
     },
+    "node_modules/crypto-js": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.2.0.tgz",
+      "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==",
+      "dev": true
+    },
     "node_modules/dayjs": {
+    "crypto-js": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-3.3.0.tgz",
+      "integrity": "sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q=="
+    },
+    "dayjs": {
       "version": "1.11.19",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.19.tgz",
+      "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.19.tgz",
       "integrity": "sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw=="
     },
-    "node_modules/jsbn": {
+    "jsbn": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/jsbn/-/jsbn-1.1.0.tgz",
       "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
     },
-    "node_modules/sm-crypto": {
+    "sm-crypto": {
       "version": "0.3.13",
       "resolved": "https://registry.npmmirror.com/sm-crypto/-/sm-crypto-0.3.13.tgz",
       "integrity": "sha512-ztNF+pZq6viCPMA1A6KKu3bgpkmYti5avykRHbcFIdSipFdkVmfUw2CnpM2kBJyppIalqvczLNM3wR8OQ0pT5w==",
-      "dependencies": {
+      "requires": {
         "jsbn": "^1.1.0"
       }
     }
diff --git a/package.json b/package.json
index bcc7116..2c5e6a9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,11 @@
 {
   "dependencies": {
     "@dcloudio/uni-ui": "^1.5.11",
+    "crypto-js": "^3.3.0",
     "dayjs": "^1.11.19",
     "sm-crypto": "^0.3.13"
+  },
+  "devDependencies": {
+    "crypto-js": "^4.2.0"
   }
 }
diff --git a/packageA/lib/lunar-javascript@1.7.2.js b/packageA/lib/lunar-javascript@1.7.2.js
deleted file mode 100644
index 8d5ad17..0000000
--- a/packageA/lib/lunar-javascript@1.7.2.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * Bundled by jsDelivr using Rollup v2.79.2 and Terser v5.39.0.
- * Original file: /npm/lunar-javascript@1.7.2/index.js
- *
- * Do NOT use SRI with dynamically generated files! More information: https://www.jsdelivr.com/using-sri-with-dynamic-files
- */
-var n,i="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},t={exports:{}};n=t,function(i,t){if(n.exports)n.exports=t();else{var e=t();for(var a in e)i[a]=e[a]}}(i,(function(){var n,i,t,e,a,g,r,u,h,s,o,F,C,A,E,D,x,c,d,y,B,f,j,_,I,p,l,S,z,m,N,Y,w,M,Z,G,k,T,b,v,H,O,X,L,q,J,P,U,W,Q,R,K,V,$,nn,tn,en,an,gn,rn,un,hn,sn,on,Fn=(n=function(i,t,e,a,g,r){var u=i,h=t,s=e,o=a,F=g,C=r;if(i*=1,isNaN(i))throw new Error("wrong solar year "+u);if(t*=1,isNaN(t))throw new Error("wrong solar month "+h);if(e*=1,isNaN(e))throw new Error("wrong solar day "+s);if(a*=1,isNaN(a))throw new Error("wrong hour "+o);if(g*=1,isNaN(g))throw new Error("wrong minute "+F);if(r*=1,isNaN(r))throw new Error("wrong second "+C);if(1582===i&&10===t&&e>4&&e<15)throw new Error("wrong solar year "+i+" month "+t+" day "+e);if(t<1||t>12)throw new Error("wrong month "+t);if(e<1||e>31)throw new Error("wrong day "+e);if(a<0||a>23)throw new Error("wrong hour "+a);if(g<0||g>59)throw new Error("wrong minute "+g);if(r<0||r>59)throw new Error("wrong second "+r);return{_p:{year:i,month:t,day:e,hour:a,minute:g,second:r},subtract:function(n){return fn.getDaysBetween(n.getYear(),n.getMonth(),n.getDay(),this._p.year,this._p.month,this._p.day)},subtractMinute:function(n){var i=this.subtract(n),t=60*this._p.hour+this._p.minute-(60*n.getHour()+n.getMinute());return t<0&&(t+=1440,i--),t+=1440*i},isAfter:function(n){return this._p.year>n.getYear()||!(this._p.year<n.getYear())&&(this._p.month>n.getMonth()||!(this._p.month<n.getMonth())&&(this._p.day>n.getDay()||!(this._p.day<n.getDay())&&(this._p.hour>n.getHour()||!(this._p.hour<n.getHour())&&(this._p.minute>n.getMinute()||!(this._p.minute<n.getMinute())&&this._p.second>n.getSecond()))))},isBefore:function(n){return!(this._p.year>n.getYear())&&(this._p.year<n.getYear()||!(this._p.month>n.getMonth())&&(this._p.month<n.getMonth()||!(this._p.day>n.getDay())&&(this._p.day<n.getDay()||!(this._p.hour>n.getHour())&&(this._p.hour<n.getHour()||!(this._p.minute>n.getMinute())&&(this._p.minute<n.getMinute()||this._p.second<n.getSecond())))))},getYear:function(){return this._p.year},getMonth:function(){return this._p.month},getDay:function(){return this._p.day},getHour:function(){return this._p.hour},getMinute:function(){return this._p.minute},getSecond:function(){return this._p.second},getWeek:function(){return(Math.floor(this.getJulianDay()+.5)+7000001)%7},getWeekInChinese:function(){return fn.WEEK[this.getWeek()]},getSolarWeek:function(n){return An.fromYmd(this._p.year,this._p.month,this._p.day,n)},isLeapYear:function(){return fn.isLeapYear(this._p.year)},getFestivals:function(){var n=[],i=fn.FESTIVAL[this._p.month+"-"+this._p.day];i&&n.push(i);var t=Math.ceil(this._p.day/7),e=this.getWeek();return(i=fn.WEEK_FESTIVAL[this._p.month+"-"+t+"-"+e])&&n.push(i),this._p.day+7>fn.getDaysOfMonth(this._p.year,this._p.month)&&(i=fn.WEEK_FESTIVAL[this._p.month+"-0-"+e])&&n.push(i),n},getOtherFestivals:function(){var n=[],i=fn.OTHER_FESTIVAL[this._p.month+"-"+this._p.day];return i&&(n=n.concat(i)),n},getXingzuo:function(){return this.getXingZuo()},getXingZuo:function(){var n=11,i=100*this._p.month+this._p.day;return i>=321&&i<=419?n=0:i>=420&&i<=520?n=1:i>=521&&i<=621?n=2:i>=622&&i<=722?n=3:i>=723&&i<=822?n=4:i>=823&&i<=922?n=5:i>=923&&i<=1023?n=6:i>=1024&&i<=1122?n=7:i>=1123&&i<=1221?n=8:i>=1222||i<=119?n=9:i<=218&&(n=10),fn.XINGZUO[n]},toYmd:function(){for(var n=this._p.month,i=this._p.day,t=this._p.year+"";t.length<4;)t="0"+t;return[t,(n<10?"0":"")+n,(i<10?"0":"")+i].join("-")},toYmdHms:function(){return this.toYmd()+" "+[(this._p.hour<10?"0":"")+this._p.hour,(this._p.minute<10?"0":"")+this._p.minute,(this._p.second<10?"0":"")+this._p.second].join(":")},toString:function(){return this.toYmd()},toFullString:function(){var n=this.toYmdHms();this.isLeapYear()&&(n+=" 闰年"),n+=" 星期"+this.getWeekInChinese();for(var i=this.getFestivals(),t=0,e=i.length;t<e;t++)n+=" ("+i[t]+")";return n+=" "+this.getXingZuo()+"座"},nextYear:function(i){var t=i;if(i*=1,isNaN(i))throw new Error("wrong years "+t);var e=this._p.year+i,a=this._p.month,g=this._p.day;return 1582===e&&10===a?g>4&&g<15&&(g+=10):2===a&&g>28&&(fn.isLeapYear(e)||(g=28)),n(e,a,g,this._p.hour,this._p.minute,this._p.second)},nextMonth:function(i){var t=i;if(i*=1,isNaN(i))throw new Error("wrong months "+t);var e=En.fromYm(this._p.year,this._p.month).next(i),a=e.getYear(),g=e.getMonth(),r=this._p.day;if(1582===a&&10===g)r>4&&r<15&&(r+=10);else{var u=fn.getDaysOfMonth(a,g);r>u&&(r=u)}return n(a,g,r,this._p.hour,this._p.minute,this._p.second)},nextDay:function(i){var t=i;if(i*=1,isNaN(i))throw new Error("wrong days "+t);var e=this._p.year,a=this._p.month,g=this._p.day;if(1582===e&&10===a&&g>4&&(g-=10),i>0){g+=i;for(var r=fn.getDaysOfMonth(e,a);g>r;)g-=r,++a>12&&(a=1,e++),r=fn.getDaysOfMonth(e,a)}else if(i<0){for(;g+i<=0;)--a<1&&(a=12,e--),g+=fn.getDaysOfMonth(e,a);g+=i}return 1582===e&&10===a&&g>4&&(g+=10),n(e,a,g,this._p.hour,this._p.minute,this._p.second)},nextWorkday:function(i){var t=i;if(i*=1,isNaN(i))throw new Error("wrong days "+t);var e=n(this._p.year,this._p.month,this._p.day,this._p.hour,this._p.minute,this._p.second);if(0!==i)for(var a=Math.abs(i),g=i<1?-1:1;a>0;){e=e.next(g);var r=!0,u=_n.getHoliday(e.getYear(),e.getMonth(),e.getDay());if(u)r=u.isWork();else{var h=e.getWeek();0!==h&&6!==h||(r=!1)}r&&(a-=1)}return e},next:function(n,i){return i?this.nextWorkday(n):this.nextDay(n)},nextHour:function(i){var t=i;if(i*=1,isNaN(i))throw new Error("wrong hours "+t);var e=this._p.hour+i,a=e<0?-1:1,g=Math.abs(e),r=Math.floor(g/24)*a;(g=g%24*a)<0&&(g+=24,r--);var u=this.next(r);return n(u.getYear(),u.getMonth(),u.getDay(),g,u.getMinute(),u.getSecond())},getLunar:function(){return Cn.fromSolar(this)},getJulianDay:function(){var n=this._p.year,i=this._p.month,t=this._p.day+((this._p.second/60+this._p.minute)/60+this._p.hour)/24,e=0,a=!1;return 372*n+31*i+Math.floor(t)>=588829&&(a=!0),i<=2&&(i+=12,n--),a&&(e=2-(e=Math.floor(n/100))+Math.floor(e/4)),Math.floor(365.25*(n+4716))+Math.floor(30.6001*(i+1))+t+e-1524.5},getSalaryRate:function(){if(1===this._p.month&&1===this._p.day)return 3;if(5===this._p.month&&1===this._p.day)return 3;if(10===this._p.month&&this._p.day>=1&&this._p.day<=3)return 3;var n=this.getLunar();if(1===n.getMonth()&&n.getDay()>=1&&n.getDay()<=3)return 3;if(5===n.getMonth()&&5===n.getDay())return 3;if(8===n.getMonth()&&15===n.getDay())return 3;if("清明"===n.getJieQi())return 3;var i=_n.getHoliday(this._p.year,this._p.month,this._p.day);if(i){if(!i.isWork())return 2}else{var t=this.getWeek();if(6===t||0===t)return 2}return 1}}},{J2000:2451545,fromYmd:function(i,t,e){return n(i,t,e,0,0,0)},fromYmdHms:function(i,t,e,a,g,r){return n(i,t,e,a,g,r)},fromDate:function(i){return function(i){return n(i.getFullYear(),i.getMonth()+1,i.getDate(),i.getHours(),i.getMinutes(),i.getSeconds())}(i)},fromJulianDay:function(i){return function(i){var t,e=Math.floor(i+.5),a=i+.5-e;e>=2299161&&(e+=1+(t=Math.floor((e-1867216.25)/36524.25))-Math.floor(t/4)),e+=1524;var g=Math.floor((e-122.1)/365.25);e-=Math.floor(365.25*g);var r=Math.floor(e/30.601),u=e-=Math.floor(30.601*r);r>13?(r-=13,g-=4715):(r-=1,g-=4716),a*=24;var h=Math.floor(a);a-=h,a*=60;var s=Math.floor(a);a-=s,a*=60;var o=Math.round(a);return o>59&&(o-=60,s++),s>59&&(s-=60,h++),h>23&&(h-=24,u+=1),n(g,r,u,h,s,o)}(i)},fromBaZi:function(n,i,t,e,a,g){return function(n,i,t,e,a,g){a*=1,isNaN(a)&&(a=2),1!==a&&(a=2),g*=1,isNaN(g)&&(g=1900);var r=[],u=jn.index(i.substring(1),jn.ZHI,-1)-2;if(u<0&&(u+=12),(2*(jn.index(n.substring(0,1),jn.GAN,-1)+1)+u)%10!==jn.index(i.substring(0,1),jn.GAN,-1))return r;var h=jn.getJiaZiIndex(n)-57;h<0&&(h+=60),h++,u*=2;var s=2*jn.index(e.substring(1),jn.ZHI,-1),o=[s];0===s&&2===a&&(o=[0,23]);for(var F=g-1,C=(new Date).getFullYear();h<=C;){if(h>=F){var A=Cn.fromYmd(h,1,1),E=A.getJieQiList(),D=A.getJieQiTable()[E[4+u]];if(D.getYear()>=g){var x=jn.getJiaZiIndex(t)-jn.getJiaZiIndex(D.getLunar().getDayInGanZhiExact2());x<0&&(x+=60),x>0&&(D=D.next(x));for(var c=0,d=o.length;c<d;c++){var y=o[c],B=0,f=0;0===x&&y===D.getHour()&&(B=D.getMinute(),f=D.getSecond());var j=Fn.fromYmdHms(D.getYear(),D.getMonth(),D.getDay(),y,B,f),_=j.getLunar(),I=2===a?_.getDayInGanZhiExact2():_.getDayInGanZhiExact();_.getYearInGanZhiExact()===n&&_.getMonthInGanZhiExact()===i&&I===t&&_.getTimeInGanZhi()===e&&r.push(j)}}}h+=60}return r}(n,i,t,e,a,g)}}),Cn=function(){var n=function(n,i,t,e,a,g){var r={};return function(n,i){n.jieQiList=[],n.jieQi={};for(var t=i.getJieQiJulianDays(),e=0,a=jn.JIE_QI_IN_USE.length;e<a;e++){var g=jn.JIE_QI_IN_USE[e];n.jieQiList.push(g),n.jieQi[g]=Fn.fromJulianDay(t[e])}}(r,g),function(n,i,t){var e=t-4,a=e%10,g=e%12;a<0&&(a+=10),g<0&&(g+=12);var r=a,u=g,h=a,s=g,o=i.getYear(),F=i.toYmd(),C=i.toYmdHms(),A=n.jieQi[Mn.getMessage("jq.liChun")];A.getYear()!==o&&(A=n.jieQi.LI_CHUN);var E=A.toYmd(),D=A.toYmdHms();t===o?(F<E&&(r--,u--),C<D&&(h--,s--)):t<o&&(F>=E&&(r++,u++),C>=D&&(h++,s++)),n.yearGanIndex=a,n.yearZhiIndex=g,n.yearGanIndexByLiChun=(r<0?r+10:r)%10,n.yearZhiIndexByLiChun=(u<0?u+12:u)%12,n.yearGanIndexExact=(h<0?h+10:h)%10,n.yearZhiIndexExact=(s<0?s+12:s)%12}(r,a,n),function(n,i){var t,e,a=null,g=jn.JIE_QI_IN_USE.length,r=-3;for(t=0;t<g;t+=2){e=n.jieQi[jn.JIE_QI_IN_USE[t]];var u=i.toYmd();if(u>=(null==a?u:a.toYmd())&&u<e.toYmd())break;a=e,r++}var h=2*((n.yearGanIndexByLiChun+(r<0?1:0))%5+1)%10;for(n.monthGanIndex=((r<0?r+10:r)+h)%10,n.monthZhiIndex=((r<0?r+12:r)+jn.BASE_MONTH_ZHI_INDEX)%12,a=null,r=-3,t=0;t<g;t+=2){e=n.jieQi[jn.JIE_QI_IN_USE[t]];var s=i.toYmdHms();if(s>=(null==a?s:a.toYmdHms())&&s<e.toYmdHms())break;a=e,r++}h=2*((n.yearGanIndexExact+(r<0?1:0))%5+1)%10,n.monthGanIndexExact=((r<0?r+10:r)+h)%10,n.monthZhiIndexExact=((r<0?r+12:r)+jn.BASE_MONTH_ZHI_INDEX)%12}(r,a),function(n,i,t,e){var a=Fn.fromYmdHms(i.getYear(),i.getMonth(),i.getDay(),12,0,0),g=Math.floor(a.getJulianDay())-11,r=g%10,u=g%12;n.dayGanIndex=r,n.dayZhiIndex=u;var h=r,s=u;n.dayGanIndexExact2=h,n.dayZhiIndexExact2=s;var o=(t<10?"0":"")+t+":"+(e<10?"0":"")+e;o>="23:00"&&o<="23:59"&&(++h>=10&&(h-=10),++s>=12&&(s-=12)),n.dayGanIndexExact=h,n.dayZhiIndexExact=s}(r,a,i,t),function(n,i,t){var e=jn.getTimeZhiIndex((i<10?"0":"")+i+":"+(t<10?"0":"")+t);n.timeZhiIndex=e,n.timeGanIndex=(n.dayGanIndexExact%5*2+e)%10}(r,i,t),function(n,i){n.weekIndex=i.getWeek()}(r,a),r},i=function(n){for(var i=0,t=0,a=0,g=dn.fromYear(n.getYear()),r=g.getMonths(),u=0,h=r.length;u<h;u++){var s=r[u],o=n.subtract(Fn.fromJulianDay(s.getFirstJulianDay()));if(o<s.getDayCount()){i=s.getYear(),t=s.getMonth(),a=o+1;break}}return e(i,t,a,n.getHour(),n.getMinute(),n.getSecond(),n,g)},t=function(n,i,t,a,g,r){var u=n,h=i,s=t,o=a,F=g,C=r;if(n*=1,isNaN(n))throw new Error("wrong lunar year "+u);if(i*=1,isNaN(i))throw new Error("wrong lunar month "+h);if(t*=1,isNaN(t))throw new Error("wrong lunar day "+s);if(a*=1,isNaN(a))throw new Error("wrong hour "+o);if(g*=1,isNaN(g))throw new Error("wrong minute "+F);if(r*=1,isNaN(r))throw new Error("wrong second "+C);if(a<0||a>23)throw new Error("wrong hour "+a);if(g<0||g>59)throw new Error("wrong minute "+g);if(r<0||r>59)throw new Error("wrong second "+r);var A=dn.fromYear(n),E=A.getMonth(i);if(null==E)throw new Error("wrong lunar year "+n+" month "+i);if(t<1)throw new Error("lunar day must bigger than 0");var D=E.getDayCount();if(t>D)throw new Error("only "+D+" days in lunar year "+n+" month "+i);var x=Fn.fromJulianDay(E.getFirstJulianDay()+t-1),c=Fn.fromYmdHms(x.getYear(),x.getMonth(),x.getDay(),a,g,r);return x.getYear()!==n&&(A=dn.fromYear(x.getYear())),e(n,i,t,a,g,r,c,A)},e=function(i,t,e,a,g,r,u,h){var s=n(i,a,g,0,u,h);return{_p:{lang:Mn.getLanguage(),year:i,month:t,day:e,hour:a,minute:g,second:r,timeGanIndex:s.timeGanIndex,timeZhiIndex:s.timeZhiIndex,dayGanIndex:s.dayGanIndex,dayZhiIndex:s.dayZhiIndex,dayGanIndexExact:s.dayGanIndexExact,dayZhiIndexExact:s.dayZhiIndexExact,dayGanIndexExact2:s.dayGanIndexExact2,dayZhiIndexExact2:s.dayZhiIndexExact2,monthGanIndex:s.monthGanIndex,monthZhiIndex:s.monthZhiIndex,monthGanIndexExact:s.monthGanIndexExact,monthZhiIndexExact:s.monthZhiIndexExact,yearGanIndex:s.yearGanIndex,yearZhiIndex:s.yearZhiIndex,yearGanIndexByLiChun:s.yearGanIndexByLiChun,yearZhiIndexByLiChun:s.yearZhiIndexByLiChun,yearGanIndexExact:s.yearGanIndexExact,yearZhiIndexExact:s.yearZhiIndexExact,weekIndex:s.weekIndex,jieQi:s.jieQi,jieQiList:s.jieQiList,solar:u,eightChar:null},getYear:function(){return this._p.year},getMonth:function(){return this._p.month},getDay:function(){return this._p.day},getHour:function(){return this._p.hour},getMinute:function(){return this._p.minute},getSecond:function(){return this._p.second},getTimeGanIndex:function(){return this._p.timeGanIndex},getTimeZhiIndex:function(){return this._p.timeZhiIndex},getDayGanIndex:function(){return this._p.dayGanIndex},getDayGanIndexExact:function(){return this._p.dayGanIndexExact},getDayGanIndexExact2:function(){return this._p.dayGanIndexExact2},getDayZhiIndex:function(){return this._p.dayZhiIndex},getDayZhiIndexExact:function(){return this._p.dayZhiIndexExact},getDayZhiIndexExact2:function(){return this._p.dayZhiIndexExact2},getMonthGanIndex:function(){return this._p.monthGanIndex},getMonthGanIndexExact:function(){return this._p.monthGanIndexExact},getMonthZhiIndex:function(){return this._p.monthZhiIndex},getMonthZhiIndexExact:function(){return this._p.monthZhiIndexExact},getYearGanIndex:function(){return this._p.yearGanIndex},getYearGanIndexByLiChun:function(){return this._p.yearGanIndexByLiChun},getYearGanIndexExact:function(){return this._p.yearGanIndexExact},getYearZhiIndex:function(){return this._p.yearZhiIndex},getYearZhiIndexByLiChun:function(){return this._p.yearZhiIndexByLiChun},getYearZhiIndexExact:function(){return this._p.yearZhiIndexExact},getGan:function(){return this.getYearGan()},getZhi:function(){return this.getYearZhi()},getYearGan:function(){return jn.GAN[this._p.yearGanIndex+1]},getYearGanByLiChun:function(){return jn.GAN[this._p.yearGanIndexByLiChun+1]},getYearGanExact:function(){return jn.GAN[this._p.yearGanIndexExact+1]},getYearZhi:function(){return jn.ZHI[this._p.yearZhiIndex+1]},getYearZhiByLiChun:function(){return jn.ZHI[this._p.yearZhiIndexByLiChun+1]},getYearZhiExact:function(){return jn.ZHI[this._p.yearZhiIndexExact+1]},getYearInGanZhi:function(){return this.getYearGan()+this.getYearZhi()},getYearInGanZhiByLiChun:function(){return this.getYearGanByLiChun()+this.getYearZhiByLiChun()},getYearInGanZhiExact:function(){return this.getYearGanExact()+this.getYearZhiExact()},getMonthGan:function(){return jn.GAN[this._p.monthGanIndex+1]},getMonthGanExact:function(){return jn.GAN[this._p.monthGanIndexExact+1]},getMonthZhi:function(){return jn.ZHI[this._p.monthZhiIndex+1]},getMonthZhiExact:function(){return jn.ZHI[this._p.monthZhiIndexExact+1]},getMonthInGanZhi:function(){return this.getMonthGan()+this.getMonthZhi()},getMonthInGanZhiExact:function(){return this.getMonthGanExact()+this.getMonthZhiExact()},getDayGan:function(){return jn.GAN[this._p.dayGanIndex+1]},getDayGanExact:function(){return jn.GAN[this._p.dayGanIndexExact+1]},getDayGanExact2:function(){return jn.GAN[this._p.dayGanIndexExact2+1]},getDayZhi:function(){return jn.ZHI[this._p.dayZhiIndex+1]},getDayZhiExact:function(){return jn.ZHI[this._p.dayZhiIndexExact+1]},getDayZhiExact2:function(){return jn.ZHI[this._p.dayZhiIndexExact2+1]},getDayInGanZhi:function(){return this.getDayGan()+this.getDayZhi()},getDayInGanZhiExact:function(){return this.getDayGanExact()+this.getDayZhiExact()},getDayInGanZhiExact2:function(){return this.getDayGanExact2()+this.getDayZhiExact2()},getTimeGan:function(){return jn.GAN[this._p.timeGanIndex+1]},getTimeZhi:function(){return jn.ZHI[this._p.timeZhiIndex+1]},getTimeInGanZhi:function(){return this.getTimeGan()+this.getTimeZhi()},getShengxiao:function(){return this.getYearShengXiao()},getYearShengXiao:function(){return jn.SHENGXIAO[this._p.yearZhiIndex+1]},getYearShengXiaoByLiChun:function(){return jn.SHENGXIAO[this._p.yearZhiIndexByLiChun+1]},getYearShengXiaoExact:function(){return jn.SHENGXIAO[this._p.yearZhiIndexExact+1]},getMonthShengXiao:function(){return jn.SHENGXIAO[this._p.monthZhiIndex+1]},getMonthShengXiaoExact:function(){return jn.SHENGXIAO[this._p.monthZhiIndexExact+1]},getDayShengXiao:function(){return jn.SHENGXIAO[this._p.dayZhiIndex+1]},getTimeShengXiao:function(){return jn.SHENGXIAO[this._p.timeZhiIndex+1]},getYearInChinese:function(){for(var n=this._p.year+"",i="",t="0".charCodeAt(0),e=0,a=n.length;e<a;e++)i+=jn.NUMBER[n.charCodeAt(e)-t];return i},getMonthInChinese:function(){var n=this._p.month;return(n<0?"闰":"")+jn.MONTH[Math.abs(n)]},getDayInChinese:function(){return jn.DAY[this._p.day]},getPengZuGan:function(){return jn.PENGZU_GAN[this._p.dayGanIndex+1]},getPengZuZhi:function(){return jn.PENGZU_ZHI[this._p.dayZhiIndex+1]},getPositionXi:function(){return this.getDayPositionXi()},getPositionXiDesc:function(){return this.getDayPositionXiDesc()},getPositionYangGui:function(){return this.getDayPositionYangGui()},getPositionYangGuiDesc:function(){return this.getDayPositionYangGuiDesc()},getPositionYinGui:function(){return this.getDayPositionYinGui()},getPositionYinGuiDesc:function(){return this.getDayPositionYinGuiDesc()},getPositionFu:function(){return this.getDayPositionFu()},getPositionFuDesc:function(){return this.getDayPositionFuDesc()},getPositionCai:function(){return this.getDayPositionCai()},getPositionCaiDesc:function(){return this.getDayPositionCaiDesc()},getDayPositionXi:function(){return jn.POSITION_XI[this._p.dayGanIndex+1]},getDayPositionXiDesc:function(){return jn.POSITION_DESC[this.getDayPositionXi()]},getDayPositionYangGui:function(){return jn.POSITION_YANG_GUI[this._p.dayGanIndex+1]},getDayPositionYangGuiDesc:function(){return jn.POSITION_DESC[this.getDayPositionYangGui()]},getDayPositionYinGui:function(){return jn.POSITION_YIN_GUI[this._p.dayGanIndex+1]},getDayPositionYinGuiDesc:function(){return jn.POSITION_DESC[this.getDayPositionYinGui()]},getDayPositionFu:function(n){return(1===n?jn.POSITION_FU:jn.POSITION_FU_2)[this._p.dayGanIndex+1]},getDayPositionFuDesc:function(n){return jn.POSITION_DESC[this.getDayPositionFu(n)]},getDayPositionCai:function(){return jn.POSITION_CAI[this._p.dayGanIndex+1]},getDayPositionCaiDesc:function(){return jn.POSITION_DESC[this.getDayPositionCai()]},getTimePositionXi:function(){return jn.POSITION_XI[this._p.timeGanIndex+1]},getTimePositionXiDesc:function(){return jn.POSITION_DESC[this.getTimePositionXi()]},getTimePositionYangGui:function(){return jn.POSITION_YANG_GUI[this._p.timeGanIndex+1]},getTimePositionYangGuiDesc:function(){return jn.POSITION_DESC[this.getTimePositionYangGui()]},getTimePositionYinGui:function(){return jn.POSITION_YIN_GUI[this._p.timeGanIndex+1]},getTimePositionYinGuiDesc:function(){return jn.POSITION_DESC[this.getTimePositionYinGui()]},getTimePositionFu:function(n){return(1===n?jn.POSITION_FU:jn.POSITION_FU_2)[this._p.timeGanIndex+1]},getTimePositionFuDesc:function(n){return jn.POSITION_DESC[this.getTimePositionFu(n)]},getTimePositionCai:function(){return jn.POSITION_CAI[this._p.timeGanIndex+1]},getTimePositionCaiDesc:function(){return jn.POSITION_DESC[this.getTimePositionCai()]},getDayPositionTaiSui:function(n){var i,t;switch(n){case 1:i=this.getDayInGanZhi(),t=this._p.yearZhiIndex;break;case 3:i=this.getDayInGanZhi(),t=this._p.yearZhiIndexExact;break;default:i=this.getDayInGanZhiExact2(),t=this._p.yearZhiIndexByLiChun}return[Mn.getMessage("jz.jiaZi"),Mn.getMessage("jz.yiChou"),Mn.getMessage("jz.bingYin"),Mn.getMessage("jz.dingMao"),Mn.getMessage("jz.wuChen"),Mn.getMessage("jz.jiSi")].join(",").indexOf(i)>-1?Mn.getMessage("bg.zhen"):[Mn.getMessage("jz.bingZi"),Mn.getMessage("jz.dingChou"),Mn.getMessage("jz.wuYin"),Mn.getMessage("jz.jiMao"),Mn.getMessage("jz.gengChen"),Mn.getMessage("jz.xinSi")].join(",").indexOf(i)>-1?Mn.getMessage("bg.li"):[Mn.getMessage("jz.wuZi"),Mn.getMessage("jz.jiChou"),Mn.getMessage("jz.gengYin"),Mn.getMessage("jz.xinMao"),Mn.getMessage("jz.renChen"),Mn.getMessage("jz.guiSi")].join(",").indexOf(i)>-1?Mn.getMessage("ps.center"):[Mn.getMessage("jz.gengZi"),Mn.getMessage("jz.xinChou"),Mn.getMessage("jz.renYin"),Mn.getMessage("jz.guiMao"),Mn.getMessage("jz.jiaChen"),Mn.getMessage("jz.yiSi")].join(",").indexOf(i)>-1?Mn.getMessage("bg.dui"):[Mn.getMessage("jz.renZi"),Mn.getMessage("jz.guiChou"),Mn.getMessage("jz.jiaYin"),Mn.getMessage("jz.yiMao"),Mn.getMessage("jz.bingChen"),Mn.getMessage("jz.dingSi")].join(",").indexOf(i)>-1?Mn.getMessage("bg.kan"):jn.POSITION_TAI_SUI_YEAR[t]},getDayPositionTaiSuiDesc:function(n){return jn.POSITION_DESC[this.getDayPositionTaiSui(n)]},getMonthPositionTaiSui:function(n){var i,t;3===n?(i=this._p.monthZhiIndexExact,t=this._p.monthGanIndexExact):(i=this._p.monthZhiIndex,t=this._p.monthGanIndex);var e=i-jn.BASE_MONTH_ZHI_INDEX;return e<0&&(e+=12),[Mn.getMessage("bg.gen"),jn.POSITION_GAN[t],Mn.getMessage("bg.kun"),Mn.getMessage("bg.xun")][e%4]},getMonthPositionTaiSuiDesc:function(n){return jn.POSITION_DESC[this.getMonthPositionTaiSui(n)]},getYearPositionTaiSui:function(n){var i;switch(n){case 1:i=this._p.yearZhiIndex;break;case 3:i=this._p.yearZhiIndexExact;break;default:i=this._p.yearZhiIndexByLiChun}return jn.POSITION_TAI_SUI_YEAR[i]},getYearPositionTaiSuiDesc:function(n){return jn.POSITION_DESC[this.getYearPositionTaiSui(n)]},_checkLang:function(){var n=Mn.getLanguage();if(this._p.lang!==n){for(var i=0,t=jn.JIE_QI_IN_USE.length;i<t;i++){var e=jn.JIE_QI_IN_USE[i],a=this._p.jieQiList[i],g=this._p.jieQi[a];this._p.jieQiList[i]=e,this._p.jieQi[e]=g}this._p.lang=n}},_getJieQiSolar:function(n){return this._checkLang(),this._p.jieQi[n]},getChong:function(){return this.getDayChong()},getChongGan:function(){return this.getDayChongGan()},getChongGanTie:function(){return this.getDayChongGanTie()},getChongShengXiao:function(){return this.getDayChongShengXiao()},getChongDesc:function(){return this.getDayChongDesc()},getSha:function(){return this.getDaySha()},getDayChong:function(){return jn.CHONG[this._p.dayZhiIndex]},getDayChongGan:function(){return jn.CHONG_GAN[this._p.dayGanIndex]},getDayChongGanTie:function(){return jn.CHONG_GAN_TIE[this._p.dayGanIndex]},getDayChongShengXiao:function(){for(var n=this.getChong(),i=0,t=jn.ZHI.length;i<t;i++)if(jn.ZHI[i]===n)return jn.SHENGXIAO[i];return""},getDayChongDesc:function(){return"("+this.getDayChongGan()+this.getDayChong()+")"+this.getDayChongShengXiao()},getDaySha:function(){return jn.SHA[this.getDayZhi()]},getTimeChong:function(){return jn.CHONG[this._p.timeZhiIndex]},getTimeChongGan:function(){return jn.CHONG_GAN[this._p.timeGanIndex]},getTimeChongGanTie:function(){return jn.CHONG_GAN_TIE[this._p.timeGanIndex]},getTimeChongShengXiao:function(){for(var n=this.getTimeChong(),i=0,t=jn.ZHI.length;i<t;i++)if(jn.ZHI[i]===n)return jn.SHENGXIAO[i];return""},getTimeChongDesc:function(){return"("+this.getTimeChongGan()+this.getTimeChong()+")"+this.getTimeChongShengXiao()},getTimeSha:function(){return jn.SHA[this.getTimeZhi()]},getYearNaYin:function(){return jn.NAYIN[this.getYearInGanZhi()]},getMonthNaYin:function(){return jn.NAYIN[this.getMonthInGanZhi()]},getDayNaYin:function(){return jn.NAYIN[this.getDayInGanZhi()]},getTimeNaYin:function(){return jn.NAYIN[this.getTimeInGanZhi()]},getSeason:function(){return jn.SEASON[Math.abs(this._p.month)]},_convertJieQi:function(n){var i=n;return"DONG_ZHI"===i?i=Mn.getMessage("jq.dongZhi"):"DA_HAN"===i?i=Mn.getMessage("jq.daHan"):"XIAO_HAN"===i?i=Mn.getMessage("jq.xiaoHan"):"LI_CHUN"===i?i=Mn.getMessage("jq.liChun"):"DA_XUE"===i?i=Mn.getMessage("jq.daXue"):"YU_SHUI"===i?i=Mn.getMessage("jq.yuShui"):"JING_ZHE"===i&&(i=Mn.getMessage("jq.jingZhe")),i},getJie:function(){for(var n=0,i=jn.JIE_QI_IN_USE.length;n<i;n+=2){var t=jn.JIE_QI_IN_USE[n],e=this._getJieQiSolar(t);if(e.getYear()===this._p.solar.getYear()&&e.getMonth()===this._p.solar.getMonth()&&e.getDay()===this._p.solar.getDay())return this._convertJieQi(t)}return""},getQi:function(){for(var n=1,i=jn.JIE_QI_IN_USE.length;n<i;n+=2){var t=jn.JIE_QI_IN_USE[n],e=this._getJieQiSolar(t);if(e.getYear()===this._p.solar.getYear()&&e.getMonth()===this._p.solar.getMonth()&&e.getDay()===this._p.solar.getDay())return this._convertJieQi(t)}return""},getJieQi:function(){for(var n in this._p.jieQi){var i=this._getJieQiSolar(n);if(i.getYear()===this._p.solar.getYear()&&i.getMonth()===this._p.solar.getMonth()&&i.getDay()===this._p.solar.getDay())return this._convertJieQi(n)}return""},getWeek:function(){return this._p.weekIndex},getWeekInChinese:function(){return fn.WEEK[this.getWeek()]},getXiu:function(){return jn.XIU[this.getDayZhi()+this.getWeek()]},getXiuLuck:function(){return jn.XIU_LUCK[this.getXiu()]},getXiuSong:function(){return jn.XIU_SONG[this.getXiu()]},getZheng:function(){return jn.ZHENG[this.getXiu()]},getAnimal:function(){return jn.ANIMAL[this.getXiu()]},getGong:function(){return jn.GONG[this.getXiu()]},getShou:function(){return jn.SHOU[this.getGong()]},getFestivals:function(){var n=[],i=jn.FESTIVAL[this._p.month+"-"+this._p.day];return i&&n.push(i),12===Math.abs(this._p.month)&&this._p.day>=29&&this._p.year!==this.next(1).getYear()&&n.push(Mn.getMessage("jr.chuXi")),n},getOtherFestivals:function(){var n=[],i=jn.OTHER_FESTIVAL[this._p.month+"-"+this._p.day];i&&(n=n.concat(i));var t=this._p.solar.toYmd();this._p.solar.toYmd()===this._getJieQiSolar(Mn.getMessage("jq.qingMing")).next(-1).toYmd()&&n.push("寒食节");var e=this._getJieQiSolar(Mn.getMessage("jq.liChun")),a=4-e.getLunar().getDayGanIndex();return a<0&&(a+=10),t===e.next(a+40).toYmd()&&n.push("春社"),(a=4-(e=this._getJieQiSolar(Mn.getMessage("jq.liQiu"))).getLunar().getDayGanIndex())<0&&(a+=10),t===e.next(a+40).toYmd()&&n.push("秋社"),n},getBaZi:function(){var n=this.getEightChar(),i=[];return i.push(n.getYear()),i.push(n.getMonth()),i.push(n.getDay()),i.push(n.getTime()),i},getBaZiWuXing:function(){var n=this.getEightChar(),i=[];return i.push(n.getYearWuXing()),i.push(n.getMonthWuXing()),i.push(n.getDayWuXing()),i.push(n.getTimeWuXing()),i},getBaZiNaYin:function(){var n=this.getEightChar(),i=[];return i.push(n.getYearNaYin()),i.push(n.getMonthNaYin()),i.push(n.getDayNaYin()),i.push(n.getTimeNaYin()),i},getBaZiShiShenGan:function(){var n=this.getEightChar(),i=[];return i.push(n.getYearShiShenGan()),i.push(n.getMonthShiShenGan()),i.push(n.getDayShiShenGan()),i.push(n.getTimeShiShenGan()),i},getBaZiShiShenZhi:function(){var n=this.getEightChar(),i=[];return i.push(n.getYearShiShenZhi()[0]),i.push(n.getMonthShiShenZhi()[0]),i.push(n.getDayShiShenZhi()[0]),i.push(n.getTimeShiShenZhi()[0]),i},getBaZiShiShenYearZhi:function(){return this.getEightChar().getYearShiShenZhi()},getBaZiShiShenMonthZhi:function(){return this.getEightChar().getMonthShiShenZhi()},getBaZiShiShenDayZhi:function(){return this.getEightChar().getDayShiShenZhi()},getBaZiShiShenTimeZhi:function(){return this.getEightChar().getTimeShiShenZhi()},getZhiXing:function(){var n=this._p.dayZhiIndex-this._p.monthZhiIndex;return n<0&&(n+=12),jn.ZHI_XING[n+1]},getDayTianShen:function(){var n=this.getMonthZhi(),i=jn.ZHI_TIAN_SHEN_OFFSET[n];return jn.TIAN_SHEN[(this._p.dayZhiIndex+i)%12+1]},getTimeTianShen:function(){var n=this.getDayZhiExact(),i=jn.ZHI_TIAN_SHEN_OFFSET[n];return jn.TIAN_SHEN[(this._p.timeZhiIndex+i)%12+1]},getDayTianShenType:function(){return jn.TIAN_SHEN_TYPE[this.getDayTianShen()]},getTimeTianShenType:function(){return jn.TIAN_SHEN_TYPE[this.getTimeTianShen()]},getDayTianShenLuck:function(){return jn.TIAN_SHEN_TYPE_LUCK[this.getDayTianShenType()]},getTimeTianShenLuck:function(){return jn.TIAN_SHEN_TYPE_LUCK[this.getTimeTianShenType()]},getDayPositionTai:function(){return jn.POSITION_TAI_DAY[jn.getJiaZiIndex(this.getDayInGanZhi())]},getMonthPositionTai:function(){var n=this._p.month;return n<0?"":jn.POSITION_TAI_MONTH[n-1]},getDayYi:function(n){return n*=1,isNaN(n)&&(n=1),jn.getDayYi(2===n?this.getMonthInGanZhiExact():this.getMonthInGanZhi(),this.getDayInGanZhi())},getDayJi:function(n){return n*=1,isNaN(n)&&(n=1),jn.getDayJi(2===n?this.getMonthInGanZhiExact():this.getMonthInGanZhi(),this.getDayInGanZhi())},getDayJiShen:function(){return jn.getDayJiShen(this.getMonth(),this.getDayInGanZhi())},getDayXiongSha:function(){return jn.getDayXiongSha(this.getMonth(),this.getDayInGanZhi())},getTimeYi:function(){return jn.getTimeYi(this.getDayInGanZhiExact(),this.getTimeInGanZhi())},getTimeJi:function(){return jn.getTimeJi(this.getDayInGanZhiExact(),this.getTimeInGanZhi())},getYueXiang:function(){return jn.YUE_XIANG[this._p.day]},_getYearNineStar:function(n){var i=jn.getJiaZiIndex(n)+1,t=i-(jn.getJiaZiIndex(this.getYearInGanZhi())+1);t>1?t-=60:t<-1&&(t+=60);var e=(62+Math.floor((this._p.year+t+2696)/60)%3*3-i)%9;return 0===e&&(e=9),In.fromIndex(e-1)},getYearNineStar:function(n){var i;switch(n){case 1:i=this.getYearInGanZhi();break;case 3:i=this.getYearInGanZhiExact();break;default:i=this.getYearInGanZhiByLiChun()}return this._getYearNineStar(i)},getMonthNineStar:function(n){var i,t;switch(n){case 1:i=this._p.yearZhiIndex,t=this._p.monthZhiIndex;break;case 3:i=this._p.yearZhiIndexExact,t=this._p.monthZhiIndexExact;break;default:i=this._p.yearZhiIndexByLiChun,t=this._p.monthZhiIndex}var e=27-i%3*3;return t<jn.BASE_MONTH_ZHI_INDEX&&(e-=3),In.fromIndex((e-t)%9)},getDayNineStar:function(){var n,i,t,e=this._p.solar.toYmd(),a=this._getJieQiSolar(Mn.getMessage("jq.dongZhi")),g=this._getJieQiSolar("DONG_ZHI"),r=this._getJieQiSolar(Mn.getMessage("jq.xiaZhi")),u=jn.getJiaZiIndex(a.getLunar().getDayInGanZhi()),h=jn.getJiaZiIndex(g.getLunar().getDayInGanZhi()),s=jn.getJiaZiIndex(r.getLunar().getDayInGanZhi()),o=(n=u>29?a.next(60-u):a.next(-u)).toYmd(),F=(i=h>29?g.next(60-h):g.next(-h)).toYmd(),C=(t=s>29?r.next(60-s):r.next(-s)).toYmd(),A=0;return e>=o&&e<C?A=this._p.solar.subtract(n)%9:e>=C&&e<F?A=8-this._p.solar.subtract(t)%9:e>=F?A=this._p.solar.subtract(i)%9:e<o&&(A=(8+n.subtract(this._p.solar))%9),In.fromIndex(A)},getTimeNineStar:function(){var n=this._p.solar.toYmd(),i=!1;(n>=this._getJieQiSolar(Mn.getMessage("jq.dongZhi")).toYmd()&&n<this._getJieQiSolar(Mn.getMessage("jq.xiaZhi")).toYmd()||n>=this._getJieQiSolar("DONG_ZHI").toYmd())&&(i=!0);var t=(i?[0,3,6]:[8,5,2])[this.getDayZhiIndex()%3],e=this.getTimeZhiIndex(),a=i?t+e:t+9-e;return In.fromIndex(a%9)},getSolar:function(){return this._p.solar},getJieQiTable:function(){return this._checkLang(),this._p.jieQi},getJieQiList:function(){return this._p.jieQiList},getNextJie:function(n){for(var i=[],t=0,e=jn.JIE_QI_IN_USE.length/2;t<e;t++)i.push(jn.JIE_QI_IN_USE[2*t]);return this._getNearJieQi(!0,i,n)},getPrevJie:function(n){for(var i=[],t=0,e=jn.JIE_QI_IN_USE.length/2;t<e;t++)i.push(jn.JIE_QI_IN_USE[2*t]);return this._getNearJieQi(!1,i,n)},getNextQi:function(n){for(var i=[],t=0,e=jn.JIE_QI_IN_USE.length/2;t<e;t++)i.push(jn.JIE_QI_IN_USE[2*t+1]);return this._getNearJieQi(!0,i,n)},getPrevQi:function(n){for(var i=[],t=0,e=jn.JIE_QI_IN_USE.length/2;t<e;t++)i.push(jn.JIE_QI_IN_USE[2*t+1]);return this._getNearJieQi(!1,i,n)},getNextJieQi:function(n){return this._getNearJieQi(!0,null,n)},getPrevJieQi:function(n){return this._getNearJieQi(!1,null,n)},_buildJieQi:function(n,i){for(var t=!1,e=!1,a=0,g=jn.JIE_QI.length;a<g;a++)if(jn.JIE_QI[a]===n){a%2==0?e=!0:t=!0;break}return{_p:{name:n,solar:i,jie:t,qi:e},getName:function(){return this._p.name},getSolar:function(){return this._p.solar},setName:function(n){this._p.name=n},setSolar:function(n){this._p.solar=n},isJie:function(){return this._p.jie},isQi:function(){return this._p.qi},toString:function(){return this.getName()}}},_getNearJieQi:function(n,i,t){var e=null,a=null,g={},r=!1;if(null!=i)for(var u=0,h=i.length;u<h;u++)g[i[u]]=!0,r=!0;var s=this._p.solar[t?"toYmd":"toYmdHms"]();for(var o in this._p.jieQi){var F=this._convertJieQi(o);if(!r||g[F]){var C=this._getJieQiSolar(o),A=C[t?"toYmd":"toYmdHms"]();if(n){if(A<=s)continue;(null==a||A<a[t?"toYmd":"toYmdHms"]())&&(e=F,a=C)}else{if(A>s)continue;(null==a||A>a[t?"toYmd":"toYmdHms"]())&&(e=F,a=C)}}}return null==a?null:this._buildJieQi(e,a)},getCurrentJieQi:function(){for(var n in this._p.jieQi){var i=this._getJieQiSolar(n);if(i.getYear()===this._p.solar.getYear()&&i.getMonth()===this._p.solar.getMonth()&&i.getDay()===this._p.solar.getDay())return this._buildJieQi(this._convertJieQi(n),i)}return null},getCurrentJie:function(){for(var n=0,i=jn.JIE_QI_IN_USE.length;n<i;n+=2){var t=jn.JIE_QI_IN_USE[n],e=this._getJieQiSolar(t);if(e.getYear()===this._p.solar.getYear()&&e.getMonth()===this._p.solar.getMonth()&&e.getDay()===this._p.solar.getDay())return this._buildJieQi(this._convertJieQi(t),e)}return null},getCurrentQi:function(){for(var n=1,i=jn.JIE_QI_IN_USE.length;n<i;n+=2){var t=jn.JIE_QI_IN_USE[n],e=this._getJieQiSolar(t);if(e.getYear()===this._p.solar.getYear()&&e.getMonth()===this._p.solar.getMonth()&&e.getDay()===this._p.solar.getDay())return this._buildJieQi(this._convertJieQi(t),e)}return null},getEightChar:function(){return this._p.eightChar||(this._p.eightChar=pn.fromLunar(this)),this._p.eightChar},next:function(n){return this._p.solar.next(n).getLunar()},getYearXun:function(){return jn.getXun(this.getYearInGanZhi())},getMonthXun:function(){return jn.getXun(this.getMonthInGanZhi())},getDayXun:function(){return jn.getXun(this.getDayInGanZhi())},getTimeXun:function(){return jn.getXun(this.getTimeInGanZhi())},getYearXunByLiChun:function(){return jn.getXun(this.getYearInGanZhiByLiChun())},getYearXunExact:function(){return jn.getXun(this.getYearInGanZhiExact())},getMonthXunExact:function(){return jn.getXun(this.getMonthInGanZhiExact())},getDayXunExact:function(){return jn.getXun(this.getDayInGanZhiExact())},getDayXunExact2:function(){return jn.getXun(this.getDayInGanZhiExact2())},getYearXunKong:function(){return jn.getXunKong(this.getYearInGanZhi())},getMonthXunKong:function(){return jn.getXunKong(this.getMonthInGanZhi())},getDayXunKong:function(){return jn.getXunKong(this.getDayInGanZhi())},getTimeXunKong:function(){return jn.getXunKong(this.getTimeInGanZhi())},getYearXunKongByLiChun:function(){return jn.getXunKong(this.getYearInGanZhiByLiChun())},getYearXunKongExact:function(){return jn.getXunKong(this.getYearInGanZhiExact())},getMonthXunKongExact:function(){return jn.getXunKong(this.getMonthInGanZhiExact())},getDayXunKongExact:function(){return jn.getXunKong(this.getDayInGanZhiExact())},getDayXunKongExact2:function(){return jn.getXunKong(this.getDayInGanZhiExact2())},toString:function(){return this.getYearInChinese()+"年"+this.getMonthInChinese()+"月"+this.getDayInChinese()},toFullString:function(){var n=this.toString();n+=" "+this.getYearInGanZhi()+"("+this.getYearShengXiao()+")年",n+=" "+this.getMonthInGanZhi()+"("+this.getMonthShengXiao()+")月",n+=" "+this.getDayInGanZhi()+"("+this.getDayShengXiao()+")日",n+=" "+this.getTimeZhi()+"("+this.getTimeShengXiao()+")时",n+=" 纳音["+this.getYearNaYin()+" "+this.getMonthNaYin()+" "+this.getDayNaYin()+" "+this.getTimeNaYin()+"]",n+=" 星期"+this.getWeekInChinese();var i,t,e=this.getFestivals();for(i=0,t=e.length;i<t;i++)n+=" ("+e[i]+")";for(i=0,t=(e=this.getOtherFestivals()).length;i<t;i++)n+=" ("+e[i]+")";var a=this.getJieQi();return a.length>0&&(n+=" ["+a+"]"),n+=" "+this.getGong()+"方"+this.getShou(),n+=" 星宿["+this.getXiu()+this.getZheng()+this.getAnimal()+"]("+this.getXiuLuck()+")",n+=" 彭祖百忌["+this.getPengZuGan()+" "+this.getPengZuZhi()+"]",n+=" 喜神方位["+this.getDayPositionXi()+"]("+this.getDayPositionXiDesc()+")",n+=" 阳贵神方位["+this.getDayPositionYangGui()+"]("+this.getDayPositionYangGuiDesc()+")",n+=" 阴贵神方位["+this.getDayPositionYinGui()+"]("+this.getDayPositionYinGuiDesc()+")",n+=" 福神方位["+this.getDayPositionFu()+"]("+this.getDayPositionFuDesc()+")",n+=" 财神方位["+this.getDayPositionCai()+"]("+this.getDayPositionCaiDesc()+")",n+=" 冲["+this.getDayChongDesc()+"]",n+=" 煞["+this.getDaySha()+"]"},_buildNameAndIndex:function(n,i){return{_p:{name:n,index:i},getName:function(){return this._p.name},setName:function(n){this._p.name=n},getIndex:function(){return this._p.index},setIndex:function(n){this._p.index=n},toString:function(){return this.getName()},toFullString:function(){return this.getName()+"第"+this.getIndex()+"天"}}},getShuJiu:function(){var n=Fn.fromYmd(this._p.solar.getYear(),this._p.solar.getMonth(),this._p.solar.getDay()),i=this._getJieQiSolar("DONG_ZHI"),t=Fn.fromYmd(i.getYear(),i.getMonth(),i.getDay());n.isBefore(t)&&(i=this._getJieQiSolar(Mn.getMessage("jq.dongZhi")),t=Fn.fromYmd(i.getYear(),i.getMonth(),i.getDay()));var e=Fn.fromYmd(i.getYear(),i.getMonth(),i.getDay()).next(81);if(n.isBefore(t)||!n.isBefore(e))return null;var a=n.subtract(t);return this._buildNameAndIndex(jn.NUMBER[Math.floor(a/9)+1]+"九",a%9+1)},getFu:function(){var n=Fn.fromYmd(this._p.solar.getYear(),this._p.solar.getMonth(),this._p.solar.getDay()),i=this._getJieQiSolar(Mn.getMessage("jq.xiaZhi")),t=this._getJieQiSolar(Mn.getMessage("jq.liQiu")),e=Fn.fromYmd(i.getYear(),i.getMonth(),i.getDay()),a=6-i.getLunar().getDayGanIndex();if(a<0&&(a+=10),a+=20,e=e.next(a),n.isBefore(e))return null;var g=n.subtract(e);if(g<10)return this._buildNameAndIndex("初伏",g+1);if(e=e.next(10),(g=n.subtract(e))<10)return this._buildNameAndIndex("中伏",g+1);e=e.next(10);var r=Fn.fromYmd(t.getYear(),t.getMonth(),t.getDay());if(g=n.subtract(e),r.isAfter(e)){if(g<10)return this._buildNameAndIndex("中伏",g+11);e=e.next(10),g=n.subtract(e)}return g<10?this._buildNameAndIndex("末伏",g+1):null},getLiuYao:function(){return jn.LIU_YAO[(Math.abs(this._p.month)+this._p.day-2)%6]},getWuHou:function(){var n=this.getPrevJieQi(!0),i=jn.find(n.getName(),jn.JIE_QI),t=Fn.fromYmd(this._p.solar.getYear(),this._p.solar.getMonth(),this._p.solar.getDay()),e=n.getSolar(),a=Fn.fromYmd(e.getYear(),e.getMonth(),e.getDay()),g=Math.floor(t.subtract(a)/5);return g>2&&(g=2),jn.WU_HOU[(3*i.index+g)%jn.WU_HOU.length]},getHou:function(){var n=this.getPrevJieQi(!0),i=this._p.solar.subtract(n.getSolar()),t=jn.HOU.length-1,e=Math.floor(i/5);return e>t&&(e=t),n.getName()+" "+jn.HOU[e]},getDayLu:function(){var n=jn.LU[this.getDayGan()],i=jn.LU[this.getDayZhi()],t=n+"命互禄";return i&&(t+=" "+i+"命进禄"),t},getTime:function(){return ln.fromYmdHms(this._p.year,this._p.month,this._p.day,this._p.hour,this._p.minute,this._p.second)},getTimes:function(){var n=[];n.push(ln.fromYmdHms(this._p.year,this._p.month,this._p.day,0,0,0));for(var i=0;i<12;i++)n.push(ln.fromYmdHms(this._p.year,this._p.month,this._p.day,2*(i+1)-1,0,0));return n},getFoto:function(){return zn.fromLunar(this)},getTao:function(){return wn.fromLunar(this)}}};return{fromYmdHms:function(n,i,e,a,g,r){return t(n,i,e,a,g,r)},fromYmd:function(n,i,e){return t(n,i,e,0,0,0)},fromSolar:function(n){return i(n)},fromDate:function(n){return function(n){return i(Fn.fromDate(n))}(n)}}}(),An=(i=function(n,t,e,a){var g=n,r=t,u=e;if(n*=1,isNaN(n))throw new Error("wrong solar year "+g);if(t*=1,isNaN(t))throw new Error("wrong solar month "+r);if(e*=1,isNaN(e))throw new Error("wrong solar day "+u);return a*=1,isNaN(a)&&(a=0),{_p:{year:n,month:t,day:e,start:a},getYear:function(){return this._p.year},getMonth:function(){return this._p.month},getDay:function(){return this._p.day},getStart:function(){return this._p.start},getIndex:function(){var n=Fn.fromYmd(this._p.year,this._p.month,1).getWeek()-this._p.start;return n<0&&(n+=7),Math.ceil((this._p.day+n)/7)},getIndexInYear:function(){var n=Fn.fromYmd(this._p.year,1,1).getWeek()-this._p.start;return n<0&&(n+=7),Math.ceil((fn.getDaysInYear(this._p.year,this._p.month,this._p.day)+n)/7)},next:function(n,t){var e=n;if(n*=1,isNaN(n))throw new Error("wrong weeks "+e);var a=this._p.start;if(0===n)return i(this._p.year,this._p.month,this._p.day,a);var g=Fn.fromYmd(this._p.year,this._p.month,this._p.day);if(t){for(var r=n,u=i(this._p.year,this._p.month,this._p.day,a),h=this._p.month,s=r>0;0!==r;){g=g.next(s?7:-7);var o=(u=i(g.getYear(),g.getMonth(),g.getDay(),a)).getMonth();if(h!==o){var F=u.getIndex();if(s)if(1===F){var C=u.getFirstDay();o=(u=i(C.getYear(),C.getMonth(),C.getDay(),a)).getMonth()}else g=Fn.fromYmd(u.getYear(),u.getMonth(),1),u=i(g.getYear(),g.getMonth(),g.getDay(),a);else if(fn.getWeeksOfMonth(u.getYear(),u.getMonth(),a)===F){var A=u.getFirstDay().next(6);o=(u=i(A.getYear(),A.getMonth(),A.getDay(),a)).getMonth()}else g=Fn.fromYmd(u.getYear(),u.getMonth(),fn.getDaysOfMonth(u.getYear(),u.getMonth())),u=i(g.getYear(),g.getMonth(),g.getDay(),a);h=o}r-=s?1:-1}return u}return g=g.next(7*n),i(g.getYear(),g.getMonth(),g.getDay(),a)},getFirstDay:function(){var n=Fn.fromYmd(this._p.year,this._p.month,this._p.day),i=n.getWeek()-this._p.start;return i<0&&(i+=7),n.next(-i)},getFirstDayInMonth:function(){for(var n=0,i=this.getDays(),t=0;t<i.length;t++)if(this._p.month===i[t].getMonth()){n=t;break}return i[n]},getDays:function(){var n=this.getFirstDay(),i=[];i.push(n);for(var t=1;t<7;t++)i.push(n.next(t));return i},getDaysInMonth:function(){for(var n=this.getDays(),i=[],t=0;t<n.length;t++){var e=n[t];this._p.month===e.getMonth()&&i.push(e)}return i},toString:function(){return this.getYear()+"."+this.getMonth()+"."+this.getIndex()},toFullString:function(){return this.getYear()+"年"+this.getMonth()+"月第"+this.getIndex()+"周"}}},{fromYmd:function(n,t,e,a){return i(n,t,e,a)},fromDate:function(n,t){return function(n,t){var e=Fn.fromDate(n);return i(e.getYear(),e.getMonth(),e.getDay(),t)}(n,t)}}),En=(t=function(n,i){var e=n,a=i;if(n*=1,isNaN(n))throw new Error("wrong solar year "+e);if(i*=1,isNaN(i))throw new Error("wrong solar month "+a);return{_p:{year:n,month:i},getYear:function(){return this._p.year},getMonth:function(){return this._p.month},next:function(n){var i=n;if(n*=1,isNaN(n))throw new Error("wrong months "+i);var e=n<0?-1:1,a=Math.abs(n),g=this._p.year+Math.floor(a/12)*e;return(a=this._p.month+a%12*e)>12?(a-=12,g++):a<1&&(a+=12,g--),t(g,a)},getDays:function(){var n=[],i=Fn.fromYmd(this._p.year,this._p.month,1);n.push(i);for(var t=fn.getDaysOfMonth(this._p.year,this._p.month),e=1;e<t;e++)n.push(i.next(e));return n},getWeeks:function(n){n*=1,isNaN(n)&&(n=0);for(var i=[],t=An.fromYmd(this._p.year,this._p.month,1,n);;){i.push(t);var e=(t=t.next(1,!1)).getFirstDay();if(e.getYear()>this._p.year||e.getMonth()>this._p.month)break}return i},toString:function(){return this.getYear()+"-"+this.getMonth()},toFullString:function(){return this.getYear()+"年"+this.getMonth()+"月"}}},{fromYm:function(n,i){return t(n,i)},fromDate:function(n){return function(n){var i=Fn.fromDate(n);return t(i.getYear(),i.getMonth())}(n)}}),Dn=function(){var n=function(i,t){var e=i,a=t;if(i*=1,isNaN(i))throw new Error("wrong solar year "+e);if(t*=1,isNaN(t))throw new Error("wrong solar month "+a);return{_p:{year:i,month:t},getYear:function(){return this._p.year},getMonth:function(){return this._p.month},getIndex:function(){return Math.ceil(this._p.month/3)},next:function(i){var t=i;if(i*=1,isNaN(i))throw new Error("wrong seasons "+t);var e=En.fromYm(this._p.year,this._p.month).next(3*i);return n(e.getYear(),e.getMonth())},getMonths:function(){for(var n=[],i=this.getIndex()-1,t=0;t<3;t++)n.push(En.fromYm(this._p.year,3*i+t+1));return n},toString:function(){return this.getYear()+"."+this.getIndex()},toFullString:function(){return this.getYear()+"年"+this.getIndex()+"季度"}}};return{fromYm:function(i,t){return n(i,t)},fromDate:function(i){return function(i){var t=Fn.fromDate(i);return n(t.getYear(),t.getMonth())}(i)}}}(),xn=function(){var n=function(i,t){var e=i,a=t;if(i*=1,isNaN(i))throw new Error("wrong solar year "+e);if(t*=1,isNaN(t))throw new Error("wrong solar month "+a);return{_p:{year:i,month:t},getYear:function(){return this._p.year},getMonth:function(){return this._p.month},getIndex:function(){return Math.ceil(this._p.month/6)},next:function(i){var t=i;if(i*=1,isNaN(i))throw new Error("wong halfYears "+t);var e=En.fromYm(this._p.year,this._p.month).next(6*i);return n(e.getYear(),e.getMonth())},getMonths:function(){for(var n=[],i=this.getIndex()-1,t=0;t<6;t++)n.push(En.fromYm(this._p.year,6*i+t+1));return n},toString:function(){return this.getYear()+"."+this.getIndex()},toFullString:function(){return this.getYear()+"年"+["上","下"][this.getIndex()-1]+"半年"}}};return{fromYm:function(i,t){return n(i,t)},fromDate:function(i){return function(i){var t=Fn.fromDate(i);return n(t.getYear(),t.getMonth())}(i)}}}(),cn=(e=function(n){var i=n;if(n*=1,isNaN(n))throw new Error("wrong solar year "+i);return{_p:{year:n},getYear:function(){return this._p.year},next:function(n){var i=n;if(n*=1,isNaN(n))throw new Error("wrong years "+i);return e(this._p.year+n)},getMonths:function(){var n=[],i=En.fromYm(this._p.year,1);n.push(i);for(var t=1;t<12;t++)n.push(i.next(t));return n},toString:function(){return this.getYear()+""},toFullString:function(){return this.getYear()+"年"}}},{fromYear:function(n){return e(n)},fromDate:function(n){return function(n){return e(Fn.fromDate(n).getYear())}(n)}}),dn=(a=["下","上","中"],g=["七","八","九","一","二","三","四","五","六"],r=[75,94,170,265,322,398,469,553,583,610,678,735,754,773,849,887,936,1050,1069,1126,1145,1164,1183,1259,1278,1308,1373,1403,1441,1460,1498,1555,1593,1612,1631,1642,2033,2128,2147,2242,2614,2728,2910,3062,3244,3339,3616,3711,3730,3825,4007,4159,4197,4322,4341,4379,4417,4531,4599,4694,4713,4789,4808,4971,5085,5104,5161,5180,5199,5294,5305,5476,5677,5696,5772,5791,5848,5886,6049,6068,6144,6163,6258,6402,6440,6497,6516,6630,6641,6660,6679,6736,6774,6850,6869,6899,6918,6994,7013,7032,7051,7070,7089,7108,7127,7146,7222,7271,7290,7309,7366,7385,7404,7442,7461,7480,7491,7499,7594,7624,7643,7662,7681,7719,7738,7814,7863,7882,7901,7939,7958,7977,7996,8034,8053,8072,8091,8121,8159,8186,8216,8235,8254,8273,8311,8330,8341,8349,8368,8444,8463,8474,8493,8531,8569,8588,8626,8664,8683,8694,8702,8713,8721,8751,8789,8808,8816,8827,8846,8884,8903,8922,8941,8971,9036,9066,9085,9104,9123,9142,9161,9180,9199,9218,9256,9294,9313,9324,9343,9362,9381,9419,9438,9476,9514,9533,9544,9552,9563,9571,9582,9601,9639,9658,9666,9677,9696,9734,9753,9772,9791,9802,9821,9886,9897,9916,9935,9954,9973,9992],u=[37,56,113,132,151,189,208,227,246,284,303,341,360,379,417,436,458,477,496,515,534,572,591,629,648,667,697,716,792,811,830,868,906,925,944,963,982,1001,1020,1039,1058,1088,1153,1202,1221,1240,1297,1335,1392,1411,1422,1430,1517,1525,1536,1574,3358,3472,3806,3988,4751,4941,5066,5123,5275,5343,5438,5457,5495,5533,5552,5715,5810,5829,5905,5924,6421,6535,6793,6812,6888,6907,7002,7184,7260,7279,7374,7556,7746,7757,7776,7833,7852,7871,7966,8015,8110,8129,8148,8224,8243,8338,8406,8425,8482,8501,8520,8558,8596,8607,8615,8645,8740,8778,8835,8865,8930,8960,8979,8998,9017,9055,9074,9093,9112,9150,9188,9237,9275,9332,9351,9370,9408,9427,9446,9457,9465,9495,9560,9590,9628,9647,9685,9715,9742,9780,9810,9818,9829,9848,9867,9905,9924,9943,9962,1e4],h=null,s=[11,12,1,2,3,4,5,6,7,8,9,10],o=function(n,i){for(var t=0,e=n.length;t<e;t++)if(n[t]===i)return!0;return!1},F=function(n){var i;return h&&h.getYear()===n?i=h:(i=function(n){var i=n;if(n*=1,isNaN(n))throw new Error("wrong lunar year "+i);var t,e,h,F=((e=(t=n-4)%10)<0&&(e+=10),(h=t%12)<0&&(h+=12),{ganIndex:e,zhiIndex:h});return{_p:{year:n,ganIndex:F.ganIndex,zhiIndex:F.zhiIndex,months:[],jieQiJulianDays:[]},getYear:function(){return this._p.year},getGanIndex:function(){return this._p.ganIndex},getZhiIndex:function(){return this._p.zhiIndex},getGan:function(){return jn.GAN[this._p.ganIndex+1]},getZhi:function(){return jn.ZHI[this._p.zhiIndex+1]},getGanZhi:function(){return this.getGan()+this.getZhi()},getJieQiJulianDays:function(){return this._p.jieQiJulianDays},getDayCount:function(){for(var n=0,i=0,t=this._p.months.length;i<t;i++){var e=this._p.months[i];e.getYear()===this._p.year&&(n+=e.getDayCount())}return n},getMonthsInYear:function(){for(var n=[],i=0,t=this._p.months.length;i<t;i++){var e=this._p.months[i];e.getYear()===this._p.year&&n.push(e)}return n},getMonths:function(){return this._p.months},getMonth:function(n){var i=n;if(n*=1,isNaN(n))throw new Error("wrong lunarMonth "+i);for(var t=0,e=this._p.months.length;t<e;t++){var a=this._p.months[t];if(a.getYear()===this._p.year&&a.getMonth()===n)return a}return null},getLeapMonth:function(){for(var n=0,i=this._p.months.length;n<i;n++){var t=this._p.months[n];if(t.getYear()===this._p.year&&t.isLeap())return Math.abs(t.getMonth())}return 0},_getZaoByGan:function(n,i){var t=n-Fn.fromJulianDay(this.getMonth(1).getFirstJulianDay()).getLunar().getDayGanIndex();return t<0&&(t+=10),i.replace("几",jn.NUMBER[t+1])},_getZaoByZhi:function(n,i){var t=n-Fn.fromJulianDay(this.getMonth(1).getFirstJulianDay()).getLunar().getDayZhiIndex();return t<0&&(t+=12),i.replace("几",jn.NUMBER[t+1])},getTouLiang:function(){return this._getZaoByZhi(0,"几鼠偷粮")},getCaoZi:function(){return this._getZaoByZhi(0,"草子几分")},getGengTian:function(){return this._getZaoByZhi(1,"几牛耕田")},getHuaShou:function(){return this._getZaoByZhi(3,"花收几分")},getZhiShui:function(){return this._getZaoByZhi(4,"几龙治水")},getTuoGu:function(){return this._getZaoByZhi(6,"几马驮谷")},getQiangMi:function(){return this._getZaoByZhi(9,"几鸡抢米")},getKanCan:function(){return this._getZaoByZhi(9,"几姑看蚕")},getGongZhu:function(){return this._getZaoByZhi(11,"几屠共猪")},getJiaTian:function(){return this._getZaoByGan(0,"甲田几分")},getFenBing:function(){return this._getZaoByGan(2,"几人分饼")},getDeJin:function(){return this._getZaoByGan(7,"几日得金")},getRenBing:function(){return this._getZaoByGan(2,this._getZaoByZhi(2,"几人几丙"))},getRenChu:function(){return this._getZaoByGan(3,this._getZaoByZhi(2,"几人几锄"))},getYuan:function(){return a[Math.floor((this._p.year+2696)/60)%3]+"元"},getYun:function(){return g[Math.floor((this._p.year+2696)/20)%9]+"运"},getNineStar:function(){var n=jn.getJiaZiIndex(this.getGanZhi())+1,i=(62+Math.floor((this._p.year+2696)/60)%3*3-n)%9;return 0===i&&(i=9),In.fromIndex(i-1)},getPositionXi:function(){return jn.POSITION_XI[this._p.ganIndex+1]},getPositionXiDesc:function(){return jn.POSITION_DESC[this.getPositionXi()]},getPositionYangGui:function(){return jn.POSITION_YANG_GUI[this._p.ganIndex+1]},getPositionYangGuiDesc:function(){return jn.POSITION_DESC[this.getPositionYangGui()]},getPositionYinGui:function(){return jn.POSITION_YIN_GUI[this._p.ganIndex+1]},getPositionYinGuiDesc:function(){return jn.POSITION_DESC[this.getPositionYinGui()]},getPositionFu:function(n){return(1===n?jn.POSITION_FU:jn.POSITION_FU_2)[this._p.ganIndex+1]},getPositionFuDesc:function(n){return jn.POSITION_DESC[this.getPositionFu(n)]},getPositionCai:function(){return jn.POSITION_CAI[this._p.ganIndex+1]},getPositionCaiDesc:function(){return jn.POSITION_DESC[this.getPositionCai()]},getPositionTaiSui:function(){return jn.POSITION_TAI_SUI_YEAR[this._p.zhiIndex]},getPositionTaiSuiDesc:function(){return jn.POSITION_DESC[this.getPositionTaiSui()]},toString:function(){return this.getYear()+""},toFullString:function(){return this.getYear()+"年"},next:function(n){var i=n;if(n*=1,isNaN(n))throw new Error("wrong years "+i);return dn.fromYear(this._p.year+n)},_compute:function(){this._p.months=[],this._p.jieQiJulianDays=[];var n,i,t=[],e=[],a=[],g=[],h=this._p.year,F=Math.floor(365.2422*(h-2e3)+180),C=365.2422*Math.floor((F-355+183)/365.2422)+355;for(Bn.calcQi(C)>F&&(C-=365.2422),n=0;n<26;n++)t.push(Bn.calcQi(C+15.2184*n));for(n=0,i=jn.JIE_QI_IN_USE.length;n<i;n++)F=0===n?Bn.qiAccurate2(t[0]-15.2184):n<=26?Bn.qiAccurate2(t[n-1]):Bn.qiAccurate2(t[25]+15.2184*(n-26)),this._p.jieQiJulianDays.push(F+Fn.J2000);for((C=Bn.calcShuo(t[0]))>t[0]&&(C-=29.53),n=0;n<16;n++)e.push(Bn.calcShuo(C+29.5306*n));for(n=0;n<15;n++)a.push(Math.floor(e[n+1]-e[n])),g.push(n);var A=h-1,E=16;if(o(r,h))E=13;else if(o(u,h))E=14;else if(e[13]<=t[24]){for(n=1;e[n+1]>t[2*n]&&n<13;)n++;E=n}for(i=E;i<15;i++)g[i]-=1;var D=-1,x=-1,c=A;for(n=0;n<15;n++){var d=e[n]+Fn.J2000,y=g[n],B=s[y%12];1724360<=d&&d<1729794||1807724<=d&&d<1808699?B=s[(y+1)%12]:1729794!==d&&1808699!==d||(B=12),-1===D&&(D=B,x=B),B<D&&(c+=1,x=1),D=B,n===E?B=-B:1729794!==d&&1808699!==d||(B=-11),this._p.months.push(yn._(c,B,a[n],e[n]+Fn.J2000,x)),x++}return this}}._compute()}(n),h=i),i},{fromYear:function(n){return F(n)}}),yn={fromYm:function(n,i){return function(n,i){var t=n,e=i;if(n*=1,isNaN(n))throw new Error("wrong lunar year "+t);if(i*=1,isNaN(i))throw new Error("wrong lunar month "+e);return dn.fromYear(n).getMonth(i)}(n,i)},_:function(n,i,t,e,a){return function(n,i,t,e,a){return{_p:{year:n,month:i,dayCount:t,firstJulianDay:e,index:a,zhiIndex:(a-1+jn.BASE_MONTH_ZHI_INDEX)%12},getIndex:function(){return this._p.index},getGanIndex:function(){var n=(dn.fromYear(this._p.year).getGanIndex()+1)%5*2;return(this._p.index-1+n)%10},getZhiIndex:function(){return this._p.zhiIndex},getGan:function(){return jn.GAN[this.getGanIndex()+1]},getZhi:function(){return jn.ZHI[this._p.zhiIndex+1]},getGanZhi:function(){return this.getGan()+this.getZhi()},getYear:function(){return this._p.year},getMonth:function(){return this._p.month},getDayCount:function(){return this._p.dayCount},getFirstJulianDay:function(){return this._p.firstJulianDay},isLeap:function(){return this._p.month<0},getPositionXi:function(){return jn.POSITION_XI[this.getGanIndex()+1]},getPositionXiDesc:function(){return jn.POSITION_DESC.get(this.getPositionXi())},getPositionYangGui:function(){return jn.POSITION_YANG_GUI[this.getGanIndex()+1]},getPositionYangGuiDesc:function(){return jn.POSITION_DESC.get(this.getPositionYangGui())},getPositionYinGui:function(){return jn.POSITION_YIN_GUI[this.getGanIndex()+1]},getPositionYinGuiDesc:function(){return jn.POSITION_DESC.get(this.getPositionYinGui())},getPositionFu:function(n){return(1===n?jn.POSITION_FU:jn.POSITION_FU_2)[this.getGanIndex()+1]},getPositionFuDesc:function(n){return jn.POSITION_DESC.get(this.getPositionFu(n))},getPositionCai:function(){return jn.POSITION_CAI[this.getGanIndex()+1]},getPositionCaiDesc:function(){return jn.POSITION_DESC.get(this.getPositionCai())},getPositionTaiSui:function(){var n;switch(Math.abs(this._p.month)){case 1:case 5:case 9:n="艮";break;case 3:case 7:case 11:n="坤";break;case 4:case 8:case 12:n="巽";break;default:n=jn.POSITION_GAN[Fn.fromJulianDay(this.getFirstJulianDay()).getLunar().getMonthGanIndex()]}return n},getPositionTaiSuiDesc:function(){return jn.POSITION_DESC[this.getPositionTaiSui()]},getNineStar:function(){var n=dn.fromYear(this._p.year).getZhiIndex()%3,i=this._p.month;i<0&&(i=-i);var t=(13+i)%12,e=27-3*n;t<jn.BASE_MONTH_ZHI_INDEX&&(e-=3);var a=(e-t)%9;return In.fromIndex(a)},next:function(n){var i=n;if(n*=1,isNaN(n))throw new Error("wrong days "+i);if(0===n)return yn.fromYm(this._p.year,this._p.month);var t,e,a,g=Math.abs(n),r=this._p.year,u=r,h=this._p.month,s=0,o=dn.fromYear(r).getMonths();if(n>0){for(;;){for(a=o.length,t=0;t<a;t++)if((e=o[t]).getYear()===u&&e.getMonth()===h){s=t;break}var F=a-s-1;if(g<F)break;g-=F;var C=o[a-1];u=C.getYear(),h=C.getMonth(),r++,o=dn.fromYear(r).getMonths()}return o[s+g]}for(;;){for(a=o.length,t=0;t<a;t++)if((e=o[t]).getYear()===u&&e.getMonth()===h){s=t;break}if(g<=s)break;g-=s;var A=o[0];u=A.getYear(),h=A.getMonth(),r--,o=dn.fromYear(r).getMonths()}return o[s-g]},toString:function(){return this.getYear()+"年"+(this.isLeap()?"闰":"")+jn.MONTH[Math.abs(this.getMonth())]+"月("+this.getDayCount()+")天"}}}(n,i,t,e,a)}},Bn=(C=function(n){var i="0000000000",t=i+i;return n=(n=(n=(n=(n=(n=(n=(n=(n=(n=(n=(n=(n=(n=(n=(n=(n=(n=(n=(n=(n=(n=(n=(n=(n=(n=(n=(n=(n=(n=n.replace(/J/g,"00")).replace(/I/g,"000")).replace(/H/g,"0000")).replace(/G/g,"00000")).replace(/t/g,"02")).replace(/s/g,"002")).replace(/r/g,"0002")).replace(/q/g,"00002")).replace(/p/g,"000002")).replace(/o/g,"0000002")).replace(/n/g,"00000002")).replace(/m/g,"000000002")).replace(/l/g,"0000000002")).replace(/k/g,"01")).replace(/j/g,"0101")).replace(/i/g,"001")).replace(/h/g,"001001")).replace(/g/g,"0001")).replace(/f/g,"00001")).replace(/e/g,"000001")).replace(/d/g,"0000001")).replace(/c/g,"00000001")).replace(/b/g,"000000001")).replace(/a/g,"0000000001")).replace(/A/g,t+t+t)).replace(/B/g,t+t+i)).replace(/C/g,t+t)).replace(/D/g,t+i)).replace(/E/g,t)).replace(/F/g,i)},{PI_2:2*Math.PI,ONE_THIRD:1/3,SECOND_PER_DAY:86400,SECOND_PER_RAD:648e3/Math.PI,NUT_B:[2.1824,-33.75705,36e-6,-1720,920,3.5069,1256.66393,11e-6,-132,57,1.3375,16799.4182,-51e-6,-23,10,4.3649,-67.5141,72e-6,21,-9,.04,-628.302,0,-14,0,2.36,8328.691,0,7,0,3.46,1884.966,0,-5,2,5.44,16833.175,0,-4,2,3.69,25128.11,0,-3,0,3.55,628.362,0,2,0],DT_AT:[-4e3,108371.7,-13036.8,392,0,-500,17201,-627.82,16.17,-.3413,-150,12200.6,-346.41,5.403,-.1593,150,9113.8,-328.13,-1.647,.0377,500,5707.5,-391.41,.915,.3145,900,2203.4,-283.45,13.034,-.1778,1300,490.1,-57.35,2.085,-.0072,1600,120,-9.81,-1.532,.1403,1700,10.2,-.91,.51,-.037,1800,13.4,-.72,.202,-.0193,1830,7.8,-1.81,.416,-.0247,1860,8.3,-.13,-.406,.0292,1880,-5.4,.32,-.183,.0173,1900,-2.3,2.06,.169,-.0135,1920,21.2,1.69,-.304,.0167,1940,24.2,1.22,-.064,.0031,1960,33.2,.51,.231,-.0109,1980,51,1.29,-.026,.0032,2e3,63.87,.1,0,0,2005,64.7,.21,0,0,2012,66.8,.22,0,0,2018,73.6,.4,0,0,2021,78.1,.44,0,0,2024,83.1,.55,0,0,2028,98.6],XL0:[1e10,20,578,920,1100,1124,1136,1148,1217,1226,1229,1229,1229,1229,1937,2363,2618,2633,2660,2666,17534704567,0,0,334165646,4.669256804,6283.075849991,3489428,4.6261024,12566.1517,349706,2.744118,5753.384885,341757,2.828866,3.523118,313590,3.62767,77713.771468,267622,4.418084,7860.419392,234269,6.135162,3930.209696,132429,.742464,11506.76977,127317,2.037097,529.690965,119917,1.109629,1577.343542,99025,5.23268,5884.92685,90186,2.04505,26.29832,85722,3.50849,398.149,77979,1.17883,5223.69392,75314,2.53339,5507.55324,50526,4.58293,18849.22755,49238,4.20507,775.52261,35666,2.91954,.06731,31709,5.84902,11790.62909,28413,1.89869,796.29801,27104,.31489,10977.0788,24281,.34481,5486.77784,20616,4.80647,2544.31442,20539,1.86948,5573.1428,20226,2.45768,6069.77675,15552,.83306,213.2991,13221,3.41118,2942.46342,12618,1.08303,20.7754,11513,.64545,.98032,10285,.636,4694.00295,10190,.97569,15720.83878,10172,4.2668,7.11355,9921,6.2099,2146.1654,9761,.681,155.4204,8580,5.9832,161000.6857,8513,1.2987,6275.9623,8471,3.6708,71430.6956,7964,1.8079,17260.1547,7876,3.037,12036.4607,7465,1.7551,5088.6288,7387,3.5032,3154.6871,7355,4.6793,801.8209,6963,.833,9437.7629,6245,3.9776,8827.3903,6115,1.8184,7084.8968,5696,2.7843,6286.599,5612,4.3869,14143.4952,5558,3.4701,6279.5527,5199,.1891,12139.5535,5161,1.3328,1748.0164,5115,.2831,5856.4777,4900,.4874,1194.447,4104,5.3682,8429.2413,4094,2.3985,19651.0485,3920,6.1683,10447.3878,3677,6.0413,10213.2855,3660,2.5696,1059.3819,3595,1.7088,2352.8662,3557,1.776,6812.7668,3329,.5931,17789.8456,3041,.4429,83996.8473,3005,2.7398,1349.8674,2535,3.1647,4690.4798,2474,.2148,3.5904,2366,.4847,8031.0923,2357,2.0653,3340.6124,2282,5.222,4705.7323,2189,5.5559,553.5694,2142,1.4256,16730.4637,2109,4.1483,951.7184,2030,.3713,283.8593,1992,5.2221,12168.0027,1986,5.7747,6309.3742,1912,3.8222,23581.2582,1889,5.3863,149854.4001,1790,2.2149,13367.9726,1748,4.5605,135.0651,1622,5.9884,11769.8537,1508,4.1957,6256.7775,1442,4.1932,242.7286,1435,3.7236,38.0277,1397,4.4014,6681.2249,1362,1.8893,7632.9433,1250,1.1305,5.5229,1205,2.6223,955.5997,1200,1.0035,632.7837,1129,.1774,4164.312,1083,.3273,103.0928,1052,.9387,11926.2544,1050,5.3591,1592.596,1033,6.1998,6438.4962,1001,6.0291,5746.2713,980,.999,11371.705,980,5.244,27511.468,938,2.624,5760.498,923,.483,522.577,922,4.571,4292.331,905,5.337,6386.169,862,4.165,7058.598,841,3.299,7234.794,836,4.539,25132.303,813,6.112,4732.031,812,6.271,426.598,801,5.821,28.449,787,.996,5643.179,776,2.957,23013.54,769,3.121,7238.676,758,3.974,11499.656,735,4.386,316.392,731,.607,11513.883,719,3.998,74.782,706,.323,263.084,676,5.911,90955.552,663,3.665,17298.182,653,5.791,18073.705,630,4.717,6836.645,615,1.458,233141.314,612,1.075,19804.827,596,3.321,6283.009,596,2.876,6283.143,555,2.452,12352.853,541,5.392,419.485,531,.382,31441.678,519,4.065,6208.294,513,2.361,10973.556,494,5.737,9917.697,450,3.272,11015.106,449,3.653,206.186,447,2.064,7079.374,435,4.423,5216.58,421,1.906,245.832,413,.921,3738.761,402,.84,20.355,387,1.826,11856.219,379,2.344,3.881,374,2.954,3128.389,370,5.031,536.805,365,1.018,16200.773,365,1.083,88860.057,352,5.978,3894.182,352,2.056,244287.6,351,3.713,6290.189,340,1.106,14712.317,339,.978,8635.942,339,3.202,5120.601,333,.837,6496.375,325,3.479,6133.513,316,5.089,21228.392,316,1.328,10873.986,309,3.646,10.637,303,1.802,35371.887,296,3.397,9225.539,288,6.026,154717.61,281,2.585,14314.168,262,3.856,266.607,262,2.579,22483.849,257,1.561,23543.231,255,3.949,1990.745,251,3.744,10575.407,240,1.161,10984.192,238,.106,7.046,236,4.272,6040.347,234,3.577,10969.965,211,3.714,65147.62,210,.754,13521.751,207,4.228,5650.292,202,.814,170.673,201,4.629,6037.244,200,.381,6172.87,199,3.933,6206.81,199,5.197,6262.3,197,1.046,18209.33,195,1.07,5230.807,195,4.869,36.028,194,4.313,6244.943,192,1.229,709.933,192,5.595,6282.096,192,.602,6284.056,189,3.744,23.878,188,1.904,15.252,188,.867,22003.915,182,3.681,15110.466,181,.491,1.484,179,3.222,39302.097,179,1.259,12559.038,62833196674749,0,0,20605886,2.67823456,6283.07584999,430343,2.635127,12566.1517,42526,1.59047,3.52312,11926,5.79557,26.29832,10898,2.96618,1577.34354,9348,2.5921,18849.2275,7212,1.1385,529.691,6777,1.8747,398.149,6733,4.4092,5507.5532,5903,2.888,5223.6939,5598,2.1747,155.4204,4541,.398,796.298,3637,.4662,775.5226,2896,2.6471,7.1135,2084,5.3414,.9803,1910,1.8463,5486.7778,1851,4.9686,213.2991,1729,2.9912,6275.9623,1623,.0322,2544.3144,1583,1.4305,2146.1654,1462,1.2053,10977.0788,1246,2.8343,1748.0164,1188,3.258,5088.6288,1181,5.2738,1194.447,1151,2.075,4694.003,1064,.7661,553.5694,997,1.303,6286.599,972,4.239,1349.867,945,2.7,242.729,858,5.645,951.718,758,5.301,2352.866,639,2.65,9437.763,610,4.666,4690.48,583,1.766,1059.382,531,.909,3154.687,522,5.661,71430.696,520,1.854,801.821,504,1.425,6438.496,433,.241,6812.767,426,.774,10447.388,413,5.24,7084.897,374,2.001,8031.092,356,2.429,14143.495,350,4.8,6279.553,337,.888,12036.461,337,3.862,1592.596,325,3.4,7632.943,322,.616,8429.241,318,3.188,4705.732,297,6.07,4292.331,295,1.431,5746.271,290,2.325,20.355,275,.935,5760.498,270,4.804,7234.794,253,6.223,6836.645,228,5.003,17789.846,225,5.672,11499.656,215,5.202,11513.883,208,3.955,10213.286,208,2.268,522.577,206,2.224,5856.478,206,2.55,25132.303,203,.91,6256.778,189,.532,3340.612,188,4.735,83996.847,179,1.474,4164.312,178,3.025,5.523,177,3.026,5753.385,159,4.637,3.286,157,6.124,5216.58,155,3.077,6681.225,154,4.2,13367.973,143,1.191,3894.182,138,3.093,135.065,136,4.245,426.598,134,5.765,6040.347,128,3.085,5643.179,127,2.092,6290.189,125,3.077,11926.254,125,3.445,536.805,114,3.244,12168.003,112,2.318,16730.464,111,3.901,11506.77,111,5.32,23.878,105,3.75,7860.419,103,2.447,1990.745,96,.82,3.88,96,4.08,6127.66,91,5.42,206.19,91,.42,7079.37,88,5.17,11790.63,81,.34,9917.7,80,3.89,10973.56,78,2.4,1589.07,78,2.58,11371.7,77,3.98,955.6,77,3.36,36.03,76,1.3,103.09,75,5.18,10969.97,75,4.96,6496.37,73,5.21,38.03,72,2.65,6309.37,70,5.61,3738.76,69,2.6,3496.03,69,.39,15.25,69,2.78,20.78,65,1.13,7058.6,64,4.28,28.45,61,5.63,10984.19,60,.73,419.48,60,5.28,10575.41,58,5.55,17298.18,58,3.19,4732.03,5291887,0,0,871984,1.072097,6283.07585,30913,.86729,12566.1517,2734,.053,3.5231,1633,5.1883,26.2983,1575,3.6846,155.4204,954,.757,18849.228,894,2.057,77713.771,695,.827,775.523,506,4.663,1577.344,406,1.031,7.114,381,3.441,5573.143,346,5.141,796.298,317,6.053,5507.553,302,1.192,242.729,289,6.117,529.691,271,.306,398.149,254,2.28,553.569,237,4.381,5223.694,208,3.754,.98,168,.902,951.718,153,5.759,1349.867,145,4.364,1748.016,134,3.721,1194.447,125,2.948,6438.496,122,2.973,2146.165,110,1.271,161000.686,104,.604,3154.687,100,5.986,6286.599,92,4.8,5088.63,89,5.23,7084.9,83,3.31,213.3,76,3.42,5486.78,71,6.19,4690.48,68,3.43,4694,65,1.6,2544.31,64,1.98,801.82,61,2.48,10977.08,50,1.44,6836.65,49,2.34,1592.6,46,1.31,4292.33,46,3.81,149854.4,43,.04,7234.79,40,4.94,7632.94,39,1.57,71430.7,38,3.17,6309.37,35,.99,6040.35,35,.67,1059.38,31,3.18,2352.87,31,3.55,8031.09,30,1.92,10447.39,30,2.52,6127.66,28,4.42,9437.76,28,2.71,3894.18,27,.67,25132.3,26,5.27,6812.77,25,.55,6279.55,23,1.38,4705.73,22,.64,6256.78,20,6.07,640.88,28923,5.84384,6283.07585,3496,0,0,1682,5.4877,12566.1517,296,5.196,155.42,129,4.722,3.523,71,5.3,18849.23,64,5.97,242.73,40,3.79,553.57,11408,3.14159,0,772,4.134,6283.076,77,3.84,12566.15,42,.42,155.42,88,3.14,0,17,2.77,6283.08,5,2.01,155.42,3,2.21,12566.15,27962,3.1987,84334.66158,10164,5.42249,5507.55324,8045,3.8801,5223.6939,4381,3.7044,2352.8662,3193,4.0003,1577.3435,2272,3.9847,1047.7473,1814,4.9837,6283.0758,1639,3.5646,5856.4777,1444,3.7028,9437.7629,1430,3.4112,10213.2855,1125,4.8282,14143.4952,1090,2.0857,6812.7668,1037,4.0566,71092.8814,971,3.473,4694.003,915,1.142,6620.89,878,4.44,5753.385,837,4.993,7084.897,770,5.554,167621.576,719,3.602,529.691,692,4.326,6275.962,558,4.41,7860.419,529,2.484,4705.732,521,6.25,18073.705,903,3.897,5507.553,618,1.73,5223.694,380,5.244,2352.866,166,1.627,84334.662,10001398880,0,0,167069963,3.098463508,6283.075849991,1395602,3.0552461,12566.1517,308372,5.198467,77713.771468,162846,1.173877,5753.384885,157557,2.846852,7860.419392,92480,5.45292,11506.76977,54244,4.56409,3930.2097,47211,3.661,5884.92685,34598,.96369,5507.55324,32878,5.89984,5223.69392,30678,.29867,5573.1428,24319,4.2735,11790.62909,21183,5.84715,1577.34354,18575,5.02194,10977.0788,17484,3.01194,18849.22755,10984,5.05511,5486.77784,9832,.8868,6069.7768,8650,5.6896,15720.8388,8583,1.2708,161000.6857,6490,.2725,17260.1547,6292,.9218,529.691,5706,2.0137,83996.8473,5574,5.2416,71430.6956,4938,3.245,2544.3144,4696,2.5781,775.5226,4466,5.5372,9437.7629,4252,6.0111,6275.9623,3897,5.3607,4694.003,3825,2.3926,8827.3903,3749,.8295,19651.0485,3696,4.9011,12139.5535,3566,1.6747,12036.4607,3454,1.8427,2942.4634,3319,.2437,7084.8968,3192,.1837,5088.6288,3185,1.7778,398.149,2846,1.2134,6286.599,2779,1.8993,6279.5527,2628,4.589,10447.3878,2460,3.7866,8429.2413,2393,4.996,5856.4777,2359,.2687,796.298,2329,2.8078,14143.4952,2210,1.95,3154.6871,2035,4.6527,2146.1654,1951,5.3823,2352.8662,1883,.6731,149854.4001,1833,2.2535,23581.2582,1796,.1987,6812.7668,1731,6.152,16730.4637,1717,4.4332,10213.2855,1619,5.2316,17789.8456,1381,5.1896,8031.0923,1364,3.6852,4705.7323,1314,.6529,13367.9726,1041,4.3329,11769.8537,1017,1.5939,4690.4798,998,4.201,6309.374,966,3.676,27511.468,874,6.064,1748.016,779,3.674,12168.003,771,.312,7632.943,756,2.626,6256.778,746,5.648,11926.254,693,2.924,6681.225,680,1.423,23013.54,674,.563,3340.612,663,5.661,11371.705,659,3.136,801.821,648,2.65,19804.827,615,3.029,233141.314,612,5.134,1194.447,563,4.341,90955.552,552,2.091,17298.182,534,5.1,31441.678,531,2.407,11499.656,523,4.624,6438.496,513,5.324,11513.883,477,.256,11856.219,461,1.722,7234.794,458,3.766,6386.169,458,4.466,5746.271,423,1.055,5760.498,422,1.557,7238.676,415,2.599,7058.598,401,3.03,1059.382,397,1.201,1349.867,379,4.907,4164.312,360,5.707,5643.179,352,3.626,244287.6,348,.761,10973.556,342,3.001,4292.331,336,4.546,4732.031,334,3.138,6836.645,324,4.164,9917.697,316,1.691,11015.106,307,.238,35371.887,298,1.306,6283.143,298,1.75,6283.009,293,5.738,16200.773,286,5.928,14712.317,281,3.515,21228.392,280,5.663,8635.942,277,.513,26.298,268,4.207,18073.705,266,.9,12352.853,260,2.962,25132.303,255,2.477,6208.294,242,2.8,709.933,231,1.054,22483.849,229,1.07,14314.168,216,1.314,154717.61,215,6.038,10873.986,200,.561,7079.374,198,2.614,951.718,197,4.369,167283.762,186,2.861,5216.58,183,1.66,39302.097,183,5.912,3738.761,175,2.145,6290.189,173,2.168,10575.407,171,3.702,1592.596,171,1.343,3128.389,164,5.55,6496.375,164,5.856,10984.192,161,1.998,10969.965,161,1.909,6133.513,157,4.955,25158.602,154,6.216,23543.231,153,5.357,13521.751,150,5.77,18209.33,150,5.439,155.42,139,1.778,9225.539,139,1.626,5120.601,128,2.46,13916.019,123,.717,143571.324,122,2.654,88860.057,121,4.414,3894.182,121,1.192,3.523,120,4.03,553.569,119,1.513,17654.781,117,3.117,14945.316,113,2.698,6040.347,110,3.085,43232.307,109,.998,955.6,108,2.939,17256.632,107,5.285,65147.62,103,.139,11712.955,103,5.85,213.299,102,3.046,6037.244,101,2.842,8662.24,100,3.626,6262.3,98,2.36,6206.81,98,5.11,6172.87,98,2,15110.47,97,2.67,5650.29,97,2.75,6244.94,96,4.02,6282.1,96,5.31,6284.06,92,.1,29088.81,85,3.26,20426.57,84,2.6,28766.92,81,3.58,10177.26,80,5.81,5230.81,78,2.53,16496.36,77,4.06,6127.66,73,.04,5481.25,72,5.96,12559.04,72,5.92,4136.91,71,5.49,22003.91,70,3.41,7.11,69,.62,11403.68,69,3.9,1589.07,69,1.96,12416.59,69,4.51,426.6,67,1.61,11087.29,66,4.5,47162.52,66,5.08,283.86,66,4.32,16858.48,65,1.04,6062.66,64,1.59,18319.54,63,5.7,45892.73,63,4.6,66567.49,63,3.82,13517.87,62,2.62,11190.38,61,1.54,33019.02,60,5.58,10344.3,60,5.38,316428.23,60,5.78,632.78,59,6.12,9623.69,57,.16,17267.27,57,3.86,6076.89,57,1.98,7668.64,56,4.78,20199.09,55,4.56,18875.53,55,3.51,17253.04,54,3.07,226858.24,54,4.83,18422.63,53,5.02,12132.44,52,3.63,5333.9,52,.97,155427.54,51,3.36,20597.24,50,.99,11609.86,50,2.21,1990.75,48,1.62,12146.67,48,1.17,12569.67,47,4.62,5436.99,47,1.81,12562.63,47,.59,21954.16,47,.76,7342.46,46,.27,4590.91,46,3.77,156137.48,45,5.66,10454.5,44,5.84,3496.03,43,.24,17996.03,41,5.93,51092.73,41,4.21,12592.45,40,5.14,1551.05,40,5.28,15671.08,39,3.69,18052.93,39,4.94,24356.78,38,2.72,11933.37,38,5.23,7477.52,38,4.99,9779.11,37,3.7,9388.01,37,4.44,4535.06,36,2.16,28237.23,36,2.54,242.73,36,.22,5429.88,35,6.15,19800.95,35,2.92,36949.23,34,5.63,2379.16,34,5.73,16460.33,34,5.11,5849.36,33,6.19,6268.85,10301861,1.1074897,6283.07584999,172124,1.064423,12566.1517,70222,3.14159,0,3235,1.0217,18849.2275,3080,2.8435,5507.5532,2497,1.3191,5223.6939,1849,1.4243,1577.3435,1008,5.9138,10977.0788,865,1.42,6275.962,863,.271,5486.778,507,1.686,5088.629,499,6.014,6286.599,467,5.987,529.691,440,.518,4694.003,410,1.084,9437.763,387,4.75,2544.314,375,5.071,796.298,352,.023,83996.847,344,.949,71430.696,341,5.412,775.523,322,6.156,2146.165,286,5.484,10447.388,284,3.42,2352.866,255,6.132,6438.496,252,.243,398.149,243,3.092,4690.48,225,3.689,7084.897,220,4.952,6812.767,219,.42,8031.092,209,1.282,1748.016,193,5.314,8429.241,185,1.82,7632.943,175,3.229,6279.553,173,1.537,4705.732,158,4.097,11499.656,158,5.539,3154.687,150,3.633,11513.883,148,3.222,7234.794,147,3.653,1194.447,144,.817,14143.495,135,6.151,5746.271,134,4.644,6836.645,128,2.693,1349.867,123,5.65,5760.498,118,2.577,13367.973,113,3.357,17789.846,110,4.497,4292.331,108,5.828,12036.461,102,5.621,6256.778,99,1.14,1059.38,98,.66,5856.48,93,2.32,10213.29,92,.77,16730.46,88,1.5,11926.25,86,1.42,5753.38,85,.66,155.42,81,1.64,6681.22,80,4.11,951.72,66,4.55,5216.58,65,.98,25132.3,64,4.19,6040.35,64,.52,6290.19,63,1.51,5643.18,59,6.18,4164.31,57,2.3,10973.56,55,2.32,11506.77,55,2.2,1592.6,55,5.27,3340.61,54,5.54,553.57,53,5.04,9917.7,53,.92,11371.7,52,3.98,17298.18,52,3.6,10969.97,49,5.91,3894.18,49,2.51,6127.66,48,1.67,12168,46,.31,801.82,42,3.7,10575.41,42,4.05,10984.19,40,2.17,7860.42,40,4.17,26.3,38,5.82,7058.6,37,3.39,6496.37,36,1.08,6309.37,36,5.34,7079.37,34,3.62,11790.63,32,.32,16200.77,31,4.24,3738.76,29,4.55,11856.22,29,1.26,8635.94,27,3.45,5884.93,26,5.08,10177.26,26,5.38,21228.39,24,2.26,11712.96,24,1.05,242.73,24,5.59,6069.78,23,3.63,6284.06,23,1.64,4732.03,22,3.46,213.3,21,1.05,3496.03,21,3.92,13916.02,21,4.01,5230.81,20,5.16,12352.85,20,.69,1990.75,19,2.73,6062.66,19,5.01,11015.11,18,6.04,6283.01,18,2.85,7238.68,18,5.6,6283.14,18,5.16,17253.04,18,2.54,14314.17,17,1.58,7.11,17,.98,3930.21,17,4.75,17267.27,16,2.19,6076.89,16,2.19,18073.7,16,6.12,3.52,16,4.61,9623.69,16,3.4,16496.36,15,.19,9779.11,15,5.3,13517.87,15,4.26,3128.39,15,.81,709.93,14,.5,25158.6,14,4.38,4136.91,13,.98,65147.62,13,3.31,154717.61,13,2.11,1589.07,13,1.92,22483.85,12,6.03,9225.54,12,1.53,12559.04,12,5.82,6282.1,12,5.61,5642.2,12,2.38,167283.76,12,.39,12132.44,12,3.98,4686.89,12,5.81,12569.67,12,.56,5849.36,11,.45,6172.87,11,5.8,16858.48,11,6.22,12146.67,11,2.27,5429.88,435939,5.784551,6283.07585,12363,5.57935,12566.1517,1234,3.1416,0,879,3.628,77713.771,569,1.87,5573.143,330,5.47,18849.228,147,4.48,5507.553,110,2.842,161000.686,101,2.815,5223.694,85,3.11,1577.34,65,5.47,775.52,61,1.38,6438.5,50,4.42,6286.6,47,3.66,7084.9,46,5.39,149854.4,42,.9,10977.08,40,3.2,5088.63,35,1.81,5486.78,32,5.35,3154.69,30,3.52,796.3,29,4.62,4690.48,28,1.84,4694,27,3.14,71430.7,27,6.17,6836.65,26,1.42,2146.17,25,2.81,1748.02,24,2.18,155.42,23,4.76,7234.79,21,3.38,7632.94,21,.22,4705.73,20,4.22,1349.87,20,2.01,1194.45,20,4.58,529.69,19,1.59,6309.37,18,5.7,6040.35,18,6.03,4292.33,17,2.9,9437.76,17,2,8031.09,17,5.78,83996.85,16,.05,2544.31,15,.95,6127.66,14,.36,10447.39,14,1.48,2352.87,13,.77,553.57,13,5.48,951.72,13,5.27,6279.55,13,3.76,6812.77,11,5.41,6256.78,10,.68,1592.6,10,4.95,398.15,10,1.15,3894.18,10,5.2,244287.6,10,1.94,11856.22,9,5.39,25132.3,8,6.18,1059.38,8,.69,8429.24,8,5.85,242.73,7,5.26,14143.5,7,.52,801.82,6,2.24,8635.94,6,4,13367.97,6,2.77,90955.55,6,5.17,7058.6,5,1.46,233141.31,5,4.13,7860.42,5,3.91,26.3,5,3.89,12036.46,5,5.58,6290.19,5,5.54,1990.75,5,.83,11506.77,5,6.22,6681.22,4,5.26,10575.41,4,1.91,7477.52,4,.43,10213.29,4,1.09,709.93,4,5.09,11015.11,4,4.22,88860.06,4,3.57,7079.37,4,1.98,6284.06,4,3.93,10973.56,4,6.18,9917.7,4,.36,10177.26,4,2.75,3738.76,4,3.33,5643.18,4,5.36,25158.6,14459,4.27319,6283.07585,673,3.917,12566.152,77,0,0,25,3.73,18849.23,4,2.8,6286.6,386,2.564,6283.076,31,2.27,12566.15,5,3.44,5573.14,2,2.05,18849.23,1,2.06,77713.77,1,4.41,161000.69,1,3.82,149854.4,1,4.08,6127.66,1,5.26,6438.5,9,1.22,6283.08,1,.66,12566.15],XL1:[[22639.586,.78475822,8328.691424623,1.5229241,25.0719,-.123598,4586.438,.1873974,7214.06286536,-2.184756,-18.86,.0828,2369.914,2.542952,15542.75428998,-.661832,6.212,-.0408,769.026,3.140313,16657.38284925,3.04585,50.144,-.2472,666.418,1.527671,628.30195521,-.02664,.062,-.0054,411.596,4.826607,16866.932315,-1.28012,-1.07,-.0059,211.656,4.115028,-1114.6285593,-3.70768,-43.93,.2064,205.436,.230523,6585.7609101,-2.15812,-18.92,.0882,191.956,4.898507,23871.4457146,.86109,31.28,-.164,164.729,2.586078,14914.4523348,-.6352,6.15,-.035,147.321,5.4553,-7700.3894694,-1.5496,-25.01,.118,124.988,.48608,7771.377145,-.3309,3.11,-.02,109.38,3.88323,8956.9933798,1.4963,25.13,-.129,55.177,5.57033,-1324.178025,.6183,7.3,-.035,45.1,.89898,25195.62374,.2428,24,-.129,39.533,3.81213,-8538.24089,2.803,26.1,-.118,38.43,4.30115,22756.817155,-2.8466,-12.6,.042,36.124,5.49587,24986.074274,4.5688,75.2,-.371,30.773,1.94559,14428.125731,-4.3695,-37.7,.166,28.397,3.28586,7842.364821,-2.2114,-18.8,.077,24.358,5.64142,16171.056245,-.6885,6.3,-.046,18.585,4.41371,-557.31428,-1.8538,-22,.1,17.954,3.58454,8399.6791,-.3576,3.2,-.03,14.53,4.9416,23243.143759,.888,31.2,-.16,14.38,.9709,32200.137139,2.384,56.4,-.29,14.251,5.7641,-2.3012,1.523,25.1,-.12,13.899,.3735,31085.50858,-1.324,12.4,-.08,13.194,1.7595,-9443.319984,-5.231,-69,.33,9.679,3.0997,-16029.080894,-3.072,-50.1,.24,9.366,.3016,24080.99518,-3.465,-19.9,.08,8.606,4.1582,-1742.930514,-3.681,-44,.21,8.453,2.8416,16100.06857,1.192,28.2,-.14,8.05,2.6292,14286.15038,-.609,6.1,-.03,7.63,6.2388,17285.684804,3.019,50.2,-.25,7.447,1.4845,1256.60391,-.053,.1,-.01,7.371,.2736,5957.458955,-2.131,-19,.09,7.063,5.6715,33.757047,-.308,-3.6,.02,6.383,4.7843,7004.5134,2.141,32.4,-.16,5.742,2.6572,32409.686605,-1.942,5,-.05,4.374,4.3443,22128.5152,-2.82,-13,.05,3.998,3.2545,33524.31516,1.766,49,-.25,3.21,2.2443,14985.44001,-2.516,-16,.06,2.915,1.7138,24499.74767,.834,31,-.17,2.732,1.9887,13799.82378,-4.343,-38,.17,2.568,5.4122,-7072.08751,-1.576,-25,.11,2.521,3.2427,8470.66678,-2.238,-19,.07,2.489,4.0719,-486.3266,-3.734,-44,.2,2.146,5.6135,-1952.47998,.645,7,-.03,1.978,2.7291,39414.2,.199,37,-.21,1.934,1.5682,33314.7657,6.092,100,-.5,1.871,.4166,30457.20662,-1.297,12,-.1,1.753,2.0582,-8886.0057,-3.38,-47,.2,1.437,2.386,-695.87607,.59,7,0,1.373,3.026,-209.54947,4.33,51,-.2,1.262,5.94,16728.37052,1.17,28,-.1,1.224,6.172,6656.74859,-4.04,-41,.2,1.187,5.873,6099.43431,-5.89,-63,.3,1.177,1.014,31571.83518,2.41,56,-.3,1.162,3.84,9585.29534,1.47,25,-.1,1.143,5.639,8364.73984,-2.18,-19,.1,1.078,1.229,70.98768,-1.88,-22,.1,1.059,3.326,40528.82856,3.91,81,-.4,.99,5.013,40738.37803,-.42,30,-.2,.948,5.687,-17772.01141,-6.75,-94,.5,.876,.298,-.35232,0,0,0,.822,2.994,393.02097,0,0,0,.788,1.836,8326.39022,3.05,50,-.2,.752,4.985,22614.8418,.91,31,-.2,.74,2.875,8330.99262,0,0,0,.669,.744,-24357.77232,-4.6,-75,.4,.644,1.314,8393.12577,-2.18,-19,.1,.639,5.888,575.33849,0,0,0,.635,1.116,23385.11911,-2.87,-13,0,.584,5.197,24428.75999,2.71,53,-.3,.583,3.513,-9095.55517,.95,4,0,.572,6.059,29970.88002,-5.03,-32,.1,.565,2.96,.32863,1.52,25,-.1,.561,4.001,-17981.56087,-2.43,-43,.2,.557,.529,7143.07519,-.3,3,0,.546,2.311,25614.37623,4.54,75,-.4,.536,4.229,15752.30376,-4.99,-45,.2,.493,3.316,-8294.9344,-1.83,-29,.1,.491,1.744,8362.4485,1.21,21,-.1,.478,1.803,-10071.6219,-5.2,-69,.3,.454,.857,15333.2048,3.66,57,-.3,.445,2.071,8311.7707,-2.18,-19,.1,.426,.345,23452.6932,-3.44,-20,.1,.42,4.941,33733.8646,-2.56,-2,0,.413,1.642,17495.2343,-1.31,-1,0,.404,1.458,23314.1314,-.99,9,-.1,.395,2.132,38299.5714,-3.51,-6,0,.382,2.7,31781.3846,-1.92,5,0,.375,4.827,6376.2114,2.17,32,-.2,.361,3.867,16833.1753,-.97,3,0,.358,5.044,15056.4277,-4.4,-38,.2,.35,5.157,-8257.7037,-3.4,-47,.2,.344,4.233,157.7344,0,0,0,.34,2.672,13657.8484,-.58,6,0,.329,5.61,41853.0066,3.29,74,-.4,.325,5.895,-39.8149,0,0,0,.309,4.387,21500.2132,-2.79,-13,.1,.302,1.278,786.0419,0,0,0,.302,5.341,-24567.3218,-.27,-24,.1,.301,1.045,5889.8848,-1.57,-12,0,.294,4.201,-2371.2325,-3.65,-44,.2,.293,3.704,21642.1886,-6.55,-57,.2,.29,4.069,32828.4391,2.36,56,-.3,.289,3.472,31713.8105,-1.35,12,-.1,.285,5.407,-33.7814,.31,4,0,.283,5.998,-16.9207,-3.71,-44,.2,.283,2.772,38785.898,.23,37,-.2,.274,5.343,15613.742,-2.54,-16,.1,.263,3.997,25823.9257,.22,24,-.1,.254,.6,24638.3095,-1.61,2,0,.253,1.344,6447.1991,.29,10,-.1,.25,.887,141.9754,-3.76,-44,.2,.247,.317,5329.157,-2.1,-19,.1,.245,.141,36.0484,-3.71,-44,.2,.231,2.287,14357.1381,-2.49,-16,.1,.227,5.158,2.6298,0,0,0,.219,5.085,47742.8914,1.72,63,-.3,.211,2.145,6638.7244,-2.18,-19,.1,.201,4.415,39623.7495,-4.13,-14,0,.194,2.091,588.4927,0,0,0,.193,3.057,-15400.7789,-3.1,-50,0,.186,5.598,16799.3582,-.72,6,0,.185,3.886,1150.677,0,0,0,.183,1.619,7178.0144,1.52,25,0,.181,2.635,8328.3391,1.52,25,0,.181,2.077,8329.0437,1.52,25,0,.179,3.215,-9652.8694,-.9,-18,0,.176,1.716,-8815.018,-5.26,-69,0,.175,5.673,550.7553,0,0,0,.17,2.06,31295.058,-5.6,-39,0,.167,1.239,7211.7617,-.7,6,0,.165,4.499,14967.4158,-.7,6,0,.164,3.595,15540.4531,.9,31,0,.164,4.237,522.3694,0,0,0,.163,4.633,15545.0555,-2.2,-19,0,.161,.478,6428.0209,-2.2,-19,0,.158,2.03,13171.5218,-4.3,-38,0,.157,2.28,7216.3641,-3.7,-44,0,.154,5.65,7935.6705,1.5,25,0,.152,.46,29828.9047,-1.3,12,0,.151,1.19,-.7113,0,0,0,.15,1.42,23942.4334,-1,9,0,.144,2.75,7753.3529,1.5,25,0,.137,2.08,7213.7105,-2.2,-19,0,.137,1.44,7214.4152,-2.2,-19,0,.136,4.46,-1185.6162,-1.8,-22,0,.136,3.03,8000.1048,-2.2,-19,0,.134,2.83,14756.7124,-.7,6,0,.131,5.05,6821.0419,-2.2,-19,0,.128,5.99,-17214.6971,-4.9,-72,0,.127,5.35,8721.7124,1.5,25,0,.126,4.49,46628.2629,-2,19,0,.125,5.94,7149.6285,1.5,25,0,.124,1.09,49067.0695,1.1,55,0,.121,2.88,15471.7666,1.2,28,0,.111,3.92,41643.4571,7.6,125,-1,.11,1.96,8904.0299,1.5,25,0,.106,3.3,-18.0489,-2.2,-19,0,.105,2.3,-4.931,1.5,25,0,.104,2.22,-6.559,-1.9,-22,0,.101,1.44,1884.9059,-.1,0,0,.1,5.92,5471.1324,-5.9,-63,0,.099,1.12,15149.7333,-.7,6,0,.096,4.73,15508.9972,-.4,10,0,.095,5.18,7230.9835,1.5,25,0,.093,3.37,39900.5266,3.9,81,0,.092,2.01,25057.0619,2.7,53,0,.092,1.21,-79.6298,0,0,0,.092,1.65,-26310.2523,-4,-68,0,.091,1.01,42062.5561,-1,23,0,.09,6.1,29342.5781,-5,-32,0,.09,4.43,15542.402,-.7,6,0,.09,3.8,15543.1066,-.7,6,0,.089,4.15,6063.3859,-2.2,-19,0,.086,4.03,52.9691,0,0,0,.085,.49,47952.4409,-2.6,11,0,.085,1.6,7632.8154,2.1,32,0,.084,.22,14392.0773,-.7,6,0,.083,6.22,6028.4466,-4,-41,0,.083,.63,-7909.9389,2.8,26,0,.083,5.2,-77.5523,0,0,0,.082,2.74,8786.1467,-2.2,-19,0,.08,2.43,9166.5428,-2.8,-26,0,.08,3.7,-25405.1732,4.1,27,0,.078,5.68,48857.52,5.4,106,-1,.077,1.85,8315.5735,-2.2,-19,0,.075,5.46,-18191.1103,1.9,8,0,.075,1.41,-16238.6304,1.3,1,0,.074,5.06,40110.0761,-.4,30,0,.072,2.1,64.4343,-3.7,-44,0,.071,2.17,37671.2695,-3.5,-6,0,.069,1.71,16693.4313,-.7,6,0,.069,3.33,-26100.7028,-8.3,-119,1,.068,1.09,8329.4028,1.5,25,0,.068,3.62,8327.9801,1.5,25,0,.068,2.41,16833.1509,-1,3,0,.067,3.4,24709.2971,-3.5,-20,0,.067,1.65,8346.7156,-.3,3,0,.066,2.61,22547.2677,1.5,39,0,.066,3.5,15576.5113,-1,3,0,.065,5.76,33037.9886,-2,5,0,.065,4.58,8322.1325,-.3,3,0,.065,6.2,17913.9868,3,50,0,.065,1.5,22685.8295,-1,9,0,.065,2.37,7180.3058,-1.9,-15,0,.064,1.06,30943.5332,2.4,56,0,.064,1.89,8288.8765,1.5,25,0,.064,4.7,6.0335,.3,4,0,.063,2.83,8368.5063,1.5,25,0,.063,5.66,-2580.7819,.7,7,0,.062,3.78,7056.3285,-2.2,-19,0,.061,1.49,8294.91,1.8,29,0,.061,.12,-10281.1714,-.9,-18,0,.061,3.06,-8362.4729,-1.2,-21,0,.061,4.43,8170.9571,1.5,25,0,.059,5.78,-13.1179,-3.7,-44,0,.059,5.97,6625.5702,-2.2,-19,0,.058,5.01,-.508,-.3,0,0,.058,2.73,7161.0938,-2.2,-19,0,.057,.19,7214.0629,-2.2,-19,0,.057,4,22199.5029,-4.7,-35,0,.057,5.38,8119.142,5.8,76,0,.056,1.07,7542.6495,1.5,25,0,.056,.28,8486.4258,1.5,25,0,.054,4.19,16655.0816,4.6,75,0,.053,.72,7267.032,-2.2,-19,0,.053,3.12,12.6192,.6,7,0,.052,2.99,-32896.013,-1.8,-49,0,.052,3.46,1097.708,0,0,0,.051,5.37,-6443.786,-1.6,-25,0,.051,1.35,7789.401,-2.2,-19,0,.051,5.83,40042.502,.2,38,0,.051,3.63,9114.733,1.5,25,0,.05,1.51,8504.484,-2.5,-22,0,.05,5.23,16659.684,1.5,25,0,.05,1.15,7247.82,-2.5,-23,0,.047,.25,-1290.421,.3,0,0,.047,4.67,-32686.464,-6.1,-100,0,.047,3.49,548.678,0,0,0,.047,2.37,6663.308,-2.2,-19,0,.046,.98,1572.084,0,0,0,.046,2.04,14954.262,-.7,6,0,.046,3.72,6691.693,-2.2,-19,0,.045,6.19,-235.287,0,0,0,.044,2.96,32967.001,-.1,27,0,.044,3.82,-1671.943,-5.6,-66,0,.043,5.82,1179.063,0,0,0,.043,.07,34152.617,1.7,49,0,.043,3.71,6514.773,-.3,0,0,.043,5.62,15.732,-2.5,-23,0,.043,5.8,8351.233,-2.2,-19,0,.042,.27,7740.199,1.5,25,0,.042,6.14,15385.02,-.7,6,0,.042,6.13,7285.051,-4.1,-41,0,.041,1.27,32757.451,4.2,78,0,.041,4.46,8275.722,1.5,25,0,.04,.23,8381.661,1.5,25,0,.04,5.87,-766.864,2.5,29,0,.04,1.66,254.431,0,0,0,.04,.4,9027.981,-.4,0,0,.04,2.96,7777.936,1.5,25,0,.039,4.67,33943.068,6.1,100,0,.039,3.52,8326.062,1.5,25,0,.039,3.75,21013.887,-6.5,-57,0,.039,5.6,606.978,0,0,0,.039,1.19,8331.321,1.5,25,0,.039,2.84,7211.433,-2.2,-19,0,.038,.67,7216.693,-2.2,-19,0,.038,6.22,25161.867,.6,28,0,.038,4.4,7806.322,1.5,25,0,.038,4.16,9179.168,-2.2,-19,0,.037,4.73,14991.999,-.7,6,0,.036,.35,67.514,-.6,-7,0,.036,3.7,25266.611,-1.6,0,0,.036,5.39,16328.796,-.7,6,0,.035,1.44,7174.248,-2.2,-19,0,.035,5,15684.73,-4.4,-38,0,.035,.39,-15.419,-2.2,-19,0,.035,6.07,15020.385,-.7,6,0,.034,6.01,7371.797,-2.2,-19,0,.034,.96,-16623.626,-3.4,-54,0,.033,6.24,9479.368,1.5,25,0,.033,3.21,23661.896,5.2,82,0,.033,4.06,8311.418,-2.2,-19,0,.033,2.4,1965.105,0,0,0,.033,5.17,15489.785,-.7,6,0,.033,5.03,21986.54,.9,31,0,.033,4.1,16691.14,2.7,46,0,.033,5.13,47114.589,1.7,63,0,.033,4.45,8917.184,1.5,25,0,.033,4.23,2.078,0,0,0,.032,2.33,75.251,1.5,25,0,.032,2.1,7253.878,-2.2,-19,0,.032,3.11,-.224,1.5,25,0,.032,4.43,16640.462,-.7,6,0,.032,5.68,8328.363,0,0,0,.031,5.32,8329.02,3,50,0,.031,3.7,16118.093,-.7,6,0,.03,3.67,16721.817,-.7,6,0,.03,5.27,-1881.492,-1.2,-15,0,.03,5.72,8157.839,-2.2,-19,0,.029,5.73,-18400.313,-6.7,-94,0,.029,2.76,16,-2.2,-19,0,.029,1.75,8879.447,1.5,25,0,.029,.32,8851.061,1.5,25,0,.029,.9,14704.903,3.7,57,0,.028,2.9,15595.723,-.7,6,0,.028,5.88,16864.631,.2,24,0,.028,.63,16869.234,-2.8,-26,0,.028,4.04,-18609.863,-2.4,-43,0,.027,5.83,6727.736,-5.9,-63,0,.027,6.12,418.752,4.3,51,0,.027,.14,41157.131,3.9,81,0,.026,3.8,15.542,0,0,0,.026,1.68,50181.698,4.8,99,-1,.026,.32,315.469,0,0,0,.025,5.67,19.188,.3,0,0,.025,3.16,62.133,-2.2,-19,0,.025,3.76,15502.939,-.7,6,0,.025,4.53,45999.961,-2,19,0,.024,3.21,837.851,-4.4,-51,0,.024,2.82,38157.596,.3,37,0,.024,5.21,15540.124,-.7,6,0,.024,.26,14218.576,0,13,0,.024,3.01,15545.384,-.7,6,0,.024,1.16,-17424.247,-.6,-21,0,.023,2.34,-67.574,.6,7,0,.023,2.44,18.024,-1.9,-22,0,.023,3.7,469.4,0,0,0,.023,.72,7136.511,-2.2,-19,0,.023,4.5,15582.569,-.7,6,0,.023,2.8,-16586.395,-4.9,-72,0,.023,1.51,80.182,0,0,0,.023,1.09,5261.583,-1.5,-12,0,.023,.56,54956.954,-.5,44,0,.023,4.01,8550.86,-2.2,-19,0,.023,4.46,38995.448,-4.1,-14,0,.023,3.82,2358.126,0,0,0,.022,3.77,32271.125,.5,34,0,.022,.82,15935.775,-.7,6,0,.022,1.07,24013.421,-2.9,-13,0,.022,.4,8940.078,-2.2,-19,0,.022,2.06,15700.489,-.7,6,0,.022,4.27,15124.002,-5,-45,0,.021,1.16,56071.583,3.2,88,0,.021,5.58,9572.189,-2.2,-19,0,.02,1.7,-17.273,-3.7,-44,0,.02,3.05,214.617,0,0,0,.02,4.41,8391.048,-2.2,-19,0,.02,5.95,23869.145,2.4,56,0,.02,.42,40947.927,-4.7,-21,0,.019,1.39,5818.897,.3,10,0,.019,.71,23873.747,-.7,6,0,.019,2.81,7291.615,-2.2,-19,0,.019,5.09,8428.018,-2.2,-19,0,.019,4.14,6518.187,-1.6,-12,0,.019,3.85,21.33,0,0,0,.018,.66,14445.046,-.7,6,0,.018,1.65,.966,-4,-48,0,.018,5.64,-17143.709,-6.8,-94,0,.018,6.01,7736.432,-2.2,-19,0,.018,2.74,31153.083,-1.9,5,0,.018,4.58,6116.355,-2.2,-19,0,.018,2.28,46.401,.3,0,0,.018,3.8,10213.597,1.4,25,0,.018,2.84,56281.132,-1.1,36,0,.018,3.53,8249.062,1.5,25,0,.017,4.43,20871.911,-3,-13,0,.017,4.44,627.596,0,0,0,.017,1.85,628.308,0,0,0,.017,1.19,8408.321,2,25,0,.017,1.95,7214.056,-2,-19,0,.017,1.57,7214.07,-2,-19,0,.017,1.65,13870.811,-6,-60,0,.017,.3,22.542,-4,-44,0,.017,2.62,-119.445,0,0,0,.016,4.87,5747.909,2,32,0,.016,4.45,14339.108,-1,6,0,.016,1.83,41366.68,0,30,0,.016,4.53,16309.618,-3,-23,0,.016,2.54,15542.754,-1,6,0,.016,6.05,1203.646,0,0,0,.015,5.2,2751.147,0,0,0,.015,1.8,-10699.924,-5,-69,0,.015,.4,22824.391,-3,-20,0,.015,2.1,30666.756,-6,-39,0,.015,2.1,6010.417,-2,-19,0,.015,.7,-23729.47,-5,-75,0,.015,1.4,14363.691,-1,6,0,.015,5.8,16900.689,-2,0,0,.015,5.2,23800.458,3,53,0,.015,5.3,6035,-2,-19,0,.015,1.2,8251.139,2,25,0,.015,3.6,-8.86,0,0,0,.015,.8,882.739,0,0,0,.015,3,1021.329,0,0,0,.015,.6,23296.107,1,31,0,.014,5.4,7227.181,2,25,0,.014,.1,7213.352,-2,-19,0,.014,4,15506.706,3,50,0,.014,3.4,7214.774,-2,-19,0,.014,4.6,6665.385,-2,-19,0,.014,.1,-8.636,-2,-22,0,.014,3.1,15465.202,-1,6,0,.014,4.9,508.863,0,0,0,.014,3.5,8406.244,2,25,0,.014,1.3,13313.497,-8,-82,0,.014,2.8,49276.619,-3,0,0,.014,.1,30528.194,-3,-10,0,.013,1.7,25128.05,1,31,0,.013,2.9,14128.405,-1,6,0,.013,3.4,57395.761,3,80,0,.013,2.7,13029.546,-1,6,0,.013,3.9,7802.556,-2,-19,0,.013,1.6,8258.802,-2,-19,0,.013,2.2,8417.709,-2,-19,0,.013,.7,9965.21,-2,-19,0,.013,3.4,50391.247,0,48,0,.013,3,7134.433,-2,-19,0,.013,2.9,30599.182,-5,-31,0,.013,3.6,-9723.857,1,0,0,.013,4.8,7607.084,-2,-19,0,.012,.8,23837.689,1,35,0,.012,3.6,4.409,-4,-44,0,.012,5,16657.031,3,50,0,.012,4.4,16657.735,3,50,0,.012,1.1,15578.803,-4,-38,0,.012,6,-11.49,0,0,0,.012,1.9,8164.398,0,0,0,.012,2.4,31852.372,-4,-17,0,.012,2.4,6607.085,-2,-19,0,.012,4.2,8359.87,0,0,0,.012,.5,5799.713,-2,-19,0,.012,2.7,7220.622,0,0,0,.012,4.3,-139.72,0,0,0,.012,2.3,13728.836,-2,-16,0,.011,3.6,14912.146,1,31,0,.011,4.7,14916.748,-2,-19,0],[1.6768,4.66926,628.301955,-.0266,.1,-.005,.51642,3.3721,6585.76091,-2.158,-18.9,.09,.41383,5.7277,14914.452335,-.635,6.2,-.04,.37115,3.9695,7700.389469,1.55,25,-.12,.2756,.7416,8956.99338,1.496,25.1,-.13,.24599,4.2253,-2.3012,1.523,25.1,-.12,.07118,.1443,7842.36482,-2.211,-19,.08,.06128,2.4998,16171.05625,-.688,6,0,.04516,.443,8399.6791,-.36,3,0,.04048,5.771,14286.15038,-.61,6,0,.03747,4.626,1256.60391,-.05,0,0,.03707,3.415,5957.45895,-2.13,-19,.1,.03649,1.8,23243.14376,.89,31,-.2,.02438,.042,16029.08089,3.07,50,-.2,.02165,1.017,-1742.93051,-3.68,-44,.2,.01923,3.097,17285.6848,3.02,50,-.3,.01692,1.28,.3286,1.52,25,-.1,.01361,.298,8326.3902,3.05,50,-.2,.01293,4.013,7072.0875,1.58,25,-.1,.01276,4.413,8330.9926,0,0,0,.0127,.101,8470.6668,-2.24,-19,.1,.01097,1.203,22128.5152,-2.82,-13,0,.01088,2.545,15542.7543,-.66,6,0,.00835,.19,7214.0629,-2.18,-19,.1,.00734,4.855,24499.7477,.83,31,-.2,.00686,5.13,13799.8238,-4.34,-38,.2,.00631,.93,-486.3266,-3.73,-44,0,.00585,.699,9585.2953,1.5,25,0,.00566,4.073,8328.3391,1.5,25,0,.00566,.638,8329.0437,1.5,25,0,.00539,2.472,-1952.48,.6,7,0,.00509,2.88,-.7113,0,0,0,.00469,3.56,30457.2066,-1.3,12,0,.00387,.78,-.3523,0,0,0,.00378,1.84,22614.8418,.9,31,0,.00362,5.53,-695.8761,.6,7,0,.00317,2.8,16728.3705,1.2,28,0,.00303,6.07,157.7344,0,0,0,.003,2.53,33.757,-.3,-4,0,.00295,4.16,31571.8352,2.4,56,0,.00289,5.98,7211.7617,-.7,6,0,.00285,2.06,15540.4531,.9,31,0,.00283,2.65,2.6298,0,0,0,.00282,6.17,15545.0555,-2.2,-19,0,.00278,1.23,-39.8149,0,0,0,.00272,3.82,7216.3641,-3.7,-44,0,.0027,4.37,70.9877,-1.9,-22,0,.00256,5.81,13657.8484,-.6,6,0,.00244,5.64,-.2237,1.5,25,0,.0024,2.96,8311.7707,-2.2,-19,0,.00239,.87,-33.7814,.3,4,0,.00216,2.31,15.9995,-2.2,-19,0,.00186,3.46,5329.157,-2.1,-19,0,.00169,2.4,24357.772,4.6,75,0,.00161,5.8,8329.403,1.5,25,0,.00161,5.2,8327.98,1.5,25,0,.0016,4.26,23385.119,-2.9,-13,0,.00156,1.26,550.755,0,0,0,.00155,1.25,21500.213,-2.8,-13,0,.00152,.6,-16.921,-3.7,-44,0,.0015,2.71,-79.63,0,0,0,.0015,5.29,15.542,0,0,0,.00148,1.06,-2371.232,-3.7,-44,0,.00141,.77,8328.691,1.5,25,0,.00141,3.67,7143.075,-.3,0,0,.00138,5.45,25614.376,4.5,75,0,.00129,4.9,23871.446,.9,31,0,.00126,4.03,141.975,-3.8,-44,0,.00124,6.01,522.369,0,0,0,.0012,4.94,-10071.622,-5.2,-69,0,.00118,5.07,-15.419,-2.2,-19,0,.00107,3.49,23452.693,-3.4,-20,0,.00104,4.78,17495.234,-1.3,0,0,.00103,1.44,-18.049,-2.2,-19,0,.00102,5.63,15542.402,-.7,6,0,.00102,2.59,15543.107,-.7,6,0,.001,4.11,-6.559,-1.9,-22,0,97e-5,.08,15400.779,3.1,50,0,96e-5,5.84,31781.385,-1.9,5,0,94e-5,1.08,8328.363,0,0,0,94e-5,2.46,16799.358,-.7,6,0,94e-5,1.69,6376.211,2.2,32,0,93e-5,3.64,8329.02,3,50,0,93e-5,2.65,16655.082,4.6,75,0,9e-4,1.9,15056.428,-4.4,-38,0,89e-5,1.59,52.969,0,0,0,88e-5,2.02,-8257.704,-3.4,-47,0,88e-5,3.02,7213.711,-2.2,-19,0,87e-5,.5,7214.415,-2.2,-19,0,87e-5,.49,16659.684,1.5,25,0,82e-5,5.64,-4.931,1.5,25,0,79e-5,5.17,13171.522,-4.3,-38,0,76e-5,3.6,29828.905,-1.3,12,0,76e-5,4.08,24567.322,.3,24,0,76e-5,4.58,1884.906,-.1,0,0,73e-5,.33,31713.811,-1.4,12,0,73e-5,.93,32828.439,2.4,56,0,71e-5,5.91,38785.898,.2,37,0,69e-5,2.2,15613.742,-2.5,-16,0,66e-5,3.87,15.732,-2.5,-23,0,66e-5,.86,25823.926,.2,24,0,65e-5,2.52,8170.957,1.5,25,0,63e-5,.18,8322.132,-.3,0,0,6e-4,5.84,8326.062,1.5,25,0,6e-4,5.15,8331.321,1.5,25,0,6e-4,2.18,8486.426,1.5,25,0,58e-5,2.3,-1.731,-4,-44,0,58e-5,5.43,14357.138,-2,-16,0,57e-5,3.09,8294.91,2,29,0,57e-5,4.67,-8362.473,-1,-21,0,56e-5,4.15,16833.151,-1,0,0,54e-5,1.93,7056.329,-2,-19,0,54e-5,5.27,8315.574,-2,-19,0,52e-5,5.6,8311.418,-2,-19,0,52e-5,2.7,-77.552,0,0,0,51e-5,4.3,7230.984,2,25,0,5e-4,.4,-.508,0,0,0,49e-5,5.4,7211.433,-2,-19,0,49e-5,4.4,7216.693,-2,-19,0,49e-5,4.3,16864.631,0,24,0,49e-5,2.2,16869.234,-3,-26,0,47e-5,6.1,627.596,0,0,0,47e-5,5,12.619,1,7,0,45e-5,4.9,-8815.018,-5,-69,0,44e-5,1.6,62.133,-2,-19,0,42e-5,2.9,-13.118,-4,-44,0,42e-5,4.1,-119.445,0,0,0,41e-5,4.3,22756.817,-3,-13,0,41e-5,3.6,8288.877,2,25,0,4e-4,.5,6663.308,-2,-19,0,4e-4,1.1,8368.506,2,25,0,39e-5,4.1,6443.786,2,25,0,39e-5,3.1,16657.383,3,50,0,38e-5,.1,16657.031,3,50,0,38e-5,3,16657.735,3,50,0,38e-5,4.6,23942.433,-1,9,0,37e-5,4.3,15385.02,-1,6,0,37e-5,5,548.678,0,0,0,36e-5,1.8,7213.352,-2,-19,0,36e-5,1.7,7214.774,-2,-19,0,35e-5,1.1,7777.936,2,25,0,35e-5,1.6,-8.86,0,0,0,35e-5,4.4,23869.145,2,56,0,35e-5,2,6691.693,-2,-19,0,34e-5,1.3,-1185.616,-2,-22,0,34e-5,2.2,23873.747,-1,6,0,33e-5,2,-235.287,0,0,0,33e-5,3.1,17913.987,3,50,0,33e-5,1,8351.233,-2,-19,0],[.00487,4.6693,628.30196,-.027,0,-.01,.00228,2.6746,-2.3012,1.523,25,-.12,.0015,3.372,6585.76091,-2.16,-19,.1,.0012,5.728,14914.45233,-.64,6,0,.00108,3.969,7700.38947,1.55,25,-.1,8e-4,.742,8956.99338,1.5,25,-.1,254e-6,6.002,.3286,1.52,25,-.1,21e-5,.144,7842.3648,-2.21,-19,0,18e-5,2.5,16171.0562,-.7,6,0,13e-5,.44,8399.6791,-.4,3,0,126e-6,5.03,8326.3902,3,50,0,12e-5,5.77,14286.1504,-.6,6,0,118e-6,5.96,8330.9926,0,0,0,11e-5,1.8,23243.1438,.9,31,0,11e-5,3.42,5957.459,-2.1,-19,0,11e-5,4.63,1256.6039,-.1,0,0,99e-6,4.7,-.7113,0,0,0,7e-5,.04,16029.0809,3.1,50,0,7e-5,5.14,8328.3391,1.5,25,0,7e-5,5.85,8329.0437,1.5,25,0,6e-5,1.02,-1742.9305,-3.7,-44,0,6e-5,3.1,17285.6848,3,50,0,54e-6,5.69,-.352,0,0,0,43e-6,.52,15.542,0,0,0,41e-6,2.03,2.63,0,0,0,4e-5,.1,8470.667,-2.2,-19,0,4e-5,4.01,7072.088,1.6,25,0,36e-6,2.93,-8.86,-.3,0,0,3e-5,1.2,22128.515,-2.8,-13,0,3e-5,2.54,15542.754,-.7,6,0,27e-6,4.43,7211.762,-.7,6,0,26e-6,.51,15540.453,.9,31,0,26e-6,1.44,15545.055,-2.2,-19,0,25e-6,5.37,7216.364,-3.7,-44,0],[12e-6,1.041,-2.3012,1.52,25,-.1,17e-7,.31,-.711,0,0,0]],QI_KB:[1640650.479938,15.218425,1642476.703182,15.21874996,1683430.515601,15.218750011,1752157.640664,15.218749978,1807675.003759,15.218620279,1883627.765182,15.218612292,1907369.1281,15.218449176,1936603.140413,15.218425,1939145.52418,15.218466998,1947180.7983,15.218524844,1964362.041824,15.218533526,1987372.340971,15.218513908,1999653.819126,15.218530782,2007445.469786,15.218535181,2021324.917146,15.218526248,2047257.232342,15.218519654,2070282.898213,15.218425,2073204.87285,15.218515221,2080144.500926,15.218530782,2086703.688963,15.218523776,2110033.182763,15.218425,2111190.300888,15.218425,2113731.271005,15.218515671,2120670.840263,15.218425,2123973.309063,15.218425,2125068.997336,15.218477932,2136026.312633,15.218472436,2156099.495538,15.218425,2159021.324663,15.218425,2162308.575254,15.218461742,2178485.706538,15.218425,2178759.662849,15.218445786,2185334.0208,15.218425,2187525.481425,15.218425,2188621.191481,15.218437494,2322147.76],QB:C("FrcFs22AFsckF2tsDtFqEtF1posFdFgiFseFtmelpsEfhkF2anmelpFlF1ikrotcnEqEq2FfqmcDsrFor22FgFrcgDscFs22FgEeFtE2sfFs22sCoEsaF2tsD1FpeE2eFsssEciFsFnmelpFcFhkF2tcnEqEpFgkrotcnEqrEtFermcDsrE222FgBmcmr22DaEfnaF222sD1FpeForeF2tssEfiFpEoeFssD1iFstEqFppDgFstcnEqEpFg11FscnEqrAoAF2ClAEsDmDtCtBaDlAFbAEpAAAAAD2FgBiBqoBbnBaBoAAAAAAAEgDqAdBqAFrBaBoACdAAf1AACgAAAeBbCamDgEifAE2AABa1C1BgFdiAAACoCeE1ADiEifDaAEqAAFe1AcFbcAAAAAF1iFaAAACpACmFmAAAAAAAACrDaAAADG0"),SHUO_KB:[1457698.231017,29.53067166,1546082.512234,29.53085106,1640640.7353,29.5306,1642472.151543,29.53085439,1683430.5093,29.53086148,1752148.041079,29.53085097,1807665.420323,29.53059851,1883618.1141,29.5306,1907360.7047,29.5306,1936596.2249,29.5306,1939135.6753,29.5306,1947168],SB:C("EqoFscDcrFpmEsF2DfFideFelFpFfFfFiaipqti1ksttikptikqckstekqttgkqttgkqteksttikptikq2fjstgjqttjkqttgkqtekstfkptikq2tijstgjiFkirFsAeACoFsiDaDiADc1AFbBfgdfikijFifegF1FhaikgFag1E2btaieeibggiffdeigFfqDfaiBkF1kEaikhkigeidhhdiegcFfakF1ggkidbiaedksaFffckekidhhdhdikcikiakicjF1deedFhFccgicdekgiFbiaikcfi1kbFibefgEgFdcFkFeFkdcfkF1kfkcickEiFkDacFiEfbiaejcFfffkhkdgkaiei1ehigikhdFikfckF1dhhdikcfgjikhfjicjicgiehdikcikggcifgiejF1jkieFhegikggcikFegiegkfjebhigikggcikdgkaFkijcfkcikfkcifikiggkaeeigefkcdfcfkhkdgkegieidhijcFfakhfgeidieidiegikhfkfckfcjbdehdikggikgkfkicjicjF1dbidikFiggcifgiejkiegkigcdiegfggcikdbgfgefjF1kfegikggcikdgFkeeijcfkcikfkekcikdgkabhkFikaffcfkhkdgkegbiaekfkiakicjhfgqdq2fkiakgkfkhfkfcjiekgFebicggbedF1jikejbbbiakgbgkacgiejkijjgigfiakggfggcibFifjefjF1kfekdgjcibFeFkijcfkfhkfkeaieigekgbhkfikidfcjeaibgekgdkiffiffkiakF1jhbakgdki1dj1ikfkicjicjieeFkgdkicggkighdF1jfgkgfgbdkicggfggkidFkiekgijkeigfiskiggfaidheigF1jekijcikickiggkidhhdbgcfkFikikhkigeidieFikggikhkffaffijhidhhakgdkhkijF1kiakF1kfheakgdkifiggkigicjiejkieedikgdfcggkigieeiejfgkgkigbgikicggkiaideeijkefjeijikhkiggkiaidheigcikaikffikijgkiahi1hhdikgjfifaakekighie1hiaikggikhkffakicjhiahaikggikhkijF1kfejfeFhidikggiffiggkigicjiekgieeigikggiffiggkidheigkgfjkeigiegikifiggkidhedeijcfkFikikhkiggkidhh1ehigcikaffkhkiggkidhh1hhigikekfiFkFikcidhh1hitcikggikhkfkicjicghiediaikggikhkijbjfejfeFhaikggifikiggkigiejkikgkgieeigikggiffiggkigieeigekijcijikggifikiggkideedeijkefkfckikhkiggkidhh1ehijcikaffkhkiggkidhh1hhigikhkikFikfckcidhh1hiaikgjikhfjicjicgiehdikcikggifikigiejfejkieFhegikggifikiggfghigkfjeijkhigikggifikiggkigieeijcijcikfksikifikiggkidehdeijcfdckikhkiggkhghh1ehijikifffffkhsFngErD1pAfBoDd1BlEtFqA2AqoEpDqElAEsEeB2BmADlDkqBtC1FnEpDqnEmFsFsAFnllBbFmDsDiCtDmAB2BmtCgpEplCpAEiBiEoFqFtEqsDcCnFtADnFlEgdkEgmEtEsCtDmADqFtAFrAtEcCqAE1BoFqC1F1DrFtBmFtAC2ACnFaoCgADcADcCcFfoFtDlAFgmFqBq2bpEoAEmkqnEeCtAE1bAEqgDfFfCrgEcBrACfAAABqAAB1AAClEnFeCtCgAADqDoBmtAAACbFiAAADsEtBqAB2FsDqpFqEmFsCeDtFlCeDtoEpClEqAAFrAFoCgFmFsFqEnAEcCqFeCtFtEnAEeFtAAEkFnErAABbFkADnAAeCtFeAfBoAEpFtAABtFqAApDcCGJ"),nutationLon2:function(n){for(var i=-1.742*n,t=n*n,e=0,a=0,g=this.NUT_B.length;a<g;a+=5)e+=(this.NUT_B[a+3]+i)*Math.sin(this.NUT_B[a]+this.NUT_B[a+1]*n+this.NUT_B[a+2]*t),i=0;return e/100/this.SECOND_PER_RAD},eLon:function(n,i){n/=10;for(var t,e,a,g,r,u=0,h=1,s=this.XL0[2]-this.XL0[1],o=0;o<6;o++,h*=n)if(t=Math.floor(this.XL0[1+o]),0!=(r=(e=Math.floor(this.XL0[2+o]))-t)){i<0?a=e:(a=Math.floor(3*i*r/s+.5+t),0!==o&&(a+=3),a>e&&(a=e)),g=0;for(var F=t;F<a;F+=3)g+=this.XL0[F]*Math.cos(this.XL0[F+1]+n*this.XL0[F+2]);u+=g*h}u/=this.XL0[0];var C=n*n;return u+=(-.0728-2.7702*n-1.1019*C-.0996*C*n)/this.SECOND_PER_RAD},mLon:function(n,i){var t,e,a=this.XL1,g=a[0].length,r=1,u=0,h=n*n,s=h*n,o=s*n,F=o*n,C=n-10;u+=(3.81034409+8399.684730072*n-3319e-8*h+3.11e-8*s-2.033e-10*o)*this.SECOND_PER_RAD,u+=5028.792262*n+1.1124406*h+7699e-8*s-23479e-9*o-1.78e-8*F,C>0&&(u+=1.43*C-.866+.054*C*C),h/=1e4,s/=1e8,o/=1e8,(i*=6)<0&&(i=g);for(var A=0,E=a.length;A<E;A++,r*=n){var D=a[A],x=D.length,c=Math.floor(i*x/g+.5);for(A>0&&(c+=6),c>=x&&(c=x),t=0,e=0;t<c;t+=6)e+=D[t]*Math.cos(D[t+1]+n*D[t+2]+h*D[t+3]+s*D[t+4]+o*D[t+5]);u+=e*r}return u/=this.SECOND_PER_RAD},gxcSunLon:function(n){var i=n*n,t=628.301955*n-.043126-2732e-9*i;return-20.49552*(1+(.016708634-42037e-9*n-1.267e-7*i)*Math.cos(t))/this.SECOND_PER_RAD},ev:function(n){var i=628.307585*n;return 628.332+21*Math.sin(1.527+i)+.44*Math.sin(1.48+2*i)+.129*Math.sin(5.82+i)*n+55e-5*Math.sin(4.21+i)*n*n},saLon:function(n,i){return this.eLon(n,i)+this.nutationLon2(n)+this.gxcSunLon(n)+Math.PI},dtExt:function(n,i){var t=(n-1820)/100;return i*t*t-20},dtCalc:function(n){var i,t=this.DT_AT.length,e=this.DT_AT[t-2],a=this.DT_AT[t-1];if(n>=e)return n>e+100?this.dtExt(n,31):this.dtExt(n,31)-(this.dtExt(e,31)-a)*(e+100-n)/100;for(i=0;i<t&&!(n<this.DT_AT[i+5]);i+=5);var g=(n-this.DT_AT[i])/(this.DT_AT[i+5]-this.DT_AT[i])*10,r=g*g,u=r*g;return this.DT_AT[i+1]+this.DT_AT[i+2]*g+this.DT_AT[i+3]*r+this.DT_AT[i+4]*u},dtT:function(n){return this.dtCalc(n/365.2425+2e3)/this.SECOND_PER_DAY},mv:function(n){var i=8399.71-914*Math.sin(.7848+8328.691425*n+1523e-7*n*n);return i-=179*Math.sin(2.543+15542.7543*n)+160*Math.sin(.1874+7214.0629*n)+62*Math.sin(3.14+16657.3828*n)+34*Math.sin(4.827+16866.9323*n)+22*Math.sin(4.9+23871.4457*n)+12*Math.sin(2.59+14914.4523*n)+7*Math.sin(.23+6585.7609*n)+5*Math.sin(.9+25195.624*n)+5*Math.sin(2.32-7700.3895*n)+5*Math.sin(3.88+8956.9934*n)+5*Math.sin(.49+7771.3771*n)},saLonT:function(n){var i,t=628.3319653318;return i=(n-1.75347-Math.PI)/t,t=this.ev(i),i+=(n-this.saLon(i,10))/t,t=this.ev(i),i+=(n-this.saLon(i,-1))/t},msaLon:function(n,i,t){return this.mLon(n,i)+-34e-7-(this.eLon(n,t)+this.gxcSunLon(n)+Math.PI)},msaLonT:function(n){var i,t=7771.37714500204;return i=(n+1.08472)/t,i+=(n-this.msaLon(i,3,3))/t,t=this.mv(i)-this.ev(i),i+=(n-this.msaLon(i,20,10))/t,i+=(n-this.msaLon(i,-1,60))/t},saLonT2:function(n){var i=628.3319653318,t=(n-1.75347-Math.PI)/i;return t-=(5297e-9*t*t+.0334166*Math.cos(4.669257+628.307585*t)+2061e-7*Math.cos(2.67823+628.307585*t)*t)/i,t+=(n-Bn.eLon(t,8)-Math.PI+(20.5+17.2*Math.sin(2.1824-33.75705*t))/this.SECOND_PER_RAD)/i},msaLonT2:function(n){var i,t=7771.37714500204,e=(i=(n+1.08472)/t)*i;return e=(i-=(-3309e-8*e+.10976*Math.cos(.784758+8328.6914246*i+152292e-9*e)+.02224*Math.cos(.1874+7214.0628654*i-21848e-8*e)-.03342*Math.cos(4.669257+628.307585*i))/t)*i,i+=(n-(this.mLon(i,20)-(4.8950632+628.3319653318*i+5297e-9*e+.0334166*Math.cos(4.669257+628.307585*i)+2061e-7*Math.cos(2.67823+628.307585*i)*i+349e-6*Math.cos(4.6261+1256.61517*i)-20.5/this.SECOND_PER_RAD)))/(t=7771.38-914*Math.sin(.7848+8328.691425*i+1523e-7*e)-179*Math.sin(2.543+15542.7543*i)-160*Math.sin(.1874+7214.0629*i))},qiHigh:function(n){var i=36525*this.saLonT2(n),t=((i=i-this.dtT(i)+this.ONE_THIRD)+.5)%1*this.SECOND_PER_DAY;return(t<1200||t>this.SECOND_PER_DAY-1200)&&(i=36525*this.saLonT(n)-this.dtT(i)+this.ONE_THIRD),i},shuoHigh:function(n){var i=36525*this.msaLonT2(n),t=((i=i-this.dtT(i)+this.ONE_THIRD)+.5)%1*this.SECOND_PER_DAY;return(t<1800||t>this.SECOND_PER_DAY-1800)&&(i=36525*this.msaLonT(n)-this.dtT(i)+this.ONE_THIRD),i},qiLow:function(n){var i=628.3319653318,t=(n-4.895062166)/i;return t-=(53*t*t+334116*Math.cos(4.67+628.307585*t)+2061*Math.cos(2.678+628.3076*t)*t)/i/1e7,36525*(t-=((48950621.66+6283319653.318*t+53*t*t+334166*Math.cos(4.669257+628.307585*t)+3489*Math.cos(4.6261+1256.61517*t)+2060.6*Math.cos(2.67823+628.307585*t)*t-994-834*Math.sin(2.1824-33.75705*t))/1e7-n)/628.332+(32*(t+1.8)*(t+1.8)-20)/this.SECOND_PER_DAY/36525)+this.ONE_THIRD},shuoLow:function(n){var i=7771.37714500204,t=(n+1.08472)/i;return 36525*(t-=(-331e-7*t*t+.10976*Math.cos(.785+8328.6914*t)+.02224*Math.cos(.187+7214.0629*t)-.03342*Math.cos(4.669+628.3076*t))/i+(32*(t+1.8)*(t+1.8)-20)/this.SECOND_PER_DAY/36525)+this.ONE_THIRD},calcShuo:function(n){var i,t=this.SHUO_KB.length,e=0,a=14;n+=Fn.J2000;var g=this.SHUO_KB[0]-a,r=this.SHUO_KB[t-1]-a,u=2436935;if(n<g||n>=u)e=Math.floor(this.shuoHigh(Math.floor((n+a-2451551)/29.5306)*Math.PI*2)+.5);else if(n>=g&&n<r){for(i=0;i<t&&!(n+a<this.SHUO_KB[i+2]);i+=2);e=this.SHUO_KB[i]+this.SHUO_KB[i+1]*Math.floor((n+a-this.SHUO_KB[i])/this.SHUO_KB[i+1]),1683460===(e=Math.floor(e+.5))&&e++,e-=Fn.J2000}else if(n>=r&&n<u){e=Math.floor(this.shuoLow(Math.floor((n+a-2451551)/29.5306)*Math.PI*2)+.5);var h=Math.floor((n-r)/29.5306),s=this.SB.substring(h,h+1);"1"===s?e+=1:"2"===s&&(e-=1)}return e},calcQi:function(n){var i,t=this.QI_KB.length,e=0;n+=Fn.J2000;var a=this.QI_KB[0]-7,g=this.QI_KB[t-1]-7,r=2436935;if(n<a||n>=r)e=Math.floor(this.qiHigh(Math.floor((n+7-2451259)/365.2422*24)*Math.PI/12)+.5);else if(n>=a&&n<g){for(i=0;i<t&&!(n+7<this.QI_KB[i+2]);i+=2);e=this.QI_KB[i]+this.QI_KB[i+1]*Math.floor((n+7-this.QI_KB[i])/this.QI_KB[i+1]),1683460===(e=Math.floor(e+.5))&&e++,e-=Fn.J2000}else if(n>=g&&n<r){e=Math.floor(this.qiLow(Math.floor((n+7-2451259)/365.2422*24)*Math.PI/12)+.5);var u=Math.floor((n-g)/365.2422*24),h=this.QB.substring(u,u+1);"1"===h?e+=1:"2"===h&&(e-=1)}return e},qiAccurate:function(n){var i=36525*this.saLonT(n);return i-this.dtT(i)+this.ONE_THIRD},qiAccurate2:function(n){var i=Math.PI/12,t=Math.floor((n+293)/365.2422*24)*i,e=this.qiAccurate(t);return e-n>5?this.qiAccurate(t-i):e-n<-5?this.qiAccurate(t+i):e}}),fn={WEEK:["{w.sun}","{w.mon}","{w.tues}","{w.wed}","{w.thur}","{w.fri}","{w.sat}"],DAYS_OF_MONTH:[31,28,31,30,31,30,31,31,30,31,30,31],XINGZUO:["{xz.aries}","{xz.taurus}","{xz.gemini}","{xz.cancer}","{xz.leo}","{xz.virgo}","{xz.libra}","{xz.scorpio}","{xz.sagittarius}","{xz.capricornus}","{xz.aquarius}","{xz.pisces}"],FESTIVAL:{"1-1":"{jr.yuanDan}","2-14":"{jr.qingRen}","3-8":"{jr.fuNv}","3-12":"{jr.zhiShu}","3-15":"{jr.xiaoFei}","4-1":"{jr.yuRen}","5-1":"{jr.wuYi}","5-4":"{jr.qingNian}","6-1":"{jr.erTong}","7-1":"{jr.jianDang}","8-1":"{jr.jianJun}","9-10":"{jr.jiaoShi}","10-1":"{jr.guoQing}","10-31":"{jr.wanShengYe}","11-1":"{jr.wanSheng}","12-24":"{jr.pingAn}","12-25":"{jr.shengDan}"},OTHER_FESTIVAL:{"1-8":["周恩来逝世纪念日"],"1-10":["中国人民警察节"],"1-14":["日记情人节"],"1-21":["列宁逝世纪念日"],"1-26":["国际海关日"],"1-27":["国际大屠杀纪念日"],"2-2":["世界湿地日"],"2-4":["世界抗癌日"],"2-7":["京汉铁路罢工纪念日"],"2-10":["国际气象节"],"2-19":["邓小平逝世纪念日"],"2-20":["世界社会公正日"],"2-21":["国际母语日"],"2-24":["第三世界青年日"],"3-1":["国际海豹日"],"3-3":["世界野生动植物日","全国爱耳日"],"3-5":["周恩来诞辰纪念日","中国青年志愿者服务日"],"3-6":["世界青光眼日"],"3-7":["女生节"],"3-12":["孙中山逝世纪念日"],"3-14":["马克思逝世纪念日","白色情人节"],"3-17":["国际航海日"],"3-18":["全国科技人才活动日","全国爱肝日"],"3-20":["国际幸福日"],"3-21":["世界森林日","世界睡眠日","国际消除种族歧视日"],"3-22":["世界水日"],"3-23":["世界气象日"],"3-24":["世界防治结核病日"],"3-29":["中国黄花岗七十二烈士殉难纪念日"],"4-2":["国际儿童图书日","世界自闭症日"],"4-4":["国际地雷行动日"],"4-7":["世界卫生日"],"4-8":["国际珍稀动物保护日"],"4-12":["世界航天日"],"4-14":["黑色情人节"],"4-15":["全民国家安全教育日"],"4-22":["世界地球日","列宁诞辰纪念日"],"4-23":["世界读书日"],"4-24":["中国航天日"],"4-25":["儿童预防接种宣传日"],"4-26":["世界知识产权日","全国疟疾日"],"4-28":["世界安全生产与健康日"],"4-30":["全国交通安全反思日"],"5-2":["世界金枪鱼日"],"5-3":["世界新闻自由日"],"5-5":["马克思诞辰纪念日"],"5-8":["世界红十字日"],"5-11":["世界肥胖日"],"5-12":["全国防灾减灾日","护士节"],"5-14":["玫瑰情人节"],"5-15":["国际家庭日"],"5-19":["中国旅游日"],"5-20":["网络情人节"],"5-22":["国际生物多样性日"],"5-25":["525心理健康节"],"5-27":["上海解放日"],"5-29":["国际维和人员日"],"5-30":["中国五卅运动纪念日"],"5-31":["世界无烟日"],"6-3":["世界自行车日"],"6-5":["世界环境日"],"6-6":["全国爱眼日"],"6-8":["世界海洋日"],"6-11":["中国人口日"],"6-14":["世界献血日","亲亲情人节"],"6-17":["世界防治荒漠化与干旱日"],"6-20":["世界难民日"],"6-21":["国际瑜伽日"],"6-25":["全国土地日"],"6-26":["国际禁毒日","联合国宪章日"],"7-1":["香港回归纪念日"],"7-6":["国际接吻日","朱德逝世纪念日"],"7-7":["七七事变纪念日"],"7-11":["世界人口日","中国航海日"],"7-14":["银色情人节"],"7-18":["曼德拉国际日"],"7-30":["国际友谊日"],"8-3":["男人节"],"8-5":["恩格斯逝世纪念日"],"8-6":["国际电影节"],"8-8":["全民健身日"],"8-9":["国际土著人日"],"8-12":["国际青年节"],"8-14":["绿色情人节"],"8-19":["世界人道主义日","中国医师节"],"8-22":["邓小平诞辰纪念日"],"8-29":["全国测绘法宣传日"],"9-3":["中国抗日战争胜利纪念日"],"9-5":["中华慈善日"],"9-8":["世界扫盲日"],"9-9":["毛泽东逝世纪念日","全国拒绝酒驾日"],"9-14":["世界清洁地球日","相片情人节"],"9-15":["国际民主日"],"9-16":["国际臭氧层保护日"],"9-17":["世界骑行日"],"9-18":["九一八事变纪念日"],"9-20":["全国爱牙日"],"9-21":["国际和平日"],"9-27":["世界旅游日"],"9-30":["中国烈士纪念日"],"10-1":["国际老年人日"],"10-2":["国际非暴力日"],"10-4":["世界动物日"],"10-11":["国际女童日"],"10-10":["辛亥革命纪念日"],"10-13":["国际减轻自然灾害日","中国少年先锋队诞辰日"],"10-14":["葡萄酒情人节"],"10-16":["世界粮食日"],"10-17":["全国扶贫日"],"10-20":["世界统计日"],"10-24":["世界发展信息日","程序员节"],"10-25":["抗美援朝纪念日"],"11-5":["世界海啸日"],"11-8":["记者节"],"11-9":["全国消防日"],"11-11":["光棍节"],"11-12":["孙中山诞辰纪念日"],"11-14":["电影情人节"],"11-16":["国际宽容日"],"11-17":["国际大学生节"],"11-19":["世界厕所日"],"11-28":["恩格斯诞辰纪念日"],"11-29":["国际声援巴勒斯坦人民日"],"12-1":["世界艾滋病日"],"12-2":["全国交通安全日"],"12-3":["世界残疾人日"],"12-4":["全国法制宣传日"],"12-5":["世界弱能人士日","国际志愿人员日"],"12-7":["国际民航日"],"12-9":["世界足球日","国际反腐败日"],"12-10":["世界人权日"],"12-11":["国际山岳日"],"12-12":["西安事变纪念日"],"12-13":["国家公祭日"],"12-14":["拥抱情人节"],"12-18":["国际移徙者日"],"12-26":["毛泽东诞辰纪念日"]},WEEK_FESTIVAL:{"3-0-1":"全国中小学生安全教育日","5-2-0":"母亲节","5-3-0":"全国助残日","6-3-0":"父亲节","9-3-6":"全民国防教育日","10-1-1":"世界住房日","11-4-4":"感恩节"},isLeapYear:function(n){return n<1600?n%4==0:n%4==0&&n%100!=0||n%400==0},getDaysOfMonth:function(n,i){var t=n,e=i;if(n*=1,isNaN(n))throw new Error("wrong solar year "+t);if(i*=1,isNaN(i))throw new Error("wrong solar month "+e);if(1582===n&&10===i)return 21;var a=i-1,g=this.DAYS_OF_MONTH[a];return 1===a&&this.isLeapYear(n)&&g++,g},getDaysOfYear:function(n){var i=n;if(n*=1,isNaN(n))throw new Error("wrong solar year "+i);return 1582===n?355:this.isLeapYear(n)?366:365},getDaysInYear:function(n,i,t){var e=n,a=i,g=t;if(n*=1,isNaN(n))throw new Error("wrong solar year "+e);if(i*=1,isNaN(i))throw new Error("wrong solar month "+a);if(t*=1,isNaN(t))throw new Error("wrong solar day "+g);for(var r=0,u=1;u<i;u++)r+=this.getDaysOfMonth(n,u);var h=t;if(1582===n&&10===i)if(t>=15)h-=10;else if(t>4)throw new Error("wrong solar year "+n+" month "+i+" day "+t);return r+=h},getDaysBetween:function(n,i,t,e,a,g){var r,u,h,s=n,o=i,F=t,C=e,A=a,E=g;if(n*=1,isNaN(n))throw new Error("wrong solar year "+s);if(i*=1,isNaN(i))throw new Error("wrong solar month "+o);if(t*=1,isNaN(t))throw new Error("wrong solar day "+F);if(e*=1,isNaN(e))throw new Error("wrong solar year "+C);if(a*=1,isNaN(a))throw new Error("wrong solar month "+A);if(g*=1,isNaN(g))throw new Error("wrong solar day "+E);if(n===e)r=this.getDaysInYear(e,a,g)-this.getDaysInYear(n,i,t);else if(n>e){for(u=this.getDaysOfYear(e)-this.getDaysInYear(e,a,g),h=e+1;h<n;h++)u+=this.getDaysOfYear(h);r=-(u+=this.getDaysInYear(n,i,t))}else{for(u=this.getDaysOfYear(n)-this.getDaysInYear(n,i,t),h=n+1;h<e;h++)u+=this.getDaysOfYear(h);r=u+=this.getDaysInYear(e,a,g)}return r},getWeeksOfMonth:function(n,i,t){return Math.ceil((this.getDaysOfMonth(n,i)+Fn.fromYmd(n,i,1).getWeek()-t)/7)}},jn={BASE_MONTH_ZHI_INDEX:2,JIE_QI:["{jq.dongZhi}","{jq.xiaoHan}","{jq.daHan}","{jq.liChun}","{jq.yuShui}","{jq.jingZhe}","{jq.chunFen}","{jq.qingMing}","{jq.guYu}","{jq.liXia}","{jq.xiaoMan}","{jq.mangZhong}","{jq.xiaZhi}","{jq.xiaoShu}","{jq.daShu}","{jq.liQiu}","{jq.chuShu}","{jq.baiLu}","{jq.qiuFen}","{jq.hanLu}","{jq.shuangJiang}","{jq.liDong}","{jq.xiaoXue}","{jq.daXue}"],JIE_QI_IN_USE:["DA_XUE","{jq.dongZhi}","{jq.xiaoHan}","{jq.daHan}","{jq.liChun}","{jq.yuShui}","{jq.jingZhe}","{jq.chunFen}","{jq.qingMing}","{jq.guYu}","{jq.liXia}","{jq.xiaoMan}","{jq.mangZhong}","{jq.xiaZhi}","{jq.xiaoShu}","{jq.daShu}","{jq.liQiu}","{jq.chuShu}","{jq.baiLu}","{jq.qiuFen}","{jq.hanLu}","{jq.shuangJiang}","{jq.liDong}","{jq.xiaoXue}","{jq.daXue}","DONG_ZHI","XIAO_HAN","DA_HAN","LI_CHUN","YU_SHUI","JING_ZHE"],CHANG_SHENG_OFFSET:{"{tg.jia}":1,"{tg.bing}":10,"{tg.wu}":10,"{tg.geng}":7,"{tg.ren}":4,"{tg.yi}":6,"{tg.ding}":9,"{tg.ji}":9,"{tg.xin}":0,"{tg.gui}":3},MONTH_ZHI:["","{dz.yin}","{dz.mao}","{dz.chen}","{dz.si}","{dz.wu}","{dz.wei}","{dz.shen}","{dz.you}","{dz.xu}","{dz.hai}","{dz.zi}","{dz.chou}"],CHANG_SHENG:["{ds.changSheng}","{ds.muYu}","{ds.guanDai}","{ds.linGuan}","{ds.diWang}","{ds.shuai}","{ds.bing}","{ds.si}","{ds.mu}","{ds.jue}","{ds.tai}","{ds.yang}"],XUN:["{jz.jiaZi}","{jz.jiaXu}","{jz.jiaShen}","{jz.jiaWu}","{jz.jiaChen}","{jz.jiaYin}"],XUN_KONG:["{dz.xu}{dz.hai}","{dz.shen}{dz.you}","{dz.wu}{dz.wei}","{dz.chen}{dz.si}","{dz.yin}{dz.mao}","{dz.zi}{dz.chou}"],LIU_YAO:["{ly.xianSheng}","{ly.youYin}","{ly.xianFu}","{ly.foMie}","{ly.daAn}","{ly.chiKou}"],HOU:["{h.first}","{h.second}","{h.third}"],WU_HOU:["{h.qiuYinJie}","{h.miJiao}","{h.shuiQuan}","{h.yanBei}","{h.queShi}","{h.zhiShi}","{h.jiShi}","{h.zhengNiao}","{h.shuiZe}","{h.dongFeng}","{h.zheChongShiZhen}","{h.yuZhi}","{h.taJi}","{h.houYan}","{h.caoMuMengDong}","{h.taoShi}","{h.cangGeng}","{h.yingHua}","{h.xuanNiaoZhi}","{h.leiNai}","{h.shiDian}","{h.tongShi}","{h.tianShu}","{h.hongShi}","{h.pingShi}","{h.mingJiu}","{h.daiSheng}","{h.louGuo}","{h.qiuYinChu}","{h.wangGua}","{h.kuCai}","{h.miCao}","{h.maiQiu}","{h.tangLang}","{h.juShi}","{h.fanShe}","{h.luJia}","{h.tiaoShi}","{h.banXia}","{h.wenFeng}","{h.xiShuai}","{h.yingShi}","{h.fuCao}","{h.tuRun}","{h.daYu}","{h.liangFeng}","{h.baiLu}","{h.hanChan}","{h.yingNai}","{h.tianDi}","{h.heNai}","{h.hongYanLai}","{h.xuanNiaoGui}","{h.qunNiao}","{h.leiShi}","{h.zheChongPiHu}","{h.shuiShiHe}","{h.hongYanLaiBin}","{h.queRu}","{h.juYou}","{h.caiNai}","{h.caoMuHuangLuo}","{h.zheChongXianFu}","{h.shuiShiBing}","{h.diShi}","{h.zhiRu}","{h.hongCang}","{h.tianQi}","{h.biSe}","{h.heDan}","{h.huShi}","{h.liTing}"],GAN:["","{tg.jia}","{tg.yi}","{tg.bing}","{tg.ding}","{tg.wu}","{tg.ji}","{tg.geng}","{tg.xin}","{tg.ren}","{tg.gui}"],POSITION_XI:["","{bg.gen}","{bg.qian}","{bg.kun}","{bg.li}","{bg.xun}","{bg.gen}","{bg.qian}","{bg.kun}","{bg.li}","{bg.xun}"],POSITION_YANG_GUI:["","{bg.kun}","{bg.kun}","{bg.dui}","{bg.qian}","{bg.gen}","{bg.kan}","{bg.li}","{bg.gen}","{bg.zhen}","{bg.xun}"],POSITION_YIN_GUI:["","{bg.gen}","{bg.kan}","{bg.qian}","{bg.dui}","{bg.kun}","{bg.kun}","{bg.gen}","{bg.li}","{bg.xun}","{bg.zhen}"],POSITION_FU:["","{bg.xun}","{bg.xun}","{bg.zhen}","{bg.zhen}","{bg.kan}","{bg.li}","{bg.kun}","{bg.kun}","{bg.qian}","{bg.dui}"],POSITION_FU_2:["","{bg.kan}","{bg.kun}","{bg.qian}","{bg.xun}","{bg.gen}","{bg.kan}","{bg.kun}","{bg.qian}","{bg.xun}","{bg.gen}"],POSITION_CAI:["","{bg.gen}","{bg.gen}","{bg.kun}","{bg.kun}","{bg.kan}","{bg.kan}","{bg.zhen}","{bg.zhen}","{bg.li}","{bg.li}"],POSITION_TAI_SUI_YEAR:["{bg.kan}","{bg.gen}","{bg.gen}","{bg.zhen}","{bg.xun}","{bg.xun}","{bg.li}","{bg.kun}","{bg.kun}","{bg.dui}","{bg.kan}","{bg.kan}"],POSITION_GAN:["{bg.zhen}","{bg.zhen}","{bg.li}","{bg.li}","{ps.center}","{ps.center}","{bg.dui}","{bg.dui}","{bg.kan}","{bg.kan}"],POSITION_ZHI:["{bg.kan}","{ps.center}","{bg.zhen}","{bg.zhen}","{ps.center}","{bg.li}","{bg.li}","{ps.center}","{bg.dui}","{bg.dui}","{ps.center}","{bg.kan}"],POSITION_TAI_DAY:["{ts.zhan}{ts.men}{ts.dui} {ps.wai}{ps.dongNan}","{ts.dui}{ts.mo}{ts.ce} {ps.wai}{ps.dongNan}","{ts.chu}{ts.zao}{ts.lu} {ps.wai}{ps.zhengNan}","{ts.cangKu}{ts.men} {ps.wai}{ps.zhengNan}","{ts.fang}{ts.chuang}{ts.xi} {ps.wai}{ps.zhengNan}","{ts.zhan}{ts.men}{ts.chuang} {ps.wai}{ps.zhengNan}","{ts.zhan}{ts.dui}{ts.mo} {ps.wai}{ps.zhengNan}","{ts.chu}{ts.zao}{ts.ce} {ps.wai}{ps.xiNan}","{ts.cangKu}{ts.lu} {ps.wai}{ps.xiNan}","{ts.fang}{ts.chuang}{ts.men} {ps.wai}{ps.xiNan}","{ts.zhan}{ts.men}{ts.xi} {ps.wai}{ps.xiNan}","{ts.dui}{ts.mo}{ts.chuang} {ps.wai}{ps.xiNan}","{ts.chu}{ts.zao}{ts.dui} {ps.wai}{ps.xiNan}","{ts.cangKu}{ts.ce} {ps.wai}{ps.zhengXi}","{ts.fang}{ts.chuang}{ts.lu} {ps.wai}{ps.zhengXi}","{ts.zhan}{ts.daMen} {ps.wai}{ps.zhengXi}","{ts.dui}{ts.mo}{ts.xi} {ps.wai}{ps.zhengXi}","{ts.chu}{ts.zao}{ts.chuang} {ps.wai}{ps.zhengXi}","{ts.cangKu}{ts.dui} {ps.wai}{ps.xiBei}","{ts.fang}{ts.chuang}{ts.ce} {ps.wai}{ps.xiBei}","{ts.zhan}{ts.men}{ts.lu} {ps.wai}{ps.xiBei}","{ts.dui}{ts.mo}{ts.men} {ps.wai}{ps.xiBei}","{ts.chu}{ts.zao}{ts.xi} {ps.wai}{ps.xiBei}","{ts.cangKu}{ts.chuang} {ps.wai}{ps.xiBei}","{ts.fang}{ts.chuang}{ts.dui} {ps.wai}{ps.zhengBei}","{ts.zhan}{ts.men}{ts.ce} {ps.wai}{ps.zhengBei}","{ts.dui}{ts.mo}{ts.lu} {ps.wai}{ps.zhengBei}","{ts.chu}{ts.zao}{ts.men} {ps.wai}{ps.zhengBei}","{ts.cangKu}{ts.xi} {ps.wai}{ps.zhengBei}","{ts.zhan}{ts.fang}{ts.chuang} {ps.fangNei}{ps.bei}","{ts.zhan}{ts.men}{ts.dui} {ps.fangNei}{ps.bei}","{ts.dui}{ts.mo}{ts.ce} {ps.fangNei}{ps.bei}","{ts.chu}{ts.zao}{ts.lu} {ps.fangNei}{ps.bei}","{ts.cangKu}{ts.men} {ps.fangNei}{ps.bei}","{ts.fang}{ts.chuang}{ts.xi} {ps.fangNei}{ps.center}","{ts.zhan}{ts.men}{ts.chuang} {ps.fangNei}{ps.center}","{ts.zhan}{ts.dui}{ts.mo} {ps.fangNei}{ps.nan}","{ts.chu}{ts.zao}{ts.ce} {ps.fangNei}{ps.nan}","{ts.cangKu}{ts.lu} {ps.fangNei}{ps.nan}","{ts.fang}{ts.chuang}{ts.men} {ps.fangNei}{ps.xi}","{ts.zhan}{ts.men}{ts.xi} {ps.fangNei}{ps.dong}","{ts.dui}{ts.mo}{ts.chuang} {ps.fangNei}{ps.dong}","{ts.chu}{ts.zao}{ts.dui} {ps.fangNei}{ps.dong}","{ts.cangKu}{ts.ce} {ps.fangNei}{ps.dong}","{ts.fang}{ts.chuang}{ts.lu} {ps.fangNei}{ps.center}","{ts.zhan}{ts.daMen} {ps.wai}{ps.dongBei}","{ts.dui}{ts.mo}{ts.xi} {ps.wai}{ps.dongBei}","{ts.chu}{ts.zao}{ts.chuang} {ps.wai}{ps.dongBei}","{ts.cangKu}{ts.dui} {ps.wai}{ps.dongBei}","{ts.fang}{ts.chuang}{ts.ce} {ps.wai}{ps.dongBei}","{ts.zhan}{ts.men}{ts.lu} {ps.wai}{ps.dongBei}","{ts.dui}{ts.mo}{ts.men} {ps.wai}{ps.zhengDong}","{ts.chu}{ts.zao}{ts.xi} {ps.wai}{ps.zhengDong}","{ts.cangKu}{ts.chuang} {ps.wai}{ps.zhengDong}","{ts.fang}{ts.chuang}{ts.dui} {ps.wai}{ps.zhengDong}","{ts.zhan}{ts.men}{ts.ce} {ps.wai}{ps.zhengDong}","{ts.dui}{ts.mo}{ts.lu} {ps.wai}{ps.dongNan}","{ts.chu}{ts.zao}{ts.men} {ps.wai}{ps.dongNan}","{ts.cangKu}{ts.xi} {ps.wai}{ps.dongNan}","{ts.zhan}{ts.fang}{ts.chuang} {ps.wai}{ps.dongNan}"],POSITION_TAI_MONTH:["{ts.zhan}{ts.fang}{ts.chuang}","{ts.zhan}{ts.hu}{ts.win}","{ts.zhan}{ts.men}{ts.tang}","{ts.zhan}{ts.chu}{ts.zao}","{ts.zhan}{ts.fang}{ts.chuang}","{ts.zhan}{ts.chuang}{ts.cang}","{ts.zhan}{ts.dui}{ts.mo}","{ts.zhan}{ts.ce}{ts.hu}","{ts.zhan}{ts.men}{ts.fang}","{ts.zhan}{ts.fang}{ts.chuang}","{ts.zhan}{ts.zao}{ts.lu}","{ts.zhan}{ts.fang}{ts.chuang}"],ZHI:["","{dz.zi}","{dz.chou}","{dz.yin}","{dz.mao}","{dz.chen}","{dz.si}","{dz.wu}","{dz.wei}","{dz.shen}","{dz.you}","{dz.xu}","{dz.hai}"],ZHI_XING:["","{zx.jian}","{zx.chu}","{zx.man}","{zx.ping}","{zx.ding}","{zx.zhi}","{zx.po}","{zx.wei}","{zx.cheng}","{zx.shou}","{zx.kai}","{zx.bi}"],JIA_ZI:["{jz.jiaZi}","{jz.yiChou}","{jz.bingYin}","{jz.dingMao}","{jz.wuChen}","{jz.jiSi}","{jz.gengWu}","{jz.xinWei}","{jz.renShen}","{jz.guiYou}","{jz.jiaXu}","{jz.yiHai}","{jz.bingZi}","{jz.dingChou}","{jz.wuYin}","{jz.jiMao}","{jz.gengChen}","{jz.xinSi}","{jz.renWu}","{jz.guiWei}","{jz.jiaShen}","{jz.yiYou}","{jz.bingXu}","{jz.dingHai}","{jz.wuZi}","{jz.jiChou}","{jz.gengYin}","{jz.xinMao}","{jz.renChen}","{jz.guiSi}","{jz.jiaWu}","{jz.yiWei}","{jz.bingShen}","{jz.dingYou}","{jz.wuXu}","{jz.jiHai}","{jz.gengZi}","{jz.xinChou}","{jz.renYin}","{jz.guiMao}","{jz.jiaChen}","{jz.yiSi}","{jz.bingWu}","{jz.dingWei}","{jz.wuShen}","{jz.jiYou}","{jz.gengXu}","{jz.xinHai}","{jz.renZi}","{jz.guiChou}","{jz.jiaYin}","{jz.yiMao}","{jz.bingChen}","{jz.dingSi}","{jz.wuWu}","{jz.jiWei}","{jz.gengShen}","{jz.xinYou}","{jz.renXu}","{jz.guiHai}"],TIAN_SHEN:["","{sn.qingLong}","{sn.mingTang}","{sn.tianXing}","{sn.zhuQue}","{sn.jinKui}","{sn.tianDe}","{sn.baiHu}","{sn.yuTang}","{sn.tianLao}","{sn.xuanWu}","{sn.siMing}","{sn.gouChen}"],ZHI_TIAN_SHEN_OFFSET:{"{dz.zi}":4,"{dz.chou}":2,"{dz.yin}":0,"{dz.mao}":10,"{dz.chen}":8,"{dz.si}":6,"{dz.wu}":4,"{dz.wei}":2,"{dz.shen}":0,"{dz.you}":10,"{dz.xu}":8,"{dz.hai}":6},TIAN_SHEN_TYPE:{"{sn.qingLong}":"{s.huangDao}","{sn.mingTang}":"{s.huangDao}","{sn.jinKui}":"{s.huangDao}","{sn.tianDe}":"{s.huangDao}","{sn.yuTang}":"{s.huangDao}","{sn.siMing}":"{s.huangDao}","{sn.tianXing}":"{s.heiDao}","{sn.zhuQue}":"{s.heiDao}","{sn.baiHu}":"{s.heiDao}","{sn.tianLao}":"{s.heiDao}","{sn.xuanWu}":"{s.heiDao}","{sn.gouChen}":"{s.heiDao}"},TIAN_SHEN_TYPE_LUCK:{"{s.huangDao}":"{s.goodLuck}","{s.heiDao}":"{s.badLuck}"},PENGZU_GAN:["","{tg.jia}不开仓财物耗散","{tg.yi}不栽植千株不长","{tg.bing}不修灶必见灾殃","{tg.ding}不剃头头必生疮","{tg.wu}不受田田主不祥","{tg.ji}不破券二比并亡","{tg.geng}不经络织机虚张","{tg.xin}不合酱主人不尝","{tg.ren}不泱水更难提防","{tg.gui}不词讼理弱敌强"],PENGZU_ZHI:["","{dz.zi}不问卜自惹祸殃","{dz.chou}不冠带主不还乡","{dz.yin}不祭祀神鬼不尝","{dz.mao}不穿井水泉不香","{dz.chen}不哭泣必主重丧","{dz.si}不远行财物伏藏","{dz.wu}不苫盖屋主更张","{dz.wei}不服药毒气入肠","{dz.shen}不安床鬼祟入房","{dz.you}不会客醉坐颠狂","{dz.xu}不吃犬作怪上床","{dz.hai}不嫁娶不利新郎"],NUMBER:["{n.zero}","{n.one}","{n.two}","{n.three}","{n.four}","{n.five}","{n.six}","{n.seven}","{n.eight}","{n.nine}","{n.ten}","{n.eleven}","{n.twelve}"],MONTH:["","{m.one}","{m.two}","{m.three}","{m.four}","{m.five}","{m.six}","{m.seven}","{m.eight}","{m.nine}","{m.ten}","{m.eleven}","{m.twelve}"],SEASON:["","{od.first}{sz.chun}","{od.second}{sz.chun}","{od.third}{sz.chun}","{od.first}{sz.xia}","{od.second}{sz.xia}","{od.third}{sz.xia}","{od.first}{sz.qiu}","{od.second}{sz.qiu}","{od.third}{sz.qiu}","{od.first}{sz.dong}","{od.second}{sz.dong}","{od.third}{sz.dong}"],SHENGXIAO:["","{sx.rat}","{sx.ox}","{sx.tiger}","{sx.rabbit}","{sx.dragon}","{sx.snake}","{sx.horse}","{sx.goat}","{sx.monkey}","{sx.rooster}","{sx.dog}","{sx.pig}"],DAY:["","{d.one}","{d.two}","{d.three}","{d.four}","{d.five}","{d.six}","{d.seven}","{d.eight}","{d.nine}","{d.ten}","{d.eleven}","{d.twelve}","{d.thirteen}","{d.fourteen}","{d.fifteen}","{d.sixteen}","{d.seventeen}","{d.eighteen}","{d.nighteen}","{d.twenty}","{d.twentyOne}","{d.twentyTwo}","{d.twentyThree}","{d.twentyFour}","{d.twentyFive}","{d.twentySix}","{d.twentySeven}","{d.twentyEight}","{d.twentyNine}","{d.thirty}"],YUE_XIANG:["","{yx.shuo}","{yx.jiShuo}","{yx.eMeiXin}","{yx.eMeiXin}","{yx.eMei}","{yx.xi}","{yx.shangXian}","{yx.shangXian}","{yx.jiuYe}","{yx.night}","{yx.night}","{yx.night}","{yx.jianYingTu}","{yx.xiaoWang}","{yx.wang}","{yx.jiWang}","{yx.liDai}","{yx.juDai}","{yx.qinDai}","{yx.gengDai}","{yx.jianKuiTu}","{yx.xiaXian}","{yx.xiaXian}","{yx.youMing}","{yx.youMing}","{yx.eMeiCan}","{yx.eMeiCan}","{yx.can}","{yx.xiao}","{yx.hui}"],XIU:{"{dz.shen}1":"{xx.bi}","{dz.shen}2":"{xx.yi}","{dz.shen}3":"{xx.ji}","{dz.shen}4":"{xx.kui}","{dz.shen}5":"{xx.gui}","{dz.shen}6":"{xx.di}","{dz.shen}0":"{xx.xu}","{dz.zi}1":"{xx.bi}","{dz.zi}2":"{xx.yi}","{dz.zi}3":"{xx.ji}","{dz.zi}4":"{xx.kui}","{dz.zi}5":"{xx.gui}","{dz.zi}6":"{xx.di}","{dz.zi}0":"{xx.xu}","{dz.chen}1":"{xx.bi}","{dz.chen}2":"{xx.yi}","{dz.chen}3":"{xx.ji}","{dz.chen}4":"{xx.kui}","{dz.chen}5":"{xx.gui}","{dz.chen}6":"{xx.di}","{dz.chen}0":"{xx.xu}","{dz.si}1":"{xx.wei}","{dz.si}2":"{xx.zi}","{dz.si}3":"{xx.zhen}","{dz.si}4":"{xx.dou}","{dz.si}5":"{xx.lou}","{dz.si}6":"{xx.liu}","{dz.si}0":"{xx.fang}","{dz.you}1":"{xx.wei}","{dz.you}2":"{xx.zi}","{dz.you}3":"{xx.zhen}","{dz.you}4":"{xx.dou}","{dz.you}5":"{xx.lou}","{dz.you}6":"{xx.liu}","{dz.you}0":"{xx.fang}","{dz.chou}1":"{xx.wei}","{dz.chou}2":"{xx.zi}","{dz.chou}3":"{xx.zhen}","{dz.chou}4":"{xx.dou}","{dz.chou}5":"{xx.lou}","{dz.chou}6":"{xx.liu}","{dz.chou}0":"{xx.fang}","{dz.yin}1":"{xx.xin}","{dz.yin}2":"{xx.shi}","{dz.yin}3":"{xx.can}","{dz.yin}4":"{xx.jiao}","{dz.yin}5":"{xx.niu}","{dz.yin}6":"{xx.vei}","{dz.yin}0":"{xx.xing}","{dz.wu}1":"{xx.xin}","{dz.wu}2":"{xx.shi}","{dz.wu}3":"{xx.can}","{dz.wu}4":"{xx.jiao}","{dz.wu}5":"{xx.niu}","{dz.wu}6":"{xx.vei}","{dz.wu}0":"{xx.xing}","{dz.xu}1":"{xx.xin}","{dz.xu}2":"{xx.shi}","{dz.xu}3":"{xx.can}","{dz.xu}4":"{xx.jiao}","{dz.xu}5":"{xx.niu}","{dz.xu}6":"{xx.vei}","{dz.xu}0":"{xx.xing}","{dz.hai}1":"{xx.zhang}","{dz.hai}2":"{xx.tail}","{dz.hai}3":"{xx.qiang}","{dz.hai}4":"{xx.jing}","{dz.hai}5":"{xx.kang}","{dz.hai}6":"{xx.nv}","{dz.hai}0":"{xx.mao}","{dz.mao}1":"{xx.zhang}","{dz.mao}2":"{xx.tail}","{dz.mao}3":"{xx.qiang}","{dz.mao}4":"{xx.jing}","{dz.mao}5":"{xx.kang}","{dz.mao}6":"{xx.nv}","{dz.mao}0":"{xx.mao}","{dz.wei}1":"{xx.zhang}","{dz.wei}2":"{xx.tail}","{dz.wei}3":"{xx.qiang}","{dz.wei}4":"{xx.jing}","{dz.wei}5":"{xx.kang}","{dz.wei}6":"{xx.nv}","{dz.wei}0":"{xx.mao}"},XIU_LUCK:{"{xx.jiao}":"{s.goodLuck}","{xx.kang}":"{s.badLuck}","{xx.di}":"{s.badLuck}","{xx.fang}":"{s.goodLuck}","{xx.xin}":"{s.badLuck}","{xx.tail}":"{s.goodLuck}","{xx.ji}":"{s.goodLuck}","{xx.dou}":"{s.goodLuck}","{xx.niu}":"{s.badLuck}","{xx.nv}":"{s.badLuck}","{xx.xu}":"{s.badLuck}","{xx.wei}":"{s.badLuck}","{xx.shi}":"{s.goodLuck}","{xx.qiang}":"{s.goodLuck}","{xx.kui}":"{s.badLuck}","{xx.lou}":"{s.goodLuck}","{xx.vei}":"{s.goodLuck}","{xx.mao}":"{s.badLuck}","{xx.bi}":"{s.goodLuck}","{xx.zi}":"{s.badLuck}","{xx.can}":"{s.goodLuck}","{xx.jing}":"{s.goodLuck}","{xx.gui}":"{s.badLuck}","{xx.liu}":"{s.badLuck}","{xx.xing}":"{s.badLuck}","{xx.zhang}":"{s.goodLuck}","{xx.yi}":"{s.badLuck}","{xx.zhen}":"{s.goodLuck}"},XIU_SONG:{"{xx.jiao}":"角星造作主荣昌，外进田财及女郎，嫁娶婚姻出贵子，文人及第见君王，惟有埋葬不可用，三年之后主瘟疫，起工修筑坟基地，堂前立见主人凶。","{xx.kang}":"亢星造作长房当，十日之中主有殃，田地消磨官失职，接运定是虎狼伤，嫁娶婚姻用此日，儿孙新妇守空房，埋葬若还用此日，当时害祸主重伤。","{xx.di}":"氐星造作主灾凶，费尽田园仓库空，埋葬不可用此日，悬绳吊颈祸重重，若是婚姻离别散，夜招浪子入房中，行船必定遭沉没，更生聋哑子孙穷。","{xx.fang}":"房星造作田园进，钱财牛马遍山岗，更招外处田庄宅，荣华富贵福禄康，埋葬若然用此日，高官进职拜君王，嫁娶嫦娥至月殿，三年抱子至朝堂。","{xx.xin}":"心星造作大为凶，更遭刑讼狱囚中，忤逆官非宅产退，埋葬卒暴死相从，婚姻若是用此日，子死儿亡泪满胸，三年之内连遭祸，事事教君没始终。","{xx.tail}":"尾星造作主天恩，富贵荣华福禄增，招财进宝兴家宅，和合婚姻贵子孙，埋葬若能依此日，男清女正子孙兴，开门放水招田宅，代代公侯远播名。","{xx.ji}":"箕星造作主高强，岁岁年年大吉昌，埋葬修坟大吉利，田蚕牛马遍山岗，开门放水招田宅，箧满金银谷满仓，福荫高官加禄位，六亲丰禄乐安康。","{xx.dou}":"斗星造作主招财，文武官员位鼎台，田宅家财千万进，坟堂修筑贵富来，开门放水招牛马，旺蚕男女主和谐，遇此吉宿来照护，时支福庆永无灾。","{xx.niu}":"牛星造作主灾危，九横三灾不可推，家宅不安人口退，田蚕不利主人衰，嫁娶婚姻皆自损，金银财谷渐无之，若是开门并放水，牛猪羊马亦伤悲。","{xx.nv}":"女星造作损婆娘，兄弟相嫌似虎狼，埋葬生灾逢鬼怪，颠邪疾病主瘟惶，为事遭官财失散，泻利留连不可当，开门放水用此日，全家财散主离乡。","{xx.xu}":"虚星造作主灾殃，男女孤眠不一双，内乱风声无礼节，儿孙媳妇伴人床，开门放水遭灾祸，虎咬蛇伤又卒亡，三三五五连年病，家破人亡不可当。","{xx.wei}":"危星不可造高楼，自遭刑吊见血光，三年孩子遭水厄，后生出外永不还，埋葬若还逢此日，周年百日取高堂，三年两载一悲伤，开门放水到官堂。","{xx.shi}":"室星修造进田牛，儿孙代代近王侯，家贵荣华天上至，寿如彭祖八千秋，开门放水招财帛，和合婚姻生贵儿，埋葬若能依此日，门庭兴旺福无休。","{xx.qiang}":"壁星造作主增财，丝蚕大熟福滔天，奴婢自来人口进，开门放水出英贤，埋葬招财官品进，家中诸事乐陶然，婚姻吉利主贵子，早播名誉著祖鞭。","{xx.kui}":"奎星造作得祯祥，家内荣和大吉昌，若是埋葬阴卒死，当年定主两三伤，看看军令刑伤到，重重官事主瘟惶，开门放水遭灾祸，三年两次损儿郎。","{xx.lou}":"娄星修造起门庭，财旺家和事事兴，外进钱财百日进，一家兄弟播高名，婚姻进益生贵子，玉帛金银箱满盈，放水开门皆吉利，男荣女贵寿康宁。","{xx.vei}":"胃星造作事如何，家贵荣华喜气多，埋葬贵临官禄位，夫妇齐眉永保康，婚姻遇此家富贵，三灾九祸不逢他，从此门前多吉庆，儿孙代代拜金阶。","{xx.mao}":"昴星造作进田牛，埋葬官灾不得休，重丧二日三人死，尽卖田园不记增，开门放水招灾祸，三岁孩儿白了头，婚姻不可逢此日，死别生离是可愁。","{xx.bi}":"毕星造作主光前，买得田园有余钱，埋葬此日添官职，田蚕大熟永丰年，开门放水多吉庆，合家人口得安然，婚姻若得逢此日，生得孩儿福寿全。","{xx.zi}":"觜星造作有徒刑，三年必定主伶丁，埋葬卒死多因此，取定寅年使杀人，三丧不止皆由此，一人药毒二人身，家门田地皆退败，仓库金银化作尘。","{xx.can}":"参星造作旺人家，文星照耀大光华，只因造作田财旺，埋葬招疾哭黄沙，开门放水加官职，房房子孙见田加，婚姻许遁遭刑克，男女朝开幕落花。","{xx.jing}":"井星造作旺蚕田，金榜题名第一光，埋葬须防惊卒死，狂颠风疾入黄泉，开门放水招财帛，牛马猪羊旺莫言，贵人田塘来入宅，儿孙兴旺有余钱。","{xx.gui}":"鬼星起造卒人亡，堂前不见主人郎，埋葬此日官禄至，儿孙代代近君王，开门放水须伤死，嫁娶夫妻不久长，修土筑墙伤产女，手扶双女泪汪汪。","{xx.liu}":"柳星造作主遭官，昼夜偷闭不暂安，埋葬瘟惶多疾病，田园退尽守冬寒，开门放水遭聋瞎，腰驼背曲似弓弯，更有棒刑宜谨慎，妇人随客走盘桓。","{xx.xing}":"星宿日好造新房，进职加官近帝王，不可埋葬并放水，凶星临位女人亡，生离死别无心恋，要自归休别嫁郎，孔子九曲殊难度，放水开门天命伤。","{xx.zhang}":"张星日好造龙轩，年年并见进庄田，埋葬不久升官职，代代为官近帝前，开门放水招财帛，婚姻和合福绵绵，田蚕人满仓库满，百般顺意自安然。","{xx.yi}":"翼星不利架高堂，三年二载见瘟惶，埋葬若还逢此日，子孙必定走他乡，婚姻此日不宜利，归家定是不相当，开门放水家须破，少女恋花贪外郎。","{xx.zhen}":"轸星临水造龙宫，代代为官受皇封，富贵荣华增寿禄，库满仓盈自昌隆，埋葬文昌来照助，宅舍安宁不见凶，更有为官沾帝宠，婚姻龙子入龙宫。"},ZHENG:{"{xx.jiao}":"{wx.mu}","{xx.jing}":"{wx.mu}","{xx.kui}":"{wx.mu}","{xx.dou}":"{wx.mu}","{xx.kang}":"{wx.jin}","{xx.gui}":"{wx.jin}","{xx.lou}":"{wx.jin}","{xx.niu}":"{wx.jin}","{xx.di}":"{wx.tu}","{xx.liu}":"{wx.tu}","{xx.vei}":"{wx.tu}","{xx.nv}":"{wx.tu}","{xx.fang}":"{wx.ri}","{xx.xing}":"{wx.ri}","{xx.mao}":"{wx.ri}","{xx.xu}":"{wx.ri}","{xx.xin}":"{wx.yue}","{xx.zhang}":"{wx.yue}","{xx.bi}":"{wx.yue}","{xx.wei}":"{wx.yue}","{xx.tail}":"{wx.huo}","{xx.yi}":"{wx.huo}","{xx.zi}":"{wx.huo}","{xx.shi}":"{wx.huo}","{xx.ji}":"{wx.shui}","{xx.zhen}":"{wx.shui}","{xx.can}":"{wx.shui}","{xx.qiang}":"{wx.shui}"},ANIMAL:{"{xx.jiao}":"{dw.jiao}","{xx.dou}":"{dw.xie}","{xx.kui}":"{dw.lang}","{xx.jing}":"{dw.han}","{xx.kang}":"{dw.long}","{xx.niu}":"{dw.niu}","{xx.lou}":"{dw.gou}","{xx.gui}":"{dw.yang}","{xx.nv}":"{dw.fu}","{xx.di}":"{dw.he}","{xx.vei}":"{dw.zhi}","{xx.liu}":"{dw.zhang}","{xx.fang}":"{dw.tu}","{xx.xu}":"{dw.shu}","{xx.mao}":"{dw.ji}","{xx.xing}":"{dw.ma}","{xx.xin}":"{dw.huLi}","{xx.wei}":"{dw.yan}","{xx.bi}":"{dw.wu}","{xx.zhang}":"{dw.lu}","{xx.tail}":"{dw.hu}","{xx.shi}":"{dw.zhu}","{xx.zi}":"{dw.hou}","{xx.yi}":"{dw.she}","{xx.ji}":"{dw.bao}","{xx.qiang}":"{dw.xu}","{xx.can}":"{dw.yuan}","{xx.zhen}":"{dw.yin}"},GONG:{"{xx.jiao}":"{ps.dong}","{xx.jing}":"{ps.nan}","{xx.kui}":"{ps.xi}","{xx.dou}":"{ps.bei}","{xx.kang}":"{ps.dong}","{xx.gui}":"{ps.nan}","{xx.lou}":"{ps.xi}","{xx.niu}":"{ps.bei}","{xx.di}":"{ps.dong}","{xx.liu}":"{ps.nan}","{xx.vei}":"{ps.xi}","{xx.nv}":"{ps.bei}","{xx.fang}":"{ps.dong}","{xx.xing}":"{ps.nan}","{xx.mao}":"{ps.xi}","{xx.xu}":"{ps.bei}","{xx.xin}":"{ps.dong}","{xx.zhang}":"{ps.nan}","{xx.bi}":"{ps.xi}","{xx.wei}":"{ps.bei}","{xx.tail}":"{ps.dong}","{xx.yi}":"{ps.nan}","{xx.zi}":"{ps.xi}","{xx.shi}":"{ps.bei}","{xx.ji}":"{ps.dong}","{xx.zhen}":"{ps.nan}","{xx.can}":"{ps.xi}","{xx.qiang}":"{ps.bei}"},SHOU:{"{ps.dong}":"{sn.qingLong}","{ps.nan}":"{sn.zhuQue}","{ps.xi}":"{sn.baiHu}","{ps.bei}":"{sn.xuanWu}"},FESTIVAL:{"1-1":"{jr.chunJie}","1-15":"{jr.yuanXiao}","2-2":"{jr.longTou}","5-5":"{jr.duanWu}","7-7":"{jr.qiXi}","8-15":"{jr.zhongQiu}","9-9":"{jr.chongYang}","12-8":"{jr.laBa}"},OTHER_FESTIVAL:{"1-4":["接神日"],"1-5":["隔开日"],"1-7":["人日"],"1-8":["谷日","顺星节"],"1-9":["天日"],"1-10":["地日"],"1-20":["天穿节"],"1-25":["填仓节"],"1-30":["正月晦"],"2-1":["中和节"],"2-2":["社日节"],"3-3":["上巳节"],"5-20":["分龙节"],"5-25":["会龙节"],"6-6":["天贶节"],"6-24":["观莲节"],"6-25":["五谷母节"],"7-15":["中元节"],"7-22":["财神节"],"7-29":["地藏节"],"8-1":["天灸日"],"10-1":["寒衣节"],"10-10":["十成节"],"10-15":["下元节"],"12-7":["驱傩日"],"12-16":["尾牙"],"12-24":["祭灶日"]},CHONG:["{dz.wu}","{dz.wei}","{dz.shen}","{dz.you}","{dz.xu}","{dz.hai}","{dz.zi}","{dz.chou}","{dz.yin}","{dz.mao}","{dz.chen}","{dz.si}"],CHONG_GAN:["{tg.wu}","{tg.ji}","{tg.geng}","{tg.xin}","{tg.ren}","{tg.gui}","{tg.jia}","{tg.yi}","{tg.bing}","{tg.ding}"],CHONG_GAN_TIE:["{tg.ji}","{tg.wu}","{tg.xin}","{tg.geng}","{tg.gui}","{tg.ren}","{tg.yi}","{tg.jia}","{tg.ding}","{tg.bing}"],CHONG_GAN_4:["{tg.geng}","{tg.xin}","{tg.ren}","{tg.gui}","","","{tg.jia}","{tg.yi}","{tg.bing}","{tg.ding}"],HE_GAN_5:["{tg.ji}","{tg.geng}","{tg.xin}","{tg.ren}","{tg.gui}","{tg.jia}","{tg.yi}","{tg.bing}","{tg.ding}","{tg.wu}"],HE_ZHI_6:["{dz.chou}","{dz.zi}","{dz.hai}","{dz.xu}","{dz.you}","{dz.shen}","{dz.wei}","{dz.wu}","{dz.si}","{dz.chen}","{dz.mao}","{dz.yin}"],SHA:{"{dz.zi}":"{ps.nan}","{dz.chou}":"{ps.dong}","{dz.yin}":"{ps.bei}","{dz.mao}":"{ps.xi}","{dz.chen}":"{ps.nan}","{dz.si}":"{ps.dong}","{dz.wu}":"{ps.bei}","{dz.wei}":"{ps.xi}","{dz.shen}":"{ps.nan}","{dz.you}":"{ps.dong}","{dz.xu}":"{ps.bei}","{dz.hai}":"{ps.xi}"},POSITION_DESC:{"{bg.kan}":"{ps.zhengBei}","{bg.gen}":"{ps.dongBei}","{bg.zhen}":"{ps.zhengDong}","{bg.xun}":"{ps.dongNan}","{bg.li}":"{ps.zhengNan}","{bg.kun}":"{ps.xiNan}","{bg.dui}":"{ps.zhengXi}","{bg.qian}":"{ps.xiBei}","{ps.center}":"{ps.zhong}"},NAYIN:{"{jz.jiaZi}":"{ny.haiZhong}{wx.jin}","{jz.jiaWu}":"{ny.shaZhong}{wx.jin}","{jz.bingYin}":"{ny.luZhong}{wx.huo}","{jz.bingShen}":"{ny.shanXia}{wx.huo}","{jz.wuChen}":"{ny.daLin}{wx.mu}","{jz.wuXu}":"{ny.pingDi}{wx.mu}","{jz.gengWu}":"{ny.luPang}{wx.tu}","{jz.gengZi}":"{ny.biShang}{wx.tu}","{jz.renShen}":"{ny.jianFeng}{wx.jin}","{jz.renYin}":"{ny.jinBo}{wx.jin}","{jz.jiaXu}":"{ny.shanTou}{wx.huo}","{jz.jiaChen}":"{ny.fuDeng}{wx.huo}","{jz.bingZi}":"{ny.jianXia}{wx.shui}","{jz.bingWu}":"{ny.tianHe}{wx.shui}","{jz.wuYin}":"{ny.chengTou}{wx.tu}","{jz.wuShen}":"{ny.daYi}{wx.tu}","{jz.gengChen}":"{ny.baiLa}{wx.jin}","{jz.gengXu}":"{ny.chaiChuan}{wx.jin}","{jz.renWu}":"{ny.yangLiu}{wx.mu}","{jz.renZi}":"{ny.sangZhe}{wx.mu}","{jz.jiaShen}":"{ny.quanZhong}{wx.shui}","{jz.jiaYin}":"{ny.daXi}{wx.shui}","{jz.bingXu}":"{ny.wuShang}{wx.tu}","{jz.bingChen}":"{ny.shaZhong}{wx.tu}","{jz.wuZi}":"{ny.piLi}{wx.huo}","{jz.wuWu}":"{ny.tianShang}{wx.huo}","{jz.gengYin}":"{ny.songBo}{wx.mu}","{jz.gengShen}":"{ny.shiLiu}{wx.mu}","{jz.renChen}":"{ny.changLiu}{wx.shui}","{jz.renXu}":"{ny.daHai}{wx.shui}","{jz.yiChou}":"{ny.haiZhong}{wx.jin}","{jz.yiWei}":"{ny.shaZhong}{wx.jin}","{jz.dingMao}":"{ny.luZhong}{wx.huo}","{jz.dingYou}":"{ny.shanXia}{wx.huo}","{jz.jiSi}":"{ny.daLin}{wx.mu}","{jz.jiHai}":"{ny.pingDi}{wx.mu}","{jz.xinWei}":"{ny.luPang}{wx.tu}","{jz.xinChou}":"{ny.biShang}{wx.tu}","{jz.guiYou}":"{ny.jianFeng}{wx.jin}","{jz.guiMao}":"{ny.jinBo}{wx.jin}","{jz.yiHai}":"{ny.shanTou}{wx.huo}","{jz.yiSi}":"{ny.fuDeng}{wx.huo}","{jz.dingChou}":"{ny.jianXia}{wx.shui}","{jz.dingWei}":"{ny.tianHe}{wx.shui}","{jz.jiMao}":"{ny.chengTou}{wx.tu}","{jz.jiYou}":"{ny.daYi}{wx.tu}","{jz.xinSi}":"{ny.baiLa}{wx.jin}","{jz.xinHai}":"{ny.chaiChuan}{wx.jin}","{jz.guiWei}":"{ny.yangLiu}{wx.mu}","{jz.guiChou}":"{ny.sangZhe}{wx.mu}","{jz.yiYou}":"{ny.quanZhong}{wx.shui}","{jz.yiMao}":"{ny.daXi}{wx.shui}","{jz.dingHai}":"{ny.wuShang}{wx.tu}","{jz.dingSi}":"{ny.shaZhong}{wx.tu}","{jz.jiChou}":"{ny.piLi}{wx.huo}","{jz.jiWei}":"{ny.tianShang}{wx.huo}","{jz.xinMao}":"{ny.songBo}{wx.mu}","{jz.xinYou}":"{ny.shiLiu}{wx.mu}","{jz.guiSi}":"{ny.changLiu}{wx.shui}","{jz.guiHai}":"{ny.daHai}{wx.shui}"},WU_XING_GAN:{"{tg.jia}":"{wx.mu}","{tg.yi}":"{wx.mu}","{tg.bing}":"{wx.huo}","{tg.ding}":"{wx.huo}","{tg.wu}":"{wx.tu}","{tg.ji}":"{wx.tu}","{tg.geng}":"{wx.jin}","{tg.xin}":"{wx.jin}","{tg.ren}":"{wx.shui}","{tg.gui}":"{wx.shui}"},WU_XING_ZHI:{"{dz.yin}":"{wx.mu}","{dz.mao}":"{wx.mu}","{dz.si}":"{wx.huo}","{dz.wu}":"{wx.huo}","{dz.chen}":"{wx.tu}","{dz.chou}":"{wx.tu}","{dz.xu}":"{wx.tu}","{dz.wei}":"{wx.tu}","{dz.shen}":"{wx.jin}","{dz.you}":"{wx.jin}","{dz.hai}":"{wx.shui}","{dz.zi}":"{wx.shui}"},SHI_SHEN:{"{tg.jia}{tg.jia}":"{ss.biJian}","{tg.jia}{tg.yi}":"{ss.jieCai}","{tg.jia}{tg.bing}":"{ss.shiShen}","{tg.jia}{tg.ding}":"{ss.shangGuan}","{tg.jia}{tg.wu}":"{ss.pianCai}","{tg.jia}{tg.ji}":"{ss.zhengCai}","{tg.jia}{tg.geng}":"{ss.qiSha}","{tg.jia}{tg.xin}":"{ss.zhengGuan}","{tg.jia}{tg.ren}":"{ss.pianYin}","{tg.jia}{tg.gui}":"{ss.zhengYin}","{tg.yi}{tg.yi}":"{ss.biJian}","{tg.yi}{tg.jia}":"{ss.jieCai}","{tg.yi}{tg.ding}":"{ss.shiShen}","{tg.yi}{tg.bing}":"{ss.shangGuan}","{tg.yi}{tg.ji}":"{ss.pianCai}","{tg.yi}{tg.wu}":"{ss.zhengCai}","{tg.yi}{tg.xin}":"{ss.qiSha}","{tg.yi}{tg.geng}":"{ss.zhengGuan}","{tg.yi}{tg.gui}":"{ss.pianYin}","{tg.yi}{tg.ren}":"{ss.zhengYin}","{tg.bing}{tg.bing}":"{ss.biJian}","{tg.bing}{tg.ding}":"{ss.jieCai}","{tg.bing}{tg.wu}":"{ss.shiShen}","{tg.bing}{tg.ji}":"{ss.shangGuan}","{tg.bing}{tg.geng}":"{ss.pianCai}","{tg.bing}{tg.xin}":"{ss.zhengCai}","{tg.bing}{tg.ren}":"{ss.qiSha}","{tg.bing}{tg.gui}":"{ss.zhengGuan}","{tg.bing}{tg.jia}":"{ss.pianYin}","{tg.bing}{tg.yi}":"{ss.zhengYin}","{tg.ding}{tg.ding}":"{ss.biJian}","{tg.ding}{tg.bing}":"{ss.jieCai}","{tg.ding}{tg.ji}":"{ss.shiShen}","{tg.ding}{tg.wu}":"{ss.shangGuan}","{tg.ding}{tg.xin}":"{ss.pianCai}","{tg.ding}{tg.geng}":"{ss.zhengCai}","{tg.ding}{tg.gui}":"{ss.qiSha}","{tg.ding}{tg.ren}":"{ss.zhengGuan}","{tg.ding}{tg.yi}":"{ss.pianYin}","{tg.ding}{tg.jia}":"{ss.zhengYin}","{tg.wu}{tg.wu}":"{ss.biJian}","{tg.wu}{tg.ji}":"{ss.jieCai}","{tg.wu}{tg.geng}":"{ss.shiShen}","{tg.wu}{tg.xin}":"{ss.shangGuan}","{tg.wu}{tg.ren}":"{ss.pianCai}","{tg.wu}{tg.gui}":"{ss.zhengCai}","{tg.wu}{tg.jia}":"{ss.qiSha}","{tg.wu}{tg.yi}":"{ss.zhengGuan}","{tg.wu}{tg.bing}":"{ss.pianYin}","{tg.wu}{tg.ding}":"{ss.zhengYin}","{tg.ji}{tg.ji}":"{ss.biJian}","{tg.ji}{tg.wu}":"{ss.jieCai}","{tg.ji}{tg.xin}":"{ss.shiShen}","{tg.ji}{tg.geng}":"{ss.shangGuan}","{tg.ji}{tg.gui}":"{ss.pianCai}","{tg.ji}{tg.ren}":"{ss.zhengCai}","{tg.ji}{tg.yi}":"{ss.qiSha}","{tg.ji}{tg.jia}":"{ss.zhengGuan}","{tg.ji}{tg.ding}":"{ss.pianYin}","{tg.ji}{tg.bing}":"{ss.zhengYin}","{tg.geng}{tg.geng}":"{ss.biJian}","{tg.geng}{tg.xin}":"{ss.jieCai}","{tg.geng}{tg.ren}":"{ss.shiShen}","{tg.geng}{tg.gui}":"{ss.shangGuan}","{tg.geng}{tg.jia}":"{ss.pianCai}","{tg.geng}{tg.yi}":"{ss.zhengCai}","{tg.geng}{tg.bing}":"{ss.qiSha}","{tg.geng}{tg.ding}":"{ss.zhengGuan}","{tg.geng}{tg.wu}":"{ss.pianYin}","{tg.geng}{tg.ji}":"{ss.zhengYin}","{tg.xin}{tg.xin}":"{ss.biJian}","{tg.xin}{tg.geng}":"{ss.jieCai}","{tg.xin}{tg.gui}":"{ss.shiShen}","{tg.xin}{tg.ren}":"{ss.shangGuan}","{tg.xin}{tg.yi}":"{ss.pianCai}","{tg.xin}{tg.jia}":"{ss.zhengCai}","{tg.xin}{tg.ding}":"{ss.qiSha}","{tg.xin}{tg.bing}":"{ss.zhengGuan}","{tg.xin}{tg.ji}":"{ss.pianYin}","{tg.xin}{tg.wu}":"{ss.zhengYin}","{tg.ren}{tg.ren}":"{ss.biJian}","{tg.ren}{tg.gui}":"{ss.jieCai}","{tg.ren}{tg.jia}":"{ss.shiShen}","{tg.ren}{tg.yi}":"{ss.shangGuan}","{tg.ren}{tg.bing}":"{ss.pianCai}","{tg.ren}{tg.ding}":"{ss.zhengCai}","{tg.ren}{tg.wu}":"{ss.qiSha}","{tg.ren}{tg.ji}":"{ss.zhengGuan}","{tg.ren}{tg.geng}":"{ss.pianYin}","{tg.ren}{tg.xin}":"{ss.zhengYin}","{tg.gui}{tg.gui}":"{ss.biJian}","{tg.gui}{tg.ren}":"{ss.jieCai}","{tg.gui}{tg.yi}":"{ss.shiShen}","{tg.gui}{tg.jia}":"{ss.shangGuan}","{tg.gui}{tg.ding}":"{ss.pianCai}","{tg.gui}{tg.bing}":"{ss.zhengCai}","{tg.gui}{tg.ji}":"{ss.qiSha}","{tg.gui}{tg.wu}":"{ss.zhengGuan}","{tg.gui}{tg.xin}":"{ss.pianYin}","{tg.gui}{tg.geng}":"{ss.zhengYin}"},ZHI_HIDE_GAN:{"{dz.zi}":["{tg.gui}"],"{dz.chou}":["{tg.ji}","{tg.gui}","{tg.xin}"],"{dz.yin}":["{tg.jia}","{tg.bing}","{tg.wu}"],"{dz.mao}":["{tg.yi}"],"{dz.chen}":["{tg.wu}","{tg.yi}","{tg.gui}"],"{dz.si}":["{tg.bing}","{tg.geng}","{tg.wu}"],"{dz.wu}":["{tg.ding}","{tg.ji}"],"{dz.wei}":["{tg.ji}","{tg.ding}","{tg.yi}"],"{dz.shen}":["{tg.geng}","{tg.ren}","{tg.wu}"],"{dz.you}":["{tg.xin}"],"{dz.xu}":["{tg.wu}","{tg.xin}","{tg.ding}"],"{dz.hai}":["{tg.ren}","{tg.jia}"]},YI_JI:["{yj.jiSi}","{yj.qiFu}","{yj.qiuSi}","{yj.kaiGuang}","{yj.suHui}","{yj.qiJiao}","{yj.zhaiJiao}","{yj.muYu}","{yj.chouShen}","{yj.zaoMiao}","{yj.siZhao}","{yj.fenXiang}","{yj.xieTu}","{yj.chuHuo}","{yj.diaoKe}","{yj.jiaQu}","{yj.DingHun}","{yj.naCai}","{yj.wenMing}","{yj.naXu}","{yj.guiNing}","{yj.anChuang}","{yj.heZhang}","{yj.guanJi}","{yj.dingMeng}","{yj.jinRenKou}","{yj.caiYi}","{yj.wanMian}","{yj.kaiRong}","{yj.xiuFen}","{yj.qiZuan}","{yj.poTu}","{yj.anZang}","{yj.liBei}","{yj.chengFu}","{yj.chuFu}","{yj.kaiShengFen}","{yj.heShouMu}","{yj.ruLian}","{yj.yiJiu}","{yj.puDu}","{yj.ruZhai}","{yj.anXiang}","{yj.anMen}","{yj.xiuZao}","{yj.qiJi}","{yj.dongTu}","{yj.shangLiang}","{yj.shuZhu}","{yj.kaiJing}","{yj.zuoBei}","{yj.chaiXie}","{yj.poWu}","{yj.huaiYuan}","{yj.buYuan}","{yj.faMuZuoLiang}","{yj.zuoZhao}","{yj.jieChu}","{yj.kaiZhuYan}","{yj.chuanPing}","{yj.gaiWuHeJi}","{yj.kaiCe}","{yj.zaoCang}","{yj.saiXue}","{yj.pingZhi}","{yj.zaoQiao}","{yj.zuoCe}","{yj.zhuDi}","{yj.kaiChi}","{yj.faMu}","{yj.kaiQu}","{yj.jueJing}","{yj.saoShe}","{yj.fangShui}","{yj.zaoWu}","{yj.heJi}","{yj.zaoChuChou}","{yj.xiuMen}","{yj.dingSang}","{yj.zuoLiang}","{yj.xiuShi}","{yj.jiaMa}","{yj.kaiShi}","{yj.guaBian}","{yj.naChai}","{yj.qiuCai}","{yj.kaiCang}","{yj.maiChe}","{yj.zhiChan}","{yj.guYong}","{yj.chuHuoCai}","{yj.anJiXie}","{yj.zaoCheQi}","{yj.jingLuo}","{yj.yunNiang}","{yj.zuoRan}","{yj.guZhu}","{yj.zaoChuan}","{yj.geMi}","{yj.zaiZhong}","{yj.quYu}","{yj.jieWang}","{yj.muYang}","{yj.anDuiWei}","{yj.xiYi}","{yj.ruXue}","{yj.liFa}","{yj.tanBing}","{yj.jianGui}","{yj.chengChuan}","{yj.duShui}","{yj.zhenJiu}","{yj.chuXing}","{yj.yiXi}","{yj.fenJu}","{yj.TiTou}","{yj.zhengShou}","{yj.naChu}","{yj.buZhuo}","{yj.tianLie}","{yj.jiaoNiuMa}","{yj.huiQinYou}","{yj.fuRen}","{yj.qiuYi}","{yj.zhiBing}","{yj.ciSong}","{yj.qiJiDongTu}","{yj.poWuHuaiYuan}","{yj.gaiWu}","{yj.zaoCangKu}","{yj.liQuanJiaoYi}","{yj.jiaoYi}","{yj.liQuan}","{yj.anJi}","{yj.huiYou}","{yj.qiuYiLiaoBing}","{yj.zhuShi}","{yj.yuShi}","{yj.xingSang}","{yj.duanYi}","{yj.guiXiu}","{s.none}"],LU:{"{tg.jia}":"{dz.yin}","{tg.yi}":"{dz.mao}","{tg.bing}":"{dz.si}","{tg.ding}":"{dz.wu}","{tg.wu}":"{dz.si}","{tg.ji}":"{dz.wu}","{tg.geng}":"{dz.shen}","{tg.xin}":"{dz.you}","{tg.ren}":"{dz.hai}","{tg.gui}":"{dz.zi}","{dz.yin}":"{tg.jia}","{dz.mao}":"{tg.yi}","{dz.si}":"{tg.bing},{tg.wu}","{dz.wu}":"{tg.ding},{tg.ji}","{dz.shen}":"{tg.geng}","{dz.you}":"{tg.xin}","{dz.hai}":"{tg.ren}","{dz.zi}":"{tg.gui}"},DAY_YI_JI:"30=192531010D:838454151A4C200C1E23221D212726,030F522E1F00=2430000C18:8319000776262322200C1E1D,06292C2E1F04=32020E1A26:7917155B0001025D,0F522E38201D=162E3A0A22:790F181113332C2E2D302F1554,7001203810=0E1A263202:79026A17657603,522E201F05=0D19250131:7911192C2E302F00030401060F1571292A75,707C20522F=0C18243000:4F2C2E2B383F443D433663,0F01478A20151D=0E1A320226:3840,0001202B892F=14202C3808:3807504089,8829=0E1A263202:383940,6370018A75202B454F6605=32020E1A26:38394089,0001202B22=16223A0A2E:384C,8A2020=2B3707131F:2C2E5B000739337C38802D44484C2425201F1E272621,5229701535=121E2A3606:2C2E2D2B156343364C,0F4729710D708A20036A1904=0D19250131:5040262789,0F7129033B=202C380814:5040000738,0F7D7C584F012063452B35=1A2632020E:50400089,8813=1A2632020E:69687011180F791966762627201E,0352292E8034=182430000C:291503000D332E53261F2075,0F5238584F450B=000C182430:297170192C2E2D2F2B3E363F4C,0F521563200103470B=131F2B3707:297115030102195283840D332C2E,0F1F5863201D8A02=222E3A0A16:261F1E20232289,52290058363F32=16222E3A0A:261F201E232289,8D39=0D19310125:262322271E201D21,52450F4F09=0D19253101:262322271E202189,1F4526=16222E3A0A:262322271F1E20,712906=0F1B273303:17262322274050,80387C6B2C=0915212D39:1707702C2E71291F20,0F52000106111D15=16222E3A0A:170007386A7448363F261F1E,030F79636F2026=030F1B2733:1784832C2E5B26201F,0F010D2913=182430000C:175447440D15838477656A49,2B2E1F8A202228=101C283404:70504C7889,8803=0D19250131:700F181126151E20001A7919,8D2F=0915212D39:705283845B0D2F71,0F202E4106=3606121E2A:70786289,06802E1F23=1824000C30:70076A363F,292017=202C380814:700718111A302F717566,0F2B2E2026=3B0B17232F:70545283842E71291A7933192A5D5A5040,090C384F45208A1D6B38=212D390915:7039170F45513A2C2E7129242526271F201D,00010352153A=15212D3909:703911170E2C2E2D2F4B15712952633D,092B8A2027=010D192531:702D155483840F63262720,53292F017D4F38442B2E1F4717=16222E3A0A:705C4C39171A4F0E7971295B5248,0F2E1F1D37=1A2632020E:2E260F27201F,523815292F1A22=0E1A260232:64262322271F2021,0F2F293822=2F3B0B1723:161A0F1526271F4C,586103473818=2430000C18:161A7889,292E1F0F386131=17232F3B0B:04795B3F651A5D,0F5201062016=14202C3808:04170F79195D1A637566363F76,01522E8A2039=132B37071F:0470170F191A134C8384662426232227201E,8D08=0D19253101:040370181123220F1326271E2021,29153B=0D19310125:040307177938494C,0F26207017=0E2632021A:0403010218111A17332C2E2D2B15713E6575,45382064291D=142C380820:04033918110F0D2C2E7129332D2B72528384547566,8D1C=1830000C24:040318111A17332C15290D200C7A,4745063835=0F2733031B:040318111A16175B795452848315302F6563395D,387029202E=14202C3808:04031975363F6366,0F5401202C5283842E2F1E=0E1A320226:0403080618111A16332E2F152A09537919702C5445490D75072B,8063203820=182430000C:04067033392C7161262322271E1D210C,8D2F=101C283404:3F4889,881C=2733030F1B:3F74397677658988,0F3847201D=293505111D:3F8B657789,0F2029702E7D35=111D293505:3F8B6589,1F200A=020E1A2632:3F656477,0F2B71292005=111D290535:3F6589,8810=0F1B273303:3F88,2B38200F1C=293505111D:0F83843D363F776424,15462F2C520329712A=0F1B273303:0F17795B54838458,52807C3811=121E2A3606:0F172C2E387129363F7566512D4E4461,01034752203A=172F3B0B23:0F171511793F76584C,0347200C1D20=2D39091521:0F175B3975660745514F2B4825201E211D,010352292E2E=0F1B273303:0F170070792C2E261F,040341232228=05111D2935:0F1700707129385C363F3D1F1E232226,80412B202F14=14202C3808:0F17000728705448757A,522E1F15562F05=30000C1824:0F17000102061979454F3A15477677,241F8A2021=2F3B0B1723:0F17000102060370392E52838453331F,452F2C266A79292B203810=0C18243000:0F170001020E032A70692C2E302F802D2B0D7129474C201F2322,5211183809615D34=1A2632020E:0F171170792F5B1566770001032C2B802D,29387C207134=14202C3808:0F0D33000103452E528384297115752620,63386F7014=15212D3909:0F7045332C2E71201F1D21,4701155229530327=101C283404:0F70161715232238838426271F20,7D035219=121E2A3606:0F705B0004037C5D15653F1F26,522B473809=131F2B0737:0F705215261E20,012E1F25=182430000C:0F707B7C00012F75,52201B=2531010D19:0F706A151E201D528384544466,47010C2E292F2C3820=14202C3808:0F707500261E20,382E1F05=3606121E2A:0F161A17452F0D33712C2E2B5443633F,150170208A0327=0E1A263202:0F150370002E0D3979528384532971331F1E20,477D0D=06121E2A36:0F5B8370000102060403161A494447,386A418A201A=17232F3B0B:0F03700D332C2E2971152F52838463,01004547380C26=101C283404:0F03700D33195284835329711563,01260038206B0E=131F2B3707:0F03706A4F0D332C528384532E29711563,4500750F=131F2B3707:0F0370010239332E2C19528384532971156375262720,8D18=17232F3B0B:0F0370390D332C192E2971637547202322,581528=0E1A263202:0F0302791566046F,29710D722A38528384202E4530=0E1A263202:0F030102392E15634447001F1E,293845200D707538=1E2A360612:0F0300017039712952542D2C302F80380D2A363F3349483E616320,1118150C1F2E20=33030F1B27:0F03000102700D29713963451F0C20,528338542F15806128=121E2A3606:0F030001027039452971150D332C2F6327,2052838403=2C38081420:0F030001022A0D3945297115528384637020,476A382E1F4426=010D192531:0F03390D332C1929711563261D2E2322,382000521118750C706B15=131F2B3707:0F033915666A52261E272048,382E2F6329712C0114=0D19253101:0F52838403700D332C29712E1F27201E2322,1545017505=131F2B3707:0F528400012E7129,092026=3707131F2B:0F528471295B795D2B155333565A446375661F201E272621,00016B0C4113=14202C3808:0F280001363F8B4326232220,2E1F47032F7D35=16222E3A0A:0F0211195465756679,2F384570202B6A10=15212D3909:0F0102700D332C2E2F0319528384531529716345261F2322,8D32=101C283404:0F0102037039330D5284832971152E1F0C,0026206B37=16222E3A0A:0F003854,20521D2106=020E1A2632:0F00175058,5D6B80382E16=1B2733030F:0F00701784831952712C2E1526271F,033806201F=2B3707131F:0F00701A17830E544C5C78,7129632E1F38208A452F16=15212D3909:0F00040370396A742E15444948,458A384F2021=16222E3A0A:0F005B261F20,2E2F1D=2531010D19:0F0003450D3329712C2E2F1575,528A63705A20587D7C12=17232F3B0B:0F00030D70332C2E3952838453542971156375,6B2019=1B2733030F:0F000301020D297115332E1F0C,165220262E=121E2A3606:0F00030102700D332E2C192971155383846375261F1E20,8D1F=33030F1B27:0F00030102700D19297115332C2B535448,2E45208A00=2632020E1A:0F00030102705283842E544779,2920454F754C3836=16222E3A0A:0F0052037029710D332C15,7545584F8A201D2121=121E2A3606:0F00074850,8A2036=0D25310119:0F00071A706A717677492923221E202726,80522E1F39=1E2A360612:0F006A385040740717,1F70631E=212D390915:0F006A1938271779,565A4575522F801F1E632B=121E2A3606:0F00010D0302703352838453297115632E,208A454F2B=0E1A263202:0F000170390D332E2971152F63751F1E20,52846A381F=14202C3808:0F000106387129,2E1F24=14202C3808:0F0001062E7129,522010=0814202C38:0F0001062871292E7C528384032C5C2A15767765,11185D8A206B08=131F2B0737:0F0001067C1F20,522900=202C380814:0F0001020D700339332C192A83842971152E1F0C20262322,065256386110=111D293505:0F000102700D332C2E297115383F631F20,0347562B=14202C3808:0F000102700D332C712E15261F201E,80036A61473831=0C18243000:0F000102700D335283845329711563,38048A7D45202A=14202C3808:0F000102702E15471F1E,294F2B452C2F268011=0D19253101:0F0001022E792D3E75663D19,472063703852292B39=222E3A0A16:0F0001022E154826271F1E203874362322,036312=0D19253101:0F000102032971152C2E19,4720637038522B15=111D293505:0F000102030D70332E3919528384532971152B2F201F0C,8D1B=232F3B0B17:0F000102030D7033528384534529711520,63475814=131F2B3707:0F000102030D332C2E195283845329716375261E2322,8D19=15212D3909:0F00010203700D332C2E1929711552838453637526202322,8D09=111D293505:0F00010203700D332E2F192971152B52838453631F20,8D33=1A2632020E:0F00010203700D332E2F1929711552838453261F201E2322,8D03=2E3A0A1622:0F0001020370332C2E2F1575261F,2971476A458352380C=111D293505:0F0001020370332E2F0D19297115637566302B2C3979,8D08=000C182430:0F000102037039297175261F1D21,454F2E1563410F=17232F3B0B:0F0001020370390D3319297115632E2C752620212322,8D07=3606121E2A:0F0001020370390D332C1929712E157563548384534C,20248A38=16222E3A0A:0F0001020370390D1952838453542971631F0C,152036=14202C3808:0F00010203703915632719792322,80262045297158750F=111D293505:0F00010203528384157033,752971206B452F2B262E05=3404101C28:0F00010206030D7129302F79802D7C2B5C4744,11701D2052843833=111D293505:0F00010206181139702E1F686F6A792D2C304E153375664923221D21,52296B0D800D=15212D3909:0F000102070D70332C2E19528384297115637526201E2322,8D05=2C38081420:0F0001021A175D2C19152E302F7183846379,8A20704F7545410A=131F2B3707:0F001A651707,565A58202E1F476320=121E36062A:0F11707B7C5271291E20,2E1F39=111D293505:0F11700001522E71291F20,2B07=131F2B0737:0F11700001397129,2E2002=111D293505:0F11707129,2E1F2002=131F37072B:0F1152702E2F71291F20,000103=131F37072B:0F1152702E2F71291F20,7A3A=111D293505:0F117B7C2C2E71291F20,520300=111D350529:0F110001702E2F71291F20,0621=101C280434:0F11000170717B,522E1F0A=06121E2A36:0F110001708471292E1F20,03388051561C=121E2A3606:0F1100017B7C702E7129,522B22=2D39091521:0F110039702C2E522F1574487B7C2D4E804B,098A204538612B=05111D2935:0F1118795B65170002195D,52382E8A201E=2531010D19:0F111829711500010370390D332E750C201F,4552832F382B8004=2A3606121E:0F1118175C000301027039450D29332C2E2F15631F,8A582020=31010D1925:0F1118032A0D545283841A802D2C2E2B71296366774744201F26232221,010900150C06=2C38081420:0F11180300706A2E1549466319,292F26806B382B20754506=2E3A0A1622:0F1118528384530001035C702971152B332C2E63201F1E23222621,6B75452D4F802E=111D293505:0F1118060300017B7C792E39767566261F20,7129805136=232F3B0B17:0F111800171A454F514E3A3871157765443D23221E262720,80612E1F1C=212D390915:0F11180003706A4F0D332C2E192971155363751F20262322,524746416128=3B0B17232F:0F111800037039450D2971332C632026,1F2E2B38528327=3B0B17232F:0F11180006032A0D70332E011954838471152C202322,58477D630C=0814202C38:0F1118000106287129705B032C2E302F802D4E2B201F,528458384108=380814202C:0F11180001027039302971542F7526201E,63472E151F583A=1E2A360612:0F1118000102030D70332C2E192971158384535426201E2322,471F1B=1F2B370713:0F1118000102030D70332C2E195283845329711563261F0C20,4745752522=3505111D29:0F1118000102030D70332E2C192971153953631F0C262720,5284612528=390915212D:0F111800010203700D332C2E192971152F4B49471F270C2322,52562B2029=390915212D:0F111800010203391929710D1552838453,2075708A456309410F=0A16222E3A:0F111800010206032A0D097170292D302F1575761320,521F47251D=1F2B370713:0F18000102111A1703154F2C2E382D2F807566,7163708A1F207D2A=05111D2935:0F111800017C5C2C2E7129,527015382021=2B3707131F:0F11185C0370332D152322528384636626271E,2F292C2E1F00010601=2430000C18:0F11185C0001092A0D7014692983847B7C2C2E302F802D2B,06454F208A2E=0D19253101:0F11181200171A7919547638,5215201D09=3A0A16222E:0F1A1716007015713F261F2720,5263587D2B470304=111D293505:0F1A0070153871291F20,7A7629=010D192531:0F181179005B712980152D4E2A0D533358,5270208A11=0814202C38:0F181138171A7975665B52845415,47701F8A2013=121E2A3606:0F181117795B5C007054292A0D690403332D2C2E66632B3D,8A454F3822=121E2A3606:0F1811705200012E71291F20,382A=16222E0A3A:0F1811705200012E71291F20,062B27=14202C0838:0F18117052000171291E20,2E1F27=16222E0A3A:0F18117000012E71291F20,527A06=111D290535:0F1811700001062E2F1F20,712912=14202C3808:0F181100062839707952542C2E302F03565A7566441F1E,0D29802B2029=1824300C00:0F181100012C2E7129,522025=121E2A0636:0F18110001261F20,03522E=0915212D39:0F18110001702C2E7129,6F454F098A2025=030F1B2733:0F18110001702C2E71291F0D2B152F2127,5283162014=16222E3A0A:0F18110001707B7C0D7129,52565A152B2034=17232F3B0B:0F1811000104037115454F7677657B7C392023222726210C,52092E1F27=3707131F2B:0F181100010603797B7C802D302F2B6743441F202322,2952477D2528=14202C0838:0F181100017B7C2E71291F20,036F33=0D19253101:0F18110001027939706954528384685D15565A75201E1D26,29032E11=182430000C:0F1811000102062A0D2C2D804B2B672E2F7129,70471F8A2030=17232F3B0B:0F5C707971292C2E0E032A0D6A804B2D8C2B3348634C,52110915462031=15212D3909:0F5C5B0001032A0D7052842C2E71291F20,1118517D462B=0F1B273303:0F5C111800015B712952841F20,756A251A=2733030F1B:1545332C2E2F84836375662620,0F0003700D71292B1C=0E1A320226:1516291211020056,06382007=000C182430:1551000403706A454F3A3D771F262322271E1D21,382B41522016=17232F3B0B:1500443626271F1E,29710F47380D19520337=182430000C:150001021745512E443D65262322,2B63387C18=192531010D:151A83842627202322,580F7003632E1F297C26=0E1A263202:15391A302F83845475662627201E,0F702E4629004708=3606121E2A:5B000102073911522C302F3A678C363F33490D482425200C1E2322,0F15382E1F6116=1E2A360612:5B71297000010611182A0D39792C2E332D4E80151F202621,52454F3804=2C38081420:5B11180001020328700D332C2E195283847115632F751F2720,290F476630=0C18243000:201E27262322,8902=3404101C28:2A0D11180F52848353037039156358332C2E,3820002628=010D192531:4089,030F565A61206B27=1824300C00:4089,8836=1C28340410:0370833F0F6A5215,010D582E1F202C2F2938=112935051D:03700F,79192C2E2D715275262322271F201D2136=112935051D:0370110F45510D3371290941614C522623222720,8D3B=152D390921:03047039171A533852443D363F,8D11=0F1B273303:030402111A16175B4F3A2B153E0079015D54528483696A51,7006200F05=0F1B270333:03041A174533302F56795B3E808339528454,700F292026=121E2A3606:037B7C2E2F261F20,0F14=1E2A360612:030270170F45513A2C71295283842A0D532D24252623222720,155A382E1F2F=1B2733030F:03027011170D332D2C2E2F716152838454,010F201F2C=121E2A3606:03027039450D332C2F2D2971528384636626202322,581535=212D390915:03020E0F18110D332C2E2D2F4971293E615244756653,8A202531=1B2733030F:030102703945802D2C512B7129092322270C7566,112E528325=2D39091521:030102062C2E543E3D636679,380D19462971001F=293505111D:03111A171538193E3F,0F632C2E70454F200C19=17232F3B0B:031A2B7915656A,0F177001204529710D632E2F02=32020E1A26:033945302F838475262720,297071000F2E1F3810=17232F3B0B:0339332C2E1575201E26,0F520D631F29712A72473826=390915212D:0339332C2E302B66201D1F27,0D2971010015520F6B0E=15212D3909:03392D2E332F211D201F1E27,0F7015380029710D195824=16223A0A2E:036F791E20,522E1F31=1D29350511:5283845B79037B7C802D2C2E4E302F2B38493D4463664C1F2021,0F0D712917=15212D3909:5283845303702971150D2F,388A6A6D0F2012=111D293505:528384530370331929272E2B2F631F1D20,0F156B380E=0D19253101:528384530339454F0D297115332E2F637520,0F00705802=2A3606121E:528384530339332E152C2F58631F20,380D000F2900=283404101C:528384530003010215392C20,1112180F29560D2E1F754511=15212D3909:5283845300031929150D332C2E63,0F217045208A717521=3505111D29:5283845300010670802D2C2E4E155B201F1E232221,380F71296A0E=17232F3B0B:5283845354037029711575262720,631F58000F2E38010D=111D293505:528384000103451915332C2E631F2720,29716A0D0F7019=1D29350511:5283840001032E1570637566302F391F,0F4729712030=16222E3A0A:5283845479036A2627201E,0F380D70297115012F1A=1F2B370713:528384542E03700F111869565A7566631F1E2021,297138000C31=121E2A3606:52838454443D65002C2E15495D1F,0F417D712B38630F=0D19253101:5283845444360F11756415,2C2F29016B472E2B20381D=212D390915:528384545363000103332E15,0F1F197029710D757D2032=121E2A3606:528384546315332C2E2F26201F2322,0F0D45002971756B17=192531010D:52838454754C2971150301022E,0F63206A0938268A4117=1B2733030F:52848353000103297115332E2F19,0F8A514F6A6620754526=1824300C00:528403395B2F1E20,0F012D=0B17232F3B:5254700001020612692D4E584647336375662E1F1E,71290D262037=131F2B3707:525400045B17791A565D754C7866,2E1F207C34=0F2733031B:483F89,8838=232F3B0B17:767779392623222789,152B1F1D200E=0A16222E3A:767789,528300292025=14202C3808:7665261F20,0F291A=222E3A0A16:7665262322271F201E21,0F0029807124=1824000C30:7889,292E1F24=101C283404:8D,8832=1D29350511:63767789,522E0006206B31=131F2B3707:7B7C343589,0F7038=2632020E1A:7B7C343589,520F20=0E1A260232:7B34,8812=1C28340410:02703918110F7919155283756626232227201E,012C2E1F0C29=121E2A3606:020F11161A17454F2C2E2D302F2B38434C,2070016328=1824300C00:02060418110D332C2E415B637566262322271F20,520F23=142038082C:07504089,0F010C=15212D3909:07262723221F40,0F7129523B=2430000C18:0717363F1A2C4F3A67433D8B,71290F0103471A=2531010D19:0704031118528384542D2E4E49201F1E1D2127,292B000C3B=283404101C:073F7765644889,012014=111D293505:074048261F202322,0F71454F1500018008=111D293505:07404826271F1E2089,882C=0D19253101:07565A5283845463756677261F20,010F15296120=2F3B0B1723:07487677393F89,0F2952151F1D30=111D293505:074889,06520F3808=17232F3B0B:074889,883B=131F2B3707:074889,8832=15212D3909:07762623221F1E20,000F1552296B2F2A=0D19253101:0776776A742623221F200C211D1E,11180F2F5206802B0B=04101C2834:0776776564,000F29382011=101C283404:0706397B7C794C636A48,520F7129472026=14202C3808:077C343589,880A=380814202C:076A79040363660F5D363F,52292E1F20382F15560123=16223A0A2E:076A696819,0F2918=222E3A0A16:076A171552847983546578,712970010F2D=182430000C:076A48,45752F29384C0F204F612B30=131F2B3707:076A7626271F1E20,0D0F29382F2E0E=0814202C38:07343589,065238=1C28340410:070039201F0C2789,06030F292F23=101C280434:076564,0F292002=0D19253101:073918111A17332C2E71292322271F1E20481D45548384,38002F702A=1824300C00:7C343589,8801=172F3B0B23:6A79363F65,0F292B7118=1B2733030F:6A170F19,5845754C201F4F382430=1B2733030F:6A170F1963766F,5452201F32=0C18243000:6A0339332C20528384531563,29713801000F0C47806B3B=2A3606121E:77766564000789,0F52201E8A01=202C380814:1F2027260076232289,0F29528339=0F1B330327:3435,8809=0F1B273303:34357B7C,8818=121E2A3606:34357B7C7789,0F291D=232F3B0B17:34357B7C89,0F2021=33030F1B27:34357B7C89,030F27=390915212D:34357B7C89,712917=1D29350511:3435073989,8802=2C38081420:34357C89,0111180F292006=30000C1824:34357C89,71291A=14202C3808:34357C89,8A2036=182430000C:3435000789,8835=232F3B0B17:34350089,0F2025=3707131F2B:34353989,0F2037=0D25310119:343589,0F52202D=0F1B273303:343589,0F7152290D=131F2B3707:343589,8830=121E2A3606:343589,881C=16222E3A0A:343589,8819=131F2B3707:343589,880F=15212D3909:343589,8832=14202C3808:343589,8813=0D19253101:343589,8811=17232F3B0B:343589,881E=142C380820:017018110F1A2E15495247838463462322271F,8D03=0F1B270333:0103040818111A155284262322271E20217A79708330,38472E631B=14202C3808:010670170F0E3A294152838454262322271F201E,2E1815442C=0F1B273303:01067071292C2E1F20,1103150F520A=17232F0B3B:010670181126271F202165,293816=182430000C:0106111839513A2C2E2D2F8C804B4723221F63,7152292037=0F2733031B:010203040618110F3315292A271D200C6339171A712C2E30491E21,7A21=0E1A260232:010206040318110F2E292A27200C70072C302F541F392B49,381512=1A2632020E:010206110F452C2E7129095B5226232227201F0C,58804B036B2B381C=142C380820:01023918112E2D493E52756624262322271F20,8D12=121E2A3606:008354,06462F2E1F27=030F1B2733:00797084831754,0F2E472D4E1F06=0D19250131:0079701811072C2E01060F33152627200C7A1A302F4576631F2B,8052382900=172F3B0B23:00790F072C2E0103047018111A262322271E7A302F5448637545,293815561E=101C340428:007952151E20,0F2E1F33=0F1B273303:007984831A160F1719,632E20471D6B01=152D390921:0079110F0304062A528423222627207A19701A2C2E2F5D83,294513=0F1B273303:0079181A165B332F2B262322271E2021030469702D4E49712930845D,454F05=152139092D:0079192E2F030417332D1552847A5D,4E201F=162E3A0A22:003826232277,632E20523A=0D19310125:0038262389,521513=1C28340410:00384089,0F202E157C07=04101C2834:00384089,152967631F=101C283404:00384740,0F2037=1C28340410:00387765504089,0F157C04=131F37072B:00385476,521F13=16222E3A0A:003854767789,2E1F522010=131F2B3707:003854637519,205D1D1F52151E210F=121E2A3606:003889,52201F1D4733=121E2A3606:003889,881F=212D390915:001D23221E2789,52290F2E1F202B=07131F2B37:002C7080305C784C62,2E1F472001=283404101C:004D64547589,0F292E=131F2B3707:005040,522E1F0F2C2004=3404101C28:005089,032C2E1F33=182430000C:005089,8815=192531010D:00261F23221E201D2189,8D12=131F2B3707:00261F2322271E200C89,8D1E=121E2A3606:0026271E20,2F2E1F33=16222E3A0A:002627241F1E20232289,8D33=14202C3808:002627651E20232289,881B=182430000C:00262789,292C2E1F2B2F2A=07131F2B37:00262322271F1E203F8B65,52290F038002=15212D3909:001779332D2322271E2007760304,38290F1C=1F2B370713:00173883546365756619,466115201F701D47522434=0D25310119:00170F79191A6540,712909387C2015=0E1A263202:00170F332C2E2D2F802952443F26232227201F,15637C383A=132B37071F:00170F7665776489,8D2A=390915212D:00177689,0F52804F2507=2E3A0A1622:00177179546A76,0F52443D1F2D=0915212D39:0070,0F292C2E791F13=131F2B3707:007083624C,0F38202E7D4F45471F7107=380814202C:00704F0D332C2E2D15363F261F20274C,0F2906036F4703=3404101C28:00702C2E164C157126271F1E202425363F,29386A032B0F=0F1B273303:00700F1715262720,472E386309=15212D0939:007022230726,2E17712952302F15=15212D3909:00704889,8834=1C28340410:0070784889,0345201F21=2D39091521:007007482089,2E1F58470B=0D19253101:0070071A010618110F5B52846775,6326202E=16222E3A0A:00701A17794C0F302F715475,2E454F8A20243A=0F1B330327:007018111A1617192E15382627201F656477,4F090A=0F1B273303:002E2F18110F5B3315292A26271F20210C7A70710102393E19,035A37=14202C3808:002E4344793F26271F20,03702C2F292B381A31=0E1A263202:00161A5D454F153826201E27,7D0D2904=152139092D:0004037039180F332D152952262322271F0C533A83,4117804735=1F2B370713:0004037B7C0F79494766754667,80293869208A1E=162E3A0A22:00040301067018111A0F332C15292A261E200C7A7919712F5D52838454,5617454F06=3404101C28:000403110F527079156523221E2027,0129802E1F6B1D=1830000C24:0004031A170F11332C2E302F1571292A657677451949,70201D5218=102834041C:0004031811171A5B332C2E155D52,0D29204504=17233B0B2F:00040318110F1519262322271E2021,52831F3825=3B0B17232F:00046A7966444C7765,010C202F38520F70292E31=14202C3808:003F261F202789,8836=131F2B3707:003F657789,7152290F032B3A=2632020E1A:003F651F0C2027232289,0F292B=16222E3A0A:003F89,8836=212D390915:000F76,032E1F522C292B22=2B3707131F:000F7765,2E1F7C4607=0F1B273303:000F01111A1615292A2627200C2C670279538384543E49,634512=0F1B273303:000F1320,6380382936=0F2733031B:000F1323222627,2E3829031535=0D25310119:00676589,0F200F=0C18243000:00401D232289,71290F47202B=101C283404:0040395089,8803=30000C1824:004023222089,0F291118470D=0A16222E3A:004089,0F5211=1A2632020E:004089,0F0147200B=3A0A16222E:00037039454F0D332971152C4C48,090F476341382E0A=111D293505:00037039041A26271F1E202322,0F2F2C335129452E0D3A3B=222E3A0A16:000370396A450D332F4B154C,0F208A7D41381F2E14=0F1B273303:00030401061A16170F332E71292627200C02696A45514F0D2C2D4E497A,2B0B=0F1B273303:000304111A33152D2E302F71292A5284530770022B,0F6345203B=0F1B330327:00030418111617332E2D2F292A52845407020D302B,090F452001=0F1B273303:000304080618110F1A2E2D0D3371292A2C302F7566010239454E802B,632039=2430000C18:00036A7415384878,45751F20240F522E834F2E=182430000C:000301394F2E154763751F27,0F707A802629710D192035=14202C3808:0003391983845475,2E1F0F6A702971722A0D04=0F1B270333:00483F,6338200F2A=3B0B17232F:00481F2023221E27262189,0F292C2E1B=122A36061E:0076645089,8819=202C380814:0076777566262322271F201E,0F111852290D=101C283404:00763989,0F2036=1E2A360612:00788B89,0671292E25=010D192531:00784C793989,0F29702E1F208A21=31010D1925:0006261F1E201D212322,0F2938111801=2A3606121E:00060403702C2E4C154947443D651F,0D2920=101C283404:0006522E261F20,0F712939=2632020E1A:00060724232227261F2025,520F157929382F22=31010D1925:0006547677,0F5229151F201B=0E1A320226:00061A161718110F292A0C26271F21797001022F49,470D=0814202C38:002876396577261F20,5283290F37=212D390915:0028397976771E232227,0F522E47442027=121E2A3606:006389,8822=101C280434:007B7C3989,881E=1830000C24:007B343589,8805=2E3A0A1622:00021719792B155D5466774962,010611180F292030=14202C3808:00020370454F0D3933192C2E2D156375261F202322,0F7123=0E1A260232:0002070818111A16175B153E445D5452848365647576,2038454F15=182430000C:0007385476771548,52061F2024=2D39091521:0007504089,0F29157030=15212D3909:0007504089,060F71702F2918=15212D3909:0007504089,880B=17232F0B3B:000770171989,0F2E20382F=0B17232F3B:00077089,522E1F8A202C=07131F2B37:000704036939487C4466,0F7011293821=1824000C30:000715547776,521F18=0E2632021A:0007030401021811171A0F2E2322271F1E706749528483,202F293800=0F1B330327:00077663,0F297138202C=0B17232F3B:000776776548,0F1118152E1F2017=121E2A3606:00077665776489,52830F208A14=1A2632020E:00077B7C4834353989,2952203B=2632020E1A:00076A386563,0F7D8A2066454F52754C15=1E2A360612:00076A0F3874485040,06707C2509=3606121E2A:00076A74504089,5229702C7D15=14202C3808:00076A74173926271F1E20,0F7029522B09=000C182430:00076A54196348767765,7920297115528A0D382B16=101C283404:000734357B7C3989,0F528329200C=06121E2A36:0007343589,290F7104=2E3A0A1622:0007343589,0F292F702012=182430000C:0007343589,0F71296B708003=15212D3909:0007343589,7129706300=0D19310125:0007010618111A332D302F15262322271E530270164C,560F712924=0E1A263202:000701020618111A1752848354230C7027,262038292C=111D293505:0007711F204840,010F29153814=17232F3B0B:00076527262322,1552835A201D0F382D=0D19253101:0007363F8B3989,09292C208A0F28=030F1B2733:000739483F66,0F208A2B0A=04101C2834:0007397B7C343589,0106522008=020E1A2632:0007396A48343589,0F203A=283404101C:00073934357B7C89,0F5223=3505111D29:000739343589,032010=0A16222E3A:000739343589,520F2F=111D293505:000739343589,8A200A=15212D0939:00077A7089,8817=17232F3B0B:000789,8D3B=172F3B0B23:000789,8815=1B2733030F:007C343589,881B=212D390915:007C343589,8812=15212D3909:006A79190F6F2627,6B46204538290B=380814202C:006A38075040,0F630141202B454F2D=121E2A3606:006A5040077448,702B2C0F2F292E=0B17232F3B:006A583F232227261F20,0F291547031C=232F3B0B17:006A6F391974,0F2E614447702C292F71201F38521F=31010D1925:0034353989,522E1F2B=0D19253101:00343589,060F5200=2A3606121E:00343589,7129565A01=131F2B3707:00343589,883B=111D350529:00343589,8800=152D390921:000150402627,0F292F2B1E=2733030F1B:00010F17505840,565A80385283846315=101C283404:000103020611187B7C2D4E616439201E0C26,522E474429=101C283404:0001030239450D297115332C2E4C,0F542070528438632C=101C283404:000103392E54837548,19700F58157A20381F=1830000C24:00010670175B71292A152322271E,03637C2B380F=0E1A263202:0001067052842E71291F20,030F38477533=131F2B3707:0001067011185B0D332C2E2D712909262322271F200C,0F5263250C=17232F0B3B:000106040318111A170F33292A26276A201D0C7A71077C1F1E74694F,520A=0D19253101:0001060403232226380F767754,568020152D=111D293505:000106025B75712904032D302F382B2A0D801E20,2E1F0F0C=0D19253101:00010607155B5C26271E2021165D83,38470F2920=16222E3A0A:000106073018110F3329271E0C7A0D75,3826201508=0F1B273303:00010618111A16332C2E2F2D27200C07483A450D,1552843825=0E1A263202:000102261E2027,03476F700F2971382E39=15212D3909:0001027007834878,2E388A201D17=131F2B3707:00010203450D3329152C2E2F5375,0F638A6A1D382D=0E1A263202:000102030D70332C2E29712F534426201F1E,0F38152F=121E2A3606:0001020370450D332C2E2D152971,0F52838A201D1B=1D29350511:0001020370528384631575712D2E4E3E581F1E1D,292C2B452620803A=222E3A0A16:0001020370392F2971152B54754C,458A1F0F20462C=14202C3808:0001020370392F80712B546675201E26,1F58472E152F=16222E3A0A:000102037039714515750D33,201D381F092E0F1103=32020E1A26:000102030F7039453319152E2D2F63751F0C1E20,71290D38472C=16222E3A0A:000102035270392E2D5863,0F381D2B2921201511=131F2B3707:0001020352666A,0F7020262938172F3A=2430000C18:00010203332C2E2F1558631F,0F1920707A2971264627=05111D2935:0001020311180F702E1F7952838468332D6749443E46630C1E1D21,292B2035=1C28340410:000102031118396375664819,1D4138702080291F=232F3B0B17:000102033945332C6375201D21,0F1929710D702D=101C283404:00010203390D3329152C2B751E20,2E1F54475352458316=111D293505:0001020339161745514F2C190F1A152E2D2F304979,8D13=17232F3B0B:00010203396A79637566201D211E,29387D71707A30=101C283404:000102033911170D3319152E2F0947442627201F,8D25=3505111D29:000102031811392E2D19528384543E4463751F20,152F1A290F0D=0E1A263202:0001020626232227201E,0F2E03801F0F=101C283404:0001020617385483,030F47202B6B1B=2733030F1B:000102060F17705283797823221E2027,2E712910=121E2A3606:000102062A397129797B7C2E1F2425,162F5D20262B=182430000C:0001020603691817452C2E2D498344,412B6A09633808=3A0A16222E:0001020603700F7B7C2E1F692D48302F565A586366240C21,2B151A292039=17232F3B0B:000102060717706A33392D2E4E674447482322271E210C,71292B4F2023=33030F1B27:0001020607036A5D397C2163664744,0F4E25208A08=04101C2834:000102060775261F20,71290F70150C=101C283404:00010206111803302F565A802D4E2B881F261E0C,0D0F521B=16222E3A0A:00010206090D5B7952838454685D7B7C443D77656366201F1E,030F47454F24=010D192531:000102071283542627201D210C4C78,29580F2E6352031F01=32020E1A26:00010275261E0C2322,6303706F0F292E1F19=0E2632021A:000102081A158483262322270C1E,700F292E1B=101C283404:00011A1615262322271F1E200C214C,472B0F1124=3707131F2B:00013974150726271F1E200C,0F06520D297170382B4507=17233B0B2F:000118111A16175B154C26271E200C232279302F5D528384547543,0F297C7A03=17232F3B0B:000118111A332C2E2D1571292A2627200C7A1979,387C02=172F3B0B23:000118111A332C2E2D1571292A23222627200C7A791970302F5D5283845456,387C454F1F=0E1A263202:0001081811171A160F1571292A26271E20396476452B0D,632E523813=15212D3909:00211D1E232289,8D16=0E2632021A:006526232227201F,8926=05111D2935:00657689,6B0F5225=16223A0A2E:00654C89,8D03=2A3606121E:006589,2970472008=15212D3909:001A170F5B332E2D7129261E203E5D,1503528306=152139092D:001A170F1379232227761926,71293833=1C28340410:001A1715838444363F261F1E200C2322,0F476B52036338=14202C3808:001A2B5448701938754C,152E20242510=0D19253101:0039504089,8D39=283404101C:003926271E20747677642322480C06,2E1F38=0F1B273303:0039262322271E201D210C0748766465776A,150F382939=202C380814:0039332C2E2D2F152B4644261F1E,0F7019382971637A31=192531010D:0039787989,1F2E2010=101C283404:0039787089,2E1F8A034F206B29=05111D2935:00398B7989,0F200C=131F2B3707:0039077426271F1E20,0F29713852832B632D=14202C3808:0039076A7426271F2048,0F79197029717A382C=0E1A263202:00397C343548,8929=3B0B17232F:003934357B7C89,0F2028=16222E0A3A:0039343589,8D34=16222E3A0A:0039343589,880B=111D293505:0039343589,8805=17233B0B2F:0039343589,882E=101C283404:0039343589,8806=17233B0B2F:00390103040618111A17332C2E262322271E157A7071302F45631F2075,807C2B=0915212D39:00396577647969271E2322,52012E1F2620612D=16222E3A0A:00391A6A15384C4943363F7448,0F0379472B6319=192531010D:00394C786F89,0F2E442035=182430000C:003989,882A=121E2A3606:003989,8816=13191F252B313701070D:003989,8801=0D19310125:003989,880D=0F1B273303:0018112C2E01040607332D292A09270C2322696870302F47023945,382052801C=101C340428:00190F153917701A48,472E1F200334=1F2B370713:00195475667689,5229152E2019=222E3A0A16:004C504089,0F5215470A=3A0A16222E:005C702C2F802B154C78,5A562E1F208A45466319=102834041C:0089,090F1538=131F2B3707:71297C790001062A0F802D,5215705D2F=0E1A263202:7100030170391959152E2D2F2B,0F201F4F75668A3824=030F1B2733:5483846376656419786A,298030201A=2430000C18:5452838479195D00012A0D7B7C2C2E3348156366242526201E,0F71292D=07131F2B37:54528384700001020339482D301571565A363F637566,06292B201F8A29=030F1B2733:54528384036F796A153E65,7129631D=2733030F1B:5452848303152F802C2D,2E1F208A7A700F29710C7D22=33030F1B27:118384155B20272E1F21,0F03380E=0E1A263202:1179302F842627201E,0071292E1F0E=06121E2A36:11177B7C52842C2E5B1F20,060071292F0F0E=101C283404:110F70528475660D7129,012E1F20262A=101C283404:110F03706A795215636626271E,0C012F38062C292B07=020E1A2632:110F0001702C2E7129201F,52060C=0E1A263202:110F00017052792E1F1E,71290D2B2020=293505111D:110F1A6A702C2E1952838453712F6375,45201500011D=101C340428:11037B7C2E2F7129,0F52200B=0E1A263202:11000170792C2E7129,0F52201F01=111D350529:110001527B7C2E75,0F2009=04101C2834:1100010206702D804E2B2620,0F52540D00=131F2B3707:110001392E1F20,0F712932=17232F3B0B:117154528384292C2E302D4E092A0D50407970443D,5680410023=2B3707131F:111879690001020370396A2E2D528384543E637566,0F380D58292000=222E3A0A16:111879076A1A171523221E272024,5229700F1D012E2B0C2F0B=06121E2A36:111817000106702C2E71292A0D33802D302F4E2B44,0F52252029=07131F2B37:11180F000704030D7C684580302F153867534775,70204119=2430000C18:11180F00012A0D70795D7B7C39332D2C2E4E4863664C,064F478A2037=1E2A360612:11180F000152548471702C2E2D4E303348492A156144474C63,8A201F38450618=202C380814:11180F000128032A0D7129302C2E2F2D802B09411F1E20,5284543824=2F3B0B1723:11180F0001020370391952845329712B632E7B7C792D2C8020,385D151E=293505111D:11180F0001020339700D29716375662E1F2620,3815568016=16222E3A0A:11180F000102587B7C5283847971302F804B2B497675,09612E1F201E=232F3B0B17:11180F00010E715229702E79692C2D2B15093954444C66,2F565A806132=131F2B3707:11180F71297052838454792A0D33802D153853201F1E212627,012F56476628=3707131F2B:11180F71297000010604032A0D793969302F33802D636675,201F52565A1E18=1D29350511:11180F5C000102030D332C2E195329711563261F202322,52843A=202C380814:11180370392A0D3329712C2F156375795B5D,450C8A00382E1F20010C=3A0A16222E:11185283847975661271393D692D15565A201E262322,292F060D0C02=30000C1824:111852838470795B302F404533802D152B39201E23221D212726,0F2E1F010D2923=2D39091521:111852838453546319297115030D332B2C,060F8A2E38201F38=0D19253101:111800020D041A796933483E5347446563751F1D212026,010F09150C17=2430000C18:1118000717161A2C2E3371292B56433D6375363F,0F010347208A09=020E1A2632:111800012A0D2C705271292E201F,1538617904=30000C1824:11180001032A0D70795B2C2E302F802D4E152B33714161201F26,520958470A=000C182430:11180001020439332C2E302F2B5844477515634C1F2721,0F520D19267A2971702037=232F3B0B17:111800010206037939695483845D2D2E4E446375661F262120,0F52290D7123=31010D1925:111800010206071979697C67474475664C,0F16298A2014=182430000C:11187129705B79000106032A0D397B6F7C802D2C2B61756627261E0C1D21,0F2E15414732=192531010D:111871545283842979397B7C69152B2A0D33485324251F1D1E26,6B00702F800C201E=1F2B370713:5D0007363F232227261E21,037C0F471F202E=0E1A263202:6526232227201F,880E=111D293505:653989,8806=131F2B3707:363F6526232227201E89,8832=1A2632020E:1A454F548384,881D=121E2A3606:1A38712975,0F201A=0E1A263202:1A162623227954,0001710F290C=0F1B273303:1A16170F13152654,3852204F32=0F1B273303:1A5D453A332C2E2F4B25262322271F201E1D21,000F704723=2F3B0B1723:3950177089,522E1F0F201A=1D29350511:39701117302F713819297566,004551152C2E201D1F34=121E2A3606:393589,881A=15212D3909:393589,882C=182430000C:393589,8825=101C283404:393589,881C=2531010D19:394089,71294709636F7C440D=0D19253101:3948007889,8D38=2430000C18:394889,8811=111D293505:394889,882A=0E1A263202:3907,8807=0D19253101:39343589,8831=101C283404:393489,8801=222E3A0A16:390050404C89,0F528329692018=131F2B3707:39006A26201F,0F520D38580629712B09=380814202C:390001022C2E302F1575804B2D261F20,0D0F0319707D5229717A15=17232F3B0B:3989,8D11=0A16222E3A:181179838454637566,0F5229012007=111D293505:18117915384C,52200E=0C18243000:1811795B032C2E302F802D4163754C27261E1D2120,010D0F29521F29=16222E0A3A:1811795B5466,01202F=192531010D:181179000607040D03302F5283844F3A45512B1533664C47,090F702E208A2B=0B17232F3B:18117900012C2E5B1F20,0F710D52291A=122A36061E:181179190E332C2E2D52637566262322271F20,8D02=0F1B273303:181117332C2E1526232227201F1E3E,38030F522922=142038082C:181170792C2F7129,52201F=121E36062A:18117001061579,71292023=121E2A3606:18117000012C2E7129,522024=3505111D29:18110F3900010203700D3329711563752E1F0C201D,38525D1A=101C283404:18110F197983842E230C271F1E7A70525463,2620291503=111D293505:1811002E1F8384,0F2022=1824000C30:181100012C2E2F1F,0F3821=142038082C:181100012C2E2F1F20,0F5229=14202C3808:181100015B3875,2E2034=15212D3909:181100012A0D2C2E2F2B2D304E447129841F,0F09416138200F=0814202C38:181100012A0D52842953411E20,2E1F0F47152F=131F2B3707:18110001032A0D845B7129302F791533536678,0F208A1F1D33=17232F3B0B:18115452840001712970802D2C2E302F2B2A0D78791F,0F204758610E=0F1B273303:18111A16175B3315262322271F1E201D215D838454433E363F754551,00030F290D=0C18243000:18115C0001702A2C2E2F5283847129795B6375802D154C,1F208A2407=15212D3909:88,262052830D=17232F3B0B:88,8D17=102834041C:88,8D0B=15212D0939:88,8D24=121E2A0636:88,8D09=17232F0B3B:88,8D13=111D293505:1979,3F2F2E45207D37=112935051D:1966583F6589,8831=16222E3A0A:4C4089,880C=0C18243000:4C78,297172380D2A2E0F47484112=16222E3A0A:5C0F1811790070528471291F20,2F0380512514=1C28340410:5C0001020652835B0E03804B2D4E2B752024210C,292E565A36=1A2632020E:5C11180001027170520D2984832B15200C,03802E386333=15212D3909:89,6B34=111D293505:89,8D",TIME_YI_JI:"0D28=,2C2E2128=,2C2E0110=,2C2E0C1F=,2C2E7A701B1C=,01022308=,01026D003026=,000106037A702D02=,000106037A702802=,000106037A703131=,000106037A70341B=,000106087A701F0E=,000106087A702E15=,000106087A702C2E0E39=,000106087A702C2E0D2B=,881727=,88032D=,88352F=,882B2F=,882125=,882A22=,880C1E=,880220=,88161A=,882018=,883422=,880113=,880B11=,883315=,882915=,881F17=,88150D=,88122E=,88302A=,88262A=,883A28=,880826=,881C2C=,881905=,882303=,880F09=,88050B=,883701=,882D01=,88060C=,882410=,881A12=,882E0E=,88380E=,881010=,883630=,881834=,880E38=,882232=,882C30=,88043A=,881E0A=,880006=,883208=,880A04=,881400=,882808=,883137=,883B35=,882737=,881D39=,88133B=,880933=,88251D=,882F1B=,881B1F=,88111D=,880719=,88391B=,88212D=,7A702C0B15=,7A70551515=,7A70552D00=,7A7D2C2E1334=382C,000106083528=382C,7A70000106080504=382C7A6C55700F197120,00010608223A=380006082C,01026D0D2C=380006082C,01027A70551D30=380006082C0F71295283,01027A703636=380006082C0F71295283,0102416D1226=380006082C7A706C550F297120,0102251C=380006082C7A6C55700F197120,01026D2300=3800010608,2C2E0324=3800010608,7A702C2E082E=3800010608,7A70552C2E3B34=38000106082C,2F8026330C=38000106082C,2F80267A701622=38000106082C7A70556C0F197120,1904=38000106082C7A6C55700F197120,1514=38000106087A70556C0F197120,2C2E3138=38000106087A70556C0F197120,2C2E0B10=38000106087A6C55700F197120,2C2E2B28=387A6C55700F197120,000106082C2E2E16=38082C,000106037A700E3A=38082C,000106037A703708=38082C6C550F197120,000106037A701B20=38082C6C550F197120,000106037A70111C=38082C6C550F197120,000106037A703A2D=2C38,000106082733=2C38,000106081015=2C38020F71295283,000106083817=2C2920,7A700F03=2C2920,616D1839=2C292070556C100F,00010608161B=2C2920020F7100010608,302B=2C2920556C0F1971,7A701E07=2C2920010F,1B1B=2C2920010670100F00,352B=2C292000010206100F70,082B=2C292000010206100F707A,0C21=2C292000010870556C100F7A,0617=2C29206C0F1971,7A70552807=2C29207A70556C0F197100010206,122F=2C29207A706C55100F1971,1017=2C29207A706C55100F1971,2731=2C20,616D0436=2C2070550F,7A7D01022E12=2C200F71295283,01021831=2C20556C0F1971,7A702912=2C20100F52,01026D1D33=2C807138152952,000106080E31=2C80713815295270556C100F,000106083201=2C80713815295270556C100F7A,000106080327=2C80713815295202100F,000106037A702B2B=2C80713815295202100F,000106037A702801=2C80713815295202100F,000106083639=2C80713815295202100F7A7055,00010608341D=2C807138152952556C100F,000106037A701B23=2C807138152952010F6C55,7A70302D=2C8071381529520102100F7A7055,2231=2C8071381529520102100F7A6C55,1F13=2C80713815295200010206100F20,7A70313B=2C8071381529526C550F,000106037A701A15=2C8071381529527A70550F,000106080219=2C8071381529527A70556C0F19,000106082E0D=2C80713815295208556C100F,000106037A70161F=2C80711529525670556C100F,000106083813=2C80711529525670556C100F,000106082D05=2C807115295256020F7A706C55,2237=2C80711529525602100F,000106081F0D=2C80711529525602100F55,000106037A702627=2C8071152952560102100F7A706C,2C33=2C8071152952560102100F7A706C,0939=2C80711529525601100F7A7055,416D021F=2C80711529525600010206100F70,0E37=2C80711529525600010870556C10,2129=2C8071152952566C550F,7A702519=2C8071152952566C550F19,7A702417=2C8071152952566C55100F19,000106037A70043B=2C8071152952566C55100F19,000106037A700C1B=2C8071152952566C55100F19,7A703B31=2C8071152952566C100F19,7A705500010603172D=2C8071152952567A70550F,416D3A2F=2C8071152952567A70556C100F,1901=2C8071152952567A706C55100F19,1119=2C8071152952567A6C55700F19,1C2B=2C80711529525608556C100F,000106037A701403=2C80711529525608556C100F,000106037A70071D=2C80711529525608100F55,000106037A701908=292C20,7A7D01026D2E0F=292C200102100F7A7055,032C=292C20000608,0102071C=292C206C550F1971,000106037A700E33=292C207A70556C000108,0503=2920550F,7A702C2E0721=2920556C100F,7A702C1225=2920000108556C100F,7A702C2E1F11=2900010870556C100F7A,032C201A11=297A70556C100F,032C200E35=297A70556C100F,032C20000A=70556C0F197120,7A7D3A29=70556C100F2C20,000106081C25=70556C100F2C20,000106082805=70556C100F2C20,000106082F20=70556C100F2C20,00010608150C=70556C100F29522002,7A7D000106033314=70556C100F,00010608032C20122A=70556C08,7A7D000106032415=70100F2C715220,000106081A0D=4B0F2C20,000106037A701902=4B0F2C20,000106080E3B=4B0F20,7A702C000106032E17=0F2C09382920,7A7000010603363B=0F2C093829206C55,000106037A70082C=0F29528320,7A2C71707D01026D0718=0F712952832C20,7A7D01021C26=0F712952832C20,7A7D01026D3918=0F712952832C2038000608,01027A70552126=0F712952832C2010,01021330=0F712952832C207A7055,01021118=0F712952832C207A7055,01023524=0F715220,7A70552C2E3419=20556C0F1971,7A702C2E1D31=2000010206100F,7A702C1E05=0270290F2C207A,00010608212C=0270550F,00010608032C200C23=0270550F,00010608032C203706=0270550F20,000106082C2E2520=0270550F20,7A7D000106032E13=0270550F202C807115295256,000106081620=020F29528320,000106087A2C71707D0112=020F2952832055,7A2C71707D000106030F08=020F20,7A7055000106032A23=020F712952832C20,2521=020F712952832C20,000106082F21=020F712952832C20,000106080003=020F712952832C20,7A700432=020F712952832C2038000106086C,7A701E03=020F712952832C2070556C10,000106081623=020F712952832C2001,2236=020F712952832C2001,000B=020F712952832C2001,7A70552C36=020F712952832C20013800,416D341E=020F712952832C20017055,7A7D0E32=020F712952832C200110,7A7D0329=020F712952832C2001107A706C55,262D=020F712952832C20017A7055,1229=020F712952832C2000010608,122D=020F712952832C2000010608,1011=020F712952832C2000010608,0A0B=020F712952832C2000010608,1F0F=020F712952832C2000010870556C,1A0E=020F712952832C206C55,7A703312=020F712952832C2010,000106037A70172A=020F712952832C2010,7A7055000106033B3B=020F712952832C2010,416D000106037A700B12=020F712952832C20106C55,000106037A700615=020F712952832C207A7055,3203=020F712952832C207A7055,201B=020F712952832C207A706C5510,2023=020F712952832C207A6C7055,2A1B=020F7129528320,000106087A702C2629=020F7129528320,7A702C2E3709=020F7129528320,7A702C000106083A24=020F7129528320,7A70552C2E341A=020F712952832038000106087A70,2C2E1C2D=020F712952832001,7A702C2E0611=020F712952832001,7A702C2E021A=020F712952832001,7A7D2C2E3815=020F71295283200100,7A702C2E3024=020F71295283200110,616D2C2E093B=020F71295283206C55,7A702C2E000106030505=020F71295283206C55,7A702C030C1A=020F71295283207A706C55,000106082C2E3705=020F712952837A706C55,032C201F0C=02550F20,000106037A700508=02550F20,000106037A703029=02550F20,000106087A702C2E3027=02550F202C807115295256,000106037A703526=02100F2C29528320,000106037A70150E=02100F2C29528320,00010608380F=02100F2C29528320,000106083527=02100F2C29528320,7A70000106031C27=02100F2C2955528320,000106081227=02100F2C29555283207A706C,00010608060F=02100F2C29555283207A706C,000106081D34=02100F7020,7A7D000106030F02=02100F7055528315,2F8026000106083920=02100F7055528315,2F802600010608212A=02100F7055528315,000106082A20=02100F7055528315,000106083A26=02100F7055528315,000106080439=02100F7055528315,000106080008=02100F7055528315,000106081B21=02100F7055528315,00010608071B=02100F7055528315,000106080D24=02100F7055528315,000106082C2E2C32=02100F7055528315,000106082C2E2B2C=02100F7055528315,00010608032C201402=02100F7055528315,00010608032C20391C=02100F7055528315,7A7D000106031F10=02100F705552831538,2F8026000106082D06=02100F70555283157A,2F802600010608290D=02100F20,7A702C000106032416=02100F20,616D000106037A702C34=02100F20292C,7A70000106031C2A=02100F528315,7A7055000106032234=02100F528315,7A7055000106032A21=02100F55528315,000106037A703313=02100F55528315,000106037A700509=02100F55528315,000106037A702D03=02100F55528315,000106037A700613=02100F55528315,000106037A702235=02100F55528315,000106037A70391D=02100F55528315,000106037A70100F=02100F55528315,000106087A702C111B=02100F55528315,000106087A702C2E2916=02100F55528315,7A2C71707D000106030430=02100F55528315,7A2C71707D000106033B32=02100F55528315,7A2C71707D000106081903=02100F55528315,7A702C2E000106033A27=02100F55528315,7A702C000106030931=02100F55528315,7A702C000106030C1C=02100F55528315,7A70000106032735=02100F555283152C8071,000106037A700B13=02100F555283152C807138,000106037A701517=02100F555283152C807138,000106037A702917=02100F555283156C,000106037A703136=550F522010,7A2C71707D01022A1E=550F715220,7A702C2E1333=550F715220,7A702C2E000106081405=556C,000106087A702C2E0433=556C,7A70000106083B38=556C0F197120,7A702C2E1E01=556C0F19712001,7A702C2E190B=556C000108,7A70230B=556C000108,7A702C2E1A0F=556C0001082C807115295256,7A701830=556C0008,7A2C71707D01023814=556C100F295220,7A2C71707D03082F=556C100F295220,7A702C0C1D=556C100F295220,7A702C2E00010603021D=556C100F295220,7A70000106031121=556C100F2952202C,7A701835=556C100F2952202C80713815,000106037A703B30=556C100F29522002,000106037A70290C=556C100F29522002,7A70000106030930=556C100F2952200238,000106037A702B27=556C100F2952200102,7A702C2E3812=556C08,000106037A701012=556C08,000106037A701621=556C08,7A702C2E000106033209=556C08,7A702C2E000106032021=556C082C807138152952,000106037A700009=556C082C807138152952,000106037A702A1D=807138152952000170100F,032C200A05=807138152952000170100F,032C20273B=8071381529527A706C550F,032C203423=80711529525600010870556C100F,032C201511=80711529525600010870556C100F,032C20183B=80711529525600010870556C100F,032C203311=010F2C80093829206C55,7A702B29=010F2C80093829206C55,7A70616D3A25=010F2C09382920,7A70550825=010F2C093829207A6C5570,201E=010F09382920,7A702C2E352E=010670100F2C71522000,1C28=010670100F7152207A6C55,2C2E2E11=0106100F7152,7A70032C203205=0106100F71526C,7A70032C202A19=0102290F20,7A702C2E2A1F=010270290F2C207A6C55,2413=010270290F2C207A6C55,0437=010270290F2C207A6C55,0935=010270550F,032C201B18=010270550F20,2B24=010270550F20,2F80261906=010270550F20,2C2E2732=010270550F20,2C2E071A=010270550F20,2C2E3700=010270550F20,7A7D1724=010270550F203800,2F80263921=010270550F202C29,416D290F=010270550F202C807138152952,1619=010270550F202C8071381529527A,3207=010270550F202C80711529525600,0829=010270550F2000,060D=010270550F2000,0001=010270550F2000,2736=010270550F207A,1B1E=010270550F207A,2C2E140B=010270550F207A6C,0114=010270550F7A6C,032C202C3B=010270550F7A6C,032C20201F=0102550F20,7A702C1A13=0102550F20,7A702C3637=0102550F20,7A702C280B=0102550F20,7A702C223B=0102550F20,7A702C032D04=0102100F2C29528320,7A701409=0102100F2C29528320,7A70552307=0102100F2C2952832000,0005=0102100F295283,032C207A700A00=0102100F2955528320,7A2C71707D082D=0102100F2955528320,7A702C2E2809=0102100F295552832000,7A702C2E2B2D=0102100F7055528315,021E=0102100F7055528315,0C20=0102100F7055528315,2F80263420=0102100F7055528315,2F80261510=0102100F7055528315,2F80262E10=0102100F7055528315,2F80262806=0102100F7055528315,2F80263134=0102100F7055528315,2F80261D38=0102100F7055528315,2F8026251A=0102100F7055528315,2F80263A2A=0102100F7055528315,2F80267A7D1120=0102100F7055528315,2F80267A7D0824=0102100F7055528315,2C2E1E00=0102100F7055528315,2C2E7A2F1D=0102100F7055528315,032C200A06=0102100F7055528315,7A7D2C2E1C2E=0102100F70555283153800,2F80261832=0102100F70555283153800,2C2E280A=0102100F70555283153800,2C2E320A=0102100F705552831538007A,2738=0102100F705552831538007A6C,2F80260720=0102100F705552831538007A6C,2F8026032B=0102100F70555283152C292000,1907=0102100F70555283152C292000,3703=0102100F70555283152C292000,2739=0102100F70555283152C29207A,251B=0102100F70555283152C29207A,2B25=0102100F70555283152C29207A6C,1331=0102100F70555283152C207A,0D29=0102100F70555283152C80717A,1B1D=0102100F70555283158071,032C200D2D=0102100F705552831500,1725=0102100F705552831500,352D=0102100F705552831500,0C19=0102100F705552831500,150F=0102100F705552831500,3025=0102100F705552831500,0F07=0102100F705552831500,1E09=0102100F705552831500,251F=0102100F705552831500,010C=0102100F705552831500,2F80261A10=0102100F705552831500,2F80261016=0102100F705552831500,2F80260934=0102100F705552831500,2F80262910=0102100F705552831500,2F80267A7D1A14=0102100F705552831500,2C2E2304=0102100F705552831500,7A7D3421=0102100F7055528315002C2920,212F=0102100F7055528315002C807138,111F=0102100F7055528315002C807138,3135=0102100F7055528315008071,032C200828=0102100F7055528315007A6C,2022=0102100F70555283156C,7A7D140A=0102100F70555283156C,7A7D2C2E2127=0102100F70555283157A,1618=0102100F70555283157A,0B0F=0102100F70555283157A,1836=0102100F70555283157A,172E=0102100F70555283157A,2F8026352A=0102100F70555283157A,2F80262B2E=0102100F70555283157A,2F8026082A=0102100F70555283157A,2F80262306=0102100F70555283157A,2F80263702=0102100F70555283157A,2F80262C38=0102100F70555283157A,2F80261E06=0102100F70555283157A,2F80261B1A=0102100F70555283157A,2F8026032A=0102100F70555283157A,2C2E1F14=0102100F70555283157A,2C2E3810=0102100F70555283157A,2C2E262C=0102100F70555283157A29,032C20201A=0102100F70555283157A00,2F80260A02=0102100F70555283157A00,2F80261838=0102100F70555283157A6C,2F80260E34=0102100F70555283157A6C,2F80260438=0102100F70555283157A6C,2C2E2F1A=0102100F70555283157A6C,2C2E2305=0102100F528315,7A70553525=0102100F5283152C8071,7A70550723=0102100F528315807138,7A7055032C200D2A=0102100F55528315,2F80267A2C71707D3316=0102100F55528315,2F80267A2C71707D1224=0102100F55528315,2F80267A2C71707D212E=0102100F55528315,2F80267A700616=0102100F55528315,2F80267A70380C=0102100F55528315,2F80267A700434=0102100F55528315,2F80267A702A18=0102100F55528315,7A2C71707D2628=0102100F55528315,7A2C71707D100C=0102100F55528315,7A2C71707D2F80261729=0102100F55528315,7A701F15=0102100F55528315,7A70240E=0102100F55528315,7A703632=0102100F55528315,7A701339=0102100F55528315,7A700115=0102100F55528315,7A702C2C37=0102100F55528315,7A702C320B=0102100F55528315,7A702C3206=0102100F55528315,7A702C2E2238=0102100F55528315,616D2F80267A2C71707D3816=0102100F555283153800,2F80267A701406=0102100F555283153800,2F80267A700111=0102100F555283152C8071,7A700501=0102100F555283152C8071,7A70370B=0102100F555283152C807138,7A703B37=0102100F555283152C80713800,7A701C2F=0102100F555283152920,7A702C240F=0102100F555283152920,7A702C0A03=0102100F555283152920,7A702C0221=0102100F55528315292000,7A702C2E3317=0102100F55528315292000,7A702C2E3634=0102100F5552831500,2F80267A2C71707D3028=0102100F5552831500,7A2C71707D111A=0102100F5552831500,7A2C71707D071E=0102100F5552831500,7A2C71707D2913=0102100F5552831500,7A702F19=0102100F5552831500,7A702301=0102100F5552831500,7A702C3919=0102100F5552831500,7A702C3B33=0102100F5552831500,7A702C2E0223=0102100F5552831500,7A702C03032F=0102100F55528315006C,7A702C2E262E=0102100F555283156C,2F80267A70032E=0102100F555283156C,7A2C71707D0F0B=0102100F555283156C,7A701D3B=0102100F555283156C,7A702C2E030116=01100F1571292C20,2F80267A703200=01100F1571292C20,7A7055370A=01100F1571292C2000,7A701B22=01100F1571292C2000,7A701E04=01100F1571292C2000,416D1336=01100F1571292C20007A70556C,391A=01100F1571292C20007A6C7055,1C24=01100F1571292C207A7055,2F80260D2E=01100F15712920,7A702C2E2D0A=01100F15712920,7A702C2E2800=01100F15712920027A7055,2C2E251E=01100F157129207A70556C,2C2E1228=01100F157129207A70556C,416D2C2E050A=01100F5220,7A70550000=01100F5220,616D2624=01100F5220,616D2F80267A702804=01100F5220006C,7A70550F06=01100F52207A70556C,2C2E2F1E=01100F52207A70556C,2C2E1014=01100F527A70556C,032C20161E=01100F712920,7A702C2E0A0A=01100F71522C2920,616D161C=0070100F292C20,01020F04=0006100F7020,7A7D01026D183A=0006100F7020,616D0102201C=0006100F20,7A2C71707D01026D1D37=000170100F292C20,2F18=000170100F292C802038,161D=00014B0F,032C201338=00014B0F2C2002,2F80261728=00014B0F20,2C2E0F0A=00014B0F20,7A2C71707D1833=00014B0F20,7A702C1407=00014B0F20,7A702C1401=0001060838,2C2E1123=0001060838,416D032C202019=000106082C38,2C31=000106082C38,391F=000106082C38,2523=000106082C38,7A70416D1C29=000106082C38020F71295283,3811=000106082C38020F71295283,7A700937=000106082C386C550F197120,7A700117=00010252100F29202C7A706C55,1337=00010206700F202C807138152952,3A2E=00010206100F7020,616D0610=00010206100F20,7A2C71707D0328=00010206100F20,7A700F01=00010206100F20,7A702C3310=00010206100F20,7A702C2E3139=0001100F298020,7A702C2625=00010870556C100F2C20,1909=00010870556C100F2C20,391E=00010870556C100F2C20,2124=00010870556C100F2C20,2F80267A7D0F00=00010870556C100F2C2038,2D09=00010870556C100F2C2002,0500=00010870556C100F2C207A,2C39=00010870556C100F2C207A,2518=00010870556C100F2C207A,0B0C=00010870556C100F2C207A,2F80262911=00010870556C100F7A,032C200007=000108556C100F2C2029,7A700A07=000108556C100F2C2029,7A701332=000108556C100F20,2C2E7A70100D=000108556C100F20,7A702C2E2239=000108556C100F20,7A702C2E0A01=000108556C100F20,7A702C2E380D=0001086C100F2C20,7A70551D36=0001086C100F2C20,7A70552F1F=000108100F70552920,010D=000108100F70552920,616D0507=000108100F705529202C80713815,0B0D=000108100F705529202C8071157A,3133=000108100F7055292002,2309=000108100F7055292002,416D0002=000108100F705529207A,2F80263202=000108100F705529207A,2F80263638=000108100F705529207A,2C2E2A1A=000108100F705529207A38,2F80262414=000108100F705529207A6C,2C2E2E14=000108100F552920,7A2C71707D1404=000108100F552920,7A2C71707D0B17=000108100F552920,7A70330D=000108100F552920,7A702C172F=000108100F552920,7A702C2E3707=000108100F5529206C,616D7A702C2E302E=6C55700F197120,2C2E7A7D0C22=6C55700F197120,7A7D01026D1E02=6C550F297120,000106037A703923=6C550F297120,7A702C2E03230A=6C550F1920,7A2C71707D240C=6C550F19200210,7A2C71707D000106031A16=6C550F197120,000106037A701513=6C550F197120,7A703A2B=6C550F197120,7A701837=6C550F197120,7A702F23=6C550F197120,7A702F22=6C550F197120,7A702D07=6C550F197120,7A702C2E3922=6C550F197120,7A700102093A=6C550F197120,7A70000106031B19=6C550F197120,616D7A70071F=6C550F197120,616D7A702C2E212B=6C550F197120,616D7A702C2E000106032734=6C550F197120292C,000106037A700325=6C550F1971200001020610,7A702C122B=6C550F19712008,000106037A702411=6C100F2952,7A7055032C20010E=100F2C29528320,01023704=100F2C29528320,0102363A=100F292C206C55,000106037A702B26=100F2920,7A2C71707D01026D302C=100F7055528315,01021E08=100F7055528315,01022730=100F7055528315,01021512=100F7055528315,010200352C=100F7055528315,7A7D01026D2F1C=100F7055528315,7A7D01026D0222=100F70555283153800,01026D2412=100F70555283157A,01022230=100F70555283157A,0102060E=100F70555283157A6C,01022C3A=100F70555283157A6C,01026D1F12=100F1571292C20,01026D3B36=100F1571292C20,01026D1516=100F1571292C20,000106037A702302=100F1571292C20,000106037A701D32=100F1571292C20,000106082F8026330E=100F1571292C20,000106086D2A1C=100F1571292C20,7A7001026D313A=100F1571292C20,7A7000010603341C=100F1571292C20,416D7A70000106032B2A=100F1571292C2002,000106037A700326=100F1571292C20556C,000106037A70273A=100F1571292C2000,01026D0722=100F1571292C2000,01026D2E0C=100F1571292C206C55,000106037A701408=100F1571292C207A706C55,01022020=100F1571292C207A706C55,000106081726=100F1571292C207A6C7055,0102290E=100F1571292C207A6C7055,000106080932=100F1571292C207A6C7055,000106080D26=100F52,00010608032C20100E=100F5283153800,01027A70550B16=100F5220,2F8026000106081122=100F5220,6D010200133A=100F5220,01026D1F16=100F5220,000106037A703132=100F5220,000106083B3A=100F5220,000106082522=100F5220,00010608190A=100F5220,000106082C2E021C=100F5220,7A70000106030936=100F52202C,01026D3A2C=100F52206C55,01027A701A0C=100F52206C55,000106037A700E30=100F52206C55,000106037A700A08=100F52207A706C55,000106083204=100F52207A6C5570,01026D0B0E=100F55528315,01027A2C71707D0004=100F55528315,7A2C71707D01026D1D3A=100F55528315,7A2C71707D01026D3418=100F5552831500,7A2C71707D0102201D=100F712920,7A702C2E00010608030E36=100F71522C2920,01023635=100F715229,00010608032C20021B=7A70550F2C715220,1900=7A70550F715220,2C2E0A09=7A70556C,00010608172C=7A70556C,00010608032C200B14=7A70556C,00010608032C202914=7A70556C0F197120,2C2E0938=7A70556C0F197120,000106082C2E111E=7A70556C000108,0502=7A70556C000108,2F80260D2F=7A70556C0001082C807138152952,2D0B=7A70556C0001082C807138152952,3633=7A70556C0001082C807115295256,0C18=7A70556C0008,01020218=7A70556C0008,0102302F=7A70556C100F295220,000106082C35=7A70556C100F295220,000106081E0B=7A70556C100F2952202C807115,3130=7A70556C100F29522002,000106080506=7A70556C100F29522001,2C2E330F=7A70556C100F29522001022C8071,010F=7A70556C100F295220010200,0435=7A70556C100F295280713815,032C200614=7A70556C100F295201,032C20122C=7A70556C100F29520102,032C203B39=7A706C550F297120,0F05=7A706C550F297102,032C200D25=7A706C550F19712001,616D2233=7A706C550F19712000010608,2626=7A6C70550F197120,01021A17=7A6C70550F197120,00010608262F=7A6C70550F1971202C29,000106083529=7A6C70550F19712002,616D000106082D08=7A6C70550F197120103800,0102341F=7A6C55700F197120,2C2E172B=082C38,7A7055000106030D27=082C38,7A70000106030827=08556C100F2C20,000106037A702803=08556C100F2C20,000106037A701013=08556C100F2C20,7A7000010603262B=08556C100F2C20,7A7000010603240D=08556C100F2C20,7A70000106033631=08556C100F2C20,7A70000106030431=08556C100F20,7A702C2E000106031D35=08100F552920,000106037A701335=08100F552920,000106037A700612=08100F55292038,000106037A70",SHEN_SHA:["{s.none}","{sn.tianEn}","{sn.muCang}","{sn.shiYang}","{sn.shengQi}","{sn.yiHou}","{sn.qingLong}","{sn.zaiSha}","{sn.tianHuo}","{sn.siJi}","{sn.baLong}","{sn.fuRi}","{sn.xuShi}","{sn.mingTang}","{sn.yueSha}","{sn.yueXu}","{sn.xueZhi}","{sn.tianZei}","{sn.wuXu}","{sn.tuFu}","{sn.guiJi}","{sn.xueJi}","{sn.yueDe}","{sn.yueEn}","{sn.siXiang}","{sn.wangRi}","{sn.tianCang}","{sn.buJiang}","{sn.yaoAn}","{sn.wuHe}","{sn.mingFeiDui}","{sn.yueJian}","{sn.xiaoShi}","{sn.tuHu}","{sn.wangWang}","{sn.tianXing}","{sn.tianDe}","{sn.guanRi}","{sn.jiQi}","{sn.yuYu}","{sn.daShi}","{sn.daBai}","{sn.xianChi}","{sn.zhuQue}","{sn.shouRi}","{sn.tianWu}","{sn.fuDe}","{sn.liuYi}","{sn.jinTang}","{sn.jinKui}","{sn.yanDui}","{sn.zhaoYao}","{sn.jiuKong}","{sn.jiuKan}","{sn.jiuJiao}","{sn.xiangRi}","{sn.baoGuang}","{sn.tianGang}","{sn.siShen}","{sn.yueXing}","{sn.yueHai}","{sn.youHuo}","{sn.chongRi}","{sn.shiDe}","{sn.minRi}","{sn.sanHe}","{sn.linRi}","{sn.tianMa}","{sn.shiYin}","{sn.mingFei}","{sn.siQi}","{sn.diNang}","{sn.baiHu}","{sn.yueDeHe}","{sn.jingAn}","{sn.yuTang}","{sn.puHu}","{sn.jieShen}","{sn.xiaoHao}","{sn.tianDeHe}","{sn.yueKong}","{sn.yiMa}","{sn.tianHou}","{sn.chuShen}","{sn.yuePo}","{sn.daHao}","{sn.wuLi}","{sn.tianLao}","{sn.yinDe}","{sn.fuSheng}","{sn.tianLi}","{sn.zhiSi}","{sn.yuanWu}","{sn.yangDe}","{sn.tianXi}","{sn.tianYi}","{sn.siMing}","{sn.yueYan}","{sn.diHuo}","{sn.fourHit}","{sn.daSha}","{sn.daHui}","{sn.tianYuan}","{sn.liuHe}","{sn.wuFu}","{sn.shengXin}","{sn.heKui}","{sn.jieSha}","{sn.siQiong}","{sn.gouChen}","{sn.chuShuiLong}","{sn.baFeng}","{sn.tianShe}","{sn.wuMu}","{sn.baZhuan}","{sn.yinCuo}","{sn.siHao}","{sn.yangCuo}","{sn.siFei}","{sn.sanYin}","{sn.xiaoHui}","{sn.yinDaoChongYang}","{sn.danYin}","{sn.guChen}","{sn.yinWei}","{sn.xingHen}","{sn.liaoLi}","{sn.jueYin}","{sn.chunYang}","{sn.qiNiao}","{sn.suiBo}","{sn.yinYangJiaoPo}","{sn.yinYangJuCuo}","{sn.yinYangJiChong}","{sn.zhuZhen}","{sn.yangCuoYinChong}","{sn.qiFu}","{sn.tianGou}","{sn.jiuHu}","{sn.chengRi}","{sn.tianFu}","{sn.guYang}","{sn.jueYang}","{sn.chunYin}","{sn.liuShe}","{sn.yinShen}","{sn.jieChu}","{sn.yangPoYinChong}"],DAY_SHEN_SHA:"100=010203040506,0708090A0B101=010C0D,0E0F101112131415102=16011718191A1B1C1D1E,1F20212223103=24011825261B271D1E,28292A2B104=012C2D2E2F3031,3233343536105=3738,393A3B3C3D123E106=3F404142434445,464748107=494A4B4C4D,4E108=4F5051524C4D5345,54555657109=58595345,5A5B12565C10A=5D415E5F60,616263640B6510B=0266676869,6A6B6C0A3E6D10C=1602171803041B05061E,07086E10D=24181B0C0D,0E0F1011126F13141510E=70191A1C1D,1F2021222310F=0125261B271D,28292A2B110=012C2D2E2F3031,3233343536111=49013738,393A3B3C3D123E112=4F50013F404142434445,4648113=014A4B,4E6E114=51524C4D5345,54550B5657115=0158595345,5A5B12565C116=1601185D415E5F60,61626364117=24021867681B69,6A6B3E6D118=0203040506,0708119=1B0C0D,0E0F10111213141511A=191A1B1C1D1E,1F2021222311B=4925261B271D1E,28292A11C=4F502C2D2E2F3031,323334353611D=3738,393A3B3C3D123E11E=3F404142434445,460B4811F=4A4B,4E71120=16171851524C4D5345,545556121=241858595345,5A5B12565C122=5D415E5F60,61626364123=0267681B69,6A6B3E6D124=0203041B05061E,070847125=491B0C0D,0E0F101112131415126=4F50191A1C1D1E,1F20212223127=2526271D1E,28292A2B128=2C2D2E2F3031,32333435360B129=3738,393A3B3C3D123E12A=1617183F404142434445,464812B=24184A4B,4E7212C=51524C4D53,5455565712D=0158595345,5A5B12565C12E=015D415E5F60,616263647312F=49010267681B69,6A6B3E6D130=4F500102030405061E,070874131=010C0D,0E0F101112131415726E132=191A1C1D1E,1F2021220B722375133=2526271D1E,28292A2B134=1617182C2D2E2F3031,3233343536135=24183738,393A3B3C3D126F3E136=3F4041424344,4648137=4A4B,4E72138=51524C4D5345,545576567257139=4958595345,5A5B7612565C7713A=4F505D415E5F60,6162636413B=02676869,6A6B3E6D200=1601025D60,393B28292A11090A201=0103041A1B4A,123435360B6D202=011819681B4C1D061E,3D1014203=011718252F591D0D1E,1F20213233204=012C26,3C23205=493751522D2E69,121364223E2B206=503F4005311E,6A3A5A5B207=5841440C38,4615208=431C4D45,6B4E5648209=27534B45,545507086162125620A=16666730,0E0F635720B=0241425E5F1B,6C0A0B3E5C20C=02185D1B601E,393B28292A116E20D=171803041B4A,126F3435366D20E=7019684C1D06,3D101420F=4901252F591D0D,1F2021323378210=50012C26,3C23211=013751522D2E69,121364223E2B212=013F40053145,6A3A5A5B213=015841440C38,46156E214=16431C4D5345,6B4E5648215=27534B45,545507086162120B5648216=18671B30,0E0F6357217=02171841425E5F1B,3E5C218=025D60,393B28292A11219=4903041A1B4A,123435366D21A=5019681B4C1D061E,3D101421B=252F591D0D45,1F2021323321C=2C26,3C2321D=3751522D2E69,121364223E2B21E=163F40053145,6A3A5A5B21F=5841440C38,467147150B220=18431C4D5345,6B4E5648221=171827534B45,5455070861621256222=6730,0E0F6357223=490241425E5F1B,3E5C224=50025D1B601E,393B28292A11225=03041A4A,123435366D226=19684C1D061E,3D1014227=252F591D0D1E,1F20213233228=162C26,3C23229=3751522D2E69,121364220B3E2B22A=183F40053145,6A3A5A5B22B=17185841440C38,46157222C=431C4D53,6B4E564822D=490127534B45,54550708616212567922E=5001671B30,0E0F635722F=010241425E5F,3E5C230=01025D601E,393B28292A1174231=0103041A4A,1234353647726E6D232=1619684C1D061E,3D1014233=252F591D0D1E,1F202132330B75234=182C26,3C23235=17183751522D2E69,126F1364223E2B236=3F400531,6A3A5A5B237=495841440C38,461572238=50431C4D5345,6B4E76567248239=27534B45,5455070861627612567323A=6730,0E0F635723B=0241425E5F,3E5C300=0102415E5F1A1B69,090A471457301=011B05,6A125C302=5001185D19515203042F0C1D601E,323315303=4F490118251C1D1E,3C5A5B106D304=012C2706,1F20213B710B787A305=58372668300D,6B123E306=173F402D2E45,07086423307=00,393A0E2B308=24164142444A533145,61624622567B309=674C533845,28292A4E12135630A=431B594D,5455633435364830B=021B27,3D116C0A3E30C=500218415E5F1A1B691E,146E5730D=4F49181B05,6A126F5C30E=705D19515203042F0C1D60,3233150B30F=01251C1D,3C5A5B106D310=01172C2706,1F20213B7C311=0158372668300D,6B123E312=2416013F402D2E45,0708476423313=01,393A0E0F6E2B314=4142444A533145,61624622567D315=66671B4C533845,28292A4E121356316=5018431B594D,54556334353648317=4F4902181B4B,3D113E318=02415E5F1A69,140B57319=1B05,6A125C31A=175D19515203042F0C1D601E,32331531B=251C1D1E,3C5A5B106D31C=24162C2706,1F20213B31D=58372668300D,6B123E31E=3F402D2E45,0708642331F=00,393A0E0F2B320=50184142444A533145,61624622567E321=4F4918671B4C533845,28292A4E121356322=43594D,5455633435360B48323=021B4B,3D113E324=0217415E5F1A691E,1457325=05,6A125C326=58165D19515203042F0C1D601E,323315327=251C1D1E,3C5A5B106D328=2C2706,1F20213B75329=58372668300D,6B123E32A=50183F402D2E45,0708642332B=4F4918,393A0E0F722B32C=4142444A5331,616246220B567B32D=01671B4C533845,28292A4E12135632E=011743594D,5455633435364832F=01024B,3D113E330=24160102415E5F1A691E,741457331=0105,6A12726E5C332=5D19515203042F0C1D601E,32331572333=251C1D1E,3C5A5B106D334=50182C2706,1F20213B335=4F491858372668300D,6B126F3E336=3F402D2E,0708640B23337=00,393A0E0F722B338=174142444A533145,616246762256727B73339=674C533845,28292A4E7612135633A=241643594D,5455633435364833B=024B,3D113E400=5001431B,5A5B1248401=490141425E5F2F4B,32336314402=4F01024A1D1E,396B3C130B57403=01025803044C1D1E,07085C404=01183F5D5960,0E0F10127F405=171819,1F20213E6D788075406=162526690645,28292A407=242C2D2E050D,6162343536647B408=3767680C5345,6A3A3B3D12155623409=4041441C5345,46562B40A=501B274D31,4E1140B=4951521A1B3038,5455223E40C=4F431B1E,5A5B0981120B6E4840D=41425E5F2F4B,3233631440E=02184A1D,396B3C135740F=010217185803044C1D,0708475C410=16013F585960,0E0F1012411=240119,1F20213E6D412=012526690645,28292A413=012C2D2E050D,6162343536646E7B414=503767681B0C5345,6A3A3B3D126F155623415=494041441B1C5345,46562B416=4F1B274D31,4E11710B417=51521A1B3038,54556C81223E418=18431B,5A5B1248419=171841425E5F2F4B,3233631441A=16024A1D1E,396B3C135741B=24025844044C1D1E,07085C41C=3F5D5960,0E0F101241D=19,1F20213E6D41E=50702526690645,28292A41F=492C2D2E050D,6162343536647D420=4F663767681B0C5345,6A3A3B3D12150B5623421=4041441B1C5345,46562B422=181B274D31,4E11423=171851521A3038,5455223E424=16431E,5A5B1248425=2441425E5F2F4B,32336314426=024A1D1E,396B3C1357427=025803044C1D1E,07085C428=503F5D5960,0E0F10126F429=4919,1F20213E6D42A=4F2526690645,28292A0B8242B=2C2D2E050D,616234353664727E7342C=183767681B0C53,6A3A3B3D1215562342D=0117184041441C5345,4647562B42E=1601274D31,4E1142F=240151521A3038,5455223E430=01431E,5A5B761248431=0141425E5F2F4B,32336314726E432=50024A1D1E,396B3C137257433=49025844044C1D1E,0708745C434=4F3F5D5960,0E0F10120B435=19,1F20213E6D75436=1825266906,28292A82437=17182C2D2E050D,616234353664727B73438=163767680C5345,6A3A3B3D1215567223439=244041441C5345,46562B43A=274D31,4E1143B=51521A3038,545576223E83500=012F4D31,54550708323312501=01586938,0E0F3C63502=16010241435E5F051D1E,641448503=01020C1D4B1E,6A28292A353615220B504=0117183F03041C,123457505=181927,3D103E5C506=5D25306045,1F20213B616213507=492C2667,6D508=503751522D2E530645,1256509=401B4A530D45,393A5A5B115650A=4142441A1B4C,462350B=681B59,6B4E3E2B50C=162F4D311E,5455070832330981126E50D=586938,0E0F3C0B50E=02171841435E5F051D,64144850F=0102180C1D4B,6A28292A35361522510=013F03041C,123457511=49011927,3D103E5C512=50015D25306045,1F20213B616213513=012C26671B,6E6D514=3751522D2E1B530645,126F56515=401B4A530D45,393A5A5B1156516=164142441A1B4C,467123517=6859,6B4E6C810B3E2B518=17182F4D31,54550708323312519=18586938,0E0F3C6351A=0241435E5F051D1E,64144851B=49020C1D4B1E,6A28292A3536152251C=503F03041C,12345751D=1927,3D103E5C51E=705D25306045,1F20213B61621351F=2C26671B,6D520=163751522D2E1B530645,1256521=404A530D45,393A5A5B110B56522=17184142441A1B,4623523=186859,6B4E3E2B524=2F4D311E,54550708323312525=49586938,0E0F3C63526=500241435E5F051D1E,641448527=020C1D4B1E,6A28292A35361522528=3F03041C,126F344757529=1927,3D103E5C52A=165D25306045,1F20213B616213658452B=662C2667,0B726D52C=17183751522D2E1B5306,125652D=0118404A530D45,393A5A5B115652E=014142441A4C,462352F=49016859,6B4E3E2B530=50012F4D311E,545507083233761285531=01586938,0E0F3C63726E532=0241435E5F051D1E,64147248533=020C1D4B1E,6A28292A7435361522534=163F03041C,123457535=1927,3D100B3E5C536=16185D253060,1F20213B61621378537=182C2667,726D538=3751522D2E530645,125672539=49404A530D45,393A5A5B115653A=504142441A4C,46472353B=681B59,6B4E763E2B600=241601304D,3C28292A4E1235361423601=01,54553B63342B602=0102681D311E,3D603=010241425E5F4A1D381E,64604=01183F434C,39127148605=4F49181951520304594B,61620B3E73606=50256745,5A5B102257607=172C69,1F20215C608=5D37261B05536045,6B111256609=402D2E1A1B0C5345,6B11125660A=24161B1C06,6A3A0E0F1360B=5841442F270D,3233463E60C=304D1E,3C28292A4E0981123536146E2360D=00,54553B63342B60E=0218681D31,3D60F=4F4901021841425E5F4A1D38,640B610=50013F434C,391248611=01171951520304594B,61623E612=0125671B45,5A5B102257613=012C1B69,1F20216E5C614=24165D37261B05536045,6B11126F56615=402D2E1A1B0C5345,070815566D616=1C06,6A3A0E0F1347617=5841442F270D,3233466C813E618=18304D,3C28292A4E1235361423619=4F4918,54553B63340B2B61A=5002681D311E,3D61B=021741425E5F4A1D381E,6461C=3F434C,39124861D=1951520304594B,61623E61E=24167025671B45,5A5B10225761F=2C1B69,1F20215C620=5D372605536045,6B111256621=402D2E1A0C5345,070815566D622=181B1C06,6A3A0E0F13623=4F49185841442F270D,3233460B3E624=50304D1E,3C28292A4E1235361423625=17,54553B63342B626=02681D311E,3D627=0241425E5F4A1D381E,64628=24163F434C,39126F48629=1951520304594B,61623E62A=256745,5A5B1022578662B=2C69,1F2021725C7562C=185D37261B055360,6B11125662D=4F490118402D2E1A0C5345,0708150B566D62E=50011C06,6A3A0E0F1362F=01175841442F270D,3233463E630=01304D1E,3C28292A4E761235361423631=01,54553B6334726E2B87632=241602681D311E,3D72633=0241425E5F4A1D381E,7464634=3F434C,39124748635=1951520304594B,61623E6573636=661825671B,5A5B10225786637=4F49182C69,1F20210B725C75638=505D372605536045,6B11125672639=17402D2E1A0C5345,070815566D63A=1B1C06,6A3A0E0F1363B=5841442F270D,323346763E700=0103404142445906,46701=01020D,4E14702=50015152694D1D1E,54553B23703=4901051D1E,5A5B2B1288704=4F0102415E5F0C31,6162636415705=6667681C38,6A6B3E706=4303042745,07080B48707=02304B,0E0F101112708=16171819,1F20135657709=24185825261B5345,28292A353622565C70A=025D2C2D2E2F4A60,3233893470B=374C,393A3C3D3E6D70C=503F4041424459061E,466E70D=49020D,4E1470E=4F5152694D1D,54553B70F=01051D,5A5B12132B710=0102415E5F0C31,61626364150B65711=0167681C38,6A6B3E712=162417184303041B2745,070848713=240102181B304B,0E0F1011126E714=191A1B5345,1F20215657715=5825261B5345,28292A353622565C717=49374C,393A3C3D126F473E6D718=4F3F404142445906,46719=020D,4E1471A=515269,1D1E71B=051D1E,5A5B12132B71C=16021718415E5F0C31,616263641571D=241867681B1C38,6A6B3E71E=4303041B2745,07084871F=021B30,0E0F101112720=50191A5345,1F20215657721=495825265345,28292A353622565C722=4F025D2C2D2E2F4A60,32338934723=374C,393A3C3D123E6D724=3F4041424459061E,46098A0B725=020D,4E7114726=1617185152694D1D1E,54553B23727=2418051D1E,5A5B12132B728=02415E5F0C31,616263641573729=67681B1C38,6A6B3E72A=504303042745,07084872B=4902304B,0E0F1011126F7272C=4F70191A1B,1F2021565772D=015825265345,28292A353622565C72E=01025D2C2D2E2F4A60,323389340B72F=01374C,393A3C3D6C8A123E6D730=160117183F4041424459061E,46731=240102180D,4E14726E732=5152694D1D1E,54553B767223733=051D1E,5A5B7612132B77734=5002415E5F0C31,6162636415735=4967681C38,6A6B473E736=4F4303041B27,7448737=02304B,0E0F10111272738=191A5345,1F20210B56725775739=5825265345,28292A353622565C73A=160217185D2C2D2E2F4A60,3233893473B=2418374C,393A3C3D123E6D800=50013F5D402760,6A3A5A5B22801=490102414430,466D802=014D1D061E,6B4E4714803=011D0D1E,54550708616212804=0102671B4A,0E0F6323805=41425E5F4C,8B2B806=16593145,3928292A113536807=025803041A1B38,1234130B808=181943681B695345,3D105648809=1718252F0553534B45,1F20213B32335680A=50022C260C,3C155780B=493751522D2E1C,12643E5C80C=3F5D4027601E,6A3A5A5B226E80D=02414430,466D80E=4D1D06,6B4E1480F=011D0D,5455070861621279810=16010266674A,0E0F6323811=0141425E5F1B4C,0B3E2B812=01181B593145,3928292A113536813=010217185803041A1B38,1234136E814=501943681B695345,3D105648815=49252F05534B45,1F20213B323356816=022C260C,3C1557817=3751522D2E1C,126F643E5C818=3F5D402760,6A3A5A5B22819=02414430,466D81A=164D1D061E,6B4E1481B=1D0D1E,545507086162120B6581C=0218671B4A,0E0F632381D=171841425E5F1B4C,3E2B81E=501B593145,3928292A11353681F=49025D03041A38,123413820=194368695345,3D10475648821=252F05534B45,1F20213B323356716=50025D2C2D2E2F4A60,32338934822=022C260C,3C1557823=3751522D2E1C,12643E5C824=163F5D4027601E,6A3A5A5B098A22825=02414430,46710B6D826=184D1D061E,6B4E14827=17181D0D1E,54550708616212828=5002671B4A,0E0F6323829=4941425E5F4C,3E2B82A=593145,3928292A11353682B=025803041A38,126F34137282C=701943681B6953,3D10564882D=01252F05534B45,1F2021613233567882E=1601022C260C,3C155782F=013751522D2E1C,6C8A12640B3E5C830=01183F5D4027601E,6A3A5A5B22831=01021718414430,46726E6D832=504D1D061E,6B4E761472833=491D0D1E,545507086162761273834=02674A,0E0F6323835=41425E5F4C,3E2B836=1B5931,3928292A11743536837=025803041A38,12341372838=16194368695345,3D10567248839=252F05534B45,1F20213B32330B567583A=02182C260C,3C155783B=17183751522D2E1C,12643E5C900=013F408C2E4C,0708641457901=010259,393A0E0F5C902=2416015D4142441D601E,61624635367B903=0167691D1E,28292A4E126D904=01021B054D06,5455637134220B905=580C0D,3D11153E906=17415E5F1A1B1C45,23907=4F49021B27,6A3B12472B908=501819515203042F30533145,323356909=1825533845,3C5A5B105690A=022C43,1F2021487C90B=3726684A4B,6B12133E90C=24163F402D2E4C1E,070864146E5790D=0259,393A0E0F5C90E=5D4142441D60,61624635360B7B90F=0167691D,28292A4E126D910=0102171B054D06,5455633422911=4F4901581B0C0D,3D11153E912=500118415E5F1A1B1C45,23913=0102181B27,6A3B126E2B914=19515203042F30533145,323356915=25533845,3C5A5B1056916=2416022C43,1F202148917=3726684A4B,6B126F133E918=3F402D2E4C,070864140B57919=0259,393A0E0F5C91A=175D4142441D601E,61624635367D91B=4F4966671B691D1E,28292A4E126D91C=5002181B054D06,545563342291D=18581B0C0D,3D11153E91E=415E5F1A1C45,2391F=0227,6A3B122B920=241619515203042F305331,323356921=25533845,3C5A5B1056922=022C43,1F20210B48788D923=3726684A4B,6B12133E924=173F402D2E4C1E,0708098A641457925=4F49022E,393A0E0F475C926=50185D4142441D601E,61624635367E927=18671B691D1E,28292A4E126D928=02054D06,5455633422929=580C0D,3D11153E92A=2416415E5F1A1C45,2392B=0227,6A3B126F722B92C=7019515203042F305331,32330B5692D=0125533845,3C5A5B105692E=0102162C43,1F2021487592F=4F49013726684A4B,6B6C8A12133E930=5001183F402D2E4C1E,0708641457931=01021859,393A0E0F726E5C932=5D4142441D601E,616246763536727B73933=67691D1E,28292A4E76126D934=241602054D06,5455633422935=580C0D,3D11153E936=415E5F1A1B1C,740B23937=0227,6A3B12722B938=1719515203042F30533145,32335672939=4F4925533845,3C5A5B105693A=5002182C43,1F20214893B=183726684A4B,6B12133EA00=160170182543261C,28292A48A01=240117182C2D2E274B,61623464147BA02=013F376768301D1E,6A3A3D1257A03=01584041441D1E,465CA04=015D4D60,4E1113A05=4951521A1B4A,54553E6DA06=4F501B4C0645,5A5B12A07=41425E5F2F590D,32336322A08=025345,396B3C0B5623A09=020304695345,0708562BA0A=16180531,0E0F10126FA0B=241618190C38,1F20213B3536103EA0C=2543261C1E,28292A6E48A0D=2C2D2E274B,61623464147BA0E=3F376768301D,6A3A3D124757A0F=4924584041441B1D,465CA10=4F50015D1B4D60,4E1113A11=0151521A1B4A,54553E6DA12=011B4C0645,5A5B120BA13=0141425E5F2F590D,323363226EA14=1602185345,396B3C5623A15=240217180304695345,0708562BA16=0531,0E0F1012A17=190C38,1F20213B3536153EA18=2543261C,28292A4882A19=49503F3767681B301D1E,6A3A3D1257A1A=4F503F3767681B301D1E,6A3A3D1257A1B=584041441B1D1E,465CA1C=5D1B4D60,4E1171130BA1D=51521A1B4A,54553E6DA1E=16184C0645,5A5B12A1F=24171841425E5F2F590D,32336322A20=025345,396B3C5623A21=020304695345,0708562BA22=0531,0E0F10128EA23=49190C38,1F20213B3536153E788FA24=4F502543261C1E,28292A48A25=2C2D2E274B,61623464147DA26=663F3767681B301D1E,6A3A3D120B57A27=584041441B1D1E,465CA28=16185D4D60,4E1113A29=24171851521A4A,54553E6DA2A=4C0645,5A5B7612A2B=41425E5F2F590D,3233632272A2C=0253,396B3C475623A2D=1601020304695345,0708562BA2E=4F50010531,0E0F1012A2F=01190C38,1F20213B3536153EA30=012543261C1E,28292A09900B4882A31=012C2D2E274B,6162346414726E7E73A32=16183F376768301D1E,6A3A3D126F7257A33=2417185D4041441D1E,465CA34=5D4D60,4E1113A35=51521A4A,5455763E6D83A36=4C06,5A5B12A37=4941425E5F2F590D,3233632272A38=4F50029145,396B3C567223A39=020304695345,070874562BA3A=0531,0E0F10120BA3B=190C38,1F20213B6C903536153E75B00=01701718254A31,1F20216162B01=0118582C26,674C38B02=50013F375152432D2E591D1E,121448B03=4901401B1D4B1E,393A5B11B04=014142441A69,4657B05=681B05,6B4E3E5CB06=682F0C4D6045,5455070832331215B07=1C,0E0F3C636DB08=1602415E5F27530645,3536136456B09=0230530D45,6A28292A0B56B0A=17180304,126F342223B0B=1819,3D103E2BB0C=50254A311E,1F202161626EB0D=49582C26,671B4C38B0E=3F375152432D2E591D,121448B0F=01401B1D4B,393A3B5A5B11B10=014142441A1B69,4657B11=01681B05,6B4E3E5CB12=16015D2F0C4D6045,5455070832331215B13=011C,0E0F3C630B6E6DB14=021718415E5F27530645,3536136456B15=021830530D45,6A28292A56B16=500304,12342223B17=4919,3D103E2BB18=254A31,1F4E21616278B19=582C26,671B4C38B1A=3F375152432D2E1B591D1E,121448B1B=401B1D4B1E,393A3B5A5B1147B1C=164142441A1B69,467157B1D=6805,6B4E0B3E5CB1E=17185D2F0C926045,5455070832331215B1F=181C,0E0F3C636DB20=5002415E5F27530645,3536136456B21=490230530D45,6A28292A56B22=0304,12342223B23=19,3D103E2BB24=254A311E,1F20136162B25=582C26671B4C38,00B26=163F375152432D2E1B591D1E,121448B27=401D4B1E,393A3B5A5B110BB28=17184142441A69,4657B29=186805,6B4E3E5CB2A=505D2F0C4D6045,54550708323376121585B2B=491C,0E0F3C63726DB2C=02415E5F275306,3536136456B2D=010230530D45,6A28292A56B2E=010304,12342223B2F=0119,3D103E2BB30=1601254A311E,1F2021616209906584B31=0166582C26674C38,0B726EB32=17183F375152432D2E591D1E,126F147248B33=18401D4B1E,393A3B5A5B11B34=504142441A69,4657B35=49681B05,6B4E763E5CB36=5D2F0C4D60,5455070832331215B37=1C,0E0F3C63726DB38=02415E5F27530645,353613645672B39=0230530D45,6A28292A744756B3A=160304,12342223B3B=19,3D106C900B3E2BC00=500170661825670C,5A5B1013141523C01=4F4901182C1C,1F2021222BC02=011637261B271D311E,6B1112C03=01402D2E1A1B311D381E,0708C04=0143,6A3A0E0F7148C05=41442F4B,32334635360B3EC06=24164A4D45,3C28292A4E1257C07=174C,545563345CC08=025D6859536045,3D56C09=0241425E5F5345,4764566DC0A=50186906,393B126FC0B=4F4918581951520304050D,61623EC0C=25671B0C1E,5A5B101314156E23C0D=2C1B1C,1F2021222BC0E=3F37264B1D31,6B1112C0F=01402D2E1A1B301D38,07080BC10=241601431B,6A3A0E0F48C11=011741442F4B,32334635363EC12=014A4D45,3C28292A4E1257C13=014C,545563346E5CC14=5002185D6804536045,3D56C15=4F49021841425E5F5345,64566DC16=6906,393B12C17=581951524404050D,61623EC18=25670C,5A5B101314152386C19=2C1B1C,1F2021220B2BC1A=24163F37261B271D31,6B1112C1B=17402D2E1A1B301D381E,0708C1C=43,6A3A0E0F48C1D=41582F4B,32334635363EC1E=50184A4D45,3C28292A4E1257C1F=4F49184C,545563345CC20=025D6859536045,3D56C21=0241425E5F5345,64566DC22=6906,393B12C23=581951520304050D,61620B3EC24=241625671B0C1E,5A5B1013141523C25=172C1B1C,1F2021222BC26=3F3726271D311E,6B1112C27=402D2E1A301D381E,0708C28=501843,6A5B0E0F48C29=4F491841442F4B,32334635363EC2A=4A4D45,3C28292A4E761257C2B=4C,54556334725C93C2C=025D68595360,3D56C2D=010241425E5F5345,640B566DC2E=2416016906,393B12C2F=0117581951520304050D,61623EC30=0125670C,5A5B1009901314152386C31=012C1C,1F202122726E2B75C32=50183F3726271D311E,6B11126F72C33=4F4918402D2E1A301D381E,070847C34=431B,6A3A0E0F48C35=41442F4B,3233467635363EC36=4A4D,3C28292A4E1257C37=4C,545563340B725CC38=2416025D6859536045,3D5672C39=021741425E5F5345,7464566DC3A=6906,393B12C3B=581951520304050D,61626C903E6573",getTimeZhiIndex:function(n){if(!n)return 0;n.length>5&&(n=n.substring(0,5));for(var i=1,t=1;t<22;t+=2){if(n>=(t<10?"0":"")+t+":00"&&n<=(t+1<10?"0":"")+(t+1)+":59")return i;i++}return 0},convertTime:function(n){return this.ZHI[this.getTimeZhiIndex(n)+1]},getJiaZiIndex:function(n){return this.index(n,this.JIA_ZI,0)},hex:function(n){var i=n.toString(16);return i.length<2&&(i="0"+i),i.toUpperCase()},getDayYi:function(n,i){for(var t=[],e=this.hex(this.getJiaZiIndex(i)),a=this.hex(this.getJiaZiIndex(n)),g=this.DAY_YI_JI,r=g.indexOf(e+"=");r>-1;){var u=g=g.substring(r+3);u.indexOf("=")>-1&&(u=u.substring(0,u.indexOf("=")-2));var h,s,o=!1,F=u.substring(0,u.indexOf(":"));for(h=0,s=F.length;h<s;h+=2)if(F.substring(h,h+2)===a){o=!0;break}if(o){var C=u.substring(u.indexOf(":")+1);for(h=0,s=(C=C.substring(0,C.indexOf(","))).length;h<s;h+=2)t.push(this.YI_JI[parseInt(C.substring(h,h+2),16)]);break}r=g.indexOf(e+"=")}return t.length<1&&t.push(this.SHEN_SHA[0]),t},getDayJi:function(n,i){for(var t=[],e=this.hex(this.getJiaZiIndex(i)),a=this.hex(this.getJiaZiIndex(n)),g=this.DAY_YI_JI,r=g.indexOf(e+"=");r>-1;){var u=g=g.substring(r+3);u.indexOf("=")>-1&&(u=u.substring(0,u.indexOf("=")-2));var h,s,o=!1,F=u.substring(0,u.indexOf(":"));for(h=0,s=F.length;h<s;h+=2)if(F.substring(h,h+2)===a){o=!0;break}if(o){var C=u.substring(u.indexOf(",")+1);for(h=0,s=C.length;h<s;h+=2)t.push(this.YI_JI[parseInt(C.substring(h,h+2),16)]);break}r=g.indexOf(e+"=")}return t.length<1&&t.push(this.SHEN_SHA[0]),t},getDayJiShen:function(n,i){var t=[],e=this.hex(this.getJiaZiIndex(i)),a=Math.abs(n).toString(16).toUpperCase(),g=this.DAY_SHEN_SHA.indexOf(a+e+"=");if(g>-1){var r=this.DAY_SHEN_SHA.substring(g+4);r.indexOf("=")>-1&&(r=r.substring(0,r.indexOf("=")-3));for(var u=r.substring(0,r.indexOf(",")),h=0,s=u.length;h<s;h+=2)t.push(this.SHEN_SHA[parseInt(u.substring(h,h+2),16)])}return t.length<1&&t.push(this.SHEN_SHA[0]),t},getDayXiongSha:function(n,i){var t=[],e=this.hex(this.getJiaZiIndex(i)),a=Math.abs(n).toString(16).toUpperCase(),g=this.DAY_SHEN_SHA.indexOf(a+e+"=");if(g>-1){var r=this.DAY_SHEN_SHA.substring(g+4);r.indexOf("=")>-1&&(r=r.substring(0,r.indexOf("=")-3));for(var u=r.substring(r.indexOf(",")+1),h=0,s=u.length;h<s;h+=2)t.push(this.SHEN_SHA[parseInt(u.substring(h,h+2),16)])}return t.length<1&&t.push(this.SHEN_SHA[0]),t},getTimeYi:function(n,i){var t=[],e=this.hex(this.getJiaZiIndex(n)),a=this.hex(this.getJiaZiIndex(i)),g=this.TIME_YI_JI.indexOf(e+a+"=");if(g>-1){var r=this.TIME_YI_JI.substring(g+5);r.indexOf("=")>-1&&(r=r.substring(0,r.indexOf("=")-4));for(var u=r.substring(0,r.indexOf(",")),h=0,s=u.length;h<s;h+=2)t.push(this.YI_JI[parseInt(u.substring(h,h+2),16)])}return t.length<1&&t.push(this.SHEN_SHA[0]),t},getTimeJi:function(n,i){var t=[],e=this.hex(this.getJiaZiIndex(n)),a=this.hex(this.getJiaZiIndex(i)),g=this.TIME_YI_JI.indexOf(e+a+"=");if(g>-1){var r=this.TIME_YI_JI.substring(g+5);r.indexOf("=")>-1&&(r=r.substring(0,r.indexOf("=")-4));for(var u=r.substring(r.indexOf(",")+1),h=0,s=u.length;h<s;h+=2)t.push(this.YI_JI[parseInt(u.substring(h,h+2),16)])}return t.length<1&&t.push(this.SHEN_SHA[0]),t},getXunIndex:function(n){var i=this.find(n,this.GAN).index-this.find(n,this.ZHI).index;return i<0&&(i+=12),Math.floor(i/2)},getXun:function(n){return this.XUN[this.getXunIndex(n)]},getXunKong:function(n){return this.XUN_KONG[this.getXunIndex(n)]},index:function(n,i,t){for(var e=0,a=i.length;e<a;e++)if(i[e]===n)return e+t;return-1},find:function(n,i){for(var t=0,e=i.length;t<e;t++){var a=i[t];if(!(a.length<1)&&n.indexOf(a)>-1)return{index:t,value:a}}return null}},_n=(A=["元旦节","春节","清明节","劳动节","端午节","中秋节","国庆节","国庆中秋","抗战胜利日"],E=18,D="0".charCodeAt(0),x=A,c="200112290020020101200112300020020101200201010120020101200201020120020101200201030120020101200202091020020212200202101020020212200202121120020212200202131120020212200202141120020212200202151120020212200202161120020212200202171120020212200202181120020212200204273020020501200204283020020501200205013120020501200205023120020501200205033120020501200205043120020501200205053120020501200205063120020501200205073120020501200209286020021001200209296020021001200210016120021001200210026120021001200210036120021001200210046120021001200210056120021001200210066120021001200210076120021001200301010120030101200302011120030201200302021120030201200302031120030201200302041120030201200302051120030201200302061120030201200302071120030201200302081020030201200302091020030201200304263020030501200304273020030501200305013120030501200305023120030501200305033120030501200305043120030501200305053120030501200305063120030501200305073120030501200309276020031001200309286020031001200310016120031001200310026120031001200310036120031001200310046120031001200310056120031001200310066120031001200310076120031001200401010120040101200401171020040122200401181020040122200401221120040122200401231120040122200401241120040122200401251120040122200401261120040122200401271120040122200401281120040122200405013120040501200405023120040501200405033120040501200405043120040501200405053120040501200405063120040501200405073120040501200405083020040501200405093020040501200410016120041001200410026120041001200410036120041001200410046120041001200410056120041001200410066120041001200410076120041001200410096020041001200410106020041001200501010120050101200501020120050101200501030120050101200502051020050209200502061020050209200502091120050209200502101120050209200502111120050209200502121120050209200502131120050209200502141120050209200502151120050209200504303020050501200505013120050501200505023120050501200505033120050501200505043120050501200505053120050501200505063120050501200505073120050501200505083020050501200510016120051001200510026120051001200510036120051001200510046120051001200510056120051001200510066120051001200510076120051001200510086020051001200510096020051001200512310020060101200601010120060101200601020120060101200601030120060101200601281020060129200601291120060129200601301120060129200601311120060129200602011120060129200602021120060129200602031120060129200602041120060129200602051020060129200604293020060501200604303020060501200605013120060501200605023120060501200605033120060501200605043120060501200605053120060501200605063120060501200605073120060501200609306020061001200610016120061001200610026120061001200610036120061001200610046120061001200610056120061001200610066120061001200610076120061001200610086020061001200612300020070101200612310020070101200701010120070101200701020120070101200701030120070101200702171020070218200702181120070218200702191120070218200702201120070218200702211120070218200702221120070218200702231120070218200702241120070218200702251020070218200704283020070501200704293020070501200705013120070501200705023120070501200705033120070501200705043120070501200705053120070501200705063120070501200705073120070501200709296020071001200709306020071001200710016120071001200710026120071001200710036120071001200710046120071001200710056120071001200710066120071001200710076120071001200712290020080101200712300120080101200712310120080101200801010120080101200802021020080206200802031020080206200802061120080206200802071120080206200802081120080206200802091120080206200802101120080206200802111120080206200802121120080206200804042120080404200804052120080404200804062120080404200805013120080501200805023120080501200805033120080501200805043020080501200806074120080608200806084120080608200806094120080608200809135120080914200809145120080914200809155120080914200809276020081001200809286020081001200809296120081001200809306120081001200810016120081001200810026120081001200810036120081001200810046120081001200810056120081001200901010120090101200901020120090101200901030120090101200901040020090101200901241020090125200901251120090125200901261120090125200901271120090125200901281120090125200901291120090125200901301120090125200901311120090125200902011020090125200904042120090404200904052120090404200904062120090404200905013120090501200905023120090501200905033120090501200905284120090528200905294120090528200905304120090528200905314020090528200909276020091001200910016120091001200910026120091001200910036120091001200910046120091001200910055120091003200910065120091003200910075120091003200910085120091003200910105020091003201001010120100101201001020120100101201001030120100101201002131120100213201002141120100213201002151120100213201002161120100213201002171120100213201002181120100213201002191120100213201002201020100213201002211020100213201004032120100405201004042120100405201004052120100405201005013120100501201005023120100501201005033120100501201006124020100616201006134020100616201006144120100616201006154120100616201006164120100616201009195020100922201009225120100922201009235120100922201009245120100922201009255020100922201009266020101001201010016120101001201010026120101001201010036120101001201010046120101001201010056120101001201010066120101001201010076120101001201010096020101001201101010120110101201101020120110101201101030120110101201101301020110203201102021120110203201102031120110203201102041120110203201102051120110203201102061120110203201102071120110203201102081120110203201102121020110203201104022020110405201104032120110405201104042120110405201104052120110405201104303120110501201105013120110501201105023120110501201106044120110606201106054120110606201106064120110606201109105120110912201109115120110912201109125120110912201110016120111001201110026120111001201110036120111001201110046120111001201110056120111001201110066120111001201110076120111001201110086020111001201110096020111001201112310020120101201201010120120101201201020120120101201201030120120101201201211020120123201201221120120123201201231120120123201201241120120123201201251120120123201201261120120123201201271120120123201201281120120123201201291020120123201203312020120404201204012020120404201204022120120404201204032120120404201204042120120404201204283020120501201204293120120501201204303120120501201205013120120501201205023020120501201206224120120623201206234120120623201206244120120623201209295020120930201209305120120930201210016120121001201210026120121001201210036120121001201210046120121001201210056120121001201210066120121001201210076120121001201210086020121001201301010120130101201301020120130101201301030120130101201301050020130101201301060020130101201302091120130210201302101120130210201302111120130210201302121120130210201302131120130210201302141120130210201302151120130210201302161020130210201302171020130210201304042120130404201304052120130404201304062120130404201304273020130501201304283020130501201304293120130501201304303120130501201305013120130501201306084020130612201306094020130612201306104120130612201306114120130612201306124120130612201309195120130919201309205120130919201309215120130919201309225020130919201309296020131001201310016120131001201310026120131001201310036120131001201310046120131001201310056120131001201310066120131001201310076120131001201401010120140101201401261020140131201401311120140131201402011120140131201402021120140131201402031120140131201402041120140131201402051120140131201402061120140131201402081020140131201404052120140405201404062120140405201404072120140405201405013120140501201405023120140501201405033120140501201405043020140501201405314120140602201406014120140602201406024120140602201409065120140908201409075120140908201409085120140908201409286020141001201410016120141001201410026120141001201410036120141001201410046120141004201410056120141001201410066120141001201410076120141001201410116020141001201501010120150101201501020120150101201501030120150101201501040020150101201502151020150219201502181120150219201502191120150219201502201120150219201502211120150219201502221120150219201502231120150219201502241120150219201502281020150219201504042120150405201504052120150405201504062120150405201505013120150501201505023120150501201505033120150501201506204120150620201506214120150620201506224120150620201509038120150903201509048120150903201509058120150903201509068020150903201509265120150927201509275120150927201510016120151001201510026120151001201510036120151001201510046120151004201510056120151001201510066120151001201510076120151001201510106020151001201601010120160101201601020120160101201601030120160101201602061020160208201602071120160208201602081120160208201602091120160208201602101120160208201602111120160208201602121120160208201602131120160208201602141020160208201604022120160404201604032120160404201604042120160404201604303120160501201605013120160501201605023120160501201606094120160609201606104120160609201606114120160609201606124020160609201609155120160915201609165120160915201609175120160915201609185020160915201610016120161001201610026120161001201610036120161001201610046120161001201610056120161001201610066120161001201610076120161001201610086020161001201610096020161001201612310120170101201701010120170101201701020120170101201701221020170128201701271120170128201701281120170128201701291120170128201701301120170128201701311120170128201702011120170128201702021120170128201702041020170128201704012020170404201704022120170404201704032120170404201704042120170404201704293120170501201704303120170501201705013120170501201705274020170530201705284120170530201705294120170530201705304120170530201709306020171001201710016120171001201710026120171001201710036120171001201710045120171004201710056120171001201710066120171001201710076120171001201710086120171001201712300120180101201712310120180101201801010120180101201802111020180216201802151120180216201802161120180216201802171120180216201802181120180216201802191120180216201802201120180216201802211120180216201802241020180216201804052120180405201804062120180405201804072120180405201804082020180405201804283020180501201804293120180501201804303120180501201805013120180501201806164120180618201806174120180618201806184120180618201809225120180924201809235120180924201809245120180924201809296020181001201809306020181001201810016120181001201810026120181001201810036120181001201810046120181001201810056120181001201810066120181001201810076120181001201812290020190101201812300120190101201812310120190101201901010120190101201902021020190205201902031020190205201902041120190205201902051120190205201902061120190205201902071120190205201902081120190205201902091120190205201902101120190205201904052120190405201904062120190405201904072120190405201904283020190501201905013120190501201905023120190501201905033120190501201905043120190501201905053020190501201906074120190607201906084120190607201906094120190607201909135120190913201909145120190913201909155120190913201909296020191001201910016120191001201910026120191001201910036120191001201910046120191001201910056120191001201910066120191001201910076120191001201910126020191001202001010120200101202001191020200125202001241120200125202001251120200125202001261120200125202001271120200125202001281120200125202001291120200125202001301120200125202001311120200125202002011120200125202002021120200125202004042120200404202004052120200404202004062120200404202004263020200501202005013120200501202005023120200501202005033120200501202005043120200501202005053120200501202005093020200501202006254120200625202006264120200625202006274120200625202006284020200625202009277020201001202010017120201001202010026120201001202010036120201001202010046120201001202010056120201001202010066120201001202010076120201001202010086120201001202010106020201001202101010120210101202101020120210101202101030120210101202102071020210212202102111120210212202102121120210212202102131120210212202102141120210212202102151120210212202102161120210212202102171120210212202102201020210212202104032120210404202104042120210404202104052120210404202104253020210501202105013120210501202105023120210501202105033120210501202105043120210501202105053120210501202105083020210501202106124120210614202106134120210614202106144120210614202109185020210921202109195120210921202109205120210921202109215120210921202109266020211001202110016120211001202110026120211001202110036120211001202110046120211001202110056120211001202110066120211001202110076120211001202110096020211001202201010120220101202201020120220101202201030120220101202201291020220201202201301020220201202201311120220201202202011120220201202202021120220201202202031120220201202202041120220201202202051120220201202202061120220201202204022020220405202204032120220405202204042120220405202204052120220405202204243020220501202204303120220501202205013120220501202205023120220501202205033120220501202205043120220501202205073020220501202206034120220603202206044120220603202206054120220603202209105120220910202209115120220910202209125120220910202210016120221001202210026120221001202210036120221001202210046120221001202210056120221001202210066120221001202210076120221001202210086020221001202210096020221001202212310120230101202301010120230101202301020120230101202301211120230122202301221120230122202301231120230122202301241120230122202301251120230122202301261120230122202301271120230122202301281020230122202301291020230122202304052120230405202304233020230501202304293120230501202304303120230501202305013120230501202305023120230501202305033120230501202305063020230501202306224120230622202306234120230622202306244120230622202306254020230622202309295120230929202309306120231001202310016120231001202310026120231001202310036120231001202310046120231001202310056120231001202310066120231001202310076020231001202310086020231001202312300120240101202312310120240101202401010120240101202402041020240210202402101120240210202402111120240210202402121120240210202402131120240210202402141120240210202402151120240210202402161120240210202402171120240210202402181020240210202404042120240404202404052120240404202404062120240404202404072020240404202404283020240501202405013120240501202405023120240501202405033120240501202405043120240501202405053120240501202405113020240501202406084120240610202406094120240610202406104120240610202409145020240917202409155120240917202409165120240917202409175120240917202409296020241001202410016120241001202410026120241001202410036120241001202410046120241001202410056120241001202410066120241001202410076120241001202410126020241001202501010120250101202501261020250129202501281120250129202501291120250129202501301120250129202501311120250129202502011120250129202502021120250129202502031120250129202502041120250129202502081020250129202504042120250404202504052120250404202504062120250404202504273020250501202505013120250501202505023120250501202505033120250501202505043120250501202505053120250501202505314120250531202506014120250531202506024120250531202509287020251001202510017120251001202510027120251001202510037120251001202510047120251001202510057120251001202510067120251001202510077120251001202510087120251001202510117020251001",d=function(n){return(n<10?"0":"")+n},y=function(n){return n.indexOf("-")<0?n.substring(0,4)+"-"+n.substring(4,6)+"-"+n.substring(6):n},B=function(n,i,t,e){return{_p:{day:y(n),name:i,work:t,target:y(e)},getDay:function(){return this._p.day},setDay:function(n){this._p.day=y(n)},getName:function(){return this._p.name},setName:function(n){this._p.name=n},isWork:function(){return this._p.work},setWork:function(n){this._p.work=n},getTarget:function(){return this._p.target},setTarget:function(n){this._p.target=y(n)},toString:function(){return this._p.day+" "+this._p.name+(this._p.work?"调休":"")+" "+this._p.target}}},f=function(n){var i=n.substring(0,8),t=x[n.charCodeAt(8)-D],e=n.charCodeAt(9)===D,a=n.substring(10,18);return B(i,t,e,a)},j=function(n){var i=n.length,t=n.substring(i-18,i-10),e=x[n.charCodeAt(i-10)-D],a=n.charCodeAt(i-9)===D,g=n.substring(i-8);return B(t,e,a,g)},_=function(n){var i=[],t=function(n){var i=c.indexOf(n);if(i<0)return null;var t=c.substring(i),e=t.length%E;for(e>0&&(t=t.substring(e));0!==t.indexOf(n)&&t.length>=E;)t=t.substring(E);return t}(n);if(null==t)return i;for(;0===t.indexOf(n);)i.push(f(t)),t=t.substring(E);return i},I=function(n){var i=[],t=function(n){var i=c.lastIndexOf(n);if(i<0)return null;var t=n.length,e=c.substring(0,i+t),a=e.length,g=a%E;for(g>0&&(e=e.substring(0,a-g)),a=e.length;a-t!==e.lastIndexOf(n)&&a>=E;)a=(e=e.substring(0,a-E)).length;return e}(n);if(null==t)return i;for(var e=t.length,a=n.length;e-a===t.lastIndexOf(n);)i.push(j(t)),e=(t=t.substring(0,e-E)).length;return i.reverse(),i},p=function(n){var i=[];switch(n.length){case 1:i=_(n[0].replace(/-/g,""));break;case 3:i=_(n[0]+d(n[1])+d(n[2]))}return i.length<1?null:i[0]},l=function(n){if(n){for(var i=[];n.length>=E;){var t=n.substring(0,E),e=t.substring(0,8),a="~"===t.substring(8,9),g=p([e]);if(g){for(var r=-1,u=0,h=x.length;u<h;u++)if(x[u]===g.getName()){r=u;break}if(r>-1){var s=e+String.fromCharCode(r+D)+(g.isWork()?"0":"1")+g.getTarget().replace(/-/g,"");c=c.replace(new RegExp(s,"g"),a?"":t)}}else a||i.push(t);n=n.substring(E)}i.length>0&&(c+=i.join(""))}},S=function(n){switch(n.length){case 1:l(n[0]);break;case 2:(i=n[0])&&(x=i),l(n[1])}var i},{NAMES:A,getHoliday:function(){return p(arguments)},getHolidays:function(){return function(n){var i=[];switch(n.length){case 1:i=_((n[0]+"").replace(/-/g,""));break;case 2:i=_(n[0]+d(n[1]))}return i}(arguments)},getHolidaysByTarget:function(){return function(n){var i=[];switch(n.length){case 1:i=I((n[0]+"").replace(/-/g,""));break;case 3:i=I(n[0]+d(n[1])+d(n[2]))}return i}(arguments)},fix:function(){S(arguments)}}),In={NAME_BEI_DOU:["天枢","天璇","天玑","天权","玉衡","开阳","摇光","洞明","隐元"],NAME_XUAN_KONG:["贪狼","巨门","禄存","文曲","廉贞","武曲","破军","左辅","右弼"],NAME_QI_MEN:["天蓬","天芮","天冲","天辅","天禽","天心","天柱","天任","天英"],BA_MEN_QI_MEN:["休","死","伤","杜","","开","惊","生","景"],NAME_TAI_YI:["太乙","摄提","轩辕","招摇","天符","青龙","咸池","太阴","天乙"],TYPE_TAI_YI:["吉神","凶神","安神","安神","凶神","吉神","凶神","吉神","吉神"],SONG_TAI_YI:["门中太乙明，星官号贪狼，赌彩财喜旺，婚姻大吉昌，出入无阻挡，参谒见贤良，此行三五里，黑衣别阴阳。","门前见摄提，百事必忧疑，相生犹自可，相克祸必临，死门并相会，老妇哭悲啼，求谋并吉事，尽皆不相宜，只可藏隐遁，若动伤身疾。","出入会轩辕，凡事必缠牵，相生全不美，相克更忧煎，远行多不利，博彩尽输钱，九天玄女法，句句不虚言。","招摇号木星，当之事莫行，相克行人阻，阴人口舌迎，梦寐多惊惧，屋响斧自鸣，阴阳消息理，万法弗违情。","五鬼为天符，当门阴女谋，相克无好事，行路阻中途，走失难寻觅，道逢有尼姑，此星当门值，万事有灾除。","神光跃青龙，财气喜重重，投入有酒食，赌彩最兴隆，更逢相生旺，休言克破凶，见贵安营寨，万事总吉同。","吾将为咸池，当之尽不宜，出入多不利，相克有灾情，赌彩全输尽，求财空手回，仙人真妙语，愚人莫与知，动用虚惊退，反复逆风吹。","坐临太阴星，百祸不相侵，求谋悉成就，知交有觅寻，回风归来路，恐有殃伏起，密语中记取，慎乎莫轻行。","迎来天乙星，相逢百事兴，运用和合庆，茶酒喜相迎，求谋并嫁娶，好合有天成，祸福如神验，吉凶甚分明。"],LUCK_QI_MEN:["大凶","大凶","小吉","大吉","大吉","大吉","小凶","小吉","小凶"],fromIndex:function(n){return function(n){return{_p:{index:n},getNumber:function(){return Yn.NUMBER[this._p.index]},getColor:function(){return Yn.COLOR[this._p.index]},getWuXing:function(){return Yn.WU_XING[this._p.index]},getPosition:function(){return Yn.POSITION[this._p.index]},getPositionDesc:function(){return jn.POSITION_DESC[this.getPosition()]},getNameInXuanKong:function(){return In.NAME_XUAN_KONG[this._p.index]},getNameInBeiDou:function(){return In.NAME_BEI_DOU[this._p.index]},getNameInQiMen:function(){return In.NAME_QI_MEN[this._p.index]},getNameInTaiYi:function(){return In.NAME_TAI_YI[this._p.index]},getLuckInQiMen:function(){return In.LUCK_QI_MEN[this._p.index]},getLuckInXuanKong:function(){return Yn.LUCK_XUAN_KONG[this._p.index]},getYinYangInQiMen:function(){return Yn.YIN_YANG_QI_MEN[this._p.index]},getTypeInTaiYi:function(){return In.TYPE_TAI_YI[this._p.index]},getBaMenInQiMen:function(){return In.BA_MEN_QI_MEN[this._p.index]},getSongInTaiYi:function(){return In.SONG_TAI_YI[this._p.index]},getIndex:function(){return this._p.index},toString:function(){return this.getNumber()+this.getColor()+this.getWuXing()+this.getNameInBeiDou()},toFullString:function(){var n=this.getNumber();return n+=this.getColor(),n+=this.getWuXing(),n+=" ",n+=this.getPosition(),n+="(",n+=this.getPositionDesc(),n+=") ",n+=this.getNameInBeiDou(),n+=" 玄空[",n+=this.getNameInXuanKong(),n+=" ",n+=this.getLuckInXuanKong(),n+="] 奇门[",n+=this.getNameInQiMen(),n+=" ",n+=this.getLuckInQiMen(),this.getBaMenInQiMen().length>0&&(n+=" ",n+=this.getBaMenInQiMen(),n+="门"),n+=" ",n+=this.getYinYangInQiMen(),n+="] 太乙[",n+=this.getNameInTaiYi(),n+=" ",(n+=this.getTypeInTaiYi())+"]"}}}(n)}},pn={fromLunar:function(n){return function(n){return{_p:{sect:2,lunar:n},setSect:function(n){n*=1,this._p.sect=1===n?1:2},getSect:function(){return this._p.sect},getDayGanIndex:function(){return 2===this._p.sect?this._p.lunar.getDayGanIndexExact2():this._p.lunar.getDayGanIndexExact()},getDayZhiIndex:function(){return 2===this._p.sect?this._p.lunar.getDayZhiIndexExact2():this._p.lunar.getDayZhiIndexExact()},getYear:function(){return this._p.lunar.getYearInGanZhiExact()},getYearGan:function(){return this._p.lunar.getYearGanExact()},getYearZhi:function(){return this._p.lunar.getYearZhiExact()},getYearHideGan:function(){return jn.ZHI_HIDE_GAN[this.getYearZhi()]},getYearWuXing:function(){return jn.WU_XING_GAN[this.getYearGan()]+jn.WU_XING_ZHI[this.getYearZhi()]},getYearNaYin:function(){return jn.NAYIN[this.getYear()]},getYearShiShenGan:function(){return jn.SHI_SHEN[this.getDayGan()+this.getYearGan()]},getYearShiShenZhi:function(){for(var n=this.getDayGan(),i=jn.ZHI_HIDE_GAN[this.getYearZhi()],t=[],e=0,a=i.length;e<a;e++)t.push(jn.SHI_SHEN[n+i[e]]);return t},_getDiShi:function(n){var i=jn.CHANG_SHENG_OFFSET[this.getDayGan()]+(this.getDayGanIndex()%2==0?n:-n);return i>=12&&(i-=12),i<0&&(i+=12),jn.CHANG_SHENG[i]},getYearDiShi:function(){return this._getDiShi(this._p.lunar.getYearZhiIndexExact())},getYearXun:function(){return this._p.lunar.getYearXunExact()},getYearXunKong:function(){return this._p.lunar.getYearXunKongExact()},getMonth:function(){return this._p.lunar.getMonthInGanZhiExact()},getMonthGan:function(){return this._p.lunar.getMonthGanExact()},getMonthZhi:function(){return this._p.lunar.getMonthZhiExact()},getMonthHideGan:function(){return jn.ZHI_HIDE_GAN[this.getMonthZhi()]},getMonthWuXing:function(){return jn.WU_XING_GAN[this.getMonthGan()]+jn.WU_XING_ZHI[this.getMonthZhi()]},getMonthNaYin:function(){return jn.NAYIN[this.getMonth()]},getMonthShiShenGan:function(){return jn.SHI_SHEN[this.getDayGan()+this.getMonthGan()]},getMonthShiShenZhi:function(){for(var n=this.getDayGan(),i=jn.ZHI_HIDE_GAN[this.getMonthZhi()],t=[],e=0,a=i.length;e<a;e++)t.push(jn.SHI_SHEN[n+i[e]]);return t},getMonthDiShi:function(){return this._getDiShi(this._p.lunar.getMonthZhiIndexExact())},getMonthXun:function(){return this._p.lunar.getMonthXunExact()},getMonthXunKong:function(){return this._p.lunar.getMonthXunKongExact()},getDay:function(){return 2===this._p.sect?this._p.lunar.getDayInGanZhiExact2():this._p.lunar.getDayInGanZhiExact()},getDayGan:function(){return 2===this._p.sect?this._p.lunar.getDayGanExact2():this._p.lunar.getDayGanExact()},getDayZhi:function(){return 2===this._p.sect?this._p.lunar.getDayZhiExact2():this._p.lunar.getDayZhiExact()},getDayHideGan:function(){return jn.ZHI_HIDE_GAN[this.getDayZhi()]},getDayWuXing:function(){return jn.WU_XING_GAN[this.getDayGan()]+jn.WU_XING_ZHI[this.getDayZhi()]},getDayNaYin:function(){return jn.NAYIN[this.getDay()]},getDayShiShenGan:function(){return"日主"},getDayShiShenZhi:function(){for(var n=this.getDayGan(),i=jn.ZHI_HIDE_GAN[this.getDayZhi()],t=[],e=0,a=i.length;e<a;e++)t.push(jn.SHI_SHEN[n+i[e]]);return t},getDayDiShi:function(){return this._getDiShi(this.getDayZhiIndex())},getDayXun:function(){return 2===this._p.sect?this._p.lunar.getDayXunExact2():this._p.lunar.getDayXunExact()},getDayXunKong:function(){return 2===this._p.sect?this._p.lunar.getDayXunKongExact2():this._p.lunar.getDayXunKongExact()},getTime:function(){return this._p.lunar.getTimeInGanZhi()},getTimeGan:function(){return this._p.lunar.getTimeGan()},getTimeZhi:function(){return this._p.lunar.getTimeZhi()},getTimeHideGan:function(){return jn.ZHI_HIDE_GAN[this.getTimeZhi()]},getTimeWuXing:function(){return jn.WU_XING_GAN[this.getTimeGan()]+jn.WU_XING_ZHI[this.getTimeZhi()]},getTimeNaYin:function(){return jn.NAYIN[this.getTime()]},getTimeShiShenGan:function(){return jn.SHI_SHEN[this.getDayGan()+this.getTimeGan()]},getTimeShiShenZhi:function(){for(var n=this.getDayGan(),i=jn.ZHI_HIDE_GAN[this.getTimeZhi()],t=[],e=0,a=i.length;e<a;e++)t.push(jn.SHI_SHEN[n+i[e]]);return t},getTimeDiShi:function(){return this._getDiShi(this._p.lunar.getTimeZhiIndex())},getTimeXun:function(){return this._p.lunar.getTimeXun()},getTimeXunKong:function(){return this._p.lunar.getTimeXunKong()},getTaiYuan:function(){var n=this._p.lunar.getMonthGanIndexExact()+1;n>=10&&(n-=10);var i=this._p.lunar.getMonthZhiIndexExact()+3;return i>=12&&(i-=12),jn.GAN[n+1]+jn.ZHI[i+1]},getTaiYuanNaYin:function(){return jn.NAYIN[this.getTaiYuan()]},getTaiXi:function(){var n=this._p.lunar,i=2===this._p.sect?n.getDayGanIndexExact2():n.getDayGanIndexExact(),t=2===this._p.sect?n.getDayZhiIndexExact2():n.getDayZhiIndexExact();return jn.HE_GAN_5[i]+jn.HE_ZHI_6[t]},getTaiXiNaYin:function(){return jn.NAYIN[this.getTaiXi()]},getMingGong:function(){var n=jn.index(this.getMonthZhi(),jn.MONTH_ZHI,0)+jn.index(this.getTimeZhi(),jn.MONTH_ZHI,0);n=(n>=14?26:14)-n;for(var i=2*(this._p.lunar.getYearGanIndexExact()+1)+n;i>10;)i-=10;return jn.GAN[i]+jn.MONTH_ZHI[n]},getMingGongNaYin:function(){return jn.NAYIN[this.getMingGong()]},getShenGong:function(){for(var n=(jn.index(this.getMonthZhi(),jn.MONTH_ZHI,0)+jn.index(this.getTimeZhi(),jn.ZHI,0)-1)%12,i=2*(this._p.lunar.getYearGanIndexExact()+1)+n;i>10;)i-=10;return jn.GAN[i+1]+jn.MONTH_ZHI[n+1]},getShenGongNaYin:function(){return jn.NAYIN[this.getShenGong()]},getLunar:function(){return this._p.lunar},getYun:function(n,i){i=2==(i*=1)?i:1;var t=this.getLunar(),e=0==t.getYearGanIndexExact()%2,a=1===n,g=e&&a||!e&&!a,r=function(){var n,e,a,r=t.getPrevJie(),u=t.getNextJie(),h=t.getSolar(),s=g?h:r.getSolar(),o=g?u.getSolar():h,F=0;if(2===i){var C=o.subtractMinute(s);C-=4320*(n=Math.floor(C/4320)),C-=360*(e=Math.floor(C/360)),F=2*(C-=12*(a=Math.floor(C/12)))}else{var A=(23===o.getHour()?11:jn.getTimeZhiIndex(o.toYmdHms().substring(11,16)))-(23===s.getHour()?11:jn.getTimeZhiIndex(s.toYmdHms().substring(11,16))),E=o.subtract(s);A<0&&(A+=12,E--);var D=Math.floor(10*A/30);e=4*E+D,a=10*A-30*D,e-=12*(n=Math.floor(e/12))}return{year:n,month:e,day:a,hour:F}}(),u=function(n,i){return{_p:{index:i,liuNian:n},getIndex:function(){return this._p.index},getMonthInChinese:function(){return jn.MONTH[this._p.index+1]},getGanZhi:function(){var n=[2,4,6,8,0][(jn.find(this._p.liuNian.getGanZhi(),jn.GAN).index-1)%5];return jn.GAN[(this._p.index+n)%10+1]+jn.ZHI[(this._p.index+jn.BASE_MONTH_ZHI_INDEX)%12+1]},getXun:function(){return jn.getXun(this.getGanZhi())},getXunKong:function(){return jn.getXunKong(this.getGanZhi())}}},h=function(n,i){return{_p:{year:n.getStartYear()+i,age:n.getStartAge()+i,index:i,daYun:n,lunar:n.getLunar()},getYear:function(){return this._p.year},getAge:function(){return this._p.age},getIndex:function(){return this._p.index},getLunar:function(){return this._p.lunar},getGanZhi:function(){var n=jn.getJiaZiIndex(this._p.lunar.getJieQiTable()[Mn.getMessage("jq.liChun")].getLunar().getYearInGanZhiExact())+this._p.index;return this._p.daYun.getIndex()>0&&(n+=this._p.daYun.getStartAge()-1),n%=jn.JIA_ZI.length,jn.JIA_ZI[n]},getXun:function(){return jn.getXun(this.getGanZhi())},getXunKong:function(){return jn.getXunKong(this.getGanZhi())},getLiuYue:function(){for(var n=[],i=0;i<12;i++)n.push(u(this,i));return n}}},s=function(n,i,t){return{_p:{year:n.getStartYear()+i,age:n.getStartAge()+i,index:i,daYun:n,forward:t,lunar:n.getLunar()},getYear:function(){return this._p.year},getAge:function(){return this._p.age},getIndex:function(){return this._p.index},getGanZhi:function(){var n=jn.getJiaZiIndex(this._p.lunar.getTimeInGanZhi()),i=this._p.index+1;this._p.daYun.getIndex()>0&&(i+=this._p.daYun.getStartAge()-1),n+=this._p.forward?i:-i;for(var t=jn.JIA_ZI.length;n<0;)n+=t;return n%=t,jn.JIA_ZI[n]},getXun:function(){return jn.getXun(this.getGanZhi())},getXunKong:function(){return jn.getXunKong(this.getGanZhi())}}},o=function(n,i){var t,e,a,g,r=n.getLunar().getSolar().getYear(),u=n.getStartSolar().getYear();return i<1?(t=r,e=1,a=u-1,g=u-r):(a=(t=u+10*(i-1))+9,g=9+(e=t-r+1)),{_p:{startYear:t,endYear:a,startAge:e,endAge:g,index:i,yun:n,lunar:n.getLunar()},getStartYear:function(){return this._p.startYear},getEndYear:function(){return this._p.endYear},getStartAge:function(){return this._p.startAge},getEndAge:function(){return this._p.endAge},getIndex:function(){return this._p.index},getLunar:function(){return this._p.lunar},getGanZhi:function(){if(this._p.index<1)return"";var n=jn.getJiaZiIndex(this._p.lunar.getMonthInGanZhiExact());n+=this._p.yun.isForward()?this._p.index:-this._p.index;var i=jn.JIA_ZI.length;return n>=i&&(n-=i),n<0&&(n+=i),jn.JIA_ZI[n]},getXun:function(){return jn.getXun(this.getGanZhi())},getXunKong:function(){return jn.getXunKong(this.getGanZhi())},getLiuNian:function(n){n||(n=10),this._p.index<1&&(n=this._p.endYear-this._p.startYear+1);for(var i=[],t=0;t<n;t++)i.push(h(this,t));return i},getXiaoYun:function(n){n||(n=10),this._p.index<1&&(n=this._p.endYear-this._p.startYear+1);for(var i=[],t=0;t<n;t++)i.push(s(this,t,this._p.yun.isForward()));return i}}};return{_p:{gender:n,startYear:r.year,startMonth:r.month,startDay:r.day,startHour:r.hour,forward:g,lunar:t},getGender:function(){return this._p.gender},getStartYear:function(){return this._p.startYear},getStartMonth:function(){return this._p.startMonth},getStartDay:function(){return this._p.startDay},getStartHour:function(){return this._p.startHour},isForward:function(){return this._p.forward},getLunar:function(){return this._p.lunar},getStartSolar:function(){var n=this._p.lunar.getSolar();return(n=(n=(n=n.nextYear(this._p.startYear)).nextMonth(this._p.startMonth)).next(this._p.startDay)).nextHour(this._p.startHour)},getDaYun:function(n){n||(n=10);for(var i=[],t=0;t<n;t++)i.push(o(this,t));return i}}},toString:function(){return this.getYear()+" "+this.getMonth()+" "+this.getDay()+" "+this.getTime()}}}(n)}},ln={fromYmdHms:function(n,i,t,e,a,g){return function(n,i,t,e,a,g){var r=Cn.fromYmdHms(n,i,t,e,a,g),u=jn.getTimeZhiIndex([(e<10?"0":"")+e,(a<10?"0":"")+a].join(":"));return{_p:{ganIndex:(r.getDayGanIndexExact()%5*2+u)%10,zhiIndex:u,lunar:r},getGanIndex:function(){return this._p.ganIndex},getZhiIndex:function(){return this._p.zhiIndex},getGan:function(){return jn.GAN[this._p.ganIndex+1]},getZhi:function(){return jn.ZHI[this._p.zhiIndex+1]},getGanZhi:function(){return this.getGan()+this.getZhi()},getShengXiao:function(){return jn.SHENGXIAO[this._p.zhiIndex+1]},getPositionXi:function(){return jn.POSITION_XI[this._p.ganIndex+1]},getPositionXiDesc:function(){return jn.POSITION_DESC[this.getPositionXi()]},getPositionYangGui:function(){return jn.POSITION_YANG_GUI[this._p.ganIndex+1]},getPositionYangGuiDesc:function(){return jn.POSITION_DESC[this.getPositionYangGui()]},getPositionYinGui:function(){return jn.POSITION_YIN_GUI[this._p.ganIndex+1]},getPositionYinGuiDesc:function(){return jn.POSITION_DESC[this.getPositionYinGui()]},getPositionFu:function(n){return(1===n?jn.POSITION_FU:jn.POSITION_FU_2)[this._p.ganIndex+1]},getPositionFuDesc:function(n){return jn.POSITION_DESC[this.getPositionFu(n)]},getPositionCai:function(){return jn.POSITION_CAI[this._p.ganIndex+1]},getPositionCaiDesc:function(){return jn.POSITION_DESC[this.getPositionCai()]},getNaYin:function(){return jn.NAYIN[this.getGanZhi()]},getTianShen:function(){return jn.TIAN_SHEN[(this._p.zhiIndex+jn.ZHI_TIAN_SHEN_OFFSET[this._p.lunar.getDayZhiExact()])%12+1]},getTianShenType:function(){return jn.TIAN_SHEN_TYPE[this.getTianShen()]},getTianShenLuck:function(){return jn.TIAN_SHEN_TYPE_LUCK[this.getTianShenType()]},getChong:function(){return jn.CHONG[this._p.zhiIndex]},getSha:function(){return jn.SHA[this.getZhi()]},getChongShengXiao:function(){for(var n=this.getChong(),i=0,t=jn.ZHI.length;i<t;i++)if(jn.ZHI[i]===n)return jn.SHENGXIAO[i];return""},getChongDesc:function(){return"("+this.getChongGan()+this.getChong()+")"+this.getChongShengXiao()},getChongGan:function(){return jn.CHONG_GAN[this._p.ganIndex]},getChongGanTie:function(){return jn.CHONG_GAN_TIE[this._p.ganIndex]},getYi:function(){return jn.getTimeYi(this._p.lunar.getDayInGanZhiExact(),this.getGanZhi())},getJi:function(){return jn.getTimeJi(this._p.lunar.getDayInGanZhiExact(),this.getGanZhi())},getNineStar:function(){var n=this._p.lunar.getSolar().toYmd(),i=this._p.lunar.getJieQiTable(),t=!1;n>=i[Mn.getMessage("jq.dongZhi")].toYmd()&&n<i[Mn.getMessage("jq.xiaZhi")].toYmd()&&(t=!0);var e=(t?[0,3,6]:[8,5,2])[this._p.lunar.getDayZhiIndex()%3],a=t?e+this._p.zhiIndex:e+9-this._p.zhiIndex;return In.fromIndex(a%9)},getXun:function(){return jn.getXun(this.getGanZhi())},getXunKong:function(){return jn.getXunKong(this.getGanZhi())},getMinHm:function(){var n=this._p.lunar.getHour();return n<1?"00:00":n>22?"23:00":(n%2==0&&(n-=1),(n<10?"0":"")+n+":00")},getMaxHm:function(){var n=this._p.lunar.getHour();return n<1?"00:59":n>22?"23:59":(n%2!=0&&(n+=1),(n<10?"0":"")+n+":59")},toString:function(){return this.getGanZhi()}}}(n,i,t,e,a,g)}},Sn=(z=[11,13,15,17,19,21,24,0,2,4,7,9],N="犯者夺纪",Y="犯者减寿",w="犯者损寿",M="犯者削禄夺纪",Z="犯者三年内夫妇俱亡",G=(m=function(n,i,t,e){return{_p:{name:n,result:i||"",everyMonth:!!t,remark:e||""},getName:function(){return this._p.name},getResult:function(){return this._p.result},isEveryMonth:function(){return this._p.everyMonth},getRemark:function(){return this._p.remark},toString:function(){return this._p.name},toFullString:function(){var n=[this._p.name];return this._p.result&&n.push(this._p.result),this._p.remark&&n.push(this._p.remark),n.join(" ")}}})("杨公忌"),k=m("四天王巡行","",!0),T=m("斗降",N,!0),b=m("月朔",N,!0),v=m("月望",N,!0),H=m("月晦",Y,!0),O=m("雷斋日",Y,!0),X=m("九毒日","犯者夭亡，奇祸不测"),L=m("人神在阴","犯者得病",!0,"宜先一日即戒"),q=m("司命奏事",Y,!0,"如月小，即戒廿九"),J=m("月晦",Y,!0,"如月小，即戒廿九"),{XIU_27:["{xx.jiao}","{xx.kang}","{xx.di}","{xx.fang}","{xx.xin}","{xx.tail}","{xx.ji}","{xx.dou}","{xx.nv}","{xx.xu}","{xx.wei}","{xx.shi}","{xx.qiang}","{xx.kui}","{xx.lou}","{xx.vei}","{xx.mao}","{xx.bi}","{xx.zi}","{xx.can}","{xx.jing}","{xx.gui}","{xx.liu}","{xx.xing}","{xx.zhang}","{xx.yi}","{xx.zhen}"],DAY_ZHAI_GUAN_YIN:["1-8","2-7","2-9","2-19","3-3","3-6","3-13","4-22","5-3","5-17","6-16","6-18","6-19","6-23","7-13","8-16","9-19","9-23","10-2","11-19","11-24","12-25"],FESTIVAL:{"1-1":[m("天腊，玉帝校世人神气禄命",M),b],"1-3":[m("万神都会",N),T],"1-5":[m("五虚忌")],"1-6":[m("六耗忌"),O],"1-7":[m("上会日",w)],"1-8":[m("五殿阎罗天子诞",N),k],"1-9":[m("玉皇上帝诞",N)],"1-13":[G],"1-14":[m("三元降",Y),k],"1-15":[m("三元降",Y),m("上元神会",N),v,k],"1-16":[m("三元降",Y)],"1-19":[m("长春真人诞")],"1-23":[m("三尸神奏事"),k],"1-25":[H,m("天地仓开日","犯者损寿，子带疾")],"1-27":[T],"1-28":[L],"1-29":[k],"1-30":[J,q,k],"2-1":[m("一殿秦广王诞",N),b],"2-2":[m("万神都会",N),m("福德土地正神诞","犯者得祸")],"2-3":[m("文昌帝君诞",M),T],"2-6":[m("东华帝君诞"),O],"2-8":[m("释迦牟尼佛出家",N),m("三殿宋帝王诞",N),m("张大帝诞",N),k],"2-11":[G],"2-14":[k],"2-15":[m("释迦牟尼佛涅槃",M),m("太上老君诞",M),m("月望",M,!0),k],"2-17":[m("东方杜将军诞")],"2-18":[m("四殿五官王诞",M),m("至圣先师孔子讳辰",M)],"2-19":[m("观音大士诞",N)],"2-21":[m("普贤菩萨诞")],"2-23":[k],"2-25":[H],"2-27":[T],"2-28":[L],"2-29":[k],"2-30":[J,q,k],"3-1":[m("二殿楚江王诞",N),b],"3-3":[m("玄天上帝诞",N),T],"3-6":[O],"3-8":[m("六殿卞城王诞",N),k],"3-9":[m("牛鬼神出","犯者产恶胎"),G],"3-12":[m("中央五道诞")],"3-14":[k],"3-15":[m("昊天上帝诞",N),m("玄坛诞",N),v,k],"3-16":[m("准提菩萨诞",N)],"3-19":[m("中岳大帝诞"),m("后土娘娘诞"),m("三茅降")],"3-20":[m("天地仓开日",w),m("子孙娘娘诞")],"3-23":[k],"3-25":[H],"3-27":[m("七殿泰山王诞"),T],"3-28":[L,m("苍颉至圣先师诞",M),m("东岳大帝诞")],"3-29":[k],"3-30":[J,q,k],"4-1":[m("八殿都市王诞",N),b],"4-3":[T],"4-4":[m("万神善会","犯者失瘼夭胎"),m("文殊菩萨诞")],"4-6":[O],"4-7":[m("南斗、北斗、西斗同降",Y),G],"4-8":[m("释迦牟尼佛诞",N),m("万神善会","犯者失瘼夭胎"),m("善恶童子降","犯者血死"),m("九殿平等王诞"),k],"4-14":[m("纯阳祖师诞",Y),k],"4-15":[v,m("钟离祖师诞"),k],"4-16":[m("天地仓开日",w)],"4-17":[m("十殿转轮王诞",N)],"4-18":[m("天地仓开日",w),m("紫徽大帝诞",w)],"4-20":[m("眼光圣母诞")],"4-23":[k],"4-25":[H],"4-27":[T],"4-28":[L],"4-29":[k],"4-30":[J,q,k],"5-1":[m("南极长生大帝诞",N),b],"5-3":[T],"5-5":[m("地腊",M),m("五帝校定生人官爵",M),X,G],"5-6":[X,O],"5-7":[X],"5-8":[m("南方五道诞"),k],"5-11":[m("天地仓开日",w),m("天下都城隍诞")],"5-12":[m("炳灵公诞")],"5-13":[m("关圣降",M)],"5-14":[m("夜子时为天地交泰",Z),k],"5-15":[v,X,k],"5-16":[m("九毒日",Z),m("天地元气造化万物之辰",Z)],"5-17":[X],"5-18":[m("张天师诞")],"5-22":[m("孝娥神诞",N)],"5-23":[k],"5-25":[X,H],"5-26":[X],"5-27":[X,T],"5-28":[L],"5-29":[k],"5-30":[J,q,k],"6-1":[b],"6-3":[m("韦驮菩萨圣诞"),T,G],"6-5":[m("南赡部洲转大轮",w)],"6-6":[m("天地仓开日",w),O],"6-8":[k],"6-10":[m("金粟如来诞")],"6-14":[k],"6-15":[v,k],"6-19":[m("观世音菩萨成道",N)],"6-23":[m("南方火神诞","犯者遭回禄"),k],"6-24":[m("雷祖诞",M),m("关帝诞",M)],"6-25":[H],"6-27":[T],"6-28":[L],"6-29":[k],"6-30":[J,q,k],"7-1":[b,G],"7-3":[T],"7-5":[m("中会日",w,!1,"一作初七")],"7-6":[O],"7-7":[m("道德腊",M),m("五帝校生人善恶",M),m("魁星诞",M)],"7-8":[k],"7-10":[m("阴毒日","",!1,"大忌")],"7-12":[m("长真谭真人诞")],"7-13":[m("大势至菩萨诞",Y)],"7-14":[m("三元降",Y),k],"7-15":[v,m("三元降",N),m("地官校籍",N),k],"7-16":[m("三元降",Y)],"7-18":[m("西王母诞",N)],"7-19":[m("太岁诞",N)],"7-22":[m("增福财神诞",M)],"7-23":[k],"7-25":[H],"7-27":[T],"7-28":[L],"7-29":[G,k],"7-30":[m("地藏菩萨诞",N),J,q,k],"8-1":[b,m("许真君诞")],"8-3":[T,m("北斗诞",M),m("司命灶君诞","犯者遭回禄")],"8-5":[m("雷声大帝诞",N)],"8-6":[O],"8-8":[k],"8-10":[m("北斗大帝诞")],"8-12":[m("西方五道诞")],"8-14":[k],"8-15":[v,m("太明朝元","犯者暴亡",!1,"宜焚香守夜"),k],"8-16":[m("天曹掠刷真君降","犯者贫夭")],"8-18":[m("天人兴福之辰","",!1,"宜斋戒，存想吉事")],"8-23":[m("汉恒候张显王诞"),k],"8-24":[m("灶君夫人诞")],"8-25":[H],"8-27":[T,m("至圣先师孔子诞",M),G],"8-28":[L,m("四天会事")],"8-29":[k],"8-30":[m("诸神考校","犯者夺算"),J,q,k],"9-1":[b,m("南斗诞",M),m("北斗九星降世",N,!1,"此九日俱宜斋戒")],"9-3":[T,m("五瘟神诞")],"9-6":[O],"9-8":[k],"9-9":[m("斗母诞",M),m("酆都大帝诞"),m("玄天上帝飞升")],"9-10":[m("斗母降",N)],"9-11":[m("宜戒")],"9-13":[m("孟婆尊神诞")],"9-14":[k],"9-15":[v,k],"9-17":[m("金龙四大王诞","犯者遭水厄")],"9-19":[m("日宫月宫会合",Y),m("观世音菩萨诞",Y)],"9-23":[k],"9-25":[H,G],"9-27":[T],"9-28":[L],"9-29":[k],"9-30":[m("药师琉璃光佛诞","犯者危疾"),J,q,k],"10-1":[b,m("民岁腊",N),m("四天王降","犯者一年内死")],"10-3":[T,m("三茅诞")],"10-5":[m("下会日",Y),m("达摩祖师诞",Y)],"10-6":[O,m("天曹考察",N)],"10-8":[m("佛涅槃日","",!1,"大忌色欲"),k],"10-10":[m("四天王降","犯者一年内死")],"10-11":[m("宜戒")],"10-14":[m("三元降",Y),k],"10-15":[v,m("三元降",N),m("下元水府校籍",N),k],"10-16":[m("三元降",Y),k],"10-23":[G,k],"10-25":[H],"10-27":[T,m("北极紫徽大帝降")],"10-28":[L],"10-29":[k],"10-30":[J,q,k],"11-1":[b],"11-3":[T],"11-4":[m("至圣先师孔子诞",M)],"11-6":[m("西岳大帝诞")],"11-8":[k],"11-11":[m("天地仓开日",N),m("太乙救苦天尊诞",N)],"11-14":[k],"11-15":[m("月望","上半夜犯男死 下半夜犯女死"),m("四天王巡行","上半夜犯男死 下半夜犯女死")],"11-17":[m("阿弥陀佛诞")],"11-19":[m("太阳日宫诞","犯者得奇祸")],"11-21":[G],"11-23":[m("张仙诞","犯者绝嗣"),k],"11-25":[m("掠刷大夫降","犯者遭大凶"),H],"11-26":[m("北方五道诞")],"11-27":[T],"11-28":[L],"11-29":[k],"11-30":[J,q,k],"12-1":[b],"12-3":[T],"12-6":[m("天地仓开日",Y),O],"12-7":[m("掠刷大夫降","犯者得恶疾")],"12-8":[m("王侯腊",N),m("释迦如来成佛之辰"),k,m("初旬内戊日，亦名王侯腊",N)],"12-12":[m("太素三元君朝真")],"12-14":[k],"12-15":[v,k],"12-16":[m("南岳大帝诞")],"12-19":[G],"12-20":[m("天地交道","犯者促寿")],"12-21":[m("天猷上帝诞")],"12-23":[m("五岳诞降"),k],"12-24":[m("司今朝天奏人善恶","犯者得大祸")],"12-25":[m("三清玉帝同降，考察善恶","犯者得奇祸"),H],"12-27":[T],"12-28":[L],"12-29":[m("华严菩萨诞"),k],"12-30":[m("诸神下降，察访善恶","犯者男女俱亡")]},OTHER_FESTIVAL:{"1-1":["弥勒菩萨圣诞"],"1-6":["定光佛圣诞"],"2-8":["释迦牟尼佛出家"],"2-15":["释迦牟尼佛涅槃"],"2-19":["观世音菩萨圣诞"],"2-21":["普贤菩萨圣诞"],"3-16":["准提菩萨圣诞"],"4-4":["文殊菩萨圣诞"],"4-8":["释迦牟尼佛圣诞"],"4-15":["佛吉祥日"],"4-28":["药王菩萨圣诞"],"5-13":["伽蓝菩萨圣诞"],"6-3":["韦驮菩萨圣诞"],"6-19":["观音菩萨成道"],"7-13":["大势至菩萨圣诞"],"7-15":["佛欢喜日"],"7-24":["龙树菩萨圣诞"],"7-30":["地藏菩萨圣诞"],"8-15":["月光菩萨圣诞"],"8-22":["燃灯佛圣诞"],"9-9":["摩利支天菩萨圣诞"],"9-19":["观世音菩萨出家"],"9-30":["药师琉璃光佛圣诞"],"10-5":["达摩祖师圣诞"],"10-20":["文殊菩萨出家"],"11-17":["阿弥陀佛圣诞"],"11-19":["日光菩萨圣诞"],"12-8":["释迦牟尼佛成道"],"12-23":["监斋菩萨圣诞"],"12-29":["华严菩萨圣诞"]},getXiu:function(n,i){return function(n,i){return Sn.XIU_27[(z[Math.abs(n)-1]+i-1)%Sn.XIU_27.length]}(n,i)}}),zn=function(){var n=function(n,t,e,a,g,r){return i(Cn.fromYmdHms(n+zn.DEAD_YEAR-1,t,e,a,g,r))},i=function(n){return{_p:{lunar:n},getLunar:function(){return this._p.lunar},getYear:function(){var n=this._p.lunar.getSolar().getYear(),i=n-zn.DEAD_YEAR;return n===this._p.lunar.getYear()&&i++,i},getMonth:function(){return this._p.lunar.getMonth()},getDay:function(){return this._p.lunar.getDay()},getYearInChinese:function(){for(var n=this.getYear()+"",i="",t="0".charCodeAt(0),e=0,a=n.length;e<a;e++)i+=jn.NUMBER[n.charCodeAt(e)-t];return i},getMonthInChinese:function(){return this._p.lunar.getMonthInChinese()},getDayInChinese:function(){return this._p.lunar.getDayInChinese()},getFestivals:function(){var n=Sn.FESTIVAL[this.getMonth()+"-"+this.getDay()];return n||[]},getOtherFestivals:function(){var n=[],i=Sn.OTHER_FESTIVAL[this.getMonth()+"-"+this.getDay()];return i&&(n=n.concat(i)),n},isMonthZhai:function(){var n=this.getMonth();return 1===n||5===n||9===n},isDayYangGong:function(){for(var n=this.getFestivals(),i=0,t=n.length;i<t;i++)if("杨公忌"===n[i].getName())return!0;return!1},isDayZhaiShuoWang:function(){var n=this.getDay();return 1===n||15===n},isDayZhaiSix:function(){var n=this.getDay();return 8===n||14===n||15===n||23===n||29===n||30===n||28===n&&30!==yn.fromYm(this._p.lunar.getYear(),this.getMonth()).getDayCount()},isDayZhaiTen:function(){var n=this.getDay();return 1===n||8===n||14===n||15===n||18===n||23===n||24===n||28===n||29===n||30===n},isDayZhaiGuanYin:function(){for(var n=this.getMonth()+"-"+this.getDay(),i=0,t=Sn.DAY_ZHAI_GUAN_YIN.length;i<t;i++)if(n===Sn.DAY_ZHAI_GUAN_YIN[i])return!0;return!1},getXiu:function(){return Sn.getXiu(this.getMonth(),this.getDay())},getXiuLuck:function(){return jn.XIU_LUCK[this.getXiu()]},getXiuSong:function(){return jn.XIU_SONG[this.getXiu()]},getZheng:function(){return jn.ZHENG[this.getXiu()]},getAnimal:function(){return jn.ANIMAL[this.getXiu()]},getGong:function(){return jn.GONG[this.getXiu()]},getShou:function(){return jn.SHOU[this.getGong()]},toString:function(){return this.getYearInChinese()+"年"+this.getMonthInChinese()+"月"+this.getDayInChinese()},toFullString:function(){for(var n=this.toString(),i=this.getFestivals(),t=0,e=i.length;t<e;t++)n+=" ("+i[t]+")";return n}}};return{DEAD_YEAR:-543,fromYmdHms:function(i,t,e,a,g,r){return n(i,t,e,a,g,r)},fromYmd:function(i,t,e){return n(i,t,e,0,0,0)},fromLunar:function(n){return i(n)}}}(),mn={create:function(n,i){return function(n,i){return{_p:{name:n,remark:i||""},getName:function(){return this._p.name},getRemark:function(){return this._p.remark},toString:function(){return this._p.name},toFullString:function(){var n=[this._p.name];return this._p.remark&&n.push("["+this._p.remark+"]"),n.join("")}}}(n,i)}},Nn=function(){var n=mn.create;return{SAN_HUI:["1-7","7-7","10-15"],SAN_YUAN:["1-15","7-15","10-15"],WU_LA:["1-1","5-5","7-7","10-1","12-8"],AN_WU:["{dz.wei}","{dz.xu}","{dz.chen}","{dz.yin}","{dz.wu}","{dz.zi}","{dz.you}","{dz.shen}","{dz.si}","{dz.hai}","{dz.mao}","{dz.chou}"],BA_HUI:{"{jz.bingWu}":"天会","{jz.renWu}":"地会","{jz.renZi}":"人会","{jz.gengWu}":"日会","{jz.gengShen}":"月会","{jz.xinYou}":"星辰会","{jz.jiaChen}":"五行会","{jz.jiaXu}":"四时会"},BA_JIE:{"{jq.liChun}":"东北方度仙上圣天尊同梵炁始青天君下降","{jq.chunFen}":"东方玉宝星上天尊同青帝九炁天君下降","{jq.liXia}":"东南方好生度命天尊同梵炁始丹天君下降","{jq.xiaZhi}":"南方玄真万福天尊同赤帝三炁天君下降","{jq.liQiu}":"西南方太灵虚皇天尊同梵炁始素天君下降","{jq.qiuFen}":"西方太妙至极天尊同白帝七炁天君下降","{jq.liDong}":"西北方无量太华天尊同梵炁始玄天君下降","{jq.dongZhi}":"北方玄上玉宸天尊同黑帝五炁天君下降"},FESTIVAL:{"1-1":[n("天腊之辰","天腊，此日五帝会于东方九炁青天")],"1-3":[n("郝真人圣诞"),n("孙真人圣诞")],"1-5":[n("孙祖清静元君诞")],"1-7":[n("举迁赏会","此日上元赐福，天官同地水二官考校罪福")],"1-9":[n("玉皇上帝圣诞")],"1-13":[n("关圣帝君飞升")],"1-15":[n("上元天官圣诞"),n("老祖天师圣诞")],"1-19":[n("长春邱真人(邱处机)圣诞")],"1-28":[n("许真君(许逊天师)圣诞")],"2-1":[n("勾陈天皇大帝圣诞"),n("长春刘真人(刘渊然)圣诞")],"2-2":[n("土地正神诞"),n("姜太公圣诞")],"2-3":[n("文昌梓潼帝君圣诞")],"2-6":[n("东华帝君圣诞")],"2-13":[n("度人无量葛真君圣诞")],"2-15":[n("太清道德天尊(太上老君)圣诞")],"2-19":[n("慈航真人圣诞")],"3-1":[n("谭祖(谭处端)长真真人圣诞")],"3-3":[n("玄天上帝圣诞")],"3-6":[n("眼光娘娘圣诞")],"3-15":[n("天师张大真人圣诞"),n("财神赵公元帅圣诞")],"3-16":[n("三茅真君得道之辰"),n("中岳大帝圣诞")],"3-18":[n("王祖(王处一)玉阳真人圣诞"),n("后土娘娘圣诞")],"3-19":[n("太阳星君圣诞")],"3-20":[n("子孙娘娘圣诞")],"3-23":[n("天后妈祖圣诞")],"3-26":[n("鬼谷先师诞")],"3-28":[n("东岳大帝圣诞")],"4-1":[n("长生谭真君成道之辰")],"4-10":[n("何仙姑圣诞")],"4-14":[n("吕祖纯阳祖师圣诞")],"4-15":[n("钟离祖师圣诞")],"4-18":[n("北极紫微大帝圣诞"),n("泰山圣母碧霞元君诞"),n("华佗神医先师诞")],"4-20":[n("眼光圣母娘娘诞")],"4-28":[n("神农先帝诞")],"5-1":[n("南极长生大帝圣诞")],"5-5":[n("地腊之辰","地腊，此日五帝会于南方三炁丹天"),n("南方雷祖圣诞"),n("地祗温元帅圣诞"),n("雷霆邓天君圣诞")],"5-11":[n("城隍爷圣诞")],"5-13":[n("关圣帝君降神"),n("关平太子圣诞")],"5-18":[n("张天师圣诞")],"5-20":[n("马祖丹阳真人圣诞")],"5-29":[n("紫青白祖师圣诞")],"6-1":[n("南斗星君下降")],"6-2":[n("南斗星君下降")],"6-3":[n("南斗星君下降")],"6-4":[n("南斗星君下降")],"6-5":[n("南斗星君下降")],"6-6":[n("南斗星君下降")],"6-10":[n("刘海蟾祖师圣诞")],"6-15":[n("灵官王天君圣诞")],"6-19":[n("慈航(观音)成道日")],"6-23":[n("火神圣诞")],"6-24":[n("南极大帝中方雷祖圣诞"),n("关圣帝君圣诞")],"6-26":[n("二郎真君圣诞")],"7-7":[n("道德腊之辰","道德腊，此日五帝会于西方七炁素天"),n("庆生中会","此日中元赦罪，地官同天水二官考校罪福")],"7-12":[n("西方雷祖圣诞")],"7-15":[n("中元地官大帝圣诞")],"7-18":[n("王母娘娘圣诞")],"7-20":[n("刘祖(刘处玄)长生真人圣诞")],"7-22":[n("财帛星君文财神增福相公李诡祖圣诞")],"7-26":[n("张三丰祖师圣诞")],"8-1":[n("许真君飞升日")],"8-3":[n("九天司命灶君诞")],"8-5":[n("北方雷祖圣诞")],"8-10":[n("北岳大帝诞辰")],"8-15":[n("太阴星君诞")],"9-1":[n("北斗九皇降世之辰")],"9-2":[n("北斗九皇降世之辰")],"9-3":[n("北斗九皇降世之辰")],"9-4":[n("北斗九皇降世之辰")],"9-5":[n("北斗九皇降世之辰")],"9-6":[n("北斗九皇降世之辰")],"9-7":[n("北斗九皇降世之辰")],"9-8":[n("北斗九皇降世之辰")],"9-9":[n("北斗九皇降世之辰"),n("斗姥元君圣诞"),n("重阳帝君圣诞"),n("玄天上帝飞升"),n("酆都大帝圣诞")],"9-22":[n("增福财神诞")],"9-23":[n("萨翁真君圣诞")],"9-28":[n("五显灵官马元帅圣诞")],"10-1":[n("民岁腊之辰","民岁腊，此日五帝会于北方五炁黑天"),n("东皇大帝圣诞")],"10-3":[n("三茅应化真君圣诞")],"10-6":[n("天曹诸司五岳五帝圣诞")],"10-15":[n("下元水官大帝圣诞"),n("建生大会","此日下元解厄，水官同天地二官考校罪福")],"10-18":[n("地母娘娘圣诞")],"10-19":[n("长春邱真君飞升")],"10-20":[n("虚靖天师(即三十代天师弘悟张真人)诞")],"11-6":[n("西岳大帝圣诞")],"11-9":[n("湘子韩祖圣诞")],"11-11":[n("太乙救苦天尊圣诞")],"11-26":[n("北方五道圣诞")],"12-8":[n("王侯腊之辰","王侯腊，此日五帝会于上方玄都玉京")],"12-16":[n("南岳大帝圣诞"),n("福德正神诞")],"12-20":[n("鲁班先师圣诞")],"12-21":[n("天猷上帝圣诞")],"12-22":[n("重阳祖师圣诞")],"12-23":[n("祭灶王","最适宜谢旧年太岁，开启拜新年太岁")],"12-25":[n("玉帝巡天"),n("天神下降")],"12-29":[n("清静孙真君(孙不二)成道")]}}}(),Yn={NUMBER:["{n.one}","{n.two}","{n.three}","{n.four}","{n.five}","{n.six}","{n.seven}","{n.eight}","{n.nine}"],WU_XING:["{wx.shui}","{wx.tu}","{wx.mu}","{wx.mu}","{wx.tu}","{wx.jin}","{wx.jin}","{wx.tu}","{wx.huo}"],POSITION:["{bg.kan}","{bg.kun}","{bg.zhen}","{bg.xun}","{ps.center}","{bg.qian}","{bg.dui}","{bg.gen}","{bg.li}"],LUCK_XUAN_KONG:["{s.goodLuck}","{s.badLuck}","{s.badLuck}","{s.goodLuck}","{s.badLuck}","{s.goodLuck}","{s.badLuck}","{s.goodLuck}","{s.goodLuck}"],YIN_YANG_QI_MEN:["{s.yang}","{s.yin}","{s.yang}","{s.yang}","{s.yang}","{s.yin}","{s.yin}","{s.yang}","{s.yin}"],COLOR:["{s.white}","{s.black}","{s.blue}","{s.green}","{s.yellow}","{s.white}","{s.red}","{s.white}","{s.purple}"]},wn=function(){var n=function(n,t,e,a,g,r){return i(Cn.fromYmdHms(n+wn.BIRTH_YEAR,t,e,a,g,r))},i=function(n){return{_p:{lunar:n},getLunar:function(){return this._p.lunar},getYear:function(){return this._p.lunar.getYear()-wn.BIRTH_YEAR},getMonth:function(){return this._p.lunar.getMonth()},getDay:function(){return this._p.lunar.getDay()},getYearInChinese:function(){for(var n=this.getYear()+"",i="",t="0".charCodeAt(0),e=0,a=n.length;e<a;e++)i+=jn.NUMBER[n.charCodeAt(e)-t];return i},getMonthInChinese:function(){return this._p.lunar.getMonthInChinese()},getDayInChinese:function(){return this._p.lunar.getDayInChinese()},getFestivals:function(){var n=[],i=Nn.FESTIVAL[this.getMonth()+"-"+this.getDay()];i&&(n=n.concat(i));var t=this._p.lunar.getJieQi();Mn.getMessage("jq.dongZhi")===t?n.push(mn.create("元始天尊圣诞")):Mn.getMessage("jq.xiaZhi")===t&&n.push(mn.create("灵宝天尊圣诞"));var e=Nn.BA_JIE[t];return e&&n.push(mn.create(e)),(e=Nn.BA_HUI[this._p.lunar.getDayInGanZhi()])&&n.push(mn.create(e)),n},_isDayIn:function(n){for(var i=this.getMonth()+"-"+this.getDay(),t=0,e=n.length;t<e;t++)if(i===n[t])return!0;return!1},isDaySanHui:function(){return this._isDayIn(Nn.SAN_HUI)},isDaySanYuan:function(){return this._isDayIn(Nn.SAN_YUAN)},isDayBaJie:function(){return!!Nn.BA_JIE[this._p.lunar.getJieQi()]},isDayWuLa:function(){return this._isDayIn(Nn.WU_LA)},isDayBaHui:function(){return!!Nn.BA_HUI[this._p.lunar.getDayInGanZhi()]},isDayMingWu:function(){return Mn.getMessage("tg.wu")===this._p.lunar.getDayGan()},isDayAnWu:function(){return this._p.lunar.getDayZhi()===Nn.AN_WU[Math.abs(this.getMonth())-1]},isDayWu:function(){return this.isDayMingWu()||this.isDayAnWu()},isDayTianShe:function(){var n=!1,i=this._p.lunar.getMonthZhi(),t=this._p.lunar.getDayInGanZhi();return[Mn.getMessage("dz.yin"),Mn.getMessage("dz.mao"),Mn.getMessage("dz.chen")].join(",").indexOf(i)>-1?Mn.getMessage("jz.wuYin")===t&&(n=!0):[Mn.getMessage("dz.si"),Mn.getMessage("dz.wu"),Mn.getMessage("dz.wei")].join(",").indexOf(i)>-1?Mn.getMessage("jz.jiaWu")===t&&(n=!0):[Mn.getMessage("dz.shen"),Mn.getMessage("dz.you"),Mn.getMessage("dz.xu")].join(",").indexOf(i)>-1?Mn.getMessage("jz.wuShen")===t&&(n=!0):[Mn.getMessage("dz.hai"),Mn.getMessage("dz.zi"),Mn.getMessage("dz.chou")].join(",").indexOf(i)>-1&&Mn.getMessage("jz.jiaZi")===t&&(n=!0),n},toString:function(){return this.getYearInChinese()+"年"+this.getMonthInChinese()+"月"+this.getDayInChinese()},toFullString:function(){return"道歷"+this.getYearInChinese()+"年，天運"+this._p.lunar.getYearInGanZhi()+"年，"+this._p.lunar.getMonthInGanZhi()+"月，"+this._p.lunar.getDayInGanZhi()+"日。"+this.getMonthInChinese()+"月"+this.getDayInChinese()+"日，"+this._p.lunar.getTimeZhi()+"時。"}}};return{BIRTH_YEAR:-2697,fromYmdHms:function(i,t,e,a,g,r){return n(i,t,e,a,g,r)},fromYmd:function(i,t,e){return n(i,t,e,0,0,0)},fromLunar:function(n){return i(n)}}}(),Mn=(U=P="chs",W=!1,Q={chs:{"tg.jia":"甲","tg.yi":"乙","tg.bing":"丙","tg.ding":"丁","tg.wu":"戊","tg.ji":"己","tg.geng":"庚","tg.xin":"辛","tg.ren":"壬","tg.gui":"癸","dz.zi":"子","dz.chou":"丑","dz.yin":"寅","dz.mao":"卯","dz.chen":"辰","dz.si":"巳","dz.wu":"午","dz.wei":"未","dz.shen":"申","dz.you":"酉","dz.xu":"戌","dz.hai":"亥","zx.jian":"建","zx.chu":"除","zx.man":"满","zx.ping":"平","zx.ding":"定","zx.zhi":"执","zx.po":"破","zx.wei":"危","zx.cheng":"成","zx.shou":"收","zx.kai":"开","zx.bi":"闭","jz.jiaZi":"甲子","jz.yiChou":"乙丑","jz.bingYin":"丙寅","jz.dingMao":"丁卯","jz.wuChen":"戊辰","jz.jiSi":"己巳","jz.gengWu":"庚午","jz.xinWei":"辛未","jz.renShen":"壬申","jz.guiYou":"癸酉","jz.jiaXu":"甲戌","jz.yiHai":"乙亥","jz.bingZi":"丙子","jz.dingChou":"丁丑","jz.wuYin":"戊寅","jz.jiMao":"己卯","jz.gengChen":"庚辰","jz.xinSi":"辛巳","jz.renWu":"壬午","jz.guiWei":"癸未","jz.jiaShen":"甲申","jz.yiYou":"乙酉","jz.bingXu":"丙戌","jz.dingHai":"丁亥","jz.wuZi":"戊子","jz.jiChou":"己丑","jz.gengYin":"庚寅","jz.xinMao":"辛卯","jz.renChen":"壬辰","jz.guiSi":"癸巳","jz.jiaWu":"甲午","jz.yiWei":"乙未","jz.bingShen":"丙申","jz.dingYou":"丁酉","jz.wuXu":"戊戌","jz.jiHai":"己亥","jz.gengZi":"庚子","jz.xinChou":"辛丑","jz.renYin":"壬寅","jz.guiMao":"癸卯","jz.jiaChen":"甲辰","jz.yiSi":"乙巳","jz.bingWu":"丙午","jz.dingWei":"丁未","jz.wuShen":"戊申","jz.jiYou":"己酉","jz.gengXu":"庚戌","jz.xinHai":"辛亥","jz.renZi":"壬子","jz.guiChou":"癸丑","jz.jiaYin":"甲寅","jz.yiMao":"乙卯","jz.bingChen":"丙辰","jz.dingSi":"丁巳","jz.wuWu":"戊午","jz.jiWei":"己未","jz.gengShen":"庚申","jz.xinYou":"辛酉","jz.renXu":"壬戌","jz.guiHai":"癸亥","sx.rat":"鼠","sx.ox":"牛","sx.tiger":"虎","sx.rabbit":"兔","sx.dragon":"龙","sx.snake":"蛇","sx.horse":"马","sx.goat":"羊","sx.monkey":"猴","sx.rooster":"鸡","sx.dog":"狗","sx.pig":"猪","dw.long":"龙","dw.niu":"牛","dw.gou":"狗","dw.yang":"羊","dw.tu":"兔","dw.shu":"鼠","dw.ji":"鸡","dw.ma":"马","dw.hu":"虎","dw.zhu":"猪","dw.hou":"猴","dw.she":"蛇","dw.huLi":"狐","dw.yan":"燕","dw.bao":"豹","dw.yuan":"猿","dw.yin":"蚓","dw.lu":"鹿","dw.wu":"乌","dw.jiao":"蛟","dw.lang":"狼","dw.fu":"蝠","dw.zhang":"獐","dw.xu":"獝","dw.xie":"獬","dw.han":"犴","dw.he":"貉","dw.zhi":"彘","wx.jin":"金","wx.mu":"木","wx.shui":"水","wx.huo":"火","wx.tu":"土","wx.ri":"日","wx.yue":"月","n.zero":"〇","n.one":"一","n.two":"二","n.three":"三","n.four":"四","n.five":"五","n.six":"六","n.seven":"七","n.eight":"八","n.nine":"九","n.ten":"十","n.eleven":"十一","n.twelve":"十二","d.one":"初一","d.two":"初二","d.three":"初三","d.four":"初四","d.five":"初五","d.six":"初六","d.seven":"初七","d.eight":"初八","d.nine":"初九","d.ten":"初十","d.eleven":"十一","d.twelve":"十二","d.thirteen":"十三","d.fourteen":"十四","d.fifteen":"十五","d.sixteen":"十六","d.seventeen":"十七","d.eighteen":"十八","d.nighteen":"十九","d.twenty":"二十","d.twentyOne":"廿一","d.twentyTwo":"廿二","d.twentyThree":"廿三","d.twentyFour":"廿四","d.twentyFive":"廿五","d.twentySix":"廿六","d.twentySeven":"廿七","d.twentyEight":"廿八","d.twentyNine":"廿九","d.thirty":"三十","m.one":"正","m.two":"二","m.three":"三","m.four":"四","m.five":"五","m.six":"六","m.seven":"七","m.eight":"八","m.nine":"九","m.ten":"十","m.eleven":"冬","m.twelve":"腊","w.sun":"日","w.mon":"一","w.tues":"二","w.wed":"三","w.thur":"四","w.fri":"五","w.sat":"六","xz.aries":"白羊","xz.taurus":"金牛","xz.gemini":"双子","xz.cancer":"巨蟹","xz.leo":"狮子","xz.virgo":"处女","xz.libra":"天秤","xz.scorpio":"天蝎","xz.sagittarius":"射手","xz.capricornus":"摩羯","xz.aquarius":"水瓶","xz.pisces":"双鱼","bg.qian":"乾","bg.kun":"坤","bg.zhen":"震","bg.xun":"巽","bg.kan":"坎","bg.li":"离","bg.gen":"艮","bg.dui":"兑","ps.center":"中","ps.dong":"东","ps.nan":"南","ps.xi":"西","ps.bei":"北","ps.zhong":"中宫","ps.zhengDong":"正东","ps.zhengNan":"正南","ps.zhengXi":"正西","ps.zhengBei":"正北","ps.dongBei":"东北","ps.dongNan":"东南","ps.xiBei":"西北","ps.xiNan":"西南","ps.wai":"外","ps.fangNei":"房内","jq.dongZhi":"冬至","jq.xiaoHan":"小寒","jq.daHan":"大寒","jq.liChun":"立春","jq.yuShui":"雨水","jq.jingZhe":"惊蛰","jq.chunFen":"春分","jq.qingMing":"清明","jq.guYu":"谷雨","jq.liXia":"立夏","jq.xiaoMan":"小满","jq.mangZhong":"芒种","jq.xiaZhi":"夏至","jq.xiaoShu":"小暑","jq.daShu":"大暑","jq.liQiu":"立秋","jq.chuShu":"处暑","jq.baiLu":"白露","jq.qiuFen":"秋分","jq.hanLu":"寒露","jq.shuangJiang":"霜降","jq.liDong":"立冬","jq.xiaoXue":"小雪","jq.daXue":"大雪","sn.qingLong":"青龙","sn.baiHu":"白虎","sn.zhuQue":"朱雀","sn.xuanWu":"玄武","sn.mingTang":"明堂","sn.tianXing":"天刑","sn.tianDe":"天德","sn.jinKui":"金匮","sn.yuTang":"玉堂","sn.siMing":"司命","sn.tianLao":"天牢","sn.gouChen":"勾陈","sn.tianEn":"天恩","sn.muCang":"母仓","sn.shiYang":"时阳","sn.shengQi":"生气","sn.yiHou":"益后","sn.zaiSha":"灾煞","sn.tianHuo":"天火","sn.siJi":"四忌","sn.baLong":"八龙","sn.fuRi":"复日","sn.xuShi":"续世","sn.yueSha":"月煞","sn.yueXu":"月虚","sn.xueZhi":"血支","sn.tianZei":"天贼","sn.wuXu":"五虚","sn.tuFu":"土符","sn.guiJi":"归忌","sn.xueJi":"血忌","sn.yueDe":"月德","sn.yueEn":"月恩","sn.siXiang":"四相","sn.wangRi":"王日","sn.tianCang":"天仓","sn.buJiang":"不将","sn.wuHe":"五合","sn.mingFeiDui":"鸣吠对","sn.yueJian":"月建","sn.xiaoShi":"小时","sn.tuHu":"土府","sn.wangWang":"往亡","sn.yaoAn":"要安","sn.siShen":"死神","sn.tianMa":"天马","sn.jiuHu":"九虎","sn.qiNiao":"七鸟","sn.liuShe":"六蛇","sn.guanRi":"官日","sn.jiQi":"吉期","sn.yuYu":"玉宇","sn.daShi":"大时","sn.daBai":"大败","sn.xianChi":"咸池","sn.shouRi":"守日","sn.tianWu":"天巫","sn.fuDe":"福德","sn.liuYi":"六仪","sn.jinTang":"金堂","sn.yanDui":"厌对","sn.zhaoYao":"招摇","sn.jiuKong":"九空","sn.jiuKan":"九坎","sn.jiuJiao":"九焦","sn.xiangRi":"相日","sn.baoGuang":"宝光","sn.tianGang":"天罡","sn.yueXing":"月刑","sn.yueHai":"月害","sn.youHuo":"游祸","sn.chongRi":"重日","sn.shiDe":"时德","sn.minRi":"民日","sn.sanHe":"三合","sn.linRi":"临日","sn.shiYin":"时阴","sn.mingFei":"鸣吠","sn.siQi":"死气","sn.diNang":"地囊","sn.yueDeHe":"月德合","sn.jingAn":"敬安","sn.puHu":"普护","sn.jieShen":"解神","sn.xiaoHao":"小耗","sn.tianDeHe":"天德合","sn.yueKong":"月空","sn.yiMa":"驿马","sn.tianHou":"天后","sn.chuShen":"除神","sn.yuePo":"月破","sn.daHao":"大耗","sn.wuLi":"五离","sn.yinDe":"阴德","sn.fuSheng":"福生","sn.tianLi":"天吏","sn.zhiSi":"致死","sn.yuanWu":"元武","sn.yangDe":"阳德","sn.tianXi":"天喜","sn.tianYi":"天医","sn.yueYan":"月厌","sn.diHuo":"地火","sn.fourHit":"四击","sn.daSha":"大煞","sn.daHui":"大会","sn.tianYuan":"天愿","sn.liuHe":"六合","sn.wuFu":"五富","sn.shengXin":"圣心","sn.heKui":"河魁","sn.jieSha":"劫煞","sn.siQiong":"四穷","sn.chuShuiLong":"触水龙","sn.baFeng":"八风","sn.tianShe":"天赦","sn.wuMu":"五墓","sn.baZhuan":"八专","sn.yinCuo":"阴错","sn.siHao":"四耗","sn.yangCuo":"阳错","sn.siFei":"四废","sn.sanYin":"三阴","sn.xiaoHui":"小会","sn.yinDaoChongYang":"阴道冲阳","sn.danYin":"单阴","sn.guChen":"孤辰","sn.yinWei":"阴位","sn.xingHen":"行狠","sn.liaoLi":"了戾","sn.jueYin":"绝阴","sn.chunYang":"纯阳","sn.suiBo":"岁薄","sn.yinYangJiaoPo":"阴阳交破","sn.yinYangJuCuo":"阴阳俱错","sn.yinYangJiChong":"阴阳击冲","sn.zhuZhen":"逐阵","sn.yangCuoYinChong":"阳错阴冲","sn.qiFu":"七符","sn.tianGou":"天狗","sn.chengRi":"成日","sn.tianFu":"天符","sn.guYang":"孤阳","sn.jueYang":"绝阳","sn.chunYin":"纯阴","sn.yinShen":"阴神","sn.jieChu":"解除","sn.yangPoYinChong":"阳破阴冲","ss.biJian":"比肩","ss.jieCai":"劫财","ss.shiShen":"食神","ss.shangGuan":"伤官","ss.pianCai":"偏财","ss.zhengCai":"正财","ss.qiSha":"七杀","ss.zhengGuan":"正官","ss.pianYin":"偏印","ss.zhengYin":"正印","s.none":"无","s.huangDao":"黄道","s.heiDao":"黑道","s.goodLuck":"吉","s.badLuck":"凶","s.yin":"阴","s.yang":"阳","s.white":"白","s.black":"黑","s.blue":"碧","s.green":"绿","s.yellow":"黄","s.red":"赤","s.purple":"紫","jr.chuXi":"除夕","jr.chunJie":"春节","jr.yuanXiao":"元宵节","jr.longTou":"龙头节","jr.duanWu":"端午节","jr.qiXi":"七夕节","jr.zhongQiu":"中秋节","jr.chongYang":"重阳节","jr.laBa":"腊八节","jr.yuanDan":"元旦节","jr.qingRen":"情人节","jr.fuNv":"妇女节","jr.zhiShu":"植树节","jr.xiaoFei":"消费者权益日","jr.wuYi":"劳动节","jr.qingNian":"青年节","jr.erTong":"儿童节","jr.yuRen":"愚人节","jr.jianDang":"建党节","jr.jianJun":"建军节","jr.jiaoShi":"教师节","jr.guoQing":"国庆节","jr.wanShengYe":"万圣节前夜","jr.wanSheng":"万圣节","jr.pingAn":"平安夜","jr.shengDan":"圣诞节","ds.changSheng":"长生","ds.muYu":"沐浴","ds.guanDai":"冠带","ds.linGuan":"临官","ds.diWang":"帝旺","ds.shuai":"衰","ds.bing":"病","ds.si":"死","ds.mu":"墓","ds.jue":"绝","ds.tai":"胎","ds.yang":"养","h.first":"初候","h.second":"二候","h.third":"三候","h.qiuYinJie":"蚯蚓结","h.miJiao":"麋角解","h.shuiQuan":"水泉动","h.yanBei":"雁北乡","h.queShi":"鹊始巢","h.zhiShi":"雉始雊","h.jiShi":"鸡始乳","h.zhengNiao":"征鸟厉疾","h.shuiZe":"水泽腹坚","h.dongFeng":"东风解冻","h.zheChongShiZhen":"蛰虫始振","h.yuZhi":"鱼陟负冰","h.taJi":"獭祭鱼","h.houYan":"候雁北","h.caoMuMengDong":"草木萌动","h.taoShi":"桃始华","h.cangGeng":"仓庚鸣","h.yingHua":"鹰化为鸠","h.xuanNiaoZhi":"玄鸟至","h.leiNai":"雷乃发声","h.shiDian":"始电","h.tongShi":"桐始华","h.tianShu":"田鼠化为鴽","h.hongShi":"虹始见","h.pingShi":"萍始生","h.mingJiu":"鸣鸠拂奇羽","h.daiSheng":"戴胜降于桑","h.louGuo":"蝼蝈鸣","h.qiuYinChu":"蚯蚓出","h.wangGua":"王瓜生","h.kuCai":"苦菜秀","h.miCao":"靡草死","h.maiQiu":"麦秋至","h.tangLang":"螳螂生","h.juShi":"鵙始鸣","h.fanShe":"反舌无声","h.luJia":"鹿角解","h.tiaoShi":"蜩始鸣","h.banXia":"半夏生","h.wenFeng":"温风至","h.xiShuai":"蟋蟀居壁","h.yingShi":"鹰始挚","h.fuCao":"腐草为萤","h.tuRun":"土润溽暑","h.daYu":"大雨行时","h.liangFeng":"凉风至","h.baiLu":"白露降","h.hanChan":"寒蝉鸣","h.yingNai":"鹰乃祭鸟","h.tianDi":"天地始肃","h.heNai":"禾乃登","h.hongYanLai":"鸿雁来","h.xuanNiaoGui":"玄鸟归","h.qunNiao":"群鸟养羞","h.leiShi":"雷始收声","h.zheChongPiHu":"蛰虫坯户","h.shuiShiHe":"水始涸","h.hongYanLaiBin":"鸿雁来宾","h.queRu":"雀入大水为蛤","h.juYou":"菊有黄花","h.caiNai":"豺乃祭兽","h.caoMuHuangLuo":"草木黄落","h.zheChongXianFu":"蛰虫咸俯","h.shuiShiBing":"水始冰","h.diShi":"地始冻","h.zhiRu":"雉入大水为蜃","h.hongCang":"虹藏不见","h.tianQi":"天气上升地气下降","h.biSe":"闭塞而成冬","h.heDan":"鹖鴠不鸣","h.huShi":"虎始交","h.liTing":"荔挺出","ts.zhan":"占","ts.hu":"户","ts.win":"窗","ts.fang":"房","ts.chuang":"床","ts.lu":"炉","ts.zao":"灶","ts.dui":"碓","ts.mo":"磨","ts.xi":"栖","ts.chu":"厨","ts.ce":"厕","ts.cang":"仓","ts.cangKu":"仓库","ts.daMen":"大门","ts.men":"门","ts.tang":"堂","ly.xianSheng":"先胜","ly.xianFu":"先负","ly.youYin":"友引","ly.foMie":"佛灭","ly.daAn":"大安","ly.chiKou":"赤口","yj.jiSi":"祭祀","yj.qiFu":"祈福","yj.qiuSi":"求嗣","yj.kaiGuang":"开光","yj.suHui":"塑绘","yj.qiJiao":"齐醮","yj.zhaiJiao":"斋醮","yj.muYu":"沐浴","yj.chouShen":"酬神","yj.zaoMiao":"造庙","yj.siZhao":"祀灶","yj.fenXiang":"焚香","yj.xieTu":"谢土","yj.chuHuo":"出火","yj.diaoKe":"雕刻","yj.jiaQu":"嫁娶","yj.DingHun":"订婚","yj.naCai":"纳采","yj.wenMing":"问名","yj.naXu":"纳婿","yj.guiNing":"归宁","yj.anChuang":"安床","yj.heZhang":"合帐","yj.guanJi":"冠笄","yj.dingMeng":"订盟","yj.jinRenKou":"进人口","yj.caiYi":"裁衣","yj.wanMian":"挽面","yj.kaiRong":"开容","yj.xiuFen":"修坟","yj.qiZuan":"启钻","yj.poTu":"破土","yj.anZang":"安葬","yj.liBei":"立碑","yj.chengFu":"成服","yj.chuFu":"除服","yj.kaiShengFen":"开生坟","yj.heShouMu":"合寿木","yj.ruLian":"入殓","yj.yiJiu":"移柩","yj.puDu":"普渡","yj.ruZhai":"入宅","yj.anXiang":"安香","yj.anMen":"安门","yj.xiuZao":"修造","yj.qiJi":"起基","yj.dongTu":"动土","yj.shangLiang":"上梁","yj.shuZhu":"竖柱","yj.kaiJing":"开井开池","yj.zuoBei":"作陂放水","yj.chaiXie":"拆卸","yj.poWu":"破屋","yj.huaiYuan":"坏垣","yj.buYuan":"补垣","yj.faMuZuoLiang":"伐木做梁","yj.zuoZhao":"作灶","yj.jieChu":"解除","yj.kaiZhuYan":"开柱眼","yj.chuanPing":"穿屏扇架","yj.gaiWuHeJi":"盖屋合脊","yj.kaiCe":"开厕","yj.zaoCang":"造仓","yj.saiXue":"塞穴","yj.pingZhi":"平治道涂","yj.zaoQiao":"造桥","yj.zuoCe":"作厕","yj.zhuDi":"筑堤","yj.kaiChi":"开池","yj.faMu":"伐木","yj.kaiQu":"开渠","yj.jueJing":"掘井","yj.saoShe":"扫舍","yj.fangShui":"放水","yj.zaoWu":"造屋","yj.heJi":"合脊","yj.zaoChuChou":"造畜稠","yj.xiuMen":"修门","yj.dingSang":"定磉","yj.zuoLiang":"作梁","yj.xiuShi":"修饰垣墙","yj.jiaMa":"架马","yj.kaiShi":"开市","yj.guaBian":"挂匾","yj.naChai":"纳财","yj.qiuCai":"求财","yj.kaiCang":"开仓","yj.maiChe":"买车","yj.zhiChan":"置产","yj.guYong":"雇佣","yj.chuHuoCai":"出货财","yj.anJiXie":"安机械","yj.zaoCheQi":"造车器","yj.jingLuo":"经络","yj.yunNiang":"酝酿","yj.zuoRan":"作染","yj.guZhu":"鼓铸","yj.zaoChuan":"造船","yj.geMi":"割蜜","yj.zaiZhong":"栽种","yj.quYu":"取渔","yj.jieWang":"结网","yj.muYang":"牧养","yj.anDuiWei":"安碓磑","yj.xiYi":"习艺","yj.ruXue":"入学","yj.liFa":"理发","yj.tanBing":"探病","yj.jianGui":"见贵","yj.chengChuan":"乘船","yj.duShui":"渡水","yj.zhenJiu":"针灸","yj.chuXing":"出行","yj.yiXi":"移徙","yj.fenJu":"分居","yj.TiTou":"剃头","yj.zhengShou":"整手足甲","yj.naChu":"纳畜","yj.buZhuo":"捕捉","yj.tianLie":"畋猎","yj.jiaoNiuMa":"教牛马","yj.huiQinYou":"会亲友","yj.fuRen":"赴任","yj.qiuYi":"求医","yj.zhiBing":"治病","yj.ciSong":"词讼","yj.qiJiDongTu":"起基动土","yj.poWuHuaiYuan":"破屋坏垣","yj.gaiWu":"盖屋","yj.zaoCangKu":"造仓库","yj.liQuanJiaoYi":"立券交易","yj.jiaoYi":"交易","yj.liQuan":"立券","yj.anJi":"安机","yj.huiYou":"会友","yj.qiuYiLiaoBing":"求医疗病","yj.zhuShi":"诸事不宜","yj.yuShi":"馀事勿取","yj.xingSang":"行丧","yj.duanYi":"断蚁","yj.guiXiu":"归岫","xx.bi":"毕","xx.yi":"翼","xx.ji":"箕","xx.kui":"奎","xx.gui":"鬼","xx.di":"氐","xx.xu":"虚","xx.wei":"危","xx.zi":"觜","xx.zhen":"轸","xx.dou":"斗","xx.lou":"娄","xx.liu":"柳","xx.fang":"房","xx.xin":"心","xx.shi":"室","xx.can":"参","xx.jiao":"角","xx.niu":"牛","xx.vei":"胃","xx.xing":"星","xx.zhang":"张","xx.tail":"尾","xx.qiang":"壁","xx.jing":"井","xx.kang":"亢","xx.nv":"女","xx.mao":"昴","sz.chun":"春","sz.xia":"夏","sz.qiu":"秋","sz.dong":"冬","od.first":"孟","od.second":"仲","od.third":"季","yx.shuo":"朔","yx.jiShuo":"既朔","yx.eMeiXin":"蛾眉新","yx.eMei":"蛾眉","yx.xi":"夕","yx.shangXian":"上弦","yx.jiuYe":"九夜","yx.night":"宵","yx.jianYingTu":"渐盈凸","yx.xiaoWang":"小望","yx.wang":"望","yx.jiWang":"既望","yx.liDai":"立待","yx.juDai":"居待","yx.qinDai":"寝待","yx.gengDai":"更待","yx.jianKuiTu":"渐亏凸","yx.xiaXian":"下弦","yx.youMing":"有明","yx.eMeiCan":"蛾眉残","yx.can":"残","yx.xiao":"晓","yx.hui":"晦","ny.sangZhe":"桑柘","ny.baiLa":"白蜡","ny.yangLiu":"杨柳","ny.jinBo":"金箔","ny.haiZhong":"海中","ny.daHai":"大海","ny.shaZhong":"沙中","ny.luZhong":"炉中","ny.shanXia":"山下","ny.daLin":"大林","ny.pingDi":"平地","ny.luPang":"路旁","ny.biShang":"壁上","ny.jianFeng":"剑锋","ny.shanTou":"山头","ny.fuDeng":"覆灯","ny.jianXia":"涧下","ny.tianHe":"天河","ny.chengTou":"城头","ny.daYi":"大驿","ny.chaiChuan":"钗钏","ny.quanZhong":"泉中","ny.daXi":"大溪","ny.wuShang":"屋上","ny.piLi":"霹雳","ny.tianShang":"天上","ny.songBo":"松柏","ny.shiLiu":"石榴","ny.changLiu":"长流"},en:{"tg.jia":"Jia","tg.yi":"Yi","tg.bing":"Bing","tg.ding":"Ding","tg.wu":"Wu","tg.ji":"Ji","tg.geng":"Geng","tg.xin":"Xin","tg.ren":"Ren","tg.gui":"Gui","dz.zi":"Zi","dz.chou":"Chou","dz.yin":"Yin","dz.mao":"Mao","dz.chen":"Chen","dz.si":"Si","dz.wu":"Wu","dz.wei":"Wei","dz.shen":"Shen","dz.you":"You","dz.xu":"Xu","dz.hai":"Hai","zx.jian":"Build","zx.chu":"Remove","zx.man":"Full","zx.ping":"Flat","zx.ding":"Stable","zx.zhi":"Hold","zx.po":"Break","zx.wei":"Danger","zx.cheng":"Complete","zx.shou":"Collect","zx.kai":"Open","zx.bi":"Close","jz.jiaZi":"JiaZi","jz.yiChou":"YiChou","jz.bingYin":"BingYin","jz.dingMao":"DingMao","jz.wuChen":"WuChen","jz.jiSi":"JiSi","jz.gengWu":"GengWu","jz.xinWei":"XinWei","jz.renShen":"RenShen","jz.guiYou":"GuiYou","jz.jiaXu":"JiaXu","jz.yiHai":"YiHai","jz.bingZi":"BingZi","jz.dingChou":"DingChou","jz.wuYin":"WuYin","jz.jiMao":"JiMao","jz.gengChen":"GengChen","jz.xinSi":"XinSi","jz.renWu":"RenWu","jz.guiWei":"GuiWei","jz.jiaShen":"JiaShen","jz.yiYou":"YiYou","jz.bingXu":"BingXu","jz.dingHai":"DingHai","jz.wuZi":"WuZi","jz.jiChou":"JiChou","jz.gengYin":"GengYin","jz.xinMao":"XinMao","jz.renChen":"RenChen","jz.guiSi":"GuiSi","jz.jiaWu":"JiaWu","jz.yiWei":"YiWei","jz.bingShen":"BingShen","jz.dingYou":"DingYou","jz.wuXu":"WuXu","jz.jiHai":"JiHai","jz.gengZi":"GengZi","jz.xinChou":"XinChou","jz.renYin":"RenYin","jz.guiMao":"GuiMao","jz.jiaChen":"JiaChen","jz.yiSi":"YiSi","jz.bingWu":"BingWu","jz.dingWei":"DingWei","jz.wuShen":"WuShen","jz.jiYou":"JiYou","jz.gengXu":"GengXu","jz.xinHai":"XinHai","jz.renZi":"RenZi","jz.guiChou":"GuiChou","jz.jiaYin":"JiaYin","jz.yiMao":"YiMao","jz.bingChen":"BingChen","jz.dingSi":"DingSi","jz.wuWu":"WuWu","jz.jiWei":"JiWei","jz.gengShen":"GengShen","jz.xinYou":"XinYou","jz.renXu":"RenXu","jz.guiHai":"GuiHai","sx.rat":"Rat","sx.ox":"Ox","sx.tiger":"Tiger","sx.rabbit":"Rabbit","sx.dragon":"Dragon","sx.snake":"Snake","sx.horse":"Horse","sx.goat":"Goat","sx.monkey":"Monkey","sx.rooster":"Rooster","sx.dog":"Dog","sx.pig":"Pig","dw.long":"Dragon","dw.niu":"Ox","dw.gou":"Dog","dw.yang":"Goat","dw.tu":"Rabbit","dw.shu":"Rat","dw.ji":"Rooster","dw.ma":"Horse","dw.hu":"Tiger","dw.zhu":"Pig","dw.hou":"Monkey","dw.she":"Snake","dw.huLi":"Fox","dw.yan":"Swallow","dw.bao":"Leopard","dw.yuan":"Ape","dw.yin":"Earthworm","dw.lu":"Deer","dw.wu":"Crow","dw.lang":"Wolf","dw.fu":"Bat","wx.jin":"Metal","wx.mu":"Wood","wx.shui":"Water","wx.huo":"Fire","wx.tu":"Earth","wx.ri":"Sun","wx.yue":"Moon","n.zero":"0","n.one":"1","n.two":"2","n.three":"3","n.four":"4","n.five":"5","n.six":"6","n.seven":"7","n.eight":"8","n.nine":"9","n.ten":"10","n.eleven":"11","n.twelve":"12","w.sun":"Sunday","w.mon":"Monday","w.tues":"Tuesday","w.wed":"Wednesday","w.thur":"Thursday","w.fri":"Friday","w.sat":"Saturday","xz.aries":"Aries","xz.taurus":"Taurus","xz.gemini":"Gemini","xz.cancer":"Cancer","xz.leo":"Leo","xz.virgo":"Virgo","xz.libra":"Libra","xz.scorpio":"Scorpio","xz.sagittarius":"Sagittarius","xz.capricornus":"Capricornus","xz.aquarius":"Aquarius","xz.pisces":"Pisces","bg.qian":"Qian","bg.kun":"Kun","bg.zhen":"Zhen","bg.xun":"Xun","bg.kan":"Kan","bg.li":"Li","bg.gen":"Gen","bg.dui":"Dui","ps.center":"Center","ps.dong":"East","ps.nan":"South","ps.xi":"West","ps.bei":"North","ps.zhong":"Center","ps.zhengDong":"East","ps.zhengNan":"South","ps.zhengXi":"West","ps.zhengBei":"North","ps.dongBei":"Northeast","ps.dongNan":"Southeast","ps.xiBei":"Northwest","ps.xiNan":"Southwest","jq.dongZhi":"Winter Solstice","jq.xiaoHan":"Lesser Cold","jq.daHan":"Great Cold","jq.liChun":"Spring Beginning","jq.yuShui":"Rain Water","jq.jingZhe":"Awakening from Hibernation","jq.chunFen":"Spring Equinox","jq.qingMing":"Fresh Green","jq.guYu":"Grain Rain","jq.liXia":"Beginning of Summer","jq.xiaoMan":"Lesser Fullness","jq.mangZhong":"Grain in Ear","jq.xiaZhi":"Summer Solstice","jq.xiaoShu":"Lesser Heat","jq.daShu":"Greater Heat","jq.liQiu":"Beginning of Autumn","jq.chuShu":"End of Heat","jq.baiLu":"White Dew","jq.qiuFen":"Autumnal Equinox","jq.hanLu":"Cold Dew","jq.shuangJiang":"First Frost","jq.liDong":"Beginning of Winter","jq.xiaoXue":"Light Snow","jq.daXue":"Heavy Snow","sn.qingLong":"Azure Dragon","sn.baiHu":"White Tiger","sn.zhuQue":"Rosefinch","sn.xuanWu":"Black Tortoise","sn.tianEn":"Serene Grace","sn.siShen":"Death","sn.tianMa":"Pegasus","sn.baLong":"Eight Dragon","sn.jiuHu":"Nine Tiger","sn.qiNiao":"Seven Bird","sn.liuShe":"Six Snake","s.none":"None","s.goodLuck":"Good luck","s.badLuck":"Bad luck","s.yin":"Yin","s.yang":"Yang","s.white":"White","s.black":"Black","s.blue":"Blue","s.green":"Green","s.yellow":"Yellow","s.red":"Red","s.purple":"Purple","jr.chuXi":"Chinese New Year's Eve","jr.chunJie":"Luna New Year","jr.yuanXiao":"Lantern Festival","jr.duanWu":"Dragon Boat Festival","jr.qiXi":"Begging Festival","jr.zhongQiu":"Mid-Autumn Festival","jr.laBa":"Laba Festival","jr.yuanDan":"New Year's Day","jr.qingRen":"Valentine's Day","jr.fuNv":"Women's Day","jr.xiaoFei":"Consumer Rights Day","jr.zhiShu":"Arbor Day","jr.wuYi":"International Worker's Day","jr.erTong":"Children's Day","jr.qingNian":"Youth Day","jr.yuRen":"April Fools' Day","jr.jianDang":"Party's Day","jr.jianJun":"Army Day","jr.jiaoShi":"Teachers' Day","jr.guoQing":"National Day","jr.wanShengYe":"All Saints' Eve","jr.wanSheng":"All Saints' Day","jr.pingAn":"Christmas Eve","jr.shengDan":"Christmas Day","ts.zhan":"At","ts.hu":"Household","ts.zao":"Cooker","ts.dui":"Pestle","ts.xi":"Habitat","ts.win":"Window","ts.fang":"Room","ts.chuang":"Bed","ts.lu":"Stove","ts.mo":"Mill","ts.chu":"Kitchen","ts.ce":"Toilet","ts.cang":"Depot","ts.cangKu":"Depot","ts.daMen":"Gate","ts.men":"Door","ts.tang":"Hall","ly.xianSheng":"Win first","ly.xianFu":"Lose first","ly.youYin":"Friend's referral","ly.foMie":"Buddhism's demise","ly.daAn":"Great safety","ly.chiKou":"Chikagoro","yj.jiSi":"Sacrifice","yj.qiFu":"Pray","yj.qiuSi":"Seek heirs","yj.kaiGuang":"Consecretion","yj.suHui":"Paint sculptural","yj.qiJiao":"Build altar","yj.zhaiJiao":"Taoist rites","yj.muYu":"Bathing","yj.chouShen":"Reward gods","yj.zaoMiao":"Build temple","yj.siZhao":"Offer kitchen god","yj.fenXiang":"Burn incense","yj.xieTu":"Earth gratitude","yj.chuHuo":"Expel the flame","yj.diaoKe":"Carving","yj.jiaQu":"Marriage","yj.DingHun":"Engagement","yj.naCai":"Proposing","yj.wenMing":"Ask name","yj.naXu":"Uxorilocal marriage","yj.guiNing":"Visit parents","yj.anChuang":"Bed placing","yj.heZhang":"Make up accounts","yj.guanJi":"Crowning adulthood","yj.dingMeng":"Make alliance","yj.jinRenKou":"Adopt","yj.caiYi":"Dressmaking","yj.wanMian":"Cosmeticsurgery","yj.kaiRong":"Open face","yj.xiuFen":"Grave repair","yj.qiZuan":"Open coffin","yj.poTu":"Break earth","yj.anZang":"Burial","yj.liBei":"Tombstone erecting","yj.chengFu":"Formation of clothes","yj.chuFu":"Mourning clothes removal","yj.kaiShengFen":"Open grave","yj.heShouMu":"Make coffin","yj.ruLian":"Body placing","yj.yiJiu":"Move coffin","yj.puDu":"Save soul","yj.ruZhai":"Enter house","yj.anXiang":"Incenst placement","yj.anMen":"Door placing","yj.xiuZao":"Repair","yj.qiJi":"Digging","yj.dongTu":"Break ground","yj.shangLiang":"Beam placing","yj.shuZhu":"Erecting pillars","yj.kaiJing":"Open pond and well","yj.zuoBei":"Make pond and fill water","yj.chaiXie":"Smash house","yj.poWu":"Break house","yj.huaiYuan":"Demolish","yj.buYuan":"Mending","yj.faMuZuoLiang":"Make beams","yj.zuoZhao":"Make stove","yj.jieChu":"Removal","yj.kaiZhuYan":"Build beam","yj.chuanPing":"Build door","yj.gaiWuHeJi":"Cover house","yj.kaiCe":"Open toilet","yj.zaoCang":"Build depot","yj.saiXue":"Block nest","yj.pingZhi":"Repair roads","yj.zaoQiao":"Build bridge","yj.zuoCe":"Build toilet","yj.zhuDi":"Fill","yj.kaiChi":"Open pond","yj.faMu":"Lumbering","yj.kaiQu":"Canalization","yj.jueJing":"Dig well","yj.saoShe":"Sweep house","yj.fangShui":"Drainage","yj.zaoWu":"Build house","yj.heJi":"Close ridge","yj.zaoChuChou":"Livestock thickening","yj.xiuMen":"Repair door","yj.dingSang":"Fix stone","yj.zuoLiang":"Beam construction","yj.xiuShi":"Decorate wall","yj.jiaMa":"Erect horse","yj.kaiShi":"Opening","yj.guaBian":"Hang plaque","yj.naChai":"Accept wealth","yj.qiuCai":"Seek wealth","yj.kaiCang":"Open depot","yj.maiChe":"Buy car","yj.zhiChan":"Buy property","yj.guYong":"Hire","yj.chuHuoCai":"Delivery","yj.anJiXie":"Build machine","yj.zaoCheQi":"Build car","yj.jingLuo":"Build loom","yj.yunNiang":"Brew","yj.zuoRan":"Dye","yj.guZhu":"Cast","yj.zaoChuan":"Build boat","yj.geMi":"Harvest honey","yj.zaiZhong":"Farming","yj.quYu":"Fishing","yj.jieWang":"Netting","yj.muYang":"Graze","yj.anDuiWei":"Build rub","yj.xiYi":"Learn","yj.ruXue":"Enter school","yj.liFa":"Haircut","yj.tanBing":"Visiting","yj.jianGui":"Meet noble","yj.chengChuan":"Ride boat","yj.duShui":"Cross water","yj.zhenJiu":"Acupuncture","yj.chuXing":"Travel","yj.yiXi":"Move","yj.fenJu":"Live apart","yj.TiTou":"Shave","yj.zhengShou":"Manicure","yj.naChu":"Feed livestock","yj.buZhuo":"Catch","yj.tianLie":"Hunt","yj.jiaoNiuMa":"Train horse","yj.huiQinYou":"Meet friends","yj.fuRen":"Go post","yj.qiuYi":"See doctor","yj.zhiBing":"Treat","yj.ciSong":"Litigation","yj.qiJiDongTu":"Lay foundation","yj.poWuHuaiYuan":"Demolish","yj.gaiWu":"Build house","yj.zaoCangKu":"Build depot","yj.liQuanJiaoYi":"Covenant trade","yj.jiaoYi":"Trade","yj.liQuan":"Covenant","yj.anJi":"Install machine","yj.huiYou":"Meet friends","yj.qiuYiLiaoBing":"Seek treatment","yj.zhuShi":"Everything Sucks","yj.yuShi":"Do nothing else","yj.xingSang":"Funeral","yj.duanYi":"Block ant hole","yj.guiXiu":"Place beam","xx.bi":"Finish","xx.yi":"Wing","xx.ji":"Sieve","xx.kui":"Qui","xx.gui":"Ghost","xx.di":"Foundation","xx.xu":"Virtual","xx.wei":"Danger","xx.zi":"Mouth","xx.zhen":"Cross-bar","xx.dou":"Fight","xx.lou":"Weak","xx.liu":"Willow","xx.fang":"House","xx.xin":"Heart","xx.shi":"Room","xx.can":"Join","xx.jiao":"Horn","xx.niu":"Ox","xx.vei":"Stomach","xx.xing":"Star","xx.zhang":"Chang","xx.tail":"Tail","xx.qiang":"Wall","xx.jing":"Well","xx.kang":"Kang","xx.nv":"Female","xx.mao":"Mao","sz.chun":"Spring","sz.xia":"Summer","sz.qiu":"Autumn","sz.dong":"Winter","yx.shuo":"New","yx.eMeiXin":"New waxing","yx.eMei":"Waxing","yx.xi":"Evening","yx.shangXian":"First quarter","yx.jiuYe":"Nine night","yx.night":"Night","yx.jianYingTu":"Gibbous","yx.xiaoWang":"Little full","yx.wang":"Full","yx.jianKuiTu":"Disseminating","yx.xiaXian":"Third quarter","yx.eMeiCan":"Waning waxing","yx.can":"Waning","yx.xiao":"Daybreak","yx.hui":"Obscure","ny.sangZhe":"Cudrania","ny.baiLa":"Wax","ny.yangLiu":"Willow","ny.jinBo":"Foil","ny.haiZhong":"Sea","ny.daHai":"Ocean","ny.shaZhong":"Sand","ny.luZhong":"Stove","ny.shanXia":"Piedmont","ny.daLin":"Forest","ny.pingDi":"Land","ny.luPang":"Roadside","ny.biShang":"Wall","ny.jianFeng":"Blade","ny.shanTou":"Hilltop","ny.fuDeng":"Light","ny.jianXia":"Valleyn","ny.tianHe":"River","ny.chengTou":"City","ny.daYi":"Post","ny.chaiChuan":"Ornaments","ny.quanZhong":"Spring","ny.daXi":"Stream","ny.wuShang":"Roof","ny.piLi":"Thunderbolt","ny.tianShang":"Sky","ny.songBo":"Coniferin","ny.shiLiu":"Pomegranate","ny.changLiu":"Flows"}},R={LunarUtil:jn,SolarUtil:fn,TaoUtil:Nn,FotoUtil:Sn,NineStarUtil:Yn},K={LunarUtil:{TIAN_SHEN_TYPE:{},TIAN_SHEN_TYPE_LUCK:{},XIU_LUCK:{},LU:{},XIU:{},SHA:{},POSITION_DESC:{},NAYIN:{},WU_XING_GAN:{},WU_XING_ZHI:{},SHOU:{},GONG:{},FESTIVAL:{},ZHENG:{},ANIMAL:{},SHI_SHEN:{},XIU_SONG:{}},SolarUtil:{FESTIVAL:{}},TaoUtil:{BA_HUI:{},BA_JIE:{}}},V={LunarUtil:{ZHI_TIAN_SHEN_OFFSET:{},CHANG_SHENG_OFFSET:{}}},$={LunarUtil:{ZHI_HIDE_GAN:{}}},nn={LunarUtil:{GAN:[],ZHI:[],JIA_ZI:[],ZHI_XING:[],XUN:[],XUN_KONG:[],CHONG:[],CHONG_GAN:[],CHONG_GAN_TIE:[],HE_GAN_5:[],HE_ZHI_6:[],SHENGXIAO:[],NUMBER:[],POSITION_XI:[],POSITION_YANG_GUI:[],POSITION_YIN_GUI:[],POSITION_FU:[],POSITION_FU_2:[],POSITION_CAI:[],POSITION_TAI_SUI_YEAR:[],POSITION_GAN:[],POSITION_ZHI:[],JIE_QI:[],JIE_QI_IN_USE:[],TIAN_SHEN:[],SHEN_SHA:[],PENGZU_GAN:[],PENGZU_ZHI:[],MONTH_ZHI:[],CHANG_SHENG:[],HOU:[],WU_HOU:[],POSITION_TAI_DAY:[],POSITION_TAI_MONTH:[],YI_JI:[],LIU_YAO:[],MONTH:[],SEASON:[],DAY:[],YUE_XIANG:[]},SolarUtil:{WEEK:[],XINGZUO:[]},TaoUtil:{AN_WU:[]},FotoUtil:{XIU_27:[]},NineStarUtil:{NUMBER:[],WU_XING:[],POSITION:[],LUCK_XUAN_KONG:[],YIN_YANG_QI_MEN:[],COLOR:[]}},tn=function(n){var i=nn[n],t=R[n];for(var e in i)for(var a=i[e],g=0,r=a.length;g<r;g++)t[e][g]=a[g].replace(/{(.[^}]*)}/g,(function(n,i){return hn(i)}))},en=function(n){var i=K[n],t=R[n];for(var e in i){var a=i[e];for(var g in a){var r=g.replace(/{(.[^}]*)}/g,(function(n,i){return hn(i)}));t[e][r]=a[g].replace(/{(.[^}]*)}/g,(function(n,i){return hn(i)}))}}},an=function(n){var i=V[n],t=R[n];for(var e in i){var a=i[e];for(var g in a){var r=g.replace(/{(.[^}]*)}/g,(function(n,i){return hn(i)}));t[e][r]=a[g]}}},gn=function(n){var i=$[n],t=R[n];for(var e in i){var a=i[e];for(var g in a){for(var r=g.replace(/{(.[^}]*)}/g,(function(n,i){return hn(i)})),u=a[g],h=0,s=u.length;h<s;h++)u[h]=u[h].replace(/{(.[^}]*)}/g,(function(n,i){return hn(i)}));t[e][r]=u}}},rn=function(){var n;for(n in nn)tn(n);for(n in K)en(n);for(n in V)an(n);for(n in $)gn(n)},un=function(n){Q[n]&&(U=n,rn())},hn=function(n){var i=Q[U][n];return void 0===i&&(i=Q[P][n]),void 0===i&&(i=n),i},sn=function(n){var i=nn[n],t=R[n];for(var e in i){i[e].length=0;for(var a=t[e],g=0,r=a.length;g<r;g++)i[e].push(a[g])}},on=function(n,i){var t;switch(i){case"string":t=K[n];break;case"number":t=V[n];break;case"array":t=$[n]}var e=R[n];for(var a in t){var g=e[a];for(var r in g)t[a][r]=g[r]}},function(){if(!W){var n;for(n in W=!0,nn)sn(n);for(n in K)on(n,"string");for(n in V)on(n,"number");for(n in $)on(n,"array");un(P)}}(),{getLanguage:function(){return U},setLanguage:function(n){un(n)},getMessage:function(n){return hn(n)},setMessages:function(n,i){!function(n,i){if(i){for(var t in Q[n]||(Q[n]={}),i)Q[n][t]=i[t];rn()}}(n,i)}});return{ShouXingUtil:Bn,SolarUtil:fn,LunarUtil:jn,FotoUtil:Sn,TaoUtil:Nn,NineStarUtil:Yn,Solar:Fn,Lunar:Cn,Foto:zn,Tao:wn,NineStar:In,EightChar:pn,SolarWeek:An,SolarMonth:En,SolarSeason:Dn,SolarHalfYear:xn,SolarYear:cn,LunarMonth:yn,LunarYear:dn,LunarTime:ln,HolidayUtil:_n,I18n:Mn}}));const{Solar:e,Lunar:a,Foto:g,Tao:r,NineStar:u,EightChar:h,SolarWeek:s,SolarMonth:o,SolarSeason:F,SolarHalfYear:C,SolarYear:A,LunarMonth:E,LunarYear:D,LunarTime:x,ShouXingUtil:c,SolarUtil:d,LunarUtil:y,FotoUtil:B,TaoUtil:f,HolidayUtil:j,NineStarUtil:_,I18n:I}=t.exports;var p={Solar:e,Lunar:a,Foto:g,Tao:r,NineStar:u,EightChar:h,SolarWeek:s,SolarMonth:o,SolarSeason:F,SolarHalfYear:C,SolarYear:A,LunarMonth:E,LunarYear:D,LunarTime:x,ShouXingUtil:c,SolarUtil:d,LunarUtil:y,FotoUtil:B,TaoUtil:f,HolidayUtil:j,NineStarUtil:_,I18n:I},l=p.EightChar,S=p.Foto,z=p.FotoUtil,m=p.HolidayUtil,N=p.I18n,Y=p.Lunar,w=p.LunarMonth,M=p.LunarTime,Z=p.LunarUtil,G=p.LunarYear,k=p.NineStar,T=p.NineStarUtil,b=p.ShouXingUtil,v=p.Solar,H=p.SolarHalfYear,O=p.SolarMonth,X=p.SolarSeason,L=p.SolarUtil,q=p.SolarWeek,J=p.SolarYear,P=p.Tao,U=p.TaoUtil;export{l as EightChar,S as Foto,z as FotoUtil,m as HolidayUtil,N as I18n,Y as Lunar,w as LunarMonth,M as LunarTime,Z as LunarUtil,G as LunarYear,k as NineStar,T as NineStarUtil,b as ShouXingUtil,v as Solar,H as SolarHalfYear,O as SolarMonth,X as SolarSeason,L as SolarUtil,q as SolarWeek,J as SolarYear,P as Tao,U as TaoUtil,p as default};
-//# sourceMappingURL=/sm/047da80979133bac0be72136597d7973da0919cf09e97bce29fd3e347378de08.map
\ No newline at end of file
diff --git a/packageA/pages/Intendedposition/Intendedposition.vue b/packageA/pages/Intendedposition/Intendedposition.vue
index d70d315..a1dedbb 100644
--- a/packageA/pages/Intendedposition/Intendedposition.vue
+++ b/packageA/pages/Intendedposition/Intendedposition.vue
@@ -41,8 +41,8 @@ onReachBottom(() => {
     getJobList();
 });
 
-function navToPost(jobId) {
-    navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(jobId)}`);
+function navToPost(job) {
+    navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(job.jobId)}&encryptJobId=${encodeURIComponent(job.encryptJobId)}`);
 }
 
 function getJobList(type = 'add') {
diff --git a/packageA/pages/UnitDetails/UnitDetails.vue b/packageA/pages/UnitDetails/UnitDetails.vue
index 13e4745..e4db336 100644
--- a/packageA/pages/UnitDetails/UnitDetails.vue
+++ b/packageA/pages/UnitDetails/UnitDetails.vue
@@ -1,16 +1,11 @@
 <template>
-	<AppLayout title="" :use-scroll-view="false">
+	<AppLayout title="单位详情" :use-scroll-view="false">
 		<template #headerleft>
 			<view class="btnback">
 				<image src="@/static/icon/back.png" @click="navBack"></image>
 			</view>
 		</template>
-		<template #headerright>
-			<view class="btn mar_ri10">
-				<image src="@/static/icon/collect3.png" v-if="!companyInfo?.isCollection"></image>
-				<image src="@/static/icon/collect2.png" v-else></image>
-			</view>
-		</template>
+		
 		<view class="content">
 			<view class="content-top">
 				<view class="companyinfo-left">
@@ -22,6 +17,10 @@
 								{{ getScaleLabel(companyInfo?.scale) }}
 							</view>
 				</view>
+				<view class="companyinfo-collect" @click="toggleCollection">
+					<image src="@/static/icon/collect3.png" v-if="!companyInfo?.isCollection"></image>
+					<image src="@/static/icon/collect2.png" v-else></image>
+				</view>
 			</view>
 			<view class="conetent-info" :class="{ expanded: isExpanded }">
 				<view class="info-title">公司介绍</view>
@@ -372,6 +371,37 @@
 			navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(jobId)}`);
 		}
 	}
+
+	// 收藏和取消收藏企业
+	function toggleCollection() {
+		const companyId = companyInfo.value.id || companyInfo.value.companyId;
+		if (!companyId) {
+			$api.msg('获取公司信息失败，无法操作');
+			return;
+		}
+
+		const isCollection = companyInfo.value.isCollection;
+		const method = isCollection ? 'DELETE' : 'POST';
+		const apiUrl = `/app/company/collection/${companyId}`;
+
+		uni.showLoading({
+			title: '操作中'
+		});
+
+		$api.createRequest(apiUrl, {}, method).then((resData) => {
+			uni.hideLoading();
+			if (resData && resData.code === 200) {
+				companyInfo.value.isCollection = !isCollection;
+				$api.msg(isCollection ? '取消收藏成功' : '收藏成功');
+			} else {
+				$api.msg((resData && resData.msg) || (isCollection ? '取消收藏失败' : '收藏失败'));
+			}
+		}).catch((error) => {
+			uni.hideLoading();
+			console.error('API error when toggling collection:', error);
+			$api.msg('网络请求失败，请检查网络连接');
+		});
+	}
 </script>
 
 <style lang="stylus" scoped>
@@ -399,33 +429,47 @@
 		flex-direction: column;
 
 		.content-top {
-			padding: 28rpx;
-			padding-top: 50rpx;
-			display: flex;
-			flex-direction: row;
-			flex-wrap: nowrap;
+				padding: 28rpx;
+				padding-top: 50rpx;
+				display: flex;
+				flex-direction: row;
+				flex-wrap: nowrap;
+				align-items: center;
 
-			.companyinfo-left {
-				width: 96rpx;
-				height: 96rpx;
-				margin-right: 24rpx;
-			}
-
-			.companyinfo-right {
-				.row1 {
-					font-weight: 500;
-					font-size: 32rpx;
-					color: #333333;
+				.companyinfo-left {
+					width: 96rpx;
+					height: 96rpx;
+					margin-right: 24rpx;
 				}
 
-				.row2 {
-					font-weight: 400;
-					font-size: 28rpx;
-					color: #6C7282;
-					line-height: 45rpx;
+				.companyinfo-right {
+					flex: 1;
+					
+					.row1 {
+						font-weight: 500;
+						font-size: 32rpx;
+						color: #333333;
+					}
+
+					.row2 {
+						font-weight: 400;
+						font-size: 28rpx;
+						color: #6C7282;
+						line-height: 45rpx;
+					}
+				}
+
+				.companyinfo-collect {
+					width: 52rpx;
+					height: 52rpx;
+					margin-left: 20rpx;
+					
+					image {
+						width: 100%;
+						height: 100%;
+					}
 				}
 			}
-		}
 
 		.conetent-info {
 			padding: 0 28rpx;
diff --git a/packageA/pages/agreement/privacy.vue b/packageA/pages/agreement/privacy.vue
new file mode 100644
index 0000000..fcf744f
--- /dev/null
+++ b/packageA/pages/agreement/privacy.vue
@@ -0,0 +1,248 @@
+<template>
+    <view class="agreement-page">
+        <!-- 顶部导航栏 -->
+        <view class="nav-bar">
+            <view class="nav-left" @click="goBack">
+                <uni-icons type="back" size="28" color="#333"></uni-icons>
+            </view>
+            <view class="nav-title">隐私政策</view>
+            <view class="nav-right"></view>
+        </view>
+        
+        <!-- 内容区域 -->
+        <scroll-view class="content" scroll-y>
+            <view class="agreement-content">
+                <!-- 协议标题 -->
+                <view class="agreement-title">隐私政策</view>
+                
+                <!-- 重要提示 -->
+                <view class="important-tip">
+                    在您注册、登录、使用本小程序服务之前，请您务必审慎阅读、充分理解本协议各条款内容，特别是以加粗形式提示您注意的、关于免除或限制责任、争议解决及法律适用的条款。一旦您以任何方式访问、使用本小程序，即表示您已同意接受本协议及我们另行发布的《隐私政策》的全部内容约束。如您不同意本协议的任何内容，请立即停止使用本小程序。
+                </view>
+                
+                <view class="important-tip">
+                    如果您未满18周岁，请在法定监护人的陪同下阅读和判断是否同意本协议，并特别注意未成年人使用条款。
+                </view>
+                
+                <!-- 第二部分：隐私政策 -->
+                <view class="section">
+                    <view class="section-title">第二部分：隐私政策</view>
+                    
+                    <view class="section-content">
+                        <view class="paragraph-text">
+                            我们深知个人信息对您的重要性，并致力于保护您的隐私安全。本政策将说明我们如何收集、使用、存储和共享您的个人信息。
+                        </view>
+                    </view>
+                    
+                    <!-- 一、我们如何收集和使用您的信息 -->
+                    <view class="section-subtitle">一、 我们如何收集和使用您的信息</view>
+                    <view class="section-content">
+                        <view class="paragraph">
+                            <view class="paragraph-title">1.1 微信授权信息：</view>
+                            <view class="paragraph-text">当您使用微信登录时，我们会收集您的微信头像、昵称、地区及OpenID，用于为您创建账号、识别用户身份并提供核心服务。拒绝提供该信息将使您无法使用本小程序的核心功能。</view>
+                        </view>
+                        
+                        <view class="paragraph">
+                            <view class="paragraph-title">1.2 您主动提供的信息：</view>
+                            <view class="paragraph-text">根据您使用的服务类型，您可能会主动向我们提供 【例如：手机号码、收货地址、实名认证信息、发布的内容、上传的图片等】 ，我们将严格按本政策约定使用这些信息。</view>
+                        </view>
+                        
+                        <view class="paragraph">
+                            <view class="paragraph-title">1.3 设备与日志信息：</view>
+                            <view class="paragraph-text">为保障运营安全与质量，我们会自动收集您的设备型号、操作系统版本、唯一设备标识符、IP地址、访问时间、在小程序内的操作行为等日志信息。</view>
+                        </view>
+                        
+                        <view class="paragraph">
+                            <view class="paragraph-title">1.4 位置信息（如需）：</view>
+                            <view class="paragraph-text">对于 【例如：本地服务、地图导航】 类小程序，在获得您的授权后，我们可能会收集您的精确或粗略位置信息，以提供相关服务。</view>
+                        </view>
+                    </view>
+                    
+                    <!-- 二、我们如何使用Cookie和同类技术 -->
+                    <view class="section-subtitle">二、 我们如何使用Cookie和同类技术</view>
+                    <view class="section-content">
+                        <view class="paragraph-text">
+                            我们可能使用Cookie和本地存储来记录您的偏好、登录状态，以优化您的使用体验。您可以在微信或设备设置中清除这些数据，但这可能会导致部分服务功能无法正常使用。
+                        </view>
+                    </view>
+                    
+                    <!-- 三、我们如何共享、转让、公开披露您的信息 -->
+                    <view class="section-subtitle">三、 我们如何共享、转让、公开披露您的信息</view>
+                    <view class="section-content">
+                        <view class="paragraph">
+                            <view class="paragraph-title">3.1 共享：</view>
+                            <view class="paragraph-text">我们不会与任何公司、组织和个人共享您的个人信息，但以下情况除外：</view>
+                        </view>
+                        
+                        <view class="paragraph-text">
+                            * 事先获得您的明确授权；<br>
+                            * 根据法律法规、司法程序或政府机关的要求；<br>
+                            * 为保护我们、我们的关联方或公众的财产和安全免遭损害而有必要提供。
+                        </view>
+                        
+                        <view class="paragraph">
+                            <view class="paragraph-title">3.2 转让与公开披露：</view>
+                            <view class="paragraph-text">我们不会将您的个人信息转让给任何公司、组织和个人，也不会公开披露您的个人信息，除非获得您的单独同意或法律法规的强制性要求。</view>
+                        </view>
+                    </view>
+                    
+                    <!-- 四、我们如何存储和保护您的信息 -->
+                    <view class="section-subtitle">四、 我们如何存储和保护您的信息</view>
+                    <view class="section-content">
+                        <view class="paragraph">
+                            <view class="paragraph-title">4.1 </view>
+                            <view class="paragraph-text">我们在中华人民共和国境内运营，您的个人信息将存储于中国境内。我们会采取符合行业标准的安全技术和管理措施（如数据加密、访问控制）来保护您的信息，防止其被未经授权的访问、使用或泄露。</view>
+                        </view>
+                        
+                        <view class="paragraph">
+                            <view class="paragraph-title">4.2 </view>
+                            <view class="paragraph-text">我们仅会在达成本政策所述目的所需的期限内保留您的个人信息，除非法律有强制的留存要求。</view>
+                        </view>
+                    </view>
+                    
+                    <!-- 五、您的权利 -->
+                    <view class="section-subtitle">五、 您的权利</view>
+                    <view class="section-content">
+                        <view class="paragraph-text">
+                            您有权：
+                        </view>
+                        
+                        <view class="paragraph-text">
+                            访问、更正、删除您的个人信息；<br>
+                            改变您授权同意的范围；<br>
+                            注销您的账号。
+                        </view>
+                        
+                        <view class="paragraph-text">
+                            您可以通过小程序内的"联系客服"或发送邮件至 【您的客服邮箱】 来行使上述权利。我们将在15个工作日内响应您的请求。
+                        </view>
+                    </view>
+                    
+                    <!-- 六、未成年人保护 -->
+                    <view class="section-subtitle">六、 未成年人保护</view>
+                    <view class="section-content">
+                        <view class="paragraph-text">
+                            我们非常重视对未成年人个人信息的保护。若您是18周岁以下的未成年人，请在您的监护人指导下使用我们的服务。如果我们发现在未获得监护人同意的情况下收集了未成年人的个人信息，我们会设法尽快删除相关数据。
+                        </view>
+                    </view>
+                    
+                    <!-- 七、政策更新 -->
+                    <view class="section-subtitle">七、 政策更新</view>
+                    <view class="section-content">
+                        <view class="paragraph-text">
+                            我们可能会适时更新本政策。更新后，我们会在本小程序发布最新版本，并通过显著方式提醒您。请您定期查阅。
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </scroll-view>
+    </view>
+</template>
+
+<script setup>
+import { ref } from 'vue';
+
+const goBack = () => {
+    uni.navigateBack();
+};
+</script>
+
+<style lang="stylus" scoped>
+.agreement-page
+    min-height: 100vh
+    background: #f5f5f5
+    
+    .nav-bar
+        height: 88rpx
+        background: #fff
+        display: flex
+        align-items: center
+        justify-content: space-between
+        padding: 0 32rpx
+        box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.05)
+        position: sticky
+        top: 0
+        z-index: 10
+        
+        .nav-left
+        .nav-right
+            width: 80rpx
+            height: 88rpx
+            display: flex
+            align-items: center
+            
+        .nav-left
+            justify-content: flex-start
+            
+        .nav-right
+            justify-content: flex-end
+            
+        .nav-title
+            font-size: 32rpx
+            font-weight: 600
+            color: #333
+    
+    .content
+        flex: 1
+        
+    .agreement-content
+        padding: 32rpx
+        background: #fff
+        margin: 20rpx
+        border-radius: 16rpx
+        
+    .agreement-title
+        font-size: 36rpx
+        font-weight: 700
+        color: #333
+        text-align: center
+        margin-bottom: 40rpx
+        
+    .important-tip
+        background: #f0f5ff
+        border-left: 8rpx solid #256bfa
+        padding: 24rpx
+        margin-bottom: 40rpx
+        font-size: 28rpx
+        line-height: 1.6
+        color: #333
+        
+    .section
+        margin-bottom: 48rpx
+        
+    .section-title
+        font-size: 32rpx
+        font-weight: 600
+        color: #333
+        margin-bottom: 32rpx
+        padding-bottom: 16rpx
+        border-bottom: 2rpx solid #f0f0f0
+        
+    .section-subtitle
+        font-size: 28rpx
+        font-weight: 600
+        color: #333
+        margin-bottom: 24rpx
+        
+    .section-content
+        margin-bottom: 32rpx
+        
+    .paragraph
+        display: flex
+        margin-bottom: 24rpx
+        
+    .paragraph-title
+        font-weight: 500
+        color: #333
+        min-width: 120rpx
+        flex-shrink: 0
+        
+    .paragraph-text
+        font-size: 26rpx
+        line-height: 1.6
+        color: #666
+        flex: 1
+        
+    .paragraph:last-child
+        margin-bottom: 0
+</style>
\ No newline at end of file
diff --git a/packageA/pages/agreement/user.vue b/packageA/pages/agreement/user.vue
new file mode 100644
index 0000000..7f5e211
--- /dev/null
+++ b/packageA/pages/agreement/user.vue
@@ -0,0 +1,322 @@
+<template>
+    <view class="agreement-page">
+        <!-- 顶部导航栏 -->
+        <!-- <view class="nav-bar">
+            <view class="nav-left" @click="goBack">
+                <uni-icons type="back" size="28" color="#333"></uni-icons>
+            </view>
+            <view class="nav-title">用户协议</view>
+            <view class="nav-right"></view>
+        </view> -->
+        
+        <!-- 内容区域 -->
+        <scroll-view class="content" scroll-y>
+            <view class="agreement-content">
+                <!-- 协议标题 -->
+                <!-- <view class="agreement-title">用户协议与隐私政策</view> -->
+            
+            <!-- 重要提示 -->
+            <view class="important-tip">
+                在您注册、登录、使用本小程序服务之前，请您务必审慎阅读、充分理解本协议各条款内容，特别是以加粗形式提示您注意的、关于免除或限制责任、争议解决及法律适用的条款。一旦您以任何方式访问、使用本小程序，即表示您已同意接受本协议及我们另行发布的《隐私政策》的全部内容约束。如您不同意本协议的任何内容，请立即停止使用本小程序。
+            </view>
+            
+            <view class="important-tip">
+                如果您未满18周岁，请在法定监护人的陪同下阅读和判断是否同意本协议，并特别注意未成年人使用条款。
+            </view>
+            
+            <!-- 第一部分：用户服务协议 -->
+            <view class="section">
+                <view class="section-title">第一部分：用户服务协议</view>
+                
+                <!-- 一、服务定义与变更 -->
+                <view class="section-subtitle">一、 服务定义与变更</view>
+                <view class="section-content">
+                    <view class="paragraph">
+                        <view class="paragraph-title">1.1 服务内容：</view>
+                        <view class="paragraph-text">本小程序是喀什地区人社局为您提供的的平台服务。具体服务内容可能因版本更新而调整。</view>
+                    </view>
+                    
+                    <view class="paragraph">
+                        <view class="paragraph-title">1.2 服务变更与中断：</view>
+                        <view class="paragraph-text">为保障服务质量，我们有权随时对服务内容、功能、操作界面等进行调整、变更或中断，恕不另行单独通知。对于因服务调整、中断或终止对用户或任何第三方造成的损失，除法律明确规定外，不承担任何责任。</view>
+                    </view>
+                </view>
+                
+                <!-- 二、账号管理与安全 -->
+                <view class="section-subtitle">二、 账号管理与安全</view>
+                <view class="section-content">
+                    <view class="paragraph">
+                        <view class="paragraph-title">2.1 账号注册：</view>
+                        <view class="paragraph-text">您需要通过微信授权登录来使用本小程序的核心功能。该授权将帮助我们获取您的微信头像、昵称、地区等基本信息。您知悉并同意，该授权行为即视为您已完成账号注册。</view>
+                    </view>
+                    
+                    <view class="paragraph">
+                        <view class="paragraph-title">2.2 账号安全：</view>
+                        <view class="paragraph-text">您的微信账号由您自行保管并承担安全责任。您应妥善保管与微信账号相关的一切信息，并对您账号下发生的一切活动（包括但不限于言论发表、信息发布、服务购买等）承担全部法律责任。如发现任何未经授权的账号使用行为，应立即通知我们。我们将对前述情况采取合理的行动，但除因我们的过错外，我们不承担由此导致的任何损失。</view>
+                    </view>
+                </view>
+                
+                <!-- 三、用户行为规范 -->
+                <view class="section-subtitle">三、 用户行为规范</view>
+                <view class="section-content">
+                    <view class="paragraph-text">您承诺并保证在使用本小程序服务时遵守中华人民共和国法律法规、社会公德，并不得从事以下行为：</view>
+                    
+                    <view class="paragraph">
+                        <view class="paragraph-title">3.1 </view>
+                        <view class="paragraph-text">上传、发布、传播或分享任何反对宪法所确定的基本原则、危害国家安全、泄露国家秘密、颠覆国家政权、破坏国家统一、损害国家荣誉和利益、煽动民族仇恨、民族歧视、破坏民族团结、破坏国家宗教政策、宣扬邪教和封建迷信、淫秽、色情、赌博、暴力、凶杀、恐怖或者教唆犯罪等法律、行政法规禁止的内容；</view>
+                    </view>
+                    
+                    <view class="paragraph">
+                        <view class="paragraph-title">3.2 </view>
+                        <view class="paragraph-text">侵犯他人知识产权、商业秘密、肖像权、隐私权等合法权益；</view>
+                    </view>
+                    
+                    <view class="paragraph">
+                        <view class="paragraph-title">3.3 </view>
+                        <view class="paragraph-text">发布任何虚假、骚扰性、侮辱性、诽谤性、恐吓性、庸俗淫秽或任何其他非法信息；</view>
+                    </view>
+                    
+                    <view class="paragraph">
+                        <view class="paragraph-title">3.4 </view>
+                        <view class="paragraph-text">利用技术手段恶意爬取、干扰、破坏本小程序的正常运营，或增加服务器负载；</view>
+                    </view>
+                    
+                    <view class="paragraph">
+                        <view class="paragraph-title">3.5 </view>
+                        <view class="paragraph-text">未经许可，从事任何形式的商业广告行为，或利用本小程序进行传销、金字塔骗局等非法营销活动；</view>
+                    </view>
+                    
+                    <view class="paragraph">
+                        <view class="paragraph-title">3.6 </view>
+                        <view class="paragraph-text">其他任何违反法律规定或干扰本小程序正常运营的行为。</view>
+                    </view>
+                    
+                    <view class="paragraph-text">若用户违反上述规定，我们有权单方面判断采取中断服务、限制功能、封禁账号等措施，并保留追究法律责任的权利。</view>
+                </view>
+                
+                <!-- 四、知识产权声明 -->
+                <view class="section-subtitle">四、 知识产权声明</view>
+                <view class="section-content">
+                    <view class="paragraph">
+                        <view class="paragraph-title">4.1 </view>
+                        <view class="paragraph-text">本公司独立拥有或与相关内容提供者共同拥有本小程序及相关软件、技术、代码、文档、页面设计、Logo、商标、信息内容等的知识产权。</view>
+                    </view>
+                    
+                    <view class="paragraph">
+                        <view class="paragraph-title">4.2 </view>
+                        <view class="paragraph-text">未经本公司或相关权利人书面许可，任何单位和个人不得以任何方式（包括但不限于非法复制、传播、展示、修改、创建衍生作品等）使用上述知识产权，否则我们将依法追究其法律责任。</view>
+                    </view>
+                </view>
+                
+                <!-- 五、免责与责任限制 -->
+                <view class="section-subtitle">五、 免责与责任限制</view>
+                <view class="section-content">
+                    <view class="paragraph">
+                        <view class="paragraph-title">5.1 "现状"提供：</view>
+                        <view class="paragraph-text">本小程序的服务按"现状"和"可得到"的状态提供。在法律允许的最大范围内，我们明确表示不提供任何明示或默示的担保，包括但不限于对服务的适用性、没有错误或疏漏、持续性、准确性、可靠性、适用于某一特定用途。</view>
+                    </view>
+                    
+                    <view class="paragraph">
+                        <view class="paragraph-title">5.2 不可抗力：</view>
+                        <view class="paragraph-text">对于因战争、动乱、自然灾害、政府行为、电信线路中断、黑客攻击、计算机病毒侵入或发作、第三方服务瑕疵等不可抗力因素导致的任何服务中断、数据丢失或信息泄露等问题，我们不承担责任。</view>
+                    </view>
+                    
+                    <view class="paragraph">
+                        <view class="paragraph-title">5.3 第三方链接与内容：</view>
+                        <view class="paragraph-text">本小程序内可能包含由第三方提供的服务或链接。该等第三方服务或链接由第三方独立运营和控制，我们不对其内容、隐私政策或行为承担任何责任。您使用任何第三方服务时，需受其自身的条款和政策的约束。</view>
+                    </view>
+                </view>
+                
+                <!-- 六、协议修改与终止 -->
+                <view class="section-subtitle">六、 协议修改与终止</view>
+                <view class="section-content">
+                    <view class="paragraph">
+                        <view class="paragraph-title">6.1 </view>
+                        <view class="paragraph-text">我们有权根据国家法律法规变化及运营需要，随时修改本协议的任何条款。更新后的协议将在本小程序上公布，并取代旧版本。如您继续使用服务，即视为接受更新后的协议。</view>
+                    </view>
+                    
+                    <view class="paragraph">
+                        <view class="paragraph-title">6.2 </view>
+                        <view class="paragraph-text">您有权随时停止使用本小程序服务。若我们判断您严重违反本协议，我们有权单方面终止向您提供服务，并保留追偿损失的权利。</view>
+                    </view>
+                </view>
+                
+                <!-- 七、法律适用与争议解决 -->
+                <view class="section-subtitle">七、 法律适用与争议解决</view>
+                <view class="section-content">
+                    <view class="paragraph">
+                        <view class="paragraph-title">7.1 </view>
+                        <view class="paragraph-text">本协议的订立、效力、解释、履行及争议的解决，均适用中华人民共和国大陆地区法律。</view>
+                    </view>
+                    
+                    <view class="paragraph">
+                        <view class="paragraph-title">7.2 </view>
+                        <view class="paragraph-text">因本协议引起的或与本协议有关的任何争议，双方应首先友好协商解决；协商不成的，您同意将争议提交至 【填写您公司所在地】 有管辖权的人民法院通过诉讼解决。</view>
+                    </view>
+                </view>
+            </view>
+            
+            <!-- 同意按钮 -->
+            <!-- <view class="agreement-actions">
+                <button class="agree-btn primary" @click="agreeAgreement">同意并继续</button>
+                <button class="agree-btn secondary" @click="disagreeAgreement">不同意</button>
+            </view> -->
+        </view>
+    </scroll-view>
+</view>
+</template>
+
+<script setup>
+import { ref } from 'vue';
+
+const goBack = () => {
+    uni.navigateBack();
+};
+
+// 同意协议
+const agreeAgreement = () => {
+    // 存储用户同意状态
+    uni.setStorageSync('agreedToUserAgreement', true);
+    // 返回上一页
+    uni.navigateBack();
+};
+
+// 不同意协议
+const disagreeAgreement = () => {
+    uni.showModal({
+        title: '提示',
+        content: '您需要同意用户协议才能使用本服务',
+        showCancel: false,
+        confirmText: '我知道了'
+    });
+};
+</script>
+
+<style lang="stylus" scoped>
+.agreement-page
+    height: 100vh
+    background: #f5f5f5
+    display: flex
+    flex-direction: column
+    .nav-bar
+        height: 88rpx
+        background: #fff
+        display: flex
+        align-items: center
+        justify-content: space-between
+        padding: 0 32rpx
+        box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.05)
+        position: sticky
+        top: 0
+        z-index: 10
+        
+        .nav-left
+        .nav-right
+            width: 80rpx
+            height: 88rpx
+            display: flex
+            align-items: center
+            
+        .nav-left
+            justify-content: flex-start
+            
+        .nav-right
+            justify-content: flex-end
+            
+        .nav-title
+            font-size: 32rpx
+            font-weight: 600
+            color: #333
+    
+    .content
+        flex: 1
+        height: 0 /* 让flex:1生效 */
+        
+    .agreement-content
+        padding: 32rpx
+        background: #fff
+        margin: 20rpx
+        border-radius: 16rpx
+        
+    .agreement-title
+        font-size: 36rpx
+        font-weight: 700
+        color: #333
+        text-align: center
+        margin-bottom: 40rpx
+        
+    .important-tip
+        background: #f0f5ff
+        border-left: 8rpx solid #256bfa
+        padding: 24rpx
+        margin-bottom: 40rpx
+        font-size: 28rpx
+        line-height: 1.6
+        color: #333
+        
+    .section
+        margin-bottom: 48rpx
+        
+    .section-title
+        font-size: 32rpx
+        font-weight: 600
+        color: #333
+        margin-bottom: 32rpx
+        padding-bottom: 16rpx
+        border-bottom: 2rpx solid #f0f0f0
+        
+    .section-subtitle
+        font-size: 28rpx
+        font-weight: 600
+        color: #333
+        margin-bottom: 24rpx
+        
+    .section-content
+        margin-bottom: 32rpx
+        
+    .paragraph
+        display: flex
+        margin-bottom: 24rpx
+        
+    .paragraph-title
+        font-weight: 500
+        color: #333
+        min-width: 120rpx
+        flex-shrink: 0
+        
+    .paragraph-text
+        font-size: 26rpx
+        line-height: 1.6
+        color: #666
+        flex: 1
+        
+    .paragraph:last-child
+        margin-bottom: 0
+    
+    .agreement-actions
+        margin-top: 60rpx
+        padding: 0 32rpx
+        display: flex
+        flex-direction: column
+        gap: 24rpx
+        
+        .agree-btn
+            width: 100%
+            height: 88rpx
+            border-radius: 44rpx
+            display: flex
+            align-items: center
+            justify-content: center
+            font-size: 32rpx
+            font-weight: 500
+            border: none
+            
+            &.primary
+                background: linear-gradient(135deg, #256BFA 0%, #1E5BFF 100%)
+                color: #FFFFFF
+                box-shadow: 0 8rpx 20rpx rgba(37, 107, 250, 0.3)
+            
+            &.secondary
+                background: #F7F8FA
+                color: #666666
+</style>
diff --git a/packageA/pages/browseJob/browseJob.vue b/packageA/pages/browseJob/browseJob.vue
index a130eb8..744f31d 100644
--- a/packageA/pages/browseJob/browseJob.vue
+++ b/packageA/pages/browseJob/browseJob.vue
@@ -83,8 +83,8 @@ function toSelectDate() {
     });
 }
 
-function navToPost(jobId) {
-    navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(jobId)}`);
+function navToPost(job) {
+    navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(job.jobId)}&encryptJobId=${encodeURIComponent(job.encryptJobId)}`);
 }
 
 function searchCollection(e) {
diff --git a/packageA/pages/cancelApplication/cancelApplication.vue b/packageA/pages/cancelApplication/cancelApplication.vue
new file mode 100644
index 0000000..b590770
--- /dev/null
+++ b/packageA/pages/cancelApplication/cancelApplication.vue
@@ -0,0 +1,99 @@
+<template>
+    <AppLayout :show-bg-image="false" :use-scroll-view="false">
+        <view class="collection-content">
+            <scroll-view scroll-y class="main-scroll" @scrolltolower="getJobList('add')">
+                <view class="one-cards">
+                    <view class="mian">
+                        <renderJobs
+                            seeDate="shareTime"
+                            v-if="pageState.list.length"
+                            :list="pageState.list"
+                            :longitude="longitudeVal"
+                            :latitude="latitudeVal"
+                        ></renderJobs>
+                        <empty v-else pdTop="200"></empty>
+                    </view>
+                </view>
+            </scroll-view>
+        </view>
+    </AppLayout>
+</template>
+
+<script setup>
+import dictLabel from '@/components/dict-Label/dict-Label.vue';
+import AppLayout from '@/components/AppLayout/AppLayout.vue';
+import { reactive, inject, watch, ref, onMounted } from 'vue';
+import { onLoad, onShow, onReachBottom } from '@dcloudio/uni-app';
+import useUserStore from '@/stores/useUserStore';
+const { $api, navTo, vacanciesTo } = inject('globalFunction');
+import { storeToRefs } from 'pinia';
+import useLocationStore from '@/stores/useLocationStore';
+const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
+const userStore = useUserStore();
+const state = reactive({});
+const pageState = reactive({
+    page: 0,
+    list: [],
+    total: 0,
+    maxPage: 1,
+    pageSize: 10,
+});
+onLoad(() => {
+    console.log('onLoad');
+    getJobList('refresh');
+});
+
+onReachBottom(() => {
+    getJobList();
+});
+
+function navToPost(job) {
+    navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(job.jobId)}&encryptJobId=${encodeURIComponent(job.encryptJobId)}`);
+}
+
+function getJobList(type = 'add') {
+    if (type === 'refresh') {
+        pageState.page = 1;
+        pageState.maxPage = 1;
+    }
+    if (type === 'add' && pageState.page < pageState.maxPage) {
+        pageState.page += 1;
+    }
+    let params = {
+        current: pageState.page,
+        pageSize: pageState.pageSize,
+    };
+    $api.createRequest('/app/job/selectCencalList', params, 'GET').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);
+        console.log(pageState.list);
+    });
+}
+</script>
+
+<style lang="stylus" scoped>
+.collection-content
+    height: 100%
+    display: flex
+    flex-direction: column
+
+.main-scroll{
+    flex: 1
+    overflow: hidden
+}
+
+.one-cards{
+    padding: 0 28rpx 20rpx 28rpx;
+    background: #f4f4f4
+
+}
+</style>
\ No newline at end of file
diff --git a/pages/chat/chat.vue b/packageA/pages/chat/chat.vue
similarity index 74%
rename from pages/chat/chat.vue
rename to packageA/pages/chat/chat.vue
index e43c8fa..4cfffc6 100644
--- a/pages/chat/chat.vue
+++ b/packageA/pages/chat/chat.vue
@@ -3,8 +3,7 @@
         <!-- 自定义tabbar -->
         <CustomTabBar :currentPage="2" />
         
-        <!-- 微信授权登录弹窗 -->
-        <WxAuthLogin ref="wxAuthLoginRef" @success="handleLoginSuccess"></WxAuthLogin>
+
         <!-- 抽屉遮罩层 -->
         <view v-if="isDrawerOpen" class="overlay" @click="toggleDrawer"></view>
 
@@ -25,16 +24,20 @@
                 <scroll-view scroll-y :show-scrollbar="false" class="chat-scroll">
                     <view
                         class="drawer-rows"
-                        @click="changeDialogue(item)"
                         v-for="(item, index) in filteredList"
                         :key="item.id"
                     >
-                        <view
-                            v-if="!item.isTitle"
-                            class="drawer-row-list"
-                            :class="{ 'drawer-row-active': item.sessionId === chatSessionID }"
-                        >
-                            {{ item.title }}
+                        <view v-if="!item.isTitle" class="drawer-row-container">
+                            <view
+                                class="drawer-row-list"
+                                :class="{ 'drawer-row-active': item.sessionId === chatSessionID }"
+                                @click="changeDialogue(item)"
+                            >
+                                {{ item.title }}
+                            </view>
+                            <view class="drawer-row-delete" @click.stop="deleteDialogue(item)">
+                                <uni-icons type="trash" size="24" color="#FF4D4F"></uni-icons>
+                            </view>
                         </view>
                         <view class="drawer-row-title" v-else>
                             {{ item.title }}
@@ -60,7 +63,8 @@
             <header class="head">
                 <view class="main-header">
                     <image src="/static/icon/Hamburger-button.png" @click="toggleDrawer"></image>
-                    <view class="title">{{ config.appInfo.areaName }}岗位推荐</view>
+                    <!-- <view class="title">{{ config.appInfo.areaName }}岗位推荐</view> -->
+                    <!-- <view class="title">{{ config.appInfo.areaName }}岗位推荐</view> -->
                     <image src="/static/icon/Comment-one.png" @click="addNewDialogue"></image>
                 </view>
             </header>
@@ -84,7 +88,7 @@ import useUserStore from '@/stores/useUserStore';
 import { tabbarManager } from '@/utils/tabbarManager';
 import aiPaging from './components/ai-paging.vue';
 import { storeToRefs } from 'pinia';
-import WxAuthLogin from '@/components/WxAuthLogin/WxAuthLogin.vue';
+
 const { isTyping, tabeList, chatSessionID } = storeToRefs(useChatGroupDBStore());
 const { userInfo } = storeToRefs(useUserStore());
 const isDrawerOpen = ref(false);
@@ -92,7 +96,7 @@ const scrollIntoView = ref(false);
 
 const searchText = ref('');
 const paging = ref(null);
-const wxAuthLoginRef = ref(null);
+
 
 // 实时过滤
 const filteredList = computed(() => {
@@ -118,7 +122,7 @@ onShow(() => {
 onMounted(() => {
     // 监听退出登录事件，显示微信登录弹窗
     uni.$on('showLoginModal', () => {
-        wxAuthLoginRef.value?.open();
+        uni.navigateTo({ url: '/pages/login/wx-login' });
     });
 });
 
@@ -165,6 +169,21 @@ const changeDialogue = (item) => {
         });
     }
 };
+
+const deleteDialogue = (item) => {
+    if (item.sessionId) {
+        uni.showModal({
+            content: '确定删除该会话吗？',
+            success(res) {
+                if (res.confirm) {
+                    useChatGroupDBStore().deleteDialogue(item.sessionId);
+                    $api.msg('会话删除成功');
+                }
+            }
+        });
+    }
+};
+
 function updateSetting() {
     $api.msg('该功能正在开发中，敬请期待后续更新！');
 }
@@ -270,33 +289,56 @@ footer-height = 98rpx
         flex: 1
         overflow: hidden
     .drawer-rows
-        padding: 0 28rpx;
-        // border-bottom: 2rpx dashed #e8e8e8
-        overflow:hidden; //超出的文本隐藏
-        text-overflow:ellipsis; //溢出用省略号显示
-        white-space:nowrap; //溢出不换行
-        .drawer-row-title
-            color: #A6A6A6;
-            font-weight: 500;
-            font-weight: bold;
-            font-size: 28rpx
-            padding: 0 24rpx
-            margin-top: 50rpx
-            margin-bottom: 16rpx
-        .drawer-row-list
-            height: 66rpx;
-            line-height: 66rpx
-            font-size: 28rpx
-            overflow: hidden
-            text-overflow: ellipsis
-            font-weight: 500;
-            color: #595959;
-            padding: 0 24rpx
-        .drawer-row-active
-        .drawer-row-list:active
-            color: #333333;
-            background: #F6F6F6;
-            border-radius: 16rpx 16rpx 16rpx 16rpx;
+            padding: 0 28rpx;
+            // border-bottom: 2rpx dashed #e8e8e8
+            overflow:hidden; //超出的文本隐藏
+            text-overflow:ellipsis; //溢出用省略号显示
+            white-space:nowrap; //溢出不换行
+            .drawer-row-title
+                color: #A6A6A6;
+                font-weight: 500;
+                font-weight: bold;
+                font-size: 28rpx
+                padding: 0 24rpx
+                margin-top: 50rpx
+                margin-bottom: 16rpx
+            .drawer-row-container
+                display: flex
+                align-items: center
+                justify-content: space-between
+                padding: 0 24rpx
+                height: 66rpx
+            
+            .drawer-row-list
+                flex: 1
+                height: 66rpx
+                line-height: 66rpx
+                font-size: 28rpx
+                overflow: hidden
+                text-overflow: ellipsis
+                font-weight: 500;
+                color: #595959;
+            
+            .drawer-row-delete
+                margin-left: 20rpx
+                display: flex
+                align-items: center
+                justify-content: center
+                padding: 10rpx
+                opacity: 0.6
+                &:hover
+                &:active
+                    opacity: 1
+            
+            .drawer-row-active
+                color: #333333;
+                background: #F6F6F6;
+                border-radius: 16rpx 16rpx 16rpx 16rpx;
+            
+            .drawer-row-list:active
+                color: #333333;
+                background: #F6F6F6;
+                border-radius: 16rpx 16rpx 16rpx 16rpx;
 
 
 /* 主要内容区域 */
diff --git a/pages/chat/components/AudioWave.vue b/packageA/pages/chat/components/AudioWave.vue
similarity index 100%
rename from pages/chat/components/AudioWave.vue
rename to packageA/pages/chat/components/AudioWave.vue
diff --git a/pages/chat/components/WaveDisplay.vue b/packageA/pages/chat/components/WaveDisplay.vue
similarity index 89%
rename from pages/chat/components/WaveDisplay.vue
rename to packageA/pages/chat/components/WaveDisplay.vue
index b0d190c..30a1dd5 100644
--- a/pages/chat/components/WaveDisplay.vue
+++ b/packageA/pages/chat/components/WaveDisplay.vue
@@ -65,6 +65,26 @@ const centerIndex = ref(0);
 // 动画帧ID
 let animationId = null;
 
+// 为小程序环境提供requestAnimationFrame兼容
+const requestAnimationFramePolyfill = (callback) => {
+    // #ifdef MP-WEIXIN
+    return setTimeout(callback, 16); // 约60fps
+    // #endif
+    // #ifdef H5
+    return requestAnimationFrame(callback);
+    // #endif
+};
+
+// 为小程序环境提供cancelAnimationFrame兼容
+const cancelAnimationFramePolyfill = (id) => {
+    // #ifdef MP-WEIXIN
+    clearTimeout(id);
+    // #endif
+    // #ifdef H5
+    cancelAnimationFrame(id);
+    // #endif
+};
+
 // 格式化显示时间
 const formattedTime = computed(() => {
     const mins = Math.floor(props.recordingTime / 60)
@@ -125,7 +145,7 @@ const updateWaveform = () => {
         }
     }
 
-    animationId = requestAnimationFrame(updateWaveform);
+    animationId = requestAnimationFramePolyfill(updateWaveform);
 };
 
 // 更新单个波形条
@@ -157,14 +177,14 @@ const updateWaveBar = (index, value) => {
 // 开始动画
 const startAnimation = () => {
     if (!animationId) {
-        animationId = requestAnimationFrame(updateWaveform);
+        animationId = requestAnimationFramePolyfill(updateWaveform);
     }
 };
 
 // 停止动画
 const stopAnimation = () => {
     if (animationId) {
-        cancelAnimationFrame(animationId);
+        cancelAnimationFramePolyfill(animationId);
         animationId = null;
     }
 };
diff --git a/packageA/pages/chat/components/ai-paging.vue b/packageA/pages/chat/components/ai-paging.vue
new file mode 100644
index 0000000..37766db
--- /dev/null
+++ b/packageA/pages/chat/components/ai-paging.vue
@@ -0,0 +1,2314 @@
+<template>
+    <view class="chat-container">
+        <!-- 选择模式操作栏 -->
+        <view v-if="isSelectMode" class="select-mode-header">
+            <view class="select-header-left">
+                <view class="select-count">{{ selectedMessages.length }} 条已选择</view>
+                <view class="select-all" @click="selectAllMessages">全选</view>
+            </view>
+            <view class="select-header-right">
+                <view class="cancel-btn" @click="exitSelectMode">取消</view>
+                <view class="delete-btn" @click="deleteSelectedMessages" :disabled="selectedMessages.length === 0">删除</view>
+            </view>
+        </view>
+        <!-- Tab切换 -->
+        <view v-else class="tab-container">
+            <view 
+                class="tab-item" 
+                :class="{ active: activeTab === 'policy' }"
+                @click="switchTab('policy')"
+            >
+                政策查询
+            </view>
+            <view 
+                class="tab-item" 
+                :class="{ active: activeTab === 'job' }"
+                @click="switchTab('job')"
+            >
+                岗位推荐
+            </view>
+        </view>
+        
+        <!-- #ifdef MP-WEIXIN -->
+         <view class="chat-background" v-if="!messages.length">
+            <image class="backlogo" src="/static/icon/backAI.png"></image>
+            <view class="back-rowTitle">嗨！欢迎使用{{ config.appInfo.areaName }}AI智能求职</view>
+            <view class="back-rowText">
+                我可以根据您的简历和求职需求，帮你精准匹配{{ config.appInfo.areaName }}互联网招聘信息，对比招聘信息的优缺点，提供面试指导等，请把你的任务交给我吧~
+            </view>
+            <view class="back-rowh3">猜你所想</view>
+            <view
+                class="back-rowmsg button-click"
+                v-for="(item, index) in queries"
+                :key="index"
+                @click="sendMessageGuess(item)"
+            >
+                {{ item }}
+            </view>
+            <view class="chat-item self" v-if="isRecording">
+                <view class="message">{{ recognizedText }} {{ lastFinalText }}</view>
+            </view>
+        </view>
+        <!-- #endif -->
+        <!-- #ifndef MP-WEIXIN -->
+        <view class="chat-background" v-if="!messages.length">
+            <image class="backlogo" src="/static/icon/backAI.png"></image>
+            <view class="back-rowTitle">嗨！欢迎使用{{ config.appInfo.areaName }}AI智能求职</view>
+            <view class="back-rowText">
+                我可以根据您的简历和求职需求，帮你精准匹配{{ config.appInfo.areaName }}互联网招聘信息，对比招聘信息的优缺点，提供面试指导等，请把你的任务交给我吧~
+            </view>
+            <view class="back-rowh3">猜你所想</view>
+            <view
+                class="back-rowmsg button-click"
+                v-for="(item, index) in queries"
+                :key="index"
+                @click="sendMessageGuess(item)"
+            >
+                {{ item }}
+            </view>
+            <view class="chat-item self" v-if="isRecording">
+                <view class="message">{{ recognizedText }} {{ lastFinalText }}</view>
+            </view>
+        </view>
+        <!-- #endif -->
+        <scroll-view class="chat-list scrollView" :scroll-top="scrollTop" :scroll-y="true" scroll-with-animation>
+            <!-- #ifdef MP-WEIXIN -->
+            <view class="chat-list list-content">
+            <!-- #endif -->
+            <!-- #ifndef MP-WEIXIN -->
+            <view class="chat-list list-content" v-fade:600="messages.length >= 1">
+            <!-- #endif -->
+                <view
+                    v-for="(msg, index) in messages"
+                    v-show="shouldShowMessage(msg)"
+                    :key="index"
+                    :id="'msg-' + index"
+                    class="chat-item"
+                    :class="{ self: msg.self }"
+                    @longpress="handleLongPress(msg, index)"
+                    @click="isSelectMode ? toggleSelectMessage(index) : null"
+                >
+                    <!-- 选择框 -->
+                    <view v-if="isSelectMode" class="message-checkbox">
+                        <view class="checkbox" :class="{ checked: selectedMessages.includes(index) }">
+                            <uni-icons v-if="selectedMessages.includes(index)" type="success" size="24" color="#FFFFFF"></uni-icons>
+                        </view>
+                    </view>
+                    <view class="message" v-if="msg.self">
+                        <view class="msg-filecontent" v-if="msg.files.length">
+                            <view
+                                class="msg-files btn-light"
+                                v-for="(file, vInex) in msg.files"
+                                :key="vInex"
+                                @click="jumpUrl(file)"
+                                :class="{ 'msg-image-file': isImage(file.type, file.name) }"
+                            >
+                                <image 
+                                        v-if="isImage(file.type, file.name)" 
+                                        class="msg-image-thumbnail" 
+                                        :src="file.url" 
+                                        mode="aspectFill"
+                                    ></image>
+                                <image 
+                                    v-else 
+                                    class="msg-file-icon" 
+                                    src="/static/icon/Vector2.png"
+                                ></image>
+                                <text class="msg-file-text">{{ file.name || '附件' }}</text>
+                            </view>
+                        </view>
+                        {{ msg.displayText }}
+                    </view>
+                    <view class="message" :class="{ messageNull: !msg.displayText }" v-else>
+                        <!-- {{ msg.displayText }} -->
+                        <view class="message-markdown">
+                            <md-render
+                                :content="msg.displayText"
+                                :typing="isTyping && messages.length - 1 === index"
+                            ></md-render>
+                            <view class="message-controll" v-show="showControll(index) && !isSelectMode">
+                                <view class="controll-left">
+                                    <image
+                                        class="controll-icon btn-light"
+                                        src="/static/icon/copy.png"
+                                        @click="copyMarkdown(msg.displayText)"
+                                    ></image>
+                                    <image
+                                        class="controll-icon mar_le10 btn-light"
+                                        src="/static/icon/feedback.png"
+                                        v-if="!msg.userBadFeedback"
+                                        @click="userGoodFeedback(msg)"
+                                    ></image>
+                                    <image
+                                        v-if="isSpeaking && !isPaused && speechIndex === index"
+                                        class="controll-icon mar_le10 btn-light"
+                                        src="/static/icon/stop.png"
+                                        @click="stopMarkdown(msg.displayText, index)"
+                                    ></image>
+                                    <image
+                                        class="controll-icon mar_le10 btn-light"
+                                        src="/static/icon/broadcast.png"
+                                        @click="readMarkdown(msg.displayText, index)"
+                                        v-else
+                                    ></image>
+                                </view>
+                                <view class="controll-right">
+                                    <image
+                                        class="controll-icon mar_ri10 btn-light"
+                                        src="/static/icon/refresh.png"
+                                        @click="refreshMarkdown(index)"
+                                    ></image>
+                                </view>
+                            </view>
+                        </view>
+                        <!-- guess -->
+                        <view
+                            class="guess"
+                            v-if="showGuess && !msg.self && messages.length - 1 === index && msg.displayText && !isSelectMode"
+                        >
+                            <view class="gulist">
+                                <view
+                                    class="guess-list"
+                                    @click="sendMessageGuess(item)"
+                                    v-for="(item, index) in guessList"
+                                    :key="index"
+                                >
+                                    {{ item }}
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+                <view class="chat-item self" v-if="isRecording">
+                    <view class="message">{{ recognizedText }} {{ lastFinalText }}</view>
+                </view>
+                <!-- 语音正在识别提示 -->
+                <!-- <view>{{isRecognizing}}</view> -->
+                <view class="chat-item self" v-if="isRecognizing">
+                    <view class="message msg-loading">
+                        <view class="loading-content">
+                            <view class="ai-loading">
+                                <view></view>
+                                <view></view>
+                                <view></view>
+                            </view>
+                            <text class="loading-text">正在识别语音...</text>
+                        </view>
+                    </view>
+                </view>
+                <view v-if="isTyping" class="self">
+                    <view class="message msg-loading">
+                        <view class="loading-content">
+                            <view class="ai-loading">
+                                <view></view>
+                                <view></view>
+                                <view></view>
+                            </view>
+                            <text class="loading-text">AI正在思考中...</text>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </scroll-view>
+        <!-- 使用 v-show 保证不销毁事件 -->
+        <view class="vio_container" :class="status" v-show="status !== 'idle'">
+            <view class="record-tip">{{ statusText }}</view>
+            <WaveDisplay
+                :background="audiowaveStyle"
+                :isActive="isRecording"
+                :audioData="audioDataForDisplay"
+                :showInfo="isRecording"
+            />
+        </view>
+        <view class="input-area" v-show="status === 'idle'">
+            <view class="areatext">
+                <input
+                    v-model="textInput"
+                    placeholder-class="inputplaceholder"
+                    class="input"
+                    @confirm="sendMessage"
+                    :disabled="isTyping"
+                    :adjust-position="true"
+                    placeholder="请输入您想找的岗位信息或就政策信息【比如:设计师、10000-12000、广州】【比如:今年喀什地区高校毕业生有什么就业政策】"
+                    v-show="!isVoice"
+                />
+                <view
+                    class="input_vio"
+                    @touchstart.prevent="handleTouchStart"
+                    @touchmove="handleTouchMove"
+                    @touchend="handleTouchEnd"
+                    @touchcancel="handleTouchCancel"
+                    v-show="isVoice"
+                    type="default"
+                >
+                    按住说话
+                </view>
+                <!-- upload -->
+                <view class="btn-box" @click="changeShowFile">
+                    <image
+                        class="send-btn"
+                        :class="{ 'add-file-btn': showfile }"
+                        src="/static/icon/addGroup.png"
+                    ></image>
+                </view>
+                <!-- sendmessgae  Button-->
+                <view class="btn-box purple" v-if="textInput && !isTyping" @click="sendMessage">
+                    <image class="send-btn" src="/static/icon/send3.png"></image>
+                </view>
+                <view class="btn-box" v-else-if="!isTyping && !isVoice" @click="changeVoice">
+                    <image class="send-btn" src="/static/icon/send2x.png"></image>
+                </view>
+                <view class="btn-box" v-else-if="!isTyping" @click="changeVoice">
+                    <image class="send-btn" src="/static/icon/send4.png"></image>
+                </view>
+                <view class="btn-box purple" v-else>
+                    <view class="btn-box-round"></view>
+                </view>
+            </view>
+            <view class="ai-tips">本服务为AI生成内容，结果仅供参考</view>
+            <!-- 文件上传区域 - 使用绝对定位向上展开，避免被tabbar遮挡 -->
+            <view class="file-upload-popup" :class="{ show: showfile }">
+                <view class="area-tips">
+                    <uni-icons type="info-filled" color="#ADADAD" size="15"></uni-icons>
+                    上传后自动解析简历内容
+                </view>
+                <view class="area-file">
+                    <view class="file-card" @click="uploadCamera">
+                        <image class="card-img" src="/static/icon/file1.png"></image>
+                        <text>拍照上传</text>
+                    </view>
+                    <view class="file-card" @click="uploadCamera('album')">
+                        <image class="card-img" src="/static/icon/file2.png"></image>
+                        <text>相册上传</text>
+                    </view>
+                    <view class="file-card" @click="getUploadFile">
+                        <image class="card-img" src="/static/icon/file3.png"></image>
+                        <text>文件上传</text>
+                    </view>
+                </view>
+            </view>
+
+            <!-- filelist -->
+            <view class="area-uploadfiles" v-if="filesList.length">
+                <scroll-view class="uploadfiles-scroll" scroll-x="true">
+                    <view class="uploadfiles-list">
+                        <view
+                            class="file-uploadsend"
+                            :class="{ 'file-border': isImage(file.type, file.name) }"
+                            v-for="(file, index) in filesList"
+                            :key="index"
+                        >
+                            <view class="file-thumbnail" @click="jumpUrl(file)">
+                                <image
+                                    class="file-iconImg"
+                                    v-if="isImage(file.type, file.name) && !file.error"
+                                    :src="file.tempPath || file.url"
+                                    mode="aspectFill"
+                                    @load="onImageLoad(file)"
+                                    @error="onImageError(file)"
+                                ></image>
+                                <view class="file-doc" v-else-if="!isImage(file.type, file.name)">
+                                    <FileIcon class="doc-icon" :type="file.type"></FileIcon>
+                                </view>
+                                <view class="image-loading" v-if="isImage(file.type, file.name) && file.loading">
+                                    <uni-icons type="spinner-cycle" size="30" color="#999"></uni-icons>
+                                    <text class="loading-text">加载中...</text>
+                                </view>
+                                <view class="image-error" v-if="isImage(file.type, file.name) && file.error" @click="retryImageLoad(file)">
+                                    <uni-icons type="info" size="30" color="#ff4444"></uni-icons>
+                                    <text class="error-text">加载失败</text>
+                                    <text class="retry-text">点击重试</text>
+                                </view>
+                                <!-- 图片数量标签 -->
+                                <view class="image-count-badge" v-if="isImage(file.type, file.name) && filesList.filter(f => isImage(f.type, f.name)).length > 1">
+                                    {{ filesList.filter(f => isImage(f.type, f.name)).indexOf(file) + 1 }}/{{ filesList.filter(f => isImage(f.type, f.name)).length }}
+                                </view>
+                            </view>
+                            <view class="file-info">
+                                <view class="filename-text">{{ file.name }}</view>
+                                <view class="filerow" v-if="!isImage(file.type, file.name)">
+                                    <FileText :type="file.type"></FileText>
+                                    <view class="row-x"></view>
+                                    <view class="filename-size">{{ file.size }}</view>
+                                </view>
+                                <view class="filerow" v-else>
+                                    <text class="file-type-tag">图片</text>
+                                    <view class="row-x"></view>
+                                    <view class="filename-size">{{ file.size }}</view>
+                                </view>
+                            </view>
+                            <view class="file-del" catchtouchmove="true" @click="delfile(file)">
+                                <uni-icons type="closeempty" color="#FFFFFF" size="10"></uni-icons>
+                            </view>
+                        </view>
+                    </view>
+                </scroll-view>
+            </view>
+        </view>
+        <PopupFeeBack ref="feeback" @onSend="confirmFeeBack"></PopupFeeBack>
+        <MsgTips ref="feeBackTips" content="已收到反馈，感谢您的关注" title="反馈成功" :icon="successIcon"></MsgTips>
+    </view>
+</template>
+
+<script setup>
+import {
+    ref,
+    inject,
+    nextTick,
+    onMounted,
+    onUnmounted,
+    toRaw,
+    reactive,
+    computed,
+    watch,
+    getCurrentInstance,
+} from 'vue';
+import { storeToRefs } from 'pinia';
+// 移除重复导入，使用从globalFunction注入的config
+import useChatGroupDBStore from '@/stores/userChatGroupStore';
+import MdRender from '@/components/md-render/md-render.vue';
+import PopupFeeBack from './popupbadFeeback.vue';
+import AudioWave from './AudioWave.vue';
+import WaveDisplay from './WaveDisplay.vue';
+import FileIcon from './fileIcon.vue';
+import FileText from './fileText.vue';
+import { useAudioRecorder } from '@/hook/useRealtimeRecorder.js';
+import { useTTSPlayer } from '@/hook/useTTSPlayer.js';
+import successIcon from '@/static/icon/success.png';
+// 全局
+const { $api, navTo, throttle, config } = inject('globalFunction');
+const emit = defineEmits(['onConfirm']);
+const { messages, isTyping, textInput, chatSessionID } = storeToRefs(useChatGroupDBStore());
+// hook
+const {
+    isRecording,
+    startRecording,
+    stopRecording,
+    cancelRecording,
+    audioDataForDisplay,
+    volumeLevel,
+    recognizedText,
+    lastFinalText,
+    recordingDuration,
+    isRecognizing,
+    reset
+} = useAudioRecorder();
+
+// 监听语音识别结果变化，自动发送消息
+watch(
+    () => recognizedText.value,
+    (newVal) => {
+        if (newVal && newVal.trim()) {
+            console.log('监听到语音识别结果变化，自动发送消息:', newVal);
+            sendMessage(newVal);
+        }
+    }
+);
+
+// 监听isRecognizing状态，显示提示
+watch(
+    () => isRecognizing.value,
+    (newVal) => {
+        if (newVal) {
+            $api.msg('正在识别语音...');
+        }
+    }
+);
+
+const { speak, pause, resume, isSpeaking, isPaused, cancelAudio } = useTTSPlayer(config.speechSynthesis);
+
+// 获取组件实例（用于小程序 SelectorQuery）
+const instance = getCurrentInstance();
+
+// state
+const activeTab = ref('policy'); // 'policy' or 'job'
+const queries = ref([]);
+const guessList = ref([]);
+const scrollTop = ref(0);
+const showGuess = ref(false);
+const showfile = ref(false);
+const filesList = ref([]);
+const bgText = ref(false);
+const isVoice = ref(false);
+const status = ref('idle'); // idle | recording | cancel
+const startY = ref(0);
+const cancelThreshold = 100;
+const speechIndex = ref(0);
+const isAudioPermission = ref(false);
+const feebackData = ref(null);
+// 删除功能相关状态
+const isSelectMode = ref(false);
+const selectedMessages = ref([]);
+// ref for DOM element
+const voiceBtn = ref(null);
+const feeback = ref(null);
+const feeBackTips = ref(null);
+const state = reactive({
+    uploadFileTips: '请根据以上附件，帮我推荐岗位。',
+});
+
+const statusText = computed(() => {
+    switch (status.value) {
+        case 'recording':
+            return '松手发送，上划取消';
+        case 'cancel':
+            return '松手取消';
+        default:
+            return '按住说话';
+    }
+});
+
+const audiowaveStyle = computed(() => {
+    return status.value === 'cancel'
+        ? '#f54545'
+        : status.value === 'recording'
+        ? 'linear-gradient(to right, #377dff, #9a60ff)'
+        : '#f1f1f1';
+});
+
+onMounted(async () => {
+    changeQueries();
+    scrollToBottom();
+    isAudioPermission.value = await requestMicPermission();
+    reset(); // 重置语音识别状态
+});
+
+const requestMicPermission = async () => {
+    // #ifdef H5
+    try {
+        if (typeof navigator !== 'undefined' && navigator.mediaDevices) {
+            const stream = await navigator.mediaDevices.getUserMedia({ audio: true });
+            console.log('✅ 麦克风权限已授权');
+
+            // 立刻停止所有音轨，释放麦克风
+            stream.getTracks().forEach((track) => track.stop());
+
+            return true;
+        } else {
+            console.warn('❌ 当前环境不支持麦克风');
+            return false;
+        }
+    } catch (err) {
+        console.warn('❌ 用户拒绝麦克风权限或不支持:', err);
+        return false;
+    }
+    // #endif
+    
+    // #ifdef MP-WEIXIN
+    try {
+        // 微信小程序使用 uni.authorize 请求权限
+        const res = await uni.authorize({
+            scope: 'scope.record'
+        });
+        console.log('✅ 麦克风权限已授权');
+        return true;
+    } catch (err) {
+        console.warn('❌ 用户拒绝麦克风权限:', err);
+        // 用户拒绝授权，但不影响其他功能
+        return false;
+    }
+    // #endif
+    
+    // #ifndef H5 || MP-WEIXIN
+    // 其他平台暂不支持
+    console.warn('❌ 当前平台不支持麦克风权限检测');
+    return false;
+    // #endif
+};
+
+function showControll(index) {
+    if (index === messages.value.length - 1 && isTyping.value) {
+        return false;
+    }
+    return true;
+}
+
+const sendMessage = (text) => {
+    const values = textInput.value || text;
+    showfile.value = false;
+    showGuess.value = false;
+    if (values.trim()) {
+        // 判断是否有对话ID // 没有则创建对话列表
+        const callback = () => {
+            const normalArr = toRaw(filesList.value); // 转换为普通数组
+            filesList.value = [];
+            useChatGroupDBStore()
+                .getStearm(values, normalArr, scrollToBottom, {
+                    onDataReceived: (data, message, index) => {
+                        // 流式朗读：只在内容足够长且包含完整信息时才开始朗读
+                        if (!message.self && message.displayText && message.displayText.trim()) {
+                            // 检查是否已经开始朗读这条消息
+                            if (speechIndex.value !== index) {
+                                // 延迟TTS，等待内容更完整
+                                // 只有在内容长度超过50个字符或者包含岗位信息时才开始朗读
+                                const hasJobInfo = message.displayText.includes('```job-json') || 
+                                                 message.displayText.includes('岗位') ||
+                                                 message.displayText.includes('公司') ||
+                                                 message.displayText.includes('薪资');
+                                
+                                if (message.displayText.length > 50 || hasJobInfo) {
+                                    console.log('🎵 Starting streaming TTS for message index:', index);
+                                    console.log('📝 Current text length:', message.displayText.length);
+                                    console.log('📝 Has job info:', hasJobInfo);
+                                    
+                                    // 开始朗读当前消息
+                            speechIndex.value = index;
+                            readMarkdown(message.displayText, index, { immediate: false });
+                            // 一旦开始朗读，就设置speechIndex，避免重复调用
+                            speechIndex.value = index;
+                                } else {
+                                    console.log('⏳ Waiting for more content before TTS, current length:', message.displayText.length);
+                                }
+                            } else {
+                                // 已经开始朗读这条消息，不再重复调用
+                                console.log('⏭️ Already speaking this message, skipping duplicate TTS call');
+                            }
+                        }
+                    },
+                    onComplete: () => {
+                        console.log('🎯 onComplete callback triggered');
+                        console.log('📊 Messages array length:', messages.value.length);
+                        
+                        // 确保最后一条AI消息的朗读完成
+                        const lastMessageIndex = messages.value.length - 1;
+                        if (lastMessageIndex >= 0) {
+                            const lastMessage = messages.value[lastMessageIndex];
+                            if (!lastMessage.self && lastMessage.displayText && lastMessage.displayText.trim()) {
+                                console.log('🎵 Final TTS for complete message');
+                                console.log('📝 Final text length:', lastMessage.displayText.length);
+                                console.log('📝 Final text preview:', lastMessage.displayText.substring(0, 100) + '...');
+                                
+                                // 停止当前的朗读（如果有的话）
+                                if (isSpeaking.value) {
+                                    console.log('🛑 Stopping current TTS to start final complete TTS');
+                                    cancelAudio();
+                                }
+                                
+                                // 开始朗读完整的内容
+                                speechIndex.value = lastMessageIndex;
+                                readMarkdown(lastMessage.displayText, lastMessageIndex, { immediate: true });
+                            }
+                        }
+                    },
+                })
+                .then(() => {
+                    getGuess();
+                    scrollToBottom();
+                });
+            emit('onConfirm', values);
+            textInput.value = '';
+            scrollToBottom();
+        };
+        // 没有对话列表则创建
+        if (!chatSessionID.value) {
+            useChatGroupDBStore()
+                .addTabel(values)
+                .then((res) => {
+                    callback();
+                });
+        } else {
+            callback();
+        }
+    } else {
+        if (filesList.value.length) {
+            $api.msg('上传文件请输入想问的问题描述');
+        } else {
+            $api.msg('请输入职位信息或描述');
+        }
+    }
+};
+
+const sendMessageGuess = (item) => {
+    showGuess.value = false;
+    textInput.value = item;
+    sendMessage(item);
+};
+
+const delfile = (file) => {
+    uni.showModal({
+        content: '确认删除文件？',
+        success(res) {
+            if (res.confirm) {
+                filesList.value = filesList.value.filter((item) => item.url !== file.url);
+                if (!filesList.value.length) {
+                    if (textInput.value === state.uploadFileTips) {
+                        textInput.value = '';
+                    }
+                }
+                $api.msg('附件删除成功');
+            }
+        },
+    });
+};
+
+const scrollToBottom = throttle(function () {
+    nextTick(() => {
+        try {
+            let query;
+            // #ifdef MP-WEIXIN
+            query = uni.createSelectorQuery().in(instance);
+            // #endif
+            // #ifndef MP-WEIXIN
+            query = uni.createSelectorQuery();
+            // #endif
+            
+            query.select('.scrollView').boundingClientRect();
+            query.select('.list-content').boundingClientRect();
+            query.exec((res) => {
+                if (!res || !res[0] || !res[1]) {
+                    console.warn('scrollToBottom: 元素未找到或尚未渲染');
+                    return;
+                }
+                const scrollViewHeight = res[0].height;
+                const scrollContentHeight = res[1].height;
+                if (scrollContentHeight > scrollViewHeight) {
+                    const scrolldistance = scrollContentHeight - scrollViewHeight;
+                    scrollTop.value = scrolldistance;
+                }
+            });
+        } catch (err) {
+            console.warn(err);
+        }
+    });
+}, 500);
+
+function getGuess() {
+    // $api.chatRequest('/guest', { sessionId: chatSessionID.value }, 'POST').then((res) => {
+    $api.chatRequest('/guest', undefined, 'POST').then((res) => {
+        console.log('getGuess ---- res:', res);
+        guessList.value = res.data;
+        showGuess.value = true;
+        nextTick(() => {
+            scrollToBottom();
+        });
+    });
+}
+
+// 从文件路径提取文件名
+function getFileNameFromPath(filePath) {
+    if (!filePath) return '';
+    // 处理反斜杠和正斜杠
+    const path = filePath.replace(/\\/g, '/');
+    const lastSlashIndex = path.lastIndexOf('/');
+    if (lastSlashIndex !== -1) {
+        return path.substring(lastSlashIndex + 1);
+    }
+    return path;
+}
+
+// 从文件名推断文件类型
+function getFileTypeFromName(fileName) {
+    if (!fileName) return '';
+    const lowerName = fileName.toLowerCase();
+    if (lowerName.endsWith('.jpg') || lowerName.endsWith('.jpeg')) return 'image/jpeg';
+    if (lowerName.endsWith('.png')) return 'image/png';
+    if (lowerName.endsWith('.gif')) return 'image/gif';
+    if (lowerName.endsWith('.bmp')) return 'image/bmp';
+    if (lowerName.endsWith('.webp')) return 'image/webp';
+    if (lowerName.endsWith('.svg')) return 'image/svg+xml';
+    if (lowerName.endsWith('.pdf')) return 'application/pdf';
+    if (lowerName.endsWith('.doc')) return 'application/msword';
+    if (lowerName.endsWith('.docx')) return 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
+    if (lowerName.endsWith('.ppt')) return 'application/vnd.ms-powerpoint';
+    if (lowerName.endsWith('.pptx')) return 'application/vnd.openxmlformats-officedocument.presentationml.presentation';
+    if (lowerName.endsWith('.xls')) return 'application/vnd.ms-excel';
+    if (lowerName.endsWith('.xlsx')) return 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+    if (lowerName.endsWith('.txt')) return 'text/plain';
+    if (lowerName.endsWith('.md')) return 'text/markdown';
+    if (lowerName.endsWith('.html') || lowerName.endsWith('.htm')) return 'text/html';
+    if (lowerName.endsWith('.csv')) return 'text/csv';
+    return '';
+}
+
+function isImage(type, name) {
+    if (!type && !name) return false;
+    
+    const debug = false;
+    if (debug) console.log('isImage检查:', { type, name });
+    
+    if (type) {
+        const lowerType = type.toLowerCase();
+        
+        if (lowerType.includes('image/')) {
+            if (debug) console.log('通过MIME类型识别为图片:', lowerType);
+            return true;
+        }
+        
+        if (lowerType.includes('image')) {
+            if (debug) console.log('通过"image"关键词识别为图片:', lowerType);
+            return true;
+        }
+        
+        const imageExtensionsInType = ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp', 'svg', 'heic', 'heif', 'tiff', 'tif'];
+        for (const ext of imageExtensionsInType) {
+            if (lowerType.includes(ext)) {
+                if (debug) console.log('通过类型中的扩展名识别为图片:', ext);
+                return true;
+            }
+        }
+    }
+    
+    if (name) {
+        const lowerName = name.toLowerCase();
+        const imageExtensions = ['.jpg', '.jpeg', '.png', '.gif', '.bmp', '.webp', '.svg', '.heic', '.heif', '.tiff', '.tif', '.jfif', '.pjpeg', '.pjp'];
+        for (const ext of imageExtensions) {
+            if (lowerName.endsWith(ext)) {
+                if (debug) console.log('通过文件扩展名识别为图片:', ext);
+                return true;
+            }
+        }
+        
+        const imageExtensionsWithoutDot = ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp', 'svg', 'heic', 'heif', 'tiff', 'tif', 'jfif', 'pjpeg', 'pjp'];
+        for (const ext of imageExtensionsWithoutDot) {
+            if (lowerName.endsWith('.' + ext)) {
+                if (debug) console.log('通过带点的扩展名识别为图片:', ext);
+                return true;
+            }
+        }
+        
+        if (debug) console.log('未识别为图片:', lowerName);
+    }
+    
+    if (debug) console.log('不是图片文件');
+    return false;
+}
+
+function isFile(type) {
+    const allowedTypes = config.allowedFileTypes || [];
+    if (!allowedTypes.includes(type)) {
+        return false;
+    }
+    return true;
+}
+
+function jumpUrl(file) {
+    if (!file.url && !file.tempPath) {
+        $api.msg('文件地址丢失');
+        return;
+    }
+    
+    if (isImage(file.type, file.name)) {
+        const imageUrl = file.tempPath || file.url;
+        uni.previewImage({ urls: [imageUrl], current: 0 });
+    } else {
+        window.open(file.url);
+    }
+}
+
+function VerifyNumberFiles(additionalCount = 1) {
+    const currentCount = filesList.value.length;
+    const maxCount = config.allowedFileNumber || 9;
+    
+    if (currentCount + additionalCount > maxCount) {
+        $api.msg(`最多只能上传${maxCount}个文件，当前已有${currentCount}个`);
+        return true;
+    } else {
+        return false;
+    }
+}
+
+function onImageLoad(file) {
+    const index = filesList.value.findIndex(f => f.url === file.url);
+    if (index !== -1) {
+        filesList.value[index].loading = false;
+        filesList.value[index].error = false;
+    }
+}
+
+function onImageError(file) {
+    const index = filesList.value.findIndex(f => f.url === file.url);
+    if (index !== -1) {
+        filesList.value[index].loading = false;
+        filesList.value[index].error = true;
+    }
+}
+
+function retryImageLoad(file) {
+    const index = filesList.value.findIndex(f => f.url === file.url);
+    if (index !== -1) {
+        filesList.value[index].loading = true;
+        filesList.value[index].error = false;
+        // 触发重新加载
+        setTimeout(() => {
+            if (filesList.value[index]) {
+                filesList.value[index].loading = false;
+            }
+        }, 100);
+    }
+}
+
+function uploadCamera(type = 'camera') {
+    // 在微信小程序中检查权限
+    // #ifdef MP-WEIXIN
+    const scope = type === 'camera' ? 'scope.camera' : 'scope.writePhotosAlbum';
+    
+    uni.getSetting({
+        success: (res) => {
+            if (!res.authSetting[scope]) {
+                // 未授权，发起授权请求
+                uni.authorize({
+                    scope: scope,
+                    success: () => {
+                        // 授权成功，执行选择图片
+                        chooseImageAfterAuth();
+                    },
+                    fail: (err) => {
+                        console.error('授权失败:', err);
+                        if (err.errMsg && err.errMsg.includes('auth deny')) {
+                            uni.showModal({
+                                title: '权限提示',
+                                content: `需要${type === 'camera' ? '相机' : '相册'}权限才能上传图片，请在设置中开启权限`,
+                                showCancel: false,
+                                confirmText: '确定'
+                            });
+                        } else {
+                            $api.msg('授权失败，请重试');
+                        }
+                    }
+                });
+            } else {
+                // 已授权，直接执行选择图片
+                chooseImageAfterAuth();
+            }
+        },
+        fail: (err) => {
+            console.error('获取设置失败:', err);
+            chooseImageAfterAuth(); // 失败时也尝试选择图片
+        }
+    });
+    // #endif
+    
+    // #ifndef MP-WEIXIN
+    // 非微信小程序环境直接选择图片
+    chooseImageAfterAuth();
+    // #endif
+    
+    function chooseImageAfterAuth() {
+        uni.chooseImage({
+            count: 9, //支持多选，最多9张
+            sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+            // sourceType: [type], // 移除 sourceType 参数，解决微信 "unknown scene" 错误
+            success: function (res) {
+                const tempFilePaths = res.tempFilePaths;
+                const files = res.tempFiles;
+                
+                // 检查文件数量限制
+                if (VerifyNumberFiles(files.length)) return;
+                
+                // 显示上传提示
+                $api.msg(`开始上传${files.length}张图片...`);
+                
+                // 上传所有图片
+                const uploadPromises = tempFilePaths.map((filePath, index) => {
+                    return $api.uploadFile(filePath, true).then((resData) => {
+                        resData = JSON.parse(resData);
+                        if (resData.code === 200 && resData.filePath) {
+                            // 从文件对象获取文件信息
+                            const fileInfo = files[index] || {};
+                            const fileName = getFileNameFromPath(fileInfo.name || filePath);
+                            const fileType = fileInfo.type || getFileTypeFromName(fileName);
+                            const fileSize = fileInfo.size || 0;
+                            
+                            // 使用统一的文件路径处理函数
+                            const processedFile = processFilePath(
+                                resData.filePath, // 原始服务器路径
+                                fileName,
+                                fileType,
+                                fileSize,
+                                tempFilePaths[index] // 临时路径用于预览
+                            );
+                            
+                            // 添加图片加载状态字段
+                            processedFile.loading = false;
+                            processedFile.error = false;
+                            
+                            return processedFile;
+                        } else {
+                            throw new Error(resData.msg || '上传失败');
+                        }
+                    });
+                });
+                
+                Promise.all(uploadPromises).then((uploadedFiles) => {
+                    // 将所有上传成功的文件添加到filesList，并设置图片加载状态
+                    uploadedFiles.forEach(file => {
+                        if (isImage(file.type, file.name)) {
+                            file.loading = true; // 图片开始加载
+                        }
+                        filesList.value.push(file);
+                    });
+                    textInput.value = state.uploadFileTips;
+                    showfile.value = false; // 关闭上传面板
+                    $api.msg(`成功上传${uploadedFiles.length}张图片`);
+                }).catch((error) => {
+                    $api.msg(error.message || '图片上传失败');
+                });
+            },
+            fail: function (err) {
+                console.error('选择图片失败:', err);
+                // 专门处理微信 "unknown scene" 错误
+                if (err.errMsg && err.errMsg.includes('unknown scene')) {
+                    $api.msg('选择图片失败，请尝试重新选择或检查权限设置');
+                } else if (err.errMsg && err.errMsg.includes('auth deny')) {
+                    $api.msg('没有相机或相册权限，请在设置中开启');
+                } else {
+                    $api.msg('选择图片失败: ' + (err.errMsg || '未知错误'));
+                }
+            }
+        });
+    }
+}
+
+function getUploadFile(type = 'camera') {
+    // 检测是否是微信小程序环境
+    const isWeixinMiniProgram = typeof wx !== 'undefined' && wx.chooseMessageFile;
+    
+    console.log('当前环境检测:', {
+        isWeixinMiniProgram,
+        wxExists: typeof wx !== 'undefined',
+        hasChooseMessageFile: typeof wx !== 'undefined' && wx.chooseMessageFile
+    });
+    
+    if (isWeixinMiniProgram) {
+        console.log('微信小程序环境，使用uni.chooseMessageFile');
+        // 微信小程序环境：使用uni.chooseMessageFile
+        uni.chooseMessageFile({
+            count: 9,
+            type: 'file',
+            success: (res) => {
+                console.log('uni.chooseMessageFile返回的res:', res);
+                // uni.chooseMessageFile返回的数据结构不同
+                // tempFiles数组中每个对象有path、name、size等属性
+                const tempFiles = res.tempFiles || [];
+                const tempFilePaths = tempFiles.map(file => file.path);
+                const files = tempFiles;
+                
+                console.log('tempFilePaths:', tempFilePaths);
+                console.log('tempFiles:', tempFiles);
+                if (files && files.length > 0) {
+                    console.log('第一个文件详情:', files[0]);
+                    console.log('第一个文件的所有属性:', Object.keys(files[0]));
+                    // 详细记录每个文件的所有属性
+                    files.forEach((file, index) => {
+                        console.log(`文件 ${index} 完整对象:`, JSON.stringify(file));
+                        console.log(`文件 ${index} 关键属性:`, {
+                            name: file.name,
+                            type: file.type,
+                            path: file.path,
+                            size: file.size,
+                            hasType: 'type' in file,
+                            typeIsString: typeof file.type === 'string',
+                            typeLength: file.type ? file.type.length : 0
+                        });
+                    });
+                }
+                
+                // 调用公共的文件处理函数
+                handleSelectedFiles(tempFilePaths, files);
+            },
+            fail: (err) => {
+                console.error('uni.chooseMessageFile失败:', err);
+                // 微信小程序特定的错误处理
+                if (err.errMsg && err.errMsg.includes('cancel')) {
+                    // 用户取消选择，不提示错误
+                    console.log('用户取消选择文件');
+                } else {
+                    $api.msg('选择文件失败，请重试');
+                }
+            }
+        });
+    } else {
+        console.log('非微信小程序环境，使用uni.chooseFile');
+        // 其他平台：使用uni.chooseFile
+        uni.chooseFile({
+            count: 9,
+            success: (res) => {
+                console.log('uni.chooseFile返回的res:', res);
+                const tempFilePaths = res.tempFilePaths;
+                const files = res.tempFiles;
+                
+                console.log('tempFilePaths:', tempFilePaths);
+                console.log('tempFiles:', files);
+                if (files && files.length > 0) {
+                    console.log('第一个文件详情:', files[0]);
+                    console.log('第一个文件的所有属性:', Object.keys(files[0]));
+                    // 详细记录每个文件的所有属性
+                    files.forEach((file, index) => {
+                        console.log(`文件 ${index} 完整对象:`, JSON.stringify(file));
+                        console.log(`文件 ${index} 关键属性:`, {
+                            name: file.name,
+                            type: file.type,
+                            path: file.path,
+                            size: file.size,
+                            hasType: 'type' in file,
+                            typeIsString: typeof file.type === 'string',
+                            typeLength: file.type ? file.type.length : 0
+                        });
+                    });
+                }
+                
+                // 调用公共的文件处理函数
+                handleSelectedFiles(tempFilePaths, files);
+            },
+            fail: (err) => {
+                console.error('uni.chooseFile失败:', err);
+                if (err.errMsg && !err.errMsg.includes('cancel')) {
+                    $api.msg('选择文件失败，请重试');
+                }
+            }
+        });
+    }
+}
+
+// 处理服务器返回的文件路径，生成正确的显示URL和服务器路径
+function processFilePath(originalFilePath, fileName, fileType, fileSize, tempPath) {
+    let displayUrl = originalFilePath; // 用于缩略图显示的URL（外网域名）
+    const serverPath = originalFilePath; // 原始服务器路径（内网地址，用于对话接口）
+    
+    console.log('processFilePath原始fileUrl:', originalFilePath);
+    
+    // 如果filePath包含IP地址，替换为配置的域名（用于显示）
+    if (displayUrl && displayUrl.includes('://')) {
+        // 检查是否是本地临时路径（如http://tmp/），如果是则保持原样
+        if (displayUrl.startsWith('http://tmp/')) {
+            // 本地临时路径，保持原样
+            console.log('本地临时路径，保持原样:', displayUrl);
+        } else {
+            // 方法1：直接替换域名部分（保持路径结构）- 使用兼容的方法
+            // 例如：http://10.98.80.146/file/xxx.jpg -> https://www.xjksly.cn/file/xxx.jpg
+            const originalUrl = displayUrl;
+            
+            // 提取协议、域名和路径部分
+            let protocol = '';
+            let domain = '';
+            let path = '';
+            
+            // 分离协议和剩余部分
+            const protocolIndex = originalUrl.indexOf('://');
+            if (protocolIndex !== -1) {
+                protocol = originalUrl.substring(0, protocolIndex + 3);
+                const rest = originalUrl.substring(protocolIndex + 3);
+                const slashIndex = rest.indexOf('/');
+                if (slashIndex !== -1) {
+                    domain = rest.substring(0, slashIndex);
+                    path = rest.substring(slashIndex);
+                } else {
+                    domain = rest;
+                    path = '/';
+                }
+            }
+            
+            console.log('解析结果:', { protocol, domain, path });
+            
+            // 使用config.baseUrl或config.imgBaseUrl作为新域名
+            let baseUrl = config.baseUrl || config.imgBaseUrl;
+            // 如果baseUrl以/api/ks结尾，去掉这个部分
+            if (baseUrl.endsWith('/api/ks')) {
+                baseUrl = baseUrl.substring(0, baseUrl.length - 7);
+            }
+            
+            // 构建新URL：使用新域名 + 原路径
+            // 确保baseUrl不以/结尾，path以/开头
+            let cleanBaseUrl = baseUrl;
+            if (cleanBaseUrl.endsWith('/')) {
+                cleanBaseUrl = cleanBaseUrl.substring(0, cleanBaseUrl.length - 1);
+            }
+            if (!path.startsWith('/')) {
+                path = '/' + path;
+            }
+            
+            displayUrl = cleanBaseUrl + path;
+            console.log('替换域名后的displayUrl（用于显示）:', displayUrl);
+        }
+    } else if (displayUrl && !displayUrl.startsWith('http')) {
+        // 如果filePath不是完整的URL，直接添加图片基础URL前缀
+        displayUrl = config.imgBaseUrl + displayUrl;
+        console.log('非完整URL，添加imgBaseUrl前缀:', displayUrl);
+    }
+    
+    return {
+        url: displayUrl, // 使用处理后的完整URL（用于缩略图显示）
+        serverPath: serverPath, // 原始服务器路径（内网地址，用于对话接口）
+        type: fileType,
+        name: fileName,
+        size: fileSize > 0 ? $api.formatFileSize(fileSize) : '',
+        tempPath: tempPath // 保存临时路径用于预览
+    };
+}
+
+// 处理选择的文件（公共逻辑）
+function handleSelectedFiles(tempFilePaths, files) {
+    // 检查文件数量限制
+    if (VerifyNumberFiles(files.length)) return;
+    
+    const allowedTypes = config.allowedFileTypes || [];
+    
+    // 调试：在文件类型检查之前记录详细信息
+    console.log('=== handleSelectedFiles 文件类型检查开始 ===');
+    console.log('allowedTypes配置:', allowedTypes);
+    console.log('files数组长度:', files.length);
+    files.forEach((file, index) => {
+        console.log(`文件 ${index} 检查前详情:`, {
+            name: file.name,
+            type: file.type,
+            hasType: 'type' in file,
+            typeValue: file.type,
+            typeIsString: typeof file.type === 'string',
+            typeLength: file.type ? file.type.length : 0,
+            size: file.size,
+            path: file.path
+        });
+        // 尝试从文件名推断类型
+        const inferredType = getFileTypeFromName(file.name);
+        console.log(`文件 ${index} 从文件名推断的类型:`, inferredType);
+        // 检查是否在allowedTypes中
+        const isAllowedByType = allowedTypes.includes(file.type);
+        const isAllowedByInferred = allowedTypes.includes(inferredType);
+        const isImageFile = isImage(file.type, file.name);
+        console.log(`文件 ${index} 检查结果:`, {
+            isAllowedByType,
+            isAllowedByInferred,
+            isImageFile,
+            finalAllowed: isAllowedByType || isAllowedByInferred || isImageFile
+        });
+    });
+    console.log('=== handleSelectedFiles 文件类型检查结束 ===');
+    
+    // 检查所有文件类型 - 增强版：优先使用file.type，回退到文件名推断
+    const invalidFiles = files.filter(file => {
+        // 如果文件类型存在且在允许的类型列表中，则通过
+        if (file.type && allowedTypes.includes(file.type)) {
+            return false;
+        }
+        
+        // 尝试从文件名推断类型
+        const inferredType = getFileTypeFromName(file.name);
+        if (inferredType && allowedTypes.includes(inferredType)) {
+            return false;
+        }
+        
+        // 如果是图片，也通过
+        if (isImage(file.type, file.name)) {
+            return false;
+        }
+        
+        // 否则，文件无效
+        return true;
+    });
+    
+    if (invalidFiles.length > 0) {
+        // 调试：查看不支持的文件类型
+        console.log('不支持的文件类型:', invalidFiles.map(f => ({name: f.name, type: f.type})));
+        // 更详细地显示为什么这些文件不被支持
+        invalidFiles.forEach((file, index) => {
+            const inferredType = getFileTypeFromName(file.name);
+            console.log(`无效文件 ${index} 分析:`, {
+                name: file.name,
+                type: file.type,
+                inferredType,
+                isImage: isImage(file.type, file.name),
+                isInAllowedTypes: allowedTypes.includes(file.type),
+                isInferredInAllowedTypes: allowedTypes.includes(inferredType)
+            });
+        });
+        return $api.msg('仅支持 txt md html word doc docx pdf ppt pptx csv excel xlsx 和图片格式');
+    }
+    
+    // 显示上传提示
+    const imageCount = files.filter(file => isImage(file.type, file.name)).length;
+    const otherFileCount = files.length - imageCount;
+    let tip = '开始上传';
+    if (imageCount > 0) tip += `${imageCount}张图片`;
+    if (otherFileCount > 0) {
+        if (imageCount > 0) tip += '和';
+        tip += `${otherFileCount}个文件`;
+    }
+    $api.msg(tip + '...');
+    
+    // 上传所有文件
+    const uploadPromises = tempFilePaths.map((filePath, index) => {
+        return $api.uploadFile(filePath, true).then((resData) => {
+            resData = JSON.parse(resData);
+            console.log('服务器返回的resData:', resData);
+            if (resData.code === 200 && resData.filePath) {
+                // 从文件对象或文件路径获取文件信息
+                const fileInfo = files[index] || {};
+                const fileName = fileInfo.name || getFileNameFromPath(tempFilePaths[index]);
+                const fileType = fileInfo.type || getFileTypeFromName(fileName);
+                const fileSize = fileInfo.size || 0;
+                
+                // 使用统一的文件路径处理函数
+                const processedFile = processFilePath(
+                    resData.filePath, // 原始服务器路径
+                    fileName,
+                    fileType,
+                    fileSize,
+                    tempFilePaths[index] // 临时路径用于预览
+                );
+                
+                // 调试：记录文件信息
+                console.log('上传文件信息:', {
+                    fileInfo: fileInfo,
+                    type: fileType,
+                    name: fileName,
+                    size: fileSize,
+                    isImage: isImage(fileType, fileName),
+                    originalFilePath: resData.filePath,
+                    displayUrl: processedFile.url,
+                    serverPath: processedFile.serverPath,
+                    imgBaseUrl: config.imgBaseUrl
+                });
+                
+                return processedFile;
+            } else {
+                throw new Error(resData.msg || '上传失败');
+            }
+        });
+    });
+    
+    Promise.all(uploadPromises).then((uploadedFiles) => {
+        // 将所有上传成功的文件添加到filesList
+        uploadedFiles.forEach(file => {
+            if (isImage(file.type, file.name)) {
+                file.loading = true; // 图片开始加载
+                file.error = false;
+            }
+            filesList.value.push(file);
+        });
+        textInput.value = state.uploadFileTips;
+        showfile.value = false; // 关闭上传面板
+        $api.msg(`成功上传${uploadedFiles.length}个文件`);
+    }).catch((error) => {
+        $api.msg(error.message || '文件上传失败');
+    });
+}
+
+const tipsPermisson = () => {
+    uni.showToast({
+        title: '需要授权麦克风权限才能使用语音功能',
+        icon: 'none',
+    });
+};
+
+const handleTouchStart = async (e) => {
+    if (!isAudioPermission.value) {
+        return tipsPermisson();
+    }
+    cancelAudio();
+    startY.value = e.touches[0].clientY;
+    status.value = 'recording';
+    showfile.value = false;
+    startRecording();
+    $api.sleep(1000).then(() => {
+        scrollToBottom();
+    });
+};
+
+const handleTouchMove = (e) => {
+    const moveY = e.touches[0].clientY;
+    if (startY.value - moveY > cancelThreshold) {
+        status.value = 'cancel';
+    } else {
+        status.value = 'recording';
+    }
+};
+
+const handleTouchEnd = () => {
+    if (status.value === 'cancel') {
+        console.log('取消发送');
+        cancelRecording();
+        status.value = 'idle';
+    } else {
+        stopRecording();
+        if (isAudioPermission.value) {
+            // 主要根据录音时长判断，而不是完全依赖识别结果
+            // 由于setInterval是异步的，这里需要考虑计时延迟
+            const actualDuration = recordingDuration.value > 0 ? recordingDuration.value : (isRecording.value ? 0.5 : 0);
+            if (actualDuration < 1) {
+                $api.msg('说话时长太短');
+                status.value = 'idle';
+            } else {
+                // 状态管理由useAudioRecorder hook内部处理
+                status.value = 'idle';
+            }
+        }
+    }
+};
+
+const handleTouchCancel = () => {
+    stopRecording();
+    status.value = 'idle';
+};
+
+function closeGuess() {
+    showGuess.value = false;
+}
+
+function changeVoice() {
+    isVoice.value = !isVoice.value;
+}
+
+function changeShowFile() {
+    showfile.value = !showfile.value;
+}
+
+function closeFile() {
+    showfile.value = false;
+}
+
+function copyMarkdown(value) {
+    $api.copyText(value);
+}
+
+function userGoodFeedback(msg) {
+    // $api.msg('该功能正在开发中，敬请期待后续更新！');
+    feeback.value?.open();
+    feebackData.value = msg;
+}
+
+function confirmFeeBack(value) {
+    useChatGroupDBStore()
+        .badFeedback(feebackData.value, value)
+        .then(() => {
+            feeback.value?.close();
+            feeBackTips.value?.open();
+        });
+}
+
+// 防抖定时器
+let ttsDebounceTimer = null;
+
+// 保存上一次调用的文本内容，避免重复调用TTS
+let lastSpeechText = '';
+
+function readMarkdown(value, index, options = {}) {
+    console.log('🎤 readMarkdown called');
+    console.log('📝 Text to speak:', value ? value.substring(0, 100) + '...' : 'No text');
+    console.log('🔢 Index:', index);
+    console.log('🔢 Current speechIndex:', speechIndex.value);
+    console.log('⏸️ Is paused:', isPaused.value);
+    console.log('🔊 Is speaking:', isSpeaking.value);
+    
+    // 清除之前的防抖定时器
+    if (ttsDebounceTimer) {
+        clearTimeout(ttsDebounceTimer);
+    }
+    
+    // 总是先停止当前播放，无论是不是同一消息
+    console.log('🛑 Always stopping current speech before starting new one');
+    speechIndex.value = index;
+    
+    // 立即调用speak，不使用防抖延迟
+    const speakNow = () => {
+        // 检查文本内容是否发生变化，避免重复调用TTS
+        if (value !== lastSpeechText) {
+            console.log('🎵 Starting new speech');
+            console.log('🎵 Calling speak function with text length:', value ? value.length : 0);
+            try {
+                speak(value);
+                console.log('✅ Speak function called successfully');
+                // 更新上一次调用的文本内容
+                lastSpeechText = value;
+            } catch (error) {
+                console.error('❌ Error calling speak function:', error);
+            }
+        } else {
+            console.log('🔄 Same text as last speech, skipping duplicate TTS call');
+        }
+    };
+    
+    // 改进防抖逻辑，确保在短时间内只调用一次
+    if (options.immediate) {
+        // 如果是onComplete回调，立即播放
+        speakNow();
+    } else {
+        // 对于流式数据，总是使用防抖，避免频繁调用
+        ttsDebounceTimer = setTimeout(speakNow, 500); // 延长防抖时间到500ms
+    }
+}
+function stopMarkdown(value, index) {
+    console.log('⏸️ stopMarkdown called for index:', index);
+    console.log('🔢 Current speechIndex:', speechIndex.value);
+    console.log('🔊 Is speaking:', isSpeaking.value);
+    console.log('⏸️ Is paused:', isPaused.value);
+    
+    // 清除防抖定时器
+    if (ttsDebounceTimer) {
+        clearTimeout(ttsDebounceTimer);
+        ttsDebounceTimer = null;
+    }
+    
+    speechIndex.value = index;
+    pause();
+}
+function refreshMarkdown(index) {
+    if (isTyping.value) {
+        $api.msg('正在生成');
+    } else {
+        const text = messages.value[index - 1].text;
+        sendMessageGuess(text);
+    }
+}
+
+const jobSearchQueries = [
+    '喀什地区有哪些薪资 12K 以上的岗位适合我？',
+    '喀什地区 3 年工作经验能找到哪些 12K 以上的工作？',
+    '喀什地区哪些公司在招聘，薪资范围在 12K 以上？',
+    '喀什地区有哪些企业提供 15K 以上的岗位？',
+    '喀什地区哪些公司在招 3-5 年经验的岗位？',
+    '我有三年的工作经验，能否推荐一些适合我的喀什地区的国企 岗位？',
+    '喀什地区国企目前在招聘哪些岗位？',
+    '喀什地区有哪些适合 3 年经验的国企岗位？',
+    '喀什地区国企招聘的岗位待遇如何？',
+    '喀什地区国企岗位的薪资水平是多少？',
+    '喀什地区哪些国企支持双休 & 五险一金完善？',
+    '喀什地区有哪些公司支持远程办公？',
+    '喀什地区有哪些外企的岗位，薪资 12K 以上的多吗？',
+    '喀什地区哪些企业在招聘 Web3.0 相关岗位？',
+    '喀什地区哪些岗位支持海外远程？薪资如何？',
+    '喀什地区招聘 AI/大数据相关岗位的公司有哪些？',
+];
+
+function changeQueries(value) {
+    queries.value = getRandomJobQueries(jobSearchQueries);
+}
+
+function getRandomJobQueries(queries, count = 2) {
+    const shuffled = queries.sort(() => 0.5 - Math.random()); // 随机打乱数组
+    return shuffled.slice(0, count); // 取前 count 条
+}
+
+// 切换tab
+function switchTab(tab) {
+    activeTab.value = tab;
+}
+
+// 检查消息是否应该显示在当前tab
+function shouldShowMessage(msg) {
+    if (msg.self) {
+        return true; // 用户自己的消息总是显示
+    }
+    
+    if (activeTab.value === 'policy') {
+        // 政策查询tab：显示除了岗位卡片以外的所有内容
+        // 岗位卡片通常包含特定的标记，如```job-json或岗位推荐等关键词
+        const isJobCard = msg.displayText && (
+            msg.displayText.includes('```job-json') ||
+            msg.displayText.includes('岗位推荐') ||
+            msg.displayText.includes('推荐岗位') ||
+            msg.displayText.includes('岗位信息') ||
+            (msg.displayText.includes('```') && msg.displayText.includes('公司') && msg.displayText.includes('薪资'))
+        );
+        return !isJobCard;
+    } else {
+        // 岗位推荐tab：只显示岗位卡片内容
+        const isJobCard = msg.displayText && (
+            msg.displayText.includes('```job-json') ||
+            msg.displayText.includes('岗位推荐') ||
+            msg.displayText.includes('推荐岗位') ||
+            msg.displayText.includes('岗位信息') ||
+            (msg.displayText.includes('```') && msg.displayText.includes('公司') && msg.displayText.includes('薪资'))
+        );
+        return isJobCard;
+    }
+}
+
+// 长按事件处理函数
+function handleLongPress(msg, index) {
+    isSelectMode.value = true;
+    selectedMessages.value = [index];
+    
+    // 如果长按的是用户消息，同时选中对应的AI回复
+    if (msg.self) {
+        const nextIndex = index + 1;
+        if (nextIndex < messages.value.length && !messages.value[nextIndex].self) {
+            selectedMessages.value.push(nextIndex);
+        }
+    }
+}
+
+// 选择/取消选择消息
+function toggleSelectMessage(index) {
+    const msg = messages.value[index];
+    const idx = selectedMessages.value.indexOf(index);
+    
+    if (idx > -1) {
+        // 取消选择
+        selectedMessages.value.splice(idx, 1);
+        
+        // 如果取消选择的是用户消息，同时取消选择对应的AI回复
+        if (msg.self) {
+            const nextIndex = index + 1;
+            if (nextIndex < messages.value.length && !messages.value[nextIndex].self) {
+                const aiIdx = selectedMessages.value.indexOf(nextIndex);
+                if (aiIdx > -1) {
+                    selectedMessages.value.splice(aiIdx, 1);
+                }
+            }
+        }
+        
+        if (selectedMessages.value.length === 0) {
+            isSelectMode.value = false;
+        }
+    } else {
+        // 选择消息
+        selectedMessages.value.push(index);
+        
+        // 如果选择的是用户消息，同时选择对应的AI回复
+        if (msg.self) {
+            const nextIndex = index + 1;
+            if (nextIndex < messages.value.length && !messages.value[nextIndex].self) {
+                if (!selectedMessages.value.includes(nextIndex)) {
+                    selectedMessages.value.push(nextIndex);
+                }
+            }
+        }
+    }
+}
+
+// 退出选择模式
+function exitSelectMode() {
+    isSelectMode.value = false;
+    selectedMessages.value = [];
+}
+
+// 全选消息
+function selectAllMessages() {
+    selectedMessages.value = messages.value.map((_, index) => index);
+}
+
+// 删除选中消息
+function deleteSelectedMessages() {
+    if (selectedMessages.value.length === 0) return;
+    
+    uni.showModal({
+        content: `确定删除${selectedMessages.value.length}条消息吗？`,
+        success(res) {
+            if (res.confirm) {
+                // 调用store中的删除方法
+                useChatGroupDBStore().deleteMessages(selectedMessages.value);
+                // 退出选择模式
+                exitSelectMode();
+                $api.msg('消息删除成功');
+            }
+        }
+    });
+}
+
+defineExpose({ scrollToBottom, closeGuess, closeFile, changeQueries, handleTouchCancel, switchTab });
+</script>
+
+<style lang="stylus" scoped>
+/* 过渡样式 */
+.collapse-enter-active,
+.collapse-leave-active {
+  transition: max-height 0.3s ease, opacity 0.3s ease;
+}
+
+.collapse-enter-from,
+.collapse-leave-to {
+  max-height: 0;
+  opacity: 0;
+}
+
+.collapse-enter-to,
+.collapse-leave-from {
+  max-height: 400rpx; /* 根据你内容最大高度设定 */
+  opacity: 1;
+}
+.msg-filecontent
+    display: flex
+    flex-wrap: wrap
+.msg-files
+    overflow: hidden
+    margin-right: 10rpx
+    height: 30rpx
+    max-width: 201rpx
+    background: #FFFFFF
+    border-radius: 10rpx
+    display: flex
+    align-items: center
+    justify-content: flex-start
+    padding: 10rpx
+    color: #000000
+    margin-bottom: 10rpx
+    .msg-file-icon
+        width: 29rpx
+        height: 26rpx
+        padding-right: 10rpx
+    .msg-file-text
+        flex: 1
+        white-space: nowrap
+        overflow: hidden
+        text-overflow: ellipsis
+        color: rgba(96, 96, 96, 1)
+        font-size: 24rpx
+.msg-files:active
+    background: #e9e9e9
+
+// 消息中的图片文件样式
+.msg-image-file
+    height: 120rpx
+    width: 120rpx
+    padding: 4rpx
+    flex-direction: column
+    justify-content: center
+    .msg-image-thumbnail
+        width: 100%
+        height: 80rpx
+        border-radius: 8rpx
+        margin-bottom: 8rpx
+    .msg-file-text
+        font-size: 20rpx
+        text-align: center
+        white-space: nowrap
+        overflow: hidden
+        text-overflow: ellipsis
+.guess
+    padding: 5rpx 0 10rpx 0
+    .guess-list
+        padding: 16rpx 24rpx
+        margin-top: 28rpx
+        font-size: 24rpx
+        color: #8c8c8c
+        width: 100%;
+        border-radius: 20rpx 20rpx 20rpx 20rpx;
+        border: 2rpx solid #E5E5E5;
+        font-size: 28rpx;
+        color: #333333;
+        line-height: 33rpx;
+    .gulist
+        display: flex
+        flex-wrap: wrap
+        position: relative
+image-margin-top = 40rpx
+.chat-container
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    position: relative
+    z-index: 1
+    background: #FFFFFF
+
+.chat-background
+    position: absolute
+    padding: 44rpx;
+    display: flex
+    flex-direction: column
+    justify-content: flex-start
+    align-items: center
+    width: calc(100% - 88rpx)
+    position: relative
+    z-index: 1
+    .backlogo
+        width: 313rpx;
+        height: 190rpx;
+    .back-rowTitle
+        height: 56rpx;
+        font-weight: bold;
+        font-size: 40rpx;
+        color: #333333;
+        line-height: 47rpx;
+        margin-top: 40rpx
+    .back-rowText
+        margin-top: 28rpx
+        width: 100%;
+        height: 148rpx;
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #333333;
+        line-height: 40rpx
+        // border-bottom: 2rpx dashed rgba(0, 0, 0, 0.2);
+        border-bottom: 2rpx solid transparent;
+        background-image: linear-gradient(to right, rgba(0, 0, 0, 0.2) 50%, transparent 50%);
+        background-size: 10rpx 2rpx; /* 调整虚线宽度和间距 */
+        background-repeat: repeat-x;
+        background-position: 0 148rpx
+    .back-rowh3
+        width: 100%;
+        font-weight: 500;
+        font-size: 28rpx;
+        color: #000000;
+        margin-top: 28rpx
+    .back-rowmsg
+        width: calc(100% - 32rpx)
+        margin-top: 24rpx
+        font-weight: 500;
+        color: rgba(51, 51, 51, 1);
+        line-height: 28rpx;
+        font-size: 24rpx
+        background: rgba(246, 246, 246, 1);
+        border-radius: 8rpx 8rpx 8rpx 8rpx;
+        padding: 32rpx 18rpx;
+
+.chat-list {
+    flex: 1;
+    overflow-y: auto;
+    white-space: pre-wrap;
+}
+.list-content {
+    padding: 0 44rpx 10rpx 44rpx;
+}
+.chat-item {
+    display: flex;
+    align-items: flex-start;
+    margin-bottom: 10rpx;
+    width: 100%;
+}
+.chat-item.self {
+    justify-content: flex-end;
+}
+.message
+    margin-top: 0rpx
+    // max-width: 80%;
+    width: 100%;
+    word-break: break-word;
+    color: #333333;
+    user-select: text;
+    -webkit-user-select: text;
+    .message-markdown
+        border-radius: 0 20rpx 20rpx 20rpx;
+        padding: 20rpx 20rpx 20rpx 20rpx;
+        background: #F6F6F6;
+        .message-controll
+            display: flex
+            justify-content: space-between
+            align-items: center
+            border-top: 2rpx solid #EAEAEA
+            padding: 24rpx 0 4rpx 0
+            margin-top: 10rpx
+            .controll-left
+            .controll-right
+                .controll-icon
+                    width: 60rpx;
+                    height: 60rpx;
+
+.messageNull
+    display: none
+.msg-loading{
+    background: #F6F6F6;
+    border-radius: 20rpx 0 20rpx 20rpx;
+    padding: 20rpx;
+    width: fit-content;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    
+    .loading-content{
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        gap: 16rpx;
+    }
+    
+    .loading-text{
+        font-size: 28rpx;
+        color: #666666;
+        font-weight: 500;
+    }
+}
+.loaded{
+    padding-left: 20rpx
+}
+.chat-item.self .message {
+    background: linear-gradient( 225deg, #DAE2FE 0%, #E9E3FF 100%);
+        border-radius: 20rpx 0 20rpx 20rpx;
+    padding: 20rpx;
+    width: fit-content;
+}
+.input-area {
+    padding: 32rpx 28rpx 24rpx 28rpx;
+    /* #ifdef H5 */
+    padding-bottom: calc(24rpx + env(safe-area-inset-bottom) + 70rpx);
+    /* #endif */
+    /* #ifdef MP-WEIXIN */
+    /* 小程序不支持CSS中的本地图片，使用image标签替代 */
+    padding-bottom: calc(24rpx + env(safe-area-inset-bottom) + 40rpx - 50rpx);
+    /* #endif */
+    position: relative;
+    background: #FFFFFF;
+    box-shadow: 0rpx -4rpx 10rpx 0rpx rgba(11,44,112,0.06);
+    transition: height 2s ease-in-out;
+    z-index: 1001;
+}
+.ai-tips{
+    font-size: 24rpx;
+    color: #8c8c8c;
+    line-height: 33rpx;
+    margin-top: 18rpx;
+    text-align: center;
+}
+.input-area::after
+    position: absolute
+    content: ''
+    top: 0
+    left: 0
+    width: 100%
+    z-index: 1
+    box-shadow: 0rpx -4rpx 10rpx 0rpx rgba(11,44,112,0.06);
+.areatext{
+    display: flex;
+}
+.input {
+    flex: 1;
+    border-radius: 5rpx;
+    min-height: 63rpx;
+    line-height: 63rpx;
+    padding: 4rpx 24rpx;
+    position: relative
+    background: #F5F5F5;
+    border-radius: 60rpx 60rpx 60rpx 60rpx;
+}
+.input_vio
+    flex: 1;
+    border-radius: 5rpx;
+    min-height: 63rpx;
+    line-height: 63rpx;
+    padding: 4rpx 24rpx;
+    // position: relative
+    border-radius: 60rpx 60rpx 60rpx 60rpx;
+    font-size: 28rpx
+    color: #333333
+    background: #F5F5F5;
+    text-align: center
+    font-size: 28rpx
+    font-weight: 500
+    user-select:none;
+    -webkit-touch-callout:none;
+    -webkit-user-select:none;
+    -khtml-user-select:none;
+    -moz-user-select:none;
+    -ms-user-select:none;
+    touch-action: none; /* 禁用默认滚动 */
+.input_vio:active
+    background: #e8e8e8
+.vio_container
+    background: transparent
+    padding: 28rpx
+    text-align: center
+    -webkit-touch-callout:none;
+    -webkit-user-select:none;
+    -khtml-user-select:none;
+    -moz-user-select:none;
+    -ms-user-select:none;
+    touch-action: none; /* 禁用默认滚动 */
+    position: fixed;
+    left: 0;
+    right: 0;
+    bottom: 160rpx; /* 为底部导航栏留出空间 */
+    z-index: 9999; /* 确保高于其他元素 */
+    .record-tip
+        font-weight: 400;
+        color: #909090;
+        text-align: center;
+        padding-bottom: 16rpx
+
+
+.inputplaceholder {
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #000000;
+    line-height: 28rpx;
+    opacity: 0.4
+}
+.btn-box
+    margin-left: 12rpx;
+    width: 70rpx;
+    height: 70rpx;
+    border-radius: 50%
+    background: #F5F5F5;
+    display: flex
+    align-items: center
+    justify-content: center
+    .send-btn,
+    .receive-btn
+        transition: transform 0.5s ease;
+        width: 38rpx;
+        height: 38rpx;
+    .btn-box-round
+        width: 22rpx
+        height: 22rpx
+        border-radius: 4rpx
+        background: #FFFFFF
+.purple
+    background: linear-gradient( 225deg, #9E74FD 0%, #256BFA 100%);
+.add-file-btn{
+    transform: rotate(45deg)
+    transition: transform 0.5s ease;
+}
+.area-tips{
+    font-weight: 400;
+    font-size: 26rpx;
+    color: #434343;
+    margin-top: 18rpx
+}
+
+/* 文件上传弹窗 - 向上展开，避免被tabbar遮挡 */
+.file-upload-popup {
+    position: absolute;
+    bottom: 100%;
+    left: 0;
+    right: 0;
+    background: #FFFFFF;
+    padding: 0 28rpx 24rpx 28rpx;
+    box-shadow: 0rpx -4rpx 10rpx 0rpx rgba(11,44,112,0.06);
+    transform: translateY(20rpx);
+    opacity: 0;
+    visibility: hidden;
+    transition: all 0.3s ease;
+    z-index: 1002;
+}
+
+.file-upload-popup.show {
+    transform: translateY(0);
+    opacity: 1;
+    visibility: visible;
+}
+
+.area-file
+    display: grid
+    width: 100%
+    grid-template-columns: repeat(3, 1fr)
+    grid-gap: 20rpx
+    padding: 20rpx 0 0 0;
+    .file-card
+        display: flex
+        flex-direction: column
+        align-items: center
+        padding: 24rpx 0
+        background: #F5F5F5;
+        border-radius: 20rpx 20rpx 20rpx 20rpx;
+        text
+            font-size: 24rpx
+            font-weight: 500
+            color: rgba(0,0,0,.5)
+            padding-top: 8rpx
+        .card-img
+            height: 56rpx
+            width: 56rpx
+    .file-card:active
+        background: #e8e8e8
+
+.area-uploadfiles
+    position: absolute
+    bottom: 100%
+    width: calc(100% - 30rpx)
+    background: #FFFFFF
+    left: 0
+    padding: 10rpx 0 10rpx 30rpx
+    box-shadow: 0rpx -4rpx 10rpx 0rpx rgba(11,44,112,0.06);
+    z-index: 1003
+    .uploadfiles-scroll
+        height: 100%
+        .uploadfiles-list
+            height: 100%
+            display: flex
+            margin-right: 28rpx
+            flex-wrap: nowrap
+            .file-doc
+                display: flex
+                align-items: center
+                justify-content: flex-start
+                padding: 16rpx 20rpx 18rpx 20rpx
+                height: calc(100% - 40rpx)
+                .doc-icon
+                    width: 60rpx
+                    height: 76rpx
+                    margin-right: 20rpx
+                .doc-con
+                    flex: 1
+                    width: 0
+            .file-uploadsend
+                margin: 10rpx 18rpx 0 0;
+                height: 100%
+                font-size: 24rpx
+                position: relative
+                min-width: 200rpx;
+                max-width: 200rpx;
+                height: 200rpx;
+                border-radius: 12rpx;
+                border: 2rpx solid #E2E2E2;
+                overflow: hidden
+                display: flex
+                flex-direction: column
+                &.file-border
+                    border: 2rpx solid #4A90E2;
+                    background: #F5F9FF;
+                .file-del
+                    position: absolute
+                    right: 25rpx
+                    top: 18rpx
+                    z-index: 9
+                    border-radius: 50%
+                    display: flex
+                    align-items: center
+                    justify-content: center
+                    transform: translate(50%, -10rpx)
+                    height: 40rpx
+                    width: 37rpx;
+                    height: 37rpx;
+                    background: #4B4B4B;
+                    border: 2rpx solid #FFFFFF;
+                .file-del:active
+                    background: #e8e8e8
+                .filename-text
+                    overflow: hidden
+                    text-overflow: ellipsis
+                    white-space: nowrap
+                    color: #333333
+                    font-size: 24rpx
+                    font-weight: 500
+                    max-width: 100%
+                .filename-size
+                    overflow: hidden
+                    text-overflow: ellipsis
+                    white-space: nowrap
+                    color: #7B7B7B;
+                    max-width: 100%
+                .file-thumbnail
+                    flex: 1
+                    display: flex
+                    align-items: center
+                    justify-content: center
+                    overflow: hidden
+                    border-radius: 10rpx 10rpx 0 0
+                    background: #F8F9FA
+                .file-iconImg
+                    height: 100%
+                    width: 100%
+                    object-fit: cover
+                .file-info
+                    padding: 12rpx 16rpx
+                    background: white
+                    border-top: 1rpx solid #F0F0F0
+                .file-type-tag
+                    font-size: 20rpx
+                    color: #4A90E2
+                    background: #F0F7FF
+                    padding: 4rpx 8rpx
+                    border-radius: 4rpx
+                .image-loading, .image-error
+                    position: absolute
+                    top: 0
+                    left: 0
+                    right: 0
+                    bottom: 0
+                    display: flex
+                    flex-direction: column
+                    align-items: center
+                    justify-content: center
+                    background: rgba(255, 255, 255, 0.9)
+                .loading-text, .error-text
+                    font-size: 24rpx
+                    margin-top: 10rpx
+                .loading-text
+                    color: #999
+                .error-text
+                    color: #ff4444
+                .retry-text
+                    font-size: 22rpx
+                    color: #4A90E2
+                    margin-top: 5rpx
+                    text-decoration: underline
+                .image-count-badge
+                    position: absolute
+                    top: 10rpx
+                    right: 10rpx
+                    background: rgba(0, 0, 0, 0.6)
+                    color: white
+                    font-size: 20rpx
+                    padding: 4rpx 8rpx
+                    border-radius: 12rpx
+                    z-index: 2
+                .filerow
+                    display: flex
+                    align-items: center
+                    margin-top: 7rpx
+                    .row-x
+                        margin: 0 18rpx
+                        height: 20rpx
+                        width: 2rpx
+                        background: rgba(226, 226, 226, .9)
+            .file-border
+                width: 160rpx !important;
+
+/* 更美观的loading动画 - 兼容H5和小程序 */
+@keyframes ai-loading-dots {
+    0%, 20%, 80%, 100% {
+        transform: scale(1);
+        opacity: 0.6;
+    }
+    40% {
+        transform: scale(1.2);
+        opacity: 1;
+    }
+}
+
+/* 重置默认样式 */
+.ai-loading {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    gap: 8rpx;
+    width: auto;
+    height: auto;
+    background: transparent;
+    border: none;
+    border-radius: 0;
+    padding: 0;
+    margin: 0;
+}
+
+/* 三个点的样式 - 使用标准CSS语法，不使用嵌套 */
+.ai-loading view {
+    display: inline-block;
+    width: 12rpx;
+    height: 12rpx;
+    border-radius: 50%;
+    background-color: #256BFA;
+    animation: ai-loading-dots 1.4s ease-in-out infinite both;
+    margin: 0;
+    padding: 0;
+}
+
+/* 为每个点设置不同的动画延迟 */
+.ai-loading view:nth-child(1) {
+    animation-delay: -0.32s;
+}
+
+.ai-loading view:nth-child(2) {
+    animation-delay: -0.16s;
+}
+
+.ai-loading view:nth-child(3) {
+    animation-delay: 0s;
+}
+
+/* Tab切换样式 */
+.tab-container {
+    display: flex;
+    background: #FFFFFF;
+    border-bottom: 2rpx solid #F4F4F4;
+    padding: 0 44rpx;
+    height: 88rpx;
+    align-items: center;
+    z-index: 10;
+}
+
+.tab-item {
+    flex: 1;
+    text-align: center;
+    font-size: 28rpx;
+    font-weight: 500;
+    color: #666666;
+    line-height: 88rpx;
+    height: 88rpx;
+    position: relative;
+    transition: all 0.3s ease;
+}
+
+.tab-item.active {
+    color: #256BFA;
+    font-weight: bold;
+}
+
+.tab-item.active::after {
+    content: '';
+    position: absolute;
+    bottom: 0;
+    left: 50%;
+    transform: translateX(-50%);
+    width: 60rpx;
+    height: 4rpx;
+    background: #256BFA;
+    border-radius: 2rpx;
+}
+
+.tab-item:active {
+    background-color: #F5F5F5;
+}
+
+/* 选择模式样式 */
+.select-mode-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 44rpx;
+    height: 88rpx;
+    background: #FFFFFF;
+    border-bottom: 2rpx solid #F4F4F4;
+    z-index: 10;
+}
+
+.select-header-left {
+    display: flex;
+    align-items: center;
+    gap: 24rpx;
+}
+
+.select-count {
+    font-size: 28rpx;
+    color: #333333;
+    font-weight: 500;
+}
+
+.select-all {
+    font-size: 28rpx;
+    color: #256BFA;
+    font-weight: 500;
+}
+
+.select-header-right {
+    display: flex;
+    align-items: center;
+    gap: 32rpx;
+}
+
+.cancel-btn {
+    font-size: 28rpx;
+    color: #666666;
+    font-weight: 500;
+}
+
+.delete-btn {
+    font-size: 28rpx;
+    color: #FF4444;
+    font-weight: 500;
+}
+
+.delete-btn:disabled {
+    color: #CCCCCC;
+}
+
+/* 消息选择框样式 */
+.message-checkbox {
+    margin-right: 12rpx;
+    display: flex;
+    align-items: flex-start;
+    padding-top: 8rpx;
+}
+
+.checkbox {
+    width: 40rpx;
+    height: 40rpx;
+    border: 2rpx solid #CCCCCC;
+    border-radius: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.checkbox.checked {
+    background-color: #256BFA;
+    border-color: #256BFA;
+}
+
+/* 调整消息项布局，为选择框留出空间 */
+.chat-item {
+    position: relative;
+}
+
+.chat-item .message {
+    flex: 1;
+}
+</style>
diff --git a/pages/chat/components/fileIcon.vue b/packageA/pages/chat/components/fileIcon.vue
similarity index 100%
rename from pages/chat/components/fileIcon.vue
rename to packageA/pages/chat/components/fileIcon.vue
diff --git a/pages/chat/components/fileText.vue b/packageA/pages/chat/components/fileText.vue
similarity index 100%
rename from pages/chat/components/fileText.vue
rename to packageA/pages/chat/components/fileText.vue
diff --git a/pages/chat/components/popupbadFeeback.vue b/packageA/pages/chat/components/popupbadFeeback.vue
similarity index 100%
rename from pages/chat/components/popupbadFeeback.vue
rename to packageA/pages/chat/components/popupbadFeeback.vue
diff --git a/pages/complete-info/company-info.vue b/packageA/pages/complete-info/company-info.vue
similarity index 92%
rename from pages/complete-info/company-info.vue
rename to packageA/pages/complete-info/company-info.vue
index f9a1dc2..5112c96 100644
--- a/pages/complete-info/company-info.vue
+++ b/packageA/pages/complete-info/company-info.vue
@@ -23,13 +23,16 @@
                 <!-- 统一社会信用代码 -->
                 <view class="form-item">
                     <view class="label">统一社会信用代码</view>
-                    <input 
-                        class="input-field" 
-                        v-model="formData.socialCreditCode" 
-                        placeholder="请输入统一社会信用代码"
-                        maxlength="18"
-                        @input="updateCompletion"
-                    />
+                    <view class="input-with-button">
+                        <input 
+                            class="input-field" 
+                            v-model="formData.socialCreditCode" 
+                            placeholder="请输入统一社会信用代码"
+                            maxlength="18"
+                            @input="updateCompletion"
+                        />
+                        <button class="query-button" @click="queryCompanyByCreditCode">查询</button>
+                    </view>
                 </view>
                 
                 <!-- 企业注册地点 -->
@@ -600,6 +603,42 @@ const cancel = () => {
     uni.navigateBack()
 }
 
+// 根据社会信用代码查询企业信息
+const queryCompanyByCreditCode = async () => {
+    const creditCode = formData.socialCreditCode.trim()
+    if (!creditCode) {
+        $api.msg('请输入统一社会信用代码')
+        return
+    }
+    
+    uni.showLoading({ title: '查询中...' })
+    
+    try {
+        const response = await $api.createRequest('/app/company/queryCodeCompany', { code: creditCode }, 'get')
+        uni.hideLoading()
+        
+        if (response.code === 200 && response.data) {
+            const companyData = response.data
+            // 回显企业信息到表单
+            if (companyData.name) formData.companyName = companyData.name
+            if (companyData.location) formData.registeredAddress = companyData.location
+            if (companyData.description) formData.companyIntro = companyData.description
+            if (companyData.nature) formData.nature = companyData.nature
+            if (companyData.registeredAddress) formData.registeredAddress = companyData.registeredAddress
+            if (companyData.legalPerson) formData.legalPersonName = companyData.legalPerson
+            // 其他字段根据接口返回的数据结构进行映射
+            updateCompletion()
+            $api.msg('企业信息查询成功')
+        } else {
+            $api.msg('未查询到企业信息')
+        }
+    } catch (error) {
+        uni.hideLoading()
+        $api.msg('查询失败，请重试')
+        console.error('查询企业信息失败:', error)
+    }
+}
+
 // 确认提交
 const confirm = () => {
     // 验证必填字段
@@ -837,6 +876,25 @@ defineExpose({
             font-size: 28rpx
             line-height: 1.4
     
+    .input-with-button
+        flex: 1
+        display: flex
+        align-items: center
+        gap: 16rpx
+        
+        .query-button
+            padding: 8rpx 16rpx
+            background: #256BFA
+            color: #fff
+            font-size: 20rpx
+            border-radius: 6rpx
+            border: none
+            min-width: 100rpx
+            text-align: center
+            
+            &:active
+                background: #1a5cd9
+    
     .input-con
         flex: 1
         font-size: 28rpx
diff --git a/pages/complete-info/complete-info.vue b/packageA/pages/complete-info/complete-info.vue
similarity index 99%
rename from pages/complete-info/complete-info.vue
rename to packageA/pages/complete-info/complete-info.vue
index 88bcf8a..13fdd4c 100644
--- a/pages/complete-info/complete-info.vue
+++ b/packageA/pages/complete-info/complete-info.vue
@@ -364,7 +364,7 @@ const changeSkillName = (index) => {
     state.currentEditingSkillIndex = index;
     // 跳转到技能查询页面
     uni.navigateTo({
-        url: `/pages/complete-info/skill-search?selected=${encodeURIComponent(JSON.stringify([]))}`
+        url: `/packageA/pages/complete-info/skill-search?selected=${encodeURIComponent(JSON.stringify([]))}`
     });
 };
 
diff --git a/pages/complete-info/components/map-location-picker.vue b/packageA/pages/complete-info/components/map-location-picker.vue
similarity index 100%
rename from pages/complete-info/components/map-location-picker.vue
rename to packageA/pages/complete-info/components/map-location-picker.vue
diff --git a/pages/complete-info/skill-search.vue b/packageA/pages/complete-info/skill-search.vue
similarity index 100%
rename from pages/complete-info/skill-search.vue
rename to packageA/pages/complete-info/skill-search.vue
diff --git a/packageA/pages/exhibitors/exhibitors.vue b/packageA/pages/exhibitors/exhibitors.vue
index cedbc34..f8b2124 100644
--- a/packageA/pages/exhibitors/exhibitors.vue
+++ b/packageA/pages/exhibitors/exhibitors.vue
@@ -62,11 +62,12 @@
 				<image class="expand-img" :class="{ 'expand-img-active': !isExpanded }" src="@/static/icon/downs.png">
 				</image>
 			</view>
-			<scroll-view scroll-y class="Detailscroll-view">
-				<view class="views">
-					<view class="Detail-title">
+		<scroll-view scroll-y class="Detailscroll-view">
+			<view class="views">
+				<view class="Detail-title">
 						<text class="title">参会单位（{{ companyList.length }}）</text>
-					</view>
+				</view>
+        <view v-if="isCompanyUser">
 					<view v-for="job in companyList" :key="job.id">
 						<view class="cards" :style="getItemBackgroundStyle('bj.png')"
 							@click="navTo('/packageA/pages/UnitDetails/UnitDetails?job='+JSON.stringify(job))">
@@ -100,8 +101,71 @@
 							</view>
 						</view>
 					</view>
-				</view>
-			</scroll-view>
+        </view>
+        <view v-else>
+            <view class="detail-box">
+              <view class="" v-for="(item1, index1) in companyList" :key="index1">
+                <view class="company-header1">
+                  <view class="left">
+                    <image
+                      :src="`${baseUrl}/jobfair/gs.png`"
+                      alt=""
+                      class="company-icon"
+                    />
+                    <text class="name1">{{ item1.companyName }}</text>
+                    <!-- <div class="header-detail">企业详情 ></div> -->
+                  </view>
+                </view>
+                <view
+                  class="detail-item"
+                  v-for="(job, index) in item1.jobInfoList"
+                  :key="index"
+                >
+                  <view class="gw">
+                    <text>{{ job.jobTitle }}</text>
+                    <view v-if="job.minSalary && job.maxSalary" class="salary">
+                      {{ job.minSalary }}-{{ job.maxSalary }}元
+                    </view>
+                  </view>
+                  <view class="bottom">
+                    <view class="tag">
+                      <view class="tag-item">{{ job.industry }}</view>
+                      <view class="tag-item success">{{ job.scale }}</view>
+                    </view>
+                  </view>
+
+                  <view class="name">
+                    <!-- 应聘状态（1已投递、2已邀请面试、3已录用、4不录用） -->
+                    <view class="status" v-if="job.jobFairPersonJob?.status">
+                      <text
+                        :style="{
+                          color: getStatusText(job.jobFairPersonJob?.status)
+                            .color,
+                        }"
+                        >{{
+                          getStatusText(job.jobFairPersonJob?.status).text
+                        }}</text
+                      >
+                    </view>
+                    <view v-else class="btn">
+                      <button
+                        plain
+                        :disabled="deliveringJobs[job.jobId]"
+                        style="color: #1685f7; border-color: #1685f7"
+                        @click="deliverResume(job)"
+                      >
+                        {{
+                          deliveringJobs[job.jobId] ? "投递中..." : "简历投递"
+                        }}
+                      </button>
+                    </view>
+                  </view>
+                </view>
+              </view>
+            </view>
+        </view>
+			</view>
+		</scroll-view>
 		</view>
 		<template #footer>
 			<view class="footer" v-if="hasnext">
@@ -150,630 +214,871 @@
 		latitudeVal
 	} = storeToRefs(useLocationStore());
 
-	const isExpanded = ref(false);
-	const fairInfo = ref({});
-	const companyList = ref([]);
-	const hasnext = ref(true);
-	const userInfo = ref({});
-	const signDialogisshow = ref(false)
-	// 弹窗
-	const signType = ref(1);
-	// person个人   ent企业
-	const signRole = ref('ent');
-	const CompanySignPopup = ref(null)
-	// 报名loading状态
-	const isLoading = ref(false)
+const isExpanded = ref(false);
+const fairInfo = ref({});
+const companyList = ref([]);
+const hasnext = ref(true);
+const userInfo = ref({});
+const signDialogisshow = ref(false);
+// 弹窗
+const signType = ref(1);
+// person个人   ent企业
+const signRole = ref("ent");
+const CompanySignPopup = ref(null);
+// 报名loading状态
+const isLoading = ref(false);
 
-	const jobFairId = ref(null)
+const jobFairId = ref(null);
+const isCompanyUser = ref(false);
+isCompanyUser.value = uni.getStorageSync("userInfo")?.isCompanyUser == 0;
+// 获取状态文本
+const getStatusText = (status) => {
+  switch (status) {
+    case "1":
+      return {
+        text: "已投递",
+        color: "#2aa553",
+      };
+    case "2":
+      return {
+        text: "已邀请面试",
+        color: "#409EFF",
+      };
+    case "3":
+      return {
+        text: "已录用",
+        color: "#67C23A",
+      };
+    case "4":
+      return {
+        text: "不录用",
+        color: "#F56C6C",
+      };
+    default:
+      return {
+        text: "未知状态",
+        color: "#2aa553",
+      };
+  }
+};
+const deliveringJobs = reactive({});
+// 岗位投递
+function deliverResume(job) {
+  uni.showModal({
+    title: "提示",
+    content: "请确认是否投递简历？",
+    showCancel: true,
+    confirmText: "确定",
+    cancelText: "取消",
+    success: (res) => {
+      if (res.confirm) {
+        if (deliveringJobs[job.jobId]) return;
+        deliveringJobs[job.jobId] = true;
+        const raw = uni.getStorageSync("Padmin-Token");
+        const token = typeof raw === "string" ? raw.trim() : "";
+        const headers = token? { Authorization: raw.startsWith("Bearer ") ? raw: `Bearer ${token}`,}: {};
 
-	const baseUrl = config.imgBaseUrl
-	const getItemBackgroundStyle = (imageName) => ({
-		backgroundImage: `url(${baseUrl}/jobfair/${imageName})`,
-		backgroundSize: '100% 100%', // 覆盖整个容器
-		backgroundPosition: 'center', // 居中
-		backgroundRepeat: 'no-repeat'
-	});
-	onLoad((options) => {
-		jobFairId.value=options.jobFairId
-		const raw = uni.getStorageSync("Padmin-Token");
-		const token = typeof raw === "string" ? raw.trim() : "";
-		const headers = token ? {
-			Authorization: raw.startsWith("Bearer ") ? raw : `Bearer ${token}`
-		} : {};
+        $api.myRequest("/dashboard/auth/heart", {}, "POST", 10100, headers).then((resData1) => {
+            if (resData1.code == 200) {
+              $api.myRequest(
+                  "/system/user/login/user/info",
+                  {},
+                  "GET",
+                  10100,
+                  headers
+                )
+                .then((resData) => {
+                  $api.myRequest(
+                      "/jobfair/public/job-fair-person-job/insert",
+                      {
+                        jobFairId: job.jobFairId, // 招聘会id
+                        personId: resData.info.userId, // 当前登录用户id
+                        enterpriseId: job.companyId, // 企业id
+                        jobId: job.jobId, // 岗位id
+                        idCard: resData.info.personCardNo,
+                      },
+                      "post",
+                      9100,
+                      {
+                        "Content-Type": "application/json",
+                      }
+                    )
+                    .then((data) => {
+                      if (data && data.code === 200) {
+                        $api.msg("简历投递成功");
+                        if (!job.jobFairPersonJob) {
+                          job.jobFairPersonJob = {};
+                        }
+                        job.jobFairPersonJob.status = "1";
+                        getCompanyInfo(userInfo.value.info.userId, jobFairId.value);
+                      } else {
+                        $api.msg((data && data.msg) || "简历投递失败");
+                      }
+                      deliveringJobs[job.jobId] = false;
+                    });
+                });
+            } else {
+              $api.msg("请先登录");
+              deliveringJobs[job.jobId] = false;
+            }
+          })
+          .catch(() => {
+            deliveringJobs[job.jobId] = false;
+          });
+      }
+    },
+  });
+}
+const baseUrl = config.imgBaseUrl;
+const getItemBackgroundStyle = (imageName) => ({
+  backgroundImage: `url(${baseUrl}/jobfair/${imageName})`,
+  backgroundSize: "100% 100%", // 覆盖整个容器
+  backgroundPosition: "center", // 居中
+  backgroundRepeat: "no-repeat",
+});
+onLoad((options) => {
+  jobFairId.value = options.jobFairId;
+  const raw = uni.getStorageSync("Padmin-Token");
+  const token = typeof raw === "string" ? raw.trim() : "";
+  const headers = token
+    ? {
+        Authorization: raw.startsWith("Bearer ") ? raw : `Bearer ${token}`,
+      }
+    : {};
 
-		$api.myRequest("/dashboard/auth/heart", {}, "POST", 10100, headers).then((resData) => {
-			if (resData.code == 200) {
-				$api.myRequest("/system/user/login/user/info", {}, "GET", 10100, {
-					Authorization: `Bearer ${uni.getStorageSync("Padmin-Token")}`
-				}).then((userinfo) => {
-					userInfo.value = userinfo
-					getCompanyInfo(userInfo.value.info.userId, options.jobFairId);
-				});
-			} else {
-				getCompanyInfo('', options.jobFairId);
-			}
-		});
-	});
+  $api
+    .myRequest("/dashboard/auth/heart", {}, "POST", 10100, headers)
+    .then((resData) => {
+      if (resData.code == 200) {
+        $api
+          .myRequest("/system/user/login/user/info", {}, "GET", 10100, {
+            Authorization: `Bearer ${uni.getStorageSync("Padmin-Token")}`,
+          })
+          .then((userinfo) => {
+            userInfo.value = userinfo;
+            getCompanyInfo(userInfo.value.info.userId, options.jobFairId);
+          });
+      } else {
+        getCompanyInfo("", options.jobFairId);
+      }
+    });
+});
 
-	function closePopup() {
-		CompanySignPopup.value.close()
-		getCompanyInfo(userInfo.value.info.userId, jobFairId.value)
-	}
+function closePopup() {
+  CompanySignPopup.value.close();
+  getCompanyInfo(userInfo.value.info.userId, jobFairId.value);
+}
 
-	function getCompanyInfo(userId, id) {
-		let data={}
-		if (userInfo.value&&userInfo.value.userType == 'ent') {
-			data={
-				jobFairId: id,
-				enterpriseId: userId,
-				code:userInfo.value.info.entCreditCode
-			}
-		}else if(userInfo.value&&userInfo.value.userType == 'ent'){
-			data={
-				jobFairId: id,
-				personId: userId,
-				idCard:userInfo.value.info.personCardNo
-			}
-		}else{
-			data={
-				jobFairId: id,
-				personId: userId
-			}
-		}
-		$api.myRequest('/jobfair/public/jobfair/detail', data).then((resData) => {
-			fairInfo.value = resData.data;
-		});
-		$api.myRequest('/jobfair/public/jobfair/enterprises-with-jobs-by-job-fair-id', {
-			jobFairId: id
-		}).then((resData) => {
-			companyList.value = resData.data;
-		});
-	};
+function getCompanyInfo(userId, id) {
+  let data = {};
+  if (userInfo.value && userInfo.value.userType == "ent") {
+    data = {
+      jobFairId: id,
+      enterpriseId: userId,
+      code: userInfo.value.info.entCreditCode,
+    };
+  } else if (userInfo.value && userInfo.value.userType == "ent") {
+    data = {
+      jobFairId: id,
+      personId: userId,
+      idCard: userInfo.value.info.personCardNo,
+    };
+  } else {
+    data = {
+      jobFairId: id,
+      personId: userId,
+    };
+  }
+  $api.myRequest("/jobfair/public/jobfair/detail", data).then((resData) => {
+    fairInfo.value = resData.data;
+  });
+  $api
+    .myRequest("/jobfair/public/jobfair/enterprises-with-jobs-by-job-fair-id", {
+      personId: userInfo.value?.info?.userId,
+      jobFairId: jobFairId.value,
+    })
+    .then((resData) => {
+      if(resData.code == 200){
+        companyList.value = resData.data;
+      }
+    });
+}
 
-	const hasAppointment = () => {
-		const isTimePassed = (timeStr) => {
-			const targetTime = new Date(timeStr.replace(/-/g, '/')).getTime(); // 兼容格式
-			const now = Date.now();
-			return now < targetTime;
-		};
+const hasAppointment = () => {
+  const isTimePassed = (timeStr) => {
+    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.startTime);
+};
 
-	function openMap(lat, lng, name = '位置') {
-		const isConfirmed = window.confirm('是否打开地图查看位置？');
-		if (!isConfirmed) return;
+function openMap(lat, lng, name = "位置") {
+  const isConfirmed = window.confirm("是否打开地图查看位置？");
+  if (!isConfirmed) return;
 
-		// 使用高德地图或百度地图的 H5 链接打开
-		const url = `https://uri.amap.com/marker?position=${lng},${lat}&name=${encodeURIComponent(name)}`;
-		window.location.href = url;
-	}
+  // 使用高德地图或百度地图的 H5 链接打开
+  const url = `https://uri.amap.com/marker?position=${lng},${lat}&name=${encodeURIComponent(
+    name
+  )}`;
+  window.location.href = url;
+}
 
-	function expand() {
-		isExpanded.value = !isExpanded.value;
-	}
+function expand() {
+  isExpanded.value = !isExpanded.value;
+}
 
-	// 报名招聘会
-	function applyExhibitors() {
-		if (isLoading.value) return
-		if (fairInfo.value.isSignUp == 1) {
-			$api.msg('请勿重复报名');
-			return
-		}
-		const raw = uni.getStorageSync("Padmin-Token");
-		const token = typeof raw === "string" ? raw.trim() : "";
-		const headers = token ? {
-			Authorization: raw.startsWith("Bearer ") ? raw : `Bearer ${token}`
-		} : {};
-		isLoading.value = true
+// 报名招聘会
+function applyExhibitors() {
+  if (isLoading.value) return;
+  if (fairInfo.value.isSignUp == 1) {
+    $api.msg("请勿重复报名");
+    return;
+  }
+  const raw = uni.getStorageSync("Padmin-Token");
+  const token = typeof raw === "string" ? raw.trim() : "";
+  const headers = token
+    ? {
+        Authorization: raw.startsWith("Bearer ") ? raw : `Bearer ${token}`,
+      }
+    : {};
+  isLoading.value = true;
 
-		$api.myRequest("/dashboard/auth/heart", {}, "POST", 10100, headers).then((resData) => {
-			if (resData.code == 200) {
-				if (userInfo.value.userType == 'ent') {
-					// 企业
-					signType.value = fairInfo.value.jobFairType;
-					signRole.value = userInfo.userType;
-					signDialogisshow.value = true
-					CompanySignPopup.value.open()
-					isLoading.value = false
-				}else{
-					$api.myRequest("/jobfair/public/job-fair-sign-up-person/sign-up", {
-						personId: userInfo.value.info.userId,
-						  jobFairId: jobFairId.value,
-						  idCard:userInfo.value.info.personCardNo
-					}, "POST", 9100, { "Content-Type": "application/json",...headers }).then((res) => {
-						if (res.code === 200) {
-							uni.showToast({
-								title: '报名成功',
-								icon: 'success'
-							});
-							fairInfo.value.isSignUp = 1;
-							getCompanyInfo(userInfo.value.info.userId, jobFairId.value);
-						} else {
-							uni.showToast({
-								title: res.msg || '报名失败',
-								icon: 'none'
-							});
-						}
-						isLoading.value = false
-					})
-					
-				}
-			} else {
-				$api.msg('请先登录');
-				// setTimeout(() => {
-				// 	uni.redirectTo({
-				// 		url: '/packageB/login'
-				// 	})
-				// }, 1000)
-				isLoading.value = false
-			}
-		}).catch(() => {
-			isLoading.value = false
-		});
-	}
+  $api
+    .myRequest("/dashboard/auth/heart", {}, "POST", 10100, headers)
+    .then((resData) => {
+      if (resData.code == 200) {
+        if (userInfo.value.userType == "ent") {
+          // 企业
+          signType.value = fairInfo.value.jobFairType;
+          signRole.value = userInfo.userType;
+          signDialogisshow.value = true;
+          CompanySignPopup.value.open();
+          isLoading.value = false;
+        } else {
+          $api
+            .myRequest(
+              "/jobfair/public/job-fair-sign-up-person/sign-up",
+              {
+                personId: userInfo.value.info.userId,
+                jobFairId: jobFairId.value,
+                idCard: userInfo.value.info.personCardNo,
+              },
+              "POST",
+              9100,
+              { "Content-Type": "application/json", ...headers }
+            )
+            .then((res) => {
+              if (res.code === 200) {
+                uni.showToast({
+                  title: "报名成功",
+                  icon: "success",
+                });
+                fairInfo.value.isSignUp = 1;
+                getCompanyInfo(userInfo.value.info.userId, jobFairId.value);
+              } else {
+                uni.showToast({
+                  title: res.msg || "报名失败",
+                  icon: "none",
+                });
+              }
+              isLoading.value = false;
+            });
+        }
+      } else {
+        $api.msg("请先登录");
+        // setTimeout(() => {
+        // 	uni.redirectTo({
+        // 		url: '/packageB/login'
+        // 	})
+        // }, 1000)
+        isLoading.value = false;
+      }
+    })
+    .catch(() => {
+      isLoading.value = false;
+    });
+}
 
-	function parseDateTime(datetimeStr) {
-		if (!datetimeStr) return {
-			time: '',
-			date: ''
-		};
+function parseDateTime(datetimeStr) {
+  if (!datetimeStr)
+    return {
+      time: "",
+      date: "",
+    };
 
-		const dateObj = new Date(datetimeStr);
+  const dateObj = new Date(datetimeStr);
 
-		if (isNaN(dateObj.getTime())) return {
-			time: '',
-			date: ''
-		}; // 无效时间
+  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');
+  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}日`,
-		};
-	}
+  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);
+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 = '开始中';
-		let color = '#13C57C'; // 进行中 - 绿色
-		if (now < startTime) {
-			status = 2; // 待开始
-			statusText = '待开始';
-			color = '#015EEA'; // 未开始 - 蓝色
-		} else if (now > endTime) {
-			status = 1; // 已过期
-			statusText = '已过期';
-			color = '#999999'; // 已过期 - 灰色
-		} else {
-			status = 0; // 进行中
-			statusText = '进行中';
-			color = '#13C57C'; // 进行中 - 绿色
-		}
-		return {
-			status, // 0: 进行中，1: 已过期，2: 待开始
-			statusText,
-			color
-		};
-	}
+  // 判断状态：0 开始中，1 过期，2 待开始
+  let status = 0;
+  let statusText = "开始中";
+  let color = "#13C57C"; // 进行中 - 绿色
+  if (now < startTime) {
+    status = 2; // 待开始
+    statusText = "待开始";
+    color = "#015EEA"; // 未开始 - 蓝色
+  } else if (now > endTime) {
+    status = 1; // 已过期
+    statusText = "已过期";
+    color = "#999999"; // 已过期 - 灰色
+  } else {
+    status = 0; // 进行中
+    statusText = "进行中";
+    color = "#13C57C"; // 进行中 - 绿色
+  }
+  return {
+    status, // 0: 进行中，1: 已过期，2: 待开始
+    statusText,
+    color,
+  };
+}
 
-	function getHoursBetween(startTimeStr, endTimeStr) {
-		const start = new Date(startTimeStr);
-		const end = new Date(endTimeStr);
+function getHoursBetween(startTimeStr, endTimeStr) {
+  const start = new Date(startTimeStr);
+  const end = new Date(endTimeStr);
 
-		const diffMs = end - start;
-		const diffHours = diffMs / (1000 * 60 * 60);
+  const diffMs = end - start;
+  const diffHours = diffMs / (1000 * 60 * 60);
 
-		return +diffHours.toFixed(2); // 保留 2 位小数
-	}
+  return +diffHours.toFixed(2); // 保留 2 位小数
+}
 </script>
 
-<style lang="stylus" scoped>
-	.popup-content {
-		width: 90vw;
-		height: 80vh;
-		position: relative;
-	}
+<style lang="scss" scoped>
+.popup-content {
+  width: 90vw;
+  height: 80vh;
+  position: relative;
+}
 
-	.btnback {
-		width: 64rpx;
-		height: 64rpx;
-	}
+.btnback {
+  width: 64rpx;
+  height: 64rpx;
+}
 
-	.btn {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		width: 52rpx;
-		height: 52rpx;
-	}
+.btn {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 52rpx;
+  height: 52rpx;
+}
 
-	image {
-		height: 100%;
-		width: 100%;
-	}
+image {
+  height: 100%;
+  width: 100%;
+}
 
-	.content {
-		height: 100%;
-		display: flex;
-		flex-direction: column;
+.content {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
 
-		.content-top {
-			padding: 28rpx;
-			padding-top: 50rpx;
-			display: flex;
-			flex-direction: row;
-			flex-wrap: nowrap;
+  .content-top {
+    padding: 28rpx;
+    padding-top: 50rpx;
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
 
-			.companyinfo-left {
-				width: 96rpx;
-				height: 96rpx;
-				margin-right: 24rpx;
-			}
+    .companyinfo-left {
+      width: 96rpx;
+      height: 96rpx;
+      margin-right: 24rpx;
+    }
 
-			.companyinfo-right {
-				flex: 1;
+    .companyinfo-right {
+      flex: 1;
 
-				.row1 {
-					font-weight: 500;
-					font-size: 32rpx;
-					color: #333333;
-					font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
-				}
+      .row1 {
+        font-weight: 500;
+        font-size: 32rpx;
+        color: #333333;
+        font-family: "PingFangSC-Medium", "PingFang SC", "Helvetica Neue",
+          Helvetica, Arial, "Microsoft YaHei", sans-serif;
+      }
 
-				.row2 {
-					font-weight: 400;
-					font-size: 28rpx;
-					color: #6C7282;
-					line-height: 45rpx;
-					display: flex;
-					justify-content: space-between;
-				}
-			}
-		}
+      .row2 {
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #6c7282;
+        line-height: 45rpx;
+        display: flex;
+        justify-content: space-between;
+      }
+    }
+  }
 
-		.locations {
-			padding: 0 28rpx;
-			height: 86rpx;
+  .locations {
+    padding: 0 28rpx;
+    height: 86rpx;
 
-			position: relative;
-			margin-bottom: 36rpx;
+    position: relative;
+    margin-bottom: 36rpx;
 
-			.location-img {
-				border-radius: 8rpx 8rpx 8rpx 8rpx;
-				border: 2rpx solid #EFEFEF;
-			}
+    .location-img {
+      border-radius: 8rpx 8rpx 8rpx 8rpx;
+      border: 2rpx solid #efefef;
+    }
 
-			.location-info {
-				position: absolute;
+    .location-info {
+      position: absolute;
 
-				top: 0;
-				left: 0;
-				width: 100%;
-				height: 100%;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 100%;
 
-				.info {
-					padding: 0 60rpx;
-					height: 100%;
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-					white-space: nowrap;
+      .info {
+        padding: 0 60rpx;
+        height: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        white-space: nowrap;
 
-					.info-title {
-						font-weight: 600;
-						font-size: 28rpx;
-						color: #333333;
-					}
+        .info-title {
+          font-weight: 600;
+          font-size: 28rpx;
+          color: #333333;
+        }
 
-					.info-text {
-						font-weight: 400;
-						font-size: 28rpx;
-						color: #9B9B9B;
-						position: relative;
-						padding-right: 20rpx
-					}
+        .info-text {
+          font-weight: 400;
+          font-size: 28rpx;
+          color: #9b9b9b;
+          position: relative;
+          padding-right: 20rpx;
+        }
 
-					.info-text::before {
-						position: absolute;
-						right: 0;
-						top: 50%;
-						content: '';
-						width: 4rpx;
-						height: 16rpx;
-						border-radius: 2rpx;
-						background: #9B9B9B;
-						transform: translate(0, -75%) rotate(-45deg)
-					}
+        .info-text::before {
+          position: absolute;
+          right: 0;
+          top: 50%;
+          content: "";
+          width: 4rpx;
+          height: 16rpx;
+          border-radius: 2rpx;
+          background: #9b9b9b;
+          transform: translate(0, -75%) rotate(-45deg);
+        }
 
-					.info-text::after {
-						position: absolute;
-						right: 0;
-						top: 50%;
-						content: '';
-						width: 4rpx;
-						height: 16rpx;
-						border-radius: 2rpx;
-						background: #9B9B9B;
-						transform: translate(0, -25%) rotate(45deg)
-					}
+        .info-text::after {
+          position: absolute;
+          right: 0;
+          top: 50%;
+          content: "";
+          width: 4rpx;
+          height: 16rpx;
+          border-radius: 2rpx;
+          background: #9b9b9b;
+          transform: translate(0, -25%) rotate(45deg);
+        }
+      }
+    }
+  }
 
-				}
-			}
-		}
+  .conetent-info {
+    padding: 0 28rpx;
+    overflow: hidden;
+    max-height: 0rpx;
+    transition: max-height 0.3s ease;
 
-		.conetent-info {
-			padding: 0 28rpx;
-			overflow: hidden;
-			max-height: 0rpx;
-			transition: max-height 0.3s ease;
+    .info-title {
+      font-weight: 600;
+      font-size: 28rpx;
+      color: #000000;
+    }
 
-			.info-title {
-				font-weight: 600;
-				font-size: 28rpx;
-				color: #000000;
-			}
+    .info-desirption {
+      margin-top: 12rpx;
+      font-weight: 400;
+      font-size: 28rpx;
+      color: #495265;
+      text-align: justify;
+    }
 
-			.info-desirption {
-				margin-top: 12rpx;
-				font-weight: 400;
-				font-size: 28rpx;
-				color: #495265;
-				text-align: justify;
-			}
+    .title2 {
+      margin-top: 48rpx;
+    }
+  }
 
-			.title2 {
-				margin-top: 48rpx
-			}
-		}
+  .company-times {
+    padding-top: 40rpx;
 
-		.company-times {
-			padding-top: 40rpx;
+    .info-title {
+      font-weight: 600;
+      font-size: 28rpx;
+      color: #000000;
+    }
+  }
 
-			.info-title {
-				font-weight: 600;
-				font-size: 28rpx;
-				color: #000000;
-			}
-		}
+  .expanded {
+    max-height: 1000rpx; // 足够显示完整内容
+  }
 
-		.expanded {
-			max-height: 1000rpx; // 足够显示完整内容
-		}
+  .expand {
+    display: flex;
+    flex-wrap: nowrap;
+    white-space: nowrap;
+    justify-content: center;
+    margin-bottom: 46rpx;
+    font-weight: 400;
+    font-size: 28rpx;
+    color: #256bfa;
 
-		.expand {
-			display: flex;
-			flex-wrap: nowrap;
-			white-space: nowrap;
-			justify-content: center;
-			margin-bottom: 46rpx;
-			font-weight: 400;
-			font-size: 28rpx;
-			color: #256BFA;
+    .expand-img {
+      width: 40rpx;
+      height: 40rpx;
+    }
 
-			.expand-img {
-				width: 40rpx;
-				height: 40rpx;
-			}
+    .expand-img-active {
+      transform: rotate(180deg);
+    }
+  }
+}
 
-			.expand-img-active {
-				transform: rotate(180deg)
-			}
-		}
-	}
+.Detailscroll-view {
+  flex: 1;
+  overflow: hidden;
+  background: #f4f4f4;
 
-	.Detailscroll-view {
-		flex: 1;
-		overflow: hidden;
-		background: #F4F4F4;
+  .views {
+    padding: 28rpx;
 
-		.views {
-			padding: 28rpx;
+    .Detail-title {
+      font-weight: 600;
+      font-size: 32rpx;
+      color: #000000;
+      position: relative;
 
-			.Detail-title {
-				font-weight: 600;
-				font-size: 32rpx;
-				color: #000000;
-				position: relative;
+      display: flex;
+      justify-content: space-between;
 
-				display: flex;
-				justify-content: space-between;
+      .title {
+        position: relative;
+        z-index: 2;
+      }
+    }
 
-				.title {
-					position: relative;
-					z-index: 2;
-				}
-			}
+    .Detail-title::before {
+      position: absolute;
+      content: "";
+      left: -14rpx;
+      bottom: 0;
+      height: 16rpx;
+      width: 108rpx;
+      background: linear-gradient(to right, #cbdeff, #ffffff);
+      border-radius: 8rpx;
+      z-index: 1;
+    }
 
-			.Detail-title::before {
-				position: absolute;
-				content: '';
-				left: -14rpx;
-				bottom: 0;
-				height: 16rpx;
-				width: 108rpx;
-				background: linear-gradient(to right, #CBDEFF, #FFFFFF);
-				border-radius: 8rpx;
-				z-index: 1;
-			}
+    .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;
 
-			.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;
 
-				.card-company {
-					display: flex;
-					justify-content: space-between;
-					align-items: flex-start;
+        .company {
+          font-weight: 600;
+          font-size: 32rpx;
+          color: #333333;
+          display: flex;
+          align-items: center;
 
-					.company {
-						font-weight: 600;
-						font-size: 32rpx;
-						color: #333333;
-						display: flex;
-						align-items: center;
+          image {
+            width: 30rpx;
+            height: 30rpx;
+            margin-right: 10rpx;
+          }
+        }
 
-						image {
-							width: 30rpx;
-							height: 30rpx;
-							margin-right: 10rpx;
+        .salary {
+          font-weight: 500;
+          font-size: 28rpx;
+          white-space: nowrap;
+          line-height: 48rpx;
+        }
 
-						}
-					}
+        .ris {
+          background: #53acff;
+          color: #fff;
+          padding: 7rpx 20rpx;
+          border-radius: 8rpx;
+        }
+      }
 
-					.salary {
-						font-weight: 500;
-						font-size: 28rpx;
-						white-space: nowrap;
-						line-height: 48rpx;
-					}
+      .card-companyName {
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #6c7282;
+      }
 
-					.ris {
-						background: #53ACFF;
-						color: #fff;
-						padding: 7rpx 20rpx;
-						border-radius: 8rpx;
-					}
-				}
+      .card-tags {
+        display: flex;
+        flex-wrap: wrap;
 
-				.card-companyName {
-					font-weight: 400;
-					font-size: 28rpx;
-					color: #6C7282;
-				}
+        .tag {
+          width: fit-content;
+          height: 30rpx;
+          background: #e0f0ff;
+          border-radius: 4rpx;
+          padding: 6rpx 26rpx;
+          line-height: 30rpx;
+          font-weight: 400;
+          font-size: 24rpx;
+          color: #595959;
+          text-align: center;
+          margin-top: 14rpx;
+          white-space: nowrap;
+          display: flex;
+          align-items: center;
+          margin-right: 20rpx;
 
-				.card-tags {
-					display: flex;
-					flex-wrap: wrap;
+          image {
+            width: 22rpx;
+            height: 22rpx;
+            margin-right: 8rpx;
+          }
+        }
+      }
 
-					.tag {
-						width: fit-content;
-						height: 30rpx;
-						background: #E0F0FF;
-						border-radius: 4rpx;
-						padding: 6rpx 26rpx;
-						line-height: 30rpx;
-						font-weight: 400;
-						font-size: 24rpx;
-						color: #595959;
-						text-align: center;
-						margin-top: 14rpx;
-						white-space: nowrap;
-						display: flex;
-						align-items: center;
-						margin-right: 20rpx;
+      .card-bottom {
+        margin-top: 15rpx;
+        display: flex;
+        justify-content: space-between;
+        font-size: 28rpx;
+        color: #6c7282;
+      }
+    }
 
-						image {
-							width: 22rpx;
-							height: 22rpx;
-							margin-right: 8rpx;
-						}
-					}
-				}
+    .detail-box {
+      padding-top: 20rpx;
+      box-sizing: border-box;
+      .company-header1 {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        margin-top: 12px;
+        .name1 {
+          font-weight: 600;
+          margin-right: 12px;
+          font-size: 18px;
+        }
+        .company-icon {
+          width: 20px;
+          height: 20px;
+          margin-right: 15px;
+        }
+        .left {
+          display: flex;
+          align-items: center;
+          .header-detail {
+            background: #5599ff;
+            border-radius: 18px;
+            padding: 2px 16px;
+            color: #fff;
+            font-size: 14px;
+          }
+        }
+        .icon {
+          margin-right: 6px;
+          color: #409eff;
+        }
+        .booth-no {
+          color: #909399;
+        }
+      }
 
-				.card-bottom {
-					margin-top: 15rpx;
-					display: flex;
-					justify-content: space-between;
-					font-size: 28rpx;
-					color: #6C7282;
-				}
-			}
-		}
-	}
+      .detail-item {
+        margin-top: 16rpx;
+        background: linear-gradient(to bottom, #deecff 0%, #ffffff 100%);
+        box-shadow: 0 0 10rpx rgba(0, 95, 169, 0.19);
+        border-radius: 12rpx;
+        border: 2rpx solid #ffffff;
+        padding: 30rpx;
+      }
 
-	.card-times {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 24rpx 30rpx 10rpx 30rpx;
+      .name {
+        font-size: 32rpx;
+        font-weight: 600;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+				margin-top: 10rpx;
 
-		.time-left,
-		.time-right {
-			text-align: center;
+        .status {
+          width: 160rpx;
+          text-align: center;
+          margin-left: 24rpx;
+          font-size: 24rpx;
+          background-size: 100% 100%;
+          font-weight: 600;
+          padding: 6rpx 0;
+          margin: 18rpx 0;
+        }
+        .btn {
+          width: 100%;
+          display: flex;
+          align-items: center;
+          justify-content: flex-end;
 
-			.left-date {
-				font-weight: 500;
-				font-size: 48rpx;
-				color: #333333;
-			}
+          button {
+            margin: 10rpx;
+            font-size: 24rpx;
+          }
+        }
+      }
 
-			.left-dateDay {
-				font-weight: 400;
-				font-size: 24rpx;
-				color: #333333;
-				margin-top: 12rpx;
-			}
-		}
+      .bottom {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        flex-wrap: wrap;
 
-		.line {
-			width: 40rpx;
-			height: 0rpx;
-			border: 2rpx solid #D4D4D4;
-			margin-top: 64rpx;
-		}
+        .tag {
+          width: 100%;
+          display: flex;
+          align-items: center;
+          gap: 16rpx;
+          flex-wrap: wrap;
 
-		.time-center {
-			text-align: center;
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
+          .tag-item {
+            padding: 6rpx 30rpx;
+            border-radius: 6rpx;
+            background-color: #e5f1ff;
+            color: #589bff;
+            font-size: 28rpx;
 
-			.center-date {
-				font-weight: 400;
-				font-size: 28rpx;
-				color: #FF881A;
-			}
+            &.success {
+              background-color: #e6f8eb;
+              color: #21aa5b;
+            }
+          }
+        }
+      }
 
-			.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;
-			}
-		}
-	}
+      .gw {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        color: #1477f1;
+        font-weight: 600;
+        font-size: 30rpx;
+      }
+    }
+  }
+}
 
-	.footer {
-		background: #FFFFFF;
-		box-shadow: 0rpx -4rpx 24rpx 0rpx rgba(11, 44, 112, 0.12);
-		border-radius: 0rpx 0rpx 0rpx 0rpx;
+.card-times {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 24rpx 30rpx 10rpx 30rpx;
 
-		padding: 40rpx 28rpx 20rpx 28rpx;
+  .time-left,
+  .time-right {
+    text-align: center;
 
-		.btn-wq {
-			height: 90rpx;
-			background: #256BFA;
-			border-radius: 12rpx 12rpx 12rpx 12rpx;
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #FFFFFF;
-			text-align: center;
-			line-height: 90rpx
-		}
+    .left-date {
+      font-weight: 500;
+      font-size: 48rpx;
+      color: #333333;
+    }
 
-		.btn-desbel {
-			background: #6697FB;
-			box-shadow: 0rpx -4rpx 24rpx 0rpx rgba(11, 44, 112, 0.12);
-		}
-	}
+    .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;
+    }
+
+    .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;
+    }
+  }
+}
+
+.footer {
+  background: #ffffff;
+  box-shadow: 0rpx -4rpx 24rpx 0rpx rgba(11, 44, 112, 0.12);
+  border-radius: 0rpx 0rpx 0rpx 0rpx;
+
+  padding: 40rpx 28rpx 20rpx 28rpx;
+
+  .btn-wq {
+    height: 90rpx;
+    background: #256bfa;
+    border-radius: 12rpx 12rpx 12rpx 12rpx;
+    font-weight: 500;
+    font-size: 32rpx;
+    color: #ffffff;
+    text-align: center;
+    line-height: 90rpx;
+  }
+
+  .btn-desbel {
+    background: #6697fb;
+    box-shadow: 0rpx -4rpx 24rpx 0rpx rgba(11, 44, 112, 0.12);
+  }
+}
 </style>
\ No newline at end of file
diff --git a/pages/job/companySearch.vue b/packageA/pages/job/companySearch.vue
similarity index 100%
rename from pages/job/companySearch.vue
rename to packageA/pages/job/companySearch.vue
diff --git a/pages/job/publishJob.vue b/packageA/pages/job/publishJob.vue
similarity index 93%
rename from pages/job/publishJob.vue
rename to packageA/pages/job/publishJob.vue
index 5cc13dc..d373ace 100644
--- a/pages/job/publishJob.vue
+++ b/packageA/pages/job/publishJob.vue
@@ -50,9 +50,11 @@
                     <view class="label">最小薪资 (元/月)</view>
                     <input 
                         class="input" 
-                        placeholder="请输入最小薪资" 
+                        placeholder="请输入最小薪资（最低2000元）"
                         type="number"
                         v-model="formData.minSalary"
+                        @input="handleMinSalaryInput"
+                        @blur="handleMinSalaryBlur"
                     />
                 </view>
                 <view class="form-group">
@@ -76,6 +78,18 @@
                         <view class="picker-text" data-placeholder="请选择学历要求">{{ selectedEducation || '请选择学历要求' }}</view>
                     </picker>
                 </view>
+                <view class="form-group">
+                    <view class="label">人员类型</view>
+                    <picker 
+                        mode="selector" 
+                        :range="staffTypes" 
+                        range-key="label"
+                        @change="onStaffTypeChange"
+                        class="picker"
+                    >
+                        <view class="picker-text" data-placeholder="请选择人员类型">{{ selectedStaffType || '请选择人员类型' }}</view>
+                    </picker>
+                </view>
                 <view class="form-group">
                     <view class="label">工作经验</view>
                     <picker 
@@ -273,7 +287,7 @@
 </template>
 
 <script setup>
-import { ref, reactive, onMounted, onUnmounted } from 'vue';
+import { ref, reactive, onMounted, onUnmounted, watch } from 'vue';
 import { onShow } from '@dcloudio/uni-app';
 import { storeToRefs } from 'pinia';
 import { createRequest } from '@/utils/request';
@@ -302,6 +316,7 @@ const formData = reactive({
     jobLocationAreaCode: '', // 新增：工作地点区县字典代码
     education: '', // 新增：学历要求字典值
     experience: '', // 新增：工作经验字典值
+    staffType: '', // 新增：人员类型
     images: [], // 新增：岗位图片
     contacts: [
         {
@@ -324,6 +339,7 @@ const experienceLevels = ref([]);
 const workDistricts = ref([]);
 const workLocations = ref([]);
 const jobCategories = ref([]); // 新增：岗位分类选项
+const staffTypes = ref([]); // 新增：人员类型选项
 
 // 选中的值
 const selectedEducation = ref('');
@@ -333,6 +349,7 @@ const selectedWorkLocation = ref('');
 const selectedJobCategory = ref('');
 const selectedJobTypeLabel = ref(''); // 新增：岗位类型显示文本
 const selectedJobTypeIds = ref(''); // 新增：岗位类型ID（多个用逗号分隔）
+const selectedStaffType = ref(''); // 新增：人员类型显示文本
 
 // 滚动视图高度
 const scrollViewHeight = ref('calc(100vh - 200rpx)');
@@ -378,6 +395,15 @@ onShow(() => {
     getCompanyInfo();
 });
 
+// 监听最小薪资变化
+watch(() => formData.minSalary, (newValue) => {
+    console.log('minSalary changed to:', newValue);
+    if (newValue && parseFloat(newValue) < 2000) {
+        console.log('setting minSalary to 2000 via watch');
+        formData.minSalary = '2000';
+    }
+});
+
 // 获取企业信息（参考首页方法）
 const getCompanyInfo = () => {
     try {
@@ -451,6 +477,11 @@ const initFormData = async () => {
         }
         console.log('岗位分类选项:', jobCategories.value);
         
+        // 设置人员类型选项 - 从字典获取 staffType
+        const staffTypeDict = await dictStore.getDictSelectOption('staff_type');
+        console.log('从字典获取的人员类型数据:', staffTypeDict);
+        staffTypes.value = staffTypeDict;
+        
         // 设置企业ID（从用户信息获取）
         if (userStore.userInfo && userStore.userInfo.id) {
             formData.companyId = userStore.userInfo.id;
@@ -512,6 +543,14 @@ const onJobCategoryChange = (e) => {
     formData.type = selectedItem.value; // 岗位分类保存到type字段
 };
 
+// 新增：人员类型选择器change事件
+const onStaffTypeChange = (e) => {
+    const index = e.detail.value;
+    const selectedItem = staffTypes.value[index];
+    selectedStaffType.value = selectedItem.label;
+    formData.staffType = selectedItem.value; // 人员类型保存到staffType字段
+};
+
 // 打开岗位类型选择器
 const openJobTypeSelector = () => {
     if (!jobTypeSelector.value) return;
@@ -676,6 +715,32 @@ const handleCompanySelected = (company) => {
     formData.companyId = company.id;
 };
 
+// 处理最小薪资输入
+const handleMinSalaryInput = (e) => {
+    let value = e.detail.value;
+    if (value && parseFloat(value) < 2000) {
+        formData.minSalary = '2000';
+        uni.showToast({
+            title: '最小薪资最低为2000元',
+            icon: 'none'
+        });
+    }
+};
+
+// 处理最小薪资失去焦点
+const handleMinSalaryBlur = () => {
+    console.log('blur event triggered');
+    console.log('current minSalary:', formData.minSalary);
+    let value = formData.minSalary;
+    if (value && parseFloat(value) < 2000) {
+        console.log('setting minSalary to 2000');
+        formData.minSalary = '2000';
+        uni.showToast({
+            title: '最小薪资最低为2000元',
+            icon: 'none'
+        });
+    }
+};
 
 // 发布岗位
 const publishJob = async () => {
@@ -706,6 +771,7 @@ const publishJob = async () => {
             jobCategory: formData.jobCategory, // 岗位类型
             companyId: formData.companyId,
             companyName: formData.companyName,
+            staffType: formData.staffType, // 新增：人员类型
             jobContactList: formData.contacts.filter(contact => contact.name.trim() && contact.phone.trim()).map(contact => ({
                 contactPerson: contact.name,
                 contactPersonPhone: contact.phone,
@@ -760,6 +826,7 @@ const validateForm = () => {
         { field: 'minSalary', message: '请输入最小薪资' },
         { field: 'maxSalary', message: '请输入最大薪资' },
         { field: 'education', message: '请选择学历要求' },
+        { field: 'staffType', message: '请选择人员类型' },
         { field: 'experience', message: '请选择工作经验' },
         { field: 'jobLocation', message: '请选择工作地点' },
         { field: 'jobLocationAreaCode', message: '请选择工作区县' },
@@ -794,6 +861,14 @@ const validateForm = () => {
     const minSalary = parseFloat(formData.minSalary);
     const maxSalary = parseFloat(formData.maxSalary);
     
+    if (minSalary < 2000) {
+        uni.showToast({
+            title: '最小薪资最低为2000元',
+            icon: 'none'
+        });
+        return false;
+    }
+    
     if (minSalary >= maxSalary) {
         uni.showToast({
             title: '最大薪资必须大于最小薪资',
diff --git a/pages/nearby/components/four.vue b/packageA/pages/nearby/components/four.vue
similarity index 99%
rename from pages/nearby/components/four.vue
rename to packageA/pages/nearby/components/four.vue
index 7fd0921..43fed3e 100644
--- a/pages/nearby/components/four.vue
+++ b/packageA/pages/nearby/components/four.vue
@@ -120,7 +120,7 @@ const rangeOptions = ref([
     { value: 0, text: '推荐' },
     { value: 1, text: '最热' },
     { value: 2, text: '最新发布' },
-    { value: 3, text: '疆外' },
+    // { value: 3, text: '疆外' },
 ]);
 
 function choosePosition(index) {
diff --git a/pages/nearby/components/one.vue b/packageA/pages/nearby/components/one.vue
similarity index 99%
rename from pages/nearby/components/one.vue
rename to packageA/pages/nearby/components/one.vue
index cc7277c..7958740 100644
--- a/pages/nearby/components/one.vue
+++ b/packageA/pages/nearby/components/one.vue
@@ -160,7 +160,7 @@ const rangeOptions = ref([
     { value: 0, text: '推荐' },
     { value: 1, text: '最热' },
     { value: 2, text: '最新发布' },
-    { value: 3, text: '疆外' },
+    // { value: 3, text: '疆外' },
 ]);
 
 function changeRangeShow() {
diff --git a/pages/nearby/components/three.vue b/packageA/pages/nearby/components/three.vue
similarity index 94%
rename from pages/nearby/components/three.vue
rename to packageA/pages/nearby/components/three.vue
index 1126a62..58ff43d 100644
--- a/pages/nearby/components/three.vue
+++ b/packageA/pages/nearby/components/three.vue
@@ -110,6 +110,10 @@
         </scroll-view>
         <!-- 筛选 -->
         <select-filter ref="selectFilterModel"></select-filter>
+        
+        <!-- #ifdef MP-WEIXIN -->
+        <selectPopup ref="selectPopupRef"></selectPopup>
+        <!-- #endif -->
     </view>
 </template>
 
@@ -117,7 +121,28 @@
 import { reactive, inject, watch, ref, onMounted, onBeforeUnmount } from 'vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
 const { $api, navTo, debounce, customSystem } = inject('globalFunction');
-const openSelectPopup = inject('openSelectPopup');
+// #ifdef H5
+const injectedOpenSelectPopup = inject('openSelectPopup', null);
+// #endif
+
+// #ifdef MP-WEIXIN
+const selectPopupRef = ref();
+// #endif
+
+// 创建本地的 openSelectPopup 函数，兼容 H5 和微信小程序
+const openSelectPopup = (config) => {
+    // #ifdef MP-WEIXIN
+    if (selectPopupRef.value) {
+        selectPopupRef.value.open(config);
+    }
+    // #endif
+
+    // #ifdef H5
+    if (injectedOpenSelectPopup) {
+        injectedOpenSelectPopup(config);
+    }
+    // #endif
+};
 import { storeToRefs } from 'pinia';
 import useLocationStore from '@/stores/useLocationStore';
 import useUserStore from '@/stores/useUserStore';
@@ -128,6 +153,9 @@ const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
 import point2 from '@/static/icon/point2.png';
 import LocationPng from '@/static/icon/Location.png';
 import selectFilter from '@/components/selectFilter/selectFilter.vue';
+// #ifdef MP-WEIXIN
+import selectPopup from '@/components/selectPopup/selectPopup.vue';
+// #endif
 const emit = defineEmits(['onFilter']);
 // status
 const showFiltersubway = ref(false);
@@ -162,7 +190,7 @@ const rangeOptions = ref([
     { value: 0, text: '推荐' },
     { value: 1, text: '最热' },
     { value: 2, text: '最新发布' },
-    { value: 3, text: '疆外' },
+    // { value: 3, text: '疆外' },
 ]);
 onLoad(() => {
     getSubway();
@@ -205,18 +233,21 @@ function openFilter() {
 }
 
 function openFilterSubway() {
+    showFiltersubway.value = true;
     const diti = state.subwayList.map((item) => ({ ...item, label: item.lineName, value: item.lineId }));
     openSelectPopup({
         title: '地铁',
         maskClick: true,
         data: [diti],
         success: (_, [value]) => {
+            showFiltersubway.value = false;
+            if (!value) return;
             subwayCurrent.value = value;
             state.subwayId = value.value;
             state.value = value.value;
             const points = value.subwayStationList;
             state.downup = true;
-            if (points.length) {
+            if (points && points.length) {
                 state.dont = 0;
                 state.dontObj = points[0];
                 state.subwayStart = points[0];
@@ -224,6 +255,9 @@ function openFilterSubway() {
                 getJobList('refresh');
             }
         },
+        cancel: () => {
+            showFiltersubway.value = false;
+        },
     });
 }
 
@@ -251,8 +285,8 @@ function selectSubwayStation(point, index) {
 
 function inputText(id) {
     if (id) {
-        const text = range.value.filter((item) => item.value === id)[0].text;
-        return text;
+        const foundItem = range.value.filter((item) => item.value === id)[0];
+        return foundItem ? foundItem.text : '';
     } else {
         return '';
     }
@@ -260,13 +294,15 @@ function inputText(id) {
 
 function bindPickerChange(e) {
     const lineId = range.value[e.detail.value];
+    if (!lineId) return;
     const value = state.subwayList.filter((iv) => iv.lineId === lineId.value)[0];
+    if (!value) return;
     subwayCurrent.value = value;
     state.value = e.detail.value;
     state.subwayId = value.lineId;
     const points = value.subwayStationList;
     state.downup = true;
-    if (points.length) {
+    if (points && points.length) {
         state.dont = 0;
         state.dontObj = points[0];
         state.subwayStart = points[0];
diff --git a/pages/nearby/components/two.vue b/packageA/pages/nearby/components/two.vue
similarity index 99%
rename from pages/nearby/components/two.vue
rename to packageA/pages/nearby/components/two.vue
index 616c11e..7943a22 100644
--- a/pages/nearby/components/two.vue
+++ b/packageA/pages/nearby/components/two.vue
@@ -134,7 +134,7 @@ const rangeOptions = ref([
     { value: 0, text: '推荐' },
     { value: 1, text: '最热' },
     { value: 2, text: '最新发布' },
-    { value: 3, text: '疆外' },
+    // { value: 3, text: '疆外' },
 ]);
 
 function choosePosition(index) {
diff --git a/pages/nearby/nearby.vue b/packageA/pages/nearby/nearby.vue
similarity index 100%
rename from pages/nearby/nearby.vue
rename to packageA/pages/nearby/nearby.vue
diff --git a/packageA/pages/personalInfo/personalInfo.vue b/packageA/pages/personalInfo/personalInfo.vue
index 12ed6c8..d700d7e 100644
--- a/packageA/pages/personalInfo/personalInfo.vue
+++ b/packageA/pages/personalInfo/personalInfo.vue
@@ -472,7 +472,7 @@ function changeSkillName(index) {
     // 将当前已选中的技能名称传递给查询页面
     const selectedSkills = state.skills.map(skill => skill.name).filter(name => name);
     uni.navigateTo({
-        url: `/pages/complete-info/skill-search?selected=${encodeURIComponent(JSON.stringify(selectedSkills))}`
+        url: `/packageA/pages/complete-info/skill-search?selected=${encodeURIComponent(JSON.stringify(selectedSkills))}`
     });
 }
 
@@ -698,7 +698,7 @@ const changePoliticalAffiliation = () => {
 };
 
 
-function generateDatePickerArrays(startYear = 1975, endYear = new Date().getFullYear()) {
+function generateDatePickerArrays(startYear = 1950, endYear = new Date().getFullYear()) {
     const years = [];
     const months = [];
     const days = [];
diff --git a/packageA/pages/post/component/radarMap.vue b/packageA/pages/post/component/radarMap.vue
index 012a53f..2cfa317 100644
--- a/packageA/pages/post/component/radarMap.vue
+++ b/packageA/pages/post/component/radarMap.vue
@@ -1,13 +1,12 @@
 <template>
     <view style="display: flex; justify-content: center; padding: 0px 0">
-        <canvas canvas-id="radarCanvas" id="radarCanvas" style="width: 300px; height: 250px"></canvas>
+        <canvas canvas-id="radarCanvas" style="width: 600rpx; height: 500rpx"></canvas>
     </view>
 </template>
 
 <script setup>
 import { reactive, inject, watch, ref, onMounted, computed } from 'vue';
-import { onLoad, onShow } from '@dcloudio/uni-app';
-// const src = ref('');
+import { onReady } from '@dcloudio/uni-app';
 
 const props = defineProps({
     value: {
@@ -41,7 +40,7 @@ function getRadarData() {
 }
 
 // 监听页面初始化
-onMounted(() => {
+onReady(() => {
     // 延迟执行，确保 canvas 已经渲染
     setTimeout(() => {
         const { labels, data } = getRadarData();
@@ -66,12 +65,10 @@ watch(
 
 function rawRadarChart(labels, data) {
     const ctx = uni.createCanvasContext('radarCanvas');
-    const width = 80;
-    const height = 80;
-    const centerX = 150;
-    const centerY = 125;
-    // const data = [2, 3.5, 5, 3.5, 5, 3.5]; // 示例数据
-    // const labels = ['火烧', '泡水', '事故', '外观', '部件', '火烧'];
+    const width = 150;
+    const height = 125;
+    const centerX = 300;
+    const centerY = 250;
     const colors = ['#F5F5F5', '#F5F5F5', '#F5F5F5', '#F5F5F5', '#F5F5F5'];
     const maxScore = 5; // 数据最大值
 
@@ -89,7 +86,6 @@ function rawRadarChart(labels, data) {
     ctx.fill();
 
     //多边形圈
-    // 多边形圈
     for (let i = 5; i > 0; i--) {
         ctx.setStrokeStyle(colors[i - 1]); // 设置边框颜色
         ctx.beginPath();
@@ -106,20 +102,14 @@ function rawRadarChart(labels, data) {
         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);
-
-        ctx.moveTo(x1, y1);
+        ctx.moveTo(centerX, centerY);
+        const x = centerX + width * Math.cos(angleStep * index - Math.PI / 2);
+        const y = centerY + height * Math.sin(angleStep * index - Math.PI / 2);
         ctx.lineTo(x, y);
-
         ctx.closePath();
         ctx.stroke();
     });
@@ -145,15 +135,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); // 半径 4
         ctx.fill();
     });
 
     // 绘制标签
     ctx.setTextAlign('center');
+    ctx.setTextBaseline('middle');
 
     labels.forEach((label, index) => {
         const x = centerX + (width + 30) * Math.cos(angleStep * index - Math.PI / 2);
@@ -162,33 +153,13 @@ function rawRadarChart(labels, data) {
         //标题
         ctx.setFillStyle('#000');
         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>
 
-<style></style>
+<style>
+/* 确保canvas容器有足够的空间 */
+</style>
diff --git a/packageA/pages/post/component/videoPlayer.vue b/packageA/pages/post/component/videoPlayer.vue
index d118dba..862d7eb 100644
--- a/packageA/pages/post/component/videoPlayer.vue
+++ b/packageA/pages/post/component/videoPlayer.vue
@@ -32,9 +32,9 @@
 
         <!-- 控制栏 -->
         <view class="controls">
-            <!--   <text @click="togglePlay">{{ isPlaying ? '暂停' : '播放' }}</text>
-            <text @click="toggleFullScreen">{{ isFullScreen ? '退出全屏' : '全屏' }}</text> -->
-            <text @click="close">关闭</text>
+            <!--   <view class="control-text" @click="togglePlay">{{ isPlaying ? '暂停' : '播放' }}</view>
+            <view class="control-text" @click="toggleFullScreen">{{ isFullScreen ? '退出全屏' : '全屏' }}</view> -->
+            <view class="control-text" @click="close">关闭</view>
         </view>
     </view>
 </template>
@@ -180,7 +180,7 @@ defineExpose({ open });
     justify-content: space-around;
 }
 
-.controls text {
+.controls .control-text {
     color: #fff;
     font-size: 24rpx;
     padding: 8rpx 16rpx;
diff --git a/packageA/pages/post/post.vue b/packageA/pages/post/post.vue
index 16514e1..62ee99b 100644
--- a/packageA/pages/post/post.vue
+++ b/packageA/pages/post/post.vue
@@ -60,6 +60,14 @@
                     <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">
+                    {{ jobInfo.jobAddress || jobInfo.jobLocation || '暂无地址信息' }}
+                </view>
+            </view>
             <view class="content-card">
                 <view class="card-title">
                     <text class="title">职位描述</text>
@@ -90,7 +98,7 @@
                             <view class="contact-label">联系人：</view>
                             <view class="contact-value">{{ contact.contactPerson }}</view>
                         </view>
-                        <view class="contact-info">
+                        <view class="contact-info" v-if="contact.position">
                             <view class="contact-label">职位：</view>
                             <view class="contact-value">{{ contact.position }}</view>
                         </view>
@@ -102,7 +110,7 @@
                 </view>
             </view>
             <!-- 公司信息 -->
-            <view class="content-card">
+            <view class="content-card" v-if="jobInfo.companyId">
                 <view class="card-title">
                     <text class="title">公司信息</text>
                     <text
@@ -127,6 +135,7 @@
                             <span v-if="jobInfo.company?.industry">&nbsp;</span>
                             <dict-Label dictType="scale" :value="jobInfo.company?.scale"></dict-Label>
                         </view>
+
                         <view class="row2">
                             <text>在招</text>
                             <text style="color: #256bfa">{{ companyCount }}</text>
@@ -143,7 +152,7 @@
                     ></map>
                 </view>
             </view>
-            <view class="content-card" v-if="currentUserType !== 0">
+            <view class="content-card jzlfx-card" v-if="currentUserType !== 0">
                 <view class="card-title">
                     <text class="title">竞争力分析</text>
                 </view>
@@ -218,10 +227,22 @@
         <view style="height: 34px"></view>
         <template #footer>
             <view class="footer">
-                <view class="btn-wq button-click" @click="jobApply">投递简历</view>
+                <view class="btn-wq button-click" @click="jobApply">{{ jobInfo.isApply === 1 ? '取消投递简历' : '投递简历' }}</view>
             </view>
         </template>
         <VideoPlayer ref="videoPalyerRef" />
+        
+        <!-- 确认弹窗 -->
+        <view v-if="showConfirmDialog" class="confirm-dialog">
+            <view class="dialog-content">
+                <view class="dialog-title">{{ jobInfo.isApply === 1 ? '确认取消投递' : '确认投递' }}</view>
+                <view class="dialog-message">{{ jobInfo.isApply === 1 ? '确定要取消投递此职位吗？' : '确定要投递此职位吗？' }}</view>
+                <view class="dialog-buttons">
+                    <view class="btn-cancel button-click" @click="hideDialog">取消</view>
+                    <view class="btn-confirm button-click" @click="confirmAction">确认</view>
+                </view>
+            </view>
+        </view>
     </AppLayout>
 </template>
 
@@ -229,7 +250,7 @@
 import point from '@/static/icon/point.png';
 import VideoPlayer from './component/videoPlayer.vue';
 import { reactive, inject, watch, ref, onMounted, computed } from 'vue';
-import { onLoad, onShow, onHide } from '@dcloudio/uni-app';
+import { onLoad, onShow, onHide, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
 import dictLabel from '@/components/dict-Label/dict-Label.vue';
 import RadarMap from './component/radarMap.vue';
 import { storeToRefs } from 'pinia';
@@ -250,6 +271,7 @@ const jobInfo = ref({});
 const state = reactive({});
 const mapCovers = ref([]);
 const jobIdRef = ref();
+const jobId = ref();
 // 竞争力分析数据，初始化为包含默认值的完整结构，确保雷达图能正常渲染
 const raderData = ref({
     matchScore: 0,
@@ -266,12 +288,13 @@ const raderData = ref({
 });
 const videoPalyerRef = ref(null);
 const explainUrlRef = ref('');
+const showConfirmDialog = ref(false);
 
 // 申请人列表直接使用接口返回的applyUsers数组
 
 onLoad((option) => {
 	console.log(option, 'option');
-    if (option.jobId) {
+    if (option.encryptJobId) {
         initLoad(option);
     }
 });
@@ -281,7 +304,7 @@ onShow(() => {
     // #ifdef H5
     try {
         const option = parseQueryParams(); // 兼容微信内置浏览器
-        if (option.jobId) {
+        if (option.encryptJobId) {
             initLoad(option);
         }
     } catch (e) {
@@ -290,10 +313,13 @@ onShow(() => {
     // #endif
 });
 function initLoad(option) {
-    const jobId = decodeURIComponent(option.jobId);
-    if (jobId !== jobIdRef.value) {
-        jobIdRef.value = jobId;
-        getDetail(jobId);
+    const encryptJobId = decodeURIComponent(option.encryptJobId);
+    if (option.jobId) {
+        jobId.value = decodeURIComponent(option.jobId);
+    }
+    if (encryptJobId !== jobIdRef.value) {
+        jobIdRef.value = encryptJobId;
+        getDetail(encryptJobId);
     }
 }
 
@@ -305,17 +331,17 @@ function seeExplain() {
     }
 }
 
-function getDetail(jobId) {
+function getDetail(encryptJobId) {
     return new Promise((reslove, reject) => {
-        $api.createRequest(`/app/job/${jobId}`).then((resData) => {
+        $api.createRequest(`/app/job/${encryptJobId}`).then((resData) => {
             const { latitude, longitude, companyName, companyId } = resData.data;
             jobInfo.value = resData.data;
             reslove(resData.data);
             getCompanyIsAJobs(companyId);
             if (currentUserType.value !== 0) {
-                getCompetivetuveness(jobId);
+                getCompetivetuveness(encryptJobId);
             }
-            // getCompetivetuveness(jobId);
+            // getCompetivetuveness(encryptJobId);
             if (latitude && longitude) {
                 mapCovers.value = [
                     {
@@ -351,14 +377,14 @@ function getCompanyIsAJobs(companyId) {
 }
 
 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; // 计算文字中心点
+    // 在小程序环境中，document 对象不存在，使用估算方法
+    // 简单估算：每个字符大约占 8px 宽度
+    const estimatedWidth = text.length * 8;
+    return -(estimatedWidth / 2) - 20; // 计算文字中心点
 }
 
-function getCompetivetuveness(jobId) {
-    $api.createRequest(`/app/job/competitiveness/${jobId}`, {}, 'GET').then((resData) => {
+function getCompetivetuveness(encryptJobId) {
+    $api.createRequest(`/app/job/competitiveness/${encryptJobId}`, {}, 'GET').then((resData) => {
         // 如果接口返回的数据为 null 或空，使用默认值0
         if (resData && resData.data) {
             // 确保 radarChart 字段存在，如果不存在则使用默认值
@@ -422,37 +448,67 @@ function jobApply() {
         $api.msg('请您先登录');
         return;
     }
-    const jobId = jobInfo.value.jobId;
-    $api.createRequest(`/app/job/apply/${jobId}`, {}, 'GET').then((resData) => {
-            getDetail(jobId);
-            $api.msg('申请成功');
-            const jobUrl = jobInfo.value.jobUrl;
-            // return window.open(jobUrl);
+    // 显示确认弹窗
+    showConfirmDialog.value = true;
+}
+
+// 隐藏弹窗
+function hideDialog() {
+    showConfirmDialog.value = false;
+}
+
+// 确认操作
+function confirmAction() {
+    const encryptJobId = jobIdRef.value;
+    if (jobInfo.value.isApply === 1) {
+        // 取消投递
+        const cancelJobId = jobId.value || jobInfo.value.jobId;
+        $api.createRequest(`/app/job/applyJobCencal`, { jobId: cancelJobId }, 'DELETE').then((resData) => {
+            $api.msg('取消投递成功');
+            getDetail(encryptJobId); // 刷新职位信息
+            showConfirmDialog.value = false;
         });
-    // 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);
-    //     });
-    // }
+    } else {
+        // 确认投递
+        $api.createRequest(`/app/job/apply/${encryptJobId}`, {}, 'GET').then((resData) => {
+            $api.msg('申请成功');
+            getDetail(encryptJobId); // 刷新职位信息
+            showConfirmDialog.value = false;
+        });
+    }
+}
+
+// 确认投递
+function confirmApply() {
+    const encryptJobId = jobIdRef.value;
+    $api.createRequest(`/app/job/apply/${encryptJobId}`, {}, 'GET').then((resData) => {
+        $api.msg('申请成功');
+        const jobUrl = jobInfo.value.jobUrl;
+        // return window.open(jobUrl);
+        showConfirmDialog.value = false;
+    });
+}
+
+// 取消投递
+function cancelApply() {
+    const cancelJobId = jobId.value || jobInfo.value.jobId;
+    $api.createRequest(`/app/job/applyJobCencal`, { jobId: cancelJobId }, 'DELETE').then((resData) => {
+        $api.msg('取消投递成功');
+        showConfirmDialog.value = false;
+    });
 }
 
 // 取消/收藏岗位
 function jobCollection() {
-    const jobId = jobInfo.value.jobId;
+    const encryptJobId = jobIdRef.value;
     if (jobInfo.value.isCollection) {
-        $api.createRequest(`/app/job/collection/${jobId}`, {}, 'DELETE').then((resData) => {
-            getDetail(jobId);
+        $api.createRequest(`/app/job/collection/${encryptJobId}`, {}, 'DELETE').then((resData) => {
+            getDetail(encryptJobId);
             $api.msg('取消收藏成功');
         });
     } else {
-        $api.createRequest(`/app/job/collection/${jobId}`, {}, 'POST').then((resData) => {
-            getDetail(jobId);
+        $api.createRequest(`/app/job/collection/${encryptJobId}`, {}, 'POST').then((resData) => {
+            getDetail(encryptJobId);
             $api.msg('收藏成功');
         });
     }
@@ -524,6 +580,24 @@ function handleCompanyDetailClick() {
         $api.msg('没有企业信息');
     }
 }
+
+// 分享给朋友
+onShareAppMessage(() => {
+    return {
+        title: '喀什智慧就业平台',
+        path: '/pages/index/index',
+        imageUrl: ''
+    };
+});
+
+// 分享到朋友圈
+onShareTimeline(() => {
+    return {
+        title: '喀什智慧就业平台',
+        path: '/pages/index/index',
+        imageUrl: ''
+    };
+});
 </script>
 
 <style lang="stylus" scoped>
@@ -714,9 +788,9 @@ for i in 0..100
     }
 }
 .content{
-    padding: 0 28rpx
     height: 100%
     padding-top: 28rpx
+    padding-bottom: 28rpx
     .content-top{
         box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04);
         border-radius: 20rpx 20rpx 20rpx 20rpx;
@@ -765,7 +839,19 @@ for i in 0..100
             color: #64779F;
             border-bottom-left-radius: 20rpx
         }
+        .publish-time{
+            margin-top: 20rpx
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #999999;
+            text-align: right
+        }
     }
+    /* #ifdef H5 */
+    .jzlfx-card{
+        padding-bottom: 90rpx!important;
+    }
+    /* #endif */
     .content-card{
         padding: 24rpx
         margin-top: 28rpx
@@ -966,4 +1052,70 @@ for i in 0..100
     font-weight: bold;
     color: #333;
 }
+// 确认弹窗样式
+.confirm-dialog {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(0, 0, 0, 0.5);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    z-index: 9999;
+}
+
+.dialog-content {
+    width: 80%;
+    max-width: 500rpx;
+    background-color: #fff;
+    border-radius: 20rpx;
+    padding: 40rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+
+.dialog-title {
+    font-size: 32rpx;
+    font-weight: 600;
+    color: #333;
+    margin-bottom: 30rpx;
+}
+
+.dialog-message {
+    font-size: 28rpx;
+    color: #666;
+    margin-bottom: 40rpx;
+    text-align: center;
+}
+
+.dialog-buttons {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    gap: 20rpx;
+}
+
+.btn-cancel, .btn-confirm {
+    flex: 1;
+    height: 80rpx;
+    border-radius: 12rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 28rpx;
+    font-weight: 500;
+}
+
+.btn-cancel {
+    background-color: #f5f5f5;
+    color: #666;
+}
+
+.btn-confirm {
+    background-color: #256BFA;
+    color: #fff;
+}
 </style>
diff --git a/packageA/pages/selectDate/selectDate.vue b/packageA/pages/selectDate/selectDate.vue
index ff13fc7..bb02342 100644
--- a/packageA/pages/selectDate/selectDate.vue
+++ b/packageA/pages/selectDate/selectDate.vue
@@ -46,12 +46,10 @@
 <script setup>
 import { reactive, inject, watch, ref, onMounted } from 'vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
-const { $api, navTo, navBack } = inject('globalFunction');
+const { $api, navTo, navBack, LunarUtil } = inject('globalFunction');
 const weekMap = ['日', '一', '二', '三', '四', '五', '六'];
 const calendarData = ref([]);
 const current = ref({});
-import lunarModule from '@/packageA/lib/lunar-javascript@1.7.2.js';
-const { Solar, Lunar } = lunarModule;
 
 const isRecord = ref(false);
 const recordNum = ref(4);
@@ -162,12 +160,11 @@ function getMonthCalendarData({ year, month, selectableDates = [] }) {
             const d = prevLastDate - i;
             const prevMonth = month - 1 <= 0 ? 12 : month - 1;
             const prevYear = month - 1 <= 0 ? year - 1 : year;
-            const solar = Solar.fromYmd(prevYear, prevMonth, d);
-            const lunar = Lunar.fromSolar(solar);
+            const nl = LunarUtil.getLunarDayInChinese(prevYear, prevMonth, d);
             const dateStr = `${prevYear}-${String(prevMonth).padStart(2, '0')}-${String(d).padStart(2, '0')}`;
             list.push({
                 day: d,
-                nl: lunar.getDayInChinese(),
+                nl: nl,
                 isThisMonth: false,
                 isToday: dateStr === todayStr,
                 isSelectable: isSelected(prevYear, prevMonth, d),
@@ -179,12 +176,11 @@ function getMonthCalendarData({ year, month, selectableDates = [] }) {
 
     // 当前月天数
     for (let d = 1; d <= lastDate; d++) {
-        const solar = Solar.fromYmd(year, month, d);
-        const lunar = Lunar.fromSolar(solar);
+        const nl = LunarUtil.getLunarDayInChinese(year, month, d);
         const dateStr = `${year}-${String(month).padStart(2, '0')}-${String(d).padStart(2, '0')}`;
         list.push({
             day: d,
-            nl: lunar.getDayInChinese(),
+            nl: nl,
             isThisMonth: true,
             isToday: dateStr === todayStr,
             isSelectable: isSelected(year, month, d),
@@ -199,12 +195,11 @@ function getMonthCalendarData({ year, month, selectableDates = [] }) {
         for (let d = 1; d <= remaining; d++) {
             const nextMonth = month + 1 > 12 ? 1 : month + 1;
             const nextYear = month + 1 > 12 ? year + 1 : year;
-            const solar = Solar.fromYmd(nextYear, nextMonth, d);
-            const lunar = Lunar.fromSolar(solar);
+            const nl = LunarUtil.getLunarDayInChinese(nextYear, nextMonth, d);
             const dateStr = `${nextYear}-${String(nextMonth).padStart(2, '0')}-${String(d).padStart(2, '0')}`;
             list.push({
                 day: d,
-                nl: lunar.getDayInChinese(),
+                nl: nl,
                 isThisMonth: false,
                 isToday: dateStr === todayStr,
                 isSelectable: isSelected(nextYear, nextMonth, d),
diff --git a/packageB/components/map.vue b/packageB/components/map.vue
new file mode 100644
index 0000000..bdf25f9
--- /dev/null
+++ b/packageB/components/map.vue
@@ -0,0 +1,827 @@
+<template>
+    <AppLayout title="选择地址" :showBack="true">
+        <view class="map-container">
+            <!-- 搜索框 -->
+            <!-- <view class="search-box">
+                <view class="search-input-wrapper">
+                    <uni-icons type="search" size="20" color="#999"></uni-icons>
+                    <input 
+                        class="search-input" 
+                        v-model="searchKeyword" 
+                        placeholder="输入关键词搜索地址（支持模糊搜索）"
+                        @input="onSearchInput"
+                        @confirm="searchLocation"
+                    />
+                    <uni-icons 
+                        v-if="searchKeyword" 
+                        type="clear" 
+                        size="18" 
+                        color="#999" 
+                        @click="clearSearch"
+                    ></uni-icons>
+                </view>
+            </view> -->
+            
+            <!-- 搜索结果列表 -->
+            <!-- <view class="search-results" v-if="showSearchResults">
+                <scroll-view scroll-y class="results-scroll" v-if="searchResults.length > 0">
+                    <view 
+                        class="result-item" 
+                        v-for="(item, index) in searchResults" 
+                        :key="index"
+                        @click="selectSearchResult(item)"
+                    >
+                        <view class="result-name">{{ item.name }}</view>
+                        <view class="result-address">{{ item.address }}</view>
+                    </view>
+                </scroll-view>
+                <view class="empty-results" v-else-if="isSearching">
+                    <view class="loading-icon">
+                        <uni-icons type="loop" size="40" color="#999"></uni-icons>
+                    </view>
+                    <text>搜索中...</text>
+                </view>
+                <view class="empty-results" v-else>
+                    <uni-icons type="info" size="40" color="#999"></uni-icons>
+                    <text>未找到相关地址，请尝试其他关键词</text>
+                    <view class="search-tips">
+                        <text class="tip-title">搜索建议：</text>
+                        <text class="tip-item">• 输入具体地址名称</text>
+                        <text class="tip-item">• 输入地标建筑名称</text>
+                        <text class="tip-item">• 输入街道或区域名称</text>
+                    </view>
+                </view>
+            </view> -->
+            
+            <!-- 地图 -->
+            <view class="map-wrapper" v-show="!showSearchResults">
+                <!-- #ifdef H5 -->
+                <view id="amap-container" class="amap-container"></view>
+                <!-- #endif -->
+                
+                <!-- #ifndef H5 -->
+                <map
+                    id="map"
+                    class="map"
+                    :latitude="latitude"
+                    :longitude="longitude"
+                    :markers="markers"
+                    :show-location="true"
+                    @regionchange="onRegionChange"
+                    @tap="onMapTap"
+                >
+                    <!-- <cover-view class="map-center-marker">
+                        <cover-image src="/static/icon/Location.png" class="marker-icon"></cover-image>
+                    </cover-view> -->
+                </map>
+                <!-- #endif -->
+            </view>
+            
+            <!-- 当前位置信息 -->
+            <view class="location-info" v-if="currentAddress && !showSearchResults">
+                <view class="info-title">当前选择位置</view>
+                <view class="info-name">{{ currentAddress.name }}</view>
+                <view class="info-address">{{ currentAddress.address }}</view>
+            </view>
+            
+            <!-- 底部按钮 -->
+            <view class="bottom-actions">
+                <!-- <button class="locate-btn" @click="getCurrentLocation" :disabled="isLocating">
+                    <uni-icons type="location-filled" size="20" color="#256BFA"></uni-icons>
+                    <text>{{ isLocating ? '定位中...' : '定位' }}</text>
+                </button> -->
+                <button class="confirm-btn" @click="confirmLocation">确认选择</button>
+            </view>
+        </view>
+    </AppLayout>
+</template>
+
+<script setup>
+import { ref, inject, onMounted } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+
+const { $api } = inject('globalFunction')
+
+// 搜索相关
+const searchKeyword = ref('')
+const searchResults = ref([])
+const showSearchResults = ref(false)
+const isSearching = ref(false)
+const isLocating = ref(false)
+let searchTimer = null
+
+// 地图相关
+const latitude = ref(39.473651)
+const longitude = ref(76.000311)
+const markers = ref([])
+const currentAddress = ref(null)
+
+// H5地图实例
+let map = null
+let AMap = null
+let geocoder = null
+let placeSearch = null
+
+onLoad((options) => {
+    // 可以接收初始位置参数
+    if (options.location) {
+		let obj=options.location.split(',')
+        latitude.value = parseFloat(obj[1])
+        longitude.value = parseFloat(obj[0])
+    }
+})
+
+onMounted(() => {
+    // #ifdef H5
+    initAmapH5()
+    // #endif
+    
+    // #ifndef H5
+    // 先设置默认位置，避免地图显示空白
+    markers.value = [{
+        id: 1,
+        latitude: latitude.value,
+        longitude: longitude.value,
+        // iconPath: '/static/icon/Location.png',
+        width: 25,
+        height: 30
+    }]
+    
+    // 延迟执行定位，避免页面加载时立即定位失败
+    // setTimeout(() => {
+    //     getCurrentLocation()
+    // }, 1000)
+    // #endif
+})
+
+// H5端初始化高德地图
+const initAmapH5 = () => {
+    // #ifdef H5
+    if (window.AMap) {
+        AMap = window.AMap
+        initMap()
+    } else {
+        const script = document.createElement('script')
+        script.src = 'https://webapi.amap.com/maps?v=2.0&key=9cfc9370bd8a941951da1cea0308e9e3&plugin=AMap.Geocoder,AMap.PlaceSearch'
+        script.onload = () => {
+            AMap = window.AMap
+            initMap()
+        }
+        document.head.appendChild(script)
+    }
+    // #endif
+}
+
+// 初始化地图
+const initMap = () => {
+    // #ifdef H5
+    map = new AMap.Map('amap-container', {
+        zoom: 13,
+        center: [longitude.value, latitude.value],
+        resizeEnable: true
+    })
+    
+    // 创建标记
+    const marker = new AMap.Marker({
+        position: [longitude.value, latitude.value],
+        draggable: true
+    })
+    
+    marker.on('dragend', (e) => {
+        const position = e.target.getPosition()
+        longitude.value = position.lng
+        latitude.value = position.lat
+        reverseGeocode(position.lng, position.lat)
+    })
+    
+    map.add(marker)
+    
+    // 初始化地理编码
+    geocoder = new AMap.Geocoder({
+        city: '全国'
+    })
+    
+    // 初始化地点搜索
+    placeSearch = new AMap.PlaceSearch({
+        city: '全国',
+        pageSize: 10
+    })
+    
+    // 地图点击事件
+    map.on('click', (e) => {
+		debugger
+        const { lng, lat } = e.lnglat
+        longitude.value = lng
+        latitude.value = lat
+        marker.setPosition([lngyy, lat])
+        // reverseGeocode(lng, lat)
+    })
+    
+    // 获取当前位置信息
+    reverseGeocode(longitude.value, latitude.value)
+    // #endif
+}
+
+// 搜索输入
+const onSearchInput = () => {
+    if (searchTimer) {
+        clearTimeout(searchTimer)
+    }
+    
+    if (!searchKeyword.value.trim()) {
+        showSearchResults.value = false
+        searchResults.value = []
+        isSearching.value = false
+        return
+    }
+    
+    showSearchResults.value = true
+    isSearching.value = true
+    
+    searchTimer = setTimeout(() => {
+        if (searchKeyword.value.trim()) {
+            searchLocation()
+        }
+    }, 300) // 优化防抖时间从500ms改为300ms
+}
+
+// 搜索地点
+const searchLocation = () => {
+    if (!searchKeyword.value.trim()) {
+        return
+    }
+    
+    showSearchResults.value = true
+    isSearching.value = true
+    
+    // #ifdef H5
+    if (placeSearch) {
+        placeSearch.search(searchKeyword.value, (status, result) => {
+            isSearching.value = false
+            if (status === 'complete' && result.poiList) {
+                searchResults.value = result.poiList.pois.map(poi => ({
+                    name: poi.name,
+                    address: poi.address || poi.pname + poi.cityname + poi.adname,
+                    location: poi.location,
+                    lng: poi.location.lng,
+                    lat: poi.location.lat
+                }))
+            } else {
+                searchResults.value = []
+            }
+        })
+    }
+    // #endif
+    
+    // #ifndef H5
+    // 小程序端使用uni.request调用高德API
+    uni.request({
+        url: 'https://restapi.amap.com/v3/place/text',
+        data: {
+            key: '9cfc9370bd8a941951da1cea0308e9e3',
+            keywords: searchKeyword.value,
+            city: '全国',
+            offset: 20,
+            citylimit: false, // 不限制城市，支持全国搜索
+            extensions: 'all' // 返回详细信息
+        },
+        success: (res) => {
+            isSearching.value = false
+            console.log('搜索响应:', res.data) // 调试日志
+            
+            if (res.data.status === '1' && res.data.pois && res.data.pois.length > 0) {
+                searchResults.value = res.data.pois.map(poi => {
+                    const [lng, lat] = poi.location.split(',')
+                    return {
+                        name: poi.name,
+                        address: poi.address || `${poi.pname || ''}${poi.cityname || ''}${poi.adname || ''}`,
+                        lng: parseFloat(lng),
+                        lat: parseFloat(lat)
+                    }
+                })
+                console.log('搜索结果:', searchResults.value) // 调试日志
+            } else {
+                // 如果第一次搜索没有结果，尝试更宽泛的搜索
+                if (searchKeyword.value.length > 2) {
+                    tryAlternativeSearch()
+                } else {
+                    searchResults.value = []
+                    console.log('搜索无结果:', res.data) // 调试日志
+                }
+            }
+        },
+        fail: (err) => {
+            isSearching.value = false
+            searchResults.value = []
+            console.error('搜索请求失败:', err) // 调试日志
+            $api.msg('搜索失败，请检查网络连接')
+        }
+    })
+    // #endif
+}
+
+// 备用搜索策略
+const tryAlternativeSearch = () => {
+    // 尝试使用地理编码API搜索
+    uni.request({
+        url: 'https://restapi.amap.com/v3/geocode/geo',
+        data: {
+            key: '9cfc9370bd8a941951da1cea0308e9e3',
+            address: searchKeyword.value,
+            city: '全国'
+        },
+        success: (res) => {
+            isSearching.value = false
+            console.log('备用搜索响应:', res.data) // 调试日志
+            
+            if (res.data.status === '1' && res.data.geocodes && res.data.geocodes.length > 0) {
+                searchResults.value = res.data.geocodes.map(geo => {
+                    const [lng, lat] = geo.location.split(',')
+                    return {
+                        name: geo.formatted_address,
+                        address: geo.formatted_address,
+                        lng: parseFloat(lng),
+                        lat: parseFloat(lat)
+                    }
+                })
+                console.log('备用搜索结果:', searchResults.value) // 调试日志
+            } else {
+                searchResults.value = []
+                console.log('备用搜索也无结果:', res.data) // 调试日志
+            }
+        },
+        fail: (err) => {
+            isSearching.value = false
+            searchResults.value = []
+            console.error('备用搜索失败:', err) // 调试日志
+        }
+    })
+}
+
+// 选择搜索结果
+const selectSearchResult = (item) => {
+    longitude.value = item.lng
+    latitude.value = item.lat
+    currentAddress.value = {
+        name: item.name,
+        address: item.address,
+        longitude: item.lng,
+        latitude: item.lat
+    }
+    
+    // #ifdef H5
+    if (map) {
+        map.setCenter([item.lng, item.lat])
+        const marker = map.getAllOverlays('marker')[0]
+        if (marker) {
+            marker.setPosition([item.lng, item.lat])
+        }
+    }
+    // #endif
+    
+    // #ifndef H5
+    markers.value = [{
+        id: 1,
+        latitude: item.lat,
+        longitude: item.lng,
+        // iconPath: '/static/icon/Location.png',
+        width: 25,
+        height: 30
+    }]
+    // #endif
+    
+    showSearchResults.value = false
+    searchKeyword.value = ''
+}
+
+// 清除搜索
+const clearSearch = () => {
+    searchKeyword.value = ''
+    searchResults.value = []
+    showSearchResults.value = false
+    isSearching.value = false
+    if (searchTimer) {
+        clearTimeout(searchTimer)
+    }
+}
+
+// 逆地理编码（根据坐标获取地址）
+const reverseGeocode = (lng, lat) => {
+    // #ifdef H5
+    if (geocoder) {
+        geocoder.getAddress([lng, lat], (status, result) => {
+            if (status === 'complete' && result.regeocode) {
+                const addressComponent = result.regeocode.addressComponent
+                const formattedAddress = result.regeocode.formattedAddress
+                currentAddress.value = {
+                    name: addressComponent.building || addressComponent.township,
+                    address: formattedAddress,
+                    longitude: lng,
+                    latitude: lat
+                }
+            }
+        })
+    }
+    // #endif
+    
+    // #ifndef H5
+    uni.request({
+        url: 'https://restapi.amap.com/v3/geocode/regeo',
+        data: {
+            key: '9cfc9370bd8a941951da1cea0308e9e3',
+            location: `${lng},${lat}`
+        },
+        success: (res) => {
+            if (res.data.status === '1' && res.data.regeocode) {
+                const addressComponent = res.data.regeocode.addressComponent
+                const formattedAddress = res.data.regeocode.formatted_address
+                currentAddress.value = {
+                    name: addressComponent.building || addressComponent.township || '选择的位置',
+                    address: formattedAddress,
+                    longitude: lng,
+                    latitude: lat
+                }
+            }
+        }
+    })
+    // #endif
+}
+
+// 获取当前定位
+const getCurrentLocation = () => {
+    if (isLocating.value) return // 防止重复定位
+    
+    isLocating.value = true
+    uni.showLoading({ title: '定位中...' })
+    
+    // 先检查定位权限
+    uni.getSetting({
+        success: (settingRes) => {
+            if (settingRes.authSetting['scope.userLocation'] === false) {
+                // 用户拒绝了定位权限，引导用户开启
+                isLocating.value = false
+                uni.hideLoading()
+                uni.showModal({
+                    title: '定位权限',
+                    content: '需要获取您的位置信息来提供更好的服务，请在设置中开启定位权限',
+                    confirmText: '去设置',
+                    success: (modalRes) => {
+                        if (modalRes.confirm) {
+                            uni.openSetting()
+                        }
+                    }
+                })
+                return
+            }
+            
+            // 执行定位
+            uni.getLocation({
+                type: 'gcj02',
+                altitude: false,
+                success: (res) => {
+                    console.log('定位成功:', res) // 调试日志
+                    longitude.value = res.longitude
+                    latitude.value = res.latitude
+                    
+                    // #ifdef H5
+                    if (map) {
+                        map.setCenter([res.longitude, res.latitude])
+                        const marker = map.getAllOverlays('marker')[0]
+                        if (marker) {
+                            marker.setPosition([res.longitude, res.latitude])
+                        }
+                    }
+                    // #endif
+                    
+                    // #ifndef H5
+                    // 更新小程序端标记
+                    markers.value = [{
+                        id: 1,
+                        latitude: res.latitude,
+                        longitude: res.longitude,
+                        // iconPath: '/static/icon/Location.png',
+                        width: 25,
+                        height: 30
+                    }]
+                    // #endif
+                    
+                    reverseGeocode(res.longitude, res.latitude)
+                    uni.hideLoading()
+                    isLocating.value = false
+                },
+                fail: (err) => {
+                    console.error('定位失败:', err) // 调试日志
+                    uni.hideLoading()
+                    isLocating.value = false
+                    
+                    // 根据错误类型给出不同提示
+                    // let errorMsg = '定位失败'
+                    // if (err.errMsg.includes('auth deny')) {
+                    //     errorMsg = '定位权限被拒绝，请在设置中开启'
+                    // } else if (err.errMsg.includes('timeout')) {
+                    //     errorMsg = '定位超时，请重试'
+                    // } else if (err.errMsg.includes('network')) {
+                    //     errorMsg = '网络异常，请检查网络连接'
+                    // }
+                    
+                    // uni.showModal({
+                    //     title: '定位失败',
+                    //     content: errorMsg + '，是否使用默认位置？',
+                    //     confirmText: '使用默认位置',
+                    //     cancelText: '重试',
+                    //     success: (modalRes) => {
+                    //         if (modalRes.confirm) {
+                    //             // 使用默认位置（北京）
+                    //             longitude.value = 116.397428
+                    //             latitude.value = 39.90923
+                    //             reverseGeocode(longitude.value, latitude.value)
+                    //         } else {
+                    //             // 重试定位
+                    //             setTimeout(() => {
+                    //                 getCurrentLocation()
+                    //             }, 2000)
+                    //         }
+                    //     }
+                    // })
+                }
+            })
+        },
+        fail: () => {
+            uni.hideLoading()
+            isLocating.value = false
+            $api.msg('无法获取定位权限设置')
+        }
+    })
+}
+
+// 地图区域变化（小程序端）
+const onRegionChange = (e) => {
+    // #ifndef H5
+    // 只有在用户手动拖动地图结束时才更新位置
+    if (e.type === 'end' && e.causedBy === 'drag') {
+        const mapContext = uni.createMapContext('map')
+        mapContext.getCenterLocation({
+            success: (res) => {
+				// debugger
+                longitude.value = res.longitude
+                latitude.value = res.latitude
+				markers.value = [{
+				    id: 1,
+				    latitude: latitude.value,
+				    longitude: longitude.value,
+				    width: 25,
+				    height: 30
+				}]
+                // reverseGeocode(res.longitude, res.latitude)
+            }
+        })
+    }
+    // #endif
+}
+
+// 地图点击事件（小程序端）
+const onMapTap = (e) => {
+    // #ifndef H5
+    const { latitude: lat, longitude: lng } = e.detail
+    longitude.value = lng
+    latitude.value = lat
+    
+    // 更新标记
+    markers.value = [{
+        id: 1,
+        latitude: lat,
+        longitude: lng,
+        // iconPath: '/static/icon/Location.png',
+        width: 25,
+        height: 30
+    }]
+    
+    reverseGeocode(lng, lat)
+    // #endif
+}
+
+// 确认选择
+const confirmLocation = () => {
+    if (!longitude.value && !latitude.value) {
+        $api.msg('请选择地址')
+        return
+    }
+	if (typeof uni.globalParams === 'object') {
+		uni.globalParams = {
+            longitude: longitude.value,
+            latitude: latitude.value
+        }; // 示例使用全局变量，实际应用中可以根据需要选择使用Vuex等
+	} else {
+		uni.globalParams = {}; // 初始化全局变量
+		uni.globalParams = {
+            longitude: longitude.value,
+            latitude: latitude.value
+        }; // 设置参数
+	}
+	uni.navigateBack({
+		delta: 1 // 返回上一页
+	});
+    
+}
+
+</script>
+
+<style lang="stylus" scoped>
+.map-container
+    width: 100%
+    height: 100vh
+    position: relative
+    display: flex
+    flex-direction: column
+
+.search-box
+    position: absolute
+    top: 20rpx
+    left: 32rpx
+    right: 32rpx
+    z-index: 10
+    
+    .search-input-wrapper
+        background: #fff
+        border-radius: 40rpx
+        padding: 20rpx 30rpx
+        display: flex
+        align-items: center
+        box-shadow: 0 4rpx 12rpx rgba(0,0,0,0.1)
+        
+        .search-input
+            flex: 1
+            margin: 0 20rpx
+            font-size: 28rpx
+            
+        uni-icons
+            flex-shrink: 0
+
+.search-results
+    position: absolute
+    top: 100rpx
+    left: 32rpx
+    right: 32rpx
+    bottom: 180rpx
+    background: #fff
+    border-radius: 20rpx
+    box-shadow: 0 4rpx 12rpx rgba(0,0,0,0.1)
+    z-index: 9
+    overflow: hidden
+    
+    .results-scroll
+        height: 100%
+        
+    .result-item
+        padding: 30rpx
+        border-bottom: 1rpx solid #f0f0f0
+        
+        &:active
+            background: #f5f5f5
+            
+        .result-name
+            font-size: 32rpx
+            color: #333
+            font-weight: 500
+            margin-bottom: 10rpx
+            
+        .result-address
+            font-size: 26rpx
+            color: #999
+    
+    .empty-results
+        height: 100%
+        display: flex
+        flex-direction: column
+        align-items: center
+        justify-content: center
+        color: #999
+        font-size: 28rpx
+        
+        .loading-icon
+            animation: rotate 1s linear infinite
+            margin-bottom: 20rpx
+            
+        uni-icons
+            margin-bottom: 20rpx
+            
+        text
+            padding: 0 60rpx
+            text-align: center
+            line-height: 1.5
+            
+        .search-tips
+            margin-top: 40rpx
+            padding: 0 40rpx
+            
+            .tip-title
+                font-size: 26rpx
+                color: #666
+                font-weight: 500
+                margin-bottom: 20rpx
+                display: block
+                
+            .tip-item
+                font-size: 24rpx
+                color: #999
+                line-height: 1.8
+                display: block
+                margin-bottom: 8rpx
+
+@keyframes rotate
+    from
+        transform: rotate(0deg)
+    to
+        transform: rotate(360deg)
+
+.map-wrapper
+    flex: 1
+    position: relative
+    
+    .map, .amap-container
+        width: 100%
+        height: 80%
+        
+    .map-center-marker
+        position: absolute
+        left: 50%
+        top: 50%
+        transform: translate(-50%, -100%)
+        z-index: 5
+        
+        .marker-icon
+            width: 60rpx
+            height: 80rpx
+
+.location-info
+    position: absolute
+    bottom: 180rpx
+    left: 32rpx
+    right: 32rpx
+    background: #fff
+    border-radius: 20rpx
+    padding: 30rpx
+    box-shadow: 0 -4rpx 12rpx rgba(0,0,0,0.1)
+    z-index: 10
+    
+    .info-title
+        font-size: 24rpx
+        color: #999
+        margin-bottom: 10rpx
+        
+    .info-name
+        font-size: 32rpx
+        color: #333
+        font-weight: 500
+        margin-bottom: 10rpx
+        
+    .info-address
+        font-size: 28rpx
+        color: #666
+
+.bottom-actions
+    position: absolute
+    bottom: 120rpx
+    left: 0
+    right: 0
+    background: #fff
+    padding: 20rpx 32rpx
+    display: flex
+    gap: 20rpx
+    box-shadow: 0 -2rpx 10rpx rgba(0,0,0,0.1)
+    z-index: 11
+    
+    .locate-btn
+        width: 120rpx
+        height: 80rpx
+        background: #fff
+        border: 2rpx solid #256BFA
+        border-radius: 40rpx
+        display: flex
+        flex-direction: column
+        align-items: center
+        justify-content: center
+        font-size: 24rpx
+        color: #256BFA
+        
+        &:disabled
+            opacity: 0.5
+            color: #999
+            border-color: #999
+        
+        text
+            margin-top: 4rpx
+            
+    .confirm-btn
+        flex: 1
+        height: 80rpx
+        background: #256BFA
+        color: #fff
+        border-radius: 40rpx
+        font-size: 32rpx
+        border: none
+
+button::after
+    border: none
+</style>
+
diff --git a/packageB/components/unieditor.vue b/packageB/components/unieditor.vue
new file mode 100644
index 0000000..a65349f
--- /dev/null
+++ b/packageB/components/unieditor.vue
@@ -0,0 +1,562 @@
+<template>
+	<view>
+		<view>
+ 
+			<view class='wrapper'>
+				<view class='toolbar' @tap="format" style="height: 160px;overflow-y: auto;">
+					<view :class="formats.bold ? 'ql-active' : ''" class="iconfont icon-zitijiacu" data-name="bold">
+					</view>
+					<view :class="formats.italic ? 'ql-active' : ''" class="iconfont icon-zitixieti" data-name="italic">
+					</view>
+					<view :class="formats.underline ? 'ql-active' : ''" class="iconfont icon-zitixiahuaxian"
+						data-name="underline"></view>
+					<view :class="formats.strike ? 'ql-active' : ''" class="iconfont icon-zitishanchuxian"
+						data-name="strike"></view>
+					<!-- #ifndef MP-BAIDU -->
+					<view :class="formats.align === 'left' ? 'ql-active' : ''" class="iconfont icon-zuoduiqi"
+						data-name="align" data-value="left"></view>
+					<!-- #endif -->
+					<view :class="formats.align === 'center' ? 'ql-active' : ''" class="iconfont icon-juzhongduiqi"
+						data-name="align" data-value="center"></view>
+					<view :class="formats.align === 'right' ? 'ql-active' : ''" class="iconfont icon-youduiqi"
+						data-name="align" data-value="right"></view>
+					<view :class="formats.align === 'justify' ? 'ql-active' : ''" class="iconfont icon-zuoyouduiqi"
+						data-name="align" data-value="justify"></view>
+					<!-- #ifndef MP-BAIDU -->
+					<view :class="formats.lineHeight ? 'ql-active' : ''" class="iconfont icon-line-height"
+						data-name="lineHeight" data-value="2"></view>
+					<view :class="formats.letterSpacing ? 'ql-active' : ''" class="iconfont icon-Character-Spacing"
+						data-name="letterSpacing" data-value="2em"></view>
+					<view :class="formats.marginTop ? 'ql-active' : ''" class="iconfont icon-722bianjiqi_duanqianju"
+						data-name="marginTop" data-value="20px"></view>
+					<view :class="formats.marginBottom ? 'ql-active' : ''" class="iconfont icon-723bianjiqi_duanhouju"
+						data-name="marginBottom" data-value="20px"></view>
+					<!-- #endif -->
+ 
+					<view class="iconfont icon-clearedformat" @tap="removeFormat"></view>
+ 
+					<!-- #ifndef MP-BAIDU -->
+					<!-- 					<view :class="formats.fontFamily ? 'ql-active' : ''" class="iconfont icon-font"
+					data-name="fontFamily" data-value="Pacifico"></view> -->
+					<view :class="formats.fontSize === '24px' ? 'ql-active' : ''" class="iconfont icon-fontsize" data-name="fontSize" data-value="24px"></view>
+					<!-- #endif -->
+					<view :class="formats.color === '#0000ff' ? 'ql-active' : ''" class="iconfont icon-text_color" data-name="color" data-value="#0000ff"></view>
+					<view :class="formats.backgroundColor === '#00ff00' ? 'ql-active' : ''" class="iconfont icon-fontbgcolor" data-name="backgroundColor" data-value="#00ff00"></view>
+					<view class="iconfont icon-date" @tap="insertDate"></view>
+					<view class="iconfont icon--checklist" data-name="list" data-value="check"></view>
+					<view :class="formats.list === 'ordered' ? 'ql-active' : ''" class="iconfont icon-youxupailie" data-name="list" data-value="ordered"></view>
+					<view :class="formats.list === 'bullet' ? 'ql-active' : ''" class="iconfont icon-wuxupailie" data-name="list" data-value="bullet"></view>
+ 
+					<view class="iconfont icon-undo" @tap="undo"></view>
+					<view class="iconfont icon-redo" @tap="redo"></view>
+ 
+					<view class="iconfont icon-outdent" data-name="indent" data-value="-1"></view>
+					<view class="iconfont icon-indent" data-name="indent" data-value="+1"></view>
+					<view class="iconfont icon-fengexian" @tap="insertDivider"></view>
+					<view class="iconfont icon-charutupian" @tap="insertImage"></view>
+					<view :class="formats.header === 1 ? 'ql-active' : ''" class="iconfont icon-format-header-1" data-name="header" :data-value="1"></view>
+					<view :class="formats.script === 'sub' ? 'ql-active' : ''" class="iconfont icon-zitixiabiao" data-name="script" data-value="sub"></view>
+					<view :class="formats.script === 'super' ? 'ql-active' : ''" class="iconfont icon-zitishangbiao" data-name="script" data-value="super"></view>
+ 
+					<view class="iconfont icon-shanchu" @tap="clear"></view>
+ 
+					<view :class="formats.direction === 'rtl' ? 'ql-active' : ''" class="iconfont icon-direction-rtl" data-name="direction" data-value="rtl"></view>
+				</view>
+ 
+				<view class="editor-wrapper">
+					<editor 
+						id="editor" 
+						class="ql-container" 
+						placeholder="开始输入..." 
+						show-img-size 
+						show-img-toolbar 
+						show-img-resize 
+						@statuschange="onStatusChange" 
+						:read-only="readOnly" 
+						@ready="onEditorReady" 
+						@blur="blur"
+						@input="whenInput"
+					></editor>
+					<!-- <view class="" style="text-align: center;margin-bottom: 30rpx;">
+						<u-button style="" type="primary" size="medium" @click="clickBtnSubmit">发布</u-button>
+					</view> -->
+				</view>
+ 
+ 
+			</view>
+		</view>
+	</view>
+</template>
+ 
+<!-- 等同于 @import "./editor-icon.css"; -->
+<style>
+	@font-face {
+	    font-family: 'iconfont';
+	    src: url('data:font/truetype;charset=utf-8;base64,AAEAAAANAIAAAwBQRkZUTYZt980AACuYAAAAHEdERUYAKQBBAAAreAAAAB5PUy8yPJdOmAAAAVgAAABWY21hcLyvuFAAAAJMAAACGmdhc3D//wADAAArcAAAAAhnbHlm1+PZcgAABOAAACD0aGVhZBRVFL8AAADcAAAANmhoZWEISgQAAAABFAAAACRobXR4TS8LYAAAAbAAAACcbG9jYQhHD/wAAARoAAAAeG1heHABTgChAAABOAAAACBuYW1lKeYRVQAAJdQAAAKIcG9zdLoCe30AAChcAAADEgABAAAAAQAAUo9exF8PPPUACwQAAAAAANhk6GIAAAAA2GToYgAA/34EbAOAAAAACAACAAAAAAAAAAEAAAOA/4AAXARsAAAAAARsAAEAAAAAAAAAAAAAAAAAAAATAAEAAAA7AJUACQAAAAAAAgAAAAoACgAAAP8AAAAAAAAAAQQBAZAABQAAAokCzAAAAI8CiQLMAAAB6wAyAQgAAAIABQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUGZFZABA5ifspQOA/4AAXAOAAIIAAAABAAAAAAAABAAAAAAAAAABVQAABAAALwQAAJ0EAAAeBAAAQARsAAAEAAACBAAANwQAADcEAACVBAAAmgQAAJoEAAA+BAAAQAQAACUEAQAABAAAQAAnAIAAgABgAIAAgACAAIAAeAAAAFAAMABgAEAAYAAgAEAAOQAgAGAAYACAAD8AYAAgAEAA1wBeACEAwACAAOAAogBgABoAIQBgADIAiwBAAAAAAwAAAAMAAAAcAAEAAAAAARQAAwABAAAAHAAEAPgAAAA6ACAABAAa5ifmK+Yx5jPmPuZN5mDmZOZu5njmfuaE5ujm/ecs513n+Ohg6GXpZOso7AnsE+x87JTsnuyg7KX//wAA5ifmK+Yx5jPmPuZN5l/mZOZt5njmfuaE5ujm/ecs51zn+Ohg6GPpZOso7AnsE+x67H/snuyg7KX//xncGdkZ1BnTGckZuxmqGacZnxmWGZEZjBkpGRUY5xi4GB4Xtxe1FrcU9BQUFAsTpROjE5oTmROVAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBgAAAQAAAAAAAAABAgAAAAIAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGgB8ANIA7AGaAiwCugNGBCAEgATiBRgFfgXyBl4GfAbGBwAHOAeWB7wH5ggoCGgI5AlSCaIKIgqmCxILPAtKC64L+gw8DIQMpgzKDQYNKA1GDaAN4g4MDlIObA6gDs4O6g8MD2APpA/GD+gQHhB6AAEAL/+AA8ADgAAJAAABNQkBNQQCFyYSAkABgP6A/r1YYdeEAoj4/oD+gP4G/rCo+QIEAAACAJ0ACANqAtQAKwA9AAAlIS4BJxE+ATchHgEXFQ4BIiY9AS4BJyEOAQcRHgEzITI2NzU0NjIWFxUOASUiLwEmNDYyHwEBNjIWFAcBBgL2/hsxQQICQTEB6y4+AgESGxIBGhP+FRYdAQEdFgHlFh0BEhsSAQJB/qoNCqMKFBkKjQFgChkUCv6KCggBQTEB5jBCAQE+Lx4NEhINHhQZAQEdFf4aFh0dFvkOEhIO+TFBnwqjChoTCY0BYAoUGQr+iQkAAAAABAAeAEoD4gJoAA8AGwAnADAAAAEGBAcmJC8BNzYkNxYEHwElDgEHHgEXPgE3LgEDLgEnPgE3HgEXDgEnDgEUFjI2NCYD0Ar+/sTE/v4LERELAQLExAECChL+Ho3WKirWjY3WKirWjTpNAQFNOjpNAQFNOh8qKj4qKgFEFtUPD9UWFRUX1Q4O1RcVzgeVMjKUCAiUMjKV/qwCTzw8UAEBUDw8T9cBK0ArK0ArAAEAQP+AA9EDgAAJAAAFNgIlFQkBFQQSAvphWP69/oABgAGNhICoAVAG/gGAAYD4C/38AAAIAAD/gARsA4AAHwArAEAATABVAGIAaAB1AAAFIikBLgEnET4BNzMVIyIGHQEhNS4BKwE1Mx4BFxEOARMiKQERFBYzITI2NwEwDwEGDwEjNzEuASc+ATceARcUBycOARQWMj8BNjcuAQUGDwE1NzMRIwEuASc1PgEyFh0BFAYlMjMhFSEHLgE9ATQ2MhYdARQGBAA5/m/+Ni49AQE9LlFRFx8EAAEeF1FRLj0BAT0IQP5A/gAfFwOUFx4B/uUCAgUGhTpiM0UBAUUzNEQBDmscJiY5FAkJAQEm/q0FIylTNDYCAAsPAQEPFw8P/aMi7AEN/eU1DA8PFw8PgAE9LgLXLj0BNh8Xa2sXHzYBPS79KS49AqH9yhcfHxcBIAMDCQjSoAJMOTlMAgJMOSIcjwEuRC4YEBIWIi4VBCAkQ1D+UgKGAQ8LogsQEAuiCw+GNlEBDwuiCxAQC6ILDwADAAL/fgPvA3AAKwBNAGcAAAEjNS4BJyMOAQcVIw4BBxUUFhcDHgE3ITUzFjI3MxYyNzMWNjcRPgE9AS4BAyM1NCYiBh0BIzU0JiIGBxUjNS4BIgYdASMiJicRIREUBhMUBiMhIiYnNT4BMyE1PgE3Mx4BFxUhMhYVA3/fAS8kpyQvAeAvPwEeGgEKYAYBMxUEBwO2AwcEhQZgCRoeAT+DVBAYEIwQGA8BiwEPGBBUJC8BAw4vZyAY/PIXIAEBIBcBGAEvIzgkLwEBFxggAnSoIzABATAjqAE/MDcgMg/+hlEjBAEBAQEBBCNQAXoPMiA3MD/9SN4MEBAM3t4MEBAM398MEBAM3ywoAU/+sScsAhIYICAYNxggqCMwAQEwI6ggGAAABQA3/8ED2gNPABEAIAAzAEQAXwAAASIjISYnJj4BMyEyFxYOASMGAzI7AR4BBwYHIS4BNzYzBSIjJSInJjY3NjMlIR4BFAYHIxUyOwEWFxYGBwYjBS4BNDYzATQmIg8BNTQmIgYdAScmIgYUFzEXFjI/ATE2ApxL0v7jHQgEBxgOAwQhCAQGGBBnZzlQiRcWBwke/LkXFwYIIAIjRs3+7RwJBAYKDQ8BcAFvFBYWFLwuJVQcCQQGCgwP/TcTFhYSAjQVHwotFB8ULQogFAlrCiEKawkB0AEZDBcOGgwXDgEBgAEeFBgBARwUG+YBGQwWBwkBARUiFAHoARgMFwcIAQEUIhX+2g8UCzKpDxQUD6kyCxQdCnYMDHYKAAAFADf/wQPaA00AEQAgADMARABeAAAlIiMhJicmPgE3ITIXFg4BIwYDMjsBHgEHBiMhIiY3NjcFIiMhJicmNjc2NykBMhYUBisBFTIzFxYXFgYHBgchIiY0NjMBMScmIg8BMQYUFjI/ARUUFjI2PQEXFjI2NAKcS9L+4x0IBAcYDgMEIQgEBhgQZ2c5UIkXFgcJHvy5FxcGCCACI0bN/u0cCQQGCg0PAXABbxQWFhS8LiVUHAkEBgoMD/03ExYWEgIrawohCmsJFCAKLRQfFC0KHxVbARkNFw0BGg0WDgEBgAEeFRgdFBoB5gEYDBcHCAEVIhXoAQEYCxcHCAEVIRUCv3cLC3cKHRQMMagPFBQPqDEMFB0AAAAACQCV/4EDawN+AB8ALwA9AE4AWgBrAHcAiACUAAABIzUuAScjLgEiBgcjDgEHFSMiBhURFBYXIT4BNRE0JiUzMjY3PgEyFhceATsBFSEBIREzFR4BMyEyNjc1MwUHJyYiBhQfARYyPwE2NCYiFyIGFBYzITI2NCYjBQcnJiIGFB8BFjI/ATY0JiIFIQ4BFBYzITI2NCYFBycmIgYUHwEWMj8BNjQmIgUhIgYUFhchPgE0JgNZVQEKB4IJPVQ9CYIHCgFVCAoKCAKyCAoK/b9/BwoBAyxALAMBCgd//kACJ/1yQwEKBwHkBwoBQ/4zSiEFDwoFLQYOBlYFCw5WBwoKBwEpBwoKB/58SiEFDwoFLQYOBlYFCw4Bf/7XBwoKBwEpBwoK/nVKIQUPCgUtBg4GVgULDgF//tcHCgoHASkHCgoC4TEHCgEoMjIoAQoHMQoI/MQHCgEBCgcDPAgKHwkIICkpIAgJbf0SAxg8CAoKCDzCSiEFCg8FLgUFVwUOCysKDwsLDwqlSSEFCw4GLQUFVgYOCysBCg8KCg8KpEohBgsPBS4FBVcFDgsrCg8KAQEKDwoAAAMAmv+AAzMDTQAXADQAPQAAJScmIgYUHwEhDgEUFhchBwYUFjI/ATY0ESEOAQceARczFRQWMjY1ETMRHgEyNjcRMzI2NCYBIy4BJz4BNzMDEmYIFBAIOv4kCg8PCgHcOggPFQhmCP5MV3MCAnNXNA4WD5kBDhYOAYAKDw/+djRBVwEBV0E0EmcHEBQIOgEOFg4BOggVDwhmCBQDQwJ0V1d0AuYLDw8LAk39swsPDwsCTQ4WD/6ZAldBQVcCAAAAAAMAmv+AAzMDTQAcACUAPQAAASEOAQceARczFRQWMjY1ETMRHgEyNjcRMzI2NCYBIy4BJz4BNzMBITc2LgEiDwEGFB8BFjI2NC8BIT4BNCYDGv5MV3MCAnNXNA4WD5kBDhYOAYAKDw/+djRBVwEBV0E0AUz+JToIAQ8UCGYICGYIFQ8IOgHbCw8PA00CdFdXdALmCw4OCwJN/bMLDg4LAk0OFg/+mQJXQUFXAv0AOggUEAdnCBQIZggPFQg6AQ4WDgAAAAADAD7/vgPCA0IADwAXABsAAAEhDgEHER4BFyE+ATcRLgEDJyMHIxMzEwEDMwMDUv1cL0ABAUAvAqQvQAEBQM82+DZn4m7i/uZevl0DQgFAL/1cL0ABAUAvAqQvQPzuqKgCav2WAfr+5wEZAAADAEAAAAPAAsAAFgAjAD8AAAEzPgE0JichDgEUFhczBwMGHgE2NxM2AT4BNyEeARQGByEuASUnJiIGFB8BBwYUFjI/ARcWMjY0LwE3NjQmIgcBtMwbJCQb/gAbJCQbuQEtBB02KgUtAv6IASQbAYAbJCQb/oAbJAK/VxMxJRJXVxIlMRNXVxMxJRJXVxIlMRMCQAEkNiQBASQ2JAEH/tgfMQsiHwEoEf4QGyQBASQ2JAEBJPJXEiUxE1dXEzElEldXEiUxE1dXEzElEgACACX/yQPbAzcABwBLAAABAxcWMzI3JgE3PgQ3GwEzFhcTHgEXHgEXFhceARcWHQEiJiMiBiM0PwI2PwE+ATU0Ji8BJQ4BFB4CHwEWFRQHIiYjIgYjBgHDYU47IAsWMv4rAQ0mGx0WB4egSQUCdRNTFwkxEQsJC04JAySRJSufFgJbCAYDBgQCIxcY/v4OOhAiFRYXAQEhhSIEFQIuAkH+/gEBAZH9+i0EBwULFhIBYAGeCAT+7i3NNhR+IRoHCBEDFgsPCQgYFBQCAgIFAgcFCVw3OgEhnhoSCgYCAgsWBQsMBQgAAAAABQAAABIEAAM3AA0AHQAtAD0ATQAAExEUBiIvASY0PwE2MhYBFRQGIyEiJj0BNDYzITIWNRUUBiMhIiY9ATQ2MyEyFjUVFAYjISImPQE0NjMhMhY1FRQGIyEiJj0BNDYzITIW2woQBaUFBaUFEAoDJQsH/CQHCwsHA9wHCwsH/ZIHCwsHAm4HCwsH/ZIHCwsHAm4HCwsH/CQHCwsHA9wHCwJJ/rcHCwWkBhAFpAUK/kFtCAsLCG0ICwvUbgcLCwduBwsL1G4HCwsHbggKCtRuCAoKCG4HCwsAAgBA/4ADwAMAAAcADwAAEyEVIxEjESMBIxEjESM1IUABgICAgAOA/Ij8AoABgID+gAGAAYD9AAMAgAAAAwAn/88D2QMxABgAHAAsAAA3MzI2PwEhFx4BOwE+AScDJicjIgYHAwYWATMXIwEhIgYHFR4BMyEyNjc1LgHNUQkPAz8BCEUDDwlRCwsE7AcTjAkPA9kECwEqElWyAhj8igwRAQERDAN2DBEBARG7DQmvrwkNAQ8KAkkSAQoJ/bcKDwH/xf5PEQ07DBERDDsNEQAAAAIAgACAA4AC1QALACQAABMzETMRMxEjESMRIykBIiY0PwE2NCYiBhUjPgE3HgEXFAYPASGAVatVVatVAwD/ACMyF88ZMkYyVQFhSElgAhsXzgEAAtX/AAEA/asBAP8AMkYX4BhHMjIjSGEBAWFIJD0Y3QAAAgCAAIADgALVAAsAJwAAEzMRMxEzESMRIxEjATMyFhURFAYrASImPQEzFTM1IzUzNSMVIzU0NoBVq1VVq1UCAKsjMjIjqyMyVaurq6tVMgLV/wABAP2rAQD/AAJVMiP+VSMyMiMrK6tVqysrIzIAAAIAYAAgA6EC4AAjAD0AAAEhBgcVFhczNjc1MxEjBgcVFhchNjc1JicjETMVFhczNjc1JgEjETMyNi8BJg8BBhY7AREjIgYfARY/ATYmAoj94AcBAQc4BwGoXAcBAQcBCAcBAQdcqAEHOAcBAQEKQUEEBAJlBgZkAwQEQUEEBANkBgZkAwQC4AEHgAcBAQdA/dABBzgHAQEHOAcBAjBABwEBB4AH/d8BhAgEfwYGfwQI/nwIBH8GBn8ECAAAAgCAAIADVQLVAAsAFgAAEzMRMxEzESMRIxEjITUzEQc1NzMRMxWAVatVVatVAdVWa2tVVQLV/wABAP2rAQD/AFUBnj5jPf4AVQAAAAMAgACAA4AC1QALABYAGQAAEzMRMxEzESMRIxEjITUjNRMzETMVIxUDNQeAVatVVatVAoDV1VUrK1VtAtX/AAEA/asBAP8A1VYBKv7WVtUBK5iYAAIAgACAA4AC1QALACsAABMzETMRMxEjESMRIwEzFSMVMx4BFw4BByMuASc1MxUzPgE0JicjLgEnNT4BgFWrVVWrVQIA1dVVSWACAmBJVSQwAVVVJDExJFUkMAEBMALV/wABAP2rAQD/AAJVVasBYUhJYAIBMCQrKwExSDABATAkqyQwAAMAgACAA4AC1QALACQAKAAAEzMRMxEzESMRIxEjATMeARcVIzUjFTMeARcVDgEHIy4BJxE+ARMVMzWAVatVVatVAgCrJDABVaurJDABATAkqyQwAQEwJKsC1f8AAQD9qwEA/wACVQEwJCsrqwEwJKskMAEBMCQBqyQw/qyrqwAAAgB4/6IDiQNeAC8AVgAAJSY1Ji8BJiIGFB8BITc2NCYiDwEOAR0BFBYfARYyPgEvASEHBhQWMj8CPgE1NyYBPgE9ASERIyIGFBY7ATI2NCYrAREhFRQWMjY9ATQmIyEiBh0BFBYDiAEBA2YFDgoFSf1jSQUKDgVmAgICAmYFDQoBBUkCnUkFCg4FZwEBAgEB/UUHCgERMwgJCQiICAkJCDMBEQoOCgoH/ZoHCgoeAQEDA2YFCg4FSUkFDgoFZwIFAwMCBQJoBAoNBUpKBQ4KBWYCAgQDAgIC2wEJCDP9MwoOCgoOCgLNMwgJCQhEBwoKB0QICQAAAAAFAAAAEgQAAzcADgAeAC4APgBOAAATFA8BBiImNRE0NjIfARYBFRQGIyEiJj0BNDYzITIWNRUUBiMhIiY9ATQ2MyEyFjUVFAYjISImPQE0NjMhMhY1FRQGIyEiJj0BNDYzITIWyQWlBQ8LCw8FpQUDNwsH/CQHCwsHA9wHCwsH/ZIHCwsHAm4HCwsH/ZIHCwsHAm4HCwsH/CQHCwsHA9wHCwGlCAakBQsHAUkICgWkBf7lbQgLCwhtCAsL1G4HCwsHbgcLC9RuBwsLB24ICgrUbggKCghuBwsLAAAABABQ/9ADsAMwABEAFQAZADIAAAkBJiMhDgEHER4BFyE+ATcRNCUzFSMBITUhFyM1NCYjISIGHQEjETMVFBYzITI2PQEzAQOd/v4TGv4iGyQBASQbAuAbJAH9cMDAAcD+QAHAkFASDv4ADhJQUBIOAQAOEk4BAgIbAQITASQb/SAbJAEBJBsB3hrocP2QkJCwDhISDrAC4JAOEhIOkP7+AAYAMP+wA9ADUAAQACEAMgBEAFQAWAAAASMiBh0BFBYyNj0BMzI2NCYhIyIGFBY7ARUUFjI2PQE0JgEjNTQmIgYdARQWOwEyNjQmJSIGHQEjIgYUFjsBMjY9ATQmEyEOAQcRHgEXIT4BNxEuAQERIREBcZEOEhIcEnENExMBk5EOEhIOcRIbExP+U3ESHBISDpENExMBkw4ScQ4SEg6RDRMTcvzgGyQBASQbAyAbJAEBJPzFAyACwBIOig0TEw1qEhwSEhwSag0TEw2KDhL9tmoOEhIOig4SEhwSihIOahIcEhIOig4SAlABJBv84BskAQEkGwMgGyT8oQMg/OAAAAAGAGD/wAOgA0AADwAfADMAPwBLAFcAAAEhDgEHER4BFyE+ATcRLgEDFAYjISImNRE0NjMhMhYVNyEiBhQWMyEyFhURFBYyNjURLgEBISIGFBYzITI2NCYHISIGFBYzITI2NCYHIyIGFBYXMz4BNCYC0P3gIi0BAS0iAiAiLQEBLRIJB/3gBwkJBwIgBwlw/eAOEhIOAiAHCRIcEgEt/u7+wA4SEg4BQA4SEg7+wA4SEg4BQA4SEo7ADhISDsAOEhICwAEtIv2gIi0BAS0iAmAiLf1RBwkJBwJgBwkJB9ASHBIJB/2gDhISDgJgIi3+2RIcEhIcEqASHBISHBKfEhsSAQESGxIAAAAFAED/oAPAA2AAHwAjAC0AOgBHAAABIzU0JiMhIgYdASMiBhQWOwETHgEXIT4BNxMzMjY0JiUhFSEBDgEjISImJwMhAzI2NRE0JiIGFREUFiMyNjURNCYiBhURFBYDoMASDv6ADhLADhISDiJOBDUmAaImNQROIg4SEv2yAUD+wAGRAhEN/l4NEQJNAnzeDhISHBISog4SEhwSEgLwUA4SEg5QEhwS/UUlLwEBLyUCuxIcEjAw/QwMEBAMArT9mxIOAdYNExMN/ioOEhIOAdYNExMN/ioOEgADAGD/wAOmAzcABAAPABMAAAEnAQc3AScjLgEPARc3NjQBIRUhAwib/jQnvwJpgwEEDQWDm4EF/LoDQPzAAfet/lm8DQJMlwUBBXitdwQN/WtAAAABACABQAPgAbAAAwAAEyEVISADwPxAAbBwAAAAAwBA/9UDwgMyAB4AJwA/AAABITY1LgEHDgEdAQ4BByMiBhURHgEzITI2NxM2LgIBETQ7AREjIiYBAw4BIyERPgE3NTY3NhYXFAcGFjMhMhYDWf73EwJUNi4sAUo5dhsoASYcAo0lOAdKBAseKf0QA01NAQIC/0kDFQ7+AE1fAQEiFiwBHAUSEQE0EhcCJ0I0PlcFB0QzOzpTBycc/nsdJi4lAYUXLCQT/fEBhQP+dQIBov57DhEBjhBzTjs5BgExIThUDxscAAADADn/uwPXAycAEwAlACkAAAEuAQ8BFzc2FhcWBg8BFzc+AiYBBiYnJjY/AScHDgEXHgE/AScTFwEnA45U82dlM2RNsz47E0lsMmwwOQ0i/k9Msz86E0lvMm9jGk9V82dpMzcz/qkzAqpjGk9SPlI6E0lMsz9XPlcnanp0/c06E0lMsz9aPlpU82djGk9VPwGBPv7iPQAAAAUAIAAAA+ADAAASABMAHAAgACQAAAE0LwEmDwEGIi8BLgEPAQYVESEDIx4BMjY0JiIGJREhEQMhESEDgAisDAlNBQ0E/QUMBbwFAwBgQAEkNiQkNiT9PwPAQPzAA0ABDQkFaQYJXgUF/AQBBaoFB/73AeAbJCQ2JCSl/QADAP1AAoAAAAkAYAARA6AC7wADAAcACwAMABUAFgAfACAAKQAAASEVIRUhFSEVIRUhAyMeATI2NCYiBhMjHgEyNjQmIgYTIx4BMjY0JiIGASACgP2AAoD9gAKA/YCAQAEkNiQkNiQ/QAEkNiQkNiQ/QAEkNiQkNiQC4GDQYNBgApAbJCQ2JCT+tRskJDYkJP61GyQkNiQkAAQAYAAAA6ADAAADAAcACwAPAAATIRUhESEVIRMhFSERIRUhYANA/MADQPzAgAJA/cACQP3AAwBg/qBgAUBg/qBgAAAABACAAFIDdQLAAAMABwALAA8AABMhESEREzMDKQERIRETMwOAAVX+q5BukAEyAVX+q5BukAGn/qsBVQEZ/uf+qwFVARn+5wAABgA//+ADoAMpAAUADwAbAB8AIwAnAAATMzUjFTMDMwcVMzUjNzUjETMVIxUzFSMVMzUjEyEVIRUhFSEVIRUhYzdbJCNAQIBAQIBJKipJgIDgAoD9gAKA/YACgP2AAmDJN/7AWzc3Wzf+iRI3EjfJAjdg0GDQYAAABABgAAADoAMAAAMABwALAA8AABMhFSERIRUhASEVIREhFSFgA0D8wANA/MABAAJA/cACQP3AAwBg/qBgAUBg/qBgAAACACAARAPUAqAABQALAAAJAjcnNyUHFwcXAQEs/vQBDEjU1AFUSNTUSAEMAqD+0v7SQO7uQEDu7kABLgAHAED/wAPAA0AACwAXABgAIQAiACsAMgAAAQ4BBx4BFz4BNy4BAy4BJz4BNx4BFw4BASMeATI2NCYiBgUjHgEyNjQmIgYFHgEXPgE3AgC+/QUF/b6+/QUF/b6j2QQE2aOj2QQE2f6dQAEkNiQkNiQBv0ABJDYkJDYk/l8Do3p6owMDQAX9vr79BQX9vr79/MUE2aOj2QQE2aOj2QH8GyQkNiQkGxskJDYkJJt6owMDo3oAAAADANf/7QMgAwYAEwAdACYAAAEmJzU+ATc2JzQmJyERITI3Njc0ATMWFxYUBwYrAQEGByM1Mx4BFAMBIUEiLw0YAXZ1/q4BbV0/PwH+OMNCHyAgH0LDATEfQ8/PQz4BQTMRAhAoFS0xX3QB/Oc+PGc+AY8BHyFgICL+yyMC7wFFYQAAAAADAF7/4AOdAyAACwATABcAAAEhIgYUFhchPgE0JiUzNSE1IRUhETMRIwN9/QANEhINAwAOEhL+NXABIP1QASBwcAGKEhsSAQESGxI28HBw/lD+4AAEACEAAAPgA2AABwALAA4AJwAACQEzNyEXMwEDEzMTBQchAw4BFSE1IzY3PgE1NCYjIgcXNjMyFhUUBgE7/uZ8PAEmPHv+56JwAnABc5ABINorOwEgnwkqOylHPXQaXwkhEBUhAwf8+a2tAwf+DgFT/q014AKHIlsxUBAhLzomNkFnDyYVERYqAAAAAAEAwP/AA0ADIAALAAABESERIxEzESERMxEC4P5AYGABwGADIP6AAYD8oAGg/mADYAAAAAACAID/ygOAAyYAEQAdAAAlPgE3ESMRDgEHLgEnESMRHgEFISIGFBYXIT4BNCYCAIWwA3ACcVVVcQJwA7AB5f1ADhISDgLADhISVQOwhQGZ/mdVcQICcVUBmf5nhbBOEhsSAQESGxIAAAEA4P/qAyADKgAbAAABISIGFBYXMwMjIgYUFhchPgE0JisBEzM+ATQmAwD+4A4SEg5g5loOEhIOASAOEhIOXudXDhISAyoSGxIB/UASGxIBARIbEgLAARIbEgAAAgCi/+YDgAMSAAcACgAABTcBIwEzNyElGwEDGWf+vVr+v2ZDAYr+nJ+fGgIDKvzWqGABjv5yAAAEAGAAAAOgAwAAAwAHAAsADwAAEyEVIREhFSERIRUhESEVIWADQPzAA0D8wAJA/cACQP3AAwBg/qBgAUBg/qBgAAAAAAQAGgAvA+4CvwALABcAIwAvAAABAiADDgEXFiA3NiYHBiAnJjQ3NiAXHgEBDgEHHgEXPgE3LgEHIi4BND4BMx4BFAYD0uP+K+QbARvPAgDPGwFLvv5AvgsM0gGW0wsB/lJffwICf19ffwICf58RHhERHhEbJCQBugEF/vsgUCH6+iFQSOTkDiIO8fEOIgEAAn9fX38CAn9fX3/eER4iHhEBJDYkAAAAAAQAIf+5A+ADJwACAAoADgAmAAABIRclATM3IRczAQMTMxMBNjc+ATU0JiMiBxc2MzIWFRQOAhUhNQPA/uCQ/gv+5nw8ASY8e/7nonACcAFkCSo7KUc9dBpfCSEQFSFYOwEgAyDg5/z5ra0DB/4OAVP+rf7UECEvOiY2QWcPJhURFipFWzFQAAAEAGAAAAOgAwAAAwAHAAsADwAAEyEVIREhFSERIRUhESEVIWADQPzAA0D8wANA/MADQPzAAwBg/qBgAUBg/qBgAAAAAAEAMgBGA+ICrwAPAAABNjIWFAcBDgEnASY+ARcBA6sKGhMJ/eYJGQr+rQ4HIg8BPAKlChMaCv3YCQEIASQMJAwM/vEAAQCLABsDZQL1ABoAAAkBNjQmIgcJASYiBhQXCQEGHgE3CQEWMjY0JwInATQKExoK/sz+ywoZFAoBNP7MDQojDQE1ATQKGhMKAYoBNAoaEwn+ywE1CRMaCv7M/ssOIwkMATX+ywkTGgoAAAAAAwBAABgDwALNABEAJgA5AAABNzYWFxEOAS8BIyImNRE0NjMBBiImNDc+ATU0JicmPgEXHgEVFAYXBi4BNz4BNCYnJj4BMhceARQGAQTNDyQBASQP0p8OEhIOAj8KGRMJHyEcHAwLJA0jJStwDSQJDDo9OzcJARMaCUBERwIbpAwRFP2eFBEMqBIOAQgOEv6VCRMaCh5PLChKHg4jCA4nYDQ5ZrMNCSMOO5ellDoKGhIKRKq/rQAAAAAAEgDeAAEAAAAAAAAAFQAsAAEAAAAAAAEACABUAAEAAAAAAAIABwBtAAEAAAAAAAMACACHAAEAAAAAAAQACACiAAEAAAAAAAUACwDDAAEAAAAAAAYACADhAAEAAAAAAAoAKwFCAAEAAAAAAAsAEwGWAAMAAQQJAAAAKgAAAAMAAQQJAAEAEABCAAMAAQQJAAIADgBdAAMAAQQJAAMAEAB1AAMAAQQJAAQAEACQAAMAAQQJAAUAFgCrAAMAAQQJAAYAEADPAAMAAQQJAAoAVgDqAAMAAQQJAAsAJgFuAAoAQwByAGUAYQB0AGUAZAAgAGIAeQAgAGkAYwBvAG4AZgBvAG4AdAAKAAAKQ3JlYXRlZCBieSBpY29uZm9udAoAAGkAYwBvAG4AZgBvAG4AdAAAaWNvbmZvbnQAAFIAZQBnAHUAbABhAHIAAFJlZ3VsYXIAAGkAYwBvAG4AZgBvAG4AdAAAaWNvbmZvbnQAAGkAYwBvAG4AZgBvAG4AdAAAaWNvbmZvbnQAAFYAZQByAHMAaQBvAG4AIAAxAC4AMAAAVmVyc2lvbiAxLjAAAGkAYwBvAG4AZgBvAG4AdAAAaWNvbmZvbnQAAEcAZQBuAGUAcgBhAHQAZQBkACAAYgB5ACAAcwB2AGcAMgB0AHQAZgAgAGYAcgBvAG0AIABGAG8AbgB0AGUAbABsAG8AIABwAHIAbwBqAGUAYwB0AC4AAEdlbmVyYXRlZCBieSBzdmcydHRmIGZyb20gRm9udGVsbG8gcHJvamVjdC4AAGgAdAB0AHAAOgAvAC8AZgBvAG4AdABlAGwAbABvAC4AYwBvAG0AAGh0dHA6Ly9mb250ZWxsby5jb20AAAIAAAAAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOwAAAAEAAgECAQMBBAEFAQYBBwEIAQkBCgELAQwBDQEOAQ8BEAERARIBEwEUARUBFgEXARgBGQEaARsBHAEdAR4BHwEgASEBIgEjASQBJQEmAScBKAEpASoBKwEsAS0BLgEvATABMQEyATMBNAE1ATYBNwE4ATkEcmVkbwlzZWxlY3RhbGwHcHJldmlldwR1bmRvBGRhdGUHY2xlYXJ1cBU3MjNiaWFuamlxaV9kdWFuaG91anUWNzIyYmlhbmppcWlfZHVhbnFpYW5qdQotY2hlY2tsaXN0DWRpcmVjdGlvbi1sdHINZGlyZWN0aW9uLXJ0bAtmb250Ymdjb2xvcg1jbGVhcmVkZm9ybWF0BGZvbnQHb3V0ZGVudAhmb250c2l6ZQp0ZXh0X2NvbG9yD2Zvcm1hdC1oZWFkZXItMg9mb3JtYXQtaGVhZGVyLTMLbGluZS1oZWlnaHQPZm9ybWF0LWhlYWRlci0xD2Zvcm1hdC1oZWFkZXItNA9mb3JtYXQtaGVhZGVyLTUPZm9ybWF0LWhlYWRlci02EUNoYXJhY3Rlci1TcGFjaW5nBmluZGVudAZiYW9jdW4IcXVhbnBpbmcFZnV6aGkHc2hhbmNodQxiaWFuamlzZWt1YWkJZmVuZ2V4aWFuB2RpYW56YW4MY2hhcnVsaWFuamllC2NoYXJ1dHVwaWFuCnd1eHVwYWlsaWUManV6aG9uZ2R1aXFpB3lpbnlvbmcLeW91eHVwYWlsaWUIeW91ZHVpcWkJeml0aWRhaW1hCHhpYW9saWFuCXppdGlqaWFjdQ96aXRpc2hhbmNodXhpYW4Neml0aXNoYW5nYmlhbwp6aXRpYmlhb3RpDnppdGl4aWFodWF4aWFuCXppdGl4aWV0aQl6aXRpeWFuc2UIenVvZHVpcWkJeml0aXl1bGFuC3ppdGl4aWFiaWFvC3p1b3lvdWR1aXFpB2R1aWdvdXgGZ3VhbmJpDnNoZW5neWluX3NoaXRpAAAAAAAB//8AAgABAAAADAAAABYAAAACAAEAAwA6AAEABAAAAAIAAAAAAAAAAQAAAADVpCcIAAAAANhk6GIAAAAA2GToYg==') format('truetype');
+	    font-weight: normal;
+	    font-style: normal;
+	    font-display: swap;
+	}
+	.iconfont {
+	  font-family: "iconfont" !important;
+	  font-size: 16px;
+	  font-style: normal;
+	  -webkit-font-smoothing: antialiased;
+	  -moz-osx-font-smoothing: grayscale;
+	}
+	 
+	.icon-redo:before {
+	  content: "\e627";
+	}
+	 
+	.icon-undo:before {
+	  content: "\e633";
+	}
+	 
+	.icon-indent:before {
+	  content: "\eb28";
+	}
+	 
+	.icon-outdent:before {
+	  content: "\e6e8";
+	}
+	 
+	.icon-fontsize:before {
+	  content: "\e6fd";
+	}
+	 
+	.icon-format-header-1:before {
+	  content: "\e860";
+	}
+	 
+	.icon-format-header-4:before {
+	  content: "\e863";
+	}
+	 
+	.icon-format-header-5:before {
+	  content: "\e864";
+	}
+	 
+	.icon-format-header-6:before {
+	  content: "\e865";
+	}
+	 
+	.icon-clearup:before {
+	  content: "\e64d";
+	}
+	 
+	.icon-preview:before {
+	  content: "\e631";
+	}
+	 
+	.icon-date:before {
+	  content: "\e63e";
+	}
+	 
+	.icon-fontbgcolor:before {
+	  content: "\e678";
+	}
+	 
+	.icon-clearedformat:before {
+	  content: "\e67e";
+	}
+	 
+	.icon-font:before {
+	  content: "\e684";
+	}
+	 
+	.icon-723bianjiqi_duanhouju:before {
+	  content: "\e65f";
+	}
+	 
+	.icon-722bianjiqi_duanqianju:before {
+	  content: "\e660";
+	}
+	 
+	.icon-text_color:before {
+	  content: "\e72c";
+	}
+	 
+	.icon-format-header-2:before {
+	  content: "\e75c";
+	}
+	 
+	.icon-format-header-3:before {
+	  content: "\e75d";
+	}
+	 
+	.icon--checklist:before {
+	  content: "\e664";
+	}
+	 
+	.icon-baocun:before {
+	  content: "\ec09";
+	}
+	 
+	.icon-line-height:before {
+	  content: "\e7f8";
+	}
+	 
+	.icon-quanping:before {
+	  content: "\ec13";
+	}
+	 
+	.icon-direction-rtl:before {
+	  content: "\e66e";
+	}
+	 
+	.icon-direction-ltr:before {
+	  content: "\e66d";
+	}
+	 
+	.icon-selectall:before {
+	  content: "\e62b";
+	}
+	 
+	.icon-fuzhi:before {
+	  content: "\ec7a";
+	}
+	 
+	.icon-shanchu:before {
+	  content: "\ec7b";
+	}
+	 
+	.icon-bianjisekuai:before {
+	  content: "\ec7c";
+	}
+	 
+	.icon-fengexian:before {
+	  content: "\ec7f";
+	}
+	 
+	.icon-dianzan:before {
+	  content: "\ec80";
+	}
+	 
+	.icon-charulianjie:before {
+	  content: "\ec81";
+	}
+	 
+	.icon-charutupian:before {
+	  content: "\ec82";
+	}
+	 
+	.icon-wuxupailie:before {
+	  content: "\ec83";
+	}
+	 
+	.icon-juzhongduiqi:before {
+	  content: "\ec84";
+	}
+	 
+	.icon-yinyong:before {
+	  content: "\ec85";
+	}
+	 
+	.icon-youxupailie:before {
+	  content: "\ec86";
+	}
+	 
+	.icon-youduiqi:before {
+	  content: "\ec87";
+	}
+	 
+	.icon-zitidaima:before {
+	  content: "\ec88";
+	}
+	 
+	.icon-xiaolian:before {
+	  content: "\ec89";
+	}
+	 
+	.icon-zitijiacu:before {
+	  content: "\ec8a";
+	}
+	 
+	.icon-zitishanchuxian:before {
+	  content: "\ec8b";
+	}
+	 
+	.icon-zitishangbiao:before {
+	  content: "\ec8c";
+	}
+	 
+	.icon-zitibiaoti:before {
+	  content: "\ec8d";
+	}
+	 
+	.icon-zitixiahuaxian:before {
+	  content: "\ec8e";
+	}
+	 
+	.icon-zitixieti:before {
+	  content: "\ec8f";
+	}
+	 
+	.icon-zitiyanse:before {
+	  content: "\ec90";
+	}
+	 
+	.icon-zuoduiqi:before {
+	  content: "\ec91";
+	}
+	 
+	.icon-zitiyulan:before {
+	  content: "\ec92";
+	}
+	 
+	.icon-zitixiabiao:before {
+	  content: "\ec93";
+	}
+	 
+	.icon-zuoyouduiqi:before {
+	  content: "\ec94";
+	}
+	 
+	.icon-duigoux:before {
+	  content: "\ec9e";
+	}
+	 
+	.icon-guanbi:before {
+	  content: "\eca0";
+	}
+	 
+	.icon-shengyin_shiti:before {
+	  content: "\eca5";
+	}
+	 
+	.icon-Character-Spacing:before {
+	  content: "\e964";
+	}
+</style>
+ 
+<style>
+	.page-body {
+		height: calc(100vh - var(--window-top) - var(--status-bar-height));
+	}
+ 
+	.wrapper {
+		height: 80%;
+	}
+ 
+	.editor-wrapper {
+		background: #fff;
+		
+		/* 编辑器高度 - 满屏 */
+		/* height: calc(100vh - var(--window-top) - var(--status-bar-height) - 140px); */
+		
+		/* 编辑器高度 - 满屏矮一点 */
+		height: calc(80vh - var(--window-top) - var(--status-bar-height) - 240px);
+	}
+ 
+	.iconfont {
+		display: inline-block;
+		padding: 8px 8px;
+		width: 24px;
+		height: 24px;
+		cursor: pointer;
+		font-size: 20px;
+	}
+ 
+	.toolbar {
+		box-sizing: border-box;
+		border-bottom: 0;
+		font-family: 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif;
+	}
+ 
+	.ql-container {
+		box-sizing: border-box;
+		padding: 12px 15px;
+		width: 100%;
+		min-height: 20vh;
+		height: 100%;
+		/* margin-top: 20px; */
+		font-size: 16px;
+		line-height: 1.5;
+	}
+ 
+	.ql-active {
+		color: #06c;
+	}
+</style>
+ 
+ 
+ 
+<script setup>
+	// 基础
+	import {
+		ref,
+		inject,
+		reactive,
+		onMounted,
+		computed,
+		getCurrentInstance
+	} from 'vue'
+	const { $api, navTo, throttle, config } = inject('globalFunction');
+	const props = defineProps({
+	  content: {
+	    type: String,
+	  },
+	  
+	})
+	const emit = defineEmits(['init-data'])
+	// 页面元素
+	const {
+		ctx,
+		proxy
+	} = getCurrentInstance()
+ 
+	// 富文本
+	const editorCtx = ref(null)
+	const formats = reactive({})
+	const readOnly = ref(false)
+	
+	// 富文本 内容
+	const editorContent = reactive({
+		// 带标签内容
+		html: '',
+		
+		// 纯文本内容
+		text: ''
+	})
+	
+	
+	
+	
+	
+	
+ 
+	function blur(e) {
+		// console.log('失去焦点')
+		// console.log('更新HTML')
+		editorContent.html = e.detail.html
+		emit('init-data', {
+			value: e.detail.html,
+		})
+	}
+ 
+	function readOnlyChange() {
+		readOnly.value = !readOnly.value
+	}
+ 
+	function onEditorReady() {
+		// #ifdef MP-BAIDU
+		editorCtx.value = requireDynamicLib('editorLib').createEditorContext('editor');
+		// #endif
+ 
+		// #ifdef APP-PLUS || MP-WEIXIN || H5
+		uni.createSelectorQuery().in(proxy).select('#editor').context((res) => {
+			editorCtx.value = res.context
+			// 初始化HTML内容
+			editorCtx.value.setContents({//赋值
+				html: props.content?props.content:editorContent.html
+			})
+		}).exec()
+		// #endif
+	}
+ 
+	function undo() {
+		editorCtx.value.undo()
+	}
+ 
+	function redo() {
+		editorCtx.value.redo()
+	}
+ 
+	function format(e) {
+		let {
+			name,
+			value
+		} = e.target.dataset
+		if (!name) return
+		// console.log('format', name, value)
+		editorCtx.value.format(name, value)
+	}
+ 
+	function onStatusChange(e) {
+		formats.value = e.detail
+	}
+ 
+	function insertDivider() {
+		editorCtx.value.insertDivider({
+			success: function() {
+				console.log('insert divider success')
+			}
+		})
+	}
+ 
+	function clear() {
+		uni.showModal({
+			title: '清空编辑器',
+			content: '确定清空编辑器全部内容？',
+			success: res => {
+				if (res.confirm) {
+					editorCtx.value.clear({
+						success: function(res) {
+							console.log("clear success")
+						}
+					})
+				}
+			}
+		})
+	}
+ 
+	function removeFormat() {
+		editorCtx.value.removeFormat()
+	}
+ 
+	function insertDate() {
+		const date = new Date()
+		const formatDate = `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}`
+		editorCtx.value.insertText({
+			text: formatDate
+		})
+	}
+	
+	
+	function whenInput (e) {
+		// 带标签内容
+		editorContent.html = e.detail.html
+		
+		// 纯文本内容
+		editorContent.text = e.detail.text
+	}
+	
+	
+	// function clickBtnSubmit () {
+	// 	console.log('>> 点击提交 > 内容')
+	// 	console.log(editorContent.html)
+		
+	// 	uni.showToast({
+	// 		icon: 'none',
+	// 		title: editorContent.html
+	// 	})
+	// }
+	
+ 
+	function insertImage() {
+		uni.chooseImage({
+			count: 1,
+			success: (res) => {
+				// 本地路径
+				let localPath = res.tempFilePaths[0]
+				// 在此可以自定义图片上传
+				// 在此可以自定义图片上传
+				// 在此可以自定义图片上传
+				$api.uploadFile(localPath, true).then((resData) => {
+				    resData = JSON.parse(resData);
+					// 插入图片
+					editorCtx.value.insertImage({
+						src: resData.msg,
+						alt: '图像',
+						success: function() {
+							console.log('insert image success')
+						}
+					})
+				});
+				
+			}
+		})
+	}
+</script>
+ 
\ No newline at end of file
diff --git a/packageB/institution/evaluationAgencyMaintenance.vue b/packageB/institution/evaluationAgencyMaintenance.vue
new file mode 100644
index 0000000..ff19952
--- /dev/null
+++ b/packageB/institution/evaluationAgencyMaintenance.vue
@@ -0,0 +1,941 @@
+<template>
+    <div style="height: 90vh;overflow-y: auto;">
+        <view class="content">
+            <view class="content-input">
+                <view class="input-titile"><text class="input-required">*</text>机构名称</view>
+                <input class="input-con" v-model="fromValue.organName" placeholder="请输入机构名称" />
+            </view>
+			<view class="content-input">
+			    <view class="input-titile">评价等级</view>
+				<view class="input-con">
+					<picker @change="bindPickerChange" :value="gradeIndex" :range="gradeLabels" range-key="dictLabel">
+						<view class="uni-input">{{gradeIndex==''?'请选择':gradeLabels[gradeIndex].dictLabel}}</view>
+					</picker>
+				</view>
+			</view>
+            <view class="content-input">
+                <view class="input-titile"><text class="input-required">*</text>联系人</view>
+                <input class="input-con" v-model="fromValue.contactName" placeholder="请输入联系人" />
+            </view>
+			<view class="content-input">
+			    <view class="input-titile"><text class="input-required">*</text>联系方式</view>
+			    <input class="input-con" v-model="fromValue.contactPhone" placeholder="请输入您的联系方式" />
+			</view>
+			
+			
+			
+			<view class="content-input">
+			    <view class="input-titile">工作时间</view>
+			    <input class="input-con" v-model="fromValue.organWorkStarttime" placeholder="请输入" />
+			</view>
+            <view class="content-input">
+                <view class="input-titile">所在区划</view>
+				<view class="input-con">
+					<picker mode = 'multiSelector' 
+					@change="onWorkTypePickerChange"
+					@columnchange="onWorkTypeColumnChange"
+					range-key="dictLabel" 
+					:value="fromValue.organAddressArr" 
+					:range="region.provinceData">
+						<view class="uni-input" v-if="isShow" style="width: 100%;">{{region.provinceData[0][region.arrayIndex[0]].dictLabel}}/{{region.provinceData[1][region.arrayIndex[1]].dictLabel}}/{{region.provinceData[2].length>0?region.provinceData[2][region.arrayIndex[2]].dictLabel:''}}</view>
+						<view class="uni-input" style="width: 100%;" v-else>请选择</view>
+					</picker>
+				</view>
+                <!-- <input class="input-con" v-model="fromValue.organAddressArr" placeholder="请选择" /> -->
+            </view>
+			<view class="content-input">
+			    <view class="input-titile"><text class="input-required">*</text>机构地址</view>
+			    <input class="input-con" v-model="fromValue.address" placeholder="请输入机构地址" />
+			</view>
+			<view class="content-input">
+			    <view class="input-titile">地图定位(经纬度)</view>
+				<view @click="selectLocation" class="input-con">{{fromValue.location?fromValue.location:'请选择'}}</view>
+			</view>
+			
+			<view class="content-input">
+			    <view class="input-titile">评价项目</view>
+			    <textarea auto-height class="input-con" v-model="fromValue.evaluationItems" placeholder="请输入评价项目" />
+			</view>
+			<view class="content-input">
+			    <view class="input-titile">流程说明</view>
+			    <textarea auto-height class="input-con" v-model="fromValue.processDescription" placeholder="请输入流程说明" />
+			</view>
+			
+			<view class="content-input">
+			    <view class="input-titile">资质证书</view>
+				<button class="upload-btn" type="primary" size="mini" @click="handleResumeUpload" :loading="isUploading" :disabled="isUploading">
+				    <uni-icons type="cloud-upload" size="20"></uni-icons>
+				    <text class="upload-text">上传</text>
+				</button>
+				<view class="uploaded-file-info" v-if="fileListss.list.length>0">
+					<view v-for="item in fileListss.list" :key="item.url" >
+						<image class="file-icon" src="/static/icons/file-icon.png" mode="widthFix"></image>
+						<text class="file-name">{{ item.name }}</text>
+						<button class="delete-file-btn" size="mini" @click.stop="handleDeleteResume(item)">删除</button>
+					</view>
+				</view>
+			</view>
+			<view class="content-input">
+			    <view class="input-titile">机构LOGO</view>
+				<button class="upload-btn" type="primary" size="mini" @click="handleResumeUpload2" :loading="isUploading2" :disabled="isUploading2">
+				    <uni-icons type="cloud-upload" size="20"></uni-icons>
+				    <text class="upload-text">上传</text>
+				</button>
+				<view class="uploaded-file-info" style="width: 200rpx;height: 200rpx;">
+					<img :src="uploadedResumeUrl" alt="" />
+				</view>
+			</view>
+        </view>
+		<view class="footer">
+			<view class="footerBtn" @click="confirm()">保存</view>
+		</view>
+        <SelectPopup ref="selectPopupRef"></SelectPopup>
+	</div>
+</template>
+
+<script setup>
+import { reactive, inject, watch, ref, onMounted, onUnmounted } from 'vue';
+import { onLoad, onShow } from '@dcloudio/uni-app';
+const { $api, navTo, navBack, checkingPhoneRegExp,config } = inject('globalFunction');
+import { storeToRefs } from 'pinia';
+import useUserStore from '@/stores/useUserStore';
+import useDictStore from '@/stores/useDictStore';
+import SelectPopup from '@/components/selectPopup/selectPopup.vue';
+const { userInfo } = storeToRefs(useUserStore());
+const { getUserResume } = useUserStore();
+const dictStore = useDictStore();
+const { dictLabel, oneDictData, complete: dictComplete, getDictSelectOption } = dictStore;
+
+let fromValue = reactive({
+    organName: '',
+	qualificationGrade:'',
+	contactName:'',
+	organWorkStarttime:'',
+	organAddressArr:'',
+	address:'',
+	introduction:'',
+	location:'',
+    contactPhone: '',
+	processDescription:'',
+	evaluationItems:'',
+});
+const gradeLabels=ref([])
+let gradeIndex=ref('')
+let fileListss=reactive({
+	list:[],
+})
+let region=reactive({
+	provinceData:[
+		[],
+		[],
+		[]
+	],
+	arrayIndex:[0,0,0],
+})
+const isShow = ref(false); // 上传中状态
+const isUploading = ref(false); // 上传中状态
+const isUploading2 = ref(false); // 上传中状态
+let uploadedResumeName = ref(''); // 已上传简历文件名
+let uploadedResumeName2 = ref('');
+let uploadedResumeUrl = ref(''); // 已上传
+// 在onLoad中初始化数据，确保页面加载时就能获取技能信息
+onLoad((options = {}) => {
+    getRegion(1,650000000000)
+    getDictionary()
+	setTimeout(()=>{
+		getDetail()
+	},2000)
+});
+
+// 监听页面显示，接收从技能查询页面返回的数据
+onShow(() => {
+	let params = uni.globalParams || {}; // 从全局变量获取参数
+	if(params.longitude&&params.latitude){
+		fromValue.location=params.longitude+','+params.latitude
+	}
+	uni.globalParams = null; // 清除全局变量，避免重复使用
+	
+    // 通过事件总线接收技能选择结果
+    // uni.$on('skillSelected', handleSkillSelected);
+});
+
+// 页面卸载时移除事件监听
+// onUnmounted(() => {
+//     uni.$off('skillSelected', handleSkillSelected);
+// });
+// 监听字典数据加载完成，自动更新学历显示
+watch(() => region.provinceData[0], (newVal) => {
+    if (newVal&&isShow.value==false) {
+		getRegion(2,region.provinceData[0][0].dictValue)
+    }
+});
+watch(() => region.provinceData[1], (newVal) => {
+    if (newVal&&isShow.value==false) {
+		getRegion(3,region.provinceData[1][0].dictValue)
+    }
+});
+function getDetail(){
+	// if(userInfo.userId){
+		$api.myRequest("/train/public/rate/organ/getRateByUnifiedSocialCreditCode", {
+			tags: '913700001630477270',
+		}, "GET", 9100, {
+			Authorization: `Bearer ${uni.getStorageSync('token')}`
+		}).then((res) => {
+			if (res.code === 200) {
+			  getRegion(2,res.data.organProvince)
+			  getRegion(3,res.data.organCity)
+			  fromValue = {
+			    ...fromValue,
+			    ...res.data,
+			    location: `${res.data.longitude},${res.data.latitude}`||'',
+			    organAddressArr: [
+			      res.data.organProvince,
+			      res.data.organCity,
+			      res.data.organCounty,
+			    ],
+			  };
+			  isShow.value=true
+			  gradeIndex.value=res.data.qualificationGrade==2?1:res.data.qualificationGrade==1?0:''
+			  uploadedResumeName2.value = res.data.logo?(JSON.parse(res.data.logo))[0].name:'';
+			  uploadedResumeUrl.value = res.data.logo?config.trainVideoImgUrl+(JSON.parse(res.data.logo))[0].url:'';
+			  fileListss.list = JSON.parse(res.data.zhengshu) || [];
+			  setTimeout(()=>{
+				  region.provinceData[0].forEach((item,index)=>{
+					  if(item.dictValue==res.data.organProvince){
+						  region.arrayIndex[0]=index
+					  }
+				  })
+				  region.provinceData[1].forEach((item,index)=>{
+					  if(item.dictValue==res.data.organCity){
+						  region.arrayIndex[1]=index
+					  }
+				  })
+				  region.provinceData[2].forEach((item,index)=>{
+					  if(item.dictValue==res.data.organCounty){
+						  region.arrayIndex[2]=index
+					  }
+				  })
+			  },2000)
+			}
+		})
+	// }else{
+	// 	$api.msg('请先登录');
+	// }
+	
+}
+function getDictionary(){
+	
+	$api.myRequest('/system/public/dict/data/type/qualification_grade_type', {},'get',9100).then((resData) => {
+		gradeLabels.value=resData.data;
+		
+	});
+}
+function getRegion(level,value){
+	let header = {
+		'Authorization': uni.getStorageSync('token')||'',
+		'Content-Type': "application/x-www-form-urlencoded"
+	};
+	$api.myRequest('/system/public/dict/data/getByParentValue', {
+		dictType: "administrative_division",
+		dictParentValue: value ? value: "-1",
+		childFlag: (level&&level > 1) ? "0" : "1",
+	},'post',9100,header).then((resData) => {
+		if(resData.code==200){
+			if(level==1){
+				let row=resData.data.filter(item => item.dictLabel === '喀什地区');
+				region.provinceData[level-1]=row
+			}else{
+				region.provinceData[level-1]=resData.data
+			}
+		}
+	});
+}
+function bindPickerChange(e) {
+	gradeIndex.value = e.detail.value
+}
+function onWorkTypePickerChange(e){
+	region.arrayIndex=e.detail.value;
+	isShow.value=true
+}
+function onWorkTypeColumnChange(e){
+	
+	const { column, value } = e.detail;
+	const newIndexes = [...region.arrayIndex];
+	newIndexes[column] = value;
+	
+	// 重置后续列的数据
+	if (column === 0) {
+		// 第一列变化，重置第二、三列
+		const selectedLevel1 = region.provinceData[0][value];
+		if (selectedLevel1) {
+			getRegion(2,selectedLevel1.dictValue)
+			region.arrayIndex[1] = 0;
+			region.arrayIndex[2] = 0;
+		}
+	} else if (column === 1) {
+		// 第二列变化，重置第三列
+		const selectedLevel2 = this.workTypeColumns[1][value];
+		if (selectedLevel2) {
+			getRegion(3,selectedLevel2.dictValue)
+			region.arrayIndex[2] = 0;
+		}
+	}
+	this.workTypeIndexes = newIndexes;
+}
+const confirm = () => {
+    if (!fromValue.organName) {
+        return $api.msg('请输入机构名称');
+    }
+	if (!fromValue.contactName) {
+	    return $api.msg('请输入联系人');
+	}
+	if (!fromValue.contactPhone) {
+	    return $api.msg('请输入联系方式');
+	}
+	if (!checkingPhoneRegExp(fromValue.contactPhone)) {
+	    return $api.msg('请输入正确联系方式');
+	}
+	if (!fromValue.address) {
+	    return $api.msg('请输入机构地址');
+	}
+    const params = {
+        ...fromValue,
+		organProvince: region.provinceData[0][region.arrayIndex[0]].dictValue, // 机构所在省
+		organCity: region.provinceData[1][region.arrayIndex[1]].dictValue, // 机构所在市
+		organCounty: region.provinceData[2][region.arrayIndex[2]].dictValue, // 机构所在区县
+		zhengshu: JSON.stringify(fileListss.list),
+		logo: JSON.stringify([{name:uploadedResumeName2.value,url:uploadedResumeUrl.value}]), // 机构logo
+		qualificationGrade:gradeLabels.value[gradeIndex.value].dictValue
+	};
+    $api.myRequest('/train/public/rate/organ/maintainRateOrgan', params, 'post').then((resData) => {
+        if(resData.code==200){
+			$api.msg(resData.msg);
+			setTimeout(()=>{
+				navBack();
+			},2000)
+        }
+    });
+};
+
+function selectLocation(){
+	uni.navigateTo({
+		url:'/packageB/components/map?location='+fromValue.location
+	})
+}
+
+function handleResumeUpload(){
+    // 从缓存获取用户ID（参考首页实现方式）
+    // 优先从store获取，如果为空则从缓存获取
+    const storeUserId = userInfo.value?.userId;
+    const cachedUserInfo = uni.getStorageSync('userInfo') || {};
+    const cachedUserId = cachedUserInfo.userId;
+    
+    // 获取用户ID：优先使用store中的userId，如果store中没有，使用缓存中的userId
+    const userId = storeUserId || cachedUserId;
+    
+    if (!userId) {
+        $api.msg('请先登录');
+        return;
+    }
+
+    // 检查是否正在上传
+    if (isUploading.value) {
+        return;
+    }
+
+    // 选择文件（微信小程序使用 wx.chooseMessageFile，uni-app 中对应 uni.chooseMessageFile）
+    uni.chooseMessageFile({
+        count: 1, // 只能选择一个文件
+        type: 'file', // 选择任意文件类型
+        success: (res) => {
+            // 注意：文件路径在 res.tempFiles[0].path
+            const file = res.tempFiles[0];
+            const tempFilePath = file.path; // 获取临时文件路径
+            const fileName = file.name; // 获取文件名
+            uploadedResumeName.value=file.name
+            // 检查文件大小（20MB = 20 * 1024 * 1024 字节）
+            const maxSize = 20 * 1024 * 1024;
+            if (file.size > maxSize) {
+                $api.msg('文件大小不能超过 20MB');
+                return;
+            }
+            // 开始上传
+            uploadResumeFile(tempFilePath, fileName, userId);
+        },
+        fail: (err) => {
+            console.error('选择文件失败:', err);
+            // 用户取消选择不提示错误
+            if (err.errMsg && !err.errMsg.includes('cancel')) {
+                $api.msg('选择文件失败，请重试');
+            }
+        }
+    });
+};
+
+// 上传简历文件到服务器（使用 wx.uploadFile，uni-app 中对应 uni.uploadFile）
+function uploadResumeFile(filePath, fileName, userId){
+    // 确保 userId 存在且有效
+    if (!userId) {
+        // 如果传入的userId为空，尝试从缓存再次获取
+        const cachedUserInfo = uni.getStorageSync('userInfo') || {};
+        const cachedUserId = cachedUserInfo.userId;
+        
+        if (!cachedUserId) {
+            $api.msg('用户ID不存在，无法上传');
+            return;
+        }
+        
+        // 使用缓存中的userId
+        userId = cachedUserId;
+    }
+
+    isUploading.value = true;
+    
+    // 获取token（从缓存获取，参考首页实现方式）
+    let Authorization = '';
+    const tokenValue = uni.getStorageSync('token') || '';
+    if (tokenValue) {
+        Authorization = tokenValue;
+    } else {
+        // 如果缓存中没有token，尝试从store获取
+        const userStore = useUserStore();
+        if (userStore.token) {
+            Authorization = userStore.token;
+        }
+    }
+
+    // 根据接口文档，bussinessId 应该作为 Query 参数传递，而不是 formData
+    // 将 bussinessId 拼接到 URL 上作为查询参数
+    const uploadUrl = `${config.baseUrl}/app/file/upload?bussinessId=${encodeURIComponent(String(userId))}`;
+	uni.uploadFile({
+		url: uploadUrl,
+		filePath: filePath,
+		name: 'file',
+		header: {
+		    'Authorization': encodeURIComponent(Authorization)
+		},
+		// formData: {
+		// 	'user': 'test'
+		// },
+		success: (uploadFileRes) => {
+			isUploading.value = false;
+			let resData;
+			if (typeof uploadFileRes.data === 'string') {
+			    resData = JSON.parse(uploadFileRes.data);
+			} else {
+			    resData = uploadFileRes.data;
+			}
+			
+			// 判断上传是否成功
+			if (uploadFileRes.statusCode === 200 && resData.code === 200) {
+				ceshi(resData.msg)
+			    // 上传成功，处理返回结果
+			    $api.msg('上传成功');
+			} else {
+			    // 上传失败
+			    const errorMsg = resData.msg || resData.message || '上传失败，请重试';
+			    $api.msg(errorMsg);
+			    // console.error('上传失败:', resData);
+			}
+		},
+		fail: (err) => {
+		    // 上传失败
+		    console.error('上传文件失败:', err);
+		    $api.msg('上传失败，请检查网络连接');
+		},
+	});
+};
+function ceshi(img){
+	isUploading.value = false;
+	let arr={name:uploadedResumeName.value,url:img || ''}
+	fileListss.list.push(arr)
+};
+// 删除已上传的简历
+const handleDeleteResume = (item) => {
+    if (!uploadedResumeName.value) {
+        return;
+    }
+
+    uni.showModal({
+        title: '确认删除',
+        content: '确定要删除已上传的证书吗？',
+        success: (res) => {
+            if (res.confirm) {
+				var array = JSON.parse(JSON.stringify(fileListss.list));
+				var index = array.indexOf(item);
+				if (index > -1) {
+				    array.splice(index, 1); // 从 index 处开始删除一个元素
+				}
+				fileListss.list=array
+                // 清除本地数据
+                uploadedResumeName.value = '';
+                $api.msg('已删除');
+                
+                // 如果需要，可以调用后端接口删除服务器上的文件
+                // deleteResumeFile(userId);
+            }
+        }
+    });
+};
+
+function handleResumeUpload2(){
+    // 从缓存获取用户ID（参考首页实现方式）
+    // 优先从store获取，如果为空则从缓存获取
+    const storeUserId = userInfo.value?.userId;
+    const cachedUserInfo = uni.getStorageSync('userInfo') || {};
+    const cachedUserId = cachedUserInfo.userId;
+    
+    // 获取用户ID：优先使用store中的userId，如果store中没有，使用缓存中的userId
+    const userId = storeUserId || cachedUserId;
+    
+    if (!userId) {
+        $api.msg('请先登录');
+        return;
+    }
+
+    // 检查是否正在上传
+    if (isUploading2.value) {
+        return;
+    }
+
+    // 选择文件（微信小程序使用 wx.chooseMessageFile，uni-app 中对应 uni.chooseMessageFile）
+    uni.chooseMessageFile({
+        count: 1, // 只能选择一个文件
+        type: 'file', // 选择任意文件类型
+        success: (res) => {
+            // 注意：文件路径在 res.tempFiles[0].path
+            const file = res.tempFiles[0];
+            const tempFilePath = file.path; // 获取临时文件路径
+            const fileName = file.name; // 获取文件名
+			uploadedResumeName2.value=file.name
+            // 检查文件大小（20MB = 20 * 1024 * 1024 字节）
+            const maxSize = 20 * 1024 * 1024;
+            if (file.size > maxSize) {
+                $api.msg('文件大小不能超过 20MB');
+                return;
+            }
+            // 开始上传
+            uploadResumeFile2(tempFilePath, fileName, userId);
+        },
+        fail: (err) => {
+            console.error('选择文件失败:', err);
+            // 用户取消选择不提示错误
+            if (err.errMsg && !err.errMsg.includes('cancel')) {
+                $api.msg('选择文件失败，请重试');
+            }
+        }
+    });
+};
+
+// 上传简历文件到服务器（使用 wx.uploadFile，uni-app 中对应 uni.uploadFile）
+function uploadResumeFile2(filePath, fileName, userId){
+    // 确保 userId 存在且有效
+    if (!userId) {
+        // 如果传入的userId为空，尝试从缓存再次获取
+        const cachedUserInfo = uni.getStorageSync('userInfo') || {};
+        const cachedUserId = cachedUserInfo.userId;
+        
+        if (!cachedUserId) {
+            $api.msg('用户ID不存在，无法上传');
+            return;
+        }
+        
+        // 使用缓存中的userId
+        userId = cachedUserId;
+    }
+
+    isUploading2.value = true;
+    
+    // 获取token（从缓存获取，参考首页实现方式）
+    let Authorization = '';
+    const tokenValue = uni.getStorageSync('token') || '';
+    if (tokenValue) {
+        Authorization = tokenValue;
+    } else {
+        // 如果缓存中没有token，尝试从store获取
+        const userStore = useUserStore();
+        if (userStore.token) {
+            Authorization = userStore.token;
+        }
+    }
+
+    // 根据接口文档，bussinessId 应该作为 Query 参数传递，而不是 formData
+    // 将 bussinessId 拼接到 URL 上作为查询参数
+    const uploadUrl = `${config.baseUrl}/app/file/upload?bussinessId=${encodeURIComponent(String(userId))}`;
+	uni.uploadFile({
+		url: uploadUrl,
+		filePath: filePath,
+		name: 'file',
+		header: {
+		    'Authorization': encodeURIComponent(Authorization)
+		},
+		// formData: {
+		// 	'user': 'test'
+		// },
+		success: (uploadFileRes) => {
+			isUploading2.value = false;
+			let resData;
+			if (typeof uploadFileRes.data === 'string') {
+			    resData = JSON.parse(uploadFileRes.data);
+			} else {
+			    resData = uploadFileRes.data;
+			}
+			
+			// 判断上传是否成功
+			if (uploadFileRes.statusCode === 200 && resData.code === 200) {
+				ceshi2(resData.msg)
+			    // 上传成功，处理返回结果
+			    $api.msg('上传成功');
+			} else {
+			    // 上传失败
+			    const errorMsg = resData.msg || resData.message || '上传失败，请重试';
+			    $api.msg(errorMsg);
+			    // console.error('上传失败:', resData);
+			}
+		},
+		fail: (err) => {
+		    // 上传失败
+		    console.error('上传文件失败:', err);
+		    $api.msg('上传失败，请检查网络连接');
+		},
+	});
+};
+function ceshi2(img){
+	isUploading2.value = false;
+	uploadedResumeUrl.value=img;
+};
+</script>
+
+<style lang="stylus" scoped>
+.btn{
+    margin-top: -30rpx
+}
+.input-required{
+	color: red
+}
+/* 上传按钮 */
+.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;
+  margin-top: 20rpx;
+}
+
+.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>view {
+  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;
+}
+.content{
+    padding: 28rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start
+    height: calc(100% - 120rpx)
+
+}
+.footer{
+	width: 100%;
+	height: 120rpx;
+	background: #fff;
+	position: fixed;
+	z-index: 10;
+	bottom: 0;
+	left: 0;
+	display: flex;
+	align-content: center;
+	justify-content: center;
+}
+.footerBtn{
+	width: 90%;
+	height: 90rpx;
+	line-height: 90rpx;
+	text-align: center
+	border-radius: 10rpx;
+	color: #fff;
+	background: #409EFF;
+}
+.content-input
+    margin-bottom: 52rpx
+    .input-titile
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #6A6A6A
+    .input-con
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #333333;
+        line-height: 80rpx;
+        height: 80rpx;
+        border-bottom: 2rpx solid #EBEBEB
+        position: relative;
+    .error-message
+        color: #ff4757;
+        font-size: 24rpx;
+        margin-top: 10rpx;
+        line-height: 1.4;
+    .success-message
+        color: #2ed573;
+        font-size: 24rpx;
+        margin-top: 10rpx;
+        line-height: 1.4;
+    .input-error
+        .input-con
+            border-bottom-color: #ff4757;
+    .triangle::before
+        position: absolute;
+        right: 20rpx;
+        top: calc(50% - 2rpx);
+        content: '';
+        width: 4rpx;
+        height: 18rpx;
+        border-radius: 2rpx
+        background: #697279;
+        transform: translate(0, -50%) rotate(-45deg) ;
+    .triangle::after
+        position: absolute;
+        right: 20rpx;
+        top: 50%;
+        content: '';
+        width: 4rpx;
+        height: 18rpx;
+        border-radius: 2rpx
+        background: #697279;
+        transform: rotate(45deg)
+.input-nx
+    position: relative
+    border-bottom: 2rpx solid #EBEBEB
+    padding-bottom: 30rpx
+    display: flex
+    flex-wrap: wrap
+    .nx-item
+        padding: 16rpx 24rpx
+        width: fit-content
+        border-radius: 20rpx
+        border: 2rpx solid #E8EAEE
+        background-color: #f8f9fa
+        margin-right: 16rpx
+        margin-top: 16rpx
+        font-size: 28rpx
+        color: #333333
+        transition: all 0.2s ease
+        
+        &:hover
+            background-color: #e9ecef
+            border-color: #256bfa
+            color: #256bfa
+.content-sex
+    height: 110rpx;
+    display: flex
+    justify-content: space-between;
+    align-items: flex-start;
+    border-bottom: 2rpx solid #EBEBEB
+    margin-bottom: 52rpx
+    .sex-titile
+        line-height: 80rpx;
+    .sext-ri
+        display: flex
+        align-items: center;
+        .sext-box
+            height: 76rpx;
+            width: 152rpx;
+            text-align: center;
+            line-height: 80rpx;
+            border-radius: 12rpx 12rpx 12rpx 12rpx
+            border: 2rpx solid #E8EAEE;
+            margin-left: 28rpx
+            font-weight: 400;
+            font-size: 28rpx;
+        .sext-boxactive
+            color: #256BFA
+            background: rgba(37,107,250,0.1);
+            border: 2rpx solid #256BFA;
+    .next-btn
+        width: 100%;
+        height: 90rpx;
+        background: #256BFA;
+        border-radius: 12rpx 12rpx 12rpx 12rpx;
+        font-weight: 500;
+        font-size: 32rpx;
+        color: #FFFFFF;
+        text-align: center;
+        line-height: 90rpx
+
+// 技能信息样式
+.content-skills
+    margin-bottom: 52rpx
+    
+    .skills-header
+        display: flex
+        justify-content: space-between
+        align-items: center
+        margin-bottom: 32rpx
+        
+        .input-titile
+            font-weight: 400
+            font-size: 28rpx
+            color: #6A6A6A
+        
+        .add-skill-btn
+            padding: 16rpx 32rpx
+            background: #256BFA
+            color: #FFFFFF
+            border-radius: 8rpx
+            font-size: 26rpx
+            font-weight: 500
+            transition: all 0.3s ease
+            
+            &:active
+                background: #1a5cd9
+                transform: scale(0.98)
+            
+            &.disabled
+                background: #CCCCCC
+                color: #999999
+                cursor: not-allowed
+                
+                &:active
+                    background: #CCCCCC
+                    transform: none
+    
+    .skills-list
+        .skill-item
+            background: #FFFFFF
+            border: 2rpx solid #E8EAEE
+            border-radius: 12rpx
+            padding: 24rpx
+            margin-bottom: 24rpx
+            box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05)
+            transition: all 0.3s ease
+            
+            &:hover
+                box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.1)
+                border-color: #256BFA
+            
+            .skill-header
+                display: flex
+                justify-content: space-between
+                align-items: center
+                margin-bottom: 20rpx
+                
+                .skill-number
+                    font-weight: 500
+                    font-size: 28rpx
+                    color: #333333
+                
+                .skill-actions
+                    .action-btn
+                        padding: 8rpx 16rpx
+                        border-radius: 6rpx
+                        font-size: 24rpx
+                        font-weight: 400
+                        transition: all 0.2s ease
+                        
+                        &.delete-btn
+                            background: #FF4D4F
+                            color: #FFFFFF
+                            
+                            &:active
+                                background: #D9363E
+                                transform: scale(0.95)
+            
+            .skill-fields
+                display: flex
+                flex-direction: column
+                gap: 20rpx
+                
+                .skill-field
+                    .field-label
+                        font-weight: 400
+                        font-size: 26rpx
+                        color: #6A6A6A
+                        margin-bottom: 8rpx
+                    
+                    .field-input
+                        font-weight: 400
+                        font-size: 28rpx
+                        color: #333333
+                        line-height: 72rpx
+                        height: 72rpx
+                        border: 2rpx solid #E8EAEE
+                        border-radius: 8rpx
+                        padding: 0 20rpx
+                        background: #F8F9FA
+                        transition: all 0.3s ease
+                        
+                        &:focus
+                            border-color: #256BFA
+                            background: #FFFFFF
+                        
+                        &.triangle::before
+                            right: 30rpx
+                            top: calc(50% - 2rpx)
+                        
+                        &.triangle::after
+                            right: 30rpx
+                            top: 50%
+    
+    .empty-skills
+        text-align: center
+        padding: 60rpx 0
+        background: #F8F9FA
+        border-radius: 12rpx
+        border: 2rpx dashed #E8EAEE
+        
+        .empty-text
+            font-size: 28rpx
+            color: #999999
+            font-weight: 400
+</style>
diff --git a/packageB/institution/trainingInstitutionMaintenance.vue b/packageB/institution/trainingInstitutionMaintenance.vue
new file mode 100644
index 0000000..7716de9
--- /dev/null
+++ b/packageB/institution/trainingInstitutionMaintenance.vue
@@ -0,0 +1,986 @@
+<template>
+    <div style="height: 90vh;overflow-y: auto;">
+        <view class="content">
+            <view class="content-input">
+                <view class="input-titile"><text class="input-required">*</text>机构名称</view>
+                <input class="input-con" v-model="fromValue.organName" placeholder="请输入机构名称" />
+            </view>
+            <view class="content-input">
+                <view class="input-titile"><text class="input-required">*</text>联系人</view>
+                <input class="input-con" v-model="fromValue.contactName" placeholder="请输入联系人" />
+            </view>
+			<view class="content-input">
+			    <view class="input-titile">联系方式</view>
+			    <input class="input-con" v-model="fromValue.contactPhone" placeholder="请输入您的联系方式" />
+			</view>
+			<view class="content-input">
+			    <view class="input-titile">机构类别</view>
+			    <input class="input-con" v-model="fromValue.organType" placeholder="请输入机构类别" />
+			</view>
+			<view class="content-input">
+			    <view class="input-titile">机构性质</view>
+			    <input class="input-con" v-model="fromValue.organNature" placeholder="请输入机构性质" />
+			</view>
+			<view class="content-input">
+			    <view class="input-titile">培训级别及证书类型</view>
+			    <input class="input-con" v-model="fromValue.trainType" placeholder="请输入培训级别及证书类型" />
+			</view>
+			<view class="content-input">
+			    <view class="input-titile">办学许可证号/批文号</view>
+			    <input class="input-con" v-model="fromValue.organLicense" placeholder="请输入办学许可证号/批文号" />
+			</view>
+            <view class="content-input">
+                <view class="input-titile">所在区域</view>
+				<view class="input-con">
+					<picker mode = 'multiSelector' 
+					@change="onWorkTypePickerChange"
+					@columnchange="onWorkTypeColumnChange"
+					range-key="dictLabel" 
+					:value="fromValue.organAddressArr" 
+					:range="region.provinceData">
+						<view class="uni-input" v-if="isShow" style="width: 100%;">{{region.provinceData[0][region.arrayIndex[0]].dictLabel}}/{{region.provinceData[1][region.arrayIndex[1]].dictLabel}}/{{region.provinceData[2].length>0?region.provinceData[2][region.arrayIndex[2]].dictLabel:''}}</view>
+						<view class="uni-input" style="width: 100%;" v-else>请选择</view>
+					</picker>
+				</view>
+                <!-- <input class="input-con" v-model="fromValue.organAddressArr" placeholder="请选择" /> -->
+            </view>
+			<view class="content-input">
+			    <view class="input-titile">机构地址</view>
+			    <input class="input-con" v-model="fromValue.address" placeholder="请输入机构地址" />
+			</view>
+			<view class="content-input">
+			    <view class="input-titile">地图定位(经纬度)</view>
+				<view @click="selectLocation" class="input-con">{{fromValue.location?fromValue.location:'请选择'}}</view>
+			</view>
+			<view class="content-input">
+			    <view class="input-titile"><text class="input-required">*</text>统一社会信用代码</view>
+			    <input class="input-con" v-model="fromValue.unifiedSocialCreditCode" placeholder="请输入统一社会信用代码" />
+			</view>
+			<view class="content-input">
+			    <view class="input-titile">机构简介</view>
+			    <textarea auto-height class="input-con" v-model="fromValue.introduction" placeholder="请输入机构简介" />
+			</view>
+			<view class="content-input">
+			    <view class="input-titile">培训项目</view>
+				
+			    <checkbox-group @change="checkboxChange">
+					<view style="display: flex;flex-wrap: wrap;">
+						<view v-for="item in courseLabels" :key="item.dictCode" style="margin-right: 20rpx;margin-bottom: 20rpx;">
+							<label>
+								<checkbox :value="item.dictCode" :checked="item.checked" />
+								{{item.dictLabel}}
+							</label>
+						</view>
+					</view>
+					
+				</checkbox-group>
+			</view>
+			<view class="content-input">
+			    <view class="input-titile">资质证书</view>
+				<button class="upload-btn" type="primary" size="mini" @click="handleResumeUpload" :loading="isUploading" :disabled="isUploading">
+				    <uni-icons type="cloud-upload" size="20"></uni-icons>
+				    <text class="upload-text">上传</text>
+				</button>
+				<view class="uploaded-file-info" v-if="fileListss.list.length>0">
+					<view v-for="item in fileListss.list" :key="item.url" >
+						<image class="file-icon" src="/static/icons/file-icon.png" mode="widthFix"></image>
+						<text class="file-name">{{ item.name }}</text>
+						<button class="delete-file-btn" size="mini" @click.stop="handleDeleteResume(item)">删除</button>
+					</view>
+				</view>
+			</view>
+			<view class="content-input">
+			    <view class="input-titile">机构LOGO</view>
+				<button class="upload-btn" type="primary" size="mini" @click="handleResumeUpload2" :loading="isUploading2" :disabled="isUploading2">
+				    <uni-icons type="cloud-upload" size="20"></uni-icons>
+				    <text class="upload-text">上传</text>
+				</button>
+				<view class="uploaded-file-info" style="width: 200rpx;height: 200rpx;">
+					<img :src="uploadedResumeUrl" alt="" />
+				</view>
+			</view>
+        </view>
+		<view class="footer">
+			<view class="footerBtn" @click="confirm()">保存</view>
+		</view>
+        <SelectPopup ref="selectPopupRef"></SelectPopup>
+	</div>
+</template>
+
+<script setup>
+import { reactive, inject, watch, ref, onMounted, onUnmounted } from 'vue';
+import { onLoad, onShow } from '@dcloudio/uni-app';
+const { $api, navTo, navBack, checkingPhoneRegExp,config } = inject('globalFunction');
+import { storeToRefs } from 'pinia';
+import useUserStore from '@/stores/useUserStore';
+import useDictStore from '@/stores/useDictStore';
+import SelectPopup from '@/components/selectPopup/selectPopup.vue';
+const { userInfo } = storeToRefs(useUserStore());
+const { getUserResume } = useUserStore();
+const dictStore = useDictStore();
+const { dictLabel, oneDictData, complete: dictComplete, getDictSelectOption } = dictStore;
+
+let fromValue = reactive({
+    organName: '',
+	contactName:'',
+	organType:'',
+	organNature:'',
+	trainType:'',
+	organLicense:'',
+	organAddressArr:'',
+	address:'',
+	unifiedSocialCreditCode:'',
+	introduction:'',
+	location:'',
+	longitude:'',
+	latitude:'',
+    education: '',
+    politicalAffiliation: '',
+    contactPhone: ''
+});
+const courseLabels=ref([])
+let fileListss=reactive({
+	list:[],
+})
+let region=reactive({
+	provinceData:[
+		[],
+		[],
+		[]
+	],
+	arrayIndex:[0,0,0],
+})
+const isShow = ref(false); // 上传中状态
+const isUploading = ref(false); // 上传中状态
+const isUploading2 = ref(false); // 上传中状态
+const uploadedResumeName = ref('');
+let uploadedResumeName2 = ref('');
+let uploadedResumeUrl = ref(''); // 已上传
+// 在onLoad中初始化数据，确保页面加载时就能获取技能信息
+onLoad((options = {}) => {
+    getRegion(1,650000000000)
+    getDictionary()
+	setTimeout(()=>{
+		getDetail()
+	},2000)
+});
+
+// 监听页面显示，接收从技能查询页面返回的数据
+onShow(() => {
+	let params = uni.globalParams || {}; // 从全局变量获取参数
+	if(params.longitude&&params.latitude){
+		fromValue.location=params.longitude+','+params.latitude
+		fromValue.longitude=params.longitude
+		fromValue.latitude=params.latitude
+	}
+	uni.globalParams = null; // 清除全局变量，避免重复使用
+	
+    // 通过事件总线接收技能选择结果
+    // uni.$on('skillSelected', handleSkillSelected);
+});
+
+// 页面卸载时移除事件监听
+// onUnmounted(() => {
+//     uni.$off('skillSelected', handleSkillSelected);
+// });
+// 监听字典数据加载完成，自动更新学历显示
+watch(() => region.provinceData[0], (newVal) => {
+    if (newVal&&isShow.value==false) {
+		getRegion(2,region.provinceData[0][0].dictValue)
+    }
+});
+watch(() => region.provinceData[1], (newVal) => {
+    if (newVal&&isShow.value==false) {
+		getRegion(3,region.provinceData[1][0].dictValue)
+    }
+});
+function getDetail(){
+	// if(userInfo.userId){
+		$api.myRequest("/train/public/train/organ/getTrainByUnifiedSocialCreditCode", {
+			tags: "913700001630477270",
+		}, "GET", 9100, {
+			Authorization: `Bearer ${uni.getStorageSync('token')}`,
+			'Content-Type': "application/x-www-form-urlencoded"
+		}).then((res) => {
+			if (res.code === 200) {
+				getRegion(2,res.data.organProvince)
+				getRegion(3,res.data.organCity)
+			  fromValue = {
+			    ...fromValue,
+			    ...res.data,
+			    location: `${res.data.longitude},${res.data.latitude}`||'',
+			    organAddressArr: [
+			      res.data.organProvince,
+			      res.data.organCity,
+			      res.data.organCounty,
+			    ],
+			  };
+			  
+			  let courseLists=res.data.course.split(",")
+			  courseLists.forEach(item=>{
+				  courseLabels.value.forEach(val=>{
+					  if(item==val.dictValue){
+						  val.checked=true
+					  }
+				  })
+			  })
+			  isShow.value=true
+			  uploadedResumeName2.value = res.data.logo?(JSON.parse(res.data.logo))[0].name:'';
+			  uploadedResumeUrl.value = res.data.logo?config.trainVideoImgUrl+(JSON.parse(res.data.logo))[0].url:'';
+			  fileListss.list = JSON.parse(res.data.zhengshu) || [];
+			  setTimeout(()=>{
+				  region.provinceData[0].forEach((item,index)=>{
+					  if(item.dictValue==res.data.organProvince){
+						  region.arrayIndex[0]=index
+					  }
+				  })
+				  region.provinceData[1].forEach((item,index)=>{
+					  if(item.dictValue==res.data.organCity){
+						  region.arrayIndex[1]=index
+					  }
+				  })
+				  region.provinceData[2].forEach((item,index)=>{
+					  if(item.dictValue==res.data.organCounty){
+						  region.arrayIndex[2]=index
+					  }
+				  })
+			  },2000)
+			}
+		})
+	// }else{
+	// 	$api.msg('请先登录');
+	// }
+}
+function getDictionary(){
+	$api.myRequest('/system/public/dict/data/type/course_type', {},'get',9100).then((resData) => {
+		courseLabels.value=resData.data;
+		courseLabels.value.forEach(item=>{
+			item.checked=false;
+		})
+	});
+}
+function getRegion(level,value){
+	let header = {
+		'Authorization': uni.getStorageSync('token')||'',
+		'Content-Type': "application/x-www-form-urlencoded"
+	};
+	$api.myRequest('/system/public/dict/data/getByParentValue', {
+		dictType: "administrative_division",
+		dictParentValue: value ? value: "-1",
+		childFlag: (level&&level > 1) ? "0" : "1",
+	},'post',9100,header).then((resData) => {
+		if(resData.code==200){
+			region.provinceData[level-1]=resData.data
+		}
+	});
+}
+function onWorkTypePickerChange(e){
+	region.arrayIndex=e.detail.value;
+	isShow.value=true
+}
+function onWorkTypeColumnChange(e){
+	
+	const { column, value } = e.detail;
+	const newIndexes = [...region.arrayIndex];
+	newIndexes[column] = value;
+	
+	// 重置后续列的数据
+	if (column === 0) {
+		// 第一列变化，重置第二、三列
+		const selectedLevel1 = region.provinceData[0][value];
+		if (selectedLevel1) {
+			getRegion(2,selectedLevel1.dictValue)
+			region.arrayIndex[1] = 0;
+			region.arrayIndex[2] = 0;
+		}
+	} else if (column === 1) {
+		// 第二列变化，重置第三列
+		const selectedLevel2 = this.workTypeColumns[1][value];
+		if (selectedLevel2) {
+			getRegion(3,selectedLevel2.dictValue)
+			region.arrayIndex[2] = 0;
+		}
+	}
+	this.workTypeIndexes = newIndexes;
+}
+const confirm = () => {
+    if (!fromValue.organName) {
+        return $api.msg('请输入机构名称');
+    }
+	if (!fromValue.contactName) {
+	    return $api.msg('请输入联系人');
+	}
+	if (!fromValue.contactPhone) {
+	    return $api.msg('请输入联系方式');
+	}
+	if (!checkingPhoneRegExp(fromValue.contactPhone)) {
+	    return $api.msg('请输入正确联系方式');
+	}
+	if (!fromValue.unifiedSocialCreditCode) {
+	    return $api.msg('请输入统一社会信用代码');
+	}
+	fromValue.organAddressArr=[
+		region.provinceData[0][region.arrayIndex[0]].dictValue,
+		region.provinceData[1][region.arrayIndex[1]].dictValue,
+		region.provinceData[2][region.arrayIndex[2]].dictValue
+	]
+	let courseList=[]
+	courseLabels.value.forEach(item=>{
+		if(item.checked==true){
+			courseList.push(item.dictValue)
+		}
+	})
+    const params = {
+        ...fromValue,
+		organProvince: region.provinceData[0][region.arrayIndex[0]].dictValue, // 机构所在省
+		organCity: region.provinceData[1][region.arrayIndex[1]].dictValue, // 机构所在市
+		organCounty: region.provinceData[2][region.arrayIndex[2]].dictValue, // 机构所在区县
+		zhengshu: JSON.stringify(fileListss.list),
+		course: courseList.join(","), // 培训项目
+		logo: JSON.stringify([{name:uploadedResumeName2.value,url:uploadedResumeUrl.value}]), // 机构logo
+    };
+    $api.myRequest('/train/public/train/organ/maintainTrainOrgan', params, 'post').then((resData) => {
+		if(resData.code==200){
+			$api.msg(resData.msg);
+			setTimeout(()=>{
+				navBack();
+			},2000)
+		}
+		
+    });
+};
+
+function checkboxChange(e){
+	var items = courseLabels.value,
+		values = e.detail.value;
+	for (var i = 0, lenI = items.length; i < lenI; ++i) {
+		const item = items[i]
+		if(values.includes(item.value)){
+			this.$set(item,'checked',true)
+		}else{
+			this.$set(item,'checked',false)
+		}
+	}
+}
+function selectLocation(){
+	uni.navigateTo({
+		url:'/packageB/components/map?location='+fromValue.location
+	})
+}
+
+function handleResumeUpload(){
+    // 从缓存获取用户ID（参考首页实现方式）
+    // 优先从store获取，如果为空则从缓存获取
+    const storeUserId = userInfo.value?.userId;
+    const cachedUserInfo = uni.getStorageSync('userInfo') || {};
+    const cachedUserId = cachedUserInfo.userId;
+    
+    // 获取用户ID：优先使用store中的userId，如果store中没有，使用缓存中的userId
+    const userId = storeUserId || cachedUserId;
+    
+    if (!userId) {
+        $api.msg('请先登录');
+        return;
+    }
+
+    // 检查是否正在上传
+    if (isUploading.value) {
+        return;
+    }
+
+    // 选择文件（微信小程序使用 wx.chooseMessageFile，uni-app 中对应 uni.chooseMessageFile）
+    uni.chooseMessageFile({
+        count: 1, // 只能选择一个文件
+        type: 'file', // 选择任意文件类型
+        success: (res) => {
+            // 注意：文件路径在 res.tempFiles[0].path
+            const file = res.tempFiles[0];
+            const tempFilePath = file.path; // 获取临时文件路径
+            const fileName = file.name; // 获取文件名
+            uploadedResumeName.value=file.name
+            // 检查文件大小（20MB = 20 * 1024 * 1024 字节）
+            const maxSize = 20 * 1024 * 1024;
+            if (file.size > maxSize) {
+                $api.msg('文件大小不能超过 20MB');
+                return;
+            }
+            // 开始上传
+            uploadResumeFile(tempFilePath, fileName, userId);
+        },
+        fail: (err) => {
+            console.error('选择文件失败:', err);
+            // 用户取消选择不提示错误
+            if (err.errMsg && !err.errMsg.includes('cancel')) {
+                $api.msg('选择文件失败，请重试');
+            }
+        }
+    });
+};
+
+// 上传简历文件到服务器（使用 wx.uploadFile，uni-app 中对应 uni.uploadFile）
+function uploadResumeFile(filePath, fileName, userId){
+    // 确保 userId 存在且有效
+    if (!userId) {
+        // 如果传入的userId为空，尝试从缓存再次获取
+        const cachedUserInfo = uni.getStorageSync('userInfo') || {};
+        const cachedUserId = cachedUserInfo.userId;
+        
+        if (!cachedUserId) {
+            $api.msg('用户ID不存在，无法上传');
+            return;
+        }
+        
+        // 使用缓存中的userId
+        userId = cachedUserId;
+    }
+
+    isUploading.value = true;
+    
+    // 获取token（从缓存获取，参考首页实现方式）
+    let Authorization = '';
+    const tokenValue = uni.getStorageSync('token') || '';
+    if (tokenValue) {
+        Authorization = tokenValue;
+    } else {
+        // 如果缓存中没有token，尝试从store获取
+        const userStore = useUserStore();
+        if (userStore.token) {
+            Authorization = userStore.token;
+        }
+    }
+
+    // 根据接口文档，bussinessId 应该作为 Query 参数传递，而不是 formData
+    // 将 bussinessId 拼接到 URL 上作为查询参数
+    const uploadUrl = `${config.baseUrl}/app/file/upload?bussinessId=${encodeURIComponent(String(userId))}`;
+	uni.uploadFile({
+		url: uploadUrl,
+		filePath: filePath,
+		name: 'file',
+		header: {
+		    'Authorization': encodeURIComponent(Authorization)
+		},
+		// formData: {
+		// 	'user': 'test'
+		// },
+		success: (uploadFileRes) => {
+			isUploading.value = false;
+			let resData;
+			if (typeof uploadFileRes.data === 'string') {
+			    resData = JSON.parse(uploadFileRes.data);
+			} else {
+			    resData = uploadFileRes.data;
+			}
+			
+			// 判断上传是否成功
+			if (uploadFileRes.statusCode === 200 && resData.code === 200) {
+				ceshi(resData.msg)
+			    // 上传成功，处理返回结果
+			    $api.msg('上传成功');
+			} else {
+			    // 上传失败
+			    const errorMsg = resData.msg || resData.message || '上传失败，请重试';
+			    $api.msg(errorMsg);
+			    // console.error('上传失败:', resData);
+			}
+		},
+		fail: (err) => {
+		    // 上传失败
+		    console.error('上传文件失败:', err);
+		    $api.msg('上传失败，请检查网络连接');
+		},
+	});
+};
+function ceshi(img){
+	isUploading.value = false;
+	let arr={name:uploadedResumeName.value,url:img || ''}
+	fileListss.list.push(arr)
+};
+// 删除已上传的简历
+const handleDeleteResume = (item) => {
+    if (!uploadedResumeName.value) {
+        return;
+    }
+
+    uni.showModal({
+        title: '确认删除',
+        content: '确定要删除已上传的证书吗？',
+        success: (res) => {
+            if (res.confirm) {
+				var array = JSON.parse(JSON.stringify(fileListss.list));
+				var index = array.indexOf(item);
+				if (index > -1) {
+				    array.splice(index, 1); // 从 index 处开始删除一个元素
+				}
+				fileListss.list=array
+                // 清除本地数据
+                uploadedResumeName.value = '';
+                $api.msg('已删除');
+                
+                // 如果需要，可以调用后端接口删除服务器上的文件
+                // deleteResumeFile(userId);
+            }
+        }
+    });
+};
+
+function handleResumeUpload2(){
+    // 从缓存获取用户ID（参考首页实现方式）
+    // 优先从store获取，如果为空则从缓存获取
+    const storeUserId = userInfo.value?.userId;
+    const cachedUserInfo = uni.getStorageSync('userInfo') || {};
+    const cachedUserId = cachedUserInfo.userId;
+    
+    // 获取用户ID：优先使用store中的userId，如果store中没有，使用缓存中的userId
+    const userId = storeUserId || cachedUserId;
+    
+    if (!userId) {
+        $api.msg('请先登录');
+        return;
+    }
+
+    // 检查是否正在上传
+    if (isUploading2.value) {
+        return;
+    }
+
+    // 选择文件（微信小程序使用 wx.chooseMessageFile，uni-app 中对应 uni.chooseMessageFile）
+    uni.chooseMessageFile({
+        count: 1, // 只能选择一个文件
+        type: 'file', // 选择任意文件类型
+        success: (res) => {
+            // 注意：文件路径在 res.tempFiles[0].path
+            const file = res.tempFiles[0];
+            const tempFilePath = file.path; // 获取临时文件路径
+            const fileName = file.name; // 获取文件名
+			uploadedResumeName2.value=file.name
+            // 检查文件大小（20MB = 20 * 1024 * 1024 字节）
+            const maxSize = 20 * 1024 * 1024;
+            if (file.size > maxSize) {
+                $api.msg('文件大小不能超过 20MB');
+                return;
+            }
+            // 开始上传
+            uploadResumeFile2(tempFilePath, fileName, userId);
+        },
+        fail: (err) => {
+            console.error('选择文件失败:', err);
+            // 用户取消选择不提示错误
+            if (err.errMsg && !err.errMsg.includes('cancel')) {
+                $api.msg('选择文件失败，请重试');
+            }
+        }
+    });
+};
+
+// 上传简历文件到服务器（使用 wx.uploadFile，uni-app 中对应 uni.uploadFile）
+function uploadResumeFile2(filePath, fileName, userId){
+    // 确保 userId 存在且有效
+    if (!userId) {
+        // 如果传入的userId为空，尝试从缓存再次获取
+        const cachedUserInfo = uni.getStorageSync('userInfo') || {};
+        const cachedUserId = cachedUserInfo.userId;
+        
+        if (!cachedUserId) {
+            $api.msg('用户ID不存在，无法上传');
+            return;
+        }
+        
+        // 使用缓存中的userId
+        userId = cachedUserId;
+    }
+
+    isUploading2.value = true;
+    
+    // 获取token（从缓存获取，参考首页实现方式）
+    let Authorization = '';
+    const tokenValue = uni.getStorageSync('token') || '';
+    if (tokenValue) {
+        Authorization = tokenValue;
+    } else {
+        // 如果缓存中没有token，尝试从store获取
+        const userStore = useUserStore();
+        if (userStore.token) {
+            Authorization = userStore.token;
+        }
+    }
+
+    // 根据接口文档，bussinessId 应该作为 Query 参数传递，而不是 formData
+    // 将 bussinessId 拼接到 URL 上作为查询参数
+    const uploadUrl = `${config.baseUrl}/app/file/upload?bussinessId=${encodeURIComponent(String(userId))}`;
+	uni.uploadFile({
+		url: uploadUrl,
+		filePath: filePath,
+		name: 'file',
+		header: {
+		    'Authorization': encodeURIComponent(Authorization)
+		},
+		// formData: {
+		// 	'user': 'test'
+		// },
+		success: (uploadFileRes) => {
+			isUploading2.value = false;
+			let resData;
+			if (typeof uploadFileRes.data === 'string') {
+			    resData = JSON.parse(uploadFileRes.data);
+			} else {
+			    resData = uploadFileRes.data;
+			}
+			
+			// 判断上传是否成功
+			if (uploadFileRes.statusCode === 200 && resData.code === 200) {
+				ceshi2(resData.msg)
+			    // 上传成功，处理返回结果
+			    $api.msg('上传成功');
+			} else {
+			    // 上传失败
+			    const errorMsg = resData.msg || resData.message || '上传失败，请重试';
+			    $api.msg(errorMsg);
+			    // console.error('上传失败:', resData);
+			}
+		},
+		fail: (err) => {
+		    // 上传失败
+		    console.error('上传文件失败:', err);
+		    $api.msg('上传失败，请检查网络连接');
+		},
+	});
+};
+function ceshi2(img){
+	isUploading2.value = false;
+	uploadedResumeUrl.value=img;
+};
+</script>
+
+<style lang="stylus" scoped>
+.btn{
+    margin-top: -30rpx
+}
+.input-required{
+	color: red
+}
+/* 上传按钮 */
+.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;
+  margin-top: 20rpx;
+}
+
+.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>view {
+  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;
+}
+.content{
+    padding: 28rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start
+    height: calc(100% - 120rpx)
+
+}
+.footer{
+	width: 100%;
+	height: 120rpx;
+	background: #fff;
+	position: fixed;
+	z-index: 10;
+	bottom: 0;
+	left: 0;
+	display: flex;
+	align-content: center;
+	justify-content: center;
+}
+.footerBtn{
+	width: 90%;
+	height: 90rpx;
+	line-height: 90rpx;
+	text-align: center
+	border-radius: 10rpx;
+	color: #fff;
+	background: #409EFF;
+}
+.content-input
+    margin-bottom: 52rpx
+    .input-titile
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #6A6A6A
+    .input-con
+        font-weight: 400;
+        font-size: 32rpx;
+        color: #333333;
+        line-height: 80rpx;
+        height: 80rpx;
+        border-bottom: 2rpx solid #EBEBEB
+        position: relative;
+    .error-message
+        color: #ff4757;
+        font-size: 24rpx;
+        margin-top: 10rpx;
+        line-height: 1.4;
+    .success-message
+        color: #2ed573;
+        font-size: 24rpx;
+        margin-top: 10rpx;
+        line-height: 1.4;
+    .input-error
+        .input-con
+            border-bottom-color: #ff4757;
+    .triangle::before
+        position: absolute;
+        right: 20rpx;
+        top: calc(50% - 2rpx);
+        content: '';
+        width: 4rpx;
+        height: 18rpx;
+        border-radius: 2rpx
+        background: #697279;
+        transform: translate(0, -50%) rotate(-45deg) ;
+    .triangle::after
+        position: absolute;
+        right: 20rpx;
+        top: 50%;
+        content: '';
+        width: 4rpx;
+        height: 18rpx;
+        border-radius: 2rpx
+        background: #697279;
+        transform: rotate(45deg)
+.input-nx
+    position: relative
+    border-bottom: 2rpx solid #EBEBEB
+    padding-bottom: 30rpx
+    display: flex
+    flex-wrap: wrap
+    .nx-item
+        padding: 16rpx 24rpx
+        width: fit-content
+        border-radius: 20rpx
+        border: 2rpx solid #E8EAEE
+        background-color: #f8f9fa
+        margin-right: 16rpx
+        margin-top: 16rpx
+        font-size: 28rpx
+        color: #333333
+        transition: all 0.2s ease
+        
+        &:hover
+            background-color: #e9ecef
+            border-color: #256bfa
+            color: #256bfa
+.content-sex
+    height: 110rpx;
+    display: flex
+    justify-content: space-between;
+    align-items: flex-start;
+    border-bottom: 2rpx solid #EBEBEB
+    margin-bottom: 52rpx
+    .sex-titile
+        line-height: 80rpx;
+    .sext-ri
+        display: flex
+        align-items: center;
+        .sext-box
+            height: 76rpx;
+            width: 152rpx;
+            text-align: center;
+            line-height: 80rpx;
+            border-radius: 12rpx 12rpx 12rpx 12rpx
+            border: 2rpx solid #E8EAEE;
+            margin-left: 28rpx
+            font-weight: 400;
+            font-size: 28rpx;
+        .sext-boxactive
+            color: #256BFA
+            background: rgba(37,107,250,0.1);
+            border: 2rpx solid #256BFA;
+    .next-btn
+        width: 100%;
+        height: 90rpx;
+        background: #256BFA;
+        border-radius: 12rpx 12rpx 12rpx 12rpx;
+        font-weight: 500;
+        font-size: 32rpx;
+        color: #FFFFFF;
+        text-align: center;
+        line-height: 90rpx
+
+// 技能信息样式
+.content-skills
+    margin-bottom: 52rpx
+    
+    .skills-header
+        display: flex
+        justify-content: space-between
+        align-items: center
+        margin-bottom: 32rpx
+        
+        .input-titile
+            font-weight: 400
+            font-size: 28rpx
+            color: #6A6A6A
+        
+        .add-skill-btn
+            padding: 16rpx 32rpx
+            background: #256BFA
+            color: #FFFFFF
+            border-radius: 8rpx
+            font-size: 26rpx
+            font-weight: 500
+            transition: all 0.3s ease
+            
+            &:active
+                background: #1a5cd9
+                transform: scale(0.98)
+            
+            &.disabled
+                background: #CCCCCC
+                color: #999999
+                cursor: not-allowed
+                
+                &:active
+                    background: #CCCCCC
+                    transform: none
+    
+    .skills-list
+        .skill-item
+            background: #FFFFFF
+            border: 2rpx solid #E8EAEE
+            border-radius: 12rpx
+            padding: 24rpx
+            margin-bottom: 24rpx
+            box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05)
+            transition: all 0.3s ease
+            
+            &:hover
+                box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.1)
+                border-color: #256BFA
+            
+            .skill-header
+                display: flex
+                justify-content: space-between
+                align-items: center
+                margin-bottom: 20rpx
+                
+                .skill-number
+                    font-weight: 500
+                    font-size: 28rpx
+                    color: #333333
+                
+                .skill-actions
+                    .action-btn
+                        padding: 8rpx 16rpx
+                        border-radius: 6rpx
+                        font-size: 24rpx
+                        font-weight: 400
+                        transition: all 0.2s ease
+                        
+                        &.delete-btn
+                            background: #FF4D4F
+                            color: #FFFFFF
+                            
+                            &:active
+                                background: #D9363E
+                                transform: scale(0.95)
+            
+            .skill-fields
+                display: flex
+                flex-direction: column
+                gap: 20rpx
+                
+                .skill-field
+                    .field-label
+                        font-weight: 400
+                        font-size: 26rpx
+                        color: #6A6A6A
+                        margin-bottom: 8rpx
+                    
+                    .field-input
+                        font-weight: 400
+                        font-size: 28rpx
+                        color: #333333
+                        line-height: 72rpx
+                        height: 72rpx
+                        border: 2rpx solid #E8EAEE
+                        border-radius: 8rpx
+                        padding: 0 20rpx
+                        background: #F8F9FA
+                        transition: all 0.3s ease
+                        
+                        &:focus
+                            border-color: #256BFA
+                            background: #FFFFFF
+                        
+                        &.triangle::before
+                            right: 30rpx
+                            top: calc(50% - 2rpx)
+                        
+                        &.triangle::after
+                            right: 30rpx
+                            top: 50%
+    
+    .empty-skills
+        text-align: center
+        padding: 60rpx 0
+        background: #F8F9FA
+        border-radius: 12rpx
+        border: 2rpx dashed #E8EAEE
+        
+        .empty-text
+            font-size: 28rpx
+            color: #999999
+            font-weight: 400
+</style>
diff --git a/packageB/jobFair/detailCom.vue b/packageB/jobFair/detailCom.vue
index b7bf8a0..7f07e21 100644
--- a/packageB/jobFair/detailCom.vue
+++ b/packageB/jobFair/detailCom.vue
@@ -206,6 +206,14 @@
 							{{detailObj.politicalAffiliation}}
 						</view>
 					</view>
+					<view class="flexBox detail-item1" v-if="detailObj.resumePicPath">
+						<view class="label">简历图片：</view>
+						<view class="value">
+							<view class="previewResume" @click="previewResume(detailObj.resumePicPath)">
+								查看简历图片
+							</view>
+						</view>
+					</view>
 				</view>
 				<view class="btn-box">
 					<button type="default" @click="closeResumeDetailPopup">关闭</button>
@@ -302,6 +310,7 @@
 		$api
 	} = inject("globalFunction");
 	const imgBaseUrl = config.imgBaseUrl;
+	const trainVideoImgUrl = config.trainVideoImgUrl;
 	const router = useRouter();
 	const route = useRoute();
 	const interviewPopup = ref(null);
@@ -311,7 +320,15 @@
 	const jobFairId = ref("");
 	const userInfo = ref({});
 	const isExpanded = ref(false);
-
+	//预览简历照片
+	const previewResume = (url) => {
+		if(url){
+			uni.previewImage({
+				urls: [trainVideoImgUrl+url], 
+				current: 0  
+			});
+		}
+	};
 	const publicUrl = config.LCBaseUrl;
 	onLoad((option) => {
 		jobFairId.value = option.jobFairId;
@@ -940,6 +957,9 @@
 			height: 80%;
 			.flexBox{
 				display: flex;
+				.previewResume{
+					color:#0088ff
+				}
 			}
 			.detail-item1 {
 				// display: flex;
diff --git a/packageB/notice/evaluateAnnouncement/evaluateDetail.vue b/packageB/notice/evaluateAnnouncement/evaluateDetail.vue
new file mode 100644
index 0000000..9ee3c82
--- /dev/null
+++ b/packageB/notice/evaluateAnnouncement/evaluateDetail.vue
@@ -0,0 +1,423 @@
+<template>
+    <div style="height: 90vh;overflow-y: auto;">
+        <view class="content">
+            <view class="content-input">
+                <view class="input-titile"><text class="input-required">*</text>标题</view>
+                <input class="input-con" v-model="fromValue.title" placeholder="请输入标题" />
+            </view>
+            <view class="content-input">
+                <view class="input-titile"><text class="input-required">*</text>内容</view>
+                <!-- <input class="input-con" v-model="fromValue.contactName" placeholder="请输入联系人" /> -->
+				<!-- <unieditor v-if="shows" @init-data="receiveInitData" :content="fromValue.content" /> -->
+				<view v-html="fromValue.content" style="width: 100%;overflow-x: auto;padding: 30rpx;box-sizing: border-box;">
+					
+				</view>
+			</view>
+			<view class="content-input">
+			    <view class="input-titile">备注</view>
+				<textarea auto-height class="input-con" v-model="fromValue.remark" placeholder="请输入备注" />
+			</view>
+			
+        </view>
+        <SelectPopup ref="selectPopupRef"></SelectPopup>
+	</div>
+</template>
+
+<script setup>
+import { reactive, inject, watch, ref, onMounted, onUnmounted } from 'vue';
+import { onLoad, onShow } from '@dcloudio/uni-app';
+const { $api, navTo, navBack, checkingPhoneRegExp,config } = inject('globalFunction');
+import { storeToRefs } from 'pinia';
+import useUserStore from '@/stores/useUserStore';
+import useDictStore from '@/stores/useDictStore';
+import SelectPopup from '@/components/selectPopup/selectPopup.vue';
+import unieditor from '../../components/unieditor.vue'
+const { userInfo } = storeToRefs(useUserStore());
+const { getUserResume } = useUserStore();
+const dictStore = useDictStore();
+const { dictLabel, oneDictData, complete: dictComplete, getDictSelectOption } = dictStore;
+
+let fromValue = reactive({
+    title: '',
+	content:'',
+	remark:'',
+	entProvince:'',
+	entCounty:'',
+	entCity:'',
+	status:'0',
+});
+let id=ref('')
+onLoad((options) => {
+    id.value=options.id
+    getDetail()
+    
+});
+
+// 监听页面显示，接收从技能查询页面返回的数据
+onShow(() => {
+    // 通过事件总线接收技能选择结果
+    // uni.$on('skillSelected', handleSkillSelected);
+});
+
+// 页面卸载时移除事件监听
+// onUnmounted(() => {
+//     uni.$off('skillSelected', handleSkillSelected);
+// });
+// 监听字典数据加载完成，自动更新学历显示
+
+
+function getDetail(){
+	$api.myRequest("/train/public/announcement/selectById", {
+		id: id.value,
+	}, "GET", 9100, {
+		Authorization: `Bearer ${uni.getStorageSync('token')}`,
+		'Content-Type': "application/x-www-form-urlencoded"
+	}).then((res) => {
+		if (res.code === 200) {
+			fromValue.id = res.data.id;
+			fromValue.title = res.data.title;
+			fromValue.content= res.data.content;
+			fromValue.remark= res.data.remark;
+			fromValue.entProvince = res.data.entProvince;
+			fromValue.entCounty = res.data.entCounty;
+			fromValue.entCity = res.data.entCity;
+		}
+	})
+}
+
+
+</script>
+
+<style lang="stylus" scoped>
+.btn{
+    margin-top: -30rpx
+}
+.input-required{
+	color: red
+}
+/* 上传按钮 */
+.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;
+  margin-top: 20rpx;
+}
+
+.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>view {
+  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;
+}
+.content{
+    padding: 28rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start
+    height: calc(100% - 120rpx)
+
+}
+.footer{
+	width: 100%;
+	height: 120rpx;
+	background: #fff;
+	position: fixed;
+	z-index: 10;
+	bottom: 0;
+	left: 0;
+	display: flex;
+	align-content: center;
+	justify-content: center;
+}
+.footerBtn{
+	width: 90%;
+	height: 90rpx;
+	line-height: 90rpx;
+	text-align: center
+	border-radius: 10rpx;
+	color: #fff;
+	background: #409EFF;
+}
+.content-input
+    margin-bottom: 52rpx
+    .input-titile
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #6A6A6A
+    .input-con
+        font-weight: 400;
+        font-size: 32rpx;
+        color: #333333;
+        line-height: 80rpx;
+        height: 80rpx;
+        border-bottom: 2rpx solid #EBEBEB
+        position: relative;
+    .error-message
+        color: #ff4757;
+        font-size: 24rpx;
+        margin-top: 10rpx;
+        line-height: 1.4;
+    .success-message
+        color: #2ed573;
+        font-size: 24rpx;
+        margin-top: 10rpx;
+        line-height: 1.4;
+    .input-error
+        .input-con
+            border-bottom-color: #ff4757;
+    .triangle::before
+        position: absolute;
+        right: 20rpx;
+        top: calc(50% - 2rpx);
+        content: '';
+        width: 4rpx;
+        height: 18rpx;
+        border-radius: 2rpx
+        background: #697279;
+        transform: translate(0, -50%) rotate(-45deg) ;
+    .triangle::after
+        position: absolute;
+        right: 20rpx;
+        top: 50%;
+        content: '';
+        width: 4rpx;
+        height: 18rpx;
+        border-radius: 2rpx
+        background: #697279;
+        transform: rotate(45deg)
+.input-nx
+    position: relative
+    border-bottom: 2rpx solid #EBEBEB
+    padding-bottom: 30rpx
+    display: flex
+    flex-wrap: wrap
+    .nx-item
+        padding: 16rpx 24rpx
+        width: fit-content
+        border-radius: 20rpx
+        border: 2rpx solid #E8EAEE
+        background-color: #f8f9fa
+        margin-right: 16rpx
+        margin-top: 16rpx
+        font-size: 28rpx
+        color: #333333
+        transition: all 0.2s ease
+        
+        &:hover
+            background-color: #e9ecef
+            border-color: #256bfa
+            color: #256bfa
+.content-sex
+    height: 110rpx;
+    display: flex
+    justify-content: space-between;
+    align-items: flex-start;
+    border-bottom: 2rpx solid #EBEBEB
+    margin-bottom: 52rpx
+    .sex-titile
+        line-height: 80rpx;
+    .sext-ri
+        display: flex
+        align-items: center;
+        .sext-box
+            height: 76rpx;
+            width: 152rpx;
+            text-align: center;
+            line-height: 80rpx;
+            border-radius: 12rpx 12rpx 12rpx 12rpx
+            border: 2rpx solid #E8EAEE;
+            margin-left: 28rpx
+            font-weight: 400;
+            font-size: 28rpx;
+        .sext-boxactive
+            color: #256BFA
+            background: rgba(37,107,250,0.1);
+            border: 2rpx solid #256BFA;
+    .next-btn
+        width: 100%;
+        height: 90rpx;
+        background: #256BFA;
+        border-radius: 12rpx 12rpx 12rpx 12rpx;
+        font-weight: 500;
+        font-size: 32rpx;
+        color: #FFFFFF;
+        text-align: center;
+        line-height: 90rpx
+
+// 技能信息样式
+.content-skills
+    margin-bottom: 52rpx
+    
+    .skills-header
+        display: flex
+        justify-content: space-between
+        align-items: center
+        margin-bottom: 32rpx
+        
+        .input-titile
+            font-weight: 400
+            font-size: 28rpx
+            color: #6A6A6A
+        
+        .add-skill-btn
+            padding: 16rpx 32rpx
+            background: #256BFA
+            color: #FFFFFF
+            border-radius: 8rpx
+            font-size: 26rpx
+            font-weight: 500
+            transition: all 0.3s ease
+            
+            &:active
+                background: #1a5cd9
+                transform: scale(0.98)
+            
+            &.disabled
+                background: #CCCCCC
+                color: #999999
+                cursor: not-allowed
+                
+                &:active
+                    background: #CCCCCC
+                    transform: none
+    
+    .skills-list
+        .skill-item
+            background: #FFFFFF
+            border: 2rpx solid #E8EAEE
+            border-radius: 12rpx
+            padding: 24rpx
+            margin-bottom: 24rpx
+            box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05)
+            transition: all 0.3s ease
+            
+            &:hover
+                box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.1)
+                border-color: #256BFA
+            
+            .skill-header
+                display: flex
+                justify-content: space-between
+                align-items: center
+                margin-bottom: 20rpx
+                
+                .skill-number
+                    font-weight: 500
+                    font-size: 28rpx
+                    color: #333333
+                
+                .skill-actions
+                    .action-btn
+                        padding: 8rpx 16rpx
+                        border-radius: 6rpx
+                        font-size: 24rpx
+                        font-weight: 400
+                        transition: all 0.2s ease
+                        
+                        &.delete-btn
+                            background: #FF4D4F
+                            color: #FFFFFF
+                            
+                            &:active
+                                background: #D9363E
+                                transform: scale(0.95)
+            
+            .skill-fields
+                display: flex
+                flex-direction: column
+                gap: 20rpx
+                
+                .skill-field
+                    .field-label
+                        font-weight: 400
+                        font-size: 26rpx
+                        color: #6A6A6A
+                        margin-bottom: 8rpx
+                    
+                    .field-input
+                        font-weight: 400
+                        font-size: 28rpx
+                        color: #333333
+                        line-height: 72rpx
+                        height: 72rpx
+                        border: 2rpx solid #E8EAEE
+                        border-radius: 8rpx
+                        padding: 0 20rpx
+                        background: #F8F9FA
+                        transition: all 0.3s ease
+                        
+                        &:focus
+                            border-color: #256BFA
+                            background: #FFFFFF
+                        
+                        &.triangle::before
+                            right: 30rpx
+                            top: calc(50% - 2rpx)
+                        
+                        &.triangle::after
+                            right: 30rpx
+                            top: 50%
+    
+    .empty-skills
+        text-align: center
+        padding: 60rpx 0
+        background: #F8F9FA
+        border-radius: 12rpx
+        border: 2rpx dashed #E8EAEE
+        
+        .empty-text
+            font-size: 28rpx
+            color: #999999
+            font-weight: 400
+</style>
diff --git a/packageB/notice/evaluateAnnouncement/evaluateEdit.vue b/packageB/notice/evaluateAnnouncement/evaluateEdit.vue
new file mode 100644
index 0000000..8f5098a
--- /dev/null
+++ b/packageB/notice/evaluateAnnouncement/evaluateEdit.vue
@@ -0,0 +1,499 @@
+<template>
+    <div style="height: 90vh;overflow-y: auto;">
+        <view class="content">
+            <view class="content-input">
+                <view class="input-titile"><text class="input-required">*</text>标题</view>
+                <input class="input-con" v-model="fromValue.title" placeholder="请输入标题" />
+            </view>
+            <view class="content-input">
+                <view class="input-titile"><text class="input-required">*</text>内容</view>
+                <!-- <input class="input-con" v-model="fromValue.contactName" placeholder="请输入联系人" /> -->
+				<unieditor v-if="shows" @init-data="receiveInitData" :content="fromValue.content" />
+            </view>
+			<view class="content-input">
+			    <view class="input-titile">备注</view>
+				<textarea auto-height class="input-con" v-model="fromValue.remark" placeholder="请输入备注" />
+			</view>
+			
+        </view>
+		<view class="footer">
+			<view class="footerBtn" @click="confirm()">保存</view>
+		</view>
+        <SelectPopup ref="selectPopupRef"></SelectPopup>
+	</div>
+</template>
+
+<script setup>
+import { reactive, inject, watch, ref, onMounted, onUnmounted } from 'vue';
+import { onLoad, onShow } from '@dcloudio/uni-app';
+const { $api, navTo, navBack, checkingPhoneRegExp,config } = inject('globalFunction');
+import { storeToRefs } from 'pinia';
+import useUserStore from '@/stores/useUserStore';
+import useDictStore from '@/stores/useDictStore';
+import SelectPopup from '@/components/selectPopup/selectPopup.vue';
+import unieditor from '../../components/unieditor.vue'
+const { userInfo } = storeToRefs(useUserStore());
+const { getUserResume } = useUserStore();
+const dictStore = useDictStore();
+const { dictLabel, oneDictData, complete: dictComplete, getDictSelectOption } = dictStore;
+
+let fromValue = reactive({
+    title: '',
+	content:'',
+	remark:'',
+	entProvince:'',
+	entCounty:'',
+	entCity:'',
+	status:'0',
+});
+let type=ref('add')
+let id=ref('')
+let shows=ref(false)
+onLoad((options) => {
+    id.value=options.id
+    if(options.id){
+		type.value='edit'
+    	getDetail()
+    }else{
+    	getInfo()
+    }
+});
+
+// 监听页面显示，接收从技能查询页面返回的数据
+onShow(() => {
+    // 通过事件总线接收技能选择结果
+    // uni.$on('skillSelected', handleSkillSelected);
+});
+
+// 页面卸载时移除事件监听
+// onUnmounted(() => {
+//     uni.$off('skillSelected', handleSkillSelected);
+// });
+// 监听字典数据加载完成，自动更新学历显示
+
+const receiveInitData = (initData) => {
+	if(initData.value=="<p><br></p>"){
+		
+	}else{
+		fromValue.content=initData.value;
+	}
+  console.log('子组件初始化数据：', initData)
+}
+function getInfo(){
+	// if(userInfo.userId){
+		$api.myRequest("/train/public/train/organ/getTrainByUnifiedSocialCreditCode", {
+			tags: "913700001630477270",
+		}, "GET", 9100, {
+			Authorization: `Bearer ${uni.getStorageSync('token')}`,
+			'Content-Type': "application/x-www-form-urlencoded"
+		}).then((res) => {
+			if (res.code === 200) {
+				fromValue.entProvince = res.data.organProvince;
+				fromValue.entCounty = res.data.organCounty;
+				fromValue.entCity = res.data.organCity;
+				shows.value=true;
+			}
+		})
+	// }else{
+	// 	$api.msg('请先登录');
+	// }
+}
+function getDetail(){
+	$api.myRequest("/train/public/announcement/selectById", {
+		id: id.value,
+	}, "GET", 9100, {
+		Authorization: `Bearer ${uni.getStorageSync('token')}`,
+		'Content-Type': "application/x-www-form-urlencoded"
+	}).then((res) => {
+		if (res.code === 200) {
+			fromValue.id = res.data.id;
+			fromValue.title = res.data.title;
+			fromValue.content= res.data.content;
+			fromValue.remark= res.data.remark;
+			fromValue.entProvince = res.data.entProvince;
+			fromValue.entCounty = res.data.entCounty;
+			fromValue.entCity = res.data.entCity;
+			shows.value=true;
+		}
+	})
+}
+
+const confirm = () => {
+    if (!fromValue.title) {
+        return $api.msg('请输入标题');
+    }
+	if (!fromValue.content) {
+	    return $api.msg('请输入内容');
+	}
+    const params = {
+        ...fromValue,
+    };
+	if(type.value=='add'){
+		$api.myRequest('/train/public/announcement/add', {
+			...fromValue,
+			type:2
+		}, 'post', 9100, {
+			Authorization: `Bearer ${uni.getStorageSync('token')}`,
+			'Content-Type': "application/x-www-form-urlencoded"
+		}).then((resData) => {
+			if(resData.code==200){
+				$api.msg('新增成功');
+				setTimeout(()=>{
+					navBack();
+				},2000)
+			}
+		});
+	} else if (type.value=='edit'){
+		$api.myRequest('/train/public/announcement/update', {
+			...fromValue,
+			type:2
+		}, 'post', 9100, {
+			Authorization: `Bearer ${uni.getStorageSync('token')}`,
+			'Content-Type': "application/x-www-form-urlencoded"
+		}).then((resData) => {
+			if(resData.code==200){
+				$api.msg('更新成功');
+				setTimeout(()=>{
+					navBack();
+				},2000)
+			}
+		});
+	}
+    
+};
+
+</script>
+
+<style lang="stylus" scoped>
+.btn{
+    margin-top: -30rpx
+}
+.input-required{
+	color: red
+}
+/* 上传按钮 */
+.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;
+  margin-top: 20rpx;
+}
+
+.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>view {
+  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;
+}
+.content{
+    padding: 28rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start
+    height: calc(100% - 120rpx)
+
+}
+.footer{
+	width: 100%;
+	height: 120rpx;
+	background: #fff;
+	position: fixed;
+	z-index: 10;
+	bottom: 0;
+	left: 0;
+	display: flex;
+	align-content: center;
+	justify-content: center;
+}
+.footerBtn{
+	width: 90%;
+	height: 90rpx;
+	line-height: 90rpx;
+	text-align: center
+	border-radius: 10rpx;
+	color: #fff;
+	background: #409EFF;
+}
+.content-input
+    margin-bottom: 52rpx
+    .input-titile
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #6A6A6A
+    .input-con
+        font-weight: 400;
+        font-size: 32rpx;
+        color: #333333;
+        line-height: 80rpx;
+        height: 80rpx;
+        border-bottom: 2rpx solid #EBEBEB
+        position: relative;
+    .error-message
+        color: #ff4757;
+        font-size: 24rpx;
+        margin-top: 10rpx;
+        line-height: 1.4;
+    .success-message
+        color: #2ed573;
+        font-size: 24rpx;
+        margin-top: 10rpx;
+        line-height: 1.4;
+    .input-error
+        .input-con
+            border-bottom-color: #ff4757;
+    .triangle::before
+        position: absolute;
+        right: 20rpx;
+        top: calc(50% - 2rpx);
+        content: '';
+        width: 4rpx;
+        height: 18rpx;
+        border-radius: 2rpx
+        background: #697279;
+        transform: translate(0, -50%) rotate(-45deg) ;
+    .triangle::after
+        position: absolute;
+        right: 20rpx;
+        top: 50%;
+        content: '';
+        width: 4rpx;
+        height: 18rpx;
+        border-radius: 2rpx
+        background: #697279;
+        transform: rotate(45deg)
+.input-nx
+    position: relative
+    border-bottom: 2rpx solid #EBEBEB
+    padding-bottom: 30rpx
+    display: flex
+    flex-wrap: wrap
+    .nx-item
+        padding: 16rpx 24rpx
+        width: fit-content
+        border-radius: 20rpx
+        border: 2rpx solid #E8EAEE
+        background-color: #f8f9fa
+        margin-right: 16rpx
+        margin-top: 16rpx
+        font-size: 28rpx
+        color: #333333
+        transition: all 0.2s ease
+        
+        &:hover
+            background-color: #e9ecef
+            border-color: #256bfa
+            color: #256bfa
+.content-sex
+    height: 110rpx;
+    display: flex
+    justify-content: space-between;
+    align-items: flex-start;
+    border-bottom: 2rpx solid #EBEBEB
+    margin-bottom: 52rpx
+    .sex-titile
+        line-height: 80rpx;
+    .sext-ri
+        display: flex
+        align-items: center;
+        .sext-box
+            height: 76rpx;
+            width: 152rpx;
+            text-align: center;
+            line-height: 80rpx;
+            border-radius: 12rpx 12rpx 12rpx 12rpx
+            border: 2rpx solid #E8EAEE;
+            margin-left: 28rpx
+            font-weight: 400;
+            font-size: 28rpx;
+        .sext-boxactive
+            color: #256BFA
+            background: rgba(37,107,250,0.1);
+            border: 2rpx solid #256BFA;
+    .next-btn
+        width: 100%;
+        height: 90rpx;
+        background: #256BFA;
+        border-radius: 12rpx 12rpx 12rpx 12rpx;
+        font-weight: 500;
+        font-size: 32rpx;
+        color: #FFFFFF;
+        text-align: center;
+        line-height: 90rpx
+
+// 技能信息样式
+.content-skills
+    margin-bottom: 52rpx
+    
+    .skills-header
+        display: flex
+        justify-content: space-between
+        align-items: center
+        margin-bottom: 32rpx
+        
+        .input-titile
+            font-weight: 400
+            font-size: 28rpx
+            color: #6A6A6A
+        
+        .add-skill-btn
+            padding: 16rpx 32rpx
+            background: #256BFA
+            color: #FFFFFF
+            border-radius: 8rpx
+            font-size: 26rpx
+            font-weight: 500
+            transition: all 0.3s ease
+            
+            &:active
+                background: #1a5cd9
+                transform: scale(0.98)
+            
+            &.disabled
+                background: #CCCCCC
+                color: #999999
+                cursor: not-allowed
+                
+                &:active
+                    background: #CCCCCC
+                    transform: none
+    
+    .skills-list
+        .skill-item
+            background: #FFFFFF
+            border: 2rpx solid #E8EAEE
+            border-radius: 12rpx
+            padding: 24rpx
+            margin-bottom: 24rpx
+            box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05)
+            transition: all 0.3s ease
+            
+            &:hover
+                box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.1)
+                border-color: #256BFA
+            
+            .skill-header
+                display: flex
+                justify-content: space-between
+                align-items: center
+                margin-bottom: 20rpx
+                
+                .skill-number
+                    font-weight: 500
+                    font-size: 28rpx
+                    color: #333333
+                
+                .skill-actions
+                    .action-btn
+                        padding: 8rpx 16rpx
+                        border-radius: 6rpx
+                        font-size: 24rpx
+                        font-weight: 400
+                        transition: all 0.2s ease
+                        
+                        &.delete-btn
+                            background: #FF4D4F
+                            color: #FFFFFF
+                            
+                            &:active
+                                background: #D9363E
+                                transform: scale(0.95)
+            
+            .skill-fields
+                display: flex
+                flex-direction: column
+                gap: 20rpx
+                
+                .skill-field
+                    .field-label
+                        font-weight: 400
+                        font-size: 26rpx
+                        color: #6A6A6A
+                        margin-bottom: 8rpx
+                    
+                    .field-input
+                        font-weight: 400
+                        font-size: 28rpx
+                        color: #333333
+                        line-height: 72rpx
+                        height: 72rpx
+                        border: 2rpx solid #E8EAEE
+                        border-radius: 8rpx
+                        padding: 0 20rpx
+                        background: #F8F9FA
+                        transition: all 0.3s ease
+                        
+                        &:focus
+                            border-color: #256BFA
+                            background: #FFFFFF
+                        
+                        &.triangle::before
+                            right: 30rpx
+                            top: calc(50% - 2rpx)
+                        
+                        &.triangle::after
+                            right: 30rpx
+                            top: 50%
+    
+    .empty-skills
+        text-align: center
+        padding: 60rpx 0
+        background: #F8F9FA
+        border-radius: 12rpx
+        border: 2rpx dashed #E8EAEE
+        
+        .empty-text
+            font-size: 28rpx
+            color: #999999
+            font-weight: 400
+</style>
diff --git a/packageB/notice/evaluateAnnouncement/evaluateList.vue b/packageB/notice/evaluateAnnouncement/evaluateList.vue
new file mode 100644
index 0000000..18b04fa
--- /dev/null
+++ b/packageB/notice/evaluateAnnouncement/evaluateList.vue
@@ -0,0 +1,447 @@
+<template>
+	<div class="app-box">
+		<div class="con-box">
+		    <!-- <view class="collection-search">
+		        <view class="search-content">
+		            <view class="header-input button-click">
+		                <uni-icons class="iconsearch" color="#6A6A6A" type="search" size="22"></uni-icons>
+		                <input
+		                    class="input"
+		                    v-model="searchKeyword"
+		                    @confirm="searchVideo"
+		                    placeholder="输入考试名称"
+		                    placeholder-class="inputplace"
+		                />
+		                <uni-icons 
+		                    v-if="searchKeyword" 
+		                    class="clear-icon" 
+		                    type="clear" 
+		                    size="24" 
+		                    color="#999" 
+		                    @click="clearSearch"
+		                />
+		            </view>
+		        </view>
+		    </view> -->
+			<scroll-view scroll-y class="main-scroll" @scrolltolower="handleScrollToLower">
+				<div class="cards" v-for="(item,index) in dataList" :key="item.examPaperId">
+					<div class="cardHead">
+						<div class="cardHeadLeft">
+							<div class="cardTitle">{{item.title}}</div>
+						</div>
+						<div class="rightBtn">
+							<uni-tag :inverted="true" v-if="item.status==2" text="已发布" type="success" />
+							<uni-tag :inverted="true" v-else-if="item.status==0" text="未发布" type="error" />
+							<uni-tag :inverted="true" v-else text="失效" />
+						</div>
+					</div>
+					<div class="heng"></div>
+					<div class="cardCon">
+						<div class="conten">发布时间：{{item.publishTime}}</div>
+						<div class="conten">审核状态：
+							<uni-tag :inverted="true" size="mini" v-if="item.shenhe==1" text="已通过" type="success" />
+							<uni-tag :inverted="true" size="mini" v-if="item.shenhe==2" text="未通过" type="error" />
+							<uni-tag :inverted="true" size="mini" v-if="item.shenhe==0" text="待审核" />
+						</div>
+						<div class="flooter">
+							<div v-if="item.status == '0' && item.shenhe == '1'" @click="handlePublishClick(scope.row,2)" >发布</div>
+							<div v-else @click="handlePublishClick(item,0)" >取消发布</div>
+							<div @click="handleDetail(item)">查看</div>
+							<div v-if="item.status == '0'" @click="handleOperation(item)">编辑</div>
+							<div v-if="item.status == '0'" @click="handleDeleteClick(item)">删除</div>
+						</div>
+					</div>
+				</div>
+			</scroll-view>
+		</div>
+		<div class="footer">
+			<div class="footerBtn" @click="handleOperation()">新增</div>
+		</div>
+	</div>
+</template>
+
+<script setup>
+import { inject, ref, reactive } from 'vue';
+import { onLoad, onShow } from '@dcloudio/uni-app';
+const { $api, navTo, navBack,urls } = inject('globalFunction');
+import config from "@/config.js"
+const userInfo = ref({});
+const Authorization = ref('');
+const searchKeyword = ref('');
+const dataList=ref([])
+const pageSize=ref(10)
+const pageNum=ref(1)
+const totalNum=ref(0)
+const baseUrl = config.imgBaseUrl
+const handleScrollToLower = () => {
+    getDataList('add');
+};
+onLoad(() => {
+	
+});
+onShow(()=>{
+	Authorization.value=uni.getStorageSync('Padmin-Token')||''
+	getDataList('refresh');
+})
+// 搜索视频
+function searchVideo() {
+    getDataList('refresh');
+}
+
+// 清除搜索内容
+function clearSearch() {
+    searchKeyword.value = '';
+    getDataList('refresh');
+}
+
+function getDataList(type = 'add') {
+	let maxPage=Math.ceil(totalNum.value/pageSize.value)
+	let params={}
+    if (type === 'refresh') {
+        pageNum.value = 1;
+		params={
+			title:"",
+			pageSize:pageSize.value,
+			pageNum:pageNum.value,
+			type:2
+		}
+		$api.myRequest('/train/public/announcement/list', params).then((resData) => {
+			if(resData.code==200){
+				dataList.value=resData.rows
+				totalNum.value=resData.total
+			}
+			
+		});
+    }
+    if (type === 'add' && pageNum.value < maxPage) {
+        pageNum.value += 1;
+		params={
+			address:"",
+			pageSize:pageSize.value,
+			pageNum:pageNum.value,
+			type:2
+		}
+		$api.myRequest('/train/public/announcement/list', params).then((resData) => {
+			if(resData.code==200){
+				dataList.value=dataList.value.concat(resData.rows)
+				totalNum.value=resData.total
+			}
+		});
+	}
+}
+function  handlePublishClick(row,status){
+  if(status=='2'){
+	  $api.myRequest('/train/public/announcement/publish', {id: row.id},'get',9100).then((resData) => {
+	  	if(resData.code==200){
+			$api.msg('发布成功');
+	  		getDataList('refresh');
+	  	}
+	  });
+  } else {
+	  $api.myRequest('/train/public/announcement/unpublish', {id: row.id},'get',9100).then((resData) => {
+	  	if(resData.code==200){
+	  		$api.msg('取消发布成功');
+	  		getDataList('refresh');
+	  	}
+	  });
+	
+  }
+}
+// 删除通知公告
+function handleDeleteClick(row) {
+	uni.showModal({
+	    title: '确认删除',
+	    content: '确认删除该通知公告吗？',
+	    success: (res) => {
+	        if (res.confirm) {
+				$api.myRequest('/train/public/announcement/delete', {id: row.id},'get',9100).then((resData) => {
+					if(resData.code==200){
+						$api.msg('已删除');
+						getDataList('refresh');
+					}
+				});
+	            
+	        }
+	    }
+	});
+}
+function handleOperation(row) {
+	if(row){
+		navTo(`/packageB/notice/evaluateAnnouncement/evaluateEdit?id=${row.id}`);
+	}else{
+		navTo(`/packageB/notice/evaluateAnnouncement/evaluateEdit`);
+	}
+}
+function handleDetail(row){
+	navTo(`/packageB/notice/evaluateAnnouncement/evaluateDetail?id=${row.id}`);
+}
+</script>
+
+<style lang="stylus" scoped>
+.app-box{
+	width: 100%;
+	height: 100vh;
+	position: relative;
+	.con-box{
+		position: absolute;
+		width: 100%;
+		height: 92%;
+		left: 0;
+		top:0;
+		z-index: 10;
+		padding: 20rpx 28rpx;
+		box-sizing: border-box;
+		overflow: hidden;
+		.collection-search{
+		    padding: 10rpx 20rpx;
+		    .search-content{
+		        position: relative
+		        display: flex
+		        align-items: center
+		        padding: 14rpx 0
+		        .header-input{
+		            padding: 0
+		            width: calc(100%);
+		            position: relative
+		            .iconsearch{
+		                position: absolute
+		                left: 30rpx;
+		                top: 50%
+		                transform: translate(0, -50%)
+		                z-index: 1
+		            }
+		            .input{
+		                padding: 0 80rpx 0 80rpx
+		                height: 80rpx;
+		                background: #FFFFFF;
+		                border-radius: 75rpx 75rpx 75rpx 75rpx;
+		                border: 2rpx solid #ECECEC
+		                font-size: 28rpx;
+		            }
+		            .clear-icon{
+		                position: absolute
+		                right: 30rpx;
+		                top: 50%
+		                transform: translate(0, -50%)
+		                z-index: 1
+		                cursor: pointer
+		            }
+		            .inputplace{
+		                font-weight: 400;
+		                font-size: 28rpx;
+		                color: #B5B5B5;
+		            }
+		        }
+		    }
+		}
+		.main-scroll {
+		    width: 100%;
+		    height: 100%;
+			.cards{
+				width: 100%;
+				min-height: 260rpx;
+				height: auto;
+				background: linear-gradient(0deg, #E3EFFF 0%, #FBFDFF 100%);
+				// box-shadow: 0px 0px 6px 0px rgba(0,71,200,0.32);
+				border-radius: 12rpx;
+				border: 2px solid #EDF5FF;
+				margin-bottom: 30rpx;
+				padding: 30rpx 40rpx 0;
+				box-sizing: border-box
+				.cardHead{
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					.cardHeadLeft{
+						display: flex;
+						align-items: center
+						width: 70%;
+						.cardTitle{
+							font-weight: bold;
+							font-size: 28rpx;
+							color: #0069CB;
+							max-width: 100%;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							white-space: nowrap;
+						}
+						.titleType{
+							border-radius: 4px;
+							font-size: 22rpx;
+							color: #157EFF;
+							width: 100rpx;
+							height: 38rpx;
+							text-align: center;
+							line-height: 38rpx;
+							margin-left: 10rpx;
+						}
+						
+					}
+					
+				}
+				.heng{
+					width: 30%;
+					height: 4rpx;
+					background: linear-gradient(88deg, #015EEA 0%, #00C0FA 100%);
+					margin: 10rpx 0 20rpx;
+				}
+				.cardCon{
+					display: flex;
+					flex-wrap: wrap;
+					.conten{
+						width: 100%;
+						font-size: 24rpx;
+						color: #666666;
+						display: flex;
+						align-items: center
+						margin-bottom: 10rpx;
+					}
+					.status-tags{
+						display: flex;
+						align-items: center;
+					}
+				}
+				.flooter{
+					width: 100%;
+					border-top: 1px solid #ccc;
+					display: flex;
+					justify-content: flex-end;
+					align-items: center;
+					margin-top: 10rpx;
+					view{
+						font-size: 28rpx;
+						margin-left: 30rpx;
+						color: #2175F3;
+						padding-top: 14rpx;
+					}
+				}
+			}
+		}
+	}
+	.cards2{
+		position: fixed;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100vh;
+		background-color: rgba(0,0,0,0.5);
+		z-index: 10000;
+		padding: 100rpx 50rpx;
+		box-sizing: border-box;
+		.cardCon{
+			height: 70%;
+			background-color: #fff;
+			padding: 20rpx;
+			box-sizing: border-box;
+			.cardHead{
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				font-size: 30rpx;
+				font-weight: 600;
+			}
+			
+		}
+	}
+	.footer{
+		width: 100%;
+		height: 120rpx;
+		background: #fff;
+		position: fixed;
+		z-index: 10;
+		bottom: 0;
+		left: 0;
+		display: flex;
+		align-content: center;
+		justify-content: center;
+	}
+	.footerBtn{
+		width: 90%;
+		height: 90rpx;
+		line-height: 90rpx;
+		text-align: center
+		border-radius: 10rpx;
+		color: #fff;
+		background: #409EFF;
+	}
+}
+.titleType{
+	display: inline-block
+	border-radius: 4px;
+	font-size: 22rpx;
+	color: #157EFF;
+	width: 100rpx;
+	height: 38rpx;
+	text-align: center;
+	line-height: 38rpx;
+	margin-left: 10rpx;
+}
+.primary{
+	border: 1px solid #157EFF!important;
+	color: #157EFF!important
+}
+.success{
+	border: 1px solid #05A636!important;
+	color: #05A636!important
+}
+.info{
+	border: 1px solid #898989!important;
+	color: #898989!important
+}
+.tertiary{
+	border: 1px solid #E6A340!important;
+	color: #E6A340!important
+}
+.primary2{
+	border: 1px solid #F56C6C!important;
+	color: #F56C6C!important
+}
+.rightBtn{
+	width: 140rpx;
+	height: 44rpx;
+	line-height: 44rpx;
+	// background: linear-gradient(90deg, #00C0FA 0%, #1271FF 100%);
+	// border-radius: 4px;
+	// color: #fff;
+	// font-size: 24rpx;
+	text-align: center;
+}
+.detailTitle{
+	font-size: 32rpx;
+	font-weight: 600;
+	margin: 30rpx 0;
+}
+.detailCon{
+	font-size: 28rpx;
+	line-height: 40rpx;
+}
+.exam-info {
+	display: flex;
+	justify-content: space-between;
+	margin-bottom: 35rpx;
+	margin-top: 20rpx;
+}
+
+.info-item {
+	flex: 1;
+	text-align: center;
+}
+
+.info-value {
+	font-family: 'D-DIN-Medium';
+	font-size: 26rpx;
+	font-weight: 600;
+	color: #409EFF;
+	margin-bottom: 8rpx;
+}
+
+.info-label {
+	font-size: 26rpx;
+	color: #333;
+}
+
+.info-divider {
+	width: 2px;
+	background-color: #C3E1FF;
+}
+</style>
diff --git a/packageB/notice/index.vue b/packageB/notice/index.vue
index 41f8273..074c094 100644
--- a/packageB/notice/index.vue
+++ b/packageB/notice/index.vue
@@ -28,12 +28,12 @@
 		    <view >
 		      <view class="gk-l-i-bottom" v-html="item.content"></view>
 		    </view>
-		    
+
 		  </view>
 		</view>
 	</scroll-view>
-	
-    
+
+
   </AppLayout>
 </template>
 
@@ -42,6 +42,9 @@ import { inject, ref, reactive, onMounted } from "vue";
 const { $api, navTo, navBack, vacanciesTo } = inject("globalFunction");
 import config from "@/config.js";
 import AppLayout from "@/components/AppLayout/AppLayout.vue";
+// import CryptoJS from 'crypto-js'
+
+
 const title = ref("");
 const baseUrl = config.imgBaseUrl;
 const pageSize=ref(10)
@@ -49,7 +52,27 @@ const pageNum=ref(1)
 const totalNum=ref(0)
 // Tab 控制
 const currentTab = ref("train"); // 默认显示培训公告
-
+async function loginA(){
+	const form={
+		usertype: "2",
+		enterprisecode: '91310101MA1FPX1234',
+		enterprisename: 'tt',
+		contactperson: "",
+		contactphone: "",
+		idno: "",
+		name: ""
+	}
+	//用户信息加密方法待更新
+	// const key = '9zS+DFKrzxvosO82mTcPJQ=='
+	// const secretKey = CryptoJS.enc.Utf8.parse(key);//key  为你的秘钥
+	// const srcs = CryptoJS.enc.Utf8.parse(form.idno);
+	// // AES 加密
+	// const encrypted = CryptoJS.AES.encrypt(srcs, secretKey, {mode:CryptoJS.mode.ECB,padding: CryptoJS.pad.Pkcs7}).toString()
+	// console.log('AES Encrypted:111', encrypted)
+	// form.idno=encrypted
+	var resLogin = await $api.myRequest('/auth/login2/ks',form,'post',10100);
+	console.log("resLogin",resLogin)
+}
 function switchTab(tabName) {
   currentTab.value = tabName;
   getPolicyData('refresh',currentTab)
@@ -65,6 +88,7 @@ const getBackgroundStyle = (imageName) => ({
 });
 onMounted(() => {
   getPolicyData('refresh',currentTab);
+  loginA()
 });
 const policyList = ref([]);
 function getPolicyData(type = 'add',currentTab='train') {
@@ -81,7 +105,8 @@ function getPolicyData(type = 'add',currentTab='train') {
 		params={
 			pageSize:pageSize.value,
 			pageNum:pageNum.value,
-			type:current.value
+			type:current.value,
+			shenhe: '1',
 		}
 		$api.myRequest('/train/public/announcement/list', params).then((resData) => {
 			if(resData.code==200){
@@ -91,7 +116,7 @@ function getPolicyData(type = 'add',currentTab='train') {
 				policyList.value=resData.rows
 				totalNum.value=resData.total
 			}
-			
+
 		});
 	}
 	if (type === 'add' && pageNum.value < maxPage) {
@@ -99,7 +124,8 @@ function getPolicyData(type = 'add',currentTab='train') {
 		params={
 			pageSize:pageSize.value,
 			pageNum:pageNum.value,
-			type:current.value
+			type:current.value,
+			shenhe: '1',
 		}
 		$api.myRequest('/train/public/announcement/list', params).then((resData) => {
 			if(resData.code==200){
@@ -198,4 +224,4 @@ function goPolicyDetail(item) {
     margin-top: 12rpx;
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/packageB/notice/trainingAnnouncement/postedDetail.vue b/packageB/notice/trainingAnnouncement/postedDetail.vue
new file mode 100644
index 0000000..30e988d
--- /dev/null
+++ b/packageB/notice/trainingAnnouncement/postedDetail.vue
@@ -0,0 +1,427 @@
+<template>
+    <div style="height: 90vh;overflow-y: auto;">
+        <view class="content">
+            <view class="content-input">
+                <view class="input-titile"><text class="input-required">*</text>标题</view>
+                <input class="input-con" v-model="fromValue.title" placeholder="请输入标题" />
+            </view>
+            <view class="content-input">
+                <view class="input-titile"><text class="input-required">*</text>内容</view>
+                <!-- <unieditor v-if="shows" @init-data="receiveInitData" :content="fromValue.content"/> -->
+				<view v-html="fromValue.content" style="width: 100%;overflow-x: auto;padding: 30rpx;box-sizing: border-box;">
+					
+				</view>
+            </view>
+			<view class="content-input">
+			    <view class="input-titile">备注</view>
+				<textarea auto-height class="input-con" v-model="fromValue.remark" placeholder="请输入备注" />
+			</view>
+			
+        </view>
+        <SelectPopup ref="selectPopupRef"></SelectPopup>
+	</div>
+</template>
+
+<script setup>
+import { reactive, inject, watch, ref, onMounted, onUnmounted } from 'vue';
+import { onLoad, onShow } from '@dcloudio/uni-app';
+const { $api, navTo, navBack, checkingPhoneRegExp,config } = inject('globalFunction');
+import { storeToRefs } from 'pinia';
+import useUserStore from '@/stores/useUserStore';
+import useDictStore from '@/stores/useDictStore';
+import SelectPopup from '@/components/selectPopup/selectPopup.vue';
+import unieditor from '../../components/unieditor.vue'
+const { userInfo } = storeToRefs(useUserStore());
+const { getUserResume } = useUserStore();
+const dictStore = useDictStore();
+const { dictLabel, oneDictData, complete: dictComplete, getDictSelectOption } = dictStore;
+
+let fromValue = reactive({
+	id:'',
+    title: '',
+	content:'',
+	remark:'',
+	entProvince:'',
+	entCounty:'',
+	entCity:'',
+	status:'0',
+});
+let id=ref('')
+onLoad((options) => {
+	id.value=options.id
+	getDetail()
+	
+});
+
+// 监听页面显示，接收从技能查询页面返回的数据
+onShow(() => {
+    // 通过事件总线接收技能选择结果
+    // uni.$on('skillSelected', handleSkillSelected);
+});
+
+// 页面卸载时移除事件监听
+// onUnmounted(() => {
+//     uni.$off('skillSelected', handleSkillSelected);
+// });
+// 监听字典数据加载完成，自动更新学历显示
+
+function getDetail(){
+	$api.myRequest("/train/public/announcement/selectById", {
+		id: id.value,
+	}, "GET", 9100, {
+		Authorization: `Bearer ${uni.getStorageSync('token')}`,
+		'Content-Type': "application/x-www-form-urlencoded"
+	}).then((res) => {
+		if (res.code === 200) {
+			fromValue.id = res.data.id;
+			fromValue.title = res.data.title;
+			fromValue.content= res.data.content;
+			fromValue.remark= res.data.remark;
+			fromValue.entProvince = res.data.entProvince;
+			fromValue.entCounty = res.data.entCounty;
+			fromValue.entCity = res.data.entCity;
+			// fromValue = {
+			//   ...fromValue,
+			//   ...res.data,
+			// };
+		}
+	})
+}
+
+
+
+</script>
+
+<style lang="stylus" scoped>
+.btn{
+    margin-top: -30rpx
+}
+.input-required{
+	color: red
+}
+/* 上传按钮 */
+.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;
+  margin-top: 20rpx;
+}
+
+.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>view {
+  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;
+}
+.content{
+    padding: 28rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start
+    height: calc(100% - 120rpx)
+
+}
+.footer{
+	width: 100%;
+	height: 120rpx;
+	background: #fff;
+	position: fixed;
+	z-index: 10;
+	bottom: 0;
+	left: 0;
+	display: flex;
+	align-content: center;
+	justify-content: center;
+}
+.footerBtn{
+	width: 90%;
+	height: 90rpx;
+	line-height: 90rpx;
+	text-align: center
+	border-radius: 10rpx;
+	color: #fff;
+	background: #409EFF;
+}
+.content-input
+    margin-bottom: 52rpx
+    .input-titile
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #6A6A6A
+    .input-con
+        font-weight: 400;
+        font-size: 32rpx;
+        color: #333333;
+        line-height: 80rpx;
+        height: 80rpx;
+        border-bottom: 2rpx solid #EBEBEB
+        position: relative;
+    .error-message
+        color: #ff4757;
+        font-size: 24rpx;
+        margin-top: 10rpx;
+        line-height: 1.4;
+    .success-message
+        color: #2ed573;
+        font-size: 24rpx;
+        margin-top: 10rpx;
+        line-height: 1.4;
+    .input-error
+        .input-con
+            border-bottom-color: #ff4757;
+    .triangle::before
+        position: absolute;
+        right: 20rpx;
+        top: calc(50% - 2rpx);
+        content: '';
+        width: 4rpx;
+        height: 18rpx;
+        border-radius: 2rpx
+        background: #697279;
+        transform: translate(0, -50%) rotate(-45deg) ;
+    .triangle::after
+        position: absolute;
+        right: 20rpx;
+        top: 50%;
+        content: '';
+        width: 4rpx;
+        height: 18rpx;
+        border-radius: 2rpx
+        background: #697279;
+        transform: rotate(45deg)
+.input-nx
+    position: relative
+    border-bottom: 2rpx solid #EBEBEB
+    padding-bottom: 30rpx
+    display: flex
+    flex-wrap: wrap
+    .nx-item
+        padding: 16rpx 24rpx
+        width: fit-content
+        border-radius: 20rpx
+        border: 2rpx solid #E8EAEE
+        background-color: #f8f9fa
+        margin-right: 16rpx
+        margin-top: 16rpx
+        font-size: 28rpx
+        color: #333333
+        transition: all 0.2s ease
+        
+        &:hover
+            background-color: #e9ecef
+            border-color: #256bfa
+            color: #256bfa
+.content-sex
+    height: 110rpx;
+    display: flex
+    justify-content: space-between;
+    align-items: flex-start;
+    border-bottom: 2rpx solid #EBEBEB
+    margin-bottom: 52rpx
+    .sex-titile
+        line-height: 80rpx;
+    .sext-ri
+        display: flex
+        align-items: center;
+        .sext-box
+            height: 76rpx;
+            width: 152rpx;
+            text-align: center;
+            line-height: 80rpx;
+            border-radius: 12rpx 12rpx 12rpx 12rpx
+            border: 2rpx solid #E8EAEE;
+            margin-left: 28rpx
+            font-weight: 400;
+            font-size: 28rpx;
+        .sext-boxactive
+            color: #256BFA
+            background: rgba(37,107,250,0.1);
+            border: 2rpx solid #256BFA;
+    .next-btn
+        width: 100%;
+        height: 90rpx;
+        background: #256BFA;
+        border-radius: 12rpx 12rpx 12rpx 12rpx;
+        font-weight: 500;
+        font-size: 32rpx;
+        color: #FFFFFF;
+        text-align: center;
+        line-height: 90rpx
+
+// 技能信息样式
+.content-skills
+    margin-bottom: 52rpx
+    
+    .skills-header
+        display: flex
+        justify-content: space-between
+        align-items: center
+        margin-bottom: 32rpx
+        
+        .input-titile
+            font-weight: 400
+            font-size: 28rpx
+            color: #6A6A6A
+        
+        .add-skill-btn
+            padding: 16rpx 32rpx
+            background: #256BFA
+            color: #FFFFFF
+            border-radius: 8rpx
+            font-size: 26rpx
+            font-weight: 500
+            transition: all 0.3s ease
+            
+            &:active
+                background: #1a5cd9
+                transform: scale(0.98)
+            
+            &.disabled
+                background: #CCCCCC
+                color: #999999
+                cursor: not-allowed
+                
+                &:active
+                    background: #CCCCCC
+                    transform: none
+    
+    .skills-list
+        .skill-item
+            background: #FFFFFF
+            border: 2rpx solid #E8EAEE
+            border-radius: 12rpx
+            padding: 24rpx
+            margin-bottom: 24rpx
+            box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05)
+            transition: all 0.3s ease
+            
+            &:hover
+                box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.1)
+                border-color: #256BFA
+            
+            .skill-header
+                display: flex
+                justify-content: space-between
+                align-items: center
+                margin-bottom: 20rpx
+                
+                .skill-number
+                    font-weight: 500
+                    font-size: 28rpx
+                    color: #333333
+                
+                .skill-actions
+                    .action-btn
+                        padding: 8rpx 16rpx
+                        border-radius: 6rpx
+                        font-size: 24rpx
+                        font-weight: 400
+                        transition: all 0.2s ease
+                        
+                        &.delete-btn
+                            background: #FF4D4F
+                            color: #FFFFFF
+                            
+                            &:active
+                                background: #D9363E
+                                transform: scale(0.95)
+            
+            .skill-fields
+                display: flex
+                flex-direction: column
+                gap: 20rpx
+                
+                .skill-field
+                    .field-label
+                        font-weight: 400
+                        font-size: 26rpx
+                        color: #6A6A6A
+                        margin-bottom: 8rpx
+                    
+                    .field-input
+                        font-weight: 400
+                        font-size: 28rpx
+                        color: #333333
+                        line-height: 72rpx
+                        height: 72rpx
+                        border: 2rpx solid #E8EAEE
+                        border-radius: 8rpx
+                        padding: 0 20rpx
+                        background: #F8F9FA
+                        transition: all 0.3s ease
+                        
+                        &:focus
+                            border-color: #256BFA
+                            background: #FFFFFF
+                        
+                        &.triangle::before
+                            right: 30rpx
+                            top: calc(50% - 2rpx)
+                        
+                        &.triangle::after
+                            right: 30rpx
+                            top: 50%
+    
+    .empty-skills
+        text-align: center
+        padding: 60rpx 0
+        background: #F8F9FA
+        border-radius: 12rpx
+        border: 2rpx dashed #E8EAEE
+        
+        .empty-text
+            font-size: 28rpx
+            color: #999999
+            font-weight: 400
+</style>
diff --git a/packageB/notice/trainingAnnouncement/postedEdit.vue b/packageB/notice/trainingAnnouncement/postedEdit.vue
new file mode 100644
index 0000000..53ad229
--- /dev/null
+++ b/packageB/notice/trainingAnnouncement/postedEdit.vue
@@ -0,0 +1,504 @@
+<template>
+    <div style="height: 90vh;overflow-y: auto;">
+        <view class="content">
+            <view class="content-input">
+                <view class="input-titile"><text class="input-required">*</text>标题</view>
+                <input class="input-con" v-model="fromValue.title" placeholder="请输入标题" />
+            </view>
+            <view class="content-input">
+                <view class="input-titile"><text class="input-required">*</text>内容</view>
+                <!-- <input class="input-con" v-model="fromValue.contactName" placeholder="请输入联系人" /> -->
+				<unieditor v-if="shows" @init-data="receiveInitData" :content="fromValue.content"/>
+            </view>
+			<view class="content-input">
+			    <view class="input-titile">备注</view>
+				<textarea auto-height class="input-con" v-model="fromValue.remark" placeholder="请输入备注" />
+			</view>
+			
+        </view>
+		<view class="footer">
+			<view class="footerBtn" @click="confirm()">保存</view>
+		</view>
+        <SelectPopup ref="selectPopupRef"></SelectPopup>
+	</div>
+</template>
+
+<script setup>
+import { reactive, inject, watch, ref, onMounted, onUnmounted } from 'vue';
+import { onLoad, onShow } from '@dcloudio/uni-app';
+const { $api, navTo, navBack, checkingPhoneRegExp,config } = inject('globalFunction');
+import { storeToRefs } from 'pinia';
+import useUserStore from '@/stores/useUserStore';
+import useDictStore from '@/stores/useDictStore';
+import SelectPopup from '@/components/selectPopup/selectPopup.vue';
+import unieditor from '../../components/unieditor.vue'
+const { userInfo } = storeToRefs(useUserStore());
+const { getUserResume } = useUserStore();
+const dictStore = useDictStore();
+const { dictLabel, oneDictData, complete: dictComplete, getDictSelectOption } = dictStore;
+
+let fromValue = reactive({
+	id:'',
+    title: '',
+	content:'',
+	remark:'',
+	entProvince:'',
+	entCounty:'',
+	entCity:'',
+	status:'0',
+});
+let type=ref('add')
+let id=ref('')
+let shows=ref(false)
+onLoad((options) => {
+	id.value=options.id
+	if(options.id){
+		type.value='edit'
+		getDetail()
+	}else{
+		getInfo()
+	}
+});
+
+// 监听页面显示，接收从技能查询页面返回的数据
+onShow(() => {
+    // 通过事件总线接收技能选择结果
+    // uni.$on('skillSelected', handleSkillSelected);
+});
+
+// 页面卸载时移除事件监听
+// onUnmounted(() => {
+//     uni.$off('skillSelected', handleSkillSelected);
+// });
+// 监听字典数据加载完成，自动更新学历显示
+
+const receiveInitData = (initData) => {
+	if(initData.value=="<p><br></p>"){
+		
+	}else{
+		fromValue.content=initData.value;
+	}
+  console.log('子组件初始化数据：', initData)
+}
+function getInfo(){
+	// if(userInfo.userId){
+		$api.myRequest("/train/public/train/organ/getTrainByUnifiedSocialCreditCode", {
+			tags: "913700001630477270",
+		}, "GET", 9100, {
+			Authorization: `Bearer ${uni.getStorageSync('token')}`,
+			'Content-Type': "application/x-www-form-urlencoded"
+		}).then((res) => {
+			if (res.code === 200) {
+				fromValue.entProvince = res.data.organProvince;
+				fromValue.entCounty = res.data.organCounty;
+				fromValue.entCity = res.data.organCity;
+				shows.value=true;
+			}
+		})
+	// }else{
+	// 	$api.msg('请先登录');
+	// }
+}
+function getDetail(){
+	$api.myRequest("/train/public/announcement/selectById", {
+		id: id.value,
+	}, "GET", 9100, {
+		Authorization: `Bearer ${uni.getStorageSync('token')}`,
+		'Content-Type': "application/x-www-form-urlencoded"
+	}).then((res) => {
+		if (res.code === 200) {
+			fromValue.id = res.data.id;
+			fromValue.title = res.data.title;
+			fromValue.content= res.data.content;
+			fromValue.remark= res.data.remark;
+			fromValue.entProvince = res.data.entProvince;
+			fromValue.entCounty = res.data.entCounty;
+			fromValue.entCity = res.data.entCity;
+			// fromValue = {
+			//   ...fromValue,
+			//   ...res.data,
+			// };
+			shows.value=true;
+		}
+	})
+}
+
+const confirm = () => {
+    if (!fromValue.title) {
+        return $api.msg('请输入标题');
+    }
+	if (!fromValue.content) {
+	    return $api.msg('请输入内容');
+	}
+    const params = {
+        ...fromValue,
+    };
+	if(type.value=='add'){
+		$api.myRequest('/train/public/announcement/add', {
+			...fromValue,
+			type:1
+		}, 'post', 9100, {
+			Authorization: `Bearer ${uni.getStorageSync('token')}`,
+			'Content-Type': "application/x-www-form-urlencoded"
+		}).then((resData) => {
+			if(resData.code==200){
+				$api.msg('新增成功');
+				setTimeout(()=>{
+					navBack();
+				},2000)
+			}
+		});
+	} else if (type.value=='edit'){
+		$api.myRequest('/train/public/announcement/update', {
+			...fromValue,
+			type:1
+		}, 'post', 9100, {
+			Authorization: `Bearer ${uni.getStorageSync('token')}`,
+			'Content-Type': "application/x-www-form-urlencoded"
+		}).then((resData) => {
+			if(resData.code==200){
+				$api.msg('更新成功');
+				setTimeout(()=>{
+					navBack();
+				},2000)
+			}
+		});
+	}
+    
+};
+
+</script>
+
+<style lang="stylus" scoped>
+.btn{
+    margin-top: -30rpx
+}
+.input-required{
+	color: red
+}
+/* 上传按钮 */
+.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;
+  margin-top: 20rpx;
+}
+
+.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>view {
+  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;
+}
+.content{
+    padding: 28rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start
+    height: calc(100% - 120rpx)
+
+}
+.footer{
+	width: 100%;
+	height: 120rpx;
+	background: #fff;
+	position: fixed;
+	z-index: 10;
+	bottom: 0;
+	left: 0;
+	display: flex;
+	align-content: center;
+	justify-content: center;
+}
+.footerBtn{
+	width: 90%;
+	height: 90rpx;
+	line-height: 90rpx;
+	text-align: center
+	border-radius: 10rpx;
+	color: #fff;
+	background: #409EFF;
+}
+.content-input
+    margin-bottom: 52rpx
+    .input-titile
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #6A6A6A
+    .input-con
+        font-weight: 400;
+        font-size: 32rpx;
+        color: #333333;
+        line-height: 80rpx;
+        height: 80rpx;
+        border-bottom: 2rpx solid #EBEBEB
+        position: relative;
+    .error-message
+        color: #ff4757;
+        font-size: 24rpx;
+        margin-top: 10rpx;
+        line-height: 1.4;
+    .success-message
+        color: #2ed573;
+        font-size: 24rpx;
+        margin-top: 10rpx;
+        line-height: 1.4;
+    .input-error
+        .input-con
+            border-bottom-color: #ff4757;
+    .triangle::before
+        position: absolute;
+        right: 20rpx;
+        top: calc(50% - 2rpx);
+        content: '';
+        width: 4rpx;
+        height: 18rpx;
+        border-radius: 2rpx
+        background: #697279;
+        transform: translate(0, -50%) rotate(-45deg) ;
+    .triangle::after
+        position: absolute;
+        right: 20rpx;
+        top: 50%;
+        content: '';
+        width: 4rpx;
+        height: 18rpx;
+        border-radius: 2rpx
+        background: #697279;
+        transform: rotate(45deg)
+.input-nx
+    position: relative
+    border-bottom: 2rpx solid #EBEBEB
+    padding-bottom: 30rpx
+    display: flex
+    flex-wrap: wrap
+    .nx-item
+        padding: 16rpx 24rpx
+        width: fit-content
+        border-radius: 20rpx
+        border: 2rpx solid #E8EAEE
+        background-color: #f8f9fa
+        margin-right: 16rpx
+        margin-top: 16rpx
+        font-size: 28rpx
+        color: #333333
+        transition: all 0.2s ease
+        
+        &:hover
+            background-color: #e9ecef
+            border-color: #256bfa
+            color: #256bfa
+.content-sex
+    height: 110rpx;
+    display: flex
+    justify-content: space-between;
+    align-items: flex-start;
+    border-bottom: 2rpx solid #EBEBEB
+    margin-bottom: 52rpx
+    .sex-titile
+        line-height: 80rpx;
+    .sext-ri
+        display: flex
+        align-items: center;
+        .sext-box
+            height: 76rpx;
+            width: 152rpx;
+            text-align: center;
+            line-height: 80rpx;
+            border-radius: 12rpx 12rpx 12rpx 12rpx
+            border: 2rpx solid #E8EAEE;
+            margin-left: 28rpx
+            font-weight: 400;
+            font-size: 28rpx;
+        .sext-boxactive
+            color: #256BFA
+            background: rgba(37,107,250,0.1);
+            border: 2rpx solid #256BFA;
+    .next-btn
+        width: 100%;
+        height: 90rpx;
+        background: #256BFA;
+        border-radius: 12rpx 12rpx 12rpx 12rpx;
+        font-weight: 500;
+        font-size: 32rpx;
+        color: #FFFFFF;
+        text-align: center;
+        line-height: 90rpx
+
+// 技能信息样式
+.content-skills
+    margin-bottom: 52rpx
+    
+    .skills-header
+        display: flex
+        justify-content: space-between
+        align-items: center
+        margin-bottom: 32rpx
+        
+        .input-titile
+            font-weight: 400
+            font-size: 28rpx
+            color: #6A6A6A
+        
+        .add-skill-btn
+            padding: 16rpx 32rpx
+            background: #256BFA
+            color: #FFFFFF
+            border-radius: 8rpx
+            font-size: 26rpx
+            font-weight: 500
+            transition: all 0.3s ease
+            
+            &:active
+                background: #1a5cd9
+                transform: scale(0.98)
+            
+            &.disabled
+                background: #CCCCCC
+                color: #999999
+                cursor: not-allowed
+                
+                &:active
+                    background: #CCCCCC
+                    transform: none
+    
+    .skills-list
+        .skill-item
+            background: #FFFFFF
+            border: 2rpx solid #E8EAEE
+            border-radius: 12rpx
+            padding: 24rpx
+            margin-bottom: 24rpx
+            box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05)
+            transition: all 0.3s ease
+            
+            &:hover
+                box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.1)
+                border-color: #256BFA
+            
+            .skill-header
+                display: flex
+                justify-content: space-between
+                align-items: center
+                margin-bottom: 20rpx
+                
+                .skill-number
+                    font-weight: 500
+                    font-size: 28rpx
+                    color: #333333
+                
+                .skill-actions
+                    .action-btn
+                        padding: 8rpx 16rpx
+                        border-radius: 6rpx
+                        font-size: 24rpx
+                        font-weight: 400
+                        transition: all 0.2s ease
+                        
+                        &.delete-btn
+                            background: #FF4D4F
+                            color: #FFFFFF
+                            
+                            &:active
+                                background: #D9363E
+                                transform: scale(0.95)
+            
+            .skill-fields
+                display: flex
+                flex-direction: column
+                gap: 20rpx
+                
+                .skill-field
+                    .field-label
+                        font-weight: 400
+                        font-size: 26rpx
+                        color: #6A6A6A
+                        margin-bottom: 8rpx
+                    
+                    .field-input
+                        font-weight: 400
+                        font-size: 28rpx
+                        color: #333333
+                        line-height: 72rpx
+                        height: 72rpx
+                        border: 2rpx solid #E8EAEE
+                        border-radius: 8rpx
+                        padding: 0 20rpx
+                        background: #F8F9FA
+                        transition: all 0.3s ease
+                        
+                        &:focus
+                            border-color: #256BFA
+                            background: #FFFFFF
+                        
+                        &.triangle::before
+                            right: 30rpx
+                            top: calc(50% - 2rpx)
+                        
+                        &.triangle::after
+                            right: 30rpx
+                            top: 50%
+    
+    .empty-skills
+        text-align: center
+        padding: 60rpx 0
+        background: #F8F9FA
+        border-radius: 12rpx
+        border: 2rpx dashed #E8EAEE
+        
+        .empty-text
+            font-size: 28rpx
+            color: #999999
+            font-weight: 400
+</style>
diff --git a/packageB/notice/trainingAnnouncement/postedList.vue b/packageB/notice/trainingAnnouncement/postedList.vue
new file mode 100644
index 0000000..c00a8e4
--- /dev/null
+++ b/packageB/notice/trainingAnnouncement/postedList.vue
@@ -0,0 +1,447 @@
+<template>
+	<div class="app-box">
+		<div class="con-box">
+		    <!-- <view class="collection-search">
+		        <view class="search-content">
+		            <view class="header-input button-click">
+		                <uni-icons class="iconsearch" color="#6A6A6A" type="search" size="22"></uni-icons>
+		                <input
+		                    class="input"
+		                    v-model="searchKeyword"
+		                    @confirm="searchVideo"
+		                    placeholder="输入考试名称"
+		                    placeholder-class="inputplace"
+		                />
+		                <uni-icons 
+		                    v-if="searchKeyword" 
+		                    class="clear-icon" 
+		                    type="clear" 
+		                    size="24" 
+		                    color="#999" 
+		                    @click="clearSearch"
+		                />
+		            </view>
+		        </view>
+		    </view> -->
+			<scroll-view scroll-y class="main-scroll" @scrolltolower="handleScrollToLower">
+				<div class="cards" v-for="(item,index) in dataList" :key="item.examPaperId">
+					<div class="cardHead">
+						<div class="cardHeadLeft">
+							<div class="cardTitle">{{item.title}}</div>
+						</div>
+						<div class="rightBtn">
+							<uni-tag :inverted="true" v-if="item.status==2" text="已发布" type="success" />
+							<uni-tag :inverted="true" v-else-if="item.status==0" text="未发布" type="error" />
+							<uni-tag :inverted="true" v-else text="失效" />
+						</div>
+					</div>
+					<div class="heng"></div>
+					<div class="cardCon">
+						<div class="conten">发布时间：{{item.publishTime}}</div>
+						<div class="conten">审核状态：
+							<uni-tag :inverted="true" size="mini" v-if="item.shenhe==1" text="已通过" type="success" />
+							<uni-tag :inverted="true" size="mini" v-if="item.shenhe==2" text="未通过" type="error" />
+							<uni-tag :inverted="true" size="mini" v-if="item.shenhe==0" text="待审核" />
+						</div>
+						<div class="flooter">
+							<div v-if="item.status == '0' && item.shenhe == '1'" @click="handlePublishClick(scope.row,2)" >发布</div>
+							<div v-else @click="handlePublishClick(item,0)" >取消发布</div>
+							<div @click="handleDetail(item)">查看</div>
+							<div v-if="item.status == '0'" @click="handleOperation(item)">编辑</div>
+							<div v-if="item.status == '0'" @click="handleDeleteClick(item)">删除</div>
+						</div>
+					</div>
+				</div>
+			</scroll-view>
+		</div>
+		<div class="footer">
+			<div class="footerBtn" @click="handleOperation()">新增</div>
+		</div>
+	</div>
+</template>
+
+<script setup>
+import { inject, ref, reactive } from 'vue';
+import { onLoad, onShow } from '@dcloudio/uni-app';
+const { $api, navTo, navBack,urls } = inject('globalFunction');
+import config from "@/config.js"
+const userInfo = ref({});
+const Authorization = ref('');
+const searchKeyword = ref('');
+const dataList=ref([])
+const pageSize=ref(10)
+const pageNum=ref(1)
+const totalNum=ref(0)
+const baseUrl = config.imgBaseUrl
+const handleScrollToLower = () => {
+    getDataList('add');
+};
+onLoad(() => {
+	
+});
+onShow(()=>{
+	Authorization.value=uni.getStorageSync('Padmin-Token')||''
+	getDataList('refresh');
+})
+// 搜索视频
+function searchVideo() {
+    getDataList('refresh');
+}
+
+// 清除搜索内容
+function clearSearch() {
+    searchKeyword.value = '';
+    getDataList('refresh');
+}
+
+function getDataList(type = 'add') {
+	let maxPage=Math.ceil(totalNum.value/pageSize.value)
+	let params={}
+    if (type === 'refresh') {
+        pageNum.value = 1;
+		params={
+			title:"",
+			pageSize:pageSize.value,
+			pageNum:pageNum.value,
+			type:1
+		}
+		$api.myRequest('/train/public/announcement/list', params).then((resData) => {
+			if(resData.code==200){
+				dataList.value=resData.rows
+				totalNum.value=resData.total
+			}
+			
+		});
+    }
+    if (type === 'add' && pageNum.value < maxPage) {
+        pageNum.value += 1;
+		params={
+			address:"",
+			pageSize:pageSize.value,
+			pageNum:pageNum.value,
+			type:1
+		}
+		$api.myRequest('/train/public/train/organ/table', params).then((resData) => {
+			if(resData.code==200){
+				dataList.value=dataList.value.concat(resData.rows)
+				totalNum.value=resData.total
+			}
+		});
+	}
+}
+function  handlePublishClick(row,status){
+  if(status=='2'){
+	  $api.myRequest('/train/public/announcement/publish', {id: row.id},'get',9100).then((resData) => {
+	  	if(resData.code==200){
+			$api.msg('发布成功');
+	  		getDataList('refresh');
+	  	}
+	  });
+  } else {
+	  $api.myRequest('/train/public/announcement/unpublish', {id: row.id},'get',9100).then((resData) => {
+	  	if(resData.code==200){
+	  		$api.msg('取消发布成功');
+	  		getDataList('refresh');
+	  	}
+	  });
+	
+  }
+}
+// 删除通知公告
+function handleDeleteClick(row) {
+	uni.showModal({
+	    title: '确认删除',
+	    content: '确认删除该通知公告吗？',
+	    success: (res) => {
+	        if (res.confirm) {
+				$api.myRequest('/train/public/announcement/delete', {id: row.id},'get',9100).then((resData) => {
+					if(resData.code==200){
+						$api.msg('已删除');
+						getDataList('refresh');
+					}
+				});
+	            
+	        }
+	    }
+	});
+}
+function handleOperation(row) {
+	if(row){
+		navTo(`/packageB/notice/trainingAnnouncement/postedEdit?id=${row.id}`);
+	}else{
+		navTo(`/packageB/notice/trainingAnnouncement/postedEdit`);
+	}
+}
+function handleDetail(row){
+	navTo(`/packageB/notice/trainingAnnouncement/postedDetail?id=${row.id}`);
+}
+</script>
+
+<style lang="stylus" scoped>
+.app-box{
+	width: 100%;
+	height: 100vh;
+	position: relative;
+	.con-box{
+		position: absolute;
+		width: 100%;
+		height: 92%;
+		left: 0;
+		top:0;
+		z-index: 10;
+		padding: 20rpx 28rpx;
+		box-sizing: border-box;
+		overflow: hidden;
+		.collection-search{
+		    padding: 10rpx 20rpx;
+		    .search-content{
+		        position: relative
+		        display: flex
+		        align-items: center
+		        padding: 14rpx 0
+		        .header-input{
+		            padding: 0
+		            width: calc(100%);
+		            position: relative
+		            .iconsearch{
+		                position: absolute
+		                left: 30rpx;
+		                top: 50%
+		                transform: translate(0, -50%)
+		                z-index: 1
+		            }
+		            .input{
+		                padding: 0 80rpx 0 80rpx
+		                height: 80rpx;
+		                background: #FFFFFF;
+		                border-radius: 75rpx 75rpx 75rpx 75rpx;
+		                border: 2rpx solid #ECECEC
+		                font-size: 28rpx;
+		            }
+		            .clear-icon{
+		                position: absolute
+		                right: 30rpx;
+		                top: 50%
+		                transform: translate(0, -50%)
+		                z-index: 1
+		                cursor: pointer
+		            }
+		            .inputplace{
+		                font-weight: 400;
+		                font-size: 28rpx;
+		                color: #B5B5B5;
+		            }
+		        }
+		    }
+		}
+		.main-scroll {
+		    width: 100%;
+		    height: 100%;
+			.cards{
+				width: 100%;
+				min-height: 260rpx;
+				height: auto;
+				background: linear-gradient(0deg, #E3EFFF 0%, #FBFDFF 100%);
+				// box-shadow: 0px 0px 6px 0px rgba(0,71,200,0.32);
+				border-radius: 12rpx;
+				border: 2px solid #EDF5FF;
+				margin-bottom: 30rpx;
+				padding: 30rpx 40rpx 0;
+				box-sizing: border-box
+				.cardHead{
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					.cardHeadLeft{
+						display: flex;
+						align-items: center
+						width: 70%;
+						.cardTitle{
+							font-weight: bold;
+							font-size: 28rpx;
+							color: #0069CB;
+							max-width: 100%;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							white-space: nowrap;
+						}
+						.titleType{
+							border-radius: 4px;
+							font-size: 22rpx;
+							color: #157EFF;
+							width: 100rpx;
+							height: 38rpx;
+							text-align: center;
+							line-height: 38rpx;
+							margin-left: 10rpx;
+						}
+						
+					}
+					
+				}
+				.heng{
+					width: 30%;
+					height: 4rpx;
+					background: linear-gradient(88deg, #015EEA 0%, #00C0FA 100%);
+					margin: 10rpx 0 20rpx;
+				}
+				.cardCon{
+					display: flex;
+					flex-wrap: wrap;
+					.conten{
+						width: 100%;
+						font-size: 24rpx;
+						color: #666666;
+						display: flex;
+						align-items: center
+						margin-bottom: 10rpx;
+					}
+					.status-tags{
+						display: flex;
+						align-items: center;
+					}
+				}
+				.flooter{
+					width: 100%;
+					border-top: 1px solid #ccc;
+					display: flex;
+					justify-content: flex-end;
+					align-items: center;
+					margin-top: 10rpx;
+					view{
+						font-size: 28rpx;
+						margin-left: 30rpx;
+						color: #2175F3;
+						padding-top: 14rpx;
+					}
+				}
+			}
+		}
+	}
+	.cards2{
+		position: fixed;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100vh;
+		background-color: rgba(0,0,0,0.5);
+		z-index: 10000;
+		padding: 100rpx 50rpx;
+		box-sizing: border-box;
+		.cardCon{
+			height: 70%;
+			background-color: #fff;
+			padding: 20rpx;
+			box-sizing: border-box;
+			.cardHead{
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				font-size: 30rpx;
+				font-weight: 600;
+			}
+			
+		}
+	}
+	.footer{
+		width: 100%;
+		height: 120rpx;
+		background: #fff;
+		position: fixed;
+		z-index: 10;
+		bottom: 0;
+		left: 0;
+		display: flex;
+		align-content: center;
+		justify-content: center;
+	}
+	.footerBtn{
+		width: 90%;
+		height: 90rpx;
+		line-height: 90rpx;
+		text-align: center
+		border-radius: 10rpx;
+		color: #fff;
+		background: #409EFF;
+	}
+}
+.titleType{
+	display: inline-block
+	border-radius: 4px;
+	font-size: 22rpx;
+	color: #157EFF;
+	width: 100rpx;
+	height: 38rpx;
+	text-align: center;
+	line-height: 38rpx;
+	margin-left: 10rpx;
+}
+.primary{
+	border: 1px solid #157EFF!important;
+	color: #157EFF!important
+}
+.success{
+	border: 1px solid #05A636!important;
+	color: #05A636!important
+}
+.info{
+	border: 1px solid #898989!important;
+	color: #898989!important
+}
+.tertiary{
+	border: 1px solid #E6A340!important;
+	color: #E6A340!important
+}
+.primary2{
+	border: 1px solid #F56C6C!important;
+	color: #F56C6C!important
+}
+.rightBtn{
+	width: 140rpx;
+	height: 44rpx;
+	line-height: 44rpx;
+	// background: linear-gradient(90deg, #00C0FA 0%, #1271FF 100%);
+	// border-radius: 4px;
+	// color: #fff;
+	// font-size: 24rpx;
+	text-align: center;
+}
+.detailTitle{
+	font-size: 32rpx;
+	font-weight: 600;
+	margin: 30rpx 0;
+}
+.detailCon{
+	font-size: 28rpx;
+	line-height: 40rpx;
+}
+.exam-info {
+	display: flex;
+	justify-content: space-between;
+	margin-bottom: 35rpx;
+	margin-top: 20rpx;
+}
+
+.info-item {
+	flex: 1;
+	text-align: center;
+}
+
+.info-value {
+	font-family: 'D-DIN-Medium';
+	font-size: 26rpx;
+	font-weight: 600;
+	color: #409EFF;
+	margin-bottom: 8rpx;
+}
+
+.info-label {
+	font-size: 26rpx;
+	color: #333;
+}
+
+.info-divider {
+	width: 2px;
+	background-color: #C3E1FF;
+}
+</style>
diff --git a/packageB/priority/allocate.vue b/packageB/priority/allocate.vue
new file mode 100644
index 0000000..7fc5d55
--- /dev/null
+++ b/packageB/priority/allocate.vue
@@ -0,0 +1,318 @@
+<template>
+    <AppLayout :title="title" :show-bg-image="false" >
+        <view class="main-list" :style="getBackgroundStyle('k.png')" >
+			<view class="list-top">
+				<view class="list-title">
+					<text>帮扶任务分配</text>
+					<view class="title-line"></view>
+				</view>
+			</view>
+            <view class="form-container">
+                <uni-forms ref="formRef" v-model="formData" :rules="rules" validate-trigger="submit" >
+                  <uni-forms-item label="任务名称：" name="taskName" required >
+					  <uni-easyinput v-model="formData.taskName" placeholder="请输入任务名称"></uni-easyinput>
+                  </uni-forms-item>
+				  <uni-forms-item label="目标人员："  required >
+				  	   <button class="choice-btn" @click="choicePerson">从帮扶人员库选择目标人员</button>
+				  </uni-forms-item>
+				  <uni-forms-item label="目标人数：" name="goalPersonCount" required>
+				  		<uni-easyinput v-model="formData.goalPersonCount" disabled></uni-easyinput>
+				  </uni-forms-item>
+				  <uni-forms-item label="执行区域：" name="executeDeptId" required >
+				  	  <uni-data-select v-model="formData.executeDeptId" placeholder="请选择执行区域" :localdata="executeDeptOptions" @change="executeDeptChange"></uni-data-select>
+				  </uni-forms-item>
+				  <uni-forms-item label="截止时间：" name="deadline" required>
+				  		<uni-datetime-picker class="picker-value" type="date" placeholder="请选择截止时间"  v-model="formData.deadline" @change="onDateChange" />
+				  </uni-forms-item>
+                  <uni-forms-item label="分配说明：" name="allocationNote" >
+					  <uni-easyinput type="textarea" v-model="formData.allocationNote" placeholder="请输入分配说明"></uni-easyinput>
+                  </uni-forms-item>
+                </uni-forms>
+                <!-- 按钮组 -->
+                <view class="button-group">
+				  <button class="btn submit-btn" @click="handleSubmit">确定</button>
+                  <!-- <button class="btn reset-btn"  @click="handleCancel">取消</button> -->
+                </view>
+			</view>
+        </view>
+    </AppLayout>
+</template>
+
+<script setup>
+import { inject, ref, reactive } from 'vue';
+import { onLoad,onShow } from '@dcloudio/uni-app';
+const { $api, navTo, navBack } = inject('globalFunction');
+import config from "@/config.js"
+import targetPersonelChoice from './components/targetPersonnelChoice.vue'
+
+const title = ref('');
+const taskTypeOptions=ref([])
+const priorityOptions=ref([])
+const executeDeptOptions=ref([])
+const jumpUrl=ref('')
+const formData = reactive({
+	id: '',
+	taskId: '',
+	taskName: '',
+	createBy: '',
+	goalPersonCount: null,
+	executeDeptId: '',
+	executeDeptName: '',
+	executeDeptAncestors: '',
+	allocationStatus: '1',
+	allocationNote: '',
+	deadline: null,
+	goalPersonList: [],
+	allocationId:''
+})
+// 表单引用
+const formRef = ref(null)
+// 校验规则
+const rules = {
+	taskName: {
+		rules: [{
+			required: true,
+			errorMessage: '请填写任务名称'
+		}]
+	},
+	goalPersonCount: {
+		rules: [{
+			required: true,
+			errorMessage: '请选择目标人员'
+		}]
+	},
+	executeDeptId: {
+		rules: [{
+			required: true,
+			errorMessage: '请选择执行区域'
+		}]
+	},
+	deadline:{
+		rules: [{
+			required: true,
+			errorMessage: '请选择截止时间'
+		}]
+	},
+}
+const baseUrl = config.imgBaseUrl
+const getBackgroundStyle = (imageName) => ({
+    backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
+    backgroundSize: 'cover',      // 覆盖整个容器
+    backgroundPosition: 'center', // 居中
+    backgroundRepeat: 'no-repeat'
+});
+function choicePerson(){
+	navTo('/packageB/priority/targetPersonnelChoice?allocationId='+formData.allocationId);
+}
+function listNotParam(){
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={}
+	$api.myRequest('/dispatch/dept/listNotParam',params,'get',9100,header).then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.deptId,
+				    text: item.deptName,
+					ancestors:item.ancestors
+				}
+				executeDeptOptions.value.push(obj)
+			})
+		}
+	});
+}
+// 事件处理
+function onDateChange(e){
+	formData.deadline=e
+}
+function executeDeptChange(e){
+	formData.executeDeptId=e
+	formData.executeDeptName=getLabelByValue(e,executeDeptOptions.value)
+	formData.executeDeptAncestors=getAncestorsByValue(e,executeDeptOptions.value)
+}
+function getLabelByValue(value,arr) {
+	if (!Array.isArray(arr)) {
+	    return ''
+	}
+	
+	const item = arr.find(item => item.value === value)
+	return item ? item.text : '暂无'
+}
+function getAncestorsByValue(value,arr){
+	if (!Array.isArray(arr)) {
+	    return ''
+	}
+	
+	const item = arr.find(item => item.value === value)
+	return item ? item.ancestors : ''
+}
+function normalizePersonData(dataList) {
+  if (!Array.isArray(dataList)) return [];
+  return dataList.map(obj => {
+    const fullValue = obj;
+    return {
+      personId: String(fullValue) // 确保转为字符串，防止意外类型
+    };
+  });
+}
+const handleSubmit = () => {
+  formRef.value?.validate()
+    .then(() => {
+		let header={
+			'Authorization':uni.getStorageSync('Padmin-Token')
+		}
+		$api.myRequest('/dispatch/assist/task/allocation/allocate', formData,'post',9100,header).then((resData) => {
+			if(resData && resData.code == 200){
+				handleCancel()
+				uni.showToast({
+				  title: '分配成功',
+				  icon: 'success',
+				  duration: 2000 
+				});
+			}else{
+				uni.showToast({
+				  title: resData.msg,
+				  icon: 'none',
+				  duration: 2000
+				});
+			}
+			
+		});
+    })
+    .catch((errors) => {
+      console.log('校验失败:', errors);
+    });
+};
+
+const handleCancel = () => {
+	formData.taskName=''
+	formData.goalPersonCount=null
+	formData.executeDeptId=''
+	formData.executeDeptName=''
+	formData.executeDeptAncestors=''
+	formData.allocationStatus='1'
+	formData.allocationNote=''
+	formData.deadline=null
+	formData.goalPersonList=[]
+	navTo(jumpUrl.value);
+}
+function getDetail(){
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={
+		id:formData.allocationId
+	}
+	$api.myRequest('/dispatch/assist/task/getTask',params,'get',9100,header).then((resData) => {
+		formData.executeDeptAncestors=resData.data.taskAllocation.executeDeptAncestors
+	});
+}
+onLoad((options) => {
+	if(options.url=='taskIssue'){
+		jumpUrl.value='/packageB/priority/taskIssue'
+	}else if (options.url=='taskAssignment'){
+		jumpUrl.value='/packageB/priority/taskAssignment'
+	}
+	let dataInfo=JSON.parse(options.item)
+	formData.id=dataInfo.allocationId
+	formData.taskName=dataInfo.taskName
+	formData.createBy=dataInfo.createBy
+	formData.deadline=dataInfo.taskAllocation.deadline
+	formData.allocationNote=dataInfo.taskAllocation.allocationNote
+	formData.allocationId=dataInfo.allocationId
+	formData.taskId=dataInfo.taskAllocation.taskId
+	listNotParam()
+	getDetail()
+});
+onShow(()=>{
+	uni.$on('choicePerson', handleBackData);
+})
+// 定义监听回调
+const handleBackData = (data) => {
+  formData.goalPersonList=normalizePersonData(data)
+  formData.goalPersonCount=data.length
+};
+
+
+</script>
+
+<style lang="stylus" scoped>
+image
+  height: 100%
+  width: 100%
+.main-list
+  background-color: #ffffff
+  padding: 20rpx 20rpx 28rpx 20rpx
+  margin: 30rpx 30rpx
+  box-shadow: 0px 3px 20px 0px rgba(0,105,234,0.1)
+  border-radius: 12px
+.list-top
+  display: flex
+  align-items: center
+  justify-content: space-between
+.list-title
+  font-weight: bold
+  font-size: 36rpx
+  color: #404040
+  position: relative
+
+.title-line
+  position: absolute
+  bottom: -10rpx
+  left: 70rpx
+  width: 70rpx
+  height: 8rpx
+  background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%)
+  border-radius: 4rpx
+
+.input,
+.picker
+  flex: 1
+
+.picker-value
+  color: #666
+  
+.form-container
+  margin-top: 30rpx
+:deep(.uni-forms-item__label)
+  width: 194rpx !important
+  font-size: 28rpx;
+  color: #404040;
+
+.button-group {
+  display: flex;
+  justify-content: space-between;
+  padding: 40rpx 20rpx 20rpx;
+}
+
+.btn {
+  width: 45%;
+  height: 80rpx;
+  font-size: 30rpx;
+  border-radius: 8rpx;
+}
+
+.reset-btn {
+  background-color: #D8E9FF;
+  color: #1176FF;
+}
+
+.submit-btn {
+  background-color: #368BFF;
+  color: white;
+}
+.choice-btn{
+	width: 100%;
+	height: 70rpx;
+	font-size: 28rpx;
+	border-radius: 8rpx;
+	background-color: #368BFF;
+	color: white;
+	margin-left: 0;
+}
+:deep(.uni-easyinput__content)
+  background: rgba(0,0,0,0) !important
+</style>
diff --git a/packageB/priority/components/targetPersonnel.vue b/packageB/priority/components/targetPersonnel.vue
new file mode 100644
index 0000000..d7beb66
--- /dev/null
+++ b/packageB/priority/components/targetPersonnel.vue
@@ -0,0 +1,474 @@
+<template>
+    <AppLayout :title="title" :show-bg-image="false" >
+		<view class="page-container" >
+			<scroll-view :scroll-y="true" class="nearby-scroll" @scrolltolower="scrollBottom" lower-threshold="50">
+				<view class="main-list" :style="getBackgroundStyle('k.png')">
+					<view class="task-box">
+						<text class="task-label">任务：</text>
+						<text class="task-name">{{props.taskName}}</text>
+					</view>
+				</view>
+			
+				<view class="main-list" :style="getBackgroundStyle('k.png')">
+					<view class="list-top">
+						<view class="list-title">
+							<text>目标人员列表</text>
+							<view class="title-line" style="left: 70rpx;"></view>
+						</view>
+						<view class="title-total">
+							目标人数<text class="total-num">{{totalNum}}</text>人
+						</view>
+					</view>
+					<view class="list-box" v-if="dataList.length>0">
+						<view class="con-box" v-for="(item,index) in dataList" :key="index">
+							<view class="form-title">
+								<view class="form-name">
+									{{item.name}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.idCard">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/person.png'" mode=""></image>
+									<view class="item-label">
+										身份证号：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.idCard}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.phone">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/tele.png'" mode=""></image>
+									<view class="item-label">
+										联系电话：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.phone}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.address">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/base.png'" mode=""></image>
+									<view class="item-label">
+										住址：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.address}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.skills">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/num.png'" mode=""></image>
+									<view class="item-label">
+										技能特长：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.skills}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.tags.length>0">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/date.png'" mode=""></image>
+									<view class="item-label">
+										人员标签：
+									</view>
+								</view>
+								<view class="item-right">
+									<view class="" v-for="(val,num) in item.tags" :key="num">
+										{{val}}
+									</view>
+								</view>
+							</view>
+							<view class="form-item" v-if="item.datasource">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/next.png'" mode=""></image>
+									<view class="item-label">
+										数据来源：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.datasource=== '1' ? '自动识别' : '手动添加'}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.assistStatus">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/help.png'" mode=""></image>
+									<view class="item-label">
+										帮扶状态：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.assistStatus}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.employmentStatus">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/num.png'" mode=""></image>
+									<view class="item-label">
+										就业状态：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.employmentStatus}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.unemploymentDate">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/date.png'" mode=""></image>
+									<view class="item-label">
+										失业时间：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.unemploymentDate}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.unemploymentRegisterDate">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/date.png'" mode=""></image>
+									<view class="item-label">
+										失业登记时间：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.unemploymentRegisterDate}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.graduateDate">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/next.png'" mode=""></image>
+									<view class="item-label">
+										毕业时间：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.graduateDate}}
+								</view>
+							</view>
+						</view>
+					</view>
+				    <empty v-else pdTop="200"></empty>
+				</view>
+			</scroll-view>
+			<view class="button-group">
+				<view class="btns">
+					<button class="btn reset-btn" @click="handleCancel">关闭</button>
+				</view>
+			  
+			</view>
+		</view>
+    </AppLayout>
+</template>
+
+<script setup>
+import { inject, ref, reactive, onMounted } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+const { $api, navTo, navBack } = inject('globalFunction');
+import config from "@/config.js"
+
+const props = defineProps({
+  currentItem:{
+    type: String,
+    required: true,
+	default: ''
+  },
+  taskName:{
+    type: String,
+    required: true,
+	default: ''
+  },
+})
+const title = ref('');
+const pageNum = ref(1)
+const pageSize = ref(2)
+const currentItem=ref({})
+const totalNum=ref(0)
+const dataList=ref([])
+const personDatabaseStatusOptions=ref([])
+const employmentStatusOptions=ref([])
+const baseUrl = config.imgBaseUrl
+const getBackgroundStyle = (imageName) => ({
+    backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
+    backgroundSize: 'cover',      // 覆盖整个容器
+    backgroundPosition: 'center', // 居中
+    backgroundRepeat: 'no-repeat'
+});
+const emit = defineEmits(['update:showView'])
+function getDictionary(){
+	$api.myRequest('/system/public/dict/data/type/person_database_status').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				personDatabaseStatusOptions.value.push(obj)
+			})
+		}
+	});
+	$api.myRequest('/system/public/dict/data/type/assist_employment_status').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				employmentStatusOptions.value.push(obj)
+			})
+		}
+	});
+}
+function getabelByValue(value,arr) {
+	if (!Array.isArray(arr.value)) {
+	    return ''
+	}
+	const item = arr.value.find(item => item.value === String(value))
+	return item ? item.text : '暂无'
+}
+const handleCancel = () => {
+	emit('update:showView', 'main')
+}
+function getDataList(){
+	console.log("props.currentItem",props.currentItem)
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={
+		allocationId: props.currentItem,
+		pageNum: pageNum.value,
+		pageSize: pageSize.value
+	}
+	$api.myRequest('/dispatch/assist/person/database/pageGoalPersonList',params,'get',9100,header).then((resData) => {
+		resData.rows.forEach(item=>{
+			item.tags=item.tagName.split(',')
+			item.assistStatus=getabelByValue(item.assistStatus,personDatabaseStatusOptions)
+			item.employmentStatus=getabelByValue(item.employmentStatus,employmentStatusOptions)
+		})
+		totalNum.value=resData.total
+		dataList.value=dataList.value.concat(resData.rows)
+		
+	});
+}
+function scrollBottom(){
+	if(pageNum.value<totalNum.value/pageSize.value){
+		pageNum.value++
+		getDataList()
+	}
+}
+onMounted(() => {
+	runAsyncTasks()
+});
+const runAsyncTasks = async () => {
+  await getDictionary()
+  await getDataList()
+}
+
+</script>
+
+<style lang="stylus" scoped>
+image
+  height: 100%
+  width: 100%
+.page-container {
+  display: flex;
+  flex-direction: column;
+  height: calc(100vh - var(--window-top)); /* 如果 AppLayout 有 header，需减去 */
+  /* 或者简单用：height: 100vh; */
+  padding-bottom: 140rpx
+}
+.nearby-scroll
+    // 使用flex布局让scroll-view自适应高度，占据剩余空间
+  flex: 1
+  // overflow: hidden;
+.task-box
+  display: flex
+  align-items: center
+.task-label
+  font-size: 30rpx
+  color: #6E7E9B
+.task-name
+  font-weight: bold
+  font-size: 30rpx
+  color: #3D61AC
+.main-list
+  background-color: #ffffff
+  padding: 20rpx 20rpx 28rpx 20rpx
+  margin: 30rpx 30rpx
+  box-shadow: 0px 3px 20px 0px rgba(0,105,234,0.1)
+  border-radius: 12px
+.list-top
+  display: flex
+  align-items: center
+  justify-content: space-between
+.list-title
+  font-weight: bold
+  font-size: 36rpx
+  color: #404040
+  position: relative
+
+.title-line
+  position: absolute
+  bottom: -10rpx
+  left: 70rpx
+  width: 70rpx
+  height: 8rpx
+  background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%)
+  border-radius: 4rpx
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+
+.list-box
+  margin-top: 40rpx
+
+:deep(.uni-forms-item__label)
+  width: 194rpx !important
+  font-size: 28rpx;
+  color: #404040;
+  
+.search-container
+  padding: 20rpx 0rpx 0rpx 0rpx
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+.search-item
+  display: flex
+  align-items: center
+  margin-bottom: 30rpx
+
+.label
+  width: 160rpx
+  font-size: 28rpx
+  color: #404040
+  flex-shrink: 0
+
+.input,
+.picker
+  background: #FFFFFF
+  flex: 1
+  min-width: 0
+.search-box-btn
+  border-radius: 32rpx !important
+  background: #3088FF !important
+  margin-right: 16rpx
+.reset-box-btn
+  border-radius: 32rpx !important
+  background: #02B44D
+  color: #fff
+.con-box
+  background: #fff
+  padding: 20rpx
+  box-shadow: 0px 0px 6rpx 0px rgba(0,71,200,0.16)
+  border-radius: 24rpx
+  border: 1rpx solid #EDF5FF
+  margin-top: 30rpx
+.form-title
+  display: flex
+  align-items: center
+
+.form-name
+  font-weight: bold
+  font-size: 30rpx
+  color: #595959
+  margin-right:16rpx
+.form-type
+  border-radius: 8rpx;
+  border: 2rpx solid #FF7D26;
+  font-size: 24rpx
+  color: #F1690E
+  padding: 4rpx 10rpx
+.form-item
+  display: flex
+  align-items: center
+  justify-content: space-between
+  margin-top: 30rpx
+.item-left
+  display: flex
+  align-items: center
+.item-img
+  width: 26rpx
+  height: 26rpx
+  margin-right: 10rpx
+.item-label
+  font-size: 26rpx
+  color: #B3B3B3
+  width: 190rpx
+.item-right
+  font-size: 26rpx
+  color: #737373
+  // overflow: hidden
+  // text-overflow: ellipsis
+  // white-space: nowrap
+  word-wrap: break-word
+  overflow-wrap: break-word
+  white-space: normal
+.form-btns
+  margin-top:30rpx
+.form-box-btn
+  border-radius: 50rpx !important
+  margin-right: 24rpx
+  padding: 0rpx 40rpx
+.detail-btn
+  background: #EDF5FF
+  border: 1px solid #3088FF
+  font-size: 28rpx
+  color: #3088FF
+.follow-btn
+  background: #EEF9F3
+  border: 1px solid #00933E
+  font-size: 28rpx
+  color: #00933E
+.recommend-btn
+  background: linear-gradient(92deg, #0DCCFF 0%, #4760FF 100%)
+  font-size: 28rpx
+  color: #FFFFFF
+.button-group 
+	position: fixed
+	bottom: 0
+	left: 0
+	width: 100%
+	height: 120rpx
+	background: #fff
+.btns
+  height: 120rpx
+  width: 100%
+  line-height: 120px
+  display: flex
+  align-items: center
+  justify-content: space-between
+  box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.1)
+
+.btn {
+  width: 45%;
+  height: 80rpx;
+  font-size: 30rpx;
+  border-radius: 8rpx;
+}
+
+.reset-btn {
+  background-color: #D8E9FF;
+  color: #1176FF;
+}
+
+.submit-btn {
+  background-color: #368BFF;
+  color: white;
+}
+</style>
diff --git a/packageB/priority/components/targetPersonnelChoice.vue b/packageB/priority/components/targetPersonnelChoice.vue
new file mode 100644
index 0000000..2f95745
--- /dev/null
+++ b/packageB/priority/components/targetPersonnelChoice.vue
@@ -0,0 +1,567 @@
+<template>
+    <AppLayout :title="title" :show-bg-image="false" >
+		<view class="page-container" >
+			<scroll-view :scroll-y="true" class="nearby-scroll" @scrolltolower="scrollBottom" lower-threshold="50">
+				<view class="main-list" :style="getBackgroundStyle('k.png')">
+					<view class="list-top">
+						<view class="list-title">
+							<text>筛选条件</text>
+							<view class="title-line"></view>
+						</view>
+						<view class="title-right button-sp-area">
+							<button class="mini-btn search-box-btn" type="primary" size="mini" @click="handleSearch">查询</button>
+							<button class="mini-btn reset-box-btn" type="default" size="mini" @click="handleReset">重置</button>
+						</view>
+					</view>
+					<view class="search-container">
+					    <view class="search-item">
+					      <text class="label">姓名：</text>
+						  <uni-easyinput v-model="formData.name" placeholder="请输入任务名称"></uni-easyinput>
+					    </view>
+						<view class="search-item">
+						  <text class="label">身份证号：</text>
+						  <uni-easyinput v-model="formData.idCard" placeholder="请输入身份证号"></uni-easyinput>
+						</view>
+						<view class="search-item">
+						  <text class="label">人员标签：</text>
+						  <uni-data-select v-model="formData.tagId" :localdata="personTagOptions" placeholder="请选择人员标签" @change="personTagChange"></uni-data-select>
+						</view>
+						<view class="search-item">
+						  <text class="label">所属区域：</text>
+						  <uni-data-select v-model="formData.deptTags" :localdata="taskTypeOptions" placeholder="请选择所属区域" @change="onTaskTypeChange"></uni-data-select>
+						</view>	
+					</view>
+				</view>
+			
+				<view class="main-list" :style="getBackgroundStyle('k.png')">
+					<view class="list-top">
+						<view class="list-title">
+							<text>目标人员列表</text>
+							<view class="title-line" style="left: 70rpx;"></view>
+						</view>
+						<view class="title-total">
+							目标人数<text class="total-num">{{totalNum}}</text>人
+						</view>
+					</view>
+					<view class="list-box" v-if="dataList.length>0">
+						<view class="con-box" v-for="(item,index) in dataList" :key="index">
+							<view class="form-title">
+								<checkbox :value="item.id" :checked="item.checked" @click="selectItem(item)"/>
+								<view class="form-name">
+									{{item.name}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.idCard">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/person.png'" mode=""></image>
+									<view class="item-label">
+										身份证号：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.idCard}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.phone">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/tele.png'" mode=""></image>
+									<view class="item-label">
+										联系电话：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.phone}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.address">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/base.png'" mode=""></image>
+									<view class="item-label">
+										住址：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.address}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.skills">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/num.png'" mode=""></image>
+									<view class="item-label">
+										技能特长：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.skills}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.tags.length>0">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/date.png'" mode=""></image>
+									<view class="item-label">
+										人员标签：
+									</view>
+								</view>
+								<view class="item-right">
+									<view class="" v-for="(val,num) in item.tags" :key="num">
+										{{val}}
+									</view>
+								</view>
+							</view>
+							<view class="form-item" v-if="item.datasource">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/next.png'" mode=""></image>
+									<view class="item-label">
+										数据来源：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.datasource=== '1' ? '自动识别' : '手动添加'}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.assistStatus">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/help.png'" mode=""></image>
+									<view class="item-label">
+										帮扶状态：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.assistStatus}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.employmentStatus">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/num.png'" mode=""></image>
+									<view class="item-label">
+										就业状态：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.employmentStatus}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.unemploymentDate">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/date.png'" mode=""></image>
+									<view class="item-label">
+										失业时间：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.unemploymentDate}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.unemploymentRegisterDate">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/date.png'" mode=""></image>
+									<view class="item-label">
+										失业登记时间：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.unemploymentRegisterDate}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.graduateDate">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/next.png'" mode=""></image>
+									<view class="item-label">
+										毕业时间：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.graduateDate}}
+								</view>
+							</view>
+						</view>
+					</view>
+				    <empty v-else pdTop="200"></empty>
+				</view>
+				
+			</scroll-view>
+			<view class="button-group">
+				<view class="btns">
+					<button class="btn submit-btn" @click="handlesubmit">确认选择</button>
+					<button class="btn reset-btn" @click="handleCancel">关闭</button>
+				</view>
+			  
+			</view>
+		</view>
+    </AppLayout>
+</template>
+
+<script setup>
+import { inject, ref, reactive, onMounted } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+const { $api, navTo, navBack } = inject('globalFunction');
+import config from "@/config.js"
+
+const props = defineProps({
+  allocationId:{
+    type: String,
+    required: false,
+	default: ''
+  },
+})
+const title = ref('');
+const formData = reactive({
+	allocationId:'',
+    name: '',
+	idCard: '',
+	tagId: '',
+	deptTags: '',
+	pageNum: 1,
+	pageSize: 10
+})
+const totalNum=ref(0)
+const dataList=ref([])
+const personDatabaseStatusOptions=ref([])
+const employmentStatusOptions=ref([])
+const personTagOptions=ref([])
+const selectedPersonIds=ref([])
+const baseUrl = config.imgBaseUrl
+const getBackgroundStyle = (imageName) => ({
+    backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
+    backgroundSize: 'cover',      // 覆盖整个容器
+    backgroundPosition: 'center', // 居中
+    backgroundRepeat: 'no-repeat'
+});
+const emit = defineEmits(['update:showVue'])
+function getDictionary(){
+	$api.myRequest('/system/public/dict/data/type/person_database_status').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				personDatabaseStatusOptions.value.push(obj)
+			})
+		}
+	});
+	$api.myRequest('/system/public/dict/data/type/assist_employment_status').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				employmentStatusOptions.value.push(obj)
+			})
+		}
+	});
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={}
+	$api.myRequest('/dispatch/assist/person/tag/list',params,'get',9100,header).then((resData) => {
+		console.log("res",resData)
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.id,
+				    text: item.name
+				}
+				personTagOptions.value.push(obj)
+			})
+		}
+	});
+}
+function getabelByValue(value,arr) {
+	if (!Array.isArray(arr.value)) {
+	    return ''
+	}
+	const item = arr.value.find(item => item.value === String(value))
+	return item ? item.text : '暂无'
+}
+const handleCancel = () => {
+	emit('update:showVue', {
+	    showVue: 'main',
+	    selectedPersonIds: []
+	});
+	// emit('update:showVue', 'main')
+}
+function handleSearch(){
+	dataList.value=[]
+	getDataList()
+}
+function handleReset(){
+	formData.allocationId=''
+	formData.name=''
+	formData.idCard=''
+	formData.tagId=''
+	formData.deptTags=''
+	formData.pageNum=1
+	formData.pageSize=10
+	dataList.value=[]
+	getDataList()
+}
+function getDataList(){
+	let url=''
+	if(props.allocationId){
+		formData.allocationId=props.allocationId
+		url='/dispatch/assist/person/database/pageAllocatePersonList'
+	}else{
+		url='/dispatch/assist/person/database/pageList'
+	}
+	
+	
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	$api.myRequest(url,formData,'get',9100,header).then((resData) => {
+		resData.rows.forEach(item=>{
+			item.tags=item.tagName.split(',')
+			item.assistStatus=getabelByValue(item.assistStatus,personDatabaseStatusOptions)
+			item.employmentStatus=getabelByValue(item.employmentStatus,employmentStatusOptions)
+			item.checked = false; // 添加这一行
+		})
+		totalNum.value=resData.total
+		dataList.value=dataList.value.concat(resData.rows)
+		
+	});
+}
+function selectItem(item) {
+	const id = item.id; // 假设每条数据有唯一 id 字段
+    item.checked = !item.checked;
+  
+    if (item.checked) {
+      // 如果选中，加入数组（去重）
+      if (!selectedPersonIds.value.includes(id)) {
+        selectedPersonIds.value.push(id);
+      }
+    } else {
+      // 如果取消选中，从数组中移除
+      selectedPersonIds.value = selectedPersonIds.value.filter(v => v !== id);
+    }
+}
+// 获取选中的数据
+function handlesubmit() {
+	emit('update:showVue', {
+	    showVue: 'main',
+	    selectedPersonIds: selectedPersonIds.value
+	});
+}
+function personTagChange(e){
+	formData.tagId=e
+}
+function scrollBottom(){
+	if(formData.pageNum<totalNum.value/formData.pageSize){
+		formData.pageNum++
+		getDataList()
+	}
+}
+onMounted(() => {
+	runAsyncTasks()
+});
+const runAsyncTasks = async () => {
+  await getDictionary()
+  await getDataList()
+}
+
+</script>
+
+<style lang="stylus" scoped>
+image
+  height: 100%
+  width: 100%
+.page-container {
+  display: flex;
+  flex-direction: column;
+  height: calc(100vh - var(--window-top)); /* 如果 AppLayout 有 header，需减去 */
+  padding-bottom: 140rpx
+  /* 或者简单用：height: 100vh; */
+}
+.nearby-scroll
+    // 使用flex布局让scroll-view自适应高度，占据剩余空间
+  flex: 1
+  // overflow: hidden;
+.task-box
+  display: flex
+  align-items: center
+.task-label
+  font-size: 30rpx
+  color: #6E7E9B
+.task-name
+  font-weight: bold
+  font-size: 30rpx
+  color: #3D61AC
+.main-list
+  background-color: #ffffff
+  padding: 20rpx 20rpx 28rpx 20rpx
+  margin: 30rpx 30rpx
+  box-shadow: 0px 3px 20px 0px rgba(0,105,234,0.1)
+  border-radius: 12px
+.list-top
+  display: flex
+  align-items: center
+  justify-content: space-between
+.list-title
+  font-weight: bold
+  font-size: 36rpx
+  color: #404040
+  position: relative
+
+.title-line
+  position: absolute
+  bottom: -10rpx
+  left: 70rpx
+  width: 70rpx
+  height: 8rpx
+  background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%)
+  border-radius: 4rpx
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+
+.list-box
+  margin-top: 40rpx
+
+:deep(.uni-forms-item__label)
+  width: 194rpx !important
+  font-size: 28rpx;
+  color: #404040;
+  
+.search-container
+  padding: 20rpx 0rpx 0rpx 0rpx
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+.search-item
+  display: flex
+  align-items: center
+  margin-bottom: 30rpx
+
+.label
+  width: 160rpx
+  font-size: 28rpx
+  color: #404040
+  flex-shrink: 0
+
+.input,
+.picker
+  background: #FFFFFF
+  flex: 1
+  min-width: 0
+.search-box-btn
+  border-radius: 32rpx !important
+  background: #3088FF !important
+  margin-right: 16rpx
+.reset-box-btn
+  border-radius: 32rpx !important
+  background: #02B44D
+  color: #fff
+.con-box
+  background: #fff
+  padding: 20rpx
+  box-shadow: 0px 0px 6rpx 0px rgba(0,71,200,0.16)
+  border-radius: 24rpx
+  border: 1rpx solid #EDF5FF
+  margin-top: 30rpx
+.form-title
+  display: flex
+  align-items: center
+
+.form-name
+  font-weight: bold
+  font-size: 30rpx
+  color: #595959
+  margin-right:16rpx
+.form-type
+  border-radius: 8rpx;
+  border: 2rpx solid #FF7D26;
+  font-size: 24rpx
+  color: #F1690E
+  padding: 4rpx 10rpx
+.form-item
+  display: flex
+  align-items: center
+  justify-content: space-between
+  margin-top: 30rpx
+.item-left
+  display: flex
+  align-items: center
+.item-img
+  width: 26rpx
+  height: 26rpx
+  margin-right: 10rpx
+.item-label
+  font-size: 26rpx
+  color: #B3B3B3
+  width: 190rpx
+.item-right
+  font-size: 26rpx
+  color: #737373
+  // overflow: hidden
+  // text-overflow: ellipsis
+  // white-space: nowrap
+  word-wrap: break-word
+  overflow-wrap: break-word
+  white-space: normal
+.form-btns
+  margin-top:30rpx
+.form-box-btn
+  border-radius: 50rpx !important
+  margin-right: 24rpx
+  padding: 0rpx 40rpx
+.detail-btn
+  background: #EDF5FF
+  border: 1px solid #3088FF
+  font-size: 28rpx
+  color: #3088FF
+.follow-btn
+  background: #EEF9F3
+  border: 1px solid #00933E
+  font-size: 28rpx
+  color: #00933E
+.recommend-btn
+  background: linear-gradient(92deg, #0DCCFF 0%, #4760FF 100%)
+  font-size: 28rpx
+  color: #FFFFFF
+.button-group
+	position: fixed
+	bottom: 0
+	left: 0
+	width: 100%
+	height: 120rpx
+	background: #fff
+.btns
+  height: 120rpx
+  width: 100%
+  line-height: 120px
+  display: flex
+  align-items: center
+  justify-content: space-between
+  box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.1)
+.btn {
+  width: 45%;
+  height: 80rpx;
+  font-size: 30rpx;
+  border-radius: 8rpx;
+}
+
+.reset-btn {
+  background-color: #D8E9FF;
+  color: #1176FF;
+}
+
+.submit-btn {
+  background-color: #368BFF;
+  color: white;
+}
+</style>
diff --git a/packageB/priority/components/taskCreated.vue b/packageB/priority/components/taskCreated.vue
new file mode 100644
index 0000000..d926fa5
--- /dev/null
+++ b/packageB/priority/components/taskCreated.vue
@@ -0,0 +1,316 @@
+<template>
+    <AppLayout :title="title" :show-bg-image="false" >
+        <view class="main-list" :style="getBackgroundStyle('k.png')" v-if="showVue=='main'">
+			<view class="list-top">
+				<view class="list-title">
+					<text>创建任务</text>
+					<view class="title-line"></view>
+				</view>
+			</view>
+            <view class="form-container">
+                <uni-forms ref="formRef" v-model="formData" :rules="rules" validate-trigger="submit" >
+                  <uni-forms-item label="任务名称：" name="taskName" required >
+					  <uni-easyinput v-model="formData.taskName" placeholder="请输入任务名称"></uni-easyinput>
+                  </uni-forms-item>
+                  <uni-forms-item label="任务类型：" name="taskType" required >
+					  <uni-data-select v-model="formData.taskType" placeholder="请选择任务类型" :localdata="taskTypeOptions" @change="taskTypeChange"></uni-data-select>
+                  </uni-forms-item>
+				  <uni-forms-item label="优先级：" name="priority" required >
+				  	   <uni-data-select v-model="formData.priority" placeholder="请选择优先级" :localdata="priorityOptions" @change="priorityChange"></uni-data-select>
+				  </uni-forms-item>
+				  <uni-forms-item label="目标人员："  required >
+				  	   <button class="choice-btn" @click="choicePerson">从帮扶人员库选择目标人员</button>
+				  </uni-forms-item>
+				  <uni-forms-item label="目标人数：" name="taskAllocation.goalPersonCount" required>
+				  		<uni-easyinput v-model="formData.taskAllocation.goalPersonCount" disabled></uni-easyinput>
+				  </uni-forms-item>
+				  <uni-forms-item label="执行区域：" name="taskAllocation.executeDeptId" required >
+				  	  <uni-data-select v-model="formData.taskAllocation.executeDeptId" placeholder="请选择执行区域" :localdata="executeDeptOptions" @change="executeDeptChange"></uni-data-select>
+				  </uni-forms-item>
+				  <uni-forms-item label="截止时间：" name="taskAllocation.deadline" required>
+				  		<uni-datetime-picker class="picker-value" type="date" placeholder="请选择截止时间"  v-model="formData.taskAllocation.deadline" @change="onDateChange" />
+				  </uni-forms-item>
+                  <uni-forms-item label="分配说明：" name="allocationNote" >
+					  <uni-easyinput type="textarea" v-model="formData.taskAllocation.allocationNote" placeholder="请输入分配说明"></uni-easyinput>
+                  </uni-forms-item>
+                </uni-forms>
+                <!-- 按钮组 -->
+                <view class="button-group">
+				  <button class="btn submit-btn" @click="handleSubmit">确定</button>
+                  <button class="btn reset-btn"  @click="handleCancel">取消</button>
+                </view>
+			</view>
+        </view>
+		<view class="" v-else>
+			<target-personel-choice @update:show-vue="handleShowVueChange"></target-personel-choice>
+		</view>
+    </AppLayout>
+</template>
+
+<script setup>
+import { inject, ref, reactive } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+const { $api, navTo, navBack } = inject('globalFunction');
+import config from "@/config.js"
+import targetPersonelChoice from './targetPersonnelChoice.vue'
+
+const props = defineProps({
+  taskTypeOptions: {
+    type: Array,
+    required: true,
+    default: () => []
+  },
+  priorityOptions:{
+    type: Array,
+    required: true,
+	default: () => []
+  },
+  executeDeptOptions:{
+    type: Array,
+    required: true,
+	default: () => []
+  },
+})
+const title = ref('');
+const formData = reactive({
+	taskName: '',
+	taskType: '',
+	priority: '',
+	taskAllocation: {
+	  goalPersonCount: null,
+	  executeDeptId: '',
+	  executeDeptName: '',
+	  executeDeptAncestors: '',
+	  allocationStatus: '1',
+	  allocationNote: '',
+	  deadline: null,
+	  goalPersonList: []
+	}
+})
+// 表单引用
+const formRef = ref(null)
+// 校验规则
+const rules = {
+	taskName: {
+		rules: [{
+			required: true,
+			errorMessage: '请填写任务名称'
+		}]
+	},
+	taskType: {
+		rules: [{
+			required: true,
+			errorMessage: '请选择任务类型'
+		}]
+	},
+	priority: {
+		rules: [{
+			required: true,
+			errorMessage: '请选择优先级'
+		}]
+	},
+	'taskAllocation.goalPersonCount': {
+		rules: [{
+			required: true,
+			errorMessage: '请选择目标人员'
+		}]
+	},
+	'taskAllocation.executeDeptId': {
+		rules: [{
+			required: true,
+			errorMessage: '请选择执行区域'
+		}]
+	},
+	'taskAllocation.deadline':{
+		rules: [{
+			required: true,
+			errorMessage: '请选择截止时间'
+		}]
+	},
+}
+const baseUrl = config.imgBaseUrl
+const getBackgroundStyle = (imageName) => ({
+    backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
+    backgroundSize: 'cover',      // 覆盖整个容器
+    backgroundPosition: 'center', // 居中
+    backgroundRepeat: 'no-repeat'
+});
+const showVue=ref('main')
+const emit = defineEmits(['update:showView'])
+function choicePerson(){
+	showVue.value='choice'
+}
+// 事件处理
+function onDateChange(e){
+	formData.taskAllocation.deadline=e
+}
+function taskTypeChange(e){
+	formData.taskType=e
+}
+function priorityChange(e){
+	formData.priority=e
+}
+function executeDeptChange(e){
+	formData.taskAllocation.executeDeptId=e
+	formData.taskAllocation.executeDeptName=getLabelByValue(e,props.executeDeptOptions)
+	formData.taskAllocation.executeDeptAncestors=getAncestorsByValue(e,props.executeDeptOptions)
+}
+function getLabelByValue(value,arr) {
+	if (!Array.isArray(arr)) {
+	    return ''
+	}
+	
+	const item = arr.find(item => item.value === value)
+	return item ? item.text : '暂无'
+}
+function getAncestorsByValue(value,arr){
+	if (!Array.isArray(arr)) {
+	    return ''
+	}
+	
+	const item = arr.find(item => item.value === value)
+	return item ? item.ancestors : ''
+}
+function normalizePersonData(dataList) {
+  if (!Array.isArray(dataList)) return [];
+  return dataList.map(obj => {
+    const fullValue = obj;
+    return {
+      personId: String(fullValue) // 确保转为字符串，防止意外类型
+    };
+  });
+}
+function handleShowVueChange(newValue){
+	showVue.value=newValue.showVue
+	if(newValue.selectedPersonIds&&newValue.selectedPersonIds.length>0){
+		formData.taskAllocation.goalPersonList = normalizePersonData(newValue.selectedPersonIds)
+		formData.taskAllocation.goalPersonCount=newValue.selectedPersonIds.length
+	}else{
+		
+	}
+}
+const handleSubmit = () => {
+  formRef.value?.validate()
+    .then(() => {
+		let header={
+			'Authorization':uni.getStorageSync('Padmin-Token')
+		}
+		$api.myRequest('/dispatch/assist/task/add', formData,'post',9100,header).then((resData) => {
+			if(resData && resData.code == 200){
+				handleCancel()
+				uni.showToast({
+				  title: '创建成功',
+				  icon: 'success',
+				  duration: 2000 
+				});
+			}else{
+				uni.showToast({
+				  title: resData.msg,
+				  icon: 'none',
+				  duration: 2000
+				});
+			}
+			
+		});
+    })
+    .catch((errors) => {
+      console.log('校验失败:', errors);
+    });
+};
+
+const handleCancel = () => {
+	formData.taskName=''
+	formData.taskType=''
+	formData.priority=''
+	formData.taskAllocation.goalPersonCount=null
+	formData.taskAllocation.executeDeptId=''
+	formData.taskAllocation.executeDeptName=''
+	formData.taskAllocation.executeDeptAncestors=''
+	formData.taskAllocation.allocationStatus='1'
+	formData.taskAllocation.allocationNote=''
+	formData.taskAllocation.deadline=null
+	formData.taskAllocation.goalPersonList=[]
+	emit('update:showView', 'main')
+}
+onLoad((options) => {});
+
+
+</script>
+
+<style lang="stylus" scoped>
+image
+  height: 100%
+  width: 100%
+.main-list
+  background-color: #ffffff
+  padding: 20rpx 20rpx 28rpx 20rpx
+  margin: 30rpx 30rpx
+  box-shadow: 0px 3px 20px 0px rgba(0,105,234,0.1)
+  border-radius: 12px
+.list-top
+  display: flex
+  align-items: center
+  justify-content: space-between
+.list-title
+  font-weight: bold
+  font-size: 36rpx
+  color: #404040
+  position: relative
+
+.title-line
+  position: absolute
+  bottom: -10rpx
+  left: 70rpx
+  width: 70rpx
+  height: 8rpx
+  background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%)
+  border-radius: 4rpx
+
+.input,
+.picker
+  flex: 1
+
+.picker-value
+  color: #666
+  
+.form-container
+  margin-top: 30rpx
+:deep(.uni-forms-item__label)
+  width: 194rpx !important
+  font-size: 28rpx;
+  color: #404040;
+
+.button-group {
+  display: flex;
+  justify-content: space-between;
+  padding: 40rpx 20rpx 20rpx;
+}
+
+.btn {
+  width: 45%;
+  height: 80rpx;
+  font-size: 30rpx;
+  border-radius: 8rpx;
+}
+
+.reset-btn {
+  background-color: #D8E9FF;
+  color: #1176FF;
+}
+
+.submit-btn {
+  background-color: #368BFF;
+  color: white;
+}
+.choice-btn{
+	width: 100%;
+	height: 70rpx;
+	font-size: 28rpx;
+	border-radius: 8rpx;
+	background-color: #368BFF;
+	color: white;
+	margin-left: 0;
+}
+:deep(.uni-easyinput__content)
+  background: rgba(0,0,0,0) !important
+</style>
diff --git a/packageB/priority/components/taskDetail.vue b/packageB/priority/components/taskDetail.vue
new file mode 100644
index 0000000..e62d5c4
--- /dev/null
+++ b/packageB/priority/components/taskDetail.vue
@@ -0,0 +1,293 @@
+<template>
+    <AppLayout :title="title" :show-bg-image="false" >
+        <view class="main-list" :style="getBackgroundStyle('k.png')">
+			<view class="list-top">
+				<view class="list-title">
+					<text>帮扶任务详情</text>
+					<view class="title-line"></view>
+				</view>
+			</view>
+            <view class="form-container">
+				<view class="form-item">
+					<view class="item-label">
+						任务名称：
+					</view>
+					<view class="item-value">
+						{{formData.taskName}}
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label">
+						任务类型：
+					</view>
+					<view class="item-value">
+						<!-- {{getabelByValue(formData.value.taskType,props.taskTypeOptions)}} -->
+						{{formData.taskType}}
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label">
+						优先级：
+					</view>
+					<view class="item-value">
+						{{formData.priority}}
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label">
+						目标人数：
+					</view>
+					<view class="item-value">
+						{{formData.taskAllocation.goalPersonCount}}人
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label">
+						分配区域：
+					</view>
+					<view class="item-value">
+						{{formData.taskAllocation.executeDeptName}}
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label">
+						创建时间：
+					</view>
+					<view class="item-value">
+						{{formData.createTime}}
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label">
+						截止时间：
+					</view>
+					<view class="item-value">
+						{{formData.taskAllocation.deadline}}
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label">
+						分配状态：
+					</view>
+					<view class="item-value">
+						{{formData.allocationStatus}}
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label">
+						分配说明：
+					</view>
+					<view class="item-value">
+						{{formData.taskAllocation.allocationNote?formData.taskAllocation.allocationNote:'暂无'}}
+					</view>
+				</view>
+                <!-- 按钮组 -->
+                <view class="button-group">
+				  <button class="btn submit-btn" @click="handleCancel">关闭</button>
+                </view>
+			</view>
+        </view>
+    </AppLayout>
+</template>
+
+<script setup>
+import { inject, ref, reactive,onMounted  } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+const { $api, navTo, navBack } = inject('globalFunction');
+import config from "@/config.js"
+
+const props = defineProps({
+  taskTypeOptions: {
+    type: Array,
+    required: true,
+    default: () => []
+  },
+  priorityOptions:{
+    type: Array,
+    required: true,
+	default: () => []
+  },
+  executeDeptOptions:{
+    type: Array,
+    required: true,
+	default: () => []
+  },
+  allocationStatusOptions:{
+    type: Array,
+    required: true,
+	default: () => []
+  },
+  currentItem:{
+    type: String,
+    required: true,
+	default: ''
+  },
+})
+const title = ref('');
+const formData = reactive({
+	taskName: '',
+	taskType: '',
+	priority: '',
+	createTime:'',
+	allocationStatus:'',
+	taskAllocation: {
+	  goalPersonCount: null,
+	  executeDeptId: '',
+	  executeDeptName: '',
+	  executeDeptAncestors: '',
+	  allocationStatus: '1',
+	  allocationNote: '',
+	  deadline: null,
+	  goalPersonList: []
+	}
+})
+// 表单引用
+const formRef = ref(null)
+
+const baseUrl = config.imgBaseUrl
+const getBackgroundStyle = (imageName) => ({
+    backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
+    backgroundSize: 'cover',      // 覆盖整个容器
+    backgroundPosition: 'center', // 居中
+    backgroundRepeat: 'no-repeat'
+});
+const emit = defineEmits(['update:showView'])
+
+// 事件处理
+function onDateChange(){}
+function taskTypeChange(){}
+function priorityChange(){}
+function executeDeptChange(){}
+
+const handleCancel = () => {
+	emit('update:showView', 'main')
+}
+function getDetail(){
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={
+		id:props.currentItem
+	}
+	$api.myRequest('/dispatch/assist/task/getTask',params,'get',9100,header).then((resData) => {
+		resData.data.taskType=getabelByValue(resData.data.taskType,props.taskTypeOptions)
+		resData.data.priority=getabelByValue(resData.data.priority,props.priorityOptions)
+		let allocationStatus=resData.data.taskAllocation.allocationStatus
+		resData.data.allocationStatus=getabelByValue(allocationStatus,props.allocationStatusOptions)
+		Object.assign(formData, resData.data)
+	});
+}
+function getabelByValue(value,arr) {
+	if (!Array.isArray(arr)) {
+	    return ''
+	}
+	const item = arr.find(item => item.value === String(value))
+	return item ? item.text : '暂无'
+}
+onMounted(() => {
+    getDetail()
+});
+
+
+</script>
+
+<style lang="stylus" scoped>
+image
+  height: 100%
+  width: 100%
+.main-list
+  background-color: #ffffff
+  padding: 20rpx 20rpx 28rpx 20rpx
+  margin: 30rpx 30rpx
+  box-shadow: 0px 3px 20px 0px rgba(0,105,234,0.1)
+  border-radius: 12px
+.list-top
+  display: flex
+  align-items: center
+  justify-content: space-between
+.list-title
+  font-weight: bold
+  font-size: 36rpx
+  color: #404040
+  position: relative
+
+.title-line
+  position: absolute
+  bottom: -10rpx
+  left: 70rpx
+  width: 70rpx
+  height: 8rpx
+  background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%)
+  border-radius: 4rpx
+
+.input,
+.picker
+  flex: 1
+
+.picker-value
+  color: #666
+  
+.form-container
+  margin-top: 30rpx
+.form-item
+  display: flex
+  align-items: center
+  margin-bottom: 20rpx
+.item-label
+  width:200rpx
+  text-align: left
+  font-size: 30rpx
+  color: #606266
+  height: 72rpx
+  padding: 0 24rpx 0 0
+  vertical-align: middle
+  flex-shrink: 0
+  box-sizing: border-box
+.item-value
+  color: #333
+  font-size: 30rpx
+  height: 72rpx
+  padding: 0 24rpx 0 0
+  vertical-align: middle
+  flex-shrink: 0
+  box-sizing: border-box
+:deep(.uni-forms-item__label)
+  width: 194rpx !important
+  font-size: 28rpx;
+  color: #404040;
+
+.button-group {
+  display: flex;
+  justify-content: space-between;
+  padding: 40rpx 20rpx 20rpx;
+}
+
+.btn {
+  width: 45%;
+  height: 80rpx;
+  font-size: 30rpx;
+  border-radius: 8rpx;
+}
+
+.reset-btn {
+  background-color: #D8E9FF;
+  color: #1176FF;
+}
+
+.submit-btn {
+  background-color: #368BFF;
+  color: white;
+}
+.choice-btn{
+	width: 100%;
+	height: 70rpx;
+	font-size: 28rpx;
+	border-radius: 8rpx;
+	background-color: #368BFF;
+	color: white;
+	margin-left: 0;
+}
+:deep(.uni-easyinput__content)
+  background: rgba(0,0,0,0) !important
+</style>
diff --git a/packageB/priority/helpFilter.vue b/packageB/priority/helpFilter.vue
index 7fd8359..5c58abe 100644
--- a/packageB/priority/helpFilter.vue
+++ b/packageB/priority/helpFilter.vue
@@ -241,7 +241,7 @@ onLoad(() => {
 			getDataList('refresh');
 		});
 	}else{
-		navTo('/packageB/login2');
+		navTo('/packageB/login2?jump=/packageB/priority/helpFilter');
 	}
 });
 function getDictionary(){
diff --git a/packageB/priority/index.vue b/packageB/priority/index.vue
new file mode 100644
index 0000000..96695fc
--- /dev/null
+++ b/packageB/priority/index.vue
@@ -0,0 +1,192 @@
+<template>
+    <!-- <AppLayout title=""> -->
+        <view class="tab-container">
+			<image src="/packageB/static/images/train/bj.jpg" mode=""></image>
+			<view>
+				<view class="btns" @click="jumps('/packageB/priority/taskAssignment')">
+					<image src="/packageB/static/images/train/zxxl-k.png" mode=""></image>
+					<view>
+						<text>帮扶任务分配</text>
+						<view class="btn">
+							<text>立即查看</text>
+							<image src="/packageB/static/images/train/arrow.png" mode=""></image>
+						</view>
+					</view>
+					
+				</view>
+				<view class="btns" @click="jumps('/packageB/priority/taskIssue')">
+					<image src="/packageB/static/images/train/mnks-k.png" mode=""></image>
+					<view>
+						<text>帮扶任务下发</text>
+						<view class="btn">
+							<text>立即查看</text>
+							<image src="/packageB/static/images/train/arrow.png" mode=""></image>
+						</view>
+					</view>
+					
+				</view>
+				<view class="btns" @click="jumps('/packageB/priority/recordsManagement')">
+					<image src="/packageB/static/images/train/ctb-k.png" mode=""></image>
+					<view>
+						<text>帮扶记录管理 </text>
+						<view class="btn" >
+							<text>立即查看</text>
+							<image src="/packageB/static/images/train/arrow.png" mode=""></image>
+						</view>
+					</view>
+					
+				</view>
+			</view>
+        </view>
+    <!-- </AppLayout> -->
+</template>
+
+<script setup>
+import { reactive, inject, watch, ref, onMounted } from 'vue';
+import { onLoad, onShow } from '@dcloudio/uni-app';
+const { $api, navTo, vacanciesTo, formatTotal, config } = inject('globalFunction');
+import useUserStore from '@/stores/useUserStore';
+import useDictStore from '@/stores/useDictStore';
+// import CryptoJS from 'crypto-js'
+
+onLoad(() => {
+    // thirdLogin()
+});
+
+async function jumps(url){
+	let token=uni.getStorageSync('Padmin-Token')
+	if(token){
+		navTo(url);
+	}else{
+		uni.showToast({
+			title:'请先登录'
+		})
+		setTimeout(() => {
+		    navTo('/packageB/login2?jump='+url);
+		}, 2000)
+	}
+	
+}
+
+
+async function thirdLogin(){
+	let form={}
+	if (uni.getStorageSync('userInfo').isCompanyUser=='1' || uni.getStorageSync('userInfo').isCompanyUser=='2') {
+		form={
+			usertype: '1',
+			idno: uni.getStorageSync('userInfo').idCard,
+			name: uni.getStorageSync('userInfo').name,
+			enterprisecode:"",
+			enterprisename: "",
+			contactperson: "",
+			contactphone: "",
+		}
+		let key = '9zS+DFKrzxvosO82mTcPJQ=='
+		let secretKey = CryptoJS.enc.Utf8.parse(key);//key  为你的秘钥
+		let srcs = CryptoJS.enc.Utf8.parse(form.idno);
+		let encrypted = CryptoJS.AES.encrypt(srcs, secretKey, {mode:CryptoJS.mode.ECB,padding: CryptoJS.pad.Pkcs7}).toString()
+		form.idno=encrypted
+	}else if (uni.getStorageSync('userInfo').isCompanyUser=='0') {
+		form={
+			usertype: "2",
+			enterprisecode: uni.getStorageSync('userInfo').idCard,
+			enterprisename: uni.getStorageSync('userInfo').name,
+			contactperson: "",
+			contactphone: "",
+			idno: "",
+			name: ""
+		}
+	}else{
+		uni.showToast({
+			icon: 'none',
+			title: '请先登录'
+		})
+		return false;
+	}
+	var resLogin = await $api.myRequest('/auth/login2/ks',form,'post',10100);
+	if (resLogin.code=='200') {
+		uni.setStorageSync('Padmin-Token', resLogin.data.access_token)
+		return true;
+	}else{
+		uni.showToast({
+			icon: 'none',
+			title: '单点异常'
+		})
+		return false;
+	}
+}
+</script>
+
+<style lang="stylus" scoped>
+.tab-container{
+	height: 100vh;
+	width: 100%;
+	position: relative;
+	// background: url('@/static/images/train/bj.jpg') center center no-repeat;
+	// background-size: 100% 100%;
+	image{
+		position: absolute;
+		width: 100%;
+		height: 100%;
+	}
+	view{
+		padding: 100rpx 28rpx 0;
+		.btns{
+			width: 100%
+			height: 170rpx;
+			border-radius: 5rpx
+			padding: 20rpx;
+			box-sizing: border-box
+			color: #000
+			text-align: center
+			margin-bottom: 50rpx
+			position: relative
+			image{
+				position: absolute;
+				width: 100%;
+				height: 100%;
+				left: 0;
+				top: 0;
+			}
+			view{
+				padding: 0 0 0 10%;
+				box-sizing: border-box;
+				position: absolute
+				width: 100%;
+				height: 100%;
+				left: 0;
+				top: 0;
+				z-index: 100;
+				display: flex;
+				align-items: center
+				font-weight: bold;
+				font-size: 36rpx;
+				color: #595959;
+				.btn{
+					margin-left: 8%;
+					background-color: #3A92FF;
+					position: static;
+					color: #fff;
+					font-size: 22rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center
+					width: 140rpx;
+					height: 50rpx;
+					border-radius: 5rpx
+					font-weight: 500;
+					padding: 0;
+					image{
+						position: static;
+						width: 14rpx;
+						height: 22rpx;
+						margin-left: 10rpx;
+					}
+				}
+			}
+		}
+	}
+	
+}
+</style>
+
diff --git a/packageB/priority/jobWill.vue b/packageB/priority/jobWill.vue
new file mode 100644
index 0000000..ebcc201
--- /dev/null
+++ b/packageB/priority/jobWill.vue
@@ -0,0 +1,463 @@
+<template>
+    <AppLayout :title="title" :show-bg-image="false" >
+		<view class="page-container" >
+			<scroll-view :scroll-y="true" class="nearby-scroll" @scrolltolower="scrollBottom" lower-threshold="50">
+				<view class="main-list" :style="getBackgroundStyle('k.png')" >
+					<view class="list-top">
+						<view class="list-title">
+							<text>求职意愿列表</text>
+							<view class="title-line" style="left: 70rpx;"></view>
+						</view>
+						<view class="title-total">
+							共<text class="total-num">{{totalNum}}</text>条
+						</view>
+					</view>
+					<view class="list-box" v-if="dataList.length>0">
+						<view class="con-box" v-for="(item,index) in dataList" :key="index">
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/person.png'" mode=""></image>
+									<view class="item-label">
+										意向岗位：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.postType}}
+								</view>
+							</view>
+							<view class="form-item">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/help.png'" mode=""></image>
+									<view class="item-label">
+										期望薪资：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.salary}}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/base.png'" mode=""></image>
+									<view class="item-label">
+										意向区域：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.regionName}}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/num.png'" mode=""></image>
+									<view class="item-label">
+										期望福利：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.welfare}}
+								</view>
+							</view>
+							<view class="form-item">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/date.png'" mode=""></image>
+									<view class="item-label">
+										学历：
+									</view>
+								</view>
+								<view class="item-right">
+									{{getabelByValue(item.education,educationOptions)}}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/next.png'" mode=""></image>
+									<view class="item-label">
+										岗位类型：
+									</view>
+								</view>
+								<view class="item-right">
+									{{getabelByValue(item.jobType,jobTypeOptions)}}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/help.png'" mode=""></image>
+									<view class="item-label">
+										类型：
+									</view>
+								</view>
+								<view class="item-right">
+									{{getabelByValue(item.type,gangweiTypeOptions)}}
+								</view>
+							</view>
+							<view class="form-btns">
+								<button class="mini-btn form-box-btn detail-btn"  size="mini" @click="goDetail('edit',item)">编辑</button>
+								<button class="mini-btn form-box-btn follow-btn"  size="mini" @click="del(item)">删除</button>
+							</view>
+						</view>
+					</view>
+				    <empty v-else pdTop="200"></empty>
+				</view>
+			</scroll-view>
+			<view class="float-btn" @click="goDetail('add')">
+				<uni-icons type="plusempty" color="#fff" size="30"></uni-icons>
+			</view>
+			<view>
+				<!-- 提示窗示例 -->
+				<uni-popup ref="alertDialog" type="dialog">
+					<uni-popup-dialog type="warn" cancelText="取消" confirmText="确定" title="提示" content="确定要删除这条求职意愿吗？" @confirm="dialogConfirm"></uni-popup-dialog>
+				</uni-popup>
+			</view>
+		</view>
+    </AppLayout>
+</template>
+
+<script setup>
+import { inject, ref, reactive, onMounted } from 'vue';
+import { onLoad,onShow } from '@dcloudio/uni-app';
+const { $api, navTo, navBack } = inject('globalFunction');
+import config from "@/config.js"
+
+const title = ref('');
+const id=ref('')
+const pageNum = ref(1)
+const pageSize = ref(2)
+const totalNum=ref(0)
+const dataList=ref([])
+const educationOptions=ref([])
+const jobTypeOptions=ref([])
+const gangweiTypeOptions=ref([])
+const goalPersonId=ref([])
+const baseUrl = config.imgBaseUrl
+const getBackgroundStyle = (imageName) => ({
+    backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
+    backgroundSize: 'cover',      // 覆盖整个容器
+    backgroundPosition: 'center', // 居中
+    backgroundRepeat: 'no-repeat'
+});
+const alertDialog = ref(null);
+const currentItem=ref({})
+function getDictionary(){
+	$api.myRequest('/system/public/dict/data/type/education').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				educationOptions.value.push(obj)
+			})
+		}
+	});
+	$api.myRequest('/system/public/dict/data/type/job_type').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				jobTypeOptions.value.push(obj)
+			})
+		}
+	});
+	$api.myRequest('/system/public/dict/data/type/gangwei_type').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				gangweiTypeOptions.value.push(obj)
+			})
+		}
+	});
+}
+function getabelByValue(value,arr) {
+	if (!Array.isArray(arr)) {
+	    return ''
+	}
+	const item = arr.find(item => item.value === String(value))
+	return item ? item.text : '暂无'
+}
+function getDataList(){
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={
+		personId: id.value,
+		pageNum: pageNum.value,
+		pageSize: pageSize.value
+	}
+	$api.myRequest('/dispatch/job/willingness/list',params,'get',9100,header).then((resData) => {
+		totalNum.value=resData.total
+		dataList.value=dataList.value.concat(resData.rows)
+		
+	});
+}
+function scrollBottom(){
+	if(pageNum.value<totalNum.value/pageSize.value){
+		pageNum.value++
+		getDataList()
+	}
+}
+function goDetail(val,item){
+	if(val=='add'){
+		navTo('/packageB/priority/jobWillEdit?goalPersonId=' + goalPersonId.value);
+	}else{
+		navTo('/packageB/priority/jobWillEdit?item=' + JSON.stringify(item));
+	}
+	
+}
+function del(item){
+	if (alertDialog.value) {
+	    alertDialog.value.open();
+		currentItem.value=item
+	  }
+}
+function dialogConfirm(){
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	$api.myRequest('/dispatch/job/willingness/'+currentItem.value.id,{},'delete',9100,header).then((resData) => {
+		console.log("resData",resData)
+		if(resData.code==200){
+			dataList.value=[]
+			pageNum.value=1
+			getDataList()
+		}
+		
+	});
+}
+onLoad((options) => {
+	id.value=options.id
+	goalPersonId.value=options.goalPersonId
+});
+const runAsyncTasks = async () => {
+  await getDictionary()
+  await getDataList()
+}
+onShow(()=>{
+	dataList.value=[]
+	pageNum.value=1
+	runAsyncTasks()
+})
+
+</script>
+
+<style lang="stylus" scoped>
+image
+  height: 100%
+  width: 100%
+.page-container {
+  display: flex;
+  flex-direction: column;
+  height: calc(100vh - var(--window-top)); /* 如果 AppLayout 有 header，需减去 */
+  /* 或者简单用：height: 100vh; */
+  padding-bottom: 140rpx
+}
+.nearby-scroll
+    // 使用flex布局让scroll-view自适应高度，占据剩余空间
+  flex: 1
+  // overflow: hidden;
+.task-box
+  display: flex
+  align-items: center
+.task-label
+  font-size: 30rpx
+  color: #6E7E9B
+.task-name
+  font-weight: bold
+  font-size: 30rpx
+  color: #3D61AC
+.main-list
+  background-color: #ffffff
+  padding: 20rpx 20rpx 28rpx 20rpx
+  margin: 30rpx 30rpx
+  box-shadow: 0px 3px 20px 0px rgba(0,105,234,0.1)
+  border-radius: 12px
+.list-top
+  display: flex
+  align-items: center
+  justify-content: space-between
+.list-title
+  font-weight: bold
+  font-size: 36rpx
+  color: #404040
+  position: relative
+
+.title-line
+  position: absolute
+  bottom: -10rpx
+  left: 70rpx
+  width: 70rpx
+  height: 8rpx
+  background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%)
+  border-radius: 4rpx
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+
+.list-box
+  margin-top: 40rpx
+
+:deep(.uni-forms-item__label)
+  width: 194rpx !important
+  font-size: 28rpx;
+  color: #404040;
+  
+.search-container
+  padding: 20rpx 0rpx 0rpx 0rpx
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+.search-item
+  display: flex
+  align-items: center
+  margin-bottom: 30rpx
+
+.label
+  width: 160rpx
+  font-size: 28rpx
+  color: #404040
+  flex-shrink: 0
+
+.input,
+.picker
+  background: #FFFFFF
+  flex: 1
+  min-width: 0
+.search-box-btn
+  border-radius: 32rpx !important
+  background: #3088FF !important
+  margin-right: 16rpx
+.reset-box-btn
+  border-radius: 32rpx !important
+  background: #02B44D
+  color: #fff
+.con-box
+  background: #fff
+  padding: 20rpx
+  box-shadow: 0px 0px 6rpx 0px rgba(0,71,200,0.16)
+  border-radius: 24rpx
+  border: 1rpx solid #EDF5FF
+  margin-top: 30rpx
+.form-title
+  display: flex
+  align-items: center
+
+.form-name
+  font-weight: bold
+  font-size: 30rpx
+  color: #595959
+  margin-right:16rpx
+.form-type
+  border-radius: 8rpx;
+  border: 2rpx solid #FF7D26;
+  font-size: 24rpx
+  color: #F1690E
+  padding: 4rpx 10rpx
+.form-item
+  display: flex
+  align-items: center
+  justify-content: space-between
+  margin-top: 30rpx
+.item-left
+  display: flex
+  align-items: center
+.item-img
+  width: 26rpx
+  height: 26rpx
+  margin-right: 10rpx
+.item-label
+  font-size: 26rpx
+  color: #B3B3B3
+  width: 190rpx
+.item-right
+  font-size: 26rpx
+  color: #737373
+  // overflow: hidden
+  // text-overflow: ellipsis
+  // white-space: nowrap
+  word-wrap: break-word
+  overflow-wrap: break-word
+  white-space: normal
+.form-btns
+  margin-top:30rpx
+.form-box-btn
+  border-radius: 50rpx !important
+  margin-right: 24rpx
+  padding: 0rpx 40rpx
+.detail-btn
+  background: #EDF5FF
+  border: 1px solid #3088FF
+  font-size: 28rpx
+  color: #3088FF
+.follow-btn
+  background: #EEF9F3
+  border: 1px solid #00933E
+  font-size: 28rpx
+  color: #00933E
+.recommend-btn
+  background: linear-gradient(92deg, #0DCCFF 0%, #4760FF 100%)
+  font-size: 28rpx
+  color: #FFFFFF
+.button-group 
+	position: fixed
+	bottom: 0
+	left: 0
+	width: 100%
+	height: 120rpx
+	background: #fff
+.btns
+  height: 120rpx
+  width: 100%
+  line-height: 120px
+  display: flex
+  align-items: center
+  justify-content: space-between
+  box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.1)
+
+.btn {
+  width: 45%;
+  height: 80rpx;
+  font-size: 30rpx;
+  border-radius: 8rpx;
+}
+
+.reset-btn {
+  background-color: #D8E9FF;
+  color: #1176FF;
+}
+
+.submit-btn {
+  background-color: #368BFF;
+  color: white;
+}
+.float-btn{
+	position: fixed;
+	bottom: 100rpx;
+	right: 50rpx;
+	background: #368BFF;
+	width: 100rpx;
+	height: 100rpx;
+	border-radius: 50%;
+	line-height: 100rpx;
+	text-align: center;
+	color: #fff;
+}
+</style>
diff --git a/packageB/priority/jobWillEdit.vue b/packageB/priority/jobWillEdit.vue
new file mode 100644
index 0000000..1a1baa7
--- /dev/null
+++ b/packageB/priority/jobWillEdit.vue
@@ -0,0 +1,302 @@
+<template>
+    <AppLayout :title="title" :show-bg-image="false" >
+        <view class="main-list" :style="getBackgroundStyle('k.png')">
+			<view class="list-top">
+				<view class="list-title">
+					<text>{{showTitle}}求职意愿</text>
+					<view class="title-line"></view>
+				</view>
+			</view>
+			
+            <view class="form-container">
+                <uni-forms ref="formRef" v-model="formData" :rules="rules" validate-trigger="submit" >
+					<uni-forms-item label="意向岗位：" name="postType" required>
+						<uni-easyinput v-model="formData.postType" placeholder="请输入意向岗位"></uni-easyinput>
+					</uni-forms-item>
+					<uni-forms-item label="期望薪资：" name="salary" required>
+						<uni-easyinput v-model="formData.salary" placeholder="请输入期望薪资"></uni-easyinput>
+					</uni-forms-item>
+					<uni-forms-item label="意向工作区域：" name="regionName" required>
+						<uni-easyinput v-model="formData.regionName" placeholder="请输入意向工作区域"></uni-easyinput>
+					</uni-forms-item>
+					<uni-forms-item label="期望福利：" name="welfare" required>
+						<uni-easyinput v-model="formData.welfare" placeholder="请输入期望福利"></uni-easyinput>
+					</uni-forms-item>
+                    <uni-forms-item label="学历：" name="education"  >
+					    <uni-data-select v-model="formData.education" placeholder="请选择学历" :localdata="educationOptions" @change="onEducationChange"></uni-data-select>
+                    </uni-forms-item>
+					<uni-forms-item label="岗位类型：" name="jobType"  >
+					    <uni-data-select v-model="formData.jobType" placeholder="请选择岗位类型" :localdata="jobTypeOptions" @change="onJobTypeChange"></uni-data-select>
+					</uni-forms-item>
+					<uni-forms-item label="类型：" name="type"  >
+					    <uni-data-select v-model="formData.type" placeholder="请选择类型" :localdata="typeOptions" @change="onTypeChange"></uni-data-select>
+					</uni-forms-item>
+                    <uni-forms-item label="意向自述：" name="description" >
+					    <uni-easyinput type="textarea" v-model="formData.description" placeholder="请输入意向自述"></uni-easyinput>
+                    </uni-forms-item>
+                </uni-forms>
+                <!-- 按钮组 -->
+                <view class="button-group">
+				  <button class="btn submit-btn" @click="handleSubmit">保存跟进</button>
+                  <button class="btn reset-btn"  @click="handleReset">重置</button>
+                </view>
+			</view>
+        </view>
+    </AppLayout>
+</template>
+
+<script setup>
+import { inject, ref, reactive } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+const { $api, navTo, navBack } = inject('globalFunction');
+import config from "@/config.js"
+
+const title = ref('');
+const showTitle=ref('')
+const formData = reactive({
+    id: null,
+	goalPersonId: '',
+	postType: '',
+	salary: '',
+	regionId: '',
+	regionName: '',
+	description: '',
+	welfare: '',
+	education: '',
+	jobType: '',
+	type: '',
+})
+const educationOptions=ref([])
+const jobTypeOptions=ref([])
+const typeOptions=ref([])
+const personInfo=ref({
+	goalPersonId:'',
+	name:'',
+	task_type:'',
+	task_id:'',
+	person_id:''
+})
+const followWays = ref([])
+// 表单引用
+const formRef = ref(null)
+
+// 校验规则
+const rules = {
+	postType: {
+		rules: [{
+			required: true,
+			errorMessage: '请输入意向岗位'
+		}]
+	},
+	salary: {
+		rules: [{
+			required: true,
+			errorMessage: '请输入期望薪资'
+		}]
+	},
+	regionName: {
+		rules: [{
+			required: true,
+			errorMessage: '请输入意向工作区域'
+		}]
+	},
+	welfare: {
+		rules: [{
+			required: true,
+			errorMessage: '请输入期望福利'
+		}]
+	}
+}
+const baseUrl = config.imgBaseUrl
+const getBackgroundStyle = (imageName) => ({
+    backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
+    backgroundSize: 'cover',      // 覆盖整个容器
+    backgroundPosition: 'center', // 居中
+    backgroundRepeat: 'no-repeat'
+});
+
+const getDictionary = async () => {
+  try {
+    const [eduRes, jobRes, gangweiRes] = await Promise.all([
+      $api.myRequest('/system/public/dict/data/type/education'),
+      $api.myRequest('/system/public/dict/data/type/job_type'),
+      $api.myRequest('/system/public/dict/data/type/gangwei_type')
+    ]);
+    if (eduRes && eduRes.code == 200) {
+      eduRes.data.forEach(item => {
+        educationOptions.value.push({
+          value: item.dictValue,
+          text: item.dictLabel
+        });
+      });
+    }
+    if (jobRes && jobRes.code == 200) {
+      jobRes.data.forEach(item => {
+        jobTypeOptions.value.push({
+          value: item.dictValue,
+          text: item.dictLabel
+        });
+      });
+    }
+    if (gangweiRes && gangweiRes.code == 200) {
+      gangweiRes.data.forEach(item => {
+        typeOptions.value.push({
+          value: item.dictValue,
+          text: item.dictLabel
+        });
+      });
+    }
+  } catch (error) {
+    console.error("获取字典数据失败:", error);
+    throw error; // 抛出错误，让外部调用者知道失败了
+  }
+};
+function onEducationChange(e){
+	formData.education=e
+}
+function onJobTypeChange(e){
+	formData.jobType=e
+}
+function onTypeChange(e) {
+	formData.type=e
+}
+const handleSubmit = () => {
+  formRef.value?.validate()
+    .then(() => {
+		let header={
+			'Authorization':uni.getStorageSync('Padmin-Token')
+		}
+		console.log("formData",formData)
+		if(formData.id){
+			$api.myRequest('/dispatch/job/willingness', formData,'put',9100,header).then((resData) => {
+				if(resData && resData.code == 200){
+					handleReset()
+					uni.showToast({
+					  title: '保存成功',
+					  icon: 'success',
+					  duration: 2000 
+					});
+					uni.navigateBack()
+				}else{
+					uni.showToast({
+					  title: resData.msg,
+					  icon: 'none',
+					  duration: 2000
+					});
+				}
+				
+			});
+		}else{
+			$api.myRequest('/dispatch/job/willingness', formData,'post',9100,header).then((resData) => {
+				if(resData && resData.code == 200){
+					handleReset()
+					uni.showToast({
+					  title: '保存成功',
+					  icon: 'success',
+					  duration: 2000 
+					});
+					uni.navigateBack()
+				}else{
+					uni.showToast({
+					  title: resData.msg,
+					  icon: 'none',
+					  duration: 2000
+					});
+				}
+				
+			});
+		}
+		
+    })
+    .catch((errors) => {
+      console.log('校验失败:', errors);
+    });
+};
+
+const handleReset = () => {
+	formData.postType=''
+	formData.salary=''
+	formData.regionId=''
+	formData.regionName=''
+	formData.description=''
+	formData.welfare=''
+	formData.education=''
+	formData.jobType=''
+	formData.type=''
+}
+onLoad((options) => {
+	runAsyncTasks(options)
+});
+const runAsyncTasks = async (options) => {
+  await getDictionary()
+  if(options.goalPersonId){
+  	formData.goalPersonId=options.goalPersonId
+	showTitle.value='新增'
+  }
+  if(options.item){
+  	let dataInfo=JSON.parse(options.item)
+  	Object.assign(formData, dataInfo)
+	showTitle.value='编辑'
+  }
+}
+
+</script>
+
+<style lang="stylus" scoped>
+.main-list
+  background-color: #ffffff
+  padding: 20rpx 20rpx 28rpx 20rpx
+  margin: 30rpx 30rpx
+  box-shadow: 0px 3px 20px 0px rgba(0,105,234,0.1)
+  border-radius: 12px
+.list-top
+  display: flex
+  align-items: center
+  justify-content: space-between
+.list-title
+  font-weight: bold
+  font-size: 36rpx
+  color: #404040
+  position: relative
+
+.title-line
+  position: absolute
+  bottom: -10rpx
+  left: 70rpx
+  width: 70rpx
+  height: 8rpx
+  background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%)
+  border-radius: 4rpx
+.input,
+.picker
+  flex: 1
+.form-container 
+  margin-top: 30rpx
+:deep(.uni-forms-item__label)
+  width: 235rpx !important
+  font-size: 28rpx;
+  color: #404040;
+
+.button-group {
+  display: flex;
+  justify-content: space-between;
+  padding: 40rpx 20rpx 20rpx;
+}
+
+.btn {
+  width: 45%;
+  height: 80rpx;
+  font-size: 30rpx;
+  border-radius: 8rpx;
+}
+
+.reset-btn {
+  background-color: #D8E9FF;
+  color: #1176FF;
+}
+
+.submit-btn {
+  background-color: #368BFF;
+  color: white;
+}
+</style>
diff --git a/packageB/priority/recordDetail.vue b/packageB/priority/recordDetail.vue
new file mode 100644
index 0000000..b15bb52
--- /dev/null
+++ b/packageB/priority/recordDetail.vue
@@ -0,0 +1,297 @@
+<template>
+    <AppLayout :title="title" :show-bg-image="false" >
+        <view class="main-list" :style="getBackgroundStyle('k.png')">
+			<view class="list-top">
+				<view class="list-title">
+					<text>帮扶记录详情</text>
+					<view class="title-line"></view>
+				</view>
+			</view>
+            <view class="form-container">
+				<view class="form-item">
+					<view class="item-label">
+						人员姓名：
+					</view>
+					<view class="item-value">
+						{{formData.name}}
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label">
+						身份证号：
+					</view>
+					<view class="item-value">
+						{{formData.id_card}}
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label">
+						联系电话：
+					</view>
+					<view class="item-value">
+						{{formData.phone}}
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label">
+						帮扶类型：
+					</view>
+					<view class="item-value">
+						{{formData.task_type}}
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label">
+						帮扶人员：
+					</view>
+					<view class="item-value" >
+						{{formData.create_by_name}}
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label">
+						帮扶日期：
+					</view>
+					<view class="item-value">
+						{{formData.follow_date}}
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label">
+						下次联系：
+					</view>
+					<view class="item-value">
+						{{formData.next_contact_date}}
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label">
+						人员标签：
+					</view>
+					<view class="item-value">
+						{{formData.tag_name}}
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label">
+						帮扶内容：
+					</view>
+					<view class="item-value">
+						{{formData.detailRecords}}
+					</view>
+				</view>
+			</view>
+        </view>
+    </AppLayout>
+</template>
+
+<script setup>
+import { inject, ref, reactive,onMounted  } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+const { $api, navTo, navBack } = inject('globalFunction');
+import config from "@/config.js"
+
+const title = ref('');
+const formData = reactive({
+	taskName: '',
+	taskType: '',
+	priority: '',
+	createTime:'',
+	allocationStatus:'',
+	taskAllocation: {
+	  goalPersonCount: null,
+	  executeDeptId: '',
+	  executeDeptName: '',
+	  executeDeptAncestors: '',
+	  allocationStatus: '1',
+	  allocationNote: '',
+	  deadline: null,
+	  goalPersonList: []
+	}
+})
+const taskTypeOptions=ref([])
+const priorityOptions=ref([])
+const allocationStatusOptions=ref([])
+const executeDeptOptions=ref([])
+// 表单引用
+const formRef = ref(null)
+const baseUrl = config.imgBaseUrl
+const getBackgroundStyle = (imageName) => ({
+    backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
+    backgroundSize: 'cover',      // 覆盖整个容器
+    backgroundPosition: 'center', // 居中
+    backgroundRepeat: 'no-repeat'
+});
+
+function getDictionary(){
+	$api.myRequest('/system/public/dict/data/type/assist_task_type').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				taskTypeOptions.value.push(obj)
+			})
+		}
+	});
+}
+function getDetail(id){
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={
+		goalPersonId:id
+	}
+	$api.myRequest('/dispatch/assist/records/getDetail',params,'get',9100,header).then((resData) => {
+		console.log("resData",resData)
+		resData.data.task_type=getabelByValue(resData.data.task_type,taskTypeOptions.value)
+		Object.assign(formData, resData.data)
+	});
+}
+function getabelByValue(value,arr) {
+	if (!Array.isArray(arr)) {
+	    return ''
+	}
+	const item = arr.find(item => item.value === String(value))
+	return item ? item.text : '暂无'
+}
+onLoad((options) => {
+	runAsyncTasks(options)
+});
+const runAsyncTasks = async (options) => {
+  await getDictionary()
+  await getDetail(options.id)
+}
+
+
+</script>
+
+<style lang="stylus" scoped>
+image
+  height: 100%
+  width: 100%
+.main-list
+  background-color: #ffffff
+  padding: 20rpx 20rpx 28rpx 20rpx
+  margin: 30rpx 30rpx
+  box-shadow: 0px 3px 20px 0px rgba(0,105,234,0.1)
+  border-radius: 12px
+.list-top
+  display: flex
+  align-items: center
+  justify-content: space-between
+.list-title
+  font-weight: bold
+  font-size: 36rpx
+  color: #404040
+  position: relative
+
+.title-line
+  position: absolute
+  bottom: -10rpx
+  left: 70rpx
+  width: 70rpx
+  height: 8rpx
+  background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%)
+  border-radius: 4rpx
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+.input,
+.picker
+  flex: 1
+
+.picker-value
+  color: #666
+  
+.form-container
+  margin-top: 30rpx
+.con-box
+  background: #fff
+  padding: 20rpx
+  box-shadow: 0px 0px 6rpx 0px rgba(0,71,200,0.16)
+  border-radius: 24rpx
+  border: 1rpx solid #EDF5FF
+  margin-top: 30rpx
+.form-item
+  display: flex
+  align-items: center
+  margin-bottom: 20rpx
+.mb-30
+  margin-bottom: 30rpx
+.item-left
+  display: flex
+  align-items: center
+.item-img
+  width: 26rpx
+  height: 26rpx
+  margin-right: 10rpx
+.item-label1
+  font-size: 26rpx
+  color: #B3B3B3
+  width: 130rpx
+.item-label
+  width:200rpx
+  text-align: left
+  font-size: 30rpx
+  color: #606266
+  height: 72rpx
+  padding: 0 24rpx 0 0
+  vertical-align: middle
+  flex-shrink: 0
+  box-sizing: border-box
+.item-value
+  color: #333
+  font-size: 30rpx
+  height: 72rpx
+  padding: 0 24rpx 0 0
+  vertical-align: middle
+  flex-shrink: 0
+  box-sizing: border-box
+:deep(.uni-forms-item__label)
+  width: 194rpx !important
+  font-size: 28rpx;
+  color: #404040;
+
+.button-group {
+  display: flex;
+  justify-content: space-between;
+  padding: 40rpx 20rpx 20rpx;
+}
+
+.btn {
+  width: 45%;
+  height: 80rpx;
+  font-size: 30rpx;
+  border-radius: 8rpx;
+}
+
+.reset-btn {
+  background-color: #D8E9FF;
+  color: #1176FF;
+}
+
+.submit-btn {
+  background-color: #368BFF;
+  color: white;
+}
+.choice-btn{
+	width: 100%;
+	height: 70rpx;
+	font-size: 28rpx;
+	border-radius: 8rpx;
+	background-color: #368BFF;
+	color: white;
+	margin-left: 0;
+}
+:deep(.uni-easyinput__content)
+  background: rgba(0,0,0,0) !important
+</style>
diff --git a/packageB/priority/recordFollow.vue b/packageB/priority/recordFollow.vue
new file mode 100644
index 0000000..537c8a4
--- /dev/null
+++ b/packageB/priority/recordFollow.vue
@@ -0,0 +1,403 @@
+<template>
+    <AppLayout :title="title" :show-bg-image="false" >
+		<view class="info-box">
+			<view class="info-item info-line">
+				<image class="info-img" :src="baseUrl+'/dispatch/person-icon.png'" mode=""></image>
+				<view class="info-label">
+					人员姓名
+				</view>
+				<view class="info-value">
+					{{personInfo.name}}
+				</view>
+			</view>
+			<view class="info-item">
+				<image class="info-img" :src="baseUrl+'/dispatch/help-icon.png'" mode=""></image>
+				<view class="info-label">
+					帮扶类型
+				</view>
+				<view class="info-value">
+					{{personInfo.task_type}}
+				</view>
+			</view>
+		</view>
+        <view class="main-list" :style="getBackgroundStyle('k.png')">
+			<view class="list-top">
+				<view class="list-title">
+					<text>新增跟进记录</text>
+					<view class="title-line"></view>
+				</view>
+			</view>
+			
+            <view class="form-container">
+                <uni-forms ref="formRef" v-model="formData" :rules="rules" validate-trigger="submit" >
+                  <!-- 跟进日期 -->
+                  <uni-forms-item label="跟进日期：" name="followDate" required >
+					  <uni-datetime-picker class="picker-value" type="date" placeholder="请选择跟进日期"  v-model="formData.followDate" @change="onFollowDateChange" />
+                  </uni-forms-item>
+            
+                  <!-- 跟进方式 -->
+                  <uni-forms-item label="跟进方式：" name="followWay" required >
+					  <uni-data-select v-model="formData.followWay" placeholder="请选择跟进方式" :localdata="followWays" @change="onMethodChange"></uni-data-select>
+                  </uni-forms-item>
+            
+                  <!-- 跟进内容 -->
+                  <uni-forms-item label="跟进内容：" name="content" required>
+					  <uni-easyinput type="textarea" v-model="formData.content" placeholder="请输入跟进内容"></uni-easyinput>
+                  </uni-forms-item>
+            
+                  <!-- 跟进结果 -->
+                  <uni-forms-item label="跟进结果：" name="result" required>
+					  <uni-easyinput type="textarea" v-model="formData.result" placeholder="请输入跟进结果"></uni-easyinput>
+                  </uni-forms-item>
+            
+                  <!-- 下一步计划 -->
+                  <uni-forms-item label="下一步计划：" name="nextPlan">
+					  <uni-easyinput type="textarea" v-model="formData.nextPlan" placeholder="请输入下一步计划（可选）"></uni-easyinput>
+                  </uni-forms-item>
+            
+                  <!-- 下次联系时间 -->
+                  <uni-forms-item label="下次联系：" name="nextContactDate" >
+					  <uni-datetime-picker class="picker-value" type="date" placeholder="请选择跟进日期"  v-model="formData.nextContactDate" @change="onDateChange" />
+                  </uni-forms-item>
+                </uni-forms>
+            
+                <!-- 按钮组 -->
+                <view class="button-group">
+				  <button class="btn submit-btn" @click="handleSubmit">保存跟进</button>
+                  <button class="btn reset-btn"  @click="handleReset">重置</button>
+                </view>
+			</view>
+        </view>
+		<view class="main-list" :style="getBackgroundStyle('k.png')">
+			<view class="list-top">
+				<view class="list-title">
+					<text>跟进历史记录</text>
+					<view class="title-line"></view>
+				</view>
+				<view class="title-total">
+					共<text class="total-num">{{followListNum}}</text>条记录
+				</view>
+			</view>
+			<view class="list-box" v-if="followListNum>0">
+				<uni-steps :options="followList" active-color="#007AFF" :active="active" direction="column" />
+			</view>
+			<empty v-else pdTop="200"></empty>
+		</view>
+    </AppLayout>
+</template>
+
+<script setup>
+import { inject, ref, reactive } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+const { $api, navTo, navBack } = inject('globalFunction');
+import config from "@/config.js"
+
+const title = ref('');
+const formData = reactive({
+  goalPersonId:'',
+  followDate: '',
+  followWay: '',
+  content: '',
+  result: '',
+  nextPlan: '',
+  nextContactDate: ''
+})
+const personInfo=ref({
+	goalPersonId:'',
+	name:'',
+	task_type:'',
+	task_id:'',
+	person_id:''
+})
+const followWays = ref([])
+const followList = ref([])
+const followListNum=ref(0)
+const active=ref(null)
+// 表单引用
+const formRef = ref(null)
+
+// 校验规则
+const rules = {
+	followDate: {
+		rules: [{
+			required: true,
+			errorMessage: '请选择跟进日期'
+		}]
+	},
+	followWay: {
+		rules: [{
+			required: true,
+			errorMessage: '请选择跟进方式'
+		}]
+	},
+	content: {
+		rules: [{
+			required: true,
+			errorMessage: '请填写跟进内容'
+		}]
+	},
+	result: {
+		rules: [{
+			required: true,
+			errorMessage: '请填写跟进结果'
+		}]
+	}
+}
+const baseUrl = config.imgBaseUrl
+const getBackgroundStyle = (imageName) => ({
+    backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
+    backgroundSize: 'cover',      // 覆盖整个容器
+    backgroundPosition: 'center', // 居中
+    backgroundRepeat: 'no-repeat'
+});
+
+const onFollowDateChange = (e)=>{
+	formData.followDate=e
+}
+const onMethodChange = (e) => {
+	formData.followWay=e
+}
+// 事件处理
+const onDateChange = ( e) => {
+  formData.nextContactDate=e
+}
+function getFollowList(){
+	followList.value=[]
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={
+		personId:personInfo.value.person_id,
+		taskId:personInfo.value.task_id
+	}
+	$api.myRequest('/dispatch/assist/records/getFollowList', params,'get',9100,header).then((resData) => {
+		if(resData && resData.code == 200){
+			if(resData.data && resData.data.length>0){
+				followListNum.value=resData.data.length
+				resData.data.forEach(item=>{
+					const obj={
+						title:item.followDate,
+						desc:`跟进方式：${getFollowWaysLabelByValue(item.followWay)}\n跟进人：${item.createByName}\n跟进内容：${item.content}\n跟进结果：${item.result}\n下一步计划：${item.nextPlan}`
+					}
+					followList.value.push(obj)
+				})
+			}
+			
+		}
+	});
+}
+
+function getDictionary(){
+	$api.myRequest('/system/public/dict/data/type/assist_follow_way').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				followWays.value.push(obj)
+			})
+		}
+	});
+}
+function getFollowWaysLabelByValue(value) {
+	if (!Array.isArray(followWays.value)) {
+	    return ''
+	  }
+	  const item = followWays.value.find(item => item.value === String(value))
+	  return item ? item.text : '暂无跟进方式'
+}
+const handleSubmit = () => {
+  formRef.value?.validate()
+    .then(() => {
+		let header={
+			'Authorization':uni.getStorageSync('Padmin-Token')
+		}
+		formData.goalPersonId=personInfo.value.goalPersonId
+		$api.myRequest('/dispatch/assist/records/addRecords', formData,'post',9100,header).then((resData) => {
+			console.log("resData",resData)
+			if(resData && resData.code == 200){
+				handleReset()
+				getFollowList()
+				uni.showToast({
+				  title: '保存成功',
+				  icon: 'success',
+				  duration: 2000 
+				});
+			}else{
+				uni.showToast({
+				  title: resData.msg,
+				  icon: 'none',
+				  duration: 2000
+				});
+			}
+			
+		});
+    })
+    .catch((errors) => {
+      console.log('校验失败:', errors);
+    });
+};
+
+const handleReset = () => {
+	  formData.followDate = '';
+	  formData.followWay = '';
+	  formData.content = '';
+	  formData.result = '';
+	  formData.nextPlan = '';
+	  formData.nextContactDate = '';
+}
+onLoad((options) => {
+	personInfo.value.goalPersonId=options.goalPersonId
+	personInfo.value.name=options.name
+	personInfo.value.task_type=options.taskType
+	personInfo.value.task_id=options.taskId
+	personInfo.value.person_id=options.personId
+	getDictionary()
+	getFollowList()
+});
+
+
+</script>
+
+<style lang="stylus" scoped>
+image
+  height: 100%
+  width: 100%
+.info-box
+  margin: 30rpx 30rpx
+  background: linear-gradient(0deg, #D9ECFF 0%, #F0F7FF 100%)
+  border-radius: 20rpx
+  padding: 40rpx 0
+  display: flex
+  align-items: center
+.info-img
+  width: 40rpx
+  height: 40rpx
+  margin-bottom: 20rpx
+.info-line
+  border-right: 2rpx solid #B7D6FF
+.info-item
+  display: flex
+  flex-direction: column
+  align-items: center
+  justify-content: center
+  width: 50%
+.info-label
+  font-size: 26rpx
+  color: #6E7E9B
+  margin-bottom: 20rpx
+.info-value
+  font-weight: bold
+  font-size: 28rpx
+  color: #3D61AC
+.main-list
+  background-color: #ffffff
+  padding: 20rpx 20rpx 28rpx 20rpx
+  margin: 30rpx 30rpx
+  box-shadow: 0px 3px 20px 0px rgba(0,105,234,0.1)
+  border-radius: 12px
+.list-top
+  display: flex
+  align-items: center
+  justify-content: space-between
+.list-title
+  font-weight: bold
+  font-size: 36rpx
+  color: #404040
+  position: relative
+
+.title-line
+  position: absolute
+  bottom: -10rpx
+  left: 70rpx
+  width: 70rpx
+  height: 8rpx
+  background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%)
+  border-radius: 4rpx
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+
+.label
+  width: 160rpx
+  font-size: 28rpx
+  color: #404040
+
+.input,
+.picker
+  flex: 1
+
+.picker-value
+  color: #666
+.list-box
+  margin-top: 40rpx
+
+.form-container 
+  margin-top: 30rpx
+:deep(.uni-forms-item__label)
+  width: 194rpx !important
+  font-size: 28rpx;
+  color: #404040;
+
+.button-group {
+  display: flex;
+  justify-content: space-between;
+  padding: 40rpx 20rpx 20rpx;
+}
+
+.btn {
+  width: 45%;
+  height: 80rpx;
+  font-size: 30rpx;
+  border-radius: 8rpx;
+}
+
+.reset-btn {
+  background-color: #D8E9FF;
+  color: #1176FF;
+}
+
+.submit-btn {
+  background-color: #368BFF;
+  color: white;
+}
+:deep(.uni-steps__column-circle )
+  width: 24rpx !important
+  height: 24rpx !important
+  background: radial-gradient(circle, 
+    #00C0FA 0%, 
+    #015EEA 50%, 
+    #FFFFFF 51%,  
+    #FFFFFF 100%) !important
+  border-radius: 50%
+  border: 2rpx solid #015EEA
+:deep(.uni-steps__column-title)
+  font-size: 28rpx !important
+  color: #006CFF !important
+  margin-bottom: 24rpx
+:deep(.uni-steps__column-desc)
+  font-size: 28rpx
+  color: #898989 !important
+  line-height: 1.5
+:deep(.uni-steps__column-text )
+  padding: 16rpx 0 !important
+  border: none
+:deep(.uni-steps__column-line)
+  background-color: #368BFF !important
+:deep(.uni-steps__column-line--before)
+  background-color:rgba(0,0,0,0) !important
+:deep(.uni-date-x)
+  background: rgba(0,0,0,0) !important
+:deep(.uni-stat-box)
+  background: rgba(0,0,0,0) !important
+:deep(.uni-easyinput__content)
+  background: rgba(0,0,0,0) !important
+</style>
diff --git a/packageB/priority/recordsManagement.vue b/packageB/priority/recordsManagement.vue
new file mode 100644
index 0000000..fcafbd5
--- /dev/null
+++ b/packageB/priority/recordsManagement.vue
@@ -0,0 +1,746 @@
+<template>
+    <AppLayout :title="title" :show-bg-image="false" >
+		<view class="page-container" >
+			<scroll-view :scroll-y="true" class="nearby-scroll" @scrolltolower="scrollBottom" lower-threshold="50">
+				<view class="info-box">
+					<view class="info-item info-line">
+						<view class="">
+							<uni-icons type="contact" color="#175CE9" size="34"></uni-icons>
+						</view>
+						<view class="info-label">
+							帮扶记录总数
+						</view>
+						<view class="info-value">
+							{{ stats.totalRecords }}
+						</view>
+					</view>
+					<view class="info-item info-line">
+						<view class="">
+							<uni-icons type="checkbox" color="#175CE9" size="34"></uni-icons>
+						</view>
+						<view class="info-label">
+							进行中记录
+						</view>
+						<view class="info-value">
+							{{ stats.pendingRecords }}
+						</view>
+					</view>
+					<view class="info-item info-line">
+						<view class="">
+							<uni-icons type="info" color="#175CE9" size="34"></uni-icons>
+						</view>
+						<view class="info-label">
+							未帮扶记录
+						</view>
+						<view class="info-value">
+							{{ stats.totalRecords - stats.pendingRecords }}
+						</view>
+					</view>
+					<view class="info-item">
+						<view class="">
+							<uni-icons type="refresh" color="#175CE9" size="34"></uni-icons>
+						</view>
+						<view class="info-label">
+							帮扶率
+						</view>
+						<view class="info-value">
+							{{ stats.assistRate }}%
+						</view>
+					</view>
+				</view>
+				<view class="main-list" :style="getBackgroundStyle('k.png')">
+					<view class="list-top">
+						<view class="list-title">
+							<text>筛选条件</text>
+							<view class="title-line"></view>
+						</view>
+						<view class="title-right button-sp-area">
+							<button class="mini-btn search-box-btn" type="primary" size="mini" @click="handleSearch">查询</button>
+							<button class="mini-btn reset-box-btn" type="default" size="mini" @click="handleReset">重置</button>
+						</view>
+					</view>
+					<view class="search-container">
+						<view class="search-item">
+						  <text class="label">人员姓名：</text>
+						  <uni-easyinput v-model="formData.name" placeholder="请输入人员姓名"></uni-easyinput>
+						</view>
+						<view class="search-item">
+						  <text class="label">身份证号：</text>
+						  <uni-easyinput v-model="formData.idCard" placeholder="请输入身份证号"></uni-easyinput>
+						</view>
+						<view class="search-item">
+						  <text class="label">帮扶类型：</text>
+						  <uni-data-select :key="1" v-model="formData.taskType" :localdata="taskTypeOptions" placeholder="请选择帮扶类型" @change="onTaskTypeChange"></uni-data-select>
+						</view>
+						<view class="search-item">
+						  <text class="label">帮扶人员：</text>
+						  <uni-easyinput v-model="formData.createByName" placeholder="请输入帮扶人员"></uni-easyinput>
+						</view>
+						<view class="search-item">
+						  <text class="label">所属区域：</text>
+						  <uni-data-picker ref="picker" class="picker" placeholder="请选择所属区域" popup-title="请选择所属区域" :localdata="regions" v-model="formData.deptTags"
+						  					  @change="onchange" >
+						  </uni-data-picker>
+						  <!-- <uni-data-select v-model="formData.filterSelectDeptIds" :localdata="executeDeptOptions" placeholder="请选择所属区域" @change="onExecuteDeptChange"></uni-data-select> -->
+						</view>
+						<view class="search-item">
+						  <text class="label">帮扶时间：</text>
+						  <uni-datetime-picker v-model="filterTimeRange" type="datetimerange" rangeSeparator="至" @change="filterTimeRangeChange" />
+						</view>	
+					</view>
+				</view>
+				<view class="main-list" :style="getBackgroundStyle('k.png')">
+					<view class="list-top">
+						<view class="list-title">
+							<text>帮扶记录列表</text>
+							<view class="title-line" style="left: 70rpx;"></view>
+						</view>
+						<view class="title-total">
+							共<text class="total-num">{{totalNum}}</text>条记录
+						</view>
+					</view>
+					<view class="list-box" v-if="dataList.length>0">
+						<view class="con-box" v-for="(item,index) in dataList" :key="index">
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/person.png'" mode=""></image>
+									<view class="item-label">
+										人员姓名：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.name}}
+								</view>
+							</view>
+							<view class="form-item">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/num.png'" mode=""></image>
+									<view class="item-label">
+										身份证号：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.id_card}}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/date.png'" mode=""></image>
+									<view class="item-label">
+										联系电话：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.phone}}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/base.png'" mode=""></image>
+									<view class="item-label">
+										居住地址：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.address}}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/next.png'" mode=""></image>
+									<view class="item-label">
+										帮扶类型：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.task_type}}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/next.png'" mode=""></image>
+									<view class="item-label">
+										帮扶人员：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.create_by_name}}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/next.png'" mode=""></image>
+									<view class="item-label">
+										帮扶单位：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.create_by_dept_name}}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/next.png'" mode=""></image>
+									<view class="item-label">
+										帮扶日期：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.follow_date}}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/next.png'" mode=""></image>
+									<view class="item-label">
+										下次联系：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.next_contact_date}}
+								</view>
+							</view>
+							<view class="form-btns">
+							    <button class="action-btn btn-primary" size="mini" @click="goDetail(item)">详情</button>
+							    <button class="action-btn btn-success" size="mini" @click="goFollow(item)">跟进</button>
+							    <button class="action-btn btn-gradient" size="mini" @click="goRecommend(item)">智能推荐</button>
+							    <button class="action-btn btn-info" size="mini" @click="goJobWill(item)">求职意愿</button>
+							    <button class="action-btn btn-info" size="mini" @click="goTrainingWill(item)">培训意愿</button>
+							    <button class="action-btn btn-warning" size="mini" v-if="!item.create_by_name" @click="returnItem(item)">退回</button>
+							</view>
+						</view>
+					</view>
+				    <empty v-else pdTop="200"></empty>
+				</view>
+			</scroll-view>
+			<view>
+				<!-- 提示窗示例 -->
+				<uni-popup ref="alertDialog" type="dialog">
+					<uni-popup-dialog type="warn" cancelText="取消" confirmText="确定" title="系统提示" content="是否确认退回？" @confirm="dialogConfirm"></uni-popup-dialog>
+				</uni-popup>
+			</view>
+		</view>
+    </AppLayout>
+</template>
+
+<script setup>
+import { inject, ref, reactive } from 'vue';
+import { onLoad,onShow } from '@dcloudio/uni-app';
+const { $api, navTo, navBack } = inject('globalFunction');
+import config from "@/config.js"
+
+const title = ref('');
+const stats=ref({})
+const formData = reactive({
+    name: '',
+	idCard: '',
+	taskType: '',
+	createByName: '',
+	deptTags: '',
+	followDateStart: null,
+	followDateEnd: null,
+	pageNum: 1,
+	pageSize: 10
+})
+const filterTimeRange=ref([])
+const totalNum=ref(0)
+const dataList=ref([])
+const taskTypeOptions=ref([])
+const priorityOptions=ref([])
+const allocationStatusOptions=ref([])
+const executeDeptOptions=ref([])
+const alertDialog = ref(null);
+const currentItem = ref({})
+const baseUrl = config.imgBaseUrl
+const getBackgroundStyle = (imageName) => ({
+    backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
+    backgroundSize: 'cover',      // 覆盖整个容器
+    backgroundPosition: 'center', // 居中
+    backgroundRepeat: 'no-repeat'
+});
+// 所属区域选项（可根据实际替换为动态数据）
+const regions = ref([])
+const picker = ref(null)
+function listNotParam(){
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={}
+	$api.myRequest('/dispatch/dept/listNotParam',params,'get',9100,header).then((resData) => {
+		if(resData && resData.code == 200){
+			loadLevelData(resData.data[0].parentId);
+			// resData.data.forEach(item=>{
+			// 	const obj = {
+			// 	    value: item.deptId,
+			// 	    text: item.deptName,
+			// 		ancestors:item.ancestors
+			// 	}
+			// 	executeDeptOptions.value.push(obj)
+			// })
+		}
+	});
+}
+function statisticTask(){
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={}
+	$api.myRequest('/dispatch/assist/records/statisticRecords',params,'get',9100,header).then((resData) => {
+		stats.value=resData.data
+		if (stats.value.totalRecords > 0 && stats.value.pendingRecords > 0) {
+		    stats.value.assistRate = ((stats.value.pendingRecords / stats.value.totalRecords) * 100).toFixed(2);
+		} else {
+		    stats.value.assistRate = 0;
+		}
+	});
+}
+function getDictionary(){
+	$api.myRequest('/system/public/dict/data/type/assist_task_type').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				taskTypeOptions.value.push(obj)
+			})
+		}
+	});
+	$api.myRequest('/system/public/dict/data/type/assist_task_priority').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				priorityOptions.value.push(obj)
+			})
+		}
+	});
+	$api.myRequest('/system/public/dict/data/type/assist_task_allocation_status').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				allocationStatusOptions.value.push(obj)
+			})
+		}
+	});
+}
+function getabelByValue(value,arr) {
+	if (!Array.isArray(arr.value)) {
+	    return ''
+	}
+	const item = arr.value.find(item => item.value === String(value))
+	return item ? item.text : '暂无'
+}
+function onTaskTypeChange(e){
+	formData.taskType=e
+}
+function onPriorityChange(e){
+	formData.priority=e
+}
+function onAllocationStatusChange(e){
+	formData.allocationStatus=e
+}
+function filterTimeRangeChange(e){
+	formData.createTimeStart=e[0]
+	formData.createTimeEnd=e[1]
+}
+function onExecuteDeptChange(e){
+	formData.executeDeptId=e
+}
+function handleSearch(){
+	formData.pageNum=1
+	console.log("formData",formData)
+	dataList.value=[]
+	getDataList()
+}
+function getDataList(){
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	$api.myRequest('/dispatch/assist/records/pageRecords',formData,'get',9100,header).then((resData) => {
+		console.log("resData",resData)
+		resData.rows.forEach(item=>{
+			item.task_type=getabelByValue(item.task_type,taskTypeOptions)
+		})
+		totalNum.value=resData.total
+		dataList.value=dataList.value.concat(resData.rows)
+		
+	});
+}
+const handleReset = () => {
+	dataList.value=[]
+	formData.name=''
+	formData.idCard=''
+	formData.taskType=''
+	formData.createByName=''
+	formData.deptTags=null
+	formData.followDateStart=null
+	formData.followDateEnd=''
+	formData.pageNum=1
+	formData.pageSize=10
+	filterTimeRange.value=[]
+	getDataList()
+}
+function goDetail(item){
+	navTo('/packageB/priority/recordDetail?id='+item.goal_person_id);
+}
+function goFollow(item){
+	navTo('/packageB/priority/recordFollow?name='+item.name+'&taskType='+item.task_type+'&taskId='+item.task_id+'&personId='+item.person_id+'&goalPersonId='+item.goal_person_id);
+}
+function goRecommend(item){
+	navTo('/packageB/priority/smartRecommend?goalPersonId='+item.goal_person_id);
+}
+function goJobWill(item){
+	navTo('/packageB/priority/jobWill?id='+item.person_id+'&goalPersonId='+item.goal_person_id);
+}
+function goTrainingWill(item){
+	navTo('/packageB/priority/trainingWill?id='+item.person_id+'&goalPersonId='+item.goal_person_id);
+}
+function returnItem(item){
+	if (alertDialog.value) {
+	    alertDialog.value.open();
+		currentItem.value=item
+	}
+}
+function dialogConfirm(){
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token')
+	}
+	let params={
+		goalPersonId:currentItem.value.goal_person_id
+	}
+	$api.myRequest('/dispatch/assist/records/returnRecords',params,'post',9100,header).then((resData) => {
+		if(resData.code==200){
+			dataList.value=[]
+			formData.pageNum=1
+			getDataList()
+		}
+		
+	});
+}
+function scrollBottom(){
+	if(formData.pageNum<totalNum.value/formData.pageSize){
+		formData.pageNum++
+		getDataList()
+	}
+}
+ // 加载某一级的数据（parentId 为空表示根）
+async function loadLevelData(parentId,node) {
+    let header = {
+		'Authorization': uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	};
+	let params = { parentId };
+
+	try {
+		const resData = await $api.myRequest('/dispatch/dept/list', params, 'get', 9100, header);
+		if(resData.data.length==0){
+			picker.value.hide()
+			return
+		}
+		const formatted = (resData.data || []).map(item => ({
+			text: item.deptName, 
+			value: item.tags,
+			deptId: item.deptId,
+			children: [] 
+		}));
+		if(node){
+			injectChildren(parentId, formatted);
+		}else{
+			regions.value=formatted
+		}
+	} catch (error) {
+		console.error("加载部门数据失败:", error);
+		// uni.showToast({ title: '加载失败', icon: 'none' });
+	}
+}
+// 将子级数据注入到对应的父节点
+function injectChildren(parentValue, childrenData) {
+    const findAndInject = (nodes) => {
+		for (let node of nodes) {
+			if (node.deptId === parentValue) {
+				// 如果 children 已存在且非空，避免重复加载
+				if (!node.children || node.children.length === 0) {
+					node.children = childrenData;
+				}
+				return true;
+			}
+			if (node.children && node.children.length > 0) {
+				if (findAndInject(node.children)) return true;
+			}
+		}
+		return false;
+	}
+
+	findAndInject(regions.value);
+  // 强制更新
+}
+// 当用户选择时触发（注意：change 在每级选择后都会触发）
+function onchange(e) {
+	const selectedValues = e.detail.value;
+	// formData.deptId=selectedValues.map(item => item.value).join(',');
+	if (selectedValues.length === 0) return;
+	// 获取最后一级选中的 value
+	const lastSelectedValue = selectedValues[selectedValues.length - 1];
+	// 查找该节点是否有 children，如果没有则尝试加载
+	const node = findNodeByValue(regions.value, lastSelectedValue);
+	if (node && (!node.children || node.children.length === 0)) {
+		// 检查接口是否还有下一级（可通过接口返回判断，或先尝试加载）
+		// 这里我们直接尝试加载下一级
+		loadLevelData(node.deptId , node);
+		picker.value.show()
+	}
+}
+// 工具函数：根据 value 查找节点
+function findNodeByValue(nodes, value) {
+	for (let node of nodes) {
+		if (node.value === value.value) {
+			return node;
+		}
+		if (node.children && node.children.length > 0) {
+			const found = findNodeByValue(node.children, value);
+			if (found) return found;
+		}
+	}
+	return null;
+}
+onShow(()=>{
+})
+onLoad((options) => {
+	listNotParam()
+	statisticTask()
+	runAsyncTasks(options)
+});
+const runAsyncTasks = async (options) => {
+	
+	await getDictionary()
+	await getDataList()
+}
+
+</script>
+
+<style lang="stylus" scoped>
+image
+  height: 100%
+  width: 100%
+.page-container {
+  display: flex;
+  flex-direction: column;
+  height: calc(100vh - var(--window-top)); /* 如果 AppLayout 有 header，需减去 */
+  /* 或者简单用：height: 100vh; */
+}
+.nearby-scroll
+    // 使用flex布局让scroll-view自适应高度，占据剩余空间
+  flex: 1
+  // overflow: hidden;
+.info-box
+  margin: 30rpx 30rpx
+  background: linear-gradient(0deg, #D9ECFF 0%, #F0F7FF 100%)
+  border-radius: 20rpx
+  padding: 40rpx 0
+  display: flex
+  align-items: center
+.info-line
+  border-right: 2rpx solid #B7D6FF
+.info-item
+  display: flex
+  flex-direction: column
+  align-items: center
+  justify-content: center
+  width: 50%
+.info-label
+  font-size: 26rpx
+  color: #6E7E9B
+  margin-bottom: 20rpx
+.info-value
+  font-weight: bold
+  font-size: 28rpx
+  color: #3D61AC
+.main-list
+  background-color: #ffffff
+  padding: 20rpx 20rpx 28rpx 20rpx
+  margin: 30rpx 30rpx
+  box-shadow: 0px 3px 20px 0px rgba(0,105,234,0.1)
+  border-radius: 12px
+.list-top
+  display: flex
+  align-items: center
+  justify-content: space-between
+.list-title
+  font-weight: bold
+  font-size: 36rpx
+  color: #404040
+  position: relative
+
+.title-line
+  position: absolute
+  bottom: -10rpx
+  left: 70rpx
+  width: 70rpx
+  height: 8rpx
+  background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%)
+  border-radius: 4rpx
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+
+.list-box
+  margin-top: 40rpx
+
+:deep(.uni-forms-item__label)
+  width: 194rpx !important
+  font-size: 28rpx;
+  color: #404040;
+  
+.search-container
+  padding: 20rpx 0rpx 0rpx 0rpx
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+.search-item
+  display: flex
+  align-items: center
+  margin-bottom: 30rpx
+
+.label
+  width: 160rpx
+  font-size: 28rpx
+  color: #404040
+  flex-shrink: 0
+
+.input,
+.picker
+  background: #FFFFFF
+  flex: 1
+  min-width: 0
+.search-box-btn
+  border-radius: 32rpx !important
+  background: #3088FF !important
+  margin-right: 16rpx
+.reset-box-btn
+  border-radius: 32rpx !important
+  background: #02B44D
+  color: #fff
+.con-box
+  background: #fff
+  padding: 20rpx
+  box-shadow: 0px 0px 6rpx 0px rgba(0,71,200,0.16)
+  border-radius: 24rpx
+  border: 1rpx solid #EDF5FF
+  margin-top: 30rpx
+.form-title
+  display: flex
+  align-items: center
+
+.form-name
+  font-weight: bold
+  font-size: 32rpx
+  color: #595959
+  margin-right:16rpx
+.form-type
+  border-radius: 8rpx;
+  border: 2rpx solid #FF7D26;
+  font-size: 24rpx
+  color: #F1690E
+  padding: 4rpx 10rpx
+.form-item
+  display: flex
+  align-items: center
+  justify-content: space-between
+  margin-top: 30rpx
+.item-left
+  display: flex
+  align-items: center
+.item-img
+  width: 26rpx
+  height: 26rpx
+  margin-right: 10rpx
+.item-label
+  font-size: 26rpx
+  color: #B3B3B3
+  width: 130rpx
+.item-right
+  font-size: 26rpx
+  color: #737373
+  overflow: hidden
+  text-overflow: ellipsis
+  white-space: nowrap
+.form-btns
+  margin-top: 30rpx
+  display: flex
+  flex-wrap: wrap // 允许换行
+  justify-content: space-between // 两端对齐，中间留空
+  // 如果希望最后一行也撑开，可以使用 space-evenly，但 space-between 配合固定宽度更整齐
+  
+.action-btn
+  border-radius: 12rpx !important // 稍微方一点的圆角，显得更稳重
+  font-size: 24rpx !important
+  font-weight: 500
+  padding: 16rpx 0 !important // 上下内边距
+  margin-bottom: 20rpx // 行间距
+  display: flex
+  align-items: center
+  justify-content: center
+  // 计算宽度：3个一行，减去间隙。假设总宽100%，gap由justify-content处理
+  // 这里设定一个固定比例宽度，确保一行能放下3个
+  width: 32% 
+  height: 72rpx // 固定高度保证整齐
+  line-height: 1.2
+  border-width: 1rpx
+  border-style: solid
+
+/* --- 样式变体 --- */
+
+// 1. 详情 (主操作 - 蓝色实心)
+.btn-primary
+  background-color: #3088FF !important
+  color: #FFFFFF !important
+  border-color: #3088FF !important
+  box-shadow: 0 4rpx 12rpx rgba(48, 136, 255, 0.3)
+
+// 2. 跟进 (次主操作 - 绿色实心)
+.btn-success
+  background-color: #00933E !important
+  color: #FFFFFF !important
+  border-color: #00933E !important
+  box-shadow: 0 4rpx 12rpx rgba(0, 147, 62, 0.3)
+
+// 3. 智能推荐 (特色操作 - 渐变)
+.btn-gradient
+  background: linear-gradient(92deg, #0DCCFF 0%, #4760FF 100%) !important
+  color: #FFFFFF !important
+  border: none !important
+  box-shadow: 0 4rpx 12rpx rgba(71, 96, 255, 0.4)
+
+// 4. 求职/培训意愿 (辅助操作 - 浅蓝底深蓝字)
+.btn-info
+  background-color: #EDF5FF !important
+  color: #3088FF !important
+  border-color: #CBDFFF !important
+
+// 5. 退回 (特殊操作 - 橙色/警告色)
+.btn-warning
+  background-color: #FFF7E6 !important
+  color: #FA8C16 !important
+  border-color: #FFD591 !important
+</style>
diff --git a/packageB/priority/smartRecommend.vue b/packageB/priority/smartRecommend.vue
new file mode 100644
index 0000000..7091b80
--- /dev/null
+++ b/packageB/priority/smartRecommend.vue
@@ -0,0 +1,597 @@
+<template>
+    <AppLayout :title="title" :show-bg-image="false" >
+		<view class="tab-list" >
+			<view class="tab" :class="{active: activeType == 1}" @click="tabChange(1)">岗位推荐
+			</view>
+			<view class="tab" :class="{active: activeType == 2}"  @click="tabChange(2)">政策推荐
+			</view>
+			<view class="tab" :class="{active: activeType == 3}"  @click="tabChange(3)">培训推荐
+			</view>
+		</view>	
+		<view class="page-container" >
+			<scroll-view :scroll-y="true" class="nearby-scroll" @scrolltolower="scrollBottom" lower-threshold="50">
+				<view class="main-list" :style="getBackgroundStyle('k.png')" v-if="activeType==1">
+					<view class="list-top">
+						<view class="list-title">
+							<text>推荐岗位列表</text>
+							<view class="title-line" style="left: 70rpx;"></view>
+						</view>
+						<view class="title-total">
+							共<text class="total-num">{{totalNum}}</text>个
+						</view>
+					</view>
+					<view class="list-box" v-if="dataList.length>0">
+						<view class="con-box" v-for="(item,index) in dataList" :key="index">
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/person.png'" mode=""></image>
+									<view class="item-label">
+										岗位名称：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.jobTitle}}
+								</view>
+							</view>
+							<view class="form-item">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/help.png'" mode=""></image>
+									<view class="item-label">
+										公司名称：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.companyName}}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/base.png'" mode=""></image>
+									<view class="item-label">
+										薪资待遇：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.minSalary}}-{{item.maxSalary}}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/num.png'" mode=""></image>
+									<view class="item-label">
+										工作地点：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.jobLocation}}
+								</view>
+							</view>
+						</view>
+					</view>
+				    <empty v-else pdTop="200"></empty>
+				</view>
+				<view class="main-list" :style="getBackgroundStyle('k.png')" v-if="activeType==2">
+					<view class="list-top">
+						<view class="list-title">
+							<text>推荐政策列表</text>
+							<view class="title-line" style="left: 70rpx;"></view>
+						</view>
+						<view class="title-total">
+							共<text class="total-num">{{totalNum}}</text>项
+						</view>
+					</view>
+					<view class="list-box" v-if="dataList.length>0">
+						<view class="con-box" v-for="(item,index) in dataList" :key="index">
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/person.png'" mode=""></image>
+									<view class="item-label">
+										政策名称：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.zcmc}}
+								</view>
+							</view>
+							<view class="form-item">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/help.png'" mode=""></image>
+									<view class="item-label">
+										政策类型：
+									</view>
+								</view>
+								<view class="item-right">
+									{{ item.type === '3' ? '个人就业政策' : '单位就业政策' }}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/base.png'" mode=""></image>
+									<view class="item-label">
+										政策级别：
+									</view>
+								</view>
+								<view class="item-right">
+									{{ item.zcLevel }}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/num.png'" mode=""></image>
+									<view class="item-label">
+										发文单位：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.sourceUnit}}
+								</view>
+							</view>
+							<view class="form-item">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/date.png'" mode=""></image>
+									<view class="item-label">
+										发布时间：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.publishTime}}
+								</view>
+							</view>
+						</view>
+					</view>
+				    <empty v-else pdTop="200"></empty>
+				</view>
+				<view class="main-list" :style="getBackgroundStyle('k.png')" v-if="activeType==3">
+					<view class="list-top">
+						<view class="list-title">
+							<text>推荐培训列表</text>
+							<view class="title-line" style="left: 70rpx;"></view>
+						</view>
+						<view class="title-total">
+							共<text class="total-num">{{totalNum}}</text>门
+						</view>
+					</view>
+					<view class="list-box" v-if="dataList.length>0">
+						<view class="con-box" v-for="(item,index) in dataList" :key="index">
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/person.png'" mode=""></image>
+									<view class="item-label">
+										课程标题：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.videoTitle}}
+								</view>
+							</view>
+							<view class="form-item">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/help.png'" mode=""></image>
+									<view class="item-label">
+										课程分类：
+									</view>
+								</view>
+								<view class="item-right">
+									{{getabelByValue(item.category,classificationOptions)}}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/base.png'" mode=""></image>
+									<view class="item-label">
+										讲师：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.teacherName}}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/num.png'" mode=""></image>
+									<view class="item-label">
+										时长：
+									</view>
+								</view>
+								<view class="item-right">
+									{{formatDuration(item.hour)}}
+								</view>
+							</view>
+						</view>
+					</view>
+				    <empty v-else pdTop="200"></empty>
+				</view>
+			</scroll-view>
+		</view>
+    </AppLayout>
+</template>
+
+<script setup>
+import { inject, ref, reactive, onMounted } from 'vue';
+import { onLoad,onShow } from '@dcloudio/uni-app';
+const { $api, navTo, navBack } = inject('globalFunction');
+import config from "@/config.js"
+
+const title = ref('');
+const activeType = ref(1)
+const pageNum = ref(1)
+const pageSize = ref(10)
+const totalNum=ref(0)
+const dataList=ref([])
+const classificationOptions=ref([])
+const goalPersonId=ref([])
+const baseUrl = config.imgBaseUrl
+const getBackgroundStyle = (imageName) => ({
+    backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
+    backgroundSize: 'cover',      // 覆盖整个容器
+    backgroundPosition: 'center', // 居中
+    backgroundRepeat: 'no-repeat'
+});
+function tabChange(val){
+	activeType.value=val
+	getDataList()
+}
+function formatDuration(duration) {
+  // 如果已经是字符串格式，直接返回
+    if (typeof duration === 'string') {
+	  return duration
+	}
+	// 如果是数字（秒数），格式化为时间字符串
+	if (typeof duration === 'number') {
+		const hours = Math.floor(duration / 3600)
+		const minutes = Math.floor((duration % 3600) / 60)
+		const secs = duration % 60
+		if (hours > 0) {
+			return `${hours}:${minutes.toString().padStart(2, '0')}:${secs.toString().padStart(2, '0')}`
+		} else {
+			return `${minutes}:${secs.toString().padStart(2, '0')}`
+		}
+	}
+	return duration
+}
+function getDictionary(){
+	$api.myRequest('/system/public/dict/data/type/question_classification').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				classificationOptions.value.push(obj)
+			})
+		}
+	});
+}
+function getabelByValue(value,arr) {
+	if (!Array.isArray(arr)) {
+	    return ''
+	}
+	const item = arr.find(item => item.value === String(value))
+	return item ? item.text : '暂无'
+}
+function getDataList(){
+	dataList.value=[]
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	if(activeType.value==1){
+		let params={
+			goalPersonId: goalPersonId.value,
+			pageNum: 1,
+			pageSize: 1
+		}
+		$api.myRequest('/dispatch/job/willingness/list',params,'get',9100,header).then((resData) => {
+			if(resData.rows&&resData.rows.length>0){
+				const education = resData.rows[0].education?resData.rows[0].education:''
+				const jobType = resData.rows[0].jobType?resData.rows[0].jobType:''
+				const type = resData.rows[0].type?resData.rows[0].type:''
+				const jobParams = {
+					education,
+					jobType, 
+					type
+				};
+				$api.myRequest('/ks/cms/job/recommend?education',jobParams,'get',9100,header,false,'jobRecommend').then((resData) => {
+					dataList.value=resData.data
+					if(dataList.value.length>10){
+						dataList.value=dataList.value.slice(0,10)
+					}
+				})
+			}else{
+				$api.myRequest('/ks/cms/job/recommend?education',{},'get',9100,header,false,'jobRecommend').then((resData) => {
+					dataList.value=resData.data
+					if(dataList.value.length>10){
+						dataList.value=dataList.value.slice(0,10)
+					}
+				})
+			}
+			
+		});
+	}else if(activeType.value==2){
+		let policyParams={
+			pageNum: 1,
+			pageSize: 5
+		}
+		$api.myRequest('/portal/policyInfo/portalList',policyParams,'get',9100,header,false,'policyRecommend').then((resData) => {
+			dataList.value=resData.rows
+		})
+	}else if(activeType.value==3){
+		let willingParams = {
+			goalPersonId: goalPersonId.value,
+			pageNum: 1,
+			pageSize: 1
+		}
+		$api.myRequest('/dispatch/train/willingness/list',willingParams,'get',9100,header).then((resData) => {
+			if(resData.code==200){
+				let train = {};
+				if (resData.rows && resData.rows.length > 0) {
+					train = resData.rows[0];
+				}
+				let trainParams = {
+					category: train.courseType || '',
+					pageNum: 1,
+					pageSize: 5
+				};
+				$api.myRequest('/dispatch/train/trainVideo/table',trainParams,'get',9100,header).then((resData) => {
+					dataList.value=resData.rows
+				})
+			}else{
+			}
+			
+		});
+	}
+	
+	
+}
+function scrollBottom(){
+	// if(pageNum.value<totalNum.value/pageSize.value){
+	// 	pageNum.value++
+	// 	getDataList()
+	// }
+}
+onLoad((options) => {
+	goalPersonId.value=options.goalPersonId
+});
+const runAsyncTasks = async () => {
+  await getDictionary()
+  await getDataList()
+}
+onShow(()=>{
+	dataList.value=[]
+	pageNum.value=1
+	runAsyncTasks()
+})
+
+</script>
+
+<style lang="stylus" scoped>
+.tab-list
+  display: flex
+  margin: 16rpx 30rpx 0rpx
+  text-align: center
+  border-radius: 16rpx
+  background: #fff
+  align-items: center
+  justify-content: space-between
+  padding:20rpx 40rpx 0rpx
+.tab
+  padding-bottom: 10rpx
+  font-size: 30rpx
+.active
+  color: #1A62CE
+  border-bottom: 4rpx solid #1A62CE
+  position: relative
+  font-weight: bold
+image
+  height: 100%
+  width: 100%
+.page-container {
+  display: flex;
+  flex-direction: column;
+  height: calc(100vh - var(--window-top)); /* 如果 AppLayout 有 header，需减去 */
+  /* 或者简单用：height: 100vh; */
+  padding-bottom: 140rpx
+}
+.nearby-scroll
+    // 使用flex布局让scroll-view自适应高度，占据剩余空间
+  flex: 1
+  // overflow: hidden;
+.task-box
+  display: flex
+  align-items: center
+.task-label
+  font-size: 30rpx
+  color: #6E7E9B
+.task-name
+  font-weight: bold
+  font-size: 30rpx
+  color: #3D61AC
+.main-list
+  background-color: #ffffff
+  padding: 20rpx 20rpx 28rpx 20rpx
+  margin: 30rpx 30rpx
+  box-shadow: 0px 3px 20px 0px rgba(0,105,234,0.1)
+  border-radius: 12px
+.list-top
+  display: flex
+  align-items: center
+  justify-content: space-between
+.list-title
+  font-weight: bold
+  font-size: 36rpx
+  color: #404040
+  position: relative
+
+.title-line
+  position: absolute
+  bottom: -10rpx
+  left: 70rpx
+  width: 70rpx
+  height: 8rpx
+  background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%)
+  border-radius: 4rpx
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+
+.list-box
+  margin-top: 40rpx
+
+:deep(.uni-forms-item__label)
+  width: 194rpx !important
+  font-size: 28rpx;
+  color: #404040;
+  
+.search-container
+  padding: 20rpx 0rpx 0rpx 0rpx
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+.search-item
+  display: flex
+  align-items: center
+  margin-bottom: 30rpx
+
+.label
+  width: 160rpx
+  font-size: 28rpx
+  color: #404040
+  flex-shrink: 0
+
+.input,
+.picker
+  background: #FFFFFF
+  flex: 1
+  min-width: 0
+.search-box-btn
+  border-radius: 32rpx !important
+  background: #3088FF !important
+  margin-right: 16rpx
+.reset-box-btn
+  border-radius: 32rpx !important
+  background: #02B44D
+  color: #fff
+.con-box
+  background: #fff
+  padding: 20rpx
+  box-shadow: 0px 0px 6rpx 0px rgba(0,71,200,0.16)
+  border-radius: 24rpx
+  border: 1rpx solid #EDF5FF
+  margin-top: 30rpx
+.form-title
+  display: flex
+  align-items: center
+
+.form-name
+  font-weight: bold
+  font-size: 30rpx
+  color: #595959
+  margin-right:16rpx
+.form-type
+  border-radius: 8rpx;
+  border: 2rpx solid #FF7D26;
+  font-size: 24rpx
+  color: #F1690E
+  padding: 4rpx 10rpx
+.form-item
+  display: flex
+  align-items: center
+  justify-content: space-between
+  margin-top: 30rpx
+.item-left
+  display: flex
+  align-items: center
+.item-img
+  width: 26rpx
+  height: 26rpx
+  margin-right: 10rpx
+.item-label
+  font-size: 26rpx
+  color: #B3B3B3
+  width: 190rpx
+.item-right
+  font-size: 26rpx
+  color: #737373
+  // overflow: hidden
+  // text-overflow: ellipsis
+  // white-space: nowrap
+  word-wrap: break-word
+  overflow-wrap: break-word
+  white-space: normal
+.form-btns
+  margin-top:30rpx
+.form-box-btn
+  border-radius: 50rpx !important
+  margin-right: 24rpx
+  padding: 0rpx 40rpx
+.detail-btn
+  background: #EDF5FF
+  border: 1px solid #3088FF
+  font-size: 28rpx
+  color: #3088FF
+.follow-btn
+  background: #EEF9F3
+  border: 1px solid #00933E
+  font-size: 28rpx
+  color: #00933E
+.recommend-btn
+  background: linear-gradient(92deg, #0DCCFF 0%, #4760FF 100%)
+  font-size: 28rpx
+  color: #FFFFFF
+.button-group 
+	position: fixed
+	bottom: 0
+	left: 0
+	width: 100%
+	height: 120rpx
+	background: #fff
+.btns
+  height: 120rpx
+  width: 100%
+  line-height: 120px
+  display: flex
+  align-items: center
+  justify-content: space-between
+  box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.1)
+
+.btn {
+  width: 45%;
+  height: 80rpx;
+  font-size: 30rpx;
+  border-radius: 8rpx;
+}
+
+.reset-btn {
+  background-color: #D8E9FF;
+  color: #1176FF;
+}
+
+.submit-btn {
+  background-color: #368BFF;
+  color: white;
+}
+.float-btn{
+	position: fixed;
+	bottom: 100rpx;
+	right: 50rpx;
+	background: #368BFF;
+	width: 100rpx;
+	height: 100rpx;
+	border-radius: 50%;
+	line-height: 100rpx;
+	text-align: center;
+	color: #fff;
+}
+</style>
diff --git a/packageB/priority/targetPersonnel.vue b/packageB/priority/targetPersonnel.vue
new file mode 100644
index 0000000..aae790b
--- /dev/null
+++ b/packageB/priority/targetPersonnel.vue
@@ -0,0 +1,457 @@
+<template>
+    <AppLayout :title="title" :show-bg-image="false" >
+		<view class="page-container" >
+			<scroll-view :scroll-y="true" class="nearby-scroll" @scrolltolower="scrollBottom" lower-threshold="50">
+				<view class="main-list" :style="getBackgroundStyle('k.png')">
+					<view class="task-box">
+						<text class="task-label">任务：</text>
+						<text class="task-name">{{taskName}}</text>
+					</view>
+				</view>
+			
+				<view class="main-list" :style="getBackgroundStyle('k.png')">
+					<view class="list-top">
+						<view class="list-title">
+							<text>目标人员列表</text>
+							<view class="title-line" style="left: 70rpx;"></view>
+						</view>
+						<view class="title-total">
+							目标人数<text class="total-num">{{totalNum}}</text>人
+						</view>
+					</view>
+					<view class="list-box" v-if="dataList.length>0">
+						<view class="con-box" v-for="(item,index) in dataList" :key="index">
+							<view class="form-title">
+								<view class="form-name">
+									{{item.name}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.idCard">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/person.png'" mode=""></image>
+									<view class="item-label">
+										身份证号：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.idCard}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.phone">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/tele.png'" mode=""></image>
+									<view class="item-label">
+										联系电话：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.phone}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.address">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/base.png'" mode=""></image>
+									<view class="item-label">
+										住址：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.address}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.skills">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/num.png'" mode=""></image>
+									<view class="item-label">
+										技能特长：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.skills}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.tags.length>0">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/date.png'" mode=""></image>
+									<view class="item-label">
+										人员标签：
+									</view>
+								</view>
+								<view class="item-right">
+									<view class="" v-for="(val,num) in item.tags" :key="num">
+										{{val}}
+									</view>
+								</view>
+							</view>
+							<view class="form-item" v-if="item.datasource">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/next.png'" mode=""></image>
+									<view class="item-label">
+										数据来源：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.datasource=== '1' ? '自动识别' : '手动添加'}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.assistStatus">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/help.png'" mode=""></image>
+									<view class="item-label">
+										帮扶状态：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.assistStatus}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.employmentStatus">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/num.png'" mode=""></image>
+									<view class="item-label">
+										就业状态：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.employmentStatus}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.unemploymentDate">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/date.png'" mode=""></image>
+									<view class="item-label">
+										失业时间：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.unemploymentDate}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.unemploymentRegisterDate">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/date.png'" mode=""></image>
+									<view class="item-label">
+										失业登记时间：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.unemploymentRegisterDate}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.graduateDate">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/next.png'" mode=""></image>
+									<view class="item-label">
+										毕业时间：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.graduateDate}}
+								</view>
+							</view>
+						</view>
+					</view>
+				    <empty v-else pdTop="200"></empty>
+				</view>
+			</scroll-view>
+		</view>
+    </AppLayout>
+</template>
+
+<script setup>
+import { inject, ref, reactive, onMounted } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+const { $api, navTo, navBack } = inject('globalFunction');
+import config from "@/config.js"
+
+const title = ref('');
+const id=ref('')
+const taskName=ref('')
+const pageNum = ref(1)
+const pageSize = ref(2)
+const currentItem=ref({})
+const totalNum=ref(0)
+const dataList=ref([])
+const personDatabaseStatusOptions=ref([])
+const employmentStatusOptions=ref([])
+const baseUrl = config.imgBaseUrl
+const getBackgroundStyle = (imageName) => ({
+    backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
+    backgroundSize: 'cover',      // 覆盖整个容器
+    backgroundPosition: 'center', // 居中
+    backgroundRepeat: 'no-repeat'
+});
+const emit = defineEmits(['update:showView'])
+function getDictionary(){
+	$api.myRequest('/system/public/dict/data/type/person_database_status').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				personDatabaseStatusOptions.value.push(obj)
+			})
+		}
+	});
+	$api.myRequest('/system/public/dict/data/type/assist_employment_status').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				employmentStatusOptions.value.push(obj)
+			})
+		}
+	});
+}
+function getabelByValue(value,arr) {
+	if (!Array.isArray(arr.value)) {
+	    return ''
+	}
+	const item = arr.value.find(item => item.value === String(value))
+	return item ? item.text : '暂无'
+}
+function getDataList(){
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={
+		allocationId: id.value,
+		pageNum: pageNum.value,
+		pageSize: pageSize.value
+	}
+	$api.myRequest('/dispatch/assist/person/database/pageGoalPersonList',params,'get',9100,header).then((resData) => {
+		resData.rows.forEach(item=>{
+			item.tags=item.tagName.split(',')
+			item.assistStatus=getabelByValue(item.assistStatus,personDatabaseStatusOptions)
+			item.employmentStatus=getabelByValue(item.employmentStatus,employmentStatusOptions)
+		})
+		totalNum.value=resData.total
+		dataList.value=dataList.value.concat(resData.rows)
+		
+	});
+}
+function scrollBottom(){
+	if(pageNum.value<totalNum.value/pageSize.value){
+		pageNum.value++
+		getDataList()
+	}
+}
+onLoad((options) => {
+	console.log("options",options)
+	id.value=options.id
+	taskName.value=options.taskName
+	runAsyncTasks()
+});
+const runAsyncTasks = async () => {
+  await getDictionary()
+  await getDataList()
+}
+
+</script>
+
+<style lang="stylus" scoped>
+image
+  height: 100%
+  width: 100%
+.page-container {
+  display: flex;
+  flex-direction: column;
+  height: calc(100vh - var(--window-top)); /* 如果 AppLayout 有 header，需减去 */
+  /* 或者简单用：height: 100vh; */
+  padding-bottom: 140rpx
+}
+.nearby-scroll
+    // 使用flex布局让scroll-view自适应高度，占据剩余空间
+  flex: 1
+  // overflow: hidden;
+.task-box
+  display: flex
+  align-items: center
+.task-label
+  font-size: 30rpx
+  color: #6E7E9B
+.task-name
+  font-weight: bold
+  font-size: 30rpx
+  color: #3D61AC
+.main-list
+  background-color: #ffffff
+  padding: 20rpx 20rpx 28rpx 20rpx
+  margin: 30rpx 30rpx
+  box-shadow: 0px 3px 20px 0px rgba(0,105,234,0.1)
+  border-radius: 12px
+.list-top
+  display: flex
+  align-items: center
+  justify-content: space-between
+.list-title
+  font-weight: bold
+  font-size: 36rpx
+  color: #404040
+  position: relative
+
+.title-line
+  position: absolute
+  bottom: -10rpx
+  left: 70rpx
+  width: 70rpx
+  height: 8rpx
+  background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%)
+  border-radius: 4rpx
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+
+.list-box
+  margin-top: 40rpx
+
+:deep(.uni-forms-item__label)
+  width: 194rpx !important
+  font-size: 28rpx;
+  color: #404040;
+  
+.search-container
+  padding: 20rpx 0rpx 0rpx 0rpx
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+.search-item
+  display: flex
+  align-items: center
+  margin-bottom: 30rpx
+
+.label
+  width: 160rpx
+  font-size: 28rpx
+  color: #404040
+  flex-shrink: 0
+
+.input,
+.picker
+  background: #FFFFFF
+  flex: 1
+  min-width: 0
+.search-box-btn
+  border-radius: 32rpx !important
+  background: #3088FF !important
+  margin-right: 16rpx
+.reset-box-btn
+  border-radius: 32rpx !important
+  background: #02B44D
+  color: #fff
+.con-box
+  background: #fff
+  padding: 20rpx
+  box-shadow: 0px 0px 6rpx 0px rgba(0,71,200,0.16)
+  border-radius: 24rpx
+  border: 1rpx solid #EDF5FF
+  margin-top: 30rpx
+.form-title
+  display: flex
+  align-items: center
+
+.form-name
+  font-weight: bold
+  font-size: 30rpx
+  color: #595959
+  margin-right:16rpx
+.form-type
+  border-radius: 8rpx;
+  border: 2rpx solid #FF7D26;
+  font-size: 24rpx
+  color: #F1690E
+  padding: 4rpx 10rpx
+.form-item
+  display: flex
+  align-items: center
+  justify-content: space-between
+  margin-top: 30rpx
+.item-left
+  display: flex
+  align-items: center
+.item-img
+  width: 26rpx
+  height: 26rpx
+  margin-right: 10rpx
+.item-label
+  font-size: 26rpx
+  color: #B3B3B3
+  width: 190rpx
+.item-right
+  font-size: 26rpx
+  color: #737373
+  // overflow: hidden
+  // text-overflow: ellipsis
+  // white-space: nowrap
+  word-wrap: break-word
+  overflow-wrap: break-word
+  white-space: normal
+.form-btns
+  margin-top:30rpx
+.form-box-btn
+  border-radius: 50rpx !important
+  margin-right: 24rpx
+  padding: 0rpx 40rpx
+.detail-btn
+  background: #EDF5FF
+  border: 1px solid #3088FF
+  font-size: 28rpx
+  color: #3088FF
+.follow-btn
+  background: #EEF9F3
+  border: 1px solid #00933E
+  font-size: 28rpx
+  color: #00933E
+.recommend-btn
+  background: linear-gradient(92deg, #0DCCFF 0%, #4760FF 100%)
+  font-size: 28rpx
+  color: #FFFFFF
+.button-group 
+	position: fixed
+	bottom: 0
+	left: 0
+	width: 100%
+	height: 120rpx
+	background: #fff
+.btns
+  height: 120rpx
+  width: 100%
+  line-height: 120px
+  display: flex
+  align-items: center
+  justify-content: space-between
+  box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.1)
+
+.btn {
+  width: 45%;
+  height: 80rpx;
+  font-size: 30rpx;
+  border-radius: 8rpx;
+}
+
+.reset-btn {
+  background-color: #D8E9FF;
+  color: #1176FF;
+}
+
+.submit-btn {
+  background-color: #368BFF;
+  color: white;
+}
+</style>
diff --git a/packageB/priority/targetPersonnelChoice.vue b/packageB/priority/targetPersonnelChoice.vue
new file mode 100644
index 0000000..f0bfc28
--- /dev/null
+++ b/packageB/priority/targetPersonnelChoice.vue
@@ -0,0 +1,670 @@
+<template>
+    <AppLayout :title="title" :show-bg-image="false" >
+		<view class="page-container" >
+			<scroll-view :scroll-y="true" class="nearby-scroll" @scrolltolower="scrollBottom" lower-threshold="50">
+				<view class="main-list" :style="getBackgroundStyle('k.png')">
+					<view class="list-top">
+						<view class="list-title">
+							<text>筛选条件</text>
+							<view class="title-line"></view>
+						</view>
+						<view class="title-right button-sp-area">
+							<button class="mini-btn search-box-btn" type="primary" size="mini" @click="handleSearch">查询</button>
+							<button class="mini-btn reset-box-btn" type="default" size="mini" @click="handleReset">重置</button>
+						</view>
+					</view>
+					<view class="search-container">
+					    <view class="search-item">
+					      <text class="label">姓名：</text>
+						  <uni-easyinput v-model="formData.name" placeholder="请输入任务名称"></uni-easyinput>
+					    </view>
+						<view class="search-item">
+						  <text class="label">身份证号：</text>
+						  <uni-easyinput v-model="formData.idCard" placeholder="请输入身份证号"></uni-easyinput>
+						</view>
+						<view class="search-item">
+						  <text class="label">人员标签：</text>
+						  <uni-data-select v-model="formData.tagId" :localdata="personTagOptions" placeholder="请选择人员标签" @change="personTagChange"></uni-data-select>
+						</view>
+						<view class="search-item">
+						  <text class="label">所属区域：</text>
+						  <uni-data-picker ref="picker" class="picker" placeholder="请选择所属区域" popup-title="请选择所属区域" :localdata="regions" v-model="formData.deptTags"
+						  					  @change="onchange" >
+						  </uni-data-picker>
+						  <!-- <uni-data-select v-model="formData.deptTags" :localdata="taskTypeOptions" placeholder="请选择所属区域" @change="onTaskTypeChange"></uni-data-select> -->
+						</view>	
+					</view>
+				</view>
+			
+				<view class="main-list" :style="getBackgroundStyle('k.png')">
+					<view class="list-top">
+						<view class="list-title">
+							<text>目标人员列表</text>
+							<view class="title-line" style="left: 70rpx;"></view>
+						</view>
+						<view class="title-total">
+							目标人数<text class="total-num">{{totalNum}}</text>人
+						</view>
+					</view>
+					<view class="list-box" v-if="dataList.length>0">
+						<view class="con-box" v-for="(item,index) in dataList" :key="index">
+							<view class="form-title">
+								<checkbox :value="item.id" :checked="item.checked" @click="selectItem(item)"/>
+								<view class="form-name">
+									{{item.name}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.idCard">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/person.png'" mode=""></image>
+									<view class="item-label">
+										身份证号：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.idCard}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.phone">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/tele.png'" mode=""></image>
+									<view class="item-label">
+										联系电话：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.phone}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.address">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/base.png'" mode=""></image>
+									<view class="item-label">
+										住址：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.address}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.skills">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/num.png'" mode=""></image>
+									<view class="item-label">
+										技能特长：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.skills}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.tags.length>0">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/date.png'" mode=""></image>
+									<view class="item-label">
+										人员标签：
+									</view>
+								</view>
+								<view class="item-right">
+									<view class="" v-for="(val,num) in item.tags" :key="num">
+										{{val}}
+									</view>
+								</view>
+							</view>
+							<view class="form-item" v-if="item.datasource">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/next.png'" mode=""></image>
+									<view class="item-label">
+										数据来源：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.datasource=== '1' ? '自动识别' : '手动添加'}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.assistStatus">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/help.png'" mode=""></image>
+									<view class="item-label">
+										帮扶状态：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.assistStatus}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.employmentStatus">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/num.png'" mode=""></image>
+									<view class="item-label">
+										就业状态：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.employmentStatus}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.unemploymentDate">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/date.png'" mode=""></image>
+									<view class="item-label">
+										失业时间：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.unemploymentDate}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.unemploymentRegisterDate">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/date.png'" mode=""></image>
+									<view class="item-label">
+										失业登记时间：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.unemploymentRegisterDate}}
+								</view>
+							</view>
+							<view class="form-item" v-if="item.graduateDate">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/next.png'" mode=""></image>
+									<view class="item-label">
+										毕业时间：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.graduateDate}}
+								</view>
+							</view>
+						</view>
+					</view>
+				    <empty v-else pdTop="200"></empty>
+				</view>
+				
+			</scroll-view>
+			<view class="button-group">
+				<view class="btns">
+					<button class="btn submit-btn" @click="handlesubmit">确认选择</button>
+					<button class="btn reset-btn" @click="handleCancel">关闭</button>
+				</view>
+			  
+			</view>
+		</view>
+    </AppLayout>
+</template>
+
+<script setup>
+import { inject, ref, reactive, onMounted } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+const { $api, navTo, navBack } = inject('globalFunction');
+import config from "@/config.js"
+
+const title = ref('');
+const formData = reactive({
+	allocationId:'',
+    name: '',
+	idCard: '',
+	tagId: '',
+	deptTags: '',
+	pageNum: 1,
+	pageSize: 10
+})
+const totalNum=ref(0)
+const dataList=ref([])
+const personDatabaseStatusOptions=ref([])
+const employmentStatusOptions=ref([])
+const personTagOptions=ref([])
+const selectedPersonIds=ref([])
+const baseUrl = config.imgBaseUrl
+const getBackgroundStyle = (imageName) => ({
+    backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
+    backgroundSize: 'cover',      // 覆盖整个容器
+    backgroundPosition: 'center', // 居中
+    backgroundRepeat: 'no-repeat'
+});
+const emit = defineEmits(['update:showVue'])
+// 所属区域选项（可根据实际替换为动态数据）
+const regions = ref([])
+const picker = ref(null)
+function listNotParam(){
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={}
+	$api.myRequest('/dispatch/dept/listNotParam',params,'get',9100,header).then((resData) => {
+		if(resData && resData.code == 200){
+			loadLevelData(resData.data[0].parentId);
+			// resData.data.forEach(item=>{
+			// 	const obj = {
+			// 	    value: item.deptId,
+			// 	    text: item.deptName,
+			// 		ancestors:item.ancestors
+			// 	}
+			// 	executeDeptOptions.value.push(obj)
+			// })
+		}
+	});
+}
+ // 加载某一级的数据（parentId 为空表示根）
+async function loadLevelData(parentId,node) {
+    let header = {
+		'Authorization': uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	};
+	let params = { parentId };
+
+	try {
+		const resData = await $api.myRequest('/dispatch/dept/list', params, 'get', 9100, header);
+		if(resData.data.length==0){
+			picker.value.hide()
+			return
+		}
+		const formatted = (resData.data || []).map(item => ({
+			text: item.deptName, 
+			value: item.tags,
+			deptId: item.deptId,
+			children: [] 
+		}));
+		if(node){
+			injectChildren(parentId, formatted);
+		}else{
+			regions.value=formatted
+		}
+	} catch (error) {
+		console.error("加载部门数据失败:", error);
+		// uni.showToast({ title: '加载失败', icon: 'none' });
+	}
+}
+// 将子级数据注入到对应的父节点
+function injectChildren(parentValue, childrenData) {
+    const findAndInject = (nodes) => {
+		for (let node of nodes) {
+			if (node.deptId === parentValue) {
+				// 如果 children 已存在且非空，避免重复加载
+				if (!node.children || node.children.length === 0) {
+					node.children = childrenData;
+				}
+				return true;
+			}
+			if (node.children && node.children.length > 0) {
+				if (findAndInject(node.children)) return true;
+			}
+		}
+		return false;
+	}
+
+	findAndInject(regions.value);
+  // 强制更新
+}
+// 当用户选择时触发（注意：change 在每级选择后都会触发）
+function onchange(e) {
+	const selectedValues = e.detail.value;
+	// formData.deptId=selectedValues.map(item => item.value).join(',');
+	if (selectedValues.length === 0) return;
+	// 获取最后一级选中的 value
+	const lastSelectedValue = selectedValues[selectedValues.length - 1];
+	// 查找该节点是否有 children，如果没有则尝试加载
+	const node = findNodeByValue(regions.value, lastSelectedValue);
+	if (node && (!node.children || node.children.length === 0)) {
+		// 检查接口是否还有下一级（可通过接口返回判断，或先尝试加载）
+		// 这里我们直接尝试加载下一级
+		loadLevelData(node.deptId , node);
+		picker.value.show()
+	}
+}
+// 工具函数：根据 value 查找节点
+function findNodeByValue(nodes, value) {
+	for (let node of nodes) {
+		if (node.value === value.value) {
+			return node;
+		}
+		if (node.children && node.children.length > 0) {
+			const found = findNodeByValue(node.children, value);
+			if (found) return found;
+		}
+	}
+	return null;
+}
+function getDictionary(){
+	$api.myRequest('/system/public/dict/data/type/person_database_status').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				personDatabaseStatusOptions.value.push(obj)
+			})
+		}
+	});
+	$api.myRequest('/system/public/dict/data/type/assist_employment_status').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				employmentStatusOptions.value.push(obj)
+			})
+		}
+	});
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={}
+	$api.myRequest('/dispatch/assist/person/tag/list',params,'get',9100,header).then((resData) => {
+		console.log("res",resData)
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.id,
+				    text: item.name
+				}
+				personTagOptions.value.push(obj)
+			})
+		}
+	});
+}
+function getabelByValue(value,arr) {
+	if (!Array.isArray(arr.value)) {
+	    return ''
+	}
+	const item = arr.value.find(item => item.value === String(value))
+	return item ? item.text : '暂无'
+}
+const handleCancel = () => {
+	uni.navigateBack();
+	// emit('update:showVue', {
+	//     showVue: 'main',
+	//     selectedPersonIds: []
+	// });
+	// emit('update:showVue', 'main')
+}
+function handleSearch(){
+	dataList.value=[]
+	getDataList()
+}
+function handleReset(){
+	formData.allocationId=''
+	formData.name=''
+	formData.idCard=''
+	formData.tagId=''
+	formData.deptTags=''
+	formData.pageNum=1
+	formData.pageSize=10
+	dataList.value=[]
+	getDataList()
+}
+function getDataList(){
+	let url=''
+	if(formData.allocationId){
+		url='/dispatch/assist/person/database/pageAllocatePersonList'
+	}else{
+		url='/dispatch/assist/person/database/pageList'
+	}
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	$api.myRequest(url,formData,'get',9100,header).then((resData) => {
+		resData.rows.forEach(item=>{
+			item.tags=item.tagName.split(',')
+			item.assistStatus=getabelByValue(item.assistStatus,personDatabaseStatusOptions)
+			item.employmentStatus=getabelByValue(item.employmentStatus,employmentStatusOptions)
+			item.checked = false; // 添加这一行
+		})
+		totalNum.value=resData.total
+		dataList.value=dataList.value.concat(resData.rows)
+		
+	});
+}
+function selectItem(item) {
+	const id = item.id; // 假设每条数据有唯一 id 字段
+    item.checked = !item.checked;
+  
+    if (item.checked) {
+      // 如果选中，加入数组（去重）
+      if (!selectedPersonIds.value.includes(id)) {
+        selectedPersonIds.value.push(id);
+      }
+    } else {
+      // 如果取消选中，从数组中移除
+      selectedPersonIds.value = selectedPersonIds.value.filter(v => v !== id);
+    }
+}
+// 获取选中的数据
+function handlesubmit() {
+	uni.$emit('choicePerson', selectedPersonIds.value);
+	uni.navigateBack();
+	// emit('update:showVue', {
+	//     showVue: 'main',
+	//     selectedPersonIds: selectedPersonIds.value
+	// });
+}
+function personTagChange(e){
+	formData.tagId=e
+}
+function scrollBottom(){
+	if(formData.pageNum<totalNum.value/formData.pageSize){
+		formData.pageNum++
+		getDataList()
+	}
+}
+onLoad((options) => {
+	listNotParam()
+	if(options.allocationId){
+		formData.allocationId=options.allocationId
+	}
+	runAsyncTasks()
+});
+const runAsyncTasks = async () => {
+  await getDictionary()
+  await getDataList()
+}
+
+</script>
+
+<style lang="stylus" scoped>
+image
+  height: 100%
+  width: 100%
+.page-container {
+  display: flex;
+  flex-direction: column;
+  height: calc(100vh - var(--window-top)); /* 如果 AppLayout 有 header，需减去 */
+  padding-bottom: 140rpx
+  /* 或者简单用：height: 100vh; */
+}
+.nearby-scroll
+    // 使用flex布局让scroll-view自适应高度，占据剩余空间
+  flex: 1
+  // overflow: hidden;
+.task-box
+  display: flex
+  align-items: center
+.task-label
+  font-size: 30rpx
+  color: #6E7E9B
+.task-name
+  font-weight: bold
+  font-size: 30rpx
+  color: #3D61AC
+.main-list
+  background-color: #ffffff
+  padding: 20rpx 20rpx 28rpx 20rpx
+  margin: 30rpx 30rpx
+  box-shadow: 0px 3px 20px 0px rgba(0,105,234,0.1)
+  border-radius: 12px
+.list-top
+  display: flex
+  align-items: center
+  justify-content: space-between
+.list-title
+  font-weight: bold
+  font-size: 36rpx
+  color: #404040
+  position: relative
+
+.title-line
+  position: absolute
+  bottom: -10rpx
+  left: 70rpx
+  width: 70rpx
+  height: 8rpx
+  background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%)
+  border-radius: 4rpx
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+
+.list-box
+  margin-top: 40rpx
+
+:deep(.uni-forms-item__label)
+  width: 194rpx !important
+  font-size: 28rpx;
+  color: #404040;
+  
+.search-container
+  padding: 20rpx 0rpx 0rpx 0rpx
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+.search-item
+  display: flex
+  align-items: center
+  margin-bottom: 30rpx
+
+.label
+  width: 160rpx
+  font-size: 28rpx
+  color: #404040
+  flex-shrink: 0
+
+.input,
+.picker
+  background: #FFFFFF
+  flex: 1
+  min-width: 0
+.search-box-btn
+  border-radius: 32rpx !important
+  background: #3088FF !important
+  margin-right: 16rpx
+.reset-box-btn
+  border-radius: 32rpx !important
+  background: #02B44D
+  color: #fff
+.con-box
+  background: #fff
+  padding: 20rpx
+  box-shadow: 0px 0px 6rpx 0px rgba(0,71,200,0.16)
+  border-radius: 24rpx
+  border: 1rpx solid #EDF5FF
+  margin-top: 30rpx
+.form-title
+  display: flex
+  align-items: center
+
+.form-name
+  font-weight: bold
+  font-size: 30rpx
+  color: #595959
+  margin-right:16rpx
+.form-type
+  border-radius: 8rpx;
+  border: 2rpx solid #FF7D26;
+  font-size: 24rpx
+  color: #F1690E
+  padding: 4rpx 10rpx
+.form-item
+  display: flex
+  align-items: center
+  justify-content: space-between
+  margin-top: 30rpx
+.item-left
+  display: flex
+  align-items: center
+.item-img
+  width: 26rpx
+  height: 26rpx
+  margin-right: 10rpx
+.item-label
+  font-size: 26rpx
+  color: #B3B3B3
+  width: 190rpx
+.item-right
+  font-size: 26rpx
+  color: #737373
+  // overflow: hidden
+  // text-overflow: ellipsis
+  // white-space: nowrap
+  word-wrap: break-word
+  overflow-wrap: break-word
+  white-space: normal
+.form-btns
+  margin-top:30rpx
+.form-box-btn
+  border-radius: 50rpx !important
+  margin-right: 24rpx
+  padding: 0rpx 40rpx
+.detail-btn
+  background: #EDF5FF
+  border: 1px solid #3088FF
+  font-size: 28rpx
+  color: #3088FF
+.follow-btn
+  background: #EEF9F3
+  border: 1px solid #00933E
+  font-size: 28rpx
+  color: #00933E
+.recommend-btn
+  background: linear-gradient(92deg, #0DCCFF 0%, #4760FF 100%)
+  font-size: 28rpx
+  color: #FFFFFF
+.button-group
+	position: fixed
+	bottom: 0
+	left: 0
+	width: 100%
+	height: 120rpx
+	background: #fff
+.btns
+  height: 120rpx
+  width: 100%
+  line-height: 120px
+  display: flex
+  align-items: center
+  justify-content: space-between
+  box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.1)
+.btn {
+  width: 45%;
+  height: 80rpx;
+  font-size: 30rpx;
+  border-radius: 8rpx;
+}
+
+.reset-btn {
+  background-color: #D8E9FF;
+  color: #1176FF;
+}
+
+.submit-btn {
+  background-color: #368BFF;
+  color: white;
+}
+</style>
diff --git a/packageB/priority/taskAssignment.vue b/packageB/priority/taskAssignment.vue
new file mode 100644
index 0000000..47e332f
--- /dev/null
+++ b/packageB/priority/taskAssignment.vue
@@ -0,0 +1,555 @@
+<template>
+    <AppLayout :title="title" :show-bg-image="false" >
+		<view class="page-container">
+			<scroll-view :scroll-y="true" class="nearby-scroll" @scrolltolower="scrollBottom" lower-threshold="50">
+				<view class="info-box">
+					<view class="info-item info-line">
+						<view class="">
+							<uni-icons type="contact" color="#175CE9" size="34"></uni-icons>
+						</view>
+						<view class="info-label">
+							帮扶任务总数
+						</view>
+						<view class="info-value">
+							{{ stats.taskCount }}
+						</view>
+					</view>
+					<view class="info-item info-line">
+						<view class="">
+							<uni-icons type="info" color="#175CE9" size="34"></uni-icons>
+						</view>
+						<view class="info-label">
+							待分配任务
+						</view>
+						<view class="info-value">
+							{{ stats.pendingCount }}
+						</view>
+					</view>
+					<view class="info-item">
+						<view class="">
+							<uni-icons type="checkbox" color="#175CE9" size="34"></uni-icons>
+						</view>
+						<view class="info-label">
+							已分配任务
+						</view>
+						<view class="info-value">
+							{{ stats.allocatedCount }}
+						</view>
+					</view>
+				</view>
+				<view class="main-list" :style="getBackgroundStyle('k.png')">
+					<view class="list-top">
+						<view class="list-title">
+							<text>筛选条件</text>
+							<view class="title-line"></view>
+						</view>
+						<view class="title-right button-sp-area">
+							<button class="mini-btn search-box-btn" type="primary" size="mini" @click="handleSearch">查询</button>
+							<button class="mini-btn reset-box-btn" type="default" size="mini" @click="handleReset">重置</button>
+						</view>
+					</view>
+					<view class="search-container">
+						<!-- 人员姓名 -->
+						<view class="search-item">
+						  <text class="label">任务名称：</text>
+						  <uni-easyinput v-model="formData.taskName" placeholder="请输入任务名称"></uni-easyinput>
+						</view>
+						<!-- 任务类型 -->
+						<view class="search-item">
+						  <text class="label">任务类型：</text>
+						  <uni-data-select :key="1" v-model="formData.taskType" :localdata="taskTypeOptions" placeholder="请选择任务类型" @change="onTaskTypeChange"></uni-data-select>
+						</view>
+						<!-- 优先级 -->
+						<view class="search-item">
+						  <text class="label">优先级：</text>
+						  <uni-data-select :key="2" v-model="formData.priority" :localdata="priorityOptions" placeholder="请选择优先级" @change="onPriorityChange"></uni-data-select>
+						</view>
+						<!-- 创建时间 -->
+						<view class="search-item">
+						  <text class="label">创建时间：</text>
+						  <uni-datetime-picker v-model="filterTimeRange" type="datetimerange" rangeSeparator="至" @change="filterTimeRangeChange" />
+						</view>	
+						<!-- 分配状态 -->
+						<view class="search-item">
+						  <text class="label">分配状态：</text>
+						  <uni-data-select :key="3" v-model="formData.allocationStatus" :localdata="allocationStatusOptions" placeholder="请选择分配状态" @change="onAllocationStatusChange"></uni-data-select>
+						</view>
+						<!-- 执行区域 -->
+						<view class="search-item">
+						  <text class="label">执行区域：</text>
+						  <uni-data-select :key="4" v-model="formData.executeDeptId" :localdata="executeDeptOptions" placeholder="请选择区域" @change="onExecuteDeptChange"></uni-data-select>
+						</view>
+					</view>
+				</view>
+				<view class="main-list" :style="getBackgroundStyle('k.png')">
+					<view class="">
+						<button class="mini-btn search-box-btn" type="primary" size="mini" @click="creatTask">创建任务</button>
+					</view>
+				</view>
+			
+				<view class="main-list" :style="getBackgroundStyle('k.png')">
+					<view class="list-top">
+						<view class="list-title">
+							<text>帮扶任务列表</text>
+							<view class="title-line" style="left: 70rpx;"></view>
+						</view>
+						<view class="title-total">
+							共<text class="total-num">{{totalNum}}</text>条记录
+						</view>
+					</view>
+					<view class="list-box" v-if="dataList.length>0">
+						<view class="con-box" v-for="(item,index) in dataList" :key="index">
+							<view class="form-title">
+								<view class="form-name">
+									{{item.taskName}}
+								</view>
+								<view class="form-type">
+									优先级：{{item.priority}}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/person.png'" mode=""></image>
+									<view class="item-label">
+										目标人数：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.taskAllocation.goalPersonCount}}
+								</view>
+							</view>
+							<view class="form-item">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/num.png'" mode=""></image>
+									<view class="item-label">
+										任务类型：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.taskType}}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/date.png'" mode=""></image>
+									<view class="item-label">
+										分配状态：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.taskAllocation.allocationStatus}}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/base.png'" mode=""></image>
+									<view class="item-label">
+										执行区域：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.taskAllocation.executeDeptName}}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/next.png'" mode=""></image>
+									<view class="item-label">
+										创建时间：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.createTime}}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/next.png'" mode=""></image>
+									<view class="item-label">
+										截止时间：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.taskAllocation.deadline}}
+								</view>
+							</view>
+							<view class="form-btns">
+								<button class="mini-btn form-box-btn detail-btn"  size="mini" @click="goDetail(item)">详情</button>
+								<button class="mini-btn form-box-btn follow-btn"  size="mini" @click="goTarget(item)">目标人员</button>
+								<button class="mini-btn form-box-btn recommend-btn" v-if="item.taskAllocation.allocationStatus == '待分配'"  size="mini" @click="goRecommend(item)">分配</button>
+							</view>
+						</view>
+					</view>
+				    <empty v-else pdTop="200"></empty>
+				</view>
+			</scroll-view>
+		</view>
+
+    </AppLayout>
+</template>
+
+<script setup>
+import { inject, ref, reactive } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+const { $api, navTo, navBack } = inject('globalFunction');
+import config from "@/config.js"
+
+const title = ref('');
+const stats=ref({})
+const formData = reactive({
+    taskName: '',
+    taskType: '',
+    priority: '',
+    createTimeStart: null,
+    createTimeEnd: null,
+    allocationStatus: '',
+    executeDeptId: '',
+    pageNum: 1,
+    pageSize: 10
+})
+const currentItem=ref('')
+const taskName=ref('')
+const filterTimeRange=ref([])
+const totalNum=ref(0)
+const dataList=ref([])
+const taskTypeOptions=ref([])
+const priorityOptions=ref([])
+const allocationStatusOptions=ref([])
+const executeDeptOptions=ref([])
+const baseUrl = config.imgBaseUrl
+const getBackgroundStyle = (imageName) => ({
+    backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
+    backgroundSize: 'cover',      // 覆盖整个容器
+    backgroundPosition: 'center', // 居中
+    backgroundRepeat: 'no-repeat'
+});
+function listNotParam(){
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={}
+	$api.myRequest('/dispatch/dept/listNotParam',params,'get',9100,header).then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.deptId,
+				    text: item.deptName,
+					ancestors:item.ancestors
+				}
+				executeDeptOptions.value.push(obj)
+			})
+		}
+	});
+}
+function statisticTask(){
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={}
+	$api.myRequest('/dispatch/assist/task/statisticTask',params,'get',9100,header).then((resData) => {
+		stats.value=resData.data
+	});
+}
+function getDictionary(){
+	$api.myRequest('/system/public/dict/data/type/assist_task_type').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				taskTypeOptions.value.push(obj)
+			})
+		}
+	});
+	$api.myRequest('/system/public/dict/data/type/assist_task_priority').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				priorityOptions.value.push(obj)
+			})
+		}
+	});
+	$api.myRequest('/system/public/dict/data/type/assist_task_allocation_status').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				allocationStatusOptions.value.push(obj)
+			})
+		}
+	});
+}
+function getabelByValue(value,arr) {
+	if (!Array.isArray(arr.value)) {
+	    return ''
+	}
+	const item = arr.value.find(item => item.value === String(value))
+	return item ? item.text : '暂无'
+}
+function onTaskTypeChange(e){
+	formData.taskType=e
+}
+function onPriorityChange(e){
+	formData.priority=e
+}
+function onAllocationStatusChange(e){
+	formData.allocationStatus=e
+}
+function filterTimeRangeChange(e){
+	formData.createTimeStart=e[0]
+	formData.createTimeEnd=e[1]
+}
+function onExecuteDeptChange(e){
+	formData.executeDeptId=e
+}
+function handleSearch(){
+	dataList.value=[]
+	getDataList()
+}
+function getDataList(){
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	$api.myRequest('/dispatch/assist/task/pageList',formData,'get',9100,header).then((resData) => {
+		resData.rows.forEach(item=>{
+			item.priority=getabelByValue(item.priority,priorityOptions)
+			item.taskType=getabelByValue(item.taskType,taskTypeOptions)
+			item.taskAllocation.allocationStatus=getabelByValue(item.taskAllocation.allocationStatus,allocationStatusOptions)
+		})
+		totalNum.value=resData.total
+		dataList.value=dataList.value.concat(resData.rows)
+		
+	});
+}
+const handleReset = () => {
+	dataList.value=[]
+	formData.taskName=''
+	formData.taskType=''
+	formData.priority=''
+	formData.createTimeStart=null
+	formData.createTimeEnd=null
+	formData.allocationStatus=''
+	formData.executeDeptId=''
+	formData.pageNum=1
+	formData.pageSize=10
+	filterTimeRange.value=[]
+	getDataList()
+}
+const creatTask = () => {
+	navTo('/packageB/priority/taskCreated');
+}
+function goRecommend(item){
+	navTo('/packageB/priority/allocate?id='+item.id);
+}
+function goDetail(item){
+	navTo('/packageB/priority/taskDetail?item='+JSON.stringify(item)+'&url=taskAssignment');
+}
+function goTarget(item){
+	navTo('/packageB/priority/targetPersonnel?id='+item.taskAllocation.id+'&taskName='+item.taskName);
+}
+function scrollBottom(){
+	if(formData.pageNum<totalNum.value/formData.pageSize){
+		formData.pageNum++
+		getDataList()
+	}
+}
+onLoad((options) => {
+	listNotParam()
+	statisticTask()
+	runAsyncTasks(options)
+});
+const runAsyncTasks = async (options) => {
+  await getDictionary()
+  await getDataList()
+}
+
+</script>
+
+<style lang="stylus" scoped>
+image
+  height: 100%
+  width: 100%
+.page-container {
+  display: flex;
+  flex-direction: column;
+  height: calc(100vh - var(--window-top)); /* 如果 AppLayout 有 header，需减去 */
+  /* 或者简单用：height: 100vh; */
+}
+.nearby-scroll
+    // 使用flex布局让scroll-view自适应高度，占据剩余空间
+  flex: 1
+  // overflow: hidden;
+.info-box
+  margin: 30rpx 30rpx
+  background: linear-gradient(0deg, #D9ECFF 0%, #F0F7FF 100%)
+  border-radius: 20rpx
+  padding: 40rpx 0
+  display: flex
+  align-items: center
+.info-line
+  border-right: 2rpx solid #B7D6FF
+.info-item
+  display: flex
+  flex-direction: column
+  align-items: center
+  justify-content: center
+  width: 50%
+.info-label
+  font-size: 26rpx
+  color: #6E7E9B
+  margin-bottom: 20rpx
+.info-value
+  font-weight: bold
+  font-size: 28rpx
+  color: #3D61AC
+.main-list
+  background-color: #ffffff
+  padding: 20rpx 20rpx 28rpx 20rpx
+  margin: 30rpx 30rpx
+  box-shadow: 0px 3px 20px 0px rgba(0,105,234,0.1)
+  border-radius: 12px
+.list-top
+  display: flex
+  align-items: center
+  justify-content: space-between
+.list-title
+  font-weight: bold
+  font-size: 36rpx
+  color: #404040
+  position: relative
+
+.title-line
+  position: absolute
+  bottom: -10rpx
+  left: 70rpx
+  width: 70rpx
+  height: 8rpx
+  background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%)
+  border-radius: 4rpx
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+
+.list-box
+  margin-top: 40rpx
+
+:deep(.uni-forms-item__label)
+  width: 194rpx !important
+  font-size: 28rpx;
+  color: #404040;
+  
+.search-container
+  padding: 20rpx 0rpx 0rpx 0rpx
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+.search-item
+  display: flex
+  align-items: center
+  margin-bottom: 30rpx
+
+.label
+  width: 160rpx
+  font-size: 28rpx
+  color: #404040
+  flex-shrink: 0
+
+.input,
+.picker
+  background: #FFFFFF
+  flex: 1
+  min-width: 0
+.search-box-btn
+  border-radius: 32rpx !important
+  background: #3088FF !important
+  margin-right: 16rpx
+.reset-box-btn
+  border-radius: 32rpx !important
+  background: #02B44D
+  color: #fff
+.con-box
+  background: #fff
+  padding: 20rpx
+  box-shadow: 0px 0px 6rpx 0px rgba(0,71,200,0.16)
+  border-radius: 24rpx
+  border: 1rpx solid #EDF5FF
+  margin-top: 30rpx
+.form-title
+  display: flex
+  align-items: center
+
+.form-name
+  font-weight: bold
+  font-size: 32rpx
+  color: #595959
+  margin-right:16rpx
+.form-type
+  border-radius: 8rpx;
+  border: 2rpx solid #FF7D26;
+  font-size: 24rpx
+  color: #F1690E
+  padding: 4rpx 10rpx
+.form-item
+  display: flex
+  align-items: center
+  justify-content: space-between
+  margin-top: 30rpx
+.item-left
+  display: flex
+  align-items: center
+.item-img
+  width: 26rpx
+  height: 26rpx
+  margin-right: 10rpx
+.item-label
+  font-size: 26rpx
+  color: #B3B3B3
+  width: 130rpx
+.item-right
+  font-size: 26rpx
+  color: #737373
+  overflow: hidden
+  text-overflow: ellipsis
+  white-space: nowrap
+.form-btns
+  margin-top:30rpx
+.form-box-btn
+  border-radius: 50rpx !important
+  margin-right: 24rpx
+  padding: 0rpx 40rpx
+.detail-btn
+  background: #EDF5FF
+  border: 1px solid #3088FF
+  font-size: 28rpx
+  color: #3088FF
+.follow-btn
+  background: #EEF9F3
+  border: 1px solid #00933E
+  font-size: 28rpx
+  color: #00933E
+.recommend-btn
+  background: linear-gradient(92deg, #0DCCFF 0%, #4760FF 100%)
+  font-size: 28rpx
+  color: #FFFFFF
+</style>
diff --git a/packageB/priority/taskCreated.vue b/packageB/priority/taskCreated.vue
new file mode 100644
index 0000000..77cde0d
--- /dev/null
+++ b/packageB/priority/taskCreated.vue
@@ -0,0 +1,344 @@
+<template>
+    <AppLayout :title="title" :show-bg-image="false" >
+        <view class="main-list" :style="getBackgroundStyle('k.png')">
+			<view class="list-top">
+				<view class="list-title">
+					<text>创建任务</text>
+					<view class="title-line"></view>
+				</view>
+			</view>
+            <view class="form-container">
+                <uni-forms ref="formRef" v-model="formData" :rules="rules" validate-trigger="submit" >
+                  <uni-forms-item label="任务名称：" name="taskName" required >
+					  <uni-easyinput v-model="formData.taskName" placeholder="请输入任务名称"></uni-easyinput>
+                  </uni-forms-item>
+                  <uni-forms-item label="任务类型：" name="taskType" required >
+					  <uni-data-select v-model="formData.taskType" placeholder="请选择任务类型" :localdata="taskTypeOptions" @change="taskTypeChange"></uni-data-select>
+                  </uni-forms-item>
+				  <uni-forms-item label="优先级：" name="priority" required >
+				  	   <uni-data-select v-model="formData.priority" placeholder="请选择优先级" :localdata="priorityOptions" @change="priorityChange"></uni-data-select>
+				  </uni-forms-item>
+				  <uni-forms-item label="目标人员："  required >
+				  	   <button class="choice-btn" @click="choicePerson">从帮扶人员库选择目标人员</button>
+				  </uni-forms-item>
+				  <uni-forms-item label="目标人数：" name="taskAllocation.goalPersonCount" required>
+				  		<uni-easyinput v-model="formData.taskAllocation.goalPersonCount" disabled></uni-easyinput>
+				  </uni-forms-item>
+				  <uni-forms-item label="执行区域：" name="taskAllocation.executeDeptId" required >
+				  	  <uni-data-select v-model="formData.taskAllocation.executeDeptId" placeholder="请选择执行区域" :localdata="executeDeptOptions" @change="executeDeptChange"></uni-data-select>
+				  </uni-forms-item>
+				  <uni-forms-item label="截止时间：" name="taskAllocation.deadline" required>
+				  		<uni-datetime-picker class="picker-value" type="date" placeholder="请选择截止时间"  v-model="formData.taskAllocation.deadline" @change="onDateChange" />
+				  </uni-forms-item>
+                  <uni-forms-item label="分配说明：" name="allocationNote" >
+					  <uni-easyinput type="textarea" v-model="formData.taskAllocation.allocationNote" placeholder="请输入分配说明"></uni-easyinput>
+                  </uni-forms-item>
+                </uni-forms>
+                <!-- 按钮组 -->
+                <view class="button-group">
+				  <button class="btn submit-btn" @click="handleSubmit">确定</button>
+                  <button class="btn reset-btn"  @click="handleCancel">取消</button>
+                </view>
+			</view>
+        </view>
+    </AppLayout>
+</template>
+
+<script setup>
+import { inject, ref, reactive } from 'vue';
+import { onLoad,onShow } from '@dcloudio/uni-app';
+const { $api, navTo, navBack } = inject('globalFunction');
+import config from "@/config.js"
+
+const title = ref('');
+const taskTypeOptions=ref([])
+const priorityOptions=ref([])
+const executeDeptOptions=ref([])
+const formData = reactive({
+	taskName: '',
+	taskType: '',
+	priority: '',
+	taskAllocation: {
+	  goalPersonCount: null,
+	  executeDeptId: '',
+	  executeDeptName: '',
+	  executeDeptAncestors: '',
+	  allocationStatus: '1',
+	  allocationNote: '',
+	  deadline: null,
+	  goalPersonList: []
+	}
+})
+// 表单引用
+const formRef = ref(null)
+// 校验规则
+const rules = {
+	taskName: {
+		rules: [{
+			required: true,
+			errorMessage: '请填写任务名称'
+		}]
+	},
+	taskType: {
+		rules: [{
+			required: true,
+			errorMessage: '请选择任务类型'
+		}]
+	},
+	priority: {
+		rules: [{
+			required: true,
+			errorMessage: '请选择优先级'
+		}]
+	},
+	'taskAllocation.goalPersonCount': {
+		rules: [{
+			required: true,
+			errorMessage: '请选择目标人员'
+		}]
+	},
+	'taskAllocation.executeDeptId': {
+		rules: [{
+			required: true,
+			errorMessage: '请选择执行区域'
+		}]
+	},
+	'taskAllocation.deadline':{
+		rules: [{
+			required: true,
+			errorMessage: '请选择截止时间'
+		}]
+	},
+}
+const baseUrl = config.imgBaseUrl
+const getBackgroundStyle = (imageName) => ({
+    backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
+    backgroundSize: 'cover',      // 覆盖整个容器
+    backgroundPosition: 'center', // 居中
+    backgroundRepeat: 'no-repeat'
+});
+function choicePerson(){
+	navTo('/packageB/priority/targetPersonnelChoice');
+}
+function getDictionary(){
+	$api.myRequest('/system/public/dict/data/type/assist_task_type').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				taskTypeOptions.value.push(obj)
+			})
+		}
+	});
+	$api.myRequest('/system/public/dict/data/type/assist_task_priority').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				priorityOptions.value.push(obj)
+			})
+		}
+	});
+}
+function listNotParam(){
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={}
+	$api.myRequest('/dispatch/dept/listNotParam',params,'get',9100,header).then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.deptId,
+				    text: item.deptName,
+					ancestors:item.ancestors
+				}
+				executeDeptOptions.value.push(obj)
+			})
+		}
+	});
+}
+// 事件处理
+function onDateChange(e){
+	console.log("e",e)
+	formData.taskAllocation.deadline=e
+}
+function taskTypeChange(e){
+	formData.taskType=e
+}
+function priorityChange(e){
+	formData.priority=e
+}
+function executeDeptChange(e){
+	formData.taskAllocation.executeDeptId=e
+	formData.taskAllocation.executeDeptName=getLabelByValue(e,executeDeptOptions.value)
+	formData.taskAllocation.executeDeptAncestors=getAncestorsByValue(e,executeDeptOptions.value)
+}
+function getLabelByValue(value,arr) {
+	if (!Array.isArray(arr)) {
+	    return ''
+	}
+	
+	const item = arr.find(item => item.value === value)
+	return item ? item.text : '暂无'
+}
+function getAncestorsByValue(value,arr){
+	if (!Array.isArray(arr)) {
+	    return ''
+	}
+	
+	const item = arr.find(item => item.value === value)
+	return item ? item.ancestors : ''
+}
+function normalizePersonData(dataList) {
+  if (!Array.isArray(dataList)) return [];
+  return dataList.map(obj => {
+    const fullValue = obj;
+    return {
+      personId: String(fullValue) // 确保转为字符串，防止意外类型
+    };
+  });
+}
+const handleSubmit = () => {
+  formRef.value?.validate()
+    .then(() => {
+		let header={
+			'Authorization':uni.getStorageSync('Padmin-Token')
+		}
+		$api.myRequest('/dispatch/assist/task/add', formData,'post',9100,header).then((resData) => {
+			if(resData && resData.code == 200){
+				handleCancel()
+				uni.showToast({
+				  title: '创建成功',
+				  icon: 'success',
+				  duration: 2000 
+				});
+			}else{
+				uni.showToast({
+				  title: resData.msg,
+				  icon: 'none',
+				  duration: 2000
+				});
+			}
+			
+		});
+    })
+    .catch((errors) => {
+      console.log('校验失败:', errors);
+    });
+};
+
+const handleCancel = () => {
+	formData.taskName=''
+	formData.taskType=''
+	formData.priority=''
+	formData.taskAllocation.goalPersonCount=null
+	formData.taskAllocation.executeDeptId=''
+	formData.taskAllocation.executeDeptName=''
+	formData.taskAllocation.executeDeptAncestors=''
+	formData.taskAllocation.allocationStatus='1'
+	formData.taskAllocation.allocationNote=''
+	formData.taskAllocation.deadline=null
+	formData.taskAllocation.goalPersonList=[]
+	uni.redirectTo({
+		url:'/packageB/priority/taskAssignment'
+	})
+}
+onLoad((options) => {
+	listNotParam()
+	getDictionary()
+});
+onShow(()=>{
+	uni.$on('choicePerson', handleBackData);
+})
+// 定义监听回调
+const handleBackData = (data) => {
+  formData.taskAllocation.goalPersonList=normalizePersonData(data)
+  formData.taskAllocation.goalPersonCount=data.length
+};
+
+
+</script>
+
+<style lang="stylus" scoped>
+image
+  height: 100%
+  width: 100%
+.main-list
+  background-color: #ffffff
+  padding: 20rpx 20rpx 28rpx 20rpx
+  margin: 30rpx 30rpx
+  box-shadow: 0px 3px 20px 0px rgba(0,105,234,0.1)
+  border-radius: 12px
+.list-top
+  display: flex
+  align-items: center
+  justify-content: space-between
+.list-title
+  font-weight: bold
+  font-size: 36rpx
+  color: #404040
+  position: relative
+
+.title-line
+  position: absolute
+  bottom: -10rpx
+  left: 70rpx
+  width: 70rpx
+  height: 8rpx
+  background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%)
+  border-radius: 4rpx
+
+.input,
+.picker
+  flex: 1
+
+.picker-value
+  color: #666
+  
+.form-container
+  margin-top: 30rpx
+:deep(.uni-forms-item__label)
+  width: 194rpx !important
+  font-size: 28rpx;
+  color: #404040;
+
+.button-group {
+  display: flex;
+  justify-content: space-between;
+  padding: 40rpx 20rpx 20rpx;
+}
+
+.btn {
+  width: 45%;
+  height: 80rpx;
+  font-size: 30rpx;
+  border-radius: 8rpx;
+}
+
+.reset-btn {
+  background-color: #D8E9FF;
+  color: #1176FF;
+}
+
+.submit-btn {
+  background-color: #368BFF;
+  color: white;
+}
+.choice-btn{
+	width: 100%;
+	height: 70rpx;
+	font-size: 28rpx;
+	border-radius: 8rpx;
+	background-color: #368BFF;
+	color: white;
+	margin-left: 0;
+}
+:deep(.uni-easyinput__content)
+  background: rgba(0,0,0,0) !important
+</style>
diff --git a/packageB/priority/taskDetail.vue b/packageB/priority/taskDetail.vue
new file mode 100644
index 0000000..ffe9ea0
--- /dev/null
+++ b/packageB/priority/taskDetail.vue
@@ -0,0 +1,470 @@
+<template>
+    <AppLayout :title="title" :show-bg-image="false" >
+        <view class="main-list" :style="getBackgroundStyle('k.png')">
+			<view class="list-top">
+				<view class="list-title">
+					<text>帮扶任务详情</text>
+					<view class="title-line"></view>
+				</view>
+			</view>
+            <view class="form-container">
+				<view class="form-item">
+					<view class="item-label">
+						任务名称：
+					</view>
+					<view class="item-value">
+						{{formData.taskName}}
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label">
+						任务类型：
+					</view>
+					<view class="item-value">
+						{{formData.taskType}}
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label">
+						优先级：
+					</view>
+					<view class="item-value">
+						{{formData.priority}}
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label">
+						目标人数：
+					</view>
+					<view class="item-value">
+						{{formData.taskAllocation.goalPersonCount}}人
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label">
+						分配区域：
+					</view>
+					<view class="item-value" v-if="isAssignment" >
+						{{formData.taskAllocation.allocationByDeptName}}
+					</view>
+					<view class="item-value" v-else >
+						{{formData.taskAllocation.executeDeptName}}
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label">
+						创建时间：
+					</view>
+					<view class="item-value">
+						{{formData.createTime}}
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label">
+						截止时间：
+					</view>
+					<view class="item-value">
+						{{formData.taskAllocation.deadline}}
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label">
+						分配状态：
+					</view>
+					<view class="item-value">
+						{{formData.taskAllocation.allocationStatus}}
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="item-label">
+						分配说明：
+					</view>
+					<view class="item-value">
+						{{formData.taskAllocation.allocationNote?formData.taskAllocation.allocationNote:'暂无'}}
+					</view>
+				</view>
+			</view>
+        </view>
+		<view class="main-list" :style="getBackgroundStyle('k.png')" v-if="isAssignment">
+			<view class="list-top">
+				<view class="list-title">
+					<text>分配列表</text>
+					<view class="title-line" style="left: 70rpx;"></view>
+				</view>
+				<view class="title-total">
+					共<text class="total-num">{{allocationList.length}}</text>条记录
+				</view>
+			</view>
+			<view class="list-box" v-if="allocationList.length>0">
+				<view class="con-box" v-for="(item,index) in allocationList" :key="index">
+					<view class="form-item mb-30" >
+						<view class="item-left">
+							<image class="item-img" :src="baseUrl+'/dispatch/person.png'" mode=""></image>
+							<view class="item-label1">
+								目标人数：
+							</view>
+						</view>
+						<view class="item-right">
+							{{item.goalPersonCount}}
+						</view>
+					</view>
+					<view class="form-item mb-30" >
+						<view class="item-left">
+							<image class="item-img" :src="baseUrl+'/dispatch/person.png'" mode=""></image>
+							<view class="item-label1">
+								分配人：
+							</view>
+						</view>
+						<view class="item-right">
+							{{item.allocationByName}}
+						</view>
+					</view>
+					<view class="form-item mb-30" >
+						<view class="item-left">
+							<image class="item-img" :src="baseUrl+'/dispatch/base.png'" mode=""></image>
+							<view class="item-label1">
+								分配区域：
+							</view>
+						</view>
+						<view class="item-right">
+							{{item.allocationByDeptName}}
+						</view>
+					</view>
+					<view class="form-item mb-30" >
+						<view class="item-left">
+							<image class="item-img" :src="baseUrl+'/dispatch/next.png'" mode=""></image>
+							<view class="item-label1">
+								分配时间：
+							</view>
+						</view>
+						<view class="item-right">
+							{{item.allocationTime}}
+						</view>
+					</view>
+					<view class="form-item mb-30" >
+						<view class="item-left">
+							<image class="item-img" :src="baseUrl+'/dispatch/base.png'" mode=""></image>
+							<view class="item-label1">
+								执行区域：
+							</view>
+						</view>
+						<view class="item-right">
+							{{item.createByDeptName}}
+						</view>
+					</view>
+					<view class="form-item mb-30" >
+						<view class="item-left">
+							<image class="item-img" :src="baseUrl+'/dispatch/date.png'" mode=""></image>
+							<view class="item-label1">
+								执行状态：
+							</view>
+						</view>
+						<view class="item-right">
+							{{item.allocationStatus}}
+						</view>
+					</view>
+					<view class="form-item mb-30" >
+						<view class="item-left">
+							<image class="item-img" :src="baseUrl+'/dispatch/next.png'" mode=""></image>
+							<view class="item-label1">
+								截止时间：
+							</view>
+						</view>
+						<view class="item-right">
+							{{item.deadline}}
+						</view>
+					</view>
+				</view>
+			</view>
+		    <empty v-else pdTop="200"></empty>
+		</view>
+    </AppLayout>
+</template>
+
+<script setup>
+import { inject, ref, reactive,onMounted  } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+const { $api, navTo, navBack } = inject('globalFunction');
+import config from "@/config.js"
+
+const title = ref('');
+const formData = reactive({
+	taskName: '',
+	taskType: '',
+	priority: '',
+	createTime:'',
+	allocationStatus:'',
+	taskAllocation: {
+	  goalPersonCount: null,
+	  executeDeptId: '',
+	  executeDeptName: '',
+	  executeDeptAncestors: '',
+	  allocationStatus: '1',
+	  allocationNote: '',
+	  deadline: null,
+	  goalPersonList: []
+	}
+})
+const isAssignment=ref(true)
+const taskTypeOptions=ref([])
+const priorityOptions=ref([])
+const allocationStatusOptions=ref([])
+const executeDeptOptions=ref([])
+// 表单引用
+const formRef = ref(null)
+const allocationList=ref([])
+const baseUrl = config.imgBaseUrl
+const getBackgroundStyle = (imageName) => ({
+    backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
+    backgroundSize: 'cover',      // 覆盖整个容器
+    backgroundPosition: 'center', // 居中
+    backgroundRepeat: 'no-repeat'
+});
+
+// 事件处理
+function onDateChange(){}
+function taskTypeChange(){}
+function priorityChange(){}
+function executeDeptChange(){}
+
+function listNotParam(){
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={}
+	$api.myRequest('/dispatch/dept/listNotParam',params,'get',9100,header).then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.deptId,
+				    text: item.deptName,
+					ancestors:item.ancestors
+				}
+				executeDeptOptions.value.push(obj)
+			})
+		}
+	});
+}
+function getDictionary(){
+	$api.myRequest('/system/public/dict/data/type/assist_task_type').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				taskTypeOptions.value.push(obj)
+			})
+		}
+	});
+	$api.myRequest('/system/public/dict/data/type/assist_task_priority').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				priorityOptions.value.push(obj)
+			})
+		}
+	});
+	$api.myRequest('/system/public/dict/data/type/assist_task_allocation_status').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				allocationStatusOptions.value.push(obj)
+			})
+		}
+	});
+}
+function getDetail(id){
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={
+		id:id
+	}
+	$api.myRequest('/dispatch/assist/task/getTask',params,'get',9100,header).then((resData) => {
+		resData.data.taskType=getabelByValue(resData.data.taskType,taskTypeOptions.value)
+		resData.data.priority=getabelByValue(resData.data.priority,priorityOptions.value)
+		let allocationStatus=resData.data.taskAllocation.allocationStatus
+		resData.data.allocationStatus=getabelByValue(allocationStatus,allocationStatusOptions.value)
+		Object.assign(formData, resData.data)
+		getAllocationList()
+	});
+}
+function getAllocationList(){
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={
+		parentId:formData.taskAllocation.id
+	}
+	$api.myRequest('/dispatch/assist/task/allocation/getAllocationList',params,'get',9100,header).then((resData) => {
+		console.log("resData",resData)
+		resData.data.forEach(item=>{
+			item.allocationStatus=getabelByValue(item.allocationStatus,allocationStatusOptions.value)
+		})
+		allocationList.value=resData.data
+	});
+}
+function getabelByValue(value,arr) {
+	if (!Array.isArray(arr)) {
+	    return ''
+	}
+	const item = arr.find(item => item.value === String(value))
+	return item ? item.text : '暂无'
+}
+onLoad((options) => {
+	if(options.url&&options.url=='taskAssignment'){
+		isAssignment.value=false
+	}
+	listNotParam()
+	runAsyncTasks(options)
+});
+const runAsyncTasks = async (options) => {
+  await getDictionary()
+  let dataInfo=JSON.parse(options.item)
+  console.log("dataInfo",dataInfo)
+  Object.assign(formData, dataInfo)
+  if(isAssignment.value){
+	  getAllocationList()
+  }
+}
+
+
+</script>
+
+<style lang="stylus" scoped>
+image
+  height: 100%
+  width: 100%
+.main-list
+  background-color: #ffffff
+  padding: 20rpx 20rpx 28rpx 20rpx
+  margin: 30rpx 30rpx
+  box-shadow: 0px 3px 20px 0px rgba(0,105,234,0.1)
+  border-radius: 12px
+.list-top
+  display: flex
+  align-items: center
+  justify-content: space-between
+.list-title
+  font-weight: bold
+  font-size: 36rpx
+  color: #404040
+  position: relative
+
+.title-line
+  position: absolute
+  bottom: -10rpx
+  left: 70rpx
+  width: 70rpx
+  height: 8rpx
+  background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%)
+  border-radius: 4rpx
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+.input,
+.picker
+  flex: 1
+
+.picker-value
+  color: #666
+  
+.form-container
+  margin-top: 30rpx
+.con-box
+  background: #fff
+  padding: 20rpx
+  box-shadow: 0px 0px 6rpx 0px rgba(0,71,200,0.16)
+  border-radius: 24rpx
+  border: 1rpx solid #EDF5FF
+  margin-top: 30rpx
+.form-item
+  display: flex
+  align-items: center
+  margin-bottom: 20rpx
+.mb-30
+  margin-bottom: 30rpx
+.item-left
+  display: flex
+  align-items: center
+.item-img
+  width: 26rpx
+  height: 26rpx
+  margin-right: 10rpx
+.item-label1
+  font-size: 26rpx
+  color: #B3B3B3
+  width: 130rpx
+.item-label
+  width:200rpx
+  text-align: left
+  font-size: 30rpx
+  color: #606266
+  height: 72rpx
+  padding: 0 24rpx 0 0
+  vertical-align: middle
+  flex-shrink: 0
+  box-sizing: border-box
+.item-value
+  color: #333
+  font-size: 30rpx
+  height: 72rpx
+  padding: 0 24rpx 0 0
+  vertical-align: middle
+  flex-shrink: 0
+  box-sizing: border-box
+:deep(.uni-forms-item__label)
+  width: 194rpx !important
+  font-size: 28rpx;
+  color: #404040;
+
+.button-group {
+  display: flex;
+  justify-content: space-between;
+  padding: 40rpx 20rpx 20rpx;
+}
+
+.btn {
+  width: 45%;
+  height: 80rpx;
+  font-size: 30rpx;
+  border-radius: 8rpx;
+}
+
+.reset-btn {
+  background-color: #D8E9FF;
+  color: #1176FF;
+}
+
+.submit-btn {
+  background-color: #368BFF;
+  color: white;
+}
+.choice-btn{
+	width: 100%;
+	height: 70rpx;
+	font-size: 28rpx;
+	border-radius: 8rpx;
+	background-color: #368BFF;
+	color: white;
+	margin-left: 0;
+}
+:deep(.uni-easyinput__content)
+  background: rgba(0,0,0,0) !important
+</style>
diff --git a/packageB/priority/taskIssue.vue b/packageB/priority/taskIssue.vue
new file mode 100644
index 0000000..112aa13
--- /dev/null
+++ b/packageB/priority/taskIssue.vue
@@ -0,0 +1,554 @@
+<template>
+    <AppLayout :title="title" :show-bg-image="false" >
+		<view class="page-container" >
+			<scroll-view :scroll-y="true" class="nearby-scroll" @scrolltolower="scrollBottom" lower-threshold="50">
+				<view class="info-box">
+					<view class="info-item info-line">
+						<view class="">
+							<uni-icons type="contact" color="#175CE9" size="34"></uni-icons>
+						</view>
+						<view class="info-label">
+							帮扶任务总数
+						</view>
+						<view class="info-value">
+							{{ stats.taskCount }}
+						</view>
+					</view>
+					<view class="info-item info-line">
+						<view class="">
+							<uni-icons type="info" color="#175CE9" size="34"></uni-icons>
+						</view>
+						<view class="info-label">
+							待分配任务
+						</view>
+						<view class="info-value">
+							{{ stats.pendingCount }}
+						</view>
+					</view>
+					<view class="info-item">
+						<view class="">
+							<uni-icons type="checkbox" color="#175CE9" size="34"></uni-icons>
+						</view>
+						<view class="info-label">
+							已分配任务
+						</view>
+						<view class="info-value">
+							{{ stats.allocatedCount }}
+						</view>
+					</view>
+				</view>
+				<view class="main-list" :style="getBackgroundStyle('k.png')">
+					<view class="list-top">
+						<view class="list-title">
+							<text>筛选条件</text>
+							<view class="title-line"></view>
+						</view>
+						<view class="title-right button-sp-area">
+							<button class="mini-btn search-box-btn" type="primary" size="mini" @click="handleSearch">查询</button>
+							<button class="mini-btn reset-box-btn" type="default" size="mini" @click="handleReset">重置</button>
+						</view>
+					</view>
+					<view class="search-container">
+						<!-- 人员姓名 -->
+						<view class="search-item">
+						  <text class="label">任务名称：</text>
+						  <uni-easyinput v-model="formData.taskName" placeholder="请输入任务名称"></uni-easyinput>
+						</view>
+						<!-- 任务类型 -->
+						<view class="search-item">
+						  <text class="label">任务类型：</text>
+						  <uni-data-select :key="1" v-model="formData.taskType" :localdata="taskTypeOptions" placeholder="请选择任务类型" @change="onTaskTypeChange"></uni-data-select>
+						</view>
+						<!-- 优先级 -->
+						<view class="search-item">
+						  <text class="label">优先级：</text>
+						  <uni-data-select :key="2" v-model="formData.priority" :localdata="priorityOptions" placeholder="请选择优先级" @change="onPriorityChange"></uni-data-select>
+						</view>
+						<!-- 创建时间 -->
+						<view class="search-item">
+						  <text class="label">创建时间：</text>
+						  <uni-datetime-picker v-model="filterTimeRange" type="datetimerange" rangeSeparator="至" @change="filterTimeRangeChange" />
+						</view>	
+						<!-- 分配状态 -->
+						<view class="search-item">
+						  <text class="label">分配状态：</text>
+						  <uni-data-select :key="3" v-model="formData.allocationStatus" :localdata="allocationStatusOptions" placeholder="请选择分配状态" @change="onAllocationStatusChange"></uni-data-select>
+						</view>
+						<!-- 执行区域 -->
+						<view class="search-item" v-if="false">
+						  <text class="label">执行区域：</text>
+						  <uni-data-select :key="4" v-model="formData.executeDeptId" :localdata="executeDeptOptions" placeholder="请选择区域" @change="onExecuteDeptChange"></uni-data-select>
+						</view>
+					</view>
+				</view>
+				<view class="main-list" :style="getBackgroundStyle('k.png')">
+					<view class="list-top">
+						<view class="list-title">
+							<text>帮扶任务列表</text>
+							<view class="title-line" style="left: 70rpx;"></view>
+						</view>
+						<view class="title-total">
+							共<text class="total-num">{{totalNum}}</text>条记录
+						</view>
+					</view>
+					<view class="list-box" v-if="dataList.length>0">
+						<view class="con-box" v-for="(item,index) in dataList" :key="index">
+							<view class="form-title">
+								<view class="form-name">
+									{{item.taskName}}
+								</view>
+								<view class="form-type">
+									优先级：{{item.priority}}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/person.png'" mode=""></image>
+									<view class="item-label">
+										目标人数：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.taskAllocation.goalPersonCount}}
+								</view>
+							</view>
+							<view class="form-item">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/num.png'" mode=""></image>
+									<view class="item-label">
+										任务类型：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.taskType}}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/date.png'" mode=""></image>
+									<view class="item-label">
+										分配状态：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.taskAllocation.allocationStatus}}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/base.png'" mode=""></image>
+									<view class="item-label">
+										执行区域：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.taskAllocation.executeDeptName}}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/next.png'" mode=""></image>
+									<view class="item-label">
+										创建时间：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.createTime}}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/next.png'" mode=""></image>
+									<view class="item-label">
+										截止时间：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.taskAllocation.deadline}}
+								</view>
+							</view>
+							<view class="form-btns">
+								<button class="mini-btn form-box-btn detail-btn"  size="mini" @click="goDetail(item)">详情</button>
+								<button class="mini-btn form-box-btn follow-btn"  size="mini" @click="goTarget(item)">目标人员</button>
+								<button class="mini-btn form-box-btn recommend-btn" v-if="item.taskAllocation.allocationStatus == '待分配'"  size="mini" @click="goRecommend(item)">分配</button>
+							</view>
+						</view>
+					</view>
+				    <empty v-else pdTop="200"></empty>
+				</view>
+			</scroll-view>
+		</view>
+    </AppLayout>
+</template>
+
+<script setup>
+import { inject, ref, reactive } from 'vue';
+import { onLoad,onShow } from '@dcloudio/uni-app';
+const { $api, navTo, navBack } = inject('globalFunction');
+import config from "@/config.js"
+
+const title = ref('');
+const stats=ref({})
+const formData = reactive({
+    taskName: '',
+    taskType: '',
+    priority: '',
+    createTimeStart: null,
+    createTimeEnd: null,
+    allocationStatus: '',
+    executeDeptId: '',
+    pageNum: 1,
+    pageSize: 10
+})
+const taskName=ref('')
+const filterTimeRange=ref([])
+const totalNum=ref(0)
+const dataList=ref([])
+const taskTypeOptions=ref([])
+const priorityOptions=ref([])
+const allocationStatusOptions=ref([])
+const executeDeptOptions=ref([])
+const baseUrl = config.imgBaseUrl
+const getBackgroundStyle = (imageName) => ({
+    backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
+    backgroundSize: 'cover',      // 覆盖整个容器
+    backgroundPosition: 'center', // 居中
+    backgroundRepeat: 'no-repeat'
+});
+function listNotParam(){
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={}
+	$api.myRequest('/dispatch/dept/listNotParam',params,'get',9100,header).then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.deptId,
+				    text: item.deptName,
+					ancestors:item.ancestors
+				}
+				executeDeptOptions.value.push(obj)
+			})
+		}
+	});
+}
+function statisticTask(){
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={}
+	$api.myRequest('/dispatch/assist/task/allocation/statisticTask',params,'get',9100,header).then((resData) => {
+		stats.value=resData.data
+	});
+}
+function getDictionary(){
+	$api.myRequest('/system/public/dict/data/type/assist_task_type').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				taskTypeOptions.value.push(obj)
+			})
+		}
+	});
+	$api.myRequest('/system/public/dict/data/type/assist_task_priority').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				priorityOptions.value.push(obj)
+			})
+		}
+	});
+	$api.myRequest('/system/public/dict/data/type/assist_task_allocation_status').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				allocationStatusOptions.value.push(obj)
+			})
+		}
+	});
+}
+function getabelByValue(value,arr) {
+	if (!Array.isArray(arr.value)) {
+	    return ''
+	}
+	const item = arr.value.find(item => item.value === String(value))
+	return item ? item.text : '暂无'
+}
+function onTaskTypeChange(e){
+	formData.taskType=e
+}
+function onPriorityChange(e){
+	formData.priority=e
+}
+function onAllocationStatusChange(e){
+	formData.allocationStatus=e
+}
+function filterTimeRangeChange(e){
+	formData.createTimeStart=e[0]
+	formData.createTimeEnd=e[1]
+}
+function onExecuteDeptChange(e){
+	formData.executeDeptId=e
+}
+function handleSearch(){
+	dataList.value=[]
+	getDataList()
+}
+function getDataList(){
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	$api.myRequest('/dispatch/assist/task/pageAllocateDeptTaskList',formData,'get',9100,header).then((resData) => {
+		resData.rows.forEach(item=>{
+			item.priority=getabelByValue(item.priority,priorityOptions)
+			item.taskType=getabelByValue(item.taskType,taskTypeOptions)
+			item.taskAllocation.allocationStatus=getabelByValue(item.taskAllocation.allocationStatus,allocationStatusOptions)
+		})
+		totalNum.value=resData.total
+		dataList.value=dataList.value.concat(resData.rows)
+		
+	});
+}
+const handleReset = () => {
+	dataList.value=[]
+	formData.taskName=''
+	formData.taskType=''
+	formData.priority=''
+	formData.createTimeStart=null
+	formData.createTimeEnd=null
+	formData.allocationStatus=''
+	formData.executeDeptId=''
+	formData.pageNum=1
+	formData.pageSize=10
+	filterTimeRange.value=[]
+	getDataList()
+}
+const creatTask = () => {
+	navTo('/packageB/priority/taskCreated');
+}
+function goRecommend(item){
+	navTo('/packageB/priority/allocate?item='+JSON.stringify(item)+'&url=taskIssue');
+}
+function goDetail(item){
+	navTo('/packageB/priority/taskDetail?item='+JSON.stringify(item));
+}
+function goTarget(item){
+	navTo('/packageB/priority/targetPersonnel?id='+item.taskAllocation.id+'&taskName='+item.taskName);
+}
+function scrollBottom(){
+	if(formData.pageNum<totalNum.value/formData.pageSize){
+		formData.pageNum++
+		getDataList()
+	}
+}
+onShow(()=>{
+	formData.pageNum=1
+	dataList.value=[]
+	getDataList()
+	console.log("111")
+})
+onLoad((options) => {
+	listNotParam()
+	statisticTask()
+	runAsyncTasks(options)
+});
+const runAsyncTasks = async (options) => {
+	
+	await getDictionary()
+	await getDataList()
+}
+
+</script>
+
+<style lang="stylus" scoped>
+image
+  height: 100%
+  width: 100%
+.page-container {
+  display: flex;
+  flex-direction: column;
+  height: calc(100vh - var(--window-top)); /* 如果 AppLayout 有 header，需减去 */
+  /* 或者简单用：height: 100vh; */
+}
+.nearby-scroll
+    // 使用flex布局让scroll-view自适应高度，占据剩余空间
+  flex: 1
+  // overflow: hidden;
+.info-box
+  margin: 30rpx 30rpx
+  background: linear-gradient(0deg, #D9ECFF 0%, #F0F7FF 100%)
+  border-radius: 20rpx
+  padding: 40rpx 0
+  display: flex
+  align-items: center
+.info-line
+  border-right: 2rpx solid #B7D6FF
+.info-item
+  display: flex
+  flex-direction: column
+  align-items: center
+  justify-content: center
+  width: 50%
+.info-label
+  font-size: 26rpx
+  color: #6E7E9B
+  margin-bottom: 20rpx
+.info-value
+  font-weight: bold
+  font-size: 28rpx
+  color: #3D61AC
+.main-list
+  background-color: #ffffff
+  padding: 20rpx 20rpx 28rpx 20rpx
+  margin: 30rpx 30rpx
+  box-shadow: 0px 3px 20px 0px rgba(0,105,234,0.1)
+  border-radius: 12px
+.list-top
+  display: flex
+  align-items: center
+  justify-content: space-between
+.list-title
+  font-weight: bold
+  font-size: 36rpx
+  color: #404040
+  position: relative
+
+.title-line
+  position: absolute
+  bottom: -10rpx
+  left: 70rpx
+  width: 70rpx
+  height: 8rpx
+  background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%)
+  border-radius: 4rpx
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+
+.list-box
+  margin-top: 40rpx
+
+:deep(.uni-forms-item__label)
+  width: 194rpx !important
+  font-size: 28rpx;
+  color: #404040;
+  
+.search-container
+  padding: 20rpx 0rpx 0rpx 0rpx
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+.search-item
+  display: flex
+  align-items: center
+  margin-bottom: 30rpx
+
+.label
+  width: 160rpx
+  font-size: 28rpx
+  color: #404040
+  flex-shrink: 0
+
+.input,
+.picker
+  background: #FFFFFF
+  flex: 1
+  min-width: 0
+.search-box-btn
+  border-radius: 32rpx !important
+  background: #3088FF !important
+  margin-right: 16rpx
+.reset-box-btn
+  border-radius: 32rpx !important
+  background: #02B44D
+  color: #fff
+.con-box
+  background: #fff
+  padding: 20rpx
+  box-shadow: 0px 0px 6rpx 0px rgba(0,71,200,0.16)
+  border-radius: 24rpx
+  border: 1rpx solid #EDF5FF
+  margin-top: 30rpx
+.form-title
+  display: flex
+  align-items: center
+
+.form-name
+  font-weight: bold
+  font-size: 32rpx
+  color: #595959
+  margin-right:16rpx
+.form-type
+  border-radius: 8rpx;
+  border: 2rpx solid #FF7D26;
+  font-size: 24rpx
+  color: #F1690E
+  padding: 4rpx 10rpx
+.form-item
+  display: flex
+  align-items: center
+  justify-content: space-between
+  margin-top: 30rpx
+.item-left
+  display: flex
+  align-items: center
+.item-img
+  width: 26rpx
+  height: 26rpx
+  margin-right: 10rpx
+.item-label
+  font-size: 26rpx
+  color: #B3B3B3
+  width: 130rpx
+.item-right
+  font-size: 26rpx
+  color: #737373
+  overflow: hidden
+  text-overflow: ellipsis
+  white-space: nowrap
+.form-btns
+  margin-top:30rpx
+.form-box-btn
+  border-radius: 50rpx !important
+  margin-right: 24rpx
+  padding: 0rpx 40rpx
+.detail-btn
+  background: #EDF5FF
+  border: 1px solid #3088FF
+  font-size: 28rpx
+  color: #3088FF
+.follow-btn
+  background: #EEF9F3
+  border: 1px solid #00933E
+  font-size: 28rpx
+  color: #00933E
+.recommend-btn
+  background: linear-gradient(92deg, #0DCCFF 0%, #4760FF 100%)
+  font-size: 28rpx
+  color: #FFFFFF
+</style>
diff --git a/packageB/priority/trainingWill.vue b/packageB/priority/trainingWill.vue
new file mode 100644
index 0000000..b003d40
--- /dev/null
+++ b/packageB/priority/trainingWill.vue
@@ -0,0 +1,451 @@
+<template>
+    <AppLayout :title="title" :show-bg-image="false" >
+		<view class="page-container" >
+			<scroll-view :scroll-y="true" class="nearby-scroll" @scrolltolower="scrollBottom" lower-threshold="50">
+				<view class="main-list" :style="getBackgroundStyle('k.png')" >
+					<view class="list-top">
+						<view class="list-title">
+							<text>培训意愿列表</text>
+							<view class="title-line" style="left: 70rpx;"></view>
+						</view>
+						<view class="title-total">
+							共<text class="total-num">{{totalNum}}</text>条
+						</view>
+					</view>
+					<view class="list-box" v-if="dataList.length>0">
+						<view class="con-box" v-for="(item,index) in dataList" :key="index">
+							<view class="form-item">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/date.png'" mode=""></image>
+									<view class="item-label">
+										需求方向：
+									</view>
+								</view>
+								<view class="item-right">
+									{{getabelByValue(item.demandDirection,trainNeedOptions)}}
+								</view>
+							</view>
+							<view class="form-item">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/date.png'" mode=""></image>
+									<view class="item-label">
+										授课方式：
+									</view>
+								</view>
+								<view class="item-right">
+									{{getabelByValue(item.courseWay,classMethodOptions)}}
+								</view>
+							</view>
+							<view class="form-item">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/date.png'" mode=""></image>
+									<view class="item-label">
+										课程类型：
+									</view>
+								</view>
+								<view class="item-right">
+									{{getabelByValue(item.courseType,questionClassificationOptions)}}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/person.png'" mode=""></image>
+									<view class="item-label">
+										培训时间：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.trainDate}}
+								</view>
+							</view>
+							<view class="form-item">
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/help.png'" mode=""></image>
+									<view class="item-label">
+										培训地点：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.trainAddress}}
+								</view>
+							</view>
+							<view class="form-item" >
+								<view class="item-left">
+									<image class="item-img" :src="baseUrl+'/dispatch/base.png'" mode=""></image>
+									<view class="item-label">
+										费用预算：
+									</view>
+								</view>
+								<view class="item-right">
+									{{item.trainFee}}
+								</view>
+							</view>
+							<view class="form-btns">
+								<button class="mini-btn form-box-btn detail-btn"  size="mini" @click="goDetail('edit',item)">编辑</button>
+								<button class="mini-btn form-box-btn follow-btn"  size="mini" @click="del(item)">删除</button>
+							</view>
+						</view>
+					</view>
+				    <empty v-else pdTop="200"></empty>
+				</view>
+			</scroll-view>
+			<view class="float-btn" @click="goDetail('add')">
+				<uni-icons type="plusempty" color="#fff" size="30"></uni-icons>
+			</view>
+			<view>
+				<!-- 提示窗示例 -->
+				<uni-popup ref="alertDialog" type="dialog">
+					<uni-popup-dialog type="warn" cancelText="取消" confirmText="确定" title="提示" content="确定要删除这条求职意愿吗？" @confirm="dialogConfirm"></uni-popup-dialog>
+				</uni-popup>
+			</view>
+		</view>
+    </AppLayout>
+</template>
+
+<script setup>
+import { inject, ref, reactive, onMounted } from 'vue';
+import { onLoad,onShow } from '@dcloudio/uni-app';
+const { $api, navTo, navBack } = inject('globalFunction');
+import config from "@/config.js"
+
+const title = ref('');
+const id=ref('')
+const pageNum = ref(1)
+const pageSize = ref(2)
+const totalNum=ref(0)
+const dataList=ref([])
+const trainNeedOptions=ref([])
+const classMethodOptions=ref([])
+const questionClassificationOptions=ref([])
+const goalPersonId=ref([])
+const baseUrl = config.imgBaseUrl
+const getBackgroundStyle = (imageName) => ({
+    backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
+    backgroundSize: 'cover',      // 覆盖整个容器
+    backgroundPosition: 'center', // 居中
+    backgroundRepeat: 'no-repeat'
+});
+const alertDialog = ref(null);
+const currentItem=ref({})
+function getDictionary(){
+	$api.myRequest('/system/public/dict/data/type/train_need').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				trainNeedOptions.value.push(obj)
+			})
+		}
+	});
+	$api.myRequest('/system/public/dict/data/type/class_method').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				classMethodOptions.value.push(obj)
+			})
+		}
+	});
+	$api.myRequest('/system/public/dict/data/type/question_classification').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				questionClassificationOptions.value.push(obj)
+			})
+		}
+	});
+}
+function getabelByValue(value,arr) {
+	if (!Array.isArray(arr)) {
+	    return ''
+	}
+	const item = arr.find(item => item.value === String(value))
+	return item ? item.text : '暂无'
+}
+function getDataList(){
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={
+		personId: id.value,
+		pageNum: pageNum.value,
+		pageSize: pageSize.value
+	}
+	$api.myRequest('/dispatch/train/willingness/list',params,'get',9100,header).then((resData) => {
+		totalNum.value=resData.total
+		dataList.value=dataList.value.concat(resData.rows)
+		
+	});
+}
+function scrollBottom(){
+	if(pageNum.value<totalNum.value/pageSize.value){
+		pageNum.value++
+		getDataList()
+	}
+}
+function goDetail(val,item){
+	if(val=='add'){
+		navTo('/packageB/priority/trainingWillEdit?goalPersonId=' + goalPersonId.value);
+	}else{
+		navTo('/packageB/priority/trainingWillEdit?item=' + JSON.stringify(item));
+	}
+	
+}
+function del(item){
+	if (alertDialog.value) {
+	    alertDialog.value.open();
+		currentItem.value=item
+	}
+}
+function dialogConfirm(){
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	$api.myRequest('/dispatch/train/willingness/'+currentItem.value.id,{},'delete',9100,header).then((resData) => {
+		if(resData.code==200){
+			dataList.value=[]
+			pageNum.value=1
+			getDataList()
+		}
+		
+	});
+}
+onLoad((options) => {
+	id.value=options.id
+	goalPersonId.value=options.goalPersonId
+});
+const runAsyncTasks = async () => {
+  await getDictionary()
+  await getDataList()
+}
+onShow(()=>{
+	dataList.value=[]
+	pageNum.value=1
+	runAsyncTasks()
+})
+
+</script>
+
+<style lang="stylus" scoped>
+image
+  height: 100%
+  width: 100%
+.page-container {
+  display: flex;
+  flex-direction: column;
+  height: calc(100vh - var(--window-top)); /* 如果 AppLayout 有 header，需减去 */
+  /* 或者简单用：height: 100vh; */
+  padding-bottom: 140rpx
+}
+.nearby-scroll
+    // 使用flex布局让scroll-view自适应高度，占据剩余空间
+  flex: 1
+  // overflow: hidden;
+.task-box
+  display: flex
+  align-items: center
+.task-label
+  font-size: 30rpx
+  color: #6E7E9B
+.task-name
+  font-weight: bold
+  font-size: 30rpx
+  color: #3D61AC
+.main-list
+  background-color: #ffffff
+  padding: 20rpx 20rpx 28rpx 20rpx
+  margin: 30rpx 30rpx
+  box-shadow: 0px 3px 20px 0px rgba(0,105,234,0.1)
+  border-radius: 12px
+.list-top
+  display: flex
+  align-items: center
+  justify-content: space-between
+.list-title
+  font-weight: bold
+  font-size: 36rpx
+  color: #404040
+  position: relative
+
+.title-line
+  position: absolute
+  bottom: -10rpx
+  left: 70rpx
+  width: 70rpx
+  height: 8rpx
+  background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%)
+  border-radius: 4rpx
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+
+.list-box
+  margin-top: 40rpx
+
+:deep(.uni-forms-item__label)
+  width: 194rpx !important
+  font-size: 28rpx;
+  color: #404040;
+  
+.search-container
+  padding: 20rpx 0rpx 0rpx 0rpx
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+.search-item
+  display: flex
+  align-items: center
+  margin-bottom: 30rpx
+
+.label
+  width: 160rpx
+  font-size: 28rpx
+  color: #404040
+  flex-shrink: 0
+
+.input,
+.picker
+  background: #FFFFFF
+  flex: 1
+  min-width: 0
+.search-box-btn
+  border-radius: 32rpx !important
+  background: #3088FF !important
+  margin-right: 16rpx
+.reset-box-btn
+  border-radius: 32rpx !important
+  background: #02B44D
+  color: #fff
+.con-box
+  background: #fff
+  padding: 20rpx
+  box-shadow: 0px 0px 6rpx 0px rgba(0,71,200,0.16)
+  border-radius: 24rpx
+  border: 1rpx solid #EDF5FF
+  margin-top: 30rpx
+.form-title
+  display: flex
+  align-items: center
+
+.form-name
+  font-weight: bold
+  font-size: 30rpx
+  color: #595959
+  margin-right:16rpx
+.form-type
+  border-radius: 8rpx;
+  border: 2rpx solid #FF7D26;
+  font-size: 24rpx
+  color: #F1690E
+  padding: 4rpx 10rpx
+.form-item
+  display: flex
+  align-items: center
+  justify-content: space-between
+  margin-top: 30rpx
+.item-left
+  display: flex
+  align-items: center
+.item-img
+  width: 26rpx
+  height: 26rpx
+  margin-right: 10rpx
+.item-label
+  font-size: 26rpx
+  color: #B3B3B3
+  width: 190rpx
+.item-right
+  font-size: 26rpx
+  color: #737373
+  // overflow: hidden
+  // text-overflow: ellipsis
+  // white-space: nowrap
+  word-wrap: break-word
+  overflow-wrap: break-word
+  white-space: normal
+.form-btns
+  margin-top:30rpx
+.form-box-btn
+  border-radius: 50rpx !important
+  margin-right: 24rpx
+  padding: 0rpx 40rpx
+.detail-btn
+  background: #EDF5FF
+  border: 1px solid #3088FF
+  font-size: 28rpx
+  color: #3088FF
+.follow-btn
+  background: #EEF9F3
+  border: 1px solid #00933E
+  font-size: 28rpx
+  color: #00933E
+.recommend-btn
+  background: linear-gradient(92deg, #0DCCFF 0%, #4760FF 100%)
+  font-size: 28rpx
+  color: #FFFFFF
+.button-group 
+	position: fixed
+	bottom: 0
+	left: 0
+	width: 100%
+	height: 120rpx
+	background: #fff
+.btns
+  height: 120rpx
+  width: 100%
+  line-height: 120px
+  display: flex
+  align-items: center
+  justify-content: space-between
+  box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.1)
+
+.btn {
+  width: 45%;
+  height: 80rpx;
+  font-size: 30rpx;
+  border-radius: 8rpx;
+}
+
+.reset-btn {
+  background-color: #D8E9FF;
+  color: #1176FF;
+}
+
+.submit-btn {
+  background-color: #368BFF;
+  color: white;
+}
+.float-btn{
+	position: fixed;
+	bottom: 100rpx;
+	right: 50rpx;
+	background: #368BFF;
+	width: 100rpx;
+	height: 100rpx;
+	border-radius: 50%;
+	line-height: 100rpx;
+	text-align: center;
+	color: #fff;
+}
+</style>
diff --git a/packageB/priority/trainingWillEdit.vue b/packageB/priority/trainingWillEdit.vue
new file mode 100644
index 0000000..f51256a
--- /dev/null
+++ b/packageB/priority/trainingWillEdit.vue
@@ -0,0 +1,312 @@
+<template>
+    <AppLayout :title="title" :show-bg-image="false" >
+        <view class="main-list" :style="getBackgroundStyle('k.png')">
+			<view class="list-top">
+				<view class="list-title">
+					<text>{{showTitle}}培训意愿</text>
+					<view class="title-line"></view>
+				</view>
+			</view>
+			
+            <view class="form-container">
+                <uni-forms ref="formRef" v-model="formData" :rules="rules" validate-trigger="submit" >
+					<uni-forms-item label="需求方向：" name="demandDirection" required >
+					    <uni-data-select v-model="formData.demandDirection" placeholder="请选择需求方向" :localdata="trainNeedOptions" @change="onTrainNeedChange"></uni-data-select>
+					</uni-forms-item>
+					<uni-forms-item label="授课方式：" name="courseWay" required>
+					    <uni-data-select v-model="formData.courseWay" placeholder="请选择授课方式" :localdata="classMethodOptions" @change="onClassMethodChange"></uni-data-select>
+					</uni-forms-item>
+					<uni-forms-item label="课程类型：" name="courseType" required >
+					    <uni-data-select v-model="formData.courseType" placeholder="请选择课程类型" :localdata="questionClassificationOptions" @change="onQuestionClassificationChange"></uni-data-select>
+					</uni-forms-item>
+					<uni-forms-item label="培训时间：" name="trainDate" required>
+						<uni-datetime-picker type="date" placeholder="请选择培训时间"  v-model="formData.trainDate" @maskClick="onTrainDateChange" />
+					</uni-forms-item>
+					<uni-forms-item label="培训费用预算：" name="trainFee" required>
+						<uni-easyinput v-model="formData.trainFee" placeholder="请输入培训费用预算"></uni-easyinput>
+					</uni-forms-item>
+					<uni-forms-item label="培训地点：" name="trainAddress" required>
+						<uni-easyinput v-model="formData.trainAddress" placeholder="请输入培训地点"></uni-easyinput>
+					</uni-forms-item>
+                    <uni-forms-item label="培训目标：" name="trainGoal" required>
+					    <uni-easyinput type="textarea" v-model="formData.trainGoal" placeholder="请输入培训目标"></uni-easyinput>
+                    </uni-forms-item>
+					<uni-forms-item label="建议与意见：" name="opinions" >
+					    <uni-easyinput type="textarea" v-model="formData.opinions" placeholder="请输入建议与意见"></uni-easyinput>
+					</uni-forms-item>
+                </uni-forms>
+                <!-- 按钮组 -->
+                <view class="button-group">
+				  <button class="btn submit-btn" @click="handleSubmit">保存跟进</button>
+                  <button class="btn reset-btn"  @click="handleReset">重置</button>
+                </view>
+			</view>
+        </view>
+    </AppLayout>
+</template>
+
+<script setup>
+import { inject, ref, reactive } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+const { $api, navTo, navBack } = inject('globalFunction');
+import config from "@/config.js"
+
+const title = ref('');
+const showTitle=ref('')
+const formData = reactive({
+    id: null,
+	goalPersonId: '',
+	demandDirection: '',
+	trainDate: '',
+	trainAddress: '',
+	trainFee: '',
+	courseWay: '',
+	courseType: '',
+	trainGoal: '',
+	opinions: ''
+})
+const trainNeedOptions=ref([])
+const classMethodOptions=ref([])
+const questionClassificationOptions=ref([])
+// 表单引用
+const formRef = ref(null)
+
+// 校验规则
+const rules = {
+	demandDirection: {
+		rules: [{
+			required: true,
+			errorMessage: '请选择需求方向'
+		}]
+	},
+	courseWay: {
+		rules: [{
+			required: true,
+			errorMessage: '请选择授课方式'
+		}]
+	},
+	courseType: {
+		rules: [{
+			required: true,
+			errorMessage: '请选择课程类型'
+		}]
+	},
+	trainDate: {
+		rules: [{
+			required: true,
+			errorMessage: '请选择培训时间'
+		}]
+	},
+	trainFee: {
+		rules: [{
+			required: true,
+			errorMessage: '请输入培训费用预算'
+		}]
+	},
+	trainAddress: {
+		rules: [{
+			required: true,
+			errorMessage: '请输入培训地点'
+		}]
+	},
+	trainGoal: {
+		rules: [{
+			required: true,
+			errorMessage: '请输入培训目标'
+		}]
+	}
+}
+const baseUrl = config.imgBaseUrl
+const getBackgroundStyle = (imageName) => ({
+    backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
+    backgroundSize: 'cover',      // 覆盖整个容器
+    backgroundPosition: 'center', // 居中
+    backgroundRepeat: 'no-repeat'
+});
+
+const getDictionary = async () => {
+  try {
+    const [trainRes, classRes, questionRes] = await Promise.all([
+      $api.myRequest('/system/public/dict/data/type/train_need'),
+      $api.myRequest('/system/public/dict/data/type/class_method'),
+      $api.myRequest('/system/public/dict/data/type/question_classification')
+    ]);
+    if (trainRes && trainRes.code == 200) {
+      trainRes.data.forEach(item => {
+        trainNeedOptions.value.push({
+          value: item.dictValue,
+          text: item.dictLabel
+        });
+      });
+    }
+    if (classRes && classRes.code == 200) {
+      classRes.data.forEach(item => {
+        classMethodOptions.value.push({
+          value: item.dictValue,
+          text: item.dictLabel
+        });
+      });
+    }
+    if (questionRes && questionRes.code == 200) {
+      questionRes.data.forEach(item => {
+        questionClassificationOptions.value.push({
+          value: item.dictValue,
+          text: item.dictLabel
+        });
+      });
+    }
+  } catch (error) {
+    console.error("获取字典数据失败:", error);
+    throw error; // 抛出错误，让外部调用者知道失败了
+  }
+};
+function onTrainNeedChange(e){
+	formData.demandDirection=e
+}
+function onClassMethodChange(e){
+	formData.courseWay=e
+}
+function onQuestionClassificationChange(e) {
+	formData.courseType=e
+}
+function onTrainDateChange(e){
+	formData.trainDate=e
+}
+const handleSubmit = () => {
+  formRef.value?.validate()
+    .then(() => {
+		let header={
+			'Authorization':uni.getStorageSync('Padmin-Token')
+		}
+		if(formData.id){
+			$api.myRequest('/dispatch/train/willingness', formData,'put',9100,header).then((resData) => {
+				if(resData && resData.code == 200){
+					handleReset()
+					uni.showToast({
+					  title: '保存成功',
+					  icon: 'success',
+					  duration: 2000 
+					});
+					uni.navigateBack()
+				}else{
+					uni.showToast({
+					  title: resData.msg,
+					  icon: 'none',
+					  duration: 2000
+					});
+				}
+				
+			});
+		}else{
+			$api.myRequest('/dispatch/train/willingness', formData,'post',9100,header).then((resData) => {
+				if(resData && resData.code == 200){
+					handleReset()
+					uni.showToast({
+					  title: '保存成功',
+					  icon: 'success',
+					  duration: 2000 
+					});
+					uni.navigateBack()
+				}else{
+					uni.showToast({
+					  title: resData.msg,
+					  icon: 'none',
+					  duration: 2000
+					});
+				}
+				
+			});
+		}
+		
+    })
+    .catch((errors) => {
+      console.log('校验失败:', errors);
+    });
+};
+
+const handleReset = () => {
+	formData.demandDirection=''
+	formData.trainDate=''
+	formData.trainAddress=''
+	formData.trainFee=''
+	formData.courseWay=''
+	formData.courseType=''
+	formData.trainGoal=''
+	formData.opinions=''
+}
+onLoad((options) => {
+	runAsyncTasks(options)
+});
+const runAsyncTasks = async (options) => {
+  await getDictionary()
+  if(options.goalPersonId){
+  	formData.goalPersonId=options.goalPersonId
+	showTitle.value='新增'
+  }
+  if(options.item){
+  	let dataInfo=JSON.parse(options.item)
+  	Object.assign(formData, dataInfo)
+	showTitle.value='编辑'
+  }
+}
+
+</script>
+
+<style lang="stylus" scoped>
+.main-list
+  background-color: #ffffff
+  padding: 20rpx 20rpx 28rpx 20rpx
+  margin: 30rpx 30rpx
+  box-shadow: 0px 3px 20px 0px rgba(0,105,234,0.1)
+  border-radius: 12px
+.list-top
+  display: flex
+  align-items: center
+  justify-content: space-between
+.list-title
+  font-weight: bold
+  font-size: 36rpx
+  color: #404040
+  position: relative
+
+.title-line
+  position: absolute
+  bottom: -10rpx
+  left: 70rpx
+  width: 70rpx
+  height: 8rpx
+  background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%)
+  border-radius: 4rpx
+.input,
+.picker
+  flex: 1
+.form-container 
+  margin-top: 30rpx
+:deep(.uni-forms-item__label)
+  width: 235rpx !important
+  font-size: 28rpx;
+  color: #404040;
+
+.button-group {
+  display: flex;
+  justify-content: space-between;
+  padding: 40rpx 20rpx 20rpx;
+}
+
+.btn {
+  width: 45%;
+  height: 80rpx;
+  font-size: 30rpx;
+  border-radius: 8rpx;
+}
+
+.reset-btn {
+  background-color: #D8E9FF;
+  color: #1176FF;
+}
+
+.submit-btn {
+  background-color: #368BFF;
+  color: white;
+}
+</style>
diff --git a/packageB/train/index.vue b/packageB/train/index.vue
index 541562b..65a9823 100644
--- a/packageB/train/index.vue
+++ b/packageB/train/index.vue
@@ -22,7 +22,7 @@
 							<image src="/packageB/static/images/train/arrow.png" mode=""></image>
 						</view>
 					</view>
-					
+
 				</view>
 				<view class="btns" @click="jumps('/packageB/train/mockExam/examList')">
 					<image src="/packageB/static/images/train/mnks-k.png" mode=""></image>
@@ -33,7 +33,7 @@
 							<image src="/packageB/static/images/train/arrow.png" mode=""></image>
 						</view>
 					</view>
-					
+
 				</view>
 				<!-- <view class="btns" @click="jumps('/packageB/train/wrongAnswer/mistakeNotebook')">
 					<image src="/packageB/static/images/train/ctb-k.png" mode=""></image>
@@ -44,7 +44,7 @@
 							<image src="/packageB/static/images/train/arrow.png" mode=""></image>
 						</view>
 					</view>
-					
+
 				</view> -->
 			</view>
         </view>
@@ -57,6 +57,7 @@ import { onLoad, onShow } from '@dcloudio/uni-app';
 const { $api, navTo, vacanciesTo, formatTotal, config } = inject('globalFunction');
 import useUserStore from '@/stores/useUserStore';
 import useDictStore from '@/stores/useDictStore';
+// import CryptoJS from 'crypto-js'
 
 onLoad(() => {
     thirdLogin()
@@ -81,6 +82,12 @@ async function thirdLogin(){
 			contactperson: "",
 			contactphone: "",
 		}
+		//用户信息加密方法待更新
+		// let key = '9zS+DFKrzxvosO82mTcPJQ=='
+		// let secretKey = CryptoJS.enc.Utf8.parse(key);//key  为你的秘钥
+		// let srcs = CryptoJS.enc.Utf8.parse(form.idno);
+		// let encrypted = CryptoJS.AES.encrypt(srcs, secretKey, {mode:CryptoJS.mode.ECB,padding: CryptoJS.pad.Pkcs7}).toString()
+		// form.idno=encrypted
 	}else if (uni.getStorageSync('userInfo').isCompanyUser=='0') {
 		form={
 			usertype: "2",
@@ -181,7 +188,7 @@ async function thirdLogin(){
 			}
 		}
 	}
-	
+
 }
 </style>
 
diff --git a/packageB/train/practice/startPracticingList.vue b/packageB/train/practice/startPracticingList.vue
index 8013433..2f46f97 100644
--- a/packageB/train/practice/startPracticingList.vue
+++ b/packageB/train/practice/startPracticingList.vue
@@ -17,12 +17,12 @@
                             placeholder="输入"
                             placeholder-class="inputplace"
                         />
-                        <uni-icons 
-                            v-if="searchKeyword" 
-                            class="clear-icon" 
-                            type="clear" 
-                            size="24" 
-                            color="#999" 
+                        <uni-icons
+                            v-if="searchKeyword"
+                            class="clear-icon"
+                            type="clear"
+                            size="24"
+                            color="#999"
                             @click="clearSearch"
                         />
                     </view>
@@ -35,8 +35,8 @@
 				<view class="title-line"></view>
 			</view>
             <view class="video-grid" v-if="dataList.length>0">
-                <view 
-                    v-for="item in dataList" 
+                <view
+                    v-for="item in dataList"
                     :key="item.category_value"
                     class="train-item"
                 >
@@ -66,6 +66,7 @@ import { inject, ref, reactive } from 'vue';
 import { onLoad } from '@dcloudio/uni-app';
 const { $api, navTo, navBack } = inject('globalFunction');
 import config from "@/config.js"
+// import CryptoJS from 'crypto-js'
 
 // state
 const title = ref('');
@@ -130,7 +131,7 @@ function getDataList(type = 'add') {
 			dataList.value=dataList.value.concat(resData.rows)
 			totalNum.value=resData.total
 		});
-		
+
 	}
 }
 
@@ -157,6 +158,12 @@ async function thirdLogin(){
 			contactperson: "",
 			contactphone: "",
 		}
+		//用户信息加密方法待更新
+		// let key = '9zS+DFKrzxvosO82mTcPJQ=='
+		// let secretKey = CryptoJS.enc.Utf8.parse(key);//key  为你的秘钥
+		// let srcs = CryptoJS.enc.Utf8.parse(form.idno);
+		// let encrypted = CryptoJS.AES.encrypt(srcs, secretKey, {mode:CryptoJS.mode.ECB,padding: CryptoJS.pad.Pkcs7}).toString()
+		// form.idno=encrypted
 	}else if (uni.getStorageSync('userInfo').isCompanyUser=='0') {
 		form={
 			usertype: "2",
@@ -238,9 +245,9 @@ image {
 				line-height: 38rpx;
 				margin-left: 10rpx;
 			}
-			
+
 		}
-		
+
 	}
 	.heng{
 		width: 120rpx;
diff --git a/packageB/train/video/videoDetail.vue b/packageB/train/video/videoDetail.vue
index 85b6b9a..d7ba2f1 100644
--- a/packageB/train/video/videoDetail.vue
+++ b/packageB/train/video/videoDetail.vue
@@ -31,17 +31,22 @@
 					<view class="title-line"></view>
 				</view>
 				<view class="info-detail">
-					<view class="info-left">
+					<view class="info-left" style="width: auto;">
 						<view class="info-item">
 							<image class="icon-img" :src="baseUrl+'/train/zs.png'" mode=""></image>
 							<view class="info-label">
 								分类：
 							</view>
-							<view class="info-value" :data-content="getCategoryLabelByValue(videoInfo.category)">
-								{{getCategoryLabelByValue(videoInfo.category)}}
+							<view class="info-value" :data-content="getCategoryLabelByValue(videoInfo.category,IndustrialData)">
+								{{getCategoryLabelByValue(videoInfo.category,IndustrialData)}}/
+								{{getCategoryLabelByValue(videoInfo.category2,domainData)}}/
+								{{getCategoryLabelByValue(videoInfo.category3,occupationalData)}}
 							</view>
 						</view>
 					</view>
+				</view>
+				<view class="info-detail">
+					
 					<view class="info-right">
 						<view class="info-item">
 							<image class="icon-img" :src="baseUrl+'/train/zs.png'" mode=""></image>
@@ -181,6 +186,9 @@ const params = reactive({
 	videoId: '',
 	userId: ''
 })
+const IndustrialData=ref([])
+const domainData=ref([])
+const occupationalData=ref([])
 // 监听 initialTime 变化，确保设置完成后再渲染
 watch(initialTime, (newVal) => {
 	if (newVal >= 0 && videoInfo.value && videoInfo.value.cover) {
@@ -205,6 +213,7 @@ onLoad((options) => {
 	pageEnterTime.value = Date.now() // 记录毫秒时间戳
 	videoId.value=options.id
 	getDictionary()
+	getSearchType("-1",1)
 });
 // onHide(() => {
 //     updateVideoInfo() // 用缓存值，不要调 getCurrentTime
@@ -227,6 +236,12 @@ function getData() {
 	}
 	$api.myRequest('/train/public/trainVideo/model', params,'post',9100,header).then((resData) => {
 		videoInfo.value=resData.data
+		if(resData.data.category){
+		  getSearchType(resData.data.category,2)
+		}
+		if(resData.data.category2){
+		  getSearchType(resData.data.category2,3)
+		}
 		videoInfo.value.currentUrl=trainVideoImgUrl+videoInfo.value.trainClassList[0].url
 		videoInfo.value.percentage=((videoInfo.value.process/(videoInfo.value.hour*60))*100).toFixed(2)
 		videoInfo.value.uploadTime=videoInfo.value.uploadTime.split(' ')[0]
@@ -266,12 +281,34 @@ function getDictionary(){
 		levalLabels.value=resData.data
 	});
 }
-function getCategoryLabelByValue(value) {
-	if (!Array.isArray(categories.value)) {
+function getSearchType(code,i){
+	let header = {
+		'Authorization': uni.getStorageSync('token')||'',
+		'Content-Type': "application/x-www-form-urlencoded"
+	};
+	$api.myRequest('/system/public/dict/data/getByParentValue', {
+		dictType: "video_level",
+		dictParentValue: code,
+		childFlag: "1",
+	},'post',9100,header).then((resData) => {
+		if(resData.code==200){
+			if(i==1){
+				IndustrialData.value=resData.data;
+			}else if(i==2){
+				domainData.value=resData.data;
+			}else if(i==3){
+				occupationalData.value=resData.data;
+			}
+		}
+	});
+  
+}
+function getCategoryLabelByValue(value,arr) {
+	if (!Array.isArray(arr)) {
 	    console.warn('categories 不是数组:', categories.value)
 	    return ''
 	  }
-	  const item = categories.value.find(item => item.dictValue === String(value))
+	  const item = arr.find(item => item.dictValue === String(value))
 	  return item ? item.dictLabel : '暂无分类'
 }
 function getLevelLabelByValue(value) {
@@ -455,7 +492,7 @@ onUnmounted(() => {
 }
 .info-detail{
 	display: flex;
-	flex-wrap: nowrap;
+	flex-wrap: wrap;
 	align-items: center;
 	margin-bottom: 30rpx;
 }
diff --git a/packageB/train/video/videoList.vue b/packageB/train/video/videoList.vue
index ca754ba..7e36623 100644
--- a/packageB/train/video/videoList.vue
+++ b/packageB/train/video/videoList.vue
@@ -17,12 +17,12 @@
                             placeholder="输入视频名称"
                             placeholder-class="inputplace"
                         />
-                        <uni-icons 
-                            v-if="searchKeyword" 
-                            class="clear-icon" 
-                            type="clear" 
-                            size="24" 
-                            color="#999" 
+                        <uni-icons
+                            v-if="searchKeyword"
+                            class="clear-icon"
+                            type="clear"
+                            size="24"
+                            color="#999"
                             @click="clearSearch"
                         />
                     </view>
@@ -35,16 +35,16 @@
 				<view class="title-line"></view>
 			</view>
             <view class="video-grid" v-if="dataList.length>0">
-                <view 
-                    v-for="video in dataList" 
+                <view
+                    v-for="video in dataList"
                     :key="video.id || video.videoId"
                     class="video-item"
 					:style="getItemBackgroundStyle('video-bg.png')"
                     @click="playVideo(video)"
                 >
                     <view class="video-cover">
-                        <image 
-                            :src="trainVideoImgUrl+ video.cover" 
+                        <image
+                            :src="trainVideoImgUrl+ video.cover"
                             mode="aspectFill"
                         ></image>
                     </view>
@@ -63,6 +63,7 @@ import { inject, ref, reactive } from 'vue';
 import { onLoad } from '@dcloudio/uni-app';
 const { $api, navTo, navBack } = inject('globalFunction');
 import config from "@/config.js"
+// import CryptoJS from 'crypto-js'
 
 // state
 const title = ref('');
@@ -133,7 +134,7 @@ function getDataList(type = 'add') {
 		});
 	}
 }
-	
+
 
 // 播放视频
 async function playVideo(video) {
@@ -155,6 +156,12 @@ async function thirdLogin(){
 			contactperson: "",
 			contactphone: "",
 		}
+        //用户信息加密方法待更新
+        // let key = '9zS+DFKrzxvosO82mTcPJQ=='
+		// let secretKey = CryptoJS.enc.Utf8.parse(key);//key  为你的秘钥
+		// let srcs = CryptoJS.enc.Utf8.parse(form.idno);
+		// let encrypted = CryptoJS.AES.encrypt(srcs, secretKey, {mode:CryptoJS.mode.ECB,padding: CryptoJS.pad.Pkcs7}).toString()
+		// form.idno=encrypted
 	}else if (uni.getStorageSync('userInfo').isCompanyUser=='0') {
 		form={
 			usertype: "2",
diff --git a/packageCa/job/index.vue b/packageCa/job/index.vue
index 626bcb2..bc66f63 100644
--- a/packageCa/job/index.vue
+++ b/packageCa/job/index.vue
@@ -47,7 +47,6 @@
 			return {
 				kw: "", //搜索关键
 				user: uni.getStorageSync("CAuserInfo").user,
-				winHeight: wx.getWindowInfo().windowHeight,
 				jobDataList: [],
 				jobList,
 				scrollTop: 0, //tab标题的滚动条位置
diff --git a/packageCa/search/search.vue b/packageCa/search/search.vue
index a1e322a..e14dfd4 100644
--- a/packageCa/search/search.vue
+++ b/packageCa/search/search.vue
@@ -8,10 +8,10 @@
 						<text class="icon icon-101"></text>
 						<text class="title">职业测评</text>
 					</view>
-					<view  class="item" @click="navDetail(2)">
+					<!-- <view  class="item" @click="navDetail(2)">
 						<text class="icon icon-102"></text>
 						<text class="title">测评报告</text>
-					</view>
+					</view> -->
 				</view>
 				<view class="head-title">探索中心</view>
 				<view class="nav-block">
@@ -68,8 +68,7 @@
 			// 演示入
 			navDetail(index){
 				switch (index){
-					case 1:
-					case 2: {
+					case 1: {
 						uni.navigateTo({
 							url: "/packageCa/pagesTest/testList"
 						})
diff --git a/packageRc/components/PopupLists.vue b/packageRc/components/PopupLists.vue
index 589cf89..a52a462 100644
--- a/packageRc/components/PopupLists.vue
+++ b/packageRc/components/PopupLists.vue
@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view :class="{'h5-pc-page': isH5}">
 		<view class="popupAll">
 			<view class="tabList dispalyF" v-if="!allCheckShow">
 				<scroll-view scroll-x style="white-space: nowrap;width: calc(100% - 144rpx);margin-left: 32rpx">
@@ -32,12 +32,13 @@
 					class="popupList"
 					v-for="(item, index) in newCkeckData"
 					:key="index"
+					v-show="!item.hidden"
 				>
 					<view class="tabTitle">
 						{{ item.name }}
 					</view>
 					<view
-						class="dispalyF"
+						class="dispalyF filter-options-container"
 						:style="[
 							{
 								position: 'sticky',
@@ -47,29 +48,20 @@
 							},
 						]"
 					>
-						<template>
-							<template v-for="(itm, idx) in item.data">
-								<view :key="idx" v-if="!itm.mode"
-									@click="getActive(itm, index, idx)"
-									:class="
-										idx == item.activeIndex
-										? 'popupItem-active'
-										: 'popupItem'
-										"
-									style="margin-right: 20rpx"
-								>
-									{{ itm.dictLabel }}
-								</view>
-								<!-- <view v-if="itm.mode == 'timerange'">
-									{{itm.start||'开始时间'}} - {{ item.end||'结束时间' }}
-								</view> -->
-							</template>
+						<template v-for="(itm, idx) in item.data">
+							<view :key="idx" v-if="!itm.mode"
+								@click="getActive(itm, index, idx)"
+								:class="
+									idx == item.activeIndex
+									? 'popupItem-active'
+									: 'popupItem'
+									"
+							>
+								{{ itm.dictLabel }}
+							</view>
 						</template>
 					</view>
 				</view>
-				<!-- <view class="search_btn" @click="search">
-					查询
-				</view> -->
 				<view class="bottom-search">
 					<view class="search-left" @click="clearAll">
 						清空
@@ -77,7 +69,7 @@
 					<view class="search-right" @click="search">查询</view>
 				</view>
 				<view class="popupPic" @click="close">
-					<u-icon name="arrow-up"></u-icon>
+					<uni-icons type="arrow-up" color="#c0c4cc" :size="isH5 ? 20 : 16"></uni-icons>
 				</view>
 			</view>
 
@@ -102,7 +94,8 @@ export default {
 			params: "",
 			fijItem: "",
 			outData: [],
-			nickName: ''
+			nickName: '',
+			isH5: false
 		};
 	},
 	watch: {
@@ -114,9 +107,17 @@ export default {
 		},
 	},
 	mounted() {
-    if (uni.getStorageSync("userInfo")) {
-      let userInfo = JSON.parse(uni.getStorageSync("userInfo"));
-      this.nickName = userInfo.userName ? userInfo.userName : "";
+    // #ifdef H5
+    this.isH5 = true;
+    // #endif
+    const rawUserInfo = uni.getStorageSync("userInfo");
+    if (rawUserInfo) {
+      try {
+        let userInfo = typeof rawUserInfo === 'string' ? JSON.parse(rawUserInfo) : rawUserInfo;
+        this.nickName = userInfo.userName || userInfo.name || "";
+      } catch (e) {
+        console.error("解析用户信息失败", e);
+      }
     }
 	},
 	methods: {
@@ -256,7 +257,7 @@ export default {
 	overflow: hidden;
 	flex-wrap: nowrap;
 	width: 100%;
-	z-index: 9;
+	z-index: 105; /* 增加层级，确保在筛选条上方而不被遮挡 */
 
 	.tabItem {
 		line-height: 56rpx;
@@ -279,7 +280,7 @@ export default {
 		right: 0;
 		width: 87rpx;
 		height: 56rpx;
-		// background: linear-gradient(270deg, #2A51DF 0%, rgba(66, 110, 230, 0) 100%);
+    z-index: 100; /* 确保图标可点击 */
 	}
 
 	.tabrightBtn {
@@ -308,7 +309,6 @@ export default {
 		border: 1rpx solid #CAD4E2;
 		box-sizing: border-box;
 	}
-
 	.popupItem-active {
 		padding: 0 32rpx;
 		text-align: center;
@@ -328,15 +328,6 @@ export default {
 	}
 }
 
-.dispalyF {
-	display: flex;
-	align-items: center;
-}
-
-.rightView :last-child {
-	margin-right: 100rpx !important;
-}
-
 .bottom-search {
 	margin-top:56rpx;
 	display: flex;
@@ -371,4 +362,73 @@ export default {
 		justify-content: center;
 	}
 }
+
+/* #ifdef H5 */
+.h5-pc-page {
+  .tabList {
+    padding: 12px 0 !important;
+    background: #f5f7fa !important;
+    border-radius: 12px !important;
+    white-space: nowrap !important;
+    overflow: hidden !important;
+    display: flex !important;
+  }
+  .tabList .tabItem {
+    display: inline-block !important;
+    font-size: 20px !important;
+    line-height: 48px !important;
+    height: 48px !important;
+    padding: 0 24px !important;
+    border-radius: 24px !important;
+    width: auto !important;
+    min-width: 100px !important; /* 减小最小宽度，防止溢出 */
+    margin-right: 12px !important;
+    vertical-align: middle;
+    background-color: #ffffff !important;
+    flex-shrink: 0 !important;
+    box-sizing: border-box !important;
+  }
+  .tabItem.popupItem-active {
+    background-color: #1a62ce !important;
+    color: #fff !important;
+  }
+  .tabTitle {
+    font-size: 20px !important;
+    margin: 16px 0 12px !important;
+    font-weight: 600;
+    display: block !important;
+  }
+  .filter-options-container {
+    display: flex !important;
+    flex-wrap: wrap !important;
+    margin-top: 8px !important;
+    min-height: 40px !important; 
+  }
+  /* 仅针对展开后的筛选列表应用网格项样式，避免影响顶部 Tab */
+  .popupList .popupItem, 
+  .popupList .popupItem-active {
+    display: inline-flex !important;
+    align-items: center !important;
+    justify-content: center !important;
+    font-size: 20px !important;
+    line-height: 1.2 !important;
+    padding: 10px 24px !important;
+    margin: 0 16px 16px 0 !important;
+    border-radius: 8px !important;
+    border: 1px solid #CAD4E2 !important;
+    min-width: 140px !important;
+    height: auto !important;
+  }
+  .popupItem-active {
+    background-color: #1a62ce !important;
+    color: #fff !important;
+    border-color: #1a62ce !important;
+  }
+  .bottom-search .search-left, .bottom-search .search-right {
+    font-size: 20px !important;
+    height: 54px !important;
+    line-height: 54px !important;
+  }
+}
+/* #endif */
 </style>
diff --git a/packageRc/pages/daiban/addbangfu.vue b/packageRc/pages/daiban/addbangfu.vue
index 159914f..0776c28 100644
--- a/packageRc/pages/daiban/addbangfu.vue
+++ b/packageRc/pages/daiban/addbangfu.vue
@@ -566,15 +566,42 @@ export default {
       this.serviceForm.practicalSolutionTime = `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')} ${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}`;
     },
     
+    // 使用密码学安全随机源生成标识符
+    generateSecureId(length = 16) {
+      const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+      const charsLength = chars.length;
+      const randomBytes = new Uint8Array(length);
+
+      // H5/现代浏览器
+      if (typeof globalThis !== 'undefined' && globalThis.crypto && typeof globalThis.crypto.getRandomValues === 'function') {
+        globalThis.crypto.getRandomValues(randomBytes);
+      }
+      // 微信小程序环境
+      else if (typeof wx !== 'undefined' && typeof wx.getRandomValues === 'function') {
+        wx.getRandomValues(randomBytes);
+      }
+      // 兜底：若运行环境不支持 CSPRNG，显式报错，避免继续使用可预测随机数
+      else {
+        throw new Error('当前环境不支持密码学安全随机数，请在服务端生成标识符');
+      }
+
+      let id = '';
+      for (let i = 0; i < length; i++) {
+        id += chars[randomBytes[i] % charsLength];
+      }
+      return id;
+    },
+
     // 触发文件上传
     triggerFileUpload() {
       if (this.serviceForm.fileUrl.length < 6) {
         // 模拟添加文件
         const mockFiles = ['文档.pdf', '图片.jpg', '表格.xlsx', '报告.docx'];
-        const randomFile = mockFiles[Math.floor(Math.random() * mockFiles.length)];
+        const secureId = this.generateSecureId(20);
+        const randomFile = mockFiles[Date.now() % mockFiles.length];
         this.serviceForm.fileUrl.push({
           name: randomFile,
-          url: `mock-url/${Date.now()}/${randomFile}`
+          url: `mock-url/${secureId}/${randomFile}`
         });
       } else {
         uni.showToast({ title: '最多只能上传6个文件', icon: 'none' });
diff --git a/packageRc/pages/index/index.vue b/packageRc/pages/index/index.vue
index 6c8799c..479f683 100644
--- a/packageRc/pages/index/index.vue
+++ b/packageRc/pages/index/index.vue
@@ -1,11 +1,11 @@
 <!--
  * @Date: 2025-10-16 15:15:47
- * @LastEditors: lip
- * @LastEditTime: 2026-01-14 21:33:18
+ * @LastEditors: shirlwang
+ * @LastEditTime: 2026-01-27 09:30:18
 -->
 <template>
   <!-- @scroll="handleScroll" @scrolltolower="scrollBottom" -->
-  <scroll-view :scroll-y="true" class="container" style="background-image: url('../../../packageRc/static/pageBg.png');">
+  <scroll-view :scroll-y="true" class="container" :class="{'h5-pc-container': isH5}" :show-scrollbar="false" style="background-image: url(../../../packageRc/static/pageBgIndex.png);">
     <view style="padding: 40rpx 28rpx;">
          <!-- #ifdef MP-WEIXIN -->
       <view class="kinggang">
@@ -31,54 +31,70 @@
         </view>
       </view>
       <!-- #endif -->
-      <view class="tabs">
-        <view class="tab" :class="{active: pageState.type == ''}" @click="changeJobType('')">岗位列表</view>
-        <view class="tab" :class="{active: pageState.type == 2}" @click="changeJobType(2)">实习实训</view>
-        <view class="tab" :class="{active: pageState.type == 3}" @click="changeJobType(3)">社区实践</view>
-      </view>
-      <view class="titles">
-        <view class="title-item" :class="{active: activeTitle == 1}" @click="activeTitle = 1,getJobRecommed()"><view>推荐岗位</view></view>
-        <view class="title-item" :class="{active: activeTitle == 2}" @click="activeTitle = 2,getJobList()"><view>热门岗位</view></view>
-      </view>
-        <view v-for="(item, index) in jobList" :key="index" @click="nextDetail(item)" class="job-list">
-        <view class="top-line">
-          <view class="salary">{{item.minSalary}}-{{item.maxSalary}}/月</view>
-          <view class="time"><uni-icons color="#A2A2A2" type="info" size="12"></uni-icons>发布日期：{{ item.postingDate }}</view>
+      <view class="showtab">
+        <view class="tabItem" @click="changeType(1)">
+          <image src="/packageRc/static/gw.png"/>
+          <image v-show="tabType == 1" class="activeImg" src="/packageRc/static/activeTangle.png"/>
         </view>
-        <view class="title">{{ item.jobTitle }}</view>
-        <view class="infos">
-          <view>
-             <dict-Label dictType="education" :value="item.education"></dict-Label>
+        <view class="tabItem" @click="changeType(2)">
+          <image src="/packageRc/static/zc.png"/>
+          <image v-show="tabType == 2" class="activeImg" src="/packageRc/static/activeTangle.png"/>
+        </view>
+      </view>
+      <template v-if="tabType == 1">
+        <view class="tabs">
+          <view class="tab" :class="{active: pageState.type == ''}" @click="changeJobType('')">岗位列表</view>
+          <view class="tab" :class="{active: pageState.type == 2}" @click="changeJobType(2)">实习实训</view>
+          <view class="tab" :class="{active: pageState.type == 3}" @click="changeJobType(3)">社区实践</view>
+        </view>
+        <view class="titles">
+          <view class="title-item" :class="{active: activeTitle == 1}" @click="activeTitle = 1,getJobRecommed()"><view>推荐岗位</view></view>
+          <view class="title-item" :class="{active: activeTitle == 2}" @click="activeTitle = 2,getJobList()"><view>热门岗位</view></view>
+        </view>
+          <view v-for="(item, index) in jobList" :key="index" @click="nextDetail(item)" class="job-list">
+          <view class="top-line">
+            <view class="salary">{{item.minSalary}}-{{item.maxSalary}}/月</view>
+            <view class="time"><uni-icons color="#A2A2A2" type="info" :size="uniIconSize"></uni-icons>发布日期：{{ item.postingDate }}</view>
           </view>
-          <view>
-            <dict-Label dictType="experience" :value="item.experience"></dict-Label>
+          <view class="title">{{ item.jobTitle }}</view>
+          <view class="infos">
+            <view>
+              <dict-Label dictType="education" :value="item.education"></dict-Label>
+            </view>
+            <view>
+              <dict-Label dictType="experience" :value="item.experience"></dict-Label>
+            </view>
+            <view>{{ item.jobLocation }}</view>
+          </view>
+          <view class="bottom-line">
+            <view><uni-icons color="#A2A2A2" type="person" :size="uniIconSize"></uni-icons>{{item.vacancies}}人</view>
+            <view>{{ item.companyName }}</view>
           </view>
-          <view>{{ item.jobLocation }}</view>
         </view>
-        <view class="bottom-line">
-          <view><uni-icons color="#A2A2A2" type="person" size="12"></uni-icons>{{item.vacancies}}人</view>
-          <view>{{ item.companyName }}</view>
+        
+        <view class="view-more-btn" @click="viewMore">查看更多内容</view>
+
+      </template>
+      <template v-else>
+        <view class="titles" style="justify-content: space-between;">
+          <view class="title-item active"><view>政策专区</view></view>
+          <view class="more-link" @click="toPolicyList">{{'查看更多 >'}}</view>
         </view>
-       </view>
-      
-      <view class="view-more-btn" @click="viewMore">查看更多内容</view>
-      <view class="titles" style="justify-content: space-between;">
-        <view class="title-item active"><view>政策专区</view></view>
-        <view @click="toPolicyList">{{'查看更多 >'}}</view>
-      </view>
-      <view v-for="(item, index) in policyList" :key="index" class="job-list" @click="toPolicyDetail(item)">
-        <view class="sign">推荐</view>
-        <view class="title">
-          <image src="../../../packageRc/static/zcLeft.png"/>
-          {{item.zcmc}}</view>
-        <view class="infos">
-          <view v-if="item.zcLevel">{{item.zcLevel}}</view>
-          <view v-if="item.sourceUnit">{{item.sourceUnit}}</view>
+        <view v-for="(item, index) in policyList" :key="index" class="job-list" @click="toPolicyDetail(item)">
+          <view class="sign">推荐</view>
+          <view class="title">
+            <image src="../../../packageRc/static/zcLeft.png"/>
+            {{item.zcmc}}</view>
+          <view class="infos">
+            <view v-if="item.zcLevel">{{item.zcLevel}}</view>
+            <view v-if="item.sourceUnit">{{item.sourceUnit}}</view>
+          </view>
+          <view class="bottom-line">
+            <view class="time"><uni-icons color="#A2A2A2" type="info" :size="uniIconSize"></uni-icons>发布日期：{{item.createTime}}</view>
+            <view><uni-icons color="#A2A2A2" type="eye" :size="uniIconSize"></uni-icons>浏览量：{{item.viewNum || 0}}</view>
+          </view>
         </view>
-        <view class="bottom-line">
-          <view><uni-icons color="#A2A2A2" type="info" size="12"></uni-icons>发布日期：{{item.createTime}}</view>
-        </view>
-      </view>
+      </template>
     </view>
   </scroll-view>
 </template>
@@ -87,6 +103,13 @@
 import { reactive, inject, watch, ref, onMounted, watchEffect, nextTick } from 'vue';
 const { $api, navTo, vacanciesTo, formatTotal, config } = inject('globalFunction');
 
+const isH5 = ref(false);
+const uniIconSize = ref(18);
+// #ifdef H5
+isH5.value = true;
+uniIconSize.value = 20;
+// #endif
+
 import { getPolicyList } from '@/packageRc/apiRc/policy';
 let policyList = ref([])
 function getPolicy() {
@@ -94,7 +117,10 @@ function getPolicy() {
     policyList.value = res.rows
   })
 }
-
+let tabType = ref(1)
+function changeType(type) {
+  tabType.value = type
+}
 function toPolicyList() {
   navTo(`/packageRc/pages/policy/policyList?zclx=1`)
 }
@@ -114,6 +140,8 @@ onMounted(()=>{
   getPolicy();
 })
 
+
+
 function goCa(){
     if (checkLogin()) {
         const userInfo = uni.getStorageSync('userInfo')
@@ -221,6 +249,14 @@ function nextDetail(job) {
 </script>
 
 <style lang="less" scoped>
+/* 隐藏滚动条 */
+::-webkit-scrollbar {
+  display: none;
+  width: 0 !important;
+  height: 0 !important;
+  -webkit-appearance: none;
+  background: transparent;
+}
 view{box-sizing: border-box;display: block;}
 .container{
   background-color: #F4F4F4;background-position: top center;background-size: 100% auto;
@@ -312,10 +348,10 @@ view{box-sizing: border-box;display: block;}
   position: relative;
   .sign{
     position: absolute;
-    font-size: 24rpx;
+    font-size: 28rpx;
     right: 0;
     top: 0;
-    padding: 4rpx 14rpx;
+    padding: 8rpx 20rpx;
     border: 1rpx solid #EC4827;
     background: rgba(227, 79, 49, 0.09);
     border-top-right-radius: 24rpx;
@@ -377,4 +413,132 @@ view{box-sizing: border-box;display: block;}
   margin: 0 auto;
   margin-bottom: 20rpx;
 }
+.showtab{
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 40rpx;
+  .tabItem{
+    position: relative;
+    width: calc(50% - 8rpx);
+    height: 144rpx;
+  }
+  .activeImg{
+    position: absolute;
+    width: 143rpx;
+    height: 18rpx;
+    bottom: -24rpx;
+    right: 50%;
+    transform: translateX(50%);
+  }
+}
+
+/* #ifdef H5 */
+.h5-pc-container {
+  & > view {
+    width: 100% !important;
+    margin: 0 auto !important;
+    padding-left: 32px !important;
+    padding-right: 32px !important;
+    padding-top: 0 !important; /* 彻底移除顶部补白 */
+    box-sizing: border-box !important;
+  }
+
+  .showtab {
+    margin-top: 0 !important; /* 移除卡片顶部间距 */
+    margin-bottom: 120rpx;
+    height: 340rpx;
+    .tabItem {
+      height: 340rpx !important;
+      image:first-child {
+        width: 100%;
+        height: 100%;
+        object-fit: contain;
+      }
+    }
+    .activeImg {
+      width: 160rpx !important;
+      height: 20rpx !important;
+      bottom: -40rpx !important;
+    }
+  }
+
+  .tabs {
+    margin-bottom: 80rpx;
+    height: 120rpx;
+    border-radius: 20rpx !important;
+    background: #f8faff !important;
+    box-shadow: 0px 4rpx 15rpx rgba(0, 0, 0, 0.04);
+    .tab {
+      width: 33.3% !important;
+      line-height: 120rpx !important;
+      font-size: 20px !important;
+      border-radius: 16rpx !important;
+    }
+  }
+
+  .titles {
+    margin-top: 40rpx;
+    margin-bottom: 60rpx;
+    .title-item {
+      font-size: 24px !important;
+      font-weight: 600;
+      margin-right: 100rpx !important;
+      >view {
+        padding: 0 16rpx !important;
+      }
+      &::after {
+        height: 24rpx !important;
+        bottom: -12rpx !important;
+        width: 110% !important;
+      }
+    }
+    .more-link {
+       font-size: 20px !important;
+       color: #A2A2A2;
+    }
+  }
+
+  .job-list {
+    padding: 48rpx 40rpx !important;
+    margin-bottom: 32rpx !important;
+    border-radius: 24rpx !important;
+    border: 1px solid #f0f0f0;
+    box-shadow: 0px 2rpx 10rpx rgba(0, 0, 0, 0.02);
+    .sign {
+      font-size: 20px !important;
+      padding: 8rpx 20rpx !important;
+    }
+  }
+
+  .title {
+    font-size: 24px !important;
+    font-weight: 600;
+    margin-bottom: 24rpx !important;
+  }
+  .infos view {
+    font-size: 20px !important;
+    line-height: 1.5 !important;
+    padding: 10rpx 24rpx !important;
+    margin-bottom: 12rpx;
+    background: #f5f5f5 !important;
+    border-radius: 12rpx !important;
+  }
+  .salary {
+    font-size: 24px !important;
+    font-weight: 600;
+  }
+  .time {
+    font-size: 20px !important; /* 发布日期字号放大 */
+  }
+  .bottom-line {
+    font-size: 20px !important;
+    margin-top: 20rpx !important;
+  }
+  .view-more-btn {
+    font-size: 24px !important; /* 查看更多字号放大 */
+    padding: 20rpx 80rpx !important;
+    border-radius: 60rpx !important;
+  }
+}
+/* #endif */
 </style>
\ No newline at end of file
diff --git a/packageRc/pages/jobList/jobList.vue b/packageRc/pages/jobList/jobList.vue
index 32bd2ab..47a4650 100644
--- a/packageRc/pages/jobList/jobList.vue
+++ b/packageRc/pages/jobList/jobList.vue
@@ -70,7 +70,7 @@
             </view>
             
             <view class="company-grid">
-                <view class="company-item press-button" @click="navTo('/pages/job/publishJob')">
+                <view class="company-item press-button" @click="navTo('/packageA/pages/job/publishJob')">
                     <view class="company-icon company-icon-1">
                         <uni-icons type="plus-filled" size="32" color="#FFFFFF"></uni-icons>
                     </view>
@@ -400,11 +400,7 @@
     <!-- 筛选 -->
     <select-filter ref="selectFilterModel"></select-filter>
 
-    <!-- 微信授权登录弹窗 -->
-    <WxAuthLogin
-      ref="wxAuthLoginRef"
-      @success="handleLoginSuccess"
-    ></WxAuthLogin>
+
 
     <!--        <view class="maskFristEntry" v-if="maskFristEntry">
             <view class="entry-content">
@@ -531,7 +527,7 @@ import {
 } from "@/stores/useRecommedIndexedDBStore.js";
 import { useScrollDirection } from "@/hook/useScrollDirection";
 import { useColumnCount } from "@/hook/useColumnCount";
-import WxAuthLogin from "@/components/WxAuthLogin/WxAuthLogin.vue";
+
 import IconfontIcon from "@/components/IconfontIcon/IconfontIcon.vue";
 // 企业卡片组件已内联到模板中
 // 滚动状态管理
@@ -584,7 +580,7 @@ const loadmoreRef = ref(null);
 const conditionSearch = ref({});
 const waterfallcolumn = ref(2);
 const maskFristEntry = ref(false);
-const wxAuthLoginRef = ref(null);
+
 const state = reactive({
   tabIndex: "all",
 });
@@ -684,7 +680,7 @@ onMounted(() => {
 
   // 监听退出登录事件，显示微信登录弹窗
   uni.$on("showLoginModal", () => {
-    wxAuthLoginRef.value?.open();
+    uni.navigateTo({ url: '/pages/login/wx-login' });
   });
 });
 
@@ -712,8 +708,8 @@ watch(
 const checkLogin = () => {
   const tokenValue = uni.getStorageSync("token") || "";
   if (!tokenValue || !hasLogin.value) {
-    // 未登录，打开授权弹窗
-    wxAuthLoginRef.value?.open();
+    // 未登录，跳转到登录页面
+    uni.navigateTo({ url: '/pages/login/wx-login' });
     return false;
   }
   return true;
@@ -731,7 +727,7 @@ const handleLoginSuccess = () => {
 // 处理附近工作点击
 const handleNearbyClick = () => {
   if (checkLogin()) {
-    navTo("/pages/nearby/nearby");
+    navTo("/packageA/pages/nearby/nearby");
   }
 };
 
@@ -878,7 +874,7 @@ function navToService(serviceType) {
     // 'skill-evaluation': '/pages/service/skill-evaluation',
     "question-bank": "/pages/service/question-bank",
     "quality-assessment": "/pages/service/quality-assessment",
-    "ai-interview": "/pages/chat/chat",
+        "ai-interview": "/packageA/pages/chat/chat",
     "job-search": "/pages/search/search",
     "career-planning": "/pages/service/career-planning",
     "salary-query": "/pages/service/salary-query",
diff --git a/packageRc/pages/policy/policyDetail.vue b/packageRc/pages/policy/policyDetail.vue
index e6725fc..e23bd2f 100644
--- a/packageRc/pages/policy/policyDetail.vue
+++ b/packageRc/pages/policy/policyDetail.vue
@@ -1,6 +1,6 @@
 <template>
-	<view class="page" style="background-image: url('../../../packageRc/static/pageBg.png');">
-    <scroll-view :scroll-y="true" style="height: 100vh;position: relative;z-index: 1;">
+	<view class="page" :class="{'h5-pc-page': isH5}" style="background-image: url(../../../packageRc/static/pageBg.png);">
+    <scroll-view :scroll-y="true" style="height: 100vh;position: relative;z-index: 1;" :show-scrollbar="false">
       <view class="input-outer-part"
         style="padding: 24rpx 32rpx 0;max-height: unset;">
         <view class="basic-info-content-main" v-if="!loading">
@@ -21,6 +21,7 @@
 						<view class="infos">
 							<view class="info">发文单位：{{ policyDetail.sourceUnit }}</view>
 							<view class="info">发布时间：{{ policyDetail.publishTime || '--' }}</view>
+							<view class="info">浏览量：{{ policyDetail.viewNum || 0 }}</view>
 						</view>
 					</view>
           <view class="main-ceontent-list">
@@ -30,8 +31,8 @@
                 class="main-ceontent-list-item"
                 v-if="policyDetail.applicableObjects"
               >
-                <view class="main-ceontent-list-item-title">政策对象</view>
-                <view class="main-ceontent-list-item-content">
+                <view :class="['main-ceontent-list-item-title', isPc ? 'pc-main-ceontent-list-item-title' : '']">政策对象</view>
+                <view :class="['main-ceontent-list-item-content', isPc ? 'pc-main-ceontent-list-item-content' : '']">
                   <span
                     v-if="policyDetail.applicableObjects"
                     v-html="policyDetail.applicableObjects"
@@ -101,9 +102,15 @@ import { getPolicyDetail } from "@/packageRc/apiRc/policy";
 			return {
         policyDetail: {},
 				loading: false,
+				isH5: false,
+				isPc: false,
 			}
 		},
 		onLoad(options) {
+			// #ifdef H5
+			this.isH5 = true;
+			this.isPc = true;
+			// #endif
       this.getPolicy(options.id);
 		},
 		onShow() {
@@ -112,6 +119,23 @@ import { getPolicyDetail } from "@/packageRc/apiRc/policy";
 			getPolicy(id) {
         getPolicyDetail({id}).then(res => {
           this.policyDetail = res.data
+        }).catch(err => {
+          // #ifdef H5 || APP-PLUS
+          // 仅在测试环境下，注入大段文本验证排版
+          this.policyDetail = {
+            zcmc: '【条件编译测试】支持高校毕业生在本地创业就业的若干激励措施(接口失败模拟)',
+            zcLevel: '省级重点',
+            sourceUnit: '人社测试局',
+            publishTime: '2026-03-10',
+            viewNum: 9999,
+            applicableObjects: '1. 本市户籍的高校毕业生；<br/>2. 创业青年群体。',
+            policyExplanation: '本政策旨在吸引更多高素质人才留在本市发展。',
+            applyCondition: '具有全日制本科及以上学历且毕业在5年内。',
+            zczc: '最高50万元奖励，办公场地免租3年。',
+            btbz: '本科5000元/月，硕士10000元/月，连续发放3年。',
+            jbqd: '政务中心2楼窗口、线上小程序入口。'
+          }
+          // #endif
         })
 			},
 			getDictLabel(value, list) {
@@ -129,6 +153,14 @@ import { getPolicyDetail } from "@/packageRc/apiRc/policy";
 </script>
 
 <style lang="scss" scoped>
+/* 隐藏滚动条 */
+::-webkit-scrollbar {
+  display: none;
+  width: 0 !important;
+  height: 0 !important;
+  -webkit-appearance: none;
+  background: transparent;
+}
 	.page {
 		background-color: #f4f4f4 !important;
 		height: 100vh;
@@ -322,4 +354,64 @@ import { getPolicyDetail } from "@/packageRc/apiRc/policy";
     );
   }
 }
+
+/* #ifdef H5 */
+.h5-pc-page {
+	width: 100% !important;
+
+	.input-outer-part {
+		width: 80% !important;
+		margin: 0 auto !important;
+		padding-left: 0 !important;
+		padding-right: 0 !important;
+	}
+	.title-line {
+		font-size: 24px !important;
+    font-weight: 600;
+    line-height: 1.4 !important;
+	}
+	.infos {
+		font-size: 20px !important;
+    line-height: 1.8 !important;
+    .info {
+      margin-top: 10rpx !important;
+    }
+	}
+	.main-ceontent-list-item-title {
+		font-size: 24px !important;
+    font-weight: 600;
+		line-height: 1.6 !important;
+    margin-bottom: 24rpx !important;
+	}
+	.main-ceontent-list-item-content {
+		font-size: 20px !important;
+		line-height: 1.6 !important;
+    padding: 24rpx !important;
+	}
+	.tag {
+		font-size: 20px !important;
+	}
+  .main-ceontent-list-title {
+    font-size: 24px !important;
+    font-weight: 600 !important;
+  }
+  .part-title {
+    font-size: 24px !important;
+    font-weight: 600 !important;
+  }
+  .part-info {
+    font-size: 20px !important;
+  }
+  .notice-list .title {
+    font-size: 24px !important;
+    font-weight: 600 !important;
+  }
+  .notice-content {
+    font-size: 20px !important;
+  }
+  .enclosure-item {
+    font-size: 20px !important;
+  }
+}
+/* #endif */
 </style>
diff --git a/packageRc/pages/policy/policyList.vue b/packageRc/pages/policy/policyList.vue
index 8b1aaed..db1eff4 100644
--- a/packageRc/pages/policy/policyList.vue
+++ b/packageRc/pages/policy/policyList.vue
@@ -1,388 +1,579 @@
 <template>
-	<view class="page" style="background-image: url('../../../packageRc/static/pageBg.png');">
-		<view class="input-outer-part"
-			style="padding: 24rpx 32rpx 0;max-height: unset;">
-			<view class="search-line">
-				<input style="width: 100%;" placeholder="请输入政策名称进行搜索" v-model="queryParams.searchValue" border="none" />
-				<img src="https://rc.jinan.gov.cn/qcwjyH5/static/images/person/search.png" class="search-icon" @click="search()" />
-			</view>
-			<view v-if="total" style="position: relative;padding: 32rpx 0;color: #000;">
-			<!-- <view v-if="total" style="position: relative;padding-bottom: 16px;color: #000;"> -->
-				<text>共 {{ total }} 条</text>
-			</view>
-			<!-- <scroll-view :scroll-y="true" style="height: calc(100vh - 342rpx);position: relative;z-index: 1;" -->
-			<scroll-view :scroll-y="true" style="height: calc(100vh - 232rpx);position: relative;z-index: 1;"
-				@scrolltolower="getBottomList">
-        <view style="margin-bottom: 24rpx;border-radius: 16rpx;" class="policy-list" v-for="(item, index) in tableData" :key="index" @click="goPolicyDetail(item)">
+  <view
+    class="page" :class="{'h5-pc-page': isH5}"
+    style="
+      background-image: url(../../../packageRc/static/pageBg.png);
+    "
+  >
+    <view
+      class="input-outer-part"
+      style="padding: 24rpx 32rpx 0; max-height: unset"
+    >
+      <view class="search-line">
+        <input
+          style="width: 100%"
+          placeholder="请输入政策名称进行搜索"
+          v-model="queryParams.searchValue"
+          border="none"
+        />
+        <img
+          src="https://rc.jinan.gov.cn/qcwjyH5/static/images/person/search.png"
+          class="search-icon"
+          @click="search()"
+        />
+      </view>
+      <view
+        class="inner"
+        :style="{
+          width: 'calc(100% + 64rpx)',
+          marginLeft: '-32rpx',
+          height: zctopShow ? 'auto' : '122rpx',
+          position: 'relative',
+          zIndex: zctopShow ? 100 : 2,
+        }"
+      >
+        <PopupList
+          :checkData="checkData"
+          @searchCheck="search"
+          ref="PopupList"
+          @popupSearch="popupSearch"
+        />
+      </view>
+      <view
+        v-if="total"
+        style="position: relative; padding: 32rpx 0; color: #000"
+      >
+        <!-- <view v-if="total" style="position: relative;padding-bottom: 16px;color: #000;"> -->
+        <text class="total-count">共 {{ total }} 条</text>
+      </view>
+      <!-- <scroll-view :scroll-y="true" style="height: calc(100vh - 342rpx);position: relative;z-index: 1;" -->
+      <scroll-view
+        :scroll-y="true"
+        style="height: calc(100vh - 354rpx); position: relative; z-index: 1"
+        @scrolltolower="getBottomList"
+        :show-scrollbar="false"
+      >
+        <view
+          style="margin-bottom: 24rpx; border-radius: 16rpx"
+          class="policy-list"
+          v-for="(item, index) in tableData"
+          :key="index"
+          @click="goPolicyDetail(item)"
+        >
           <view class="title">
-            <image src="../../../packageRc/static/zcLeft.png"/>
-            {{item.zcmc}}</view>
+            <image src="../../../packageRc/static/zcLeft.png" />
+            {{ item.zcmc }}</view
+          >
           <view class="infos">
-            <view v-if="item.zcLevel">{{item.zcLevel}}</view>
-            <view v-if="item.sourceUnit">{{item.sourceUnit}}</view>
+            <view v-if="item.zcLevel">{{ item.zcLevel }}</view>
+            <view v-if="item.sourceUnit">{{ item.sourceUnit }}</view>
           </view>
           <view class="bottom-line">
-            <view><uni-icons color="#A2A2A2" type="info" size="12"></uni-icons>发文日期：{{item.publishTime}}</view>
+            <view>
+              <uni-icons color="#A2A2A2" type="info" :size="uniIconSize"></uni-icons>
+              发文日期：{{ item.publishTime }}
+            </view>
+            <view>
+              <uni-icons color="#A2A2A2" type="eye" :size="uniIconSize"></uni-icons>
+              浏览量：{{ item.viewNum || 0 }}
+            </view>
           </view>
         </view>
-				<view style="padding-bottom: 24rpx;">
-					<img v-if="!total&&!loading" src="https://rc.jinan.gov.cn/qcwjyH5/static/images/person/empty.png"
-						style="width: 100%;display: block;margin: 0 auto;" />
-					<view v-if="loading"><u-loading-icon></u-loading-icon>
-						<view style="text-align: center;color: #8E8E8E;font-size: 24rpx;">加载中~</view>
-					</view>
-					<view v-else-if="showMorePage" style="text-align: center;color: #1A62CE;font-size: 24rpx;">加载更多
-					</view>
-					<view style="text-align: center;color: #8E8E8E;font-size: 24rpx;" v-else>没有更多数据了~</view>
-				</view>  
-			</scroll-view>
-		</view>
-	</view>
+        <view style="padding-bottom: 24rpx">
+          <img
+            v-if="!total && !loading"
+            src="https://rc.jinan.gov.cn/qcwjyH5/static/images/person/empty.png"
+            style="width: 100%; display: block; margin: 0 auto"
+          />
+          <view v-if="loading">
+            <uni-load-more status="loading" :content-text="{contentrefresh: '加载中~'}"></uni-load-more>
+          </view>
+          <view
+            v-else-if="showMorePage"
+            style="text-align: center; color: #1a62ce; font-size: 24rpx"
+            >加载更多
+          </view>
+          <view
+            style="text-align: center; color: #8e8e8e; font-size: 24rpx"
+            v-else
+            >没有更多数据了~</view
+          > </view
+        >  
+      </scroll-view>
+    </view>
+  </view>
 </template>
 <script>
-	import PopupList from "/packageRc/components/PopupLists.vue";
+import PopupList from "/packageRc/components/PopupLists.vue";
 import { getPolicyList } from "@/packageRc/apiRc/policy";
-	export default {
-		components: {
-			PopupList,
-		},
-		data() {
-			return {
-				queryParams: {
-					pageNum: 1,
-					pageSize: 10,
-				},
-				total: 0,
-				showMorePage: true,
-				tableData: [],
-				loading: false,
-			}
-		},
-		onLoad(options) {
-			this.queryParams.zclx = options.zclx
-		},
-		onShow() {
-			this.search();
-		},
-		methods: {
-			goPolicyDetail(item) {
-				uni.navigateTo({
-					url: `/packageRc/pages/policy/policyDetail?id=${item.id}`
-				})
-			},
-			search() {
-				this.showMorePage = true;
-				this.queryParams.pageNum = 1;
-				this.queryParams.pageSize = 20;
-				this.tableData = [];
-				this.total = 0;
-				this.getList();
-			},
-			// 触底加载
-			getBottomList() {
-				if (
-					this.queryParams.pageNum * this.queryParams.pageSize >=
-					this.total
-				) {
-					this.showMorePage = false;
-				} else if (
-					this.queryParams.pageNum * this.queryParams.pageSize <
-					this.total
-				) {
-					this.queryParams.pageNum++;
-					this.getList();
-					if (
-						this.queryParams.pageNum * this.queryParams.pageSize >=
-						this.total
-					) {
-						this.showMorePage = false;
-					}
-				}
-			},
-			// 获取列表
-			async getList() {
-				this.loading = true;
-        getPolicyList(this.queryParams).then((res) => {
-          this.gettedData(res)
+import { getDicts } from "@/packageRc/apiRc/system/dict";
+export default {
+  components: {
+    PopupList,
+  },
+  data() {
+    return {
+      uniIconSize: 18,
+      isH5: false,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      total: 0,
+      showMorePage: true,
+      tableData: [],
+      loading: false,
+      checkData: [],
+      zctopShow: false,
+      policyTypeMList: [],
+    };
+  },
+  onLoad(options) {
+    // #ifdef H5
+    this.uniIconSize = 20;
+    this.isH5 = true;
+    // #endif
+    this.queryParams.zclx = options.zclx;
+    this.getCheckData();
+  },
+  onShow() {
+    this.search();
+  },
+  watch: {
+    "checkData": {
+      handler(newVal) {
+        if (!newVal || newVal.length < 3 || !this.policyTypeMList.length) return;
+        const typeL = newVal[0].data[newVal[0].activeIndex].dictValue;
+
+        // 政策类型不选时，不显示二级分类
+        const isHidden = !typeL;
+        if (newVal[1].hidden !== isHidden) {
+          this.$set(newVal[1], "hidden", isHidden);
+        }
+
+        // 政策类型不选时，确保二级分类已选索引重置为0（全部）
+        if (isHidden && newVal[1].activeIndex !== 0) {
+          this.$set(newVal[1], "activeIndex", 0);
+        }
+
+        let filtered = [];
+        if (typeL) {
+          filtered = this.policyTypeMList.filter((item) =>
+            item.dictValue.startsWith(typeL)
+          );
+        } else {
+          filtered = this.policyTypeMList;
+        }
+
+        // Only update if data changed to avoid infinite loop
+        const newData = [{ dictLabel: "全部", dictValue: "" }].concat(filtered);
+        if (JSON.stringify(newVal[1].data) !== JSON.stringify(newData)) {
+          this.$set(newVal[1], "data", newData);
+          this.$set(newVal[1], "activeIndex", 0);
+        }
+      },
+      deep: true,
+    },
+  },
+  methods: {
+    async getCheckData() {
+      const resLevel = await getDicts("zc_level");
+      const resType1 = await getDicts("policy_type1");
+      const resType2 = await getDicts("policy_type2");
+      this.policyTypeMList = resType2.data;
+
+      const type1Data = [{ dictLabel: "全部", dictValue: "" }].concat(
+        resType1.data || []
+      );
+      // policyTypeL 与 zclx 不相关，不再使用 zclx 初始化
+      const initialTypeLIndex = type1Data.findIndex(
+        (item) => item.dictValue == this.queryParams.policyTypeL
+      );
+
+      this.checkData = [
+        {
+          name: "政策类型",
+          type: "policyTypeL",
+          data: type1Data,
+          activeIndex: initialTypeLIndex > -1 ? initialTypeLIndex : 0,
+        },
+        {
+          name: "二级分类",
+          type: "policyTypeM",
+          data: [{ dictLabel: "全部", dictValue: "" }].concat(resType2.data || []),
+          activeIndex: 0,
+          hidden: true,
+        },
+        {
+          name: "政策级别",
+          type: "zcLevel",
+          data: [{ dictLabel: "全部", dictValue: "" }].concat(resLevel.data || []),
+          activeIndex: 0,
+        },
+      ];
+    },
+    popupSearch(data) {
+      // 获取此次提交前，旧的政策类型值
+      const oldTypeL = this.queryParams.policyTypeL || "";
+
+      // 获取弹窗提交的实时选值
+      const selections = {};
+      data.forEach((item) => {
+        const active = item.data[item.activeIndex];
+        selections[item.type] = active.dictLabel === "全部" ? "" : active.dictValue;
+      });
+
+      // 核心判定逻辑：
+      // 如果发现“政策类型(policyTypeL)”发生了变化
+      if (selections.policyTypeL !== oldTypeL) {
+        // 如果改变成了具体的分类，且二级分类传过来的不是该分类下的子类（说明是残留选项没来得及重置）
+        // 或者是变回了“全部”
+        // 那么必须强制清空二级分类
+        if (!selections.policyTypeL || (selections.policyTypeM && !selections.policyTypeM.startsWith(selections.policyTypeL))) {
+            selections.policyTypeM = "";
+            const typeMItem = data.find((it) => it.type === "policyTypeM");
+            if (typeMItem) typeMItem.activeIndex = 0;
+        }
+      }
+
+      // 将最终确定的值同步到查询参数中
+      Object.keys(selections).forEach((key) => {
+        this.$set(this.queryParams, key, selections[key]);
+      });
+
+      this.search();
+    },
+    goPolicyDetail(item) {
+      uni.navigateTo({
+        url: `/packageRc/pages/policy/policyDetail?id=${item.id}`,
+      });
+    },
+    search() {
+      this.showMorePage = true;
+      this.queryParams.pageNum = 1;
+      this.queryParams.pageSize = 20;
+      this.tableData = [];
+      this.total = 0;
+      this.getList();
+    },
+    // 触底加载
+    getBottomList() {
+      if (this.queryParams.pageNum * this.queryParams.pageSize >= this.total) {
+        this.showMorePage = false;
+      } else if (
+        this.queryParams.pageNum * this.queryParams.pageSize <
+        this.total
+      ) {
+        this.queryParams.pageNum++;
+        this.getList();
+        if (
+          this.queryParams.pageNum * this.queryParams.pageSize >=
+          this.total
+        ) {
+          this.showMorePage = false;
+        }
+      }
+    },
+    // 获取列表
+    async getList() {
+      this.loading = true;
+      getPolicyList(this.queryParams).then((res) => {
+        this.gettedData(res);
+      });
+    },
+    gettedData(res) {
+      if (res.code == 200) {
+        if (res.rows.length < 10) {
+          this.showMorePage = false;
+        }
+        this.loading = false;
+        this.tableData = this.tableData.concat(res.rows);
+        this.total = res.total;
+      } else {
+        this.loading = false;
+        // #ifdef H5 || APP-PLUS
+        // 接口返回非 200 或失败时展示测试数据 (条件编译)
+        this.tableData = [
+          { id: '1', zcmc: '测试政策001：关于进一步支持人才发展的若干措施（条件编译测试数据）', publishTime: '2026-03-10', viewNum: 888, zcLevel: '省级', sourceUnit: '模拟测试部' },
+          { id: '2', zcmc: '测试政策002：高校毕业生创业补贴申请指南（条件编译测试数据）', publishTime: '2026-03-10', viewNum: 666, zcLevel: '市级', sourceUnit: '人力资源局' }
+        ];
+        this.total = 2;
+        // #endif
+        uni.showToast({
+          title: res.msg || '获取列表失败',
+          icon: "none",
         });
-			},
-			gettedData(res) {
-				if (res.code == 200) {
-					if (res.rows.length < 10) {
-						this.showMorePage = false;
-					}
-					this.loading = false;
-					this.tableData = this.tableData.concat(res.rows);
-					this.total = res.total;
-				} else {
-					this.loading = false;
-					uni.showToast({
-						title: res.msg,
-						icon: "none",
-					});
-				}
-			},
-		}
-	}
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.page {
-		background-color: #f4f4f4 !important;
-		height: 100vh;
-		background-repeat: no-repeat;
-		background-size: 100% auto;
-	}
-
-	.search-line {
-		border-radius: 32px;
-		background: #FFFFFF;
-		box-sizing: border-box;
-		border: 1px solid #107AFD;
-		height: 64rpx;
-		border-radius: 32rpx;
-		padding: 0 32rpx;
-		display: flex;
-		align-items: center;
-		position: relative;
-		z-index: 1;
-		margin-top: 24rpx;
-
-		.search-icon {
-			width: 40rpx;
-			height: 40rpx;
-		}
-	}
-
-	.job-item {
-		position: relative;
-		margin-bottom: 24rpx;
-		background: #fff;
-		border-radius: 16rpx;
-		.item_btn{
-			height: 100rpx;
-			border-top: 1px solid #e3e8ee;
-		}
-		.line{
-			position: absolute;
-			right: 50%;
-			bottom: 20rpx;
-			width: 1px;
-			height: 60rpx;
-			background-color: #e3e8ee;
-		}
-		.status-card {
-			position: absolute;
-			right: 0;
-			top: 0;
-			border-radius: 0 16rpx 0 16rpx;
-			width: 160rpx;
-			line-height: 40rpx;
-			text-align: center;
-			color: #fff;
-			background: #B2C0D1;
-			border: 1px solid #9BA9B9;
-			font-size: 24rpx;
-
-			&.in {
-				background: #29D297;
-				border: 1px solid #1BBA83;
-			}
-
-			&.out {
-				background: #ECB83D;
-				border: 1px solid #D7892B;
-			}
-
-			&.far {
-				background: #EC7737;
-				border: 1px solid #C24F1A;
-			}
-		}
-
-		.top-container {
-			padding: 32rpx;
-
-			// margin-bottom: 24rpx;
-			.title-line {
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				font-size: 32rpx;
-				font-weight: bold;
-				margin-bottom: 16rpx;
-
-				.type-tag {
-					line-height: 40rpx;
-					width: 128rpx;
-					font-size: 24rpx;
-					color: #fff;
-					text-align: center;
-
-					&.qz {
-						background: #28CB5E;
-					}
-
-					&.yz {
-						background: #DD6728;
-					}
-
-					&.cy {
-						background: #23B5C5;
-					}
-
-					&.px {
-						background: #DDA728;
-					}
-
-					&.qt {
-						background: #2870DD;
-					}
-				}
-
-				.title {
-					color: #3D3D3D;
-					width: calc(100% - 137rpx);
-					overflow: hidden;
-					text-overflow: ellipsis;
-					white-space: nowrap;
-					line-height: 40rpx;
-				}
-
-				.salary {
-					width: 33%;
-					color: #FA6553;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					white-space: nowrap;
-					text-align: right
-				}
-			}
-
-			.info {
-				color: #3D3D3D;
-				margin-bottom: 7rpx;
-				font-size: 28rpx;
-				white-space: nowrap;
-				overflow: hidden;
-				text-overflow: ellipsis;
-
-				text {
-					color: #8E8E8E;
-				}
-
-				.not {
-					color: #EC7737;
-					font-weight: bold;
-				}
-
-				.ing {
-					color: #ECB83D;
-					font-weight: bold;
-				}
-
-				.finish {
-					color: #21C88D;
-					font-weight: bold;
-				}
-			}
-		}
-
-		.function-btn {
-			color: #BF5818;
-			border-top: 1px solid #E2E8EF;
-			padding-bottom: 6rpx;
-			line-height: 90rpx;
-			text-align: center;
-		}
-	}
-
-	.self-form {
-		padding: 32rpx;
-
-		.bordered {
-			border: 1rpx solid #dadbde;
-			padding: 9px;
-			border-radius: 4px;
-		}
-	}
-
-	.button-area {
-		padding: 24rpx 32rpx 68rpx;
-		background: #fff;
-		display: flex;
-		box-sizing: border-box;
-		border-radius: 16px 16px 0px 0px;
-		box-shadow: 0 0 5px rgba(0, 0, 0, 0.1);
-
-		.btn {
-			line-height: 72rpx;
-			width: 176rpx;
-			margin-right: 16rpx;
-			font-size: 28rpx;
-			border: 1px solid #B8C5D4;
-			color: #282828;
-			text-align: center;
-			border-radius: 8rpx;
-		}
-
-		.reset {
-			background: #DCE2E9;
-		}
-
-		.save {
-			background: linear-gradient(103deg, #1D64CF 0%, #1590D4 99%);
-			color: #fff;
-			border: 0;
-			flex-grow: 1;
-		}
-	}
-
-	.noValue {
-		color: rgb(192, 196, 204);
-	}
-
-	.addNeeds {
-		position: fixed;
-		right: 0;
-		bottom: 150rpx;
-		width: 150rpx;
-		overflow: hidden;
-		z-index: 10;
-		border-radius: 44rpx;
-		border-radius: 75rpx;
-
-		img {
-			display: block;
-			width: 100%;
-		}
-	}
-	
-	.df_flex{
-		display: flex;
-		view{
-			flex-grow: 1;
-			text-align: center;
-			color: #4c6efb;
-		}
+/* 隐藏滚动条 */
+::-webkit-scrollbar {
+  display: none;
+  width: 0 !important;
+  height: 0 !important;
+  -webkit-appearance: none;
+  background: transparent;
 }
-.df_flex_1{
-	flex: 1;
+.page {
+  background-color: #f4f4f4 !important;
+  height: 100vh;
+  background-repeat: no-repeat;
+  background-size: 100% auto;
+}
+
+.search-line {
+  border-radius: 32px;
+  background: #ffffff;
+  box-sizing: border-box;
+  border: 1px solid #107afd;
+  height: 64rpx;
+  border-radius: 32rpx;
+  padding: 0 32rpx;
+  display: flex;
+  align-items: center;
+  position: relative;
+  z-index: 110;
+  margin-top: 24rpx;
+
+  .search-icon {
+    width: 40rpx;
+    height: 40rpx;
+  }
+}
+
+.job-item {
+  position: relative;
+  margin-bottom: 24rpx;
+  background: #fff;
+  border-radius: 16rpx;
+  .item_btn {
+    height: 100rpx;
+    border-top: 1px solid #e3e8ee;
+  }
+  .line {
+    position: absolute;
+    right: 50%;
+    bottom: 20rpx;
+    width: 1px;
+    height: 60rpx;
+    background-color: #e3e8ee;
+  }
+  .status-card {
+    position: absolute;
+    right: 0;
+    top: 0;
+    border-radius: 0 16rpx 0 16rpx;
+    width: 160rpx;
+    line-height: 40rpx;
+    text-align: center;
+    color: #fff;
+    background: #b2c0d1;
+    border: 1px solid #9ba9b9;
+    font-size: 24rpx;
+
+    &.in {
+      background: #29d297;
+      border: 1px solid #1bba83;
+    }
+
+    &.out {
+      background: #ecb83d;
+      border: 1px solid #d7892b;
+    }
+
+    &.far {
+      background: #ec7737;
+      border: 1px solid #c24f1a;
+    }
+  }
+
+  .top-container {
+    padding: 32rpx;
+
+    // margin-bottom: 24rpx;
+    .title-line {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      font-size: 32rpx;
+      font-weight: bold;
+      margin-bottom: 16rpx;
+
+      .type-tag {
+        line-height: 40rpx;
+        width: 128rpx;
+        font-size: 24rpx;
+        color: #fff;
+        text-align: center;
+
+        &.qz {
+          background: #28cb5e;
+        }
+
+        &.yz {
+          background: #dd6728;
+        }
+
+        &.cy {
+          background: #23b5c5;
+        }
+
+        &.px {
+          background: #dda728;
+        }
+
+        &.qt {
+          background: #2870dd;
+        }
+      }
+
+      .title {
+        color: #3d3d3d;
+        width: calc(100% - 137rpx);
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        line-height: 40rpx;
+      }
+
+      .salary {
+        width: 33%;
+        color: #fa6553;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        text-align: right;
+      }
+    }
+
+    .info {
+      color: #3d3d3d;
+      margin-bottom: 7rpx;
+      font-size: 28rpx;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+
+      text {
+        color: #8e8e8e;
+      }
+
+      .not {
+        color: #ec7737;
+        font-weight: bold;
+      }
+
+      .ing {
+        color: #ecb83d;
+        font-weight: bold;
+      }
+
+      .finish {
+        color: #21c88d;
+        font-weight: bold;
+      }
+    }
+  }
+
+  .function-btn {
+    color: #bf5818;
+    border-top: 1px solid #e2e8ef;
+    padding-bottom: 6rpx;
+    line-height: 90rpx;
+    text-align: center;
+  }
+}
+
+.self-form {
+  padding: 32rpx;
+
+  .bordered {
+    border: 1rpx solid #dadbde;
+    padding: 9px;
+    border-radius: 4px;
+  }
+}
+
+.button-area {
+  padding: 24rpx 32rpx 68rpx;
+  background: #fff;
+  display: flex;
+  box-sizing: border-box;
+  border-radius: 16px 16px 0px 0px;
+  box-shadow: 0 0 5px rgba(0, 0, 0, 0.1);
+
+  .btn {
+    line-height: 72rpx;
+    width: 176rpx;
+    margin-right: 16rpx;
+    font-size: 28rpx;
+    border: 1px solid #b8c5d4;
+    color: #282828;
+    text-align: center;
+    border-radius: 8rpx;
+  }
+
+  .reset {
+    background: #dce2e9;
+  }
+
+  .save {
+    background: linear-gradient(103deg, #1d64cf 0%, #1590d4 99%);
+    color: #fff;
+    border: 0;
+    flex-grow: 1;
+  }
+}
+
+.noValue {
+  color: rgb(192, 196, 204);
+}
+
+.addNeeds {
+  position: fixed;
+  right: 0;
+  bottom: 150rpx;
+  width: 150rpx;
+  overflow: hidden;
+  z-index: 10;
+  border-radius: 44rpx;
+  border-radius: 75rpx;
+
+  img {
+    display: block;
+    width: 100%;
+  }
+}
+
+.df_flex {
+  display: flex;
+  view {
+    flex-grow: 1;
+    text-align: center;
+    color: #4c6efb;
+  }
+}
+.df_flex_1 {
+  flex: 1;
 }
 .df__direction_column {
-	flex-direction: column;
+  flex-direction: column;
 }
-.df_align_center{
-	align-items: center;
+.df_align_center {
+  align-items: center;
 }
-.df_justify_center{
-	justify-content: center;
+.df_justify_center {
+  justify-content: center;
 }
-.df_content_between{
-	justify-content: space-between;
+.df_content_between {
+  justify-content: space-between;
 }
-.df_shrink_0{
-	flex-shrink: 0;
+.df_shrink_0 {
+  flex-shrink: 0;
 }
 
 /* 日期选择器样式 */
@@ -405,73 +596,138 @@ import { getPolicyList } from "@/packageRc/apiRc/policy";
 
 .date-value {
   color: #333;
-  width: 100%
+  width: 100%;
 }
 
-.policy-list{
+.policy-list {
   width: 100%;
   margin: 0 auto;
   color: #333333;
   border-radius: 24rpx;
-  background: #FFFFFF;
+  background: #ffffff;
   padding: 32rpx;
   margin-bottom: 24rpx;
   box-sizing: border-box;
   position: relative;
-  .sign{
+  .sign {
     position: absolute;
     font-size: 24rpx;
     right: 0;
     top: 0;
     padding: 4rpx 14rpx;
-    border: 1rpx solid #EC4827;
+    border: 1rpx solid #ec4827;
     background: rgba(227, 79, 49, 0.09);
     border-top-right-radius: 24rpx;
     border-bottom-left-radius: 24rpx;
-    color: #EC4827;
+    color: #ec4827;
   }
-  .top-line{
+  .top-line {
     display: flex;
     justify-content: space-between;
     font-size: 24rpx;
-    color: #A2A2A2;
+    color: #a2a2a2;
     margin-bottom: 16rpx;
-    .salary{
+    .salary {
       font-size: 32rpx;
-      color: #4C6EFB;
+      color: #4c6efb;
       font-weight: bold;
     }
   }
-  .title{
+  .title {
     font-size: 32rpx;
     font-weight: bold;
     color: #282828;
     margin-bottom: 16rpx;
     display: flex;
-    image{
+    image {
       width: 46rpx;
       height: 46rpx;
       margin-right: 11rpx;
     }
   }
-  .infos{
+  .infos {
     display: flex;
     flex-wrap: wrap;
     font-size: 24rpx;
     margin-bottom: 16rpx;
     line-height: 42rpx;
-    view{
+    view {
       padding: 0 16rpx;
       margin-right: 10rpx;
-      background: #F2F2F2;
+      background: #f2f2f2;
     }
   }
-  .bottom-line{
+  .bottom-line {
     display: flex;
     justify-content: space-between;
     font-size: 24rpx;
-    color: #A2A2A2;
+    color: #a2a2a2;
     margin-top: 12rpx;
   }
 }
+
+/* #ifdef H5 */
+.h5-pc-page {
+  width: 100% !important;
+
+  .input-outer-part {
+    width: 100% !important;
+    margin: 0 auto !important;
+    padding-left: 32px !important;
+    padding-right: 32px !important;
+    box-sizing: border-box !important;
+  }
+
+  .total-count {
+    font-size: 20px !important;
+    margin: 20px 0 !important;
+    display: block;
+  }
+  .policy-list {
+    margin-bottom: 24px !important;
+    padding: 32px !important;
+  }
+  .title {
+    font-size: 24px !important;
+    font-weight: 600;
+    margin-bottom: 16px !important;
+  }
+  .infos {
+    margin-bottom: 16px !important;
+    view {
+      font-size: 18px !important;
+      line-height: 1.6 !important;
+      padding: 4px 12px !important;
+      margin-right: 12px !important;
+    }
+  }
+  .bottom-line {
+    font-size: 18px !important;
+    margin-top: 16px !important;
+    display: flex;
+    align-items: center;
+    border-top: 1px solid #f0f0f0;
+    padding-top: 16px;
+  }
+  .bottom-line uni-icons {
+    font-size: 20px !important;
+    margin-right: 8rpx;
+  }
+  input {
+    font-size: 20px !important;
+    height: 48px !important;
+  }
+  .search-line {
+    height: 80rpx !important;
+  }
+  .policy-list .title image {
+    width: 56rpx !important;
+    height: 56rpx !important;
+    margin-right: 16rpx !important;
+  }
+  .loading-text {
+    font-size: 20px !important;
+  }
+}
+/* #endif */
 </style>
diff --git a/packageRc/static/activeTangle.png b/packageRc/static/activeTangle.png
new file mode 100644
index 0000000..18e2824
Binary files /dev/null and b/packageRc/static/activeTangle.png differ
diff --git a/packageRc/static/gw.png b/packageRc/static/gw.png
new file mode 100644
index 0000000..3319d6f
Binary files /dev/null and b/packageRc/static/gw.png differ
diff --git a/packageRc/static/pageBgIndex.png b/packageRc/static/pageBgIndex.png
new file mode 100644
index 0000000..5158235
Binary files /dev/null and b/packageRc/static/pageBgIndex.png differ
diff --git a/packageRc/static/zc.png b/packageRc/static/zc.png
new file mode 100644
index 0000000..89ea0d1
Binary files /dev/null and b/packageRc/static/zc.png differ
diff --git a/pages.json b/pages.json
index 3cc332c..12fe0cb 100644
--- a/pages.json
+++ b/pages.json
@@ -3,7 +3,16 @@
       {
         "path": "pages/index/index",
         "style": {
-          "navigationBarTitleText": "喀什智慧就业平台"
+          "navigationBarTitleText": "喀什智慧就业平台",
+          // #ifdef H5
+          "navigationStyle": "custom"
+          // #endif
+        }
+      },
+      {
+        "path": "pages/city-select/index",
+        "style": {
+          "navigationBarTitleText": "选择城市"
         }
       },
       {
@@ -24,62 +33,6 @@
           "navigationBarTitleText": "招聘会"
         }
       },
-      {
-        "path": "pages/complete-info/complete-info",
-        "style": {
-          "navigationBarTitleText": "补全信息"
-        }
-      },
-      {
-        "path": "pages/complete-info/company-info",
-        "style": {
-          "navigationBarTitleText": "企业信息"
-        }
-      },
-      {
-        "path": "pages/complete-info/components/map-location-picker",
-        "style": {
-          "navigationBarTitleText": "选择地址"
-        }
-      },
-      {
-        "path": "pages/complete-info/skill-search",
-        "style": {
-          "navigationBarTitleText": "技能查询"
-        }
-      },
-      {
-        "path": "pages/nearby/nearby",
-        "style": {
-          "navigationBarTitleText": "附近",
-          "navigationBarBackgroundColor": "#4778EC",
-          "navigationBarTextStyle": "white"
-        }
-      },
-      {
-        "path": "pages/job/publishJob",
-        "style": {
-          "navigationBarTitleText": "发布岗位"
-        }
-      },
-      {
-        "path": "pages/job/companySearch",
-        "style": {
-          "navigationBarTitleText": "选择企业",
-          "disableScroll": false,
-          "enablePullDownRefresh": false,
-          "backgroundColor": "#f5f5f5"
-        }
-      },
-      {
-        "path": "pages/chat/chat",
-        "style": {
-          "navigationBarTitleText": "AI+",
-          "navigationBarBackgroundColor": "#4778EC",
-          "navigationBarTextStyle": "white",
-          "enablePullDownRefresh": false
-        }
-      },
       {
         "path": "pages/search/search",
         "style": {
@@ -126,6 +79,18 @@
           "navigationStyle": "custom"
         }
       },
+      {
+        "path": "pages/login/wx-login",
+        "style": {
+          "navigationBarTitleText": "登录"
+        }
+      },
+      {
+        "path": "pages/login/sms-verify",
+        "style": {
+          "navigationBarTitleText": "短信验证"
+        }
+      },
       {
         "path": "pages/resume-guide/resume-guide",
         "style": {
@@ -155,6 +120,53 @@
       {
         "root": "packageA",
         "pages": [
+          {
+            "path": "pages/complete-info/complete-info",
+            "style": {
+              "navigationBarTitleText": "补全信息"
+            }
+          },
+          {
+            "path": "pages/complete-info/company-info",
+            "style": {
+              "navigationBarTitleText": "企业信息"
+            }
+          },
+          {
+            "path": "pages/complete-info/components/map-location-picker",
+            "style": {
+              "navigationBarTitleText": "选择地址"
+            }
+          },
+          {
+            "path": "pages/complete-info/skill-search",
+            "style": {
+              "navigationBarTitleText": "技能查询"
+            }
+          },
+          {
+            "path": "pages/nearby/nearby",
+            "style": {
+              "navigationBarTitleText": "附近",
+              "navigationBarBackgroundColor": "#4778EC",
+              "navigationBarTextStyle": "white"
+            }
+          },
+          {
+            "path": "pages/job/publishJob",
+            "style": {
+              "navigationBarTitleText": "发布岗位"
+            }
+          },
+          {
+            "path": "pages/job/companySearch",
+            "style": {
+              "navigationBarTitleText": "选择企业",
+              "disableScroll": false,
+              "enablePullDownRefresh": false,
+              "backgroundColor": "#f5f5f5"
+            }
+          },
           {
             "path": "pages/addWorkExperience/addWorkExperience",
             "style": {
@@ -306,6 +318,34 @@
               "navigationBarBackgroundColor": "#4778EC",
               "navigationBarTextStyle": "white"
             }
+          },
+          {
+            "path": "pages/cancelApplication/cancelApplication",
+            "style": {
+              "navigationBarTitleText": "取消投递",
+              "navigationBarBackgroundColor": "#FFFFFF"
+            }
+          },
+          {
+            "path": "pages/agreement/user",
+            "style": {
+              "navigationBarTitleText": "隐私协议"
+            }
+          },
+          {
+            "path": "pages/agreement/privacy",
+            "style": {
+              "navigationBarTitleText": "隐私政策"
+            }
+          },
+          {
+            "path": "pages/chat/chat",
+            "style": {
+              "navigationBarTitleText": "智能客服",
+              "navigationBarBackgroundColor": "#4778EC",
+              "navigationBarTextStyle": "white",
+              "enablePullDownRefresh": false
+            }
           }
         ]
       },
@@ -408,6 +448,102 @@
               "navigationBarTitleText": "推荐"
             }
           },
+		  {
+		    "path": "priority/index",
+		    "style": {
+		      "navigationBarTitleText": "帮扶任务"
+		    }
+		  },
+		  {
+		    "path": "priority/taskAssignment",
+		    "style": {
+		      "navigationBarTitleText": "帮扶任务分配"
+		    }
+		  },
+		  {
+		    "path": "priority/taskCreated",
+		    "style": {
+		      "navigationBarTitleText": "创建任务"
+		    }
+		  },
+		  {
+		    "path": "priority/taskDetail",
+		    "style": {
+		      "navigationBarTitleText": "任务详情"
+		    }
+		  },
+		  {
+		    "path": "priority/targetPersonnel",
+		    "style": {
+		      "navigationBarTitleText": "目标人员"
+		    }
+		  },
+		  {
+		    "path": "priority/targetPersonnelChoice",
+		    "style": {
+		      "navigationBarTitleText": "目标人员选择"
+		    }
+		  },
+		  {
+		    "path": "priority/taskIssue",
+		    "style": {
+		      "navigationBarTitleText": "帮扶任务下发"
+		    }
+		  },
+		  {
+		    "path": "priority/recordsManagement",
+		    "style": {
+		      "navigationBarTitleText": "帮扶记录管理"
+		    }
+		  },
+		  {
+		    "path": "priority/recordDetail",
+		    "style": {
+		      "navigationBarTitleText": "帮扶记录详情"
+		    }
+		  },
+		  {
+		    "path": "priority/recordFollow",
+		    "style": {
+		      "navigationBarTitleText": "帮扶记录跟进"
+		    }
+		  },
+		  {
+		    "path": "priority/jobWill",
+		    "style": {
+		      "navigationBarTitleText": "求职意愿列表"
+		    }
+		  },
+		  {
+		    "path": "priority/jobWillEdit",
+		    "style": {
+		      "navigationBarTitleText": "求职意愿"
+		    }
+		  },
+		  {
+		    "path": "priority/trainingWill",
+		    "style": {
+		      "navigationBarTitleText": "培训意愿列表"
+		    }
+		  },
+		  {
+		    "path": "priority/trainingWillEdit",
+		    "style": {
+		      "navigationBarTitleText": "培训意愿"
+		    }
+		  },
+		  {
+		    "path": "priority/smartRecommend",
+		    "style": {
+		      "navigationBarTitleText": "智能推荐"
+		    }
+		  },
+		  {
+		    "path": "priority/allocate",
+		    "style": {
+		      "navigationBarTitleText": "任务分配"
+		    }
+		  },
 		  {
 		    "path": "train/wrongAnswer/mistakeNotebook",
 		    "style": {
@@ -461,6 +597,60 @@
 		    "style": {
 		      "navigationBarTitleText": "培训机构信息详情"
 		    }
+		  },
+		  {
+			"path": "institution/trainingInstitutionMaintenance",
+			"style": {
+			  "navigationBarTitleText": "培训机构信息维护"
+			}
+		  },
+		  {
+			"path": "components/map",
+			"style": {
+			  "navigationBarTitleText": "选择地址"
+			}
+		  },
+		  {
+			"path": "institution/evaluationAgencyMaintenance",
+			"style": {
+			  "navigationBarTitleText": "评价机构信息维护"
+			}
+		  },
+		  {
+			"path": "notice/trainingAnnouncement/postedList",
+			"style": {
+			  "navigationBarTitleText": "培训公告发布"
+			}
+		  },
+		  {
+			"path": "notice/trainingAnnouncement/postedEdit",
+			"style": {
+			  "navigationBarTitleText": "培训公告"
+			}
+		  },
+		  {
+			"path": "notice/trainingAnnouncement/postedDetail",
+			"style": {
+			  "navigationBarTitleText": "培训公告详情"
+			}
+		  },
+		  {
+			"path": "notice/evaluateAnnouncement/evaluateList",
+			"style": {
+			  "navigationBarTitleText": "评价公告发布"
+			}
+		  },
+		  {
+			"path": "notice/evaluateAnnouncement/evaluateEdit",
+			"style": {
+			  "navigationBarTitleText": "评价公告"
+			}
+		  },
+		  {
+			"path": "notice/evaluateAnnouncement/evaluateDetail",
+			"style": {
+			  "navigationBarTitleText": "评价公告详情"
+			}
 		  }
         ]
       },
diff --git a/pages/careerfair/careerfair.vue b/pages/careerfair/careerfair.vue
index c9eae87..8b31423 100644
--- a/pages/careerfair/careerfair.vue
+++ b/pages/careerfair/careerfair.vue
@@ -22,21 +22,78 @@
 						@click="getFair('refresh')"></uni-icons>
 					<input class="input" placeholder="招聘会" placeholder-class="inputplace"
 						v-model="pageState.jobFairTitle" />
+					<view class="btn-feel" v-show="state.current != 3" @click="openFilter">筛选</view>
 				</view>
 			</view>
+			 <uni-popup
+				ref="selectFilterModel"
+				type="bottom"
+				borderRadius="10px 10px 0 0"
+				background-color="#FFFFFF"
+				class="popup-fix"
+			>
+				<view class="popup-content">
+					<view class="popup-list">
+						<view class="content-wrapper">
+							<!-- 左侧筛选类别 -->
+							<!-- <scroll-view class="filter-nav" scroll-y>
+								<view
+									v-for="(item, index) in filterOptions"
+									:key="index"
+									class="nav-item button-click"
+									:class="{ active: activeTab === item.key }"
+									@click="scrollTo(item.key)"
+								>
+									{{ item.label }}
+								</view>
+							</scroll-view> -->
 
+							<!-- 右侧筛选内容 -->
+							<scroll-view class="filter-content" :scroll-into-view="activeTab" scroll-y>
+								<view v-for="(item, index) in filterOptions" :key="index">
+									<view class="content-item">
+										<view class="item-title" :id="item.key">{{ item.label }}</view>
+										<radio-group class="check-content" @change="handleSelect">
+											<label
+												v-for="option in item.options"
+												:key="option.value"
+												class="checkbox-item button-click"
+												:class="{
+													checkedstyle: selectedValues === String(option.value),
+												}"
+											>
+												<radio
+													style="display: none"
+													:value="String(option.value)"
+													:checked="selectedValues === String(option.value)"
+												/>
+												<text class="option-label">{{ option.label }}</text>
+											</label>
+										</radio-group>
+									</view>
+								</view>
+							</scroll-view>
+						</view>
+					</view>
+					<view class="popup-bottom">
+						<view class="btn-cancel btn-feel" @click="cleanup">重置</view>
+						<view class="btn-confirm btn-feel" @click="confirm">确认</view>
+					</view>
+				</view>
+			</uni-popup>
 			<!-- 主体内容区域 -->
 			<view class="container-main">
 				<scroll-view scroll-y class="main-scroll" :class="{fullHeightScroll:!showTabar}" @scrolltolower="handleScrollToLower">
 					<view class="cards" v-if="fairList.length">
 						<view class="card press-button" v-for="(item, index) in fairList" :key="index"
 							@click="goDetail(item.jobFairId)">
+							<view class="center-date"
+								:style="{ color: getTimeStatus(item.jobFairStartTime, item.jobFairEndTime).color,borderColor: getTimeStatus(item.jobFairStartTime, item.jobFairEndTime).color  }">
+								{{ getTimeStatus(item.jobFairStartTime, item.jobFairEndTime).statusText }}
+							</view>
 							<view class="card-title">
 								{{ item.jobFairTitle }}
-								<view class="center-date"
-									:style="{ color: getTimeStatus(item.jobFairStartTime, item.jobFairEndTime).color,borderColor: getTimeStatus(item.jobFairStartTime, item.jobFairEndTime).color  }">
-									{{ getTimeStatus(item.jobFairStartTime, item.jobFairEndTime).statusText }}
-								</view>
+								
 							</view>
 							<view class="card-row">
 								<text class="">{{ item.jobFairAddress }}</text>
@@ -104,8 +161,9 @@
 	import {
 		tabbarManager
 	} from "@/utils/tabbarManager";
-	import WxAuthLogin from "@/components/WxAuthLogin/WxAuthLogin.vue";
+
 	import config from "@/config.js";
+	// import CryptoJS from 'crypto-js'
 	const {
 		longitudeVal,
 		latitudeVal
@@ -151,10 +209,57 @@
 	onShow(() => {
 		// 更新自定义tabbar选中状态
 		tabbarManager.updateSelected(1);
+		getoptions();
 	});//
-	
-	
-	
+	//筛选
+	const filterOptions = ref([]);
+	const activeTab = ref('');
+	const selectFilterModel = ref(null);
+	const selectedValues = ref(null);
+	function openFilter() {
+		selectFilterModel.value?.open();
+	}
+	const scrollTo = (key) => {
+		activeTab.value = key;
+	};
+
+	const handleSelect = (e) => {
+		selectedValues.value = e.detail.value
+	};
+	function cleanup(){
+		selectedValues.value = null
+		confirm()
+	}
+	function confirm(){
+		getFair("refresh");
+		selectFilterModel.value?.close();
+	}
+	function getoptions() {
+		let headers = {
+			'Content-Type': 'application/x-www-form-urlencoded',
+		}
+		let params = {
+			dictType:'administrative_division',
+			dictParentValue:'653100000000',
+			childFlag:'1',
+		}
+		filterOptions.value = [{
+				label: '所在区域',
+				key: 'area',
+				options: []
+		}];
+		$api.myRequest('/system/public/dict/data/getByParentValue',params,'POST',9100,headers).then(res=>{
+			if (res.code == 200) {
+				filterOptions.value[0].options = res.data.map(item=>{
+					return {
+						label: item.dictLabel,
+						value: item.dictValue,
+					}
+				})
+			}
+		})
+		activeTab.value = 'area';
+	}
 	async function thirdLogin(needToast){
 		let form={}
 		if (uni.getStorageSync('userInfo') && (uni.getStorageSync('userInfo').isCompanyUser=='1' || uni.getStorageSync('userInfo').isCompanyUser=='2')) {
@@ -167,6 +272,12 @@
 				contactperson: "",
 				contactphone: "",
 			}
+			//用户信息加密方法待更新
+			// let key = '9zS+DFKrzxvosO82mTcPJQ=='
+			// let secretKey = CryptoJS.enc.Utf8.parse(key);//key  为你的秘钥
+			// let srcs = CryptoJS.enc.Utf8.parse(form.idno);
+			// let encrypted = CryptoJS.AES.encrypt(srcs, secretKey, {mode:CryptoJS.mode.ECB,padding: CryptoJS.pad.Pkcs7}).toString()
+			// form.idno=encrypted
 		}else if (uni.getStorageSync('userInfo') && uni.getStorageSync('userInfo').isCompanyUser=='0') {
 			form={
 				usertype: "2",
@@ -206,7 +317,7 @@
 	// 		wxAuthLoginRef.value?.open();
 	// 	});
 	// });
-	watch(() => userInfo.value.userType, (newVal) => { 
+	watch(() => userInfo.value.userType, (newVal) => {
 		if(newVal=='ent'){
 			showTabar.value = true
 		}else{
@@ -305,18 +416,18 @@
 	};
 
 	async function getHeart() {
-		
-		
+
+
 		const raw = uni.getStorageSync("Padmin-Token");
 		const token = typeof raw === "string" ? raw.trim() : "";
-		
+
 		var isLogins = await thirdLogin();
-		
+
 		const headers = token ? {
 			Authorization: raw.startsWith("Bearer ") ? raw : `Bearer ${token}`
 		} : {};
-		
-		
+
+
 		$api.myRequest("/dashboard/auth/heart", {}, "POST", 10100, headers).then((resData) => {
 			if (isLogins) {
 				isLogin.value = true;
@@ -404,7 +515,6 @@
 		} else {
 			$api.msg('请先登录');
 		}
-
 	}
 
 	function getFair(type = "add") {
@@ -420,6 +530,7 @@
 			pageSize: pageState.pageSize,
 			jobFairTitle: pageState.jobFairTitle,
 			jobFairType: state.current,
+			dictValue: selectedValues.value,
 		};
 		if (isLogin.value) {
 			if (userInfo.value.userType == "ent") {
@@ -577,7 +688,168 @@
 		return dates;
 	}
 </script>
+<style lang="scss" scoped>
+.popup-fix {
+    z-index: 9999 !important;
+}
+.popup-content {
+    color: #000000;
+    height: 70vh;
+	padding-bottom: 20rpx;
+}
+.popup-bottom {
+    padding: 40rpx 28rpx 20rpx 28rpx;
+    display: flex;
+    justify-content: space-between;
+    .btn-cancel {
+        font-weight: 400;
+        font-size: 32rpx;
+        color: #666d7f;
+        line-height: 90rpx;
+        width: 33%;
+        min-width: 222rpx;
+        height: 90rpx;
+        background: #f5f5f5;
+        border-radius: 12rpx 12rpx 12rpx 12rpx;
+        text-align: center;
+    }
+    .btn-confirm {
+        font-weight: 400;
+        font-size: 32rpx;
+        color: #ffffff;
+        text-align: center;
+        width: 67%;
+        height: 90rpx;
+        margin-left: 28rpx;
+        line-height: 90rpx;
+        background: #256bfa;
+        min-width: 444rpx;
+        border-radius: 12rpx 12rpx 12rpx 12rpx;
+    }
+}
+.popup-list {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    align-items: center;
+    justify-content: space-evenly;
+    height: calc(77vh - 100rpx - 150rpx);
+    overflow: hidden;
+    .picker-view {
+        width: 100%;
+        height: 500rpx;
+        margin-top: 20rpx;
+        .uni-picker-view-mask {
+            background: rgba(0, 0, 0, 0);
+        }
+        .item {
+            line-height: 84rpx;
+            height: 84rpx;
+            text-align: center;
+            font-weight: 400;
+            font-size: 32rpx;
+            color: #cccccc;
+        }
+        .item-active {
+            color: #333333;
+        }
+        .uni-picker-view-indicator:after {
+            border-color: #e3e3e3;
+        }
+        .uni-picker-view-indicator:before {
+            border-color: #e3e3e3;
+        }
+    }
+    // .list {
+    //     .row {
+    //         font-weight: 400;
+    //         font-size: 32rpx;
+    //         color: #333333;
+    //         line-height: 84rpx;
+    //         text-align: center;
+    //     }
+    // }
+}
 
+.content-wrapper {
+    flex: 1;
+    display: flex;
+    overflow: hidden;
+    height: 100%;
+}
+
+.filter-nav {
+    width: 200rpx;
+    background-color: #ffffff;
+
+    .nav-item {
+        height: 100rpx;
+        line-height: 100rpx;
+        text-align: center;
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #666d7f;
+        &.active {
+            font-weight: 500;
+            font-size: 28rpx;
+            color: #256bfa;
+        }
+    }
+}
+
+.filter-content {
+    flex: 1;
+    padding: 20rpx;
+    background-color: #f6f6f6;
+
+    .content-item {
+        margin-top: 30rpx;
+        .item-title {
+            font-weight: 400;
+            font-size: 28rpx;
+            color: #333333;
+            margin-bottom: 15rpx;
+        }
+    }
+    .content-item:first-child {
+        margin-top: 0rpx;
+    }
+
+    .check-content {
+        display: grid;
+        gap: 16rpx;
+        grid-template-columns: repeat(auto-fill, minmax(300rpx, 1fr));
+        place-items: stretch;
+
+        .checkbox-item {
+            display: flex;
+            align-items: center;
+            text-align: center;
+            background-color: #d9d9d9;
+
+            min-width: 0;
+            padding: 0 10rpx;
+            height: 80rpx;
+            background: #e8eaee;
+            border-radius: 12rpx 12rpx 12rpx 12rpx;
+
+            .option-label {
+                font-size: 28rpx;
+                width: 100%;
+                white-space: nowrap;
+                overflow: hidden;
+            }
+        }
+        .checkedstyle {
+            height: 76rpx;
+            background: rgba(37, 107, 250, 0.06);
+            border-radius: 12rpx 12rpx 12rpx 12rpx;
+            border: 2rpx solid #256bfa;
+            color: #256bfa;
+        }
+    }
+}
+</style>
 <style scoped lang="stylus">
 	.app-custom-root {
 		position: fixed;
@@ -639,6 +911,8 @@
 		padding: 0 24rpx;
 		width: calc(100% - 48rpx);
 		position: relative;
+		display: flex;
+		align-items: center;
 	}
 
 	.app-container .container-header .header-input .iconsearch {
@@ -654,6 +928,7 @@
 		background: #ffffff;
 		border-radius: 75rpx;
 		font-size: 28rpx;
+		flex:1
 	}
 
 	.app-container .container-header .header-input .inputplace {
@@ -661,7 +936,13 @@
 		font-size: 28rpx;
 		color: #b5b5b5;
 	}
-
+	.app-container .container-header .header-input .btn-feel {
+		font-weight: 400;
+		font-size: 28rpx;
+		text-align: center;
+		color: #484444;
+		width: 80rpx;
+	}
 	.app-container .container-header .header-date {
 		padding: 28rpx;
 		display: flex;
@@ -731,10 +1012,21 @@
 
 	.cards .card {
 		margin-top: 28rpx;
-		padding: 32rpx;
+		padding: 45rpx 32rpx 32rpx 32rpx;
 		background: linear-gradient(to bottom, #e3efff 0%, #fbfdff 100%);
 		box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0, 0, 0, 0.04);
 		border-radius: 20rpx;
+		position: relative;
+		.center-date {
+			font-weight: 400;
+			font-size: 24rpx;
+			position: absolute;
+			right: 0;
+			top: 0;
+			border: 1rpx solid;
+			padding: 5rpx 10rpx;
+			margin-left: 10rpx;
+		}
 	}
 
 	.cards .card-title {
@@ -760,16 +1052,7 @@
 			transform: translate(-50%, -50%);
 		}
 
-		.center-date {
-			font-weight: 400;
-			font-size: 24rpx;
-			// position: absolute;
-			// right: 0;
-			// top: 0;
-			border: 1rpx solid;
-			padding: 5rpx 10rpx;
-			margin-left: 10rpx;
-		}
+		
 	}
 
 	.cards .card-row {
diff --git a/pages/chat/components/ai-paging.vue b/pages/chat/components/ai-paging.vue
deleted file mode 100644
index 2c5309f..0000000
--- a/pages/chat/components/ai-paging.vue
+++ /dev/null
@@ -1,1272 +0,0 @@
-<template>
-    <view class="chat-container">
-        <!-- #ifdef MP-WEIXIN -->
-         <view class="chat-background" v-if="!messages.length">
-            <image class="backlogo" src="/static/icon/backAI.png"></image>
-            <view class="back-rowTitle">嗨！欢迎使用{{ config.appInfo.areaName }}AI智能求职</view>
-            <view class="back-rowText">
-                我可以根据您的简历和求职需求，帮你精准匹配{{ config.appInfo.areaName }}互联网招聘信息，对比招聘信息的优缺点，提供面试指导等，请把你的任务交给我吧~
-            </view>
-            <view class="back-rowh3">猜你所想</view>
-            <view
-                class="back-rowmsg button-click"
-                v-for="(item, index) in queries"
-                :key="index"
-                @click="sendMessageGuess(item)"
-            >
-                {{ item }}
-            </view>
-            <view class="chat-item self" v-if="isRecording">
-                <view class="message">{{ recognizedText }} {{ lastFinalText }}</view>
-            </view>
-        </view>
-        <!-- #endif -->
-        <!-- #ifndef MP-WEIXIN -->
-        <view class="chat-background" v-if="!messages.length">
-            <image class="backlogo" src="/static/icon/backAI.png"></image>
-            <view class="back-rowTitle">嗨！欢迎使用{{ config.appInfo.areaName }}AI智能求职</view>
-            <view class="back-rowText">
-                我可以根据您的简历和求职需求，帮你精准匹配{{ config.appInfo.areaName }}互联网招聘信息，对比招聘信息的优缺点，提供面试指导等，请把你的任务交给我吧~
-            </view>
-            <view class="back-rowh3">猜你所想</view>
-            <view
-                class="back-rowmsg button-click"
-                v-for="(item, index) in queries"
-                :key="index"
-                @click="sendMessageGuess(item)"
-            >
-                {{ item }}
-            </view>
-            <view class="chat-item self" v-if="isRecording">
-                <view class="message">{{ recognizedText }} {{ lastFinalText }}</view>
-            </view>
-        </view>
-        <!-- #endif -->
-        <scroll-view class="chat-list scrollView" :scroll-top="scrollTop" :scroll-y="true" scroll-with-animation>
-            <!-- #ifdef MP-WEIXIN -->
-            <view class="chat-list list-content">
-            <!-- #endif -->
-            <!-- #ifndef MP-WEIXIN -->
-            <view class="chat-list list-content" v-fade:600="messages.length >= 1">
-            <!-- #endif -->
-                <view
-                    v-for="(msg, index) in messages"
-                    :key="index"
-                    :id="'msg-' + index"
-                    class="chat-item"
-                    :class="{ self: msg.self }"
-                >
-                    <view class="message" v-if="msg.self">
-                        <view class="msg-filecontent" v-if="msg.files.length">
-                            <view
-                                class="msg-files btn-light"
-                                v-for="(file, vInex) in msg.files"
-                                :key="vInex"
-                                @click="jumpUrl(file)"
-                            >
-                                <image class="msg-file-icon" src="/static/icon/Vector2.png"></image>
-                                <text class="msg-file-text">{{ file.name || '附件' }}</text>
-                            </view>
-                        </view>
-                        {{ msg.displayText }}
-                    </view>
-                    <view class="message" :class="{ messageNull: !msg.displayText }" v-else>
-                        <!-- {{ msg.displayText }} -->
-                        <view class="message-markdown">
-                            <md-render
-                                :content="msg.displayText"
-                                :typing="isTyping && messages.length - 1 === index"
-                            ></md-render>
-                            <view class="message-controll" v-show="showControll(index)">
-                                <view class="controll-left">
-                                    <image
-                                        class="controll-icon btn-light"
-                                        src="/static/icon/copy.png"
-                                        @click="copyMarkdown(msg.displayText)"
-                                    ></image>
-                                    <image
-                                        class="controll-icon mar_le10 btn-light"
-                                        src="/static/icon/feedback.png"
-                                        v-if="!msg.userBadFeedback"
-                                        @click="userGoodFeedback(msg)"
-                                    ></image>
-                                    <image
-                                        v-if="isSpeaking && !isPaused && speechIndex === index"
-                                        class="controll-icon mar_le10 btn-light"
-                                        src="/static/icon/stop.png"
-                                        @click="stopMarkdown(msg.displayText, index)"
-                                    ></image>
-                                    <image
-                                        class="controll-icon mar_le10 btn-light"
-                                        src="/static/icon/broadcast.png"
-                                        @click="readMarkdown(msg.displayText, index)"
-                                        v-else
-                                    ></image>
-                                </view>
-                                <view class="controll-right">
-                                    <image
-                                        class="controll-icon mar_ri10 btn-light"
-                                        src="/static/icon/refresh.png"
-                                        @click="refreshMarkdown(index)"
-                                    ></image>
-                                </view>
-                            </view>
-                        </view>
-                        <!-- guess -->
-                        <view
-                            class="guess"
-                            v-if="showGuess && !msg.self && messages.length - 1 === index && msg.displayText"
-                        >
-                            <view class="gulist">
-                                <view
-                                    class="guess-list"
-                                    @click="sendMessageGuess(item)"
-                                    v-for="(item, index) in guessList"
-                                    :key="index"
-                                >
-                                    {{ item }}
-                                </view>
-                            </view>
-                        </view>
-                    </view>
-                </view>
-                <view class="chat-item self" v-if="isRecording">
-                    <view class="message">{{ recognizedText }} {{ lastFinalText }}</view>
-                </view>
-                <view v-if="isTyping" class="self">
-                    <text class="message msg-loading">
-                        <span class="ai-loading"></span>
-                    </text>
-                </view>
-            </view>
-        </scroll-view>
-        <!-- 使用 v-show 保证不销毁事件 -->
-        <view class="vio_container" :class="status" v-show="status !== 'idle'">
-            <view class="record-tip">{{ statusText }}</view>
-            <WaveDisplay
-                :background="audiowaveStyle"
-                :isActive="isRecording"
-                :audioData="audioDataForDisplay"
-                :showInfo="isRecording"
-            />
-        </view>
-        <view class="input-area" v-show="status === 'idle'">
-            <view class="areatext">
-                <input
-                    v-model="textInput"
-                    placeholder-class="inputplaceholder"
-                    class="input"
-                    @confirm="sendMessage"
-                    :disabled="isTyping"
-                    :adjust-position="false"
-                    placeholder="请输入您的职位名称、薪资要求、岗位地址"
-                    v-show="!isVoice"
-                />
-                <view
-                    class="input_vio"
-                    @touchstart.prevent="handleTouchStart"
-                    @touchmove="handleTouchMove"
-                    @touchend="handleTouchEnd"
-                    @touchcancel="handleTouchCancel"
-                    :catchtouchstart="true"
-                    :catchtouchmove="true"
-                    :catchtouchend="true"
-                    v-show="isVoice"
-                    type="default"
-                >
-                    按住说话
-                </view>
-                <!-- upload -->
-                <view class="btn-box" @click="changeShowFile">
-                    <image
-                        class="send-btn"
-                        :class="{ 'add-file-btn': showfile }"
-                        src="/static/icon/addGroup.png"
-                    ></image>
-                </view>
-                <!-- sendmessgae  Button-->
-                <view class="btn-box purple" v-if="textInput && !isTyping" @click="sendMessage">
-                    <image class="send-btn" src="/static/icon/send3.png"></image>
-                </view>
-                <view class="btn-box" v-else-if="!isTyping && !isVoice" @click="changeVoice">
-                    <image class="send-btn" src="/static/icon/send2x.png"></image>
-                </view>
-                <view class="btn-box" v-else-if="!isTyping" @click="changeVoice">
-                    <image class="send-btn" src="/static/icon/send4.png"></image>
-                </view>
-                <view class="btn-box purple" v-else>
-                    <view class="btn-box-round"></view>
-                </view>
-            </view>
-            <view class="ai-tips">本服务为AI生成内容，结果仅供参考</view>
-            <!-- btn -->
-            <CollapseTransition :show="showfile">
-                <view class="area-tips">
-                    <uni-icons type="info-filled" color="#ADADAD" size="15"></uni-icons>
-                    上传后自动解析简历内容
-                </view>
-                <view class="area-file">
-                    <view class="file-card" @click="uploadCamera">
-                        <image class="card-img" src="/static/icon/file1.png"></image>
-                        <text>拍照上传</text>
-                    </view>
-                    <view class="file-card" @click="uploadCamera('album')">
-                        <image class="card-img" src="/static/icon/file2.png"></image>
-                        <text>相册上传</text>
-                    </view>
-                    <view class="file-card" @click="getUploadFile">
-                        <image class="card-img" src="/static/icon/file3.png"></image>
-                        <text>文件上传</text>
-                    </view>
-                </view>
-            </CollapseTransition>
-
-            <!-- filelist -->
-            <view class="area-uploadfiles" v-if="filesList.length">
-                <scroll-view class="uploadfiles-scroll" scroll-x="true">
-                    <view class="uploadfiles-list">
-                        <view
-                            class="file-uploadsend"
-                            :class="{ 'file-border': isImage(file.type) }"
-                            v-for="(file, index) in filesList"
-                            :key="index"
-                        >
-                            <image
-                                class="file-iconImg"
-                                @click="jumpUrl(file)"
-                                v-if="isImage(file.type)"
-                                :src="file.url"
-                            ></image>
-                            <view class="file-doc" @click="jumpUrl(file)" v-else>
-                                <FileIcon class="doc-icon" :type="file.type"></FileIcon>
-                                <view class="doc-con">
-                                    <view class="filename-text">{{ file.name }}</view>
-                                    <view class="filerow">
-                                        <FileText :type="file.type"></FileText>
-                                        <view class="row-x"></view>
-                                        <view class="filename-size">{{ file.size }}</view>
-                                    </view>
-                                </view>
-                                <!-- <image class="file-icon" @click="jumpUrl(file)" :src=""></image> -->
-                            </view>
-                            <view class="file-del" catchtouchmove="true" @click="delfile(file)">
-                                <uni-icons type="closeempty" color="#FFFFFF" size="10"></uni-icons>
-                            </view>
-                        </view>
-                    </view>
-                </scroll-view>
-            </view>
-        </view>
-        <PopupFeeBack ref="feeback" @onSend="confirmFeeBack"></PopupFeeBack>
-        <MsgTips ref="feeBackTips" content="已收到反馈，感谢您的关注" title="反馈成功" :icon="successIcon"></MsgTips>
-    </view>
-</template>
-
-<script setup>
-import {
-    ref,
-    inject,
-    nextTick,
-    onMounted,
-    onUnmounted,
-    toRaw,
-    reactive,
-    computed,
-    watch,
-    getCurrentInstance,
-} from 'vue';
-import { storeToRefs } from 'pinia';
-// 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';
-import PopupFeeBack from './popupbadFeeback.vue';
-import AudioWave from './AudioWave.vue';
-import WaveDisplay from './WaveDisplay.vue';
-import FileIcon from './fileIcon.vue';
-import FileText from './fileText.vue';
-import { useAudioRecorder } from '@/hook/useRealtimeRecorder.js';
-import { useTTSPlayer } from '@/hook/useTTSPlayer.js';
-// 全局
-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';
-// hook
-const {
-    isRecording,
-    startRecording,
-    stopRecording,
-    cancelRecording,
-    audioDataForDisplay,
-    volumeLevel,
-    recognizedText,
-    lastFinalText,
-} = useAudioRecorder();
-
-const { speak, pause, resume, isSpeaking, isPaused, cancelAudio } = useTTSPlayer(config.speechSynthesis);
-
-// 获取组件实例（用于小程序 SelectorQuery）
-const instance = getCurrentInstance();
-
-// state
-const queries = ref([]);
-const guessList = ref([]);
-const scrollTop = ref(0);
-const showGuess = ref(false);
-const showfile = ref(false);
-const filesList = ref([]);
-const bgText = ref(false);
-const isVoice = ref(false);
-const status = ref('idle'); // idle | recording | cancel
-const startY = ref(0);
-const cancelThreshold = 100;
-const speechIndex = ref(0);
-const isAudioPermission = ref(false);
-const feebackData = ref(null);
-// ref for DOM element
-const voiceBtn = ref(null);
-const feeback = ref(null);
-const feeBackTips = ref(null);
-const state = reactive({
-    uploadFileTips: '请根据以上附件，帮我推荐岗位。',
-});
-
-const statusText = computed(() => {
-    switch (status.value) {
-        case 'recording':
-            return '松手发送，上划取消';
-        case 'cancel':
-            return '松手取消';
-        default:
-            return '按住说话';
-    }
-});
-
-const audiowaveStyle = computed(() => {
-    return status.value === 'cancel'
-        ? '#f54545'
-        : status.value === 'recording'
-        ? 'linear-gradient(to right, #377dff, #9a60ff)'
-        : '#f1f1f1';
-});
-
-onMounted(async () => {
-    changeQueries();
-    scrollToBottom();
-    isAudioPermission.value = await requestMicPermission();
-});
-
-const requestMicPermission = async () => {
-    // #ifdef H5
-    try {
-        if (typeof navigator !== 'undefined' && navigator.mediaDevices) {
-            const stream = await navigator.mediaDevices.getUserMedia({ audio: true });
-            console.log('✅ 麦克风权限已授权');
-
-            // 立刻停止所有音轨，释放麦克风
-            stream.getTracks().forEach((track) => track.stop());
-
-            return true;
-        } else {
-            console.warn('❌ 当前环境不支持麦克风');
-            return false;
-        }
-    } catch (err) {
-        console.warn('❌ 用户拒绝麦克风权限或不支持:', err);
-        return false;
-    }
-    // #endif
-    
-    // #ifdef MP-WEIXIN
-    try {
-        // 微信小程序使用 uni.authorize 请求权限
-        const res = await uni.authorize({
-            scope: 'scope.record'
-        });
-        console.log('✅ 麦克风权限已授权');
-        return true;
-    } catch (err) {
-        console.warn('❌ 用户拒绝麦克风权限:', err);
-        // 用户拒绝授权，但不影响其他功能
-        return false;
-    }
-    // #endif
-    
-    // #ifndef H5 || MP-WEIXIN
-    // 其他平台暂不支持
-    console.warn('❌ 当前平台不支持麦克风权限检测');
-    return false;
-    // #endif
-};
-
-function showControll(index) {
-    if (index === messages.value.length - 1 && isTyping.value) {
-        return false;
-    }
-    return true;
-}
-
-const sendMessage = (text) => {
-    const values = textInput.value || text;
-    showfile.value = false;
-    showGuess.value = false;
-    if (values.trim()) {
-        // 判断是否有对话ID // 没有则创建对话列表
-        const callback = () => {
-            const normalArr = toRaw(filesList.value); // 转换为普通数组
-            filesList.value = [];
-            useChatGroupDBStore()
-                .getStearm(values, normalArr, scrollToBottom, {
-                    onDataReceived: (data, message, index) => {
-                        // 流式朗读：只在内容足够长且包含完整信息时才开始朗读
-                        if (!message.self && message.displayText && message.displayText.trim()) {
-                            // 检查是否已经开始朗读这条消息
-                            if (speechIndex.value !== index) {
-                                // 延迟TTS，等待内容更完整
-                                // 只有在内容长度超过50个字符或者包含岗位信息时才开始朗读
-                                const hasJobInfo = message.displayText.includes('```job-json') || 
-                                                 message.displayText.includes('岗位') ||
-                                                 message.displayText.includes('公司') ||
-                                                 message.displayText.includes('薪资');
-                                
-                                if (message.displayText.length > 50 || hasJobInfo) {
-                                    console.log('🎵 Starting streaming TTS for message index:', index);
-                                    console.log('📝 Current text length:', message.displayText.length);
-                                    console.log('📝 Has job info:', hasJobInfo);
-                                    
-                                    // 开始朗读当前消息
-                                    speechIndex.value = index;
-                                    readMarkdown(message.displayText, index);
-                                } else {
-                                    console.log('⏳ Waiting for more content before TTS, current length:', message.displayText.length);
-                                }
-                            }
-                        }
-                    },
-                    onComplete: () => {
-                        console.log('🎯 onComplete callback triggered');
-                        console.log('📊 Messages array length:', messages.value.length);
-                        
-                        // 确保最后一条AI消息的朗读完成
-                        const lastMessageIndex = messages.value.length - 1;
-                        if (lastMessageIndex >= 0) {
-                            const lastMessage = messages.value[lastMessageIndex];
-                            if (!lastMessage.self && lastMessage.displayText && lastMessage.displayText.trim()) {
-                                console.log('🎵 Final TTS for complete message');
-                                console.log('📝 Final text length:', lastMessage.displayText.length);
-                                console.log('📝 Final text preview:', lastMessage.displayText.substring(0, 100) + '...');
-                                
-                                // 停止当前的朗读（如果有的话）
-                                if (isSpeaking.value) {
-                                    console.log('🛑 Stopping current TTS to start final complete TTS');
-                                    cancelAudio();
-                                }
-                                
-                                // 开始朗读完整的内容
-                                speechIndex.value = lastMessageIndex;
-                                readMarkdown(lastMessage.displayText, lastMessageIndex);
-                            }
-                        }
-                    },
-                })
-                .then(() => {
-                    getGuess();
-                    scrollToBottom();
-                });
-            emit('onConfirm', values);
-            textInput.value = '';
-            scrollToBottom();
-        };
-        // 没有对话列表则创建
-        if (!chatSessionID.value) {
-            useChatGroupDBStore()
-                .addTabel(values)
-                .then((res) => {
-                    callback();
-                });
-        } else {
-            callback();
-        }
-    } else {
-        if (filesList.value.length) {
-            $api.msg('上传文件请输入想问的问题描述');
-        } else {
-            $api.msg('请输入职位信息或描述');
-        }
-    }
-};
-
-const sendMessageGuess = (item) => {
-    showGuess.value = false;
-    textInput.value = item;
-    sendMessage(item);
-};
-
-const delfile = (file) => {
-    uni.showModal({
-        content: '确认删除文件？',
-        success(res) {
-            if (res.confirm) {
-                filesList.value = filesList.value.filter((item) => item.url !== file.url);
-                if (!filesList.value.length) {
-                    if (textInput.value === state.uploadFileTips) {
-                        textInput.value = '';
-                    }
-                }
-                $api.msg('附件删除成功');
-            }
-        },
-    });
-};
-
-const scrollToBottom = throttle(function () {
-    nextTick(() => {
-        try {
-            // #ifdef MP-WEIXIN
-            const query = uni.createSelectorQuery().in(instance);
-            // #endif
-            // #ifndef MP-WEIXIN
-            const query = uni.createSelectorQuery();
-            // #endif
-            
-            query.select('.scrollView').boundingClientRect();
-            query.select('.list-content').boundingClientRect();
-            query.exec((res) => {
-                if (!res || !res[0] || !res[1]) {
-                    console.warn('scrollToBottom: 元素未找到或尚未渲染');
-                    return;
-                }
-                const scrollViewHeight = res[0].height;
-                const scrollContentHeight = res[1].height;
-                if (scrollContentHeight > scrollViewHeight) {
-                    const scrolldistance = scrollContentHeight - scrollViewHeight;
-                    scrollTop.value = scrolldistance;
-                }
-            });
-        } catch (err) {
-            console.warn(err);
-        }
-    });
-}, 500);
-
-function getGuess() {
-    $api.chatRequest('/guest', { sessionId: chatSessionID.value }, 'POST').then((res) => {
-        guessList.value = res.data;
-        showGuess.value = true;
-        nextTick(() => {
-            scrollToBottom();
-        });
-    });
-}
-
-function isImage(type) {
-    return new RegExp('image').test(type);
-}
-
-function isFile(type) {
-    const allowedTypes = config.allowedFileTypes || [];
-    if (!allowedTypes.includes(type)) {
-        return false;
-    }
-    return true;
-}
-
-function jumpUrl(file) {
-    if (file.url) {
-        window.open(file.url);
-    } else {
-        $api.msg('文件地址丢失');
-    }
-}
-
-function VerifyNumberFiles(num) {
-    if (filesList.value.length >= config.allowedFileNumber) {
-        $api.msg(`最大上传文件数量 ${config.allowedFileNumber} 个`);
-        return true;
-    } else {
-        return false;
-    }
-}
-
-function uploadCamera(type = 'camera') {
-    if (VerifyNumberFiles()) return;
-    uni.chooseImage({
-        count: 1, //默认9
-        sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
-        sourceType: [type], //从相册选择
-        success: function (res) {
-            const tempFilePaths = res.tempFilePaths;
-            const file = res.tempFiles[0];
-            // 继续上传
-            $api.uploadFile(tempFilePaths[0], true).then((resData) => {
-                resData = JSON.parse(resData);
-                if (isImage(file.type)) {
-                    filesList.value.push({
-                        url: resData.msg,
-                        type: file.type,
-                        name: file.name,
-                    });
-                    textInput.value = state.uploadFileTips;
-                }
-            });
-        },
-    });
-}
-
-function getUploadFile(type = 'camera') {
-    if (VerifyNumberFiles()) return;
-    uni.chooseFile({
-        count: 1,
-        success: (res) => {
-            const tempFilePaths = res.tempFilePaths;
-            const file = res.tempFiles[0];
-            const allowedTypes = config.allowedFileTypes || [];
-            const size = $api.formatFileSize(file.size);
-            if (!allowedTypes.includes(file.type)) {
-                return $api.msg('仅支持 txt md html word pdf ppt csv excel 格式类型');
-            }
-            // 继续上传
-            $api.uploadFile(tempFilePaths[0], true).then((resData) => {
-                resData = JSON.parse(resData);
-                filesList.value.push({
-                    url: resData.msg,
-                    type: file.type,
-                    name: file.name,
-                    size: size,
-                });
-                textInput.value = state.uploadFileTips;
-            });
-        },
-    });
-}
-
-const tipsPermisson = () => {
-    uni.showToast({
-        title: '需要授权麦克风权限才能使用语音功能',
-        icon: 'none',
-    });
-};
-
-const handleTouchStart = async (e) => {
-    if (!isAudioPermission.value) {
-        return tipsPermisson();
-    }
-    cancelAudio();
-    startY.value = e.touches[0].clientY;
-    status.value = 'recording';
-    showfile.value = false;
-    startRecording();
-    $api.sleep(1000).then(() => {
-        scrollToBottom();
-    });
-};
-
-const handleTouchMove = (e) => {
-    const moveY = e.touches[0].clientY;
-    if (startY.value - moveY > cancelThreshold) {
-        status.value = 'cancel';
-    } else {
-        status.value = 'recording';
-    }
-};
-
-const handleTouchEnd = () => {
-    if (status.value === 'cancel') {
-        console.log('取消发送');
-        cancelRecording();
-    } else {
-        stopRecording();
-        if (isAudioPermission.value) {
-            if (recognizedText.value) {
-                sendMessage(recognizedText.value);
-            } else {
-                $api.msg('说话时长太短');
-            }
-        }
-    }
-    status.value = 'idle';
-};
-
-const handleTouchCancel = () => {
-    stopRecording();
-    status.value = 'idle';
-};
-
-function closeGuess() {
-    showGuess.value = false;
-}
-
-function changeVoice() {
-    isVoice.value = !isVoice.value;
-}
-
-function changeShowFile() {
-    showfile.value = !showfile.value;
-}
-
-function closeFile() {
-    showfile.value = false;
-}
-
-function copyMarkdown(value) {
-    $api.copyText(value);
-}
-
-function userGoodFeedback(msg) {
-    // $api.msg('该功能正在开发中，敬请期待后续更新！');
-    feeback.value?.open();
-    feebackData.value = msg;
-}
-
-function confirmFeeBack(value) {
-    useChatGroupDBStore()
-        .badFeedback(feebackData.value, value)
-        .then(() => {
-            feeback.value?.close();
-            feeBackTips.value?.open();
-        });
-}
-
-// 防抖定时器
-let ttsDebounceTimer = null;
-
-function readMarkdown(value, index) {
-    console.log('🎤 readMarkdown called');
-    console.log('📝 Text to speak:', value ? value.substring(0, 100) + '...' : 'No text');
-    console.log('🔢 Index:', index);
-    console.log('🔢 Current speechIndex:', speechIndex.value);
-    console.log('⏸️ Is paused:', isPaused.value);
-    console.log('🔊 Is speaking:', isSpeaking.value);
-    
-    // 清除之前的防抖定时器
-    if (ttsDebounceTimer) {
-        clearTimeout(ttsDebounceTimer);
-    }
-    
-    // 如果当前正在播放其他消息，先停止
-    if (speechIndex.value !== index && speechIndex.value !== 0) {
-        console.log('🛑 Stopping current speech and starting new one');
-        speechIndex.value = index;
-        speak(value);
-        return;
-    }
-    
-    speechIndex.value = index;
-    
-    // 如果当前正在播放且暂停了，直接恢复
-    if (isPaused.value && isSpeaking.value) {
-        console.log('▶️ Resuming paused speech');
-        resume();
-        return;
-    }
-    
-    // 如果当前正在播放且没有暂停，不需要重新开始
-    if (isSpeaking.value && !isPaused.value) {
-        console.log('🔊 Already speaking, no need to restart');
-        return;
-    }
-    
-    // 使用防抖，避免频繁调用TTS
-    ttsDebounceTimer = setTimeout(() => {
-        console.log('🎵 Starting new speech');
-        console.log('🎵 Calling speak function with text length:', value ? value.length : 0);
-        try {
-            speak(value);
-            console.log('✅ Speak function called successfully');
-        } catch (error) {
-            console.error('❌ Error calling speak function:', error);
-        }
-    }, 300); // 300ms防抖延迟
-}
-function stopMarkdown(value, index) {
-    console.log('⏸️ stopMarkdown called for index:', index);
-    console.log('🔢 Current speechIndex:', speechIndex.value);
-    console.log('🔊 Is speaking:', isSpeaking.value);
-    console.log('⏸️ Is paused:', isPaused.value);
-    
-    // 清除防抖定时器
-    if (ttsDebounceTimer) {
-        clearTimeout(ttsDebounceTimer);
-        ttsDebounceTimer = null;
-    }
-    
-    speechIndex.value = index;
-    pause();
-}
-function refreshMarkdown(index) {
-    if (isTyping.value) {
-        $api.msg('正在生成');
-    } else {
-        const text = messages.value[index - 1].text;
-        sendMessageGuess(text);
-    }
-}
-
-const jobSearchQueries = [
-    '青岛有哪些薪资 12K 以上的岗位适合我？',
-    '青岛 3 年工作经验能找到哪些 12K 以上的工作？',
-    '青岛哪些公司在招聘，薪资范围在 12K 以上？',
-    '青岛有哪些企业提供 15K 以上的岗位？',
-    '青岛哪些公司在招 3-5 年经验的岗位？',
-    '我有三年的工作经验，能否推荐一些适合我的青岛的国企 岗位？',
-    '青岛国企目前在招聘哪些岗位？',
-    '青岛有哪些适合 3 年经验的国企岗位？',
-    '青岛国企招聘的岗位待遇如何？',
-    '青岛国企岗位的薪资水平是多少？',
-    '青岛哪些国企支持双休 & 五险一金完善？',
-    '青岛有哪些公司支持远程办公？',
-    '青岛有哪些外企的岗位，薪资 12K 以上的多吗？',
-    '青岛哪些企业在招聘 Web3.0 相关岗位？',
-    '青岛哪些岗位支持海外远程？薪资如何？',
-    '青岛招聘 AI/大数据相关岗位的公司有哪些？',
-];
-
-function changeQueries(value) {
-    queries.value = getRandomJobQueries(jobSearchQueries);
-}
-
-function getRandomJobQueries(queries, count = 2) {
-    const shuffled = queries.sort(() => 0.5 - Math.random()); // 随机打乱数组
-    return shuffled.slice(0, count); // 取前 count 条
-}
-
-defineExpose({ scrollToBottom, closeGuess, closeFile, changeQueries, handleTouchCancel });
-</script>
-
-<style lang="stylus" scoped>
-/* 过渡样式 */
-.collapse-enter-active,
-.collapse-leave-active {
-  transition: max-height 0.3s ease, opacity 0.3s ease;
-}
-
-.collapse-enter-from,
-.collapse-leave-to {
-  max-height: 0;
-  opacity: 0;
-}
-
-.collapse-enter-to,
-.collapse-leave-from {
-  max-height: 400rpx; /* 根据你内容最大高度设定 */
-  opacity: 1;
-}
-.msg-filecontent
-    display: flex
-    flex-wrap: wrap
-.msg-files
-    overflow: hidden
-    margin-right: 10rpx
-    height: 30rpx
-    max-width: 201rpx
-    background: #FFFFFF
-    border-radius: 10rpx
-    display: flex
-    align-items: center
-    justify-content: flex-start
-    padding: 10rpx
-    color: #000000
-    margin-bottom: 10rpx
-    .msg-file-icon
-        width: 29rpx
-        height: 26rpx
-        padding-right: 10rpx
-    .msg-file-text
-        flex: 1
-        white-space: nowrap
-        overflow: hidden
-        text-overflow: ellipsis
-        color: rgba(96, 96, 96, 1)
-        font-size: 24rpx
-.msg-files:active
-    background: #e9e9e9
-.guess
-    padding: 5rpx 0 10rpx 0
-    .guess-list
-        padding: 16rpx 24rpx
-        margin-top: 28rpx
-        font-size: 24rpx
-        color: #8c8c8c
-        width: 100%;
-        border-radius: 20rpx 20rpx 20rpx 20rpx;
-        border: 2rpx solid #E5E5E5;
-        font-size: 28rpx;
-        color: #333333;
-        line-height: 33rpx;
-    .gulist
-        display: flex
-        flex-wrap: wrap
-        position: relative
-image-margin-top = 40rpx
-.chat-container
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-    position: relative
-    z-index: 1
-    background: #FFFFFF
-
-.chat-background
-    position: absolute
-    padding: 44rpx;
-    display: flex
-    flex-direction: column
-    justify-content: flex-start
-    align-items: center
-    width: calc(100% - 88rpx)
-    position: relative
-    z-index: 1
-    .backlogo
-        width: 313rpx;
-        height: 190rpx;
-    .back-rowTitle
-        height: 56rpx;
-        font-weight: bold;
-        font-size: 40rpx;
-        color: #333333;
-        line-height: 47rpx;
-        margin-top: 40rpx
-    .back-rowText
-        margin-top: 28rpx
-        width: 100%;
-        height: 148rpx;
-        font-weight: 400;
-        font-size: 28rpx;
-        color: #333333;
-        line-height: 40rpx
-        // border-bottom: 2rpx dashed rgba(0, 0, 0, 0.2);
-        border-bottom: 2rpx solid transparent;
-        background-image: linear-gradient(to right, rgba(0, 0, 0, 0.2) 50%, transparent 50%);
-        background-size: 10rpx 2rpx; /* 调整虚线宽度和间距 */
-        background-repeat: repeat-x;
-        background-position: 0 148rpx
-    .back-rowh3
-        width: 100%;
-        font-weight: 500;
-        font-size: 28rpx;
-        color: #000000;
-        margin-top: 28rpx
-    .back-rowmsg
-        width: calc(100% - 32rpx)
-        margin-top: 24rpx
-        font-weight: 500;
-        color: rgba(51, 51, 51, 1);
-        line-height: 28rpx;
-        font-size: 24rpx
-        background: rgba(246, 246, 246, 1);
-        border-radius: 8rpx 8rpx 8rpx 8rpx;
-        padding: 32rpx 18rpx;
-
-.chat-list {
-    flex: 1;
-    overflow-y: auto;
-    white-space: pre-wrap;
-}
-.list-content {
-    padding: 0 44rpx 10rpx 44rpx;
-}
-.chat-item {
-    display: flex;
-    align-items: flex-start;
-    margin-bottom: 10rpx;
-    width: 100%;
-}
-.chat-item.self {
-    justify-content: flex-end;
-}
-.message
-    margin-top: 0rpx
-    // max-width: 80%;
-    width: 100%;
-    word-break: break-word;
-    color: #333333;
-    user-select: text;
-    -webkit-user-select: text;
-    .message-markdown
-        border-radius: 0 20rpx 20rpx 20rpx;
-        padding: 20rpx 20rpx 20rpx 20rpx;
-        background: #F6F6F6;
-        .message-controll
-            display: flex
-            justify-content: space-between
-            align-items: center
-            border-top: 2rpx solid #EAEAEA
-            padding: 24rpx 0 4rpx 0
-            margin-top: 10rpx
-            .controll-left
-            .controll-right
-                .controll-icon
-                    width: 60rpx;
-                    height: 60rpx;
-
-.messageNull
-    display: none
-.msg-loading{
-    background: transparent;
-    font-size: 24rpx;
-    color: #8f8d8e;
-    display: flex;
-    align-items: flex-end;
-    justify-content: flex-start;
-}
-.loaded{
-    padding-left: 20rpx
-}
-.chat-item.self .message {
-    background: linear-gradient( 225deg, #DAE2FE 0%, #E9E3FF 100%);
-        border-radius: 20rpx 0 20rpx 20rpx;
-    padding: 20rpx;
-    width: fit-content;
-}
-.input-area {
-    padding: 32rpx 28rpx 24rpx 28rpx;
-    /* #ifdef H5 */
-    padding-bottom: calc(24rpx + env(safe-area-inset-bottom) + 70rpx);
-    /* #endif */
-    /* #ifdef MP-WEIXIN */
-    /* 小程序不支持CSS中的本地图片，使用image标签替代 */
-    padding-bottom: calc(24rpx + env(safe-area-inset-bottom) + 40rpx - 50rpx);
-    /* #endif */
-    position: relative;
-    background: #FFFFFF;
-    box-shadow: 0rpx -4rpx 10rpx 0rpx rgba(11,44,112,0.06);
-    transition: height 2s ease-in-out;
-    z-index: 1001;
-}
-.ai-tips{
-    font-size: 24rpx;
-    color: #8c8c8c;
-    line-height: 33rpx;
-    margin-top: 18rpx;
-    text-align: center;
-}
-.input-area::after
-    position: absolute
-    content: ''
-    top: 0
-    left: 0
-    width: 100%
-    z-index: 1
-    box-shadow: 0rpx -4rpx 10rpx 0rpx rgba(11,44,112,0.06);
-.areatext{
-    display: flex;
-}
-.input {
-    flex: 1;
-    border-radius: 5rpx;
-    min-height: 63rpx;
-    line-height: 63rpx;
-    padding: 4rpx 24rpx;
-    position: relative
-    background: #F5F5F5;
-    border-radius: 60rpx 60rpx 60rpx 60rpx;
-}
-.input_vio
-    flex: 1;
-    border-radius: 5rpx;
-    min-height: 63rpx;
-    line-height: 63rpx;
-    padding: 4rpx 24rpx;
-    // position: relative
-    border-radius: 60rpx 60rpx 60rpx 60rpx;
-    font-size: 28rpx
-    color: #333333
-    background: #F5F5F5;
-    text-align: center
-    font-size: 28rpx
-    font-weight: 500
-    user-select:none;
-    -webkit-touch-callout:none;
-    -webkit-user-select:none;
-    -khtml-user-select:none;
-    -moz-user-select:none;
-    -ms-user-select:none;
-    touch-action: none; /* 禁用默认滚动 */
-.input_vio:active
-    background: #e8e8e8
-.vio_container
-    background: transparent
-    padding: 28rpx
-    text-align: center
-    -webkit-touch-callout:none;
-    -webkit-user-select:none;
-    -khtml-user-select:none;
-    -moz-user-select:none;
-    -ms-user-select:none;
-    touch-action: none; /* 禁用默认滚动 */
-    .record-tip
-        font-weight: 400;
-        color: #909090;
-        text-align: center;
-        padding-bottom: 16rpx
-
-
-.inputplaceholder {
-    font-weight: 500;
-    font-size: 24rpx;
-    color: #000000;
-    line-height: 28rpx;
-    opacity: 0.4
-}
-.btn-box
-    margin-left: 12rpx;
-    width: 70rpx;
-    height: 70rpx;
-    border-radius: 50%
-    background: #F5F5F5;
-    display: flex
-    align-items: center
-    justify-content: center
-    .send-btn,
-    .receive-btn
-        transition: transform 0.5s ease;
-        width: 38rpx;
-        height: 38rpx;
-    .btn-box-round
-        width: 22rpx
-        height: 22rpx
-        border-radius: 4rpx
-        background: #FFFFFF
-.purple
-    background: linear-gradient( 225deg, #9E74FD 0%, #256BFA 100%);
-.add-file-btn{
-    transform: rotate(45deg)
-    transition: transform 0.5s ease;
-}
-.area-tips{
-    font-weight: 400;
-    font-size: 26rpx;
-    color: #434343;
-    margin-top: 18rpx
-}
-.area-file
-    display: grid
-    width: 100%
-    grid-template-columns: repeat(3, 1fr)
-    grid-gap: 20rpx
-    padding: 20rpx 0 0 0;
-    .file-card
-        display: flex
-        flex-direction: column
-        align-items: center
-        padding: 24rpx 0
-        background: #F5F5F5;
-        border-radius: 20rpx 20rpx 20rpx 20rpx;
-        text
-            font-size: 24rpx
-            font-weight: 500
-            color: rgba(0,0,0,.5)
-            padding-top: 8rpx
-        .card-img
-            height: 56rpx
-            width: 56rpx
-    .file-card:active
-        background: #e8e8e8
-
-.area-uploadfiles
-    position: absolute
-    top: -180rpx
-    width: calc(100% - 30rpx)
-    background: #FFFFFF
-    left: 0
-    padding: 10rpx 0 10rpx 30rpx
-    box-shadow: 0rpx -4rpx 10rpx 0rpx rgba(11,44,112,0.06);
-    .uploadfiles-scroll
-        height: 100%
-        .uploadfiles-list
-            height: 100%
-            display: flex
-            margin-right: 28rpx
-            flex-wrap: nowrap
-            .file-doc
-                display: flex
-                align-items: center
-                justify-content: flex-start
-                padding: 16rpx 20rpx 18rpx 20rpx
-                height: calc(100% - 40rpx)
-                .doc-icon
-                    width: 60rpx
-                    height: 76rpx
-                    margin-right: 20rpx
-                .doc-con
-                    flex: 1
-                    width: 0
-            .file-uploadsend
-                margin: 10rpx 18rpx 0 0;
-                height: 100%
-                font-size: 24rpx
-                position: relative
-                min-width: 460rpx;
-                height: 160rpx;
-                border-radius: 12rpx 12rpx 12rpx 12rpx;
-                border: 2rpx solid #E2E2E2;
-                overflow: hidden
-                .file-del
-                    position: absolute
-                    right: 25rpx
-                    top: 18rpx
-                    z-index: 9
-                    border-radius: 50%
-                    display: flex
-                    align-items: center
-                    justify-content: center
-                    transform: translate(50%, -10rpx)
-                    height: 40rpx
-                    width: 37rpx;
-                    height: 37rpx;
-                    background: #4B4B4B;
-                    border: 2rpx solid #FFFFFF;
-                .file-del:active
-                    background: #e8e8e8
-                .filename-text
-                    overflow: hidden
-                    text-overflow: ellipsis
-                    white-space: nowrap
-                    color: #333333
-                    font-size: 24rpx
-                    font-weight: 500
-                    max-width: 100%
-                .filename-size
-                    overflow: hidden
-                    text-overflow: ellipsis
-                    white-space: nowrap
-                    color: #7B7B7B;
-                    max-width: 100%
-                .file-iconImg
-                    height: 100%
-                    width: 100%
-                .filerow
-                    display: flex
-                    align-items: center
-                    margin-top: 7rpx
-                    .row-x
-                        margin: 0 18rpx
-                        height: 20rpx
-                        width: 2rpx
-                        background: rgba(226, 226, 226, .9)
-            .file-border
-                width: 160rpx !important;
-
-@keyframes ai-circle {
-    0% {
-        -webkit-transform: rotate(0);
-        transform: rotate(0);
-    }
-    100% {
-        -webkit-transform: rotate(360deg);
-        transform: rotate(360deg);
-    }
-}
-.ai-loading
-    display: inline-flex;
-    vertical-align: middle;
-    width: 28rpx;
-    height: 28rpx;
-    background: 0 0;
-    border-radius: 50%;
-    border: 4rpx solid;
-    border-color: #e5e5e5 #e5e5e5 #e5e5e5 #8f8d8e;
-    -webkit-animation: ai-circle 1s linear infinite;
-    animation: ai-circle 1s linear infinite;
-</style>
diff --git a/pages/city-select/index.vue b/pages/city-select/index.vue
new file mode 100644
index 0000000..c62b2ea
--- /dev/null
+++ b/pages/city-select/index.vue
@@ -0,0 +1,425 @@
+<template>
+    <view class="city-select-container">
+        <!-- 顶部导航栏 -->
+        <!-- <view class="nav-bar">
+            <view class="nav-left" @click="navBack">
+                <uni-icons type="left" size="24" color="#333"></uni-icons>
+            </view>
+            <view class="nav-title">选择城市</view>
+            <view class="nav-right"></view>
+        </view> -->
+        
+        <!-- 搜索框 -->
+        <view class="search-box">
+            <uni-icons class="search-icon" type="search" size="20" color="#999"></uni-icons>
+            <input 
+                class="search-input" 
+                placeholder="搜索城市名/拼音" 
+                placeholder-style="color: #999" 
+                v-model="searchText"
+                @input="handleSearch"
+            >
+        </view>
+        
+        <!-- 定位城市 -->
+        <!-- <view class="location-section">
+            <view class="section-title">定位城市</view>
+            <view class="location-city" :class="{ active: selectedCity.code === locationCity.code }" @click="selectCity(locationCity)">
+                {{ locationCity.name }}
+            </view>
+        </view> -->
+        
+        <!-- 热门城市 -->
+    <!-- <view class="hot-section">
+        <view class="section-title">热门城市</view>
+        <view class="hot-cities">
+            <view 
+                class="city-item" 
+                :class="{ active: selectedCity.code === item.code }" 
+                v-for="item in hotCities" 
+                :key="item.code"
+                @click="selectCity(item)"
+            >
+                {{ item.name }}
+            </view>
+        </view>
+    </view> -->
+    
+    <!-- 城市数量统计 -->
+    <!-- <view class="city-count" v-if="allCities.length > 0">
+        共找到 {{ allCities.length }} 个城市
+    </view> -->
+        
+        <!-- 城市列表 -->
+        <view class="city-list-section">
+            <scroll-view 
+                class="city-list-content" 
+                scroll-y
+                :scroll-into-view="currentScrollId"
+                :scroll-with-animation="true"
+            >
+                <view 
+                    class="city-group" 
+                    v-for="group in cityGroups" 
+                    :key="group.letter"
+                    :id="`city-group-${group.letter}`"
+                >
+                    <view class="group-title">{{ group.letter }}</view>
+                    <view 
+                        class="city-item" 
+                        :class="{ active: selectedCity.code === item.code }" 
+                        v-for="item in group.cities" 
+                        :key="item.code"
+                        @click="selectCity(item)"
+                    >
+                        {{ item.name }}
+                    </view>
+                </view>
+            </scroll-view>
+            
+            <!-- 右侧字母索引 -->
+            <view class="letter-index">
+                <view 
+                    class="letter-item" 
+                    v-for="letter in letters" 
+                    :key="letter"
+                    @click="scrollToLetter(letter)"
+                    :class="{ active: currentLetter === letter }"
+                >
+                    {{ letter }}
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import { ref, reactive, onMounted, computed, inject } from 'vue';
+const { $api, navTo } = inject('globalFunction');
+
+// 搜索文本
+const searchText = ref('');
+// 定位城市
+const locationCity = ref({ code: '110100', name: '北京' });
+// 选中的城市
+const selectedCity = ref({ code: '', name: '' });
+// 当前显示的字母
+const currentLetter = ref('');
+// 当前滚动到的城市组ID
+const currentScrollId = ref('');
+// 城市数据
+const allCities = ref([]);
+// 字母列表
+const letters = ref(['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z']);
+
+
+// 按字母分组的城市
+const cityGroups = computed(() => {
+    const groups = {};
+    const filteredCities = allCities.value.filter(city => {
+        if (!searchText.value) return true;
+        return city.name.includes(searchText.value) || city.pinyin?.includes(searchText.value.toUpperCase());
+    });
+    
+    console.log('过滤后用于分组的城市:', filteredCities);
+    
+    // 初始化字母分组
+    letters.value.forEach(letter => {
+        groups[letter] = { letter, cities: [] };
+    });
+    
+    // 将城市分配到对应字母组
+    filteredCities.forEach(city => {
+        const firstLetter = city.pinyin || '#';
+        // 如果字母不在预定义列表中，将其添加到分组中
+        if (!groups[firstLetter]) {
+            groups[firstLetter] = { letter: firstLetter, cities: [] };
+        }
+        groups[firstLetter].cities.push(city);
+    });
+    
+    const result = Object.values(groups).filter(group => group.cities.length > 0);
+    
+    // 对城市组进行排序
+    result.sort((a, b) => {
+        // '#' 符号应该排在最前面
+        if (a.letter === '#') return -1;
+        if (b.letter === '#') return 1;
+        // 其他字母按字母顺序排序
+        return a.letter.localeCompare(b.letter);
+    });
+    
+    console.log('最终分组结果:', result);
+    
+    return result;
+});
+
+// 获取城市数据
+const getCityData = async () => {
+    try {
+        // 直接获取所有城市数据，新接口已经返回了所有层级的数据
+        const res = await $api.createRequest('/cms/dict/sysarea/listCity', {});
+        console.log('城市数据接口返回:', res);
+        if (res.code === 200 && res.data) {
+            console.log('原始城市数据:', res.data);
+            // 显示接口返回的所有城市数据
+            const filteredCities = res.data;
+            console.log('过滤后城市数据:', filteredCities);
+            
+            // 直接使用后端返回的zm字段作为拼音首字母，并转换为大写
+            allCities.value = filteredCities.map(city => ({
+                ...city,
+                pinyin: (city.zm || '#').toUpperCase()
+            }));
+            
+            console.log('使用后端zm字段的城市数据:', allCities.value);
+            
+            // 按拼音首字母排序
+            allCities.value.sort((a, b) => {
+                // 首先按拼音首字母排序
+                if (a.pinyin !== b.pinyin) {
+                    // '#' 符号应该排在最前面
+                    if (a.pinyin === '#') return -1;
+                    if (b.pinyin === '#') return 1;
+                    return a.pinyin.localeCompare(b.pinyin);
+                }
+                // 首字母相同时，按城市名称排序
+                return a.name.localeCompare(b.name);
+            });
+        }
+    } catch (error) {
+        console.error('获取城市数据失败:', error);
+    }
+};
+
+// 获取拼音首字母（使用更准确的映射表）
+const getPinyinFirstLetter = (name) => {
+    const firstChar = name.charAt(0);
+    
+    // 查找对应的拼音首字母
+    for (const [letter, chars] of Object.entries(pinyinMap)) {
+        if (chars.includes(firstChar)) {
+            return letter;
+        }
+    }
+    
+    // 如果没有找到，返回#
+    return '#';
+};
+
+// 处理搜索
+const handleSearch = () => {
+    // 搜索逻辑已在cityGroups计算属性中处理
+};
+
+// 选择城市
+const selectCity = (city) => {
+    selectedCity.value = city;
+    // 返回上一页并传递选择的城市
+    uni.navigateBack({
+        delta: 1,
+        success: () => {
+            // 发送事件通知首页选择了城市
+            uni.$emit('citySelected', city);
+        }
+    });
+};
+
+// 滚动到指定字母
+const scrollToLetter = (letter) => {
+    currentLetter.value = letter;
+    // 更新滚动ID，触发scroll-view滚动
+    currentScrollId.value = `city-group-${letter}`;
+};
+
+// 返回上一页
+const navBack = () => {
+    uni.navigateBack({ delta: 1 });
+};
+
+// 组件挂载时获取城市数据
+onMounted(() => {
+    getCityData();
+});
+</script>
+
+<style scoped>
+.city-select-container {
+    background-color: #f5f5f5;
+    min-height: 100vh;
+    padding-top: 16px;
+}
+
+/* 导航栏 */
+.nav-bar {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    height: 44px;
+    padding: 0 16px;
+    background-color: #fff;
+    border-bottom: 1px solid #e5e5e5;
+}
+
+.nav-left,
+.nav-right {
+    width: 40px;
+    height: 40px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.nav-title {
+    font-size: 18px;
+    font-weight: 500;
+    color: #333;
+}
+
+/* 搜索框 */
+.search-box {
+    display: flex;
+    align-items: center;
+    margin: 12px 16px;
+    padding:8px 16px;
+    background-color: #fff;
+    border-radius: 20px;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+}
+
+.search-icon {
+    margin-right: 8px;
+}
+
+.search-input {
+    flex: 1;
+    font-size: 14px;
+    color: #333;
+    border: none;
+    outline: none;
+}
+
+/* 定位城市 */
+.location-section {
+    padding: 16px;
+    background-color: #fff;
+    margin-bottom: 8px;
+}
+
+.section-title {
+    font-size: 14px;
+    color: #666;
+    margin-bottom: 12px;
+}
+
+.location-city {
+    display: inline-block;
+    padding: 8px 20px;
+    background-color: #f0f9ff;
+    color: #007aff;
+    border-radius: 20px;
+    font-size: 14px;
+}
+
+.location-city.active {
+    background-color: #007aff;
+    color: #fff;
+}
+
+/* 热门城市 */
+.hot-section {
+    padding: 16px;
+    background-color: #fff;
+    margin-bottom: 8px;
+}
+
+.city-count {
+    padding: 0 16px 12px;
+    background-color: #fff;
+    font-size: 12px;
+    color: #999;
+    margin-bottom: 8px;
+}
+
+.hot-cities {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 12px;
+}
+
+.city-item {
+    padding: 8px 20px;
+    background-color: #f5f5f5;
+    color: #333;
+    border-radius: 20px;
+    font-size: 14px;
+}
+
+.city-item.active {
+    background-color: #007aff;
+    color: #fff;
+}
+
+/* 城市列表 */
+.city-list-section {
+    display: flex;
+    background-color: #fff;
+    height: calc(100vh - 180px);
+}
+
+.city-list-content {
+    flex: 1;
+    overflow-y: auto;
+}
+
+.city-group {
+    padding: 0 16px;
+}
+
+.group-title {
+    font-size: 14px;
+    color: #666;
+    margin: 12px 0 8px 0;
+    padding-left: 4px;
+}
+
+.city-list-content .city-item {
+    display: block;
+    padding: 12px 4px;
+    margin-bottom: 0;
+    background-color: transparent;
+    border-radius: 0;
+    border-bottom: 1px solid #f0f0f0;
+}
+
+.city-list-content .city-item.active {
+    background-color: transparent;
+    color: #007aff;
+}
+
+/* 右侧字母索引 */
+.letter-index {
+    width: 30px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    background-color: #f5f5f5;
+}
+
+.letter-item {
+    width: 24px;
+    height: 20px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 12px;
+    color: #666;
+    margin: 2px 0;
+}
+
+.letter-item.active {
+    color: #007aff;
+    font-weight: bold;
+}
+</style>
\ No newline at end of file
diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue
index f55f850..c1c1ef6 100644
--- a/pages/index/components/index-one.vue
+++ b/pages/index/components/index-one.vue
@@ -1,5 +1,5 @@
 <template>
-    <view class="app-container">
+    <view class="app-container" @touchstart="handleTouchStart" @touchmove="handleTouchMove">
         <!-- #ifdef MP-WEIXIN -->
         <!-- 小程序背景图片 -->
         <image class="mp-background" src="/static/icon/background2.png" mode="aspectFill"></image>
@@ -110,7 +110,7 @@
                     <view class="service-icon service-icon-5">
                         <IconfontIcon name="jinengpeixun" :size="48" color="#FFFFFF" />
                     </view>
-                    <view class="service-title">技能培训</view>
+                    <view class="service-title">技能课堂</view>
                 </view>
                 <view class="service-item press-button" @click="handleServiceClick('skill-evaluation')">
                     <view class="service-icon service-icon-6">
@@ -136,12 +136,7 @@
                     </view>
                     <view class="service-title">虚拟面试</view>
                 </view>
-                <view class="service-item press-button" style="justify-content:normal" @click="goRc()">
-                    <view class="service-icon service-icon-9">
-                        <IconfontIcon name="Graduation-simple-" :size="32" color="#FFFFFF" />
-                    </view>
-                    <view class="service-title" style="overflow:unset">高校毕业生<br/>智慧就业服务</view>
-                </view>
+                
                 <view class="service-item press-button" @click="handleServiceClick('career-planning')">
                     <view class="service-icon service-icon-11">
                         <image class="service-icon-img" src="/static/icon/antOutline.png" mode="aspectFit"></image>
@@ -166,6 +161,12 @@
 				    </view>
 				    <view class="service-title">帮扶</view>
 				</view>
+				<!-- <view class="service-item press-button" v-if="isFourLevelLinkagePurview" @click="helpTaskClick">
+				    <view class="service-icon service-icon-1">
+				        <uni-icons type="shop" size="32" color="#FFFFFF"></uni-icons>
+				    </view>
+				    <view class="service-title">帮扶任务</view>
+				</view> -->
                 <view class="service-item press-button" @click="handleNoticeClick">
                     <view class="service-icon service-icon-10">
                         <uni-icons type="sound" size="32" color="#FFFFFF"></uni-icons>
@@ -185,6 +186,12 @@
                     </view>
                     <view class="service-title">评价机构信息</view>
                 </view>
+                <view class="service-item press-button" style="justify-content:normal" @click="goRc()">
+                    <view class="service-icon service-icon-9">
+                        <IconfontIcon name="Graduation-simple-" :size="32" color="#FFFFFF" />
+                    </view>
+                    <view class="service-title" style="overflow:unset">高校毕业生<br/>智慧就业服务</view>
+                </view>
             </view>
             <!-- #endif -->
         </view>
@@ -197,7 +204,7 @@
             </view>
             
             <view class="company-grid">
-                <view class="company-item press-button" @click="navTo('/pages/job/publishJob')">
+                <view class="company-item press-button" @click="navTo('/packageA/pages/job/publishJob')">
                     <view class="company-icon company-icon-1">
                         <uni-icons type="plus-filled" size="32" color="#FFFFFF"></uni-icons>
                     </view>
@@ -229,7 +236,7 @@
         
         
         <view class="nav-filter" :class="{ 'sticky-filter': shouldStickyFilter }" v-if="shouldShowJobSeekerContent">
-            <view class="filter-top" @touchmove.stop.prevent>
+            <view class="filter-top">
                 <scroll-view :scroll-x="true" :show-scrollbar="false" class="tab-scroll">
                     <view class="jobs-left">
                         <view
@@ -250,10 +257,15 @@
                         </view>
                     </view>
                 </scroll-view>
+                
                 <view class="jobs-add button-click" @click="navTo('/packageA/pages/addPosition/addPosition')">
                     <uni-icons class="iconsearch" color="#666D7F" type="plusempty" size="18"></uni-icons>
                     <text>添加</text>
                 </view>
+                <view class="jobs-add button-click" @click="navTo('/pages/city-select/index')" style="padding-right:0;">
+                    <text>{{ selectedCity.name || '地区' }}</text>
+                    <image class="right-sx" :class="{ active: showFilter }" src="@/static/icon/shaixun.png"></image>
+                </view>
             </view>
             <view class="filter-bottom">
                 <view class="btm-left">
@@ -281,7 +293,6 @@
                 @scrolltolower="scrollBottom"
                 :enable-back-to-top="false"
                 :scroll-with-animation="false"
-                @touchmove.stop.prevent
             >
                 <view class="falls" v-if="list.length">
                     <!-- #ifdef MP-WEIXIN -->
@@ -293,10 +304,17 @@
                         :value="list"
                     >
                         <view v-for="(job, index) in list" :key="index" :slot="`slot${index}`">
-                            <view class="item btn-feel" v-if="!job.recommend">
-                                <view class="falls-card" @click="nextDetail(job)">
+                            <view class="item" v-if="!job.recommend">
+                                <view 
+                                    class="falls-card" 
+                                    :class="{ 
+                                        'disabled-card': Number(job.isPublish) === 0
+                                    }" 
+                                    @click="Number(job.isPublish) === 1 ? nextDetail(job) : null"
+                                >
                                     <view class="falls-card-pay">
-                                        <view class="pay-text">
+                                        <view class="fl_1 falls-card-title">{{ job.jobTitle }}</view>
+                                        <view class="fr_1 pay-text">
                                             <Salary-Expectation
                                                 :max-salary="job.maxSalary"
                                                 :min-salary="job.minSalary"
@@ -305,31 +323,35 @@
                                         </view>
                                         <image v-if="job.isHot" class="flame" src="/static/icon/flame.png"></image>
                                     </view>
-                                    <view class="falls-card-title">{{ job.jobTitle }}</view>
-                                    <view class="fl_box fl_warp">
-                                        <view class="falls-card-education mar_ri10" v-if="job.education">
-                                            <dict-Label dictType="education" :value="job.education"></dict-Label>
-                                        </view>
-                                        <view class="falls-card-experience" v-if="job.experience">
-                                            <dict-Label dictType="experience" :value="job.experience"></dict-Label>
+                                    <view>
+                                        <!-- <view class="fl_1 falls-card-title">{{ job.jobTitle }}</view> -->
+                                    
+                                        <view class="fr_1 fl_box fl_warp">
+                                            <view class="falls-card-education mar_ri10" v-if="job.education">
+                                                <dict-Label dictType="education" :value="job.education"></dict-Label>
+                                            </view>
+                                            <view class="falls-card-experience" v-if="job.experience">
+                                                <dict-Label dictType="experience" :value="job.experience"></dict-Label>
+                                            </view>
                                         </view>
                                     </view>
-                                    <view class="falls-card-company" v-show="isShowJw !== 3">
+                                    <!-- <view class="falls-card-company" v-show="isShowJw !== 3">
                                         {{ config.appInfo.areaName }}
-                                        <!-- {{ job.jobLocation }} -->
-                                        <dict-Label dictType="area" :value="job.jobLocationAreaCode"></dict-Label>
-                                    </view>
+                                        {{ job.jobLocation }}
+                                        <dict-Label dictType="jobLocationAreaCode" :value="job.jobLocationAreaCode"></dict-Label>
+                                    </view> -->
                                     <view class="falls-card-pepleNumber">
                                         <view>
-                                            <image class="point2" src="/static/icon/pintDate.png"></image>
+                                             <image class="point2" src="/static/icon/pintDate.png"></image>
                                             <view class="fl_1">
-                                                {{ job.postingDate || '发布日期' }}
+                                               发布日期：{{ job.postingDate || '暂无数据' }}
                                             </view>
                                         </view>
                                         <view>
+                                            
                                             <image class="point3" src="/static/icon/pointpeople.png"></image>
                                             <view class="fl_1">
-                                                {{ vacanciesTo(job.vacancies) }}
+                                                招聘人数：{{ vacanciesTo(job.vacancies) }}
                                             </view>
                                         </view>
                                     </view>
@@ -338,6 +360,24 @@
                                         <view class="fl_1">
                                             {{ job.companyName }}
                                         </view>
+                                        <view class="fr-1" v-if="job.regionName">
+                                            地区：{{ job.regionName }}
+                                        </view>
+                                    </view>
+                                    <!-- 未通过审核状态显示 -->
+                                    <view class="unpublished-badge" v-if="Number(job.isPublish) === 0">
+                                        未通过审核
+                                    </view>
+                                    <!-- 招聘者显示上下架开关 -->
+                                    <view class="falls-card-actions" v-if="isRecruiter && Number(job.isPublish) === 1">
+                                        <view class="job-status-switch" @click.stop="toggleJobStatus(job)">
+                                            <view class="switch-track" :class="{ 'active': Number(job.jobStatus) === 0 }">
+                                                <view class="switch-thumb" :class="{ 'active': Number(job.jobStatus) === 0 }"></view>
+                                            </view>
+                                            <view class="switch-label">
+                                                {{ Number(job.jobStatus) === 0 ? '已上架' : '已下架' }}
+                                            </view>
+                                        </view>
                                     </view>
                                     <!--  <view class="falls-card-matchingrate">
                                         <view class=""><matchingDegree :job="job"></matchingDegree></view>
@@ -370,10 +410,17 @@
                         :value="list"
                     >
                         <template v-slot:default="job">
-                            <view class="item btn-feel" v-if="!job.recommend">
-                                <view class="falls-card" @click="nextDetail(job)">
+                            <view class="item" v-if="!job.recommend">
+                                <view 
+                                    class="falls-card" 
+                                    :class="{ 
+                                        'disabled-card': (Number(job.jobStatus) === 1 || Number(job.isPublish) === 0) && currentUserType !== 0 
+                                    }" 
+                                    @click="Number(job.isPublish) === 1 ? nextDetail(job) : null"
+                                >
                                     <view class="falls-card-pay">
-                                        <view class="pay-text">
+                                        <view class="fl_1 falls-card-title">{{ job.jobTitle }}</view>
+                                        <view class="fr_1 pay-text">
                                             <Salary-Expectation
                                                 :max-salary="job.maxSalary"
                                                 :min-salary="job.minSalary"
@@ -382,7 +429,7 @@
                                         </view>
                                         <image v-if="job.isHot" class="flame" src="/static/icon/flame.png"></image>
                                     </view>
-                                    <view class="falls-card-title">{{ job.jobTitle }}</view>
+                                    
                                     <view class="fl_box fl_warp">
                                         <view class="falls-card-education mar_ri10" v-if="job.education">
                                             <dict-Label dictType="education" :value="job.education"></dict-Label>
@@ -391,16 +438,16 @@
                                             <dict-Label dictType="experience" :value="job.experience"></dict-Label>
                                         </view>
                                     </view>
-                                    <view class="falls-card-company" v-show="isShowJw !== 3">
-                                        {{ config.appInfo.areaName }}
-                                        <!-- {{ job.jobLocation }} -->
-                                        <dict-Label dictType="area" :value="job.jobLocationAreaCode"></dict-Label>
-                                    </view>
+                                    <!-- <view class="falls-card-company" v-show="isShowJw !== 3">
+                                        地区：{{ config.appInfo.areaName }}
+                                        地址：{{ job.jobLocation }}
+                                        <dict-Label dictType="jobLocationAreaCode" :value="job.jobLocationAreaCode"></dict-Label>
+                                    </view> -->
                                     <view class="falls-card-pepleNumber">
                                         <view>
                                             <image class="point2" src="/static/icon/pintDate.png"></image>
                                             <view class="fl_1">
-                                                {{ job.postingDate || '发布日期' }}
+                                                发布日期：{{ job.postingDate || '暂无数据' }}
                                             </view>
                                         </view>
                                         <view>
@@ -415,6 +462,24 @@
                                         <view class="fl_1">
                                             {{ job.companyName }}
                                         </view>
+                                        <view class="fr-1" v-if="job.regionName">
+                                            地区：{{ job.regionName }}
+                                        </view>
+                                    </view>
+                                    <!-- 未通过审核状态显示 -->
+                                    <view class="unpublished-badge" v-if="Number(job.isPublish) === 0">
+                                        未通过审核
+                                    </view>
+                                    <!-- 招聘者显示上下架开关 -->
+                                    <view class="falls-card-actions" v-if="isRecruiter && Number(job.isPublish) === 1">
+                                        <view class="job-status-switch" @click.stop="toggleJobStatus(job)">
+                                            <view class="switch-track" :class="{ 'active': Number(job.jobStatus) === 0 }">
+                                                <view class="switch-thumb" :class="{ 'active': Number(job.jobStatus) === 0 }"></view>
+                                            </view>
+                                            <view class="switch-label">
+                                                {{ Number(job.jobStatus) === 0 ? '已上架' : '已下架' }}
+                                            </view>
+                                        </view>
                                     </view>
                                     <!--  <view class="falls-card-matchingrate">
                                         <view class=""><matchingDegree :job="job"></matchingDegree></view>
@@ -445,9 +510,15 @@
         </view>
         <!-- 筛选 -->
         <select-filter ref="selectFilterModel" />
+        <!-- 新筛选页面 -->
+        <new-filter-page 
+            :show="showNewFilter" 
+            @confirm="handleNewFilterConfirm" 
+            @close="handleNewFilterClose"
+            @update:show="(value) => showNewFilter = value"
+        />
+
 
-        <!-- 微信授权登录弹窗 -->
-        <WxAuthLogin ref="wxAuthLoginRef" @success="handleLoginSuccess" />
 
         <!--        <view class="maskFristEntry" v-if="maskFristEntry">
             <view class="entry-content">
@@ -525,6 +596,15 @@ const shouldShowCompanyCard = computed(() => {
     return companyInfo.name && companyInfo.name.trim() !== '';
 });
 
+// 计算当前用户类型
+const currentUserType = computed(() => {
+    // 优先从store获取，如果为空则从缓存获取
+    const storeIsCompanyUser = userInfo.value?.isCompanyUser;
+    const cachedUserInfo = uni.getStorageSync('userInfo') || {};
+    const cachedIsCompanyUser = cachedUserInfo.isCompanyUser;
+    return storeIsCompanyUser !== undefined ? Number(storeIsCompanyUser) : Number(cachedIsCompanyUser);
+});
+
 // 计算是否显示企业用户内容
 const shouldShowCompanyContent = computed(() => {
     // 未登录时不显示企业内容
@@ -545,14 +625,34 @@ const shouldShowCompanyContent = computed(() => {
     return userType === 0;
 });
 
+// 判断当前用户是否为招聘者（企业用户）
+const isRecruiter = computed(() => {
+    if (!hasLogin.value) {
+        return false;
+    }
+    
+    // 优先从store获取，如果为空则从缓存获取
+    const storeIsCompanyUser = userInfo.value?.isCompanyUser;
+    const cachedUserInfo = uni.getStorageSync('userInfo') || {};
+    const cachedIsCompanyUser = cachedUserInfo.isCompanyUser;
+    
+    // 获取用户类型：优先使用store中的isCompanyUser，如果store中没有，使用缓存中的isCompanyUser
+    // 缓存中的值可能是字符串，需要转换为数值类型
+    const userType = storeIsCompanyUser !== undefined ? Number(storeIsCompanyUser) : Number(cachedIsCompanyUser);
+    
+    // 企业用户(isCompanyUser=0)是招聘者
+    return userType === 0;
+});
+
 import useDictStore from '@/stores/useDictStore';
 const { getTransformChildren, oneDictData, dictLabel: getDictLabel, industryLabel } = useDictStore();
 import useLocationStore from '@/stores/useLocationStore';
 import selectFilter from '@/components/selectFilter/selectFilter.vue';
+import newFilterPage from '@/components/new-filter-page/new-filter-page.vue';
 import { useRecommedIndexedDBStore, jobRecommender } from '@/stores/useRecommedIndexedDBStore.js';
 import { useScrollDirection } from '@/hook/useScrollDirection';
 import { useColumnCount } from '@/hook/useColumnCount';
-import WxAuthLogin from '@/components/WxAuthLogin/WxAuthLogin.vue';
+
 import IconfontIcon from '@/components/IconfontIcon/IconfontIcon.vue'
 // 企业卡片组件已内联到模板中
 // 滚动状态管理
@@ -562,10 +662,48 @@ const lastScrollTop = ref(0);
 const scrollTop = ref(0);
 // 当用户与筛选/导航交互时，临时锁定头部显示状态，避免因数据刷新导致回弹显示
 const isInteractingWithFilter = ref(false);
+// 触摸事件状态
+const touchStartY = ref(0);
+const touchMoveY = ref(0);
 // 滚动阈值配置
 const HIDE_THRESHOLD = 50; // 隐藏顶部区域的滚动阈值（降低阈值，更容易触发）
 const SHOW_THRESHOLD = 5; // 显示顶部区域的滚动阈值（接近顶部）
 const STICKY_THRESHOLD = 80; // 筛选区域吸顶的滚动阈值
+const TOUCH_MOVE_THRESHOLD = 30; // 触摸滑动阈值，用于判断是否为有效滑动
+
+// 处理触摸开始事件
+function handleTouchStart(e) {
+    // 记录触摸起始位置
+    touchStartY.value = e.touches[0].clientY;
+}
+
+// 处理触摸移动事件
+function handleTouchMove(e) {
+    // 记录触摸移动位置
+    touchMoveY.value = e.touches[0].clientY;
+    
+    // 计算滑动距离
+    const diffY = touchStartY.value - touchMoveY.value;
+    
+    // 当向上滑动超过阈值时，隐藏顶部区域
+    if (diffY > TOUCH_MOVE_THRESHOLD) {
+        if (!shouldHideTop.value) {
+            shouldHideTop.value = true;
+        }
+        if (!shouldStickyFilter.value) {
+            shouldStickyFilter.value = true;
+        }
+    }
+    // 当向下滑动超过阈值且在顶部附近时，显示顶部区域
+    else if (diffY < -TOUCH_MOVE_THRESHOLD && scrollTop.value <= SHOW_THRESHOLD) {
+        if (shouldHideTop.value && !isInteractingWithFilter.value) {
+            shouldHideTop.value = false;
+        }
+        if (shouldStickyFilter.value) {
+            shouldStickyFilter.value = false;
+        }
+    }
+}
 
 // 简化的滚动处理函数
 function handleScroll(e) {
@@ -605,7 +743,7 @@ const loadmoreRef = ref(null);
 const conditionSearch = ref({});
 const waterfallcolumn = ref(2);
 const maskFristEntry = ref(false);
-const wxAuthLoginRef = ref(null);
+
 const state = reactive({
     tabIndex: 'all',
 });
@@ -613,6 +751,9 @@ const state = reactive({
 const helpClick = () => {
     navTo('/packageB/priority/helpFilter');
 };
+const helpTaskClick = () =>{
+	navTo('/packageB/priority/index');
+}
 //招聘会模块跳转
 const handleJobFairClick = () => {
     navTo('/pages/careerfair/careerfair');
@@ -631,11 +772,14 @@ const inputText = ref('');
 const showFilter = ref(false);
 const selectFilterModel = ref(null);
 const showModel = ref(false);
+const showNewFilter = ref(false);
+// 选中的城市
+const selectedCity = ref({ code: '', name: '' });
 const rangeOptions = ref([
     { value: 0, text: '推荐' },
     { value: 1, text: '最热' },
     { value: 2, text: '最新发布' },
-    { value: 3, text: '疆外' },
+    // { value: 3, text: '疆外' },
     { value: 4, text: '零工市场' }
 ]);
 const isLoaded = ref(false);
@@ -714,7 +858,7 @@ onMounted(() => {
     getCompanyInfo();
     // pageNull.value = 0;
     uni.$on('showLoginModal', () => {
-        wxAuthLoginRef.value?.open();
+        uni.navigateTo({ url: '/pages/login/wx-login' });
         pageNull.value = 0;
     });
 });
@@ -723,14 +867,24 @@ onMounted(() => {
     // 在组件挂载时绑定事件监听，确保只绑定一次
     // 先移除可能存在的旧监听，避免重复绑定
     uni.$off('showLoginModal');
+    uni.$off('citySelected');
     
     // 绑定新的监听
     uni.$on('showLoginModal', () => {
         console.log('收到showLoginModal事件，打开登录弹窗');
-        wxAuthLoginRef.value?.open();
+        uni.navigateTo({ url: '/pages/login/wx-login' });
         pageNull.value = 0;
     });
     
+    // 监听城市选择事件
+    uni.$on('citySelected', (city) => {
+        console.log('收到citySelected事件，选择的城市:', city);
+        selectedCity.value = city;
+        // 可以在这里添加根据城市筛选职位的逻辑
+        conditionSearch.value.regionCode = city.code;
+        getJobRecommend('refresh');
+    });
+    
     // 获取企业信息
     getCompanyInfo();
 });
@@ -738,6 +892,7 @@ onMounted(() => {
 onUnmounted(() => {
     // 组件销毁时移除事件监听
     uni.$off('showLoginModal');
+    uni.$off('citySelected');
 });
 
 onShow(() => {
@@ -776,26 +931,19 @@ const handleLoginSuccess = () => {
     getIsFourLevelLinkagePurview()
 };
 // H5环境下从URL获取token并自动登录
-onLoad(() => {
-    // #ifdef H5
-        const token = uni.getStorageSync('zkr-token');
-        if (token) {
-            useUserStore().loginSetToken(token);
-        }
-    // #endif
-});
+// onLoad 函数已移至下方，包含筛选参数处理
 
 // 处理附近工作点击
 const handleNearbyClick = (options  ) => {
     // #ifdef MP-WEIXIN
     if (checkLogin()) {
-        navTo('/pages/nearby/nearby');
+        navTo('/packageA/pages/nearby/nearby');
     }
     // #endif
     // #ifdef H5
     const token = options.token || uni.getStorageSync('zkr-token');
     if (token) {
-        navTo('/pages/nearby/nearby');
+        navTo('/packageA/pages/nearby/nearby');
     }
     // #endif
 };
@@ -944,7 +1092,7 @@ function clearfindJob(job) {
 }
 
 function nextDetail(job) {
-    navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(job.jobId)}`);
+    navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(job.jobId)}&encryptJobId=${encodeURIComponent(job.encryptJobId)}`);
 }
 
 function navToService(serviceType) {
@@ -959,7 +1107,7 @@ function navToService(serviceType) {
         // 'skill-evaluation': '/pages/service/skill-evaluation',
         'question-bank': '/pages/service/question-bank',
         // 'quality-assessment': '/packageCa/search/search',
-        // 'ai-interview': '/pages/chat/chat',
+        // 'ai-interview': '/packageA/pages/chat/chat',
         'job-search': '/pages/search/search',
         'career-planning': '/pages/service/career-planning',
         'salary-query': '/pages/service/salary-query',
@@ -982,34 +1130,65 @@ function navToService(serviceType) {
 
 function openFilter() {
     isInteractingWithFilter.value = true;
-    showFilter.value = true;
+    showNewFilter.value = true;
     emits('onShowTabbar', false);
-    selectFilterModel.value?.open({
-        title: '筛选',
-        maskClick: true,
-        success: (values) => {
-            pageState.search = {
-                ...pageState.search,
-            };
-            for (const [key, value] of Object.entries(values)) {
-                // 特殊处理岗位类型，直接传递数字值
+}
+
+function handleNewFilterConfirm(values) {
+    pageState.search = {
+        ...pageState.search,
+    };
+    for (const [key, value] of Object.entries(values)) {
+        // 特殊处理岗位类型，直接传递数字值
+        if (key === 'jobType') {
+            pageState.search.type = value;
+        } else if (value) {
+            pageState.search[key] = value;
+        } else {
+            // 如果值为空，删除该搜索条件
+            delete pageState.search[key];
+        }
+    }
+    showNewFilter.value = false;
+    getJobList('refresh');
+    // 短暂延迟后解除交互锁，避免数据刷新导致顶部区域回弹
+    setTimeout(() => { isInteractingWithFilter.value = false; }, 400);
+    emits('onShowTabbar', true);
+}
+
+// 监听页面加载，接收筛选参数
+onLoad((options) => {
+    // #ifdef H5
+        const token = uni.getStorageSync('zkr-token');
+        if (token) {
+            useUserStore().loginSetToken(token);
+        }
+    // #endif
+    
+    // 接收从筛选页面传递过来的参数
+    if (options.filterParams) {
+        try {
+            const filterParams = JSON.parse(options.filterParams);
+            console.log('filterParams:', filterParams);
+            for (const [key, value] of Object.entries(filterParams)) {
                 if (key === 'jobType') {
-                    pageState.search.type = value.join(',');
-                } else {
-                    pageState.search[key] = value.join(',');
+                    pageState.search.type = value;
+                } else if (value) {
+                    pageState.search[key] = value;
                 }
             }
-            showFilter.value = false;
+            console.log('pageState.search:', pageState.search);
             getJobList('refresh');
-            // 短暂延迟后解除交互锁，避免数据刷新导致顶部区域回弹
-            setTimeout(() => { isInteractingWithFilter.value = false; }, 400);
-        },
-        cancel: () => {
-            showFilter.value = false;
-            emits('onShowTabbar', true);
-            setTimeout(() => { isInteractingWithFilter.value = false; }, 200);
-        },
-    });
+        } catch (error) {
+            console.error('解析筛选参数失败:', error);
+        }
+    }
+});
+
+function handleNewFilterClose() {
+    showNewFilter.value = false;
+    emits('onShowTabbar', true);
+    setTimeout(() => { isInteractingWithFilter.value = false; }, 200);
 }
 
 function handleFilterConfirm(e) {
@@ -1064,7 +1243,6 @@ function getJobRecommend(type = 'add') {
         sessionId: useUserStore().seesionId,
         ...pageState.search,
         ...conditionSearch.value,
-        isPublish: 1,
     };
     // 当选中零工市场(4)或疆外(3)时，order参数传递0
     if (pageState.search.order === 3 || pageState.search.order === 4) {
@@ -1079,6 +1257,11 @@ function getJobRecommend(type = 'add') {
     // 只有企业用户(isCompanyUser=0)才添加current字段
     if (userType === 0) {
         params.current = pageNull.value;
+        // 企业用户不传递isPublish字段
+    } else {
+        // 求职者只显示已上架且通过审核的岗位（jobStatus=0, isPublish=1）
+        params.jobStatus = 0;
+        params.isPublish = 1;
     }
     let comd = { recommend: true, jobCategory: '', tip: '确认你的兴趣，为您推荐更多合适的岗位' };
     $api.createRequest('/app/job/recommend', params).then((resData) => {
@@ -1152,6 +1335,19 @@ function getJobList(type = 'add') {
     if (pageState.search.order === 3 || pageState.search.order === 4) {
         params.order = 0;
     }
+    
+    // 判断用户类型，求职者只显示已上架的岗位（jobStatus=0）
+    // 优先从store获取，如果为空则从缓存获取
+    const storeIsCompanyUser = userInfo.value?.isCompanyUser;
+    const cachedUserInfo = uni.getStorageSync('userInfo') || {};
+    const cachedIsCompanyUser = cachedUserInfo.isCompanyUser;
+    const userType = storeIsCompanyUser !== undefined ? Number(storeIsCompanyUser) : Number(cachedIsCompanyUser);
+    
+    // 如果不是企业用户（求职者），只显示已上架且通过审核的岗位
+    if (userType !== 0) {
+        params.jobStatus = 0;
+        params.isPublish = 1;
+    }
 
     $api.createRequest('/app/job/list', params).then((resData) => {
         const { rows, total } = resData;
@@ -1175,6 +1371,93 @@ function getJobList(type = 'add') {
         }
     });
 }
+
+// 上架岗位
+const jobUp = (encryptJobId) => {
+    if (!checkLogin()) return;
+    
+    uni.showLoading({
+        title: '处理中...',
+        mask: true
+    });
+    
+    $api.createRequest(`/app/job/jobUp/${encryptJobId}`, {}, 'PUT', true).then((res) => {
+        uni.hideLoading();
+        $api.msg('上架成功');
+        // 刷新数据
+        if (state.tabIndex === 'all') {
+            getJobRecommend('refresh');
+        } else {
+            getJobList('refresh');
+        }
+    }).catch((err) => {
+        uni.hideLoading();
+        console.error('上架失败:', err);
+        $api.msg('上架失败，请重试');
+    });
+};
+
+// 下架岗位
+const jobDown = (encryptJobId) => {
+    if (!checkLogin()) return;
+    
+    uni.showLoading({
+        title: '处理中...',
+        mask: true
+    });
+    
+    $api.createRequest(`/app/job/jobDown/${encryptJobId}`, {}, 'PUT', true).then((res) => {
+        uni.hideLoading();
+        $api.msg('下架成功');
+        // 刷新数据
+        if (state.tabIndex === 'all') {
+            getJobRecommend('refresh');
+        } else {
+            getJobList('refresh');
+        }
+    }).catch((err) => {
+        uni.hideLoading();
+        console.error('下架失败:', err);
+        $api.msg('下架失败，请重试');
+    });
+};
+
+// 切换岗位状态（上架/下架）
+const toggleJobStatus = (job) => {
+    if (!checkLogin()) return;
+    
+    uni.showLoading({
+        title: '处理中...',
+        mask: true
+    });
+    
+    // 根据当前状态决定调用哪个接口
+    const isCurrentlyUp = Number(job.jobStatus) === 0; // 0: 已上架, 1: 已下架
+    const apiUrl = isCurrentlyUp ? `/app/job/jobDown/${job.encryptJobId}` : `/app/job/jobUp/${job.encryptJobId}`;
+    
+    $api.createRequest(apiUrl, {}, 'PUT', true).then((res) => {
+        uni.hideLoading();
+        $api.msg(isCurrentlyUp ? '下架成功' : '上架成功');
+        
+        // 更新本地数据状态，避免立即刷新整个列表
+        const jobIndex = list.value.findIndex(item => item.encryptJobId === job.encryptJobId);
+        if (jobIndex !== -1) {
+            // 更新状态
+            list.value[jobIndex].jobStatus = isCurrentlyUp ? 1 : 0;
+        }
+        
+        // 也可以选择刷新数据
+        // if (state.tabIndex === 'all') {
+        //     getJobRecommend('refresh');
+        // } else {
+        //     getJobList('refresh');
+        // }
+    }).catch((err) => {
+        uni.hideLoading();
+        console.error('操作失败:', err);
+        $api.msg(isCurrentlyUp ? '下架失败，请重试' : '上架失败，请重试');
+    });
+};
 const isFourLevelLinkagePurview=ref(false)
 const getIsFourLevelLinkagePurview=()=>{
     let userInfo = uni.getStorageSync('userInfo')
@@ -1493,10 +1776,10 @@ defineExpose({ loadData });
             color: #256BFA
 // 服务功能网格样式
 .service-grid
-    padding: 20rpx 28rpx
+    padding: 10rpx 28rpx
     display: grid
     grid-template-columns: 1fr 1fr 1fr 1fr
-    grid-gap: 20rpx
+    grid-gap: 10rpx
     .service-item
         display: flex
         flex-direction: column
@@ -1504,12 +1787,12 @@ defineExpose({ loadData });
         justify-content: center
         height: 120rpx
         background: transparent
-        padding: 10px 0px
+        padding: 2rpx 0px
         .service-icon
-            width: 88rpx
-            height: 88rpx
-            border-radius: 12rpx
-            margin-bottom: 8rpx
+            width: 62rpx
+            height: 62rpx
+            border-radius: 10rpx
+            margin-bottom: 14rpx
             flex-shrink: 0
         .service-icon-1
             background: linear-gradient(180deg, #FF8E8E 0%, #E53E3E 100%)
@@ -1728,6 +2011,9 @@ defineExpose({ loadData });
             min-width: 80rpx;
             padding: 8rpx 12rpx;
             white-space: nowrap;
+            .right-sx
+                width: 28rpx;
+                height: 28rpx;
     .filter-bottom
         display: flex
         justify-content: space-between
@@ -1876,6 +2162,17 @@ defineExpose({ loadData });
                             margin: 4rpx 4rpx 0 0
                             height: 26rpx
                             width: 26rpx
+                    // 未通过审核状态样式
+                    .unpublished-badge
+                        position: absolute
+                        top: 0
+                        right: 0
+                        background-color: #FF4D4F
+                        color: #FFFFFF
+                        font-size: 20rpx
+                        padding: 6rpx 12rpx
+                        border-bottom-left-radius: 16rpx
+                        z-index: 10
 // 推荐卡片
 .recommend-card::before
     position: absolute
@@ -2205,4 +2502,54 @@ defineExpose({ loadData });
                 color: #FFFFFF
                 text-align: center
                 white-space: nowrap
+
+// 上下架开关样式
+.falls-card-actions
+    margin-top: 20rpx
+    .job-status-switch
+        display: flex
+        align-items: center
+        justify-content: space-between
+        padding: 8rpx 0
+        .switch-track
+            width: 80rpx
+            height: 40rpx
+            background: #e0e0e0
+            border-radius: 20rpx
+            position: relative
+            transition: all 0.3s ease
+            cursor: pointer
+            &.active
+                background: #52c41a
+            .switch-thumb
+                position: absolute
+                top: 4rpx
+                left: 4rpx
+                width: 32rpx
+                height: 32rpx
+                background: #ffffff
+                border-radius: 50%
+                box-shadow: 0 2rpx 4rpx rgba(0, 0, 0, 0.2)
+                transition: all 0.3s ease
+                &.active
+                    left: 44rpx
+        .switch-label
+            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif
+            font-weight: 500
+            font-size: 24rpx
+            color: #666666
+            margin-left: 16rpx
+            min-width: 80rpx
+            text-align: center
+
+// 下架后卡片置灰样式
+.disabled-card
+    opacity: 0.6
+    filter: grayscale(50%)
+    background: #f8f8f8 !important
+    .falls-card-title,
+    .falls-card-company,
+    .falls-card-pepleNumber,
+    .falls-card-company2
+        color: #999999 !important
 </style>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c903289..734ceda 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,6 +1,16 @@
 <template>
     <view class="app-custom-root">
         <view class="app-container">
+            <!-- #ifdef H5 -->
+            <!-- 自定义导航栏 -->
+            <view class="custom-nav" :style="{paddingTop: statusBarHeight + 'px'}">
+                <view class="nav-content">
+                    <view class="nav-back" @click="back"><text class="nav-back-text">‹</text></view>
+                    <view class="nav-title">喀什智慧就业平台</view>
+                    <view class="nav-placeholder"></view>
+                </view>
+            </view>
+            <!-- #endif -->
             <!-- 主体内容区域 -->
             <view class="container-main">
                 <IndexOne @onShowTabbar="changeShowTabbar" />
@@ -26,7 +36,13 @@ const userStore = useUserStore();
 onLoad((options) => {
     // useReadMsg().fetchMessages();
 });
-
+// 返回按钮功能
+function back() {
+    // uni.navigateBack({
+    //     delta: 1
+    // });
+    window.location.href = 'https://www.xjksly.cn/mechine-single-vue/';
+}
 onShow(() => {
     // 更新自定义tabbar选中状态
     tabbarManager.updateSelected(0);
@@ -191,4 +207,39 @@ onShow(() => {
             background: #FFFFFF
             width: 4rpx
             height: 20rpx
+/* 自定义导航栏样式 */
+.custom-nav
+    background: linear-gradient(135deg, #8a9bf0, #c3cafa, #e7ebfe)
+    width: 100%
+    box-shadow: 0 2rpx 10rpx rgba(138, 155, 240, 0.2)
+    border-radius: 0
+    .nav-content
+        height: 80rpx
+        display: flex
+        align-items: center
+        justify-content: space-between
+        padding: 0 40rpx
+        .nav-back
+            width: 120rpx
+            height: 80rpx
+            display: flex
+            align-items: center
+            justify-content: flex-start
+            color: #2f56e8
+            font-weight: 400
+            transition: all 0.3s ease
+            &:hover
+                transform: translateX(-5rpx)
+            .nav-back-text
+                font-size: 56rpx
+                line-height: 1
+                text-shadow: 1rpx 1rpx 2rpx rgba(0, 0, 0, 0.1)
+        .nav-title
+            color: #4a55b0
+            font-size: 36rpx
+            font-weight: 600
+            text-shadow: 1rpx 1rpx 2rpx rgba(255, 255, 255, 0.8)
+            letter-spacing: 2rpx
+        .nav-placeholder
+            width: 120rpx
 </style>
diff --git a/pages/login/sms-verify.vue b/pages/login/sms-verify.vue
new file mode 100644
index 0000000..5ce1577
--- /dev/null
+++ b/pages/login/sms-verify.vue
@@ -0,0 +1,634 @@
+<template>
+    <view class="sms-verify-page">
+        <!-- 顶部导航栏 -->
+        <!-- <view class="nav-bar">
+            <view class="nav-back" @click="goBack">
+                <uni-icons type="arrowleft" size="24" color="#333"></uni-icons>
+            </view>
+            <view class="nav-title">短信验证</view>
+            <view class="nav-placeholder"></view>
+        </view> -->
+
+        <!-- 页面内容 -->
+        <view class="page-content">
+            <!-- 安全提示 -->
+            <view class="security-tip">
+                <view class="tip-icon">
+                    <uni-icons type="auth-filled" size="36" color="#256BFA"></uni-icons>
+                </view>
+                <view class="tip-text">为了您的账户安全需要您进行验证</view>
+            </view>
+            
+            <!-- 手机号显示 -->
+            <view class="phone-display">
+                <view class="phone-label">验证码将发送至</view>
+                <view class="phone-number">{{ formattedPhone }}</view>
+            </view>
+            
+            <!-- 验证码输入区域 -->
+            <view class="sms-input-area">
+                <view class="input-label">请输入6位数字验证码</view>
+                <view class="single-input-container">
+                    <input
+                        ref="smsInput"
+                        class="single-input"
+                        type="tel"
+                        inputmode="numeric"
+                        pattern="[0-9]*"
+                        autocomplete="one-time-code"
+                        maxlength="6"
+                        :value="smsCode"
+                        @input="onCodeInput"
+                        @paste="onPaste"
+                        placeholder="请输入验证码"
+                        :focus="autoFocus"
+                    />
+                </view>
+            </view>
+            
+            <!-- 倒计时和重发 -->
+            <view class="countdown-section">
+                <view v-if="countdown > 0" class="countdown-text">
+                    {{ countdown }}秒后重新获取
+                </view>
+                <view v-else class="resend-text" @click="resendSms">
+                    重新获取验证码
+                </view>
+            </view>
+            
+            <!-- 提交按钮 -->
+            <button class="submit-btn" :disabled="!canSubmit" @click="submitVerification">
+                <text v-if="!loading">确认</text>
+                <view v-else class="loading-spinner"></view>
+            </button>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import { ref, inject, computed, onMounted, onUnmounted } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+import useUserStore from '@/stores/useUserStore';
+import { tabbarManager } from '@/utils/tabbarManager';
+
+const { $api } = inject('globalFunction');
+const userStore = useUserStore();
+
+// 从页面参数获取数据
+const phone = ref('');
+const openid = ref('');
+const unionid = ref('');
+const userType = ref('');
+const orgType = ref('');
+
+// 验证码相关
+const smsCode = ref(''); // 单个字符串验证码
+const smsInput = ref(null); // 输入框引用
+const countdown = ref(60); // 倒计时
+const timer = ref(null);
+const loading = ref(false);
+const autoFocus = ref(true); // 自动聚焦
+
+// 格式化手机号：只显示前三位和后四位，中间用星号代替
+const formattedPhone = computed(() => {
+    if (!phone.value || phone.value.trim() === '') {
+        return '未知号码';
+    }
+    
+    // 清理手机号，移除空格和特殊字符
+    const cleanPhone = phone.value.replace(/\D/g, '');
+    
+    if (cleanPhone.length < 11) {
+        return phone.value;
+    }
+    
+    const prefix = cleanPhone.substring(0, 3);
+    const suffix = cleanPhone.substring(cleanPhone.length - 4);
+    return `${prefix}****${suffix}`;
+});
+
+// 是否可以提交
+const canSubmit = computed(() => {
+    return smsCode.value.length === 6 && !loading.value;
+});
+
+// 页面加载时获取参数
+onLoad(async (options) => {
+    // 尝试多种可能的手机号字段名（按优先级）
+    const possiblePhoneFields = [
+        'phone', 'mobile', 'phoneNumber', 'tel', 
+        'phoneNum', 'userPhone', 'telephone', 'mobilePhone', 'cellphone',
+        'userTel', 'userMobile', 'contactPhone'
+    ];
+    
+    let foundPhone = '';
+    for (const field of possiblePhoneFields) {
+        if (options[field]) {
+            foundPhone = options[field];
+            break;
+        }
+    }
+    
+    // 如果没找到，尝试从URL参数中解析
+    if (!foundPhone) {
+        const currentPages = getCurrentPages();
+        if (currentPages.length > 0) {
+            const currentPage = currentPages[currentPages.length - 1];
+            
+            // 尝试从页面路由参数中获取
+            if (currentPage.$page && currentPage.$page.fullPath) {
+                const urlParams = new URLSearchParams(currentPage.$page.fullPath.split('?')[1] || '');
+                for (const field of possiblePhoneFields) {
+                    const value = urlParams.get(field);
+                    if (value) {
+                        foundPhone = value;
+                        break;
+                    }
+                }
+            }
+        }
+    }
+    
+    phone.value = foundPhone || '';
+    openid.value = options.openid || '';
+    unionid.value = options.unionid || '';
+    userType.value = options.userType || '';
+    orgType.value = options.orgType || '';
+    
+    // 如果手机号仍然为空，显示错误信息
+    if (!phone.value) {
+        uni.showToast({ title: '无法获取手机号，请返回重试', icon: 'none' });
+    }
+    
+    // 开始倒计时
+    startCountdown();
+    
+    // 自动聚焦到输入框
+    setTimeout(() => {
+        if (smsInput.value && typeof smsInput.value.focus === 'function') {
+            smsInput.value.focus();
+        }
+    }, 300);
+});
+
+// 开始倒计时
+const startCountdown = () => {
+    clearInterval(timer.value);
+    countdown.value = 60;
+    timer.value = setInterval(() => {
+        if (countdown.value > 0) {
+            countdown.value--;
+        } else {
+            clearInterval(timer.value);
+        }
+    }, 1000);
+};
+
+// 重发验证码
+const resendSms = async () => {
+    if (countdown.value > 0) return;
+    
+    // 检查手机号是否为空
+    if (!phone.value) {
+        uni.showToast({ title: '手机号获取失败，请返回重试', icon: 'none' });
+        return;
+    }
+    
+    uni.showLoading({ title: '发送中...' });
+    try {
+        // 调用重新发送验证码接口
+        const requestParams = { phone: phone.value };
+        // 只有单位用户才传递机构类型
+        if (userType.value === '0') {
+            requestParams.orgType = orgType.value;
+            requestParams.userType = userType.value;
+        }
+        const res = await $api.createRequest('/app/sendSmsAgain', requestParams, 'post');
+        
+        // 检查状态码
+        if (res.code === 200 ) {
+            uni.hideLoading();
+            
+            uni.showToast({ title: '验证码已发送', icon: 'success' });
+            startCountdown();
+        } else {
+            uni.hideLoading();
+            uni.showToast({ title: res.msg || '发送失败', icon: 'none' });
+        }
+    } catch (error) {
+        uni.hideLoading();
+        uni.showToast({ title: error.msg || '发送失败，请重试', icon: 'none' });
+    }
+};
+
+// 验证码输入处理
+const onCodeInput = (e) => {
+    let value = e.detail.value.replace(/\D/g, ''); // 只保留数字
+    
+    // 限制为6位数字
+    if (value.length > 6) {
+        value = value.substring(0, 6);
+    }
+    
+    smsCode.value = value;
+};
+
+// 粘贴事件处理
+const onPaste = (e) => {
+    // #ifdef MP-WEIXIN
+    // 微信小程序中，使用异步方式获取剪贴板
+    setTimeout(() => {
+        pasteFromClipboard();
+    }, 50);
+    
+    // 尝试阻止默认行为
+    if (e && e.preventDefault) {
+        e.preventDefault();
+    }
+    if (e && e.stopPropagation) {
+        e.stopPropagation();
+    }
+    // #endif
+    
+    // #ifndef MP-WEIXIN
+    // 其他平台（H5/App）使用标准粘贴处理
+    e.preventDefault();
+    e.stopPropagation();
+    
+    let pasteText = '';
+    if (e.clipboardData && e.clipboardData.getData) {
+        pasteText = e.clipboardData.getData('text');
+    }
+    
+    if (pasteText) {
+        // 处理粘贴的文本
+        handlePaste(pasteText);
+    } else {
+        // 使用异步方式获取剪贴板
+        setTimeout(() => {
+            pasteFromClipboard();
+        }, 100);
+    }
+    
+    return false;
+    // #endif
+};
+
+// 处理粘贴的文本
+const handlePaste = (text) => {
+    // 提取数字
+    const digits = text.replace(/\D/g, '');
+    
+    if (digits.length === 0) {
+        uni.showToast({ title: '剪贴板中没有找到验证码', icon: 'none' });
+        return;
+    }
+    
+    // 限制为6位数字
+    const code = digits.substring(0, 6);
+    smsCode.value = code;
+    
+    uni.showToast({ title: '已粘贴验证码', icon: 'success' });
+};
+
+// 从剪贴板粘贴验证码
+const pasteFromClipboard = () => {
+    uni.getClipboardData({
+        success: (res) => {
+            const text = res.data || '';
+            handlePaste(text);
+        },
+        fail: () => {
+            uni.showToast({ title: '读取剪贴板失败', icon: 'none' });
+        }
+    });
+};
+
+// 提交验证
+const submitVerification = async () => {
+    if (!canSubmit.value) {
+        return;
+    }
+    
+    loading.value = true;
+    const code = smsCode.value;
+    
+    // 检查手机号是否为空
+    if (!phone.value) {
+        uni.showToast({ title: '手机号获取失败，请返回重试', icon: 'none' });
+        loading.value = false;
+        return;
+    }
+    
+    try {
+        // 调用接口 /app/appLoginPhone
+        const requestParams = {
+            smsCode: code,
+            phone: phone.value,
+            openid: openid.value,
+            unionid: unionid.value,
+            userType: userType.value
+        };
+        // 只有单位用户才传递机构类型
+        if (userType.value === '0') {
+            requestParams.orgType = orgType.value;
+        }
+        const res = await $api.createRequest('/app/appLoginPhone', requestParams, 'post');
+        
+        if (res.token && res.code === 200) {
+            // 登录成功，存储token
+            await userStore.loginSetToken(res.token).then((resume) => {
+                // 更新用户类型到缓存
+                if (res.isCompanyUser !== undefined) {
+                    const userInfo = uni.getStorageSync('userInfo') || {};
+                    userInfo.isCompanyUser = Number(res.isCompanyUser); // 0-企业用户，1-求职者
+                    uni.setStorageSync('userInfo', userInfo);
+                }
+                
+                uni.showToast({ title: '登录成功', icon: 'success' });
+                
+                // 刷新tabbar以显示正确的用户类型
+                tabbarManager.refreshTabBar();
+                console.log(userType.value , res.isCompanyUser);
+                console.log('用户登录成功，简历信息-resume:', resume);
+                console.log('用户登录成功，简历信息-res:', res);
+                if (!resume?.data?.jobTitleId) {
+                    if (!res.idCard) {
+                        console.log('用户登录成功，没有身份证号');
+                        if (userType.value == '1') {
+                            // 求职者跳转到个人信息补全页面
+                            uni.reLaunch({
+                                url: '/packageA/pages/complete-info/complete-info?step=1'
+                            });
+                        } else if (userType.value == '0') {
+                            // 招聘者跳转到企业信息补全页面
+                            uni.reLaunch({
+                                url: '/packageA/pages/complete-info/company-info'
+                            });
+                        }
+                    } else {
+                        // 跳转到首页
+                        uni.reLaunch({
+                            url: '/pages/index/index'
+                        });
+                    }
+                } else {
+                    console.log('用户登录成功，有简历信息--');
+                    // 跳转到首页
+                    uni.reLaunch({
+                        url: '/pages/index/index'
+                    });
+                }
+            }).catch((error) => {
+                // 只有在非企业用户且确实需要简历信息时才显示错误
+                // 企业用户可能没有简历信息，这是正常的
+                if (userType.value !== '0') {
+                    uni.showToast({ title: '获取用户信息失败', icon: 'none' });
+                } else {
+                    console.log('企业用户登录成功，简历信息可能为空');
+                }
+            });
+        } else {
+            uni.showToast({ title: res.msg || '验证失败', icon: 'none' });
+        }
+    } catch (error) {
+        uni.showToast({ title: error || '验证失败，请重试', icon: 'none' });
+    } finally {
+        loading.value = false;
+    }
+};
+
+// 返回上一页
+const goBack = () => {
+    uni.navigateBack();
+};
+
+// 组件销毁时清除定时器
+onUnmounted(() => {
+    clearInterval(timer.value);
+});
+
+
+</script>
+
+<style lang="stylus" scoped>
+.sms-verify-page
+    min-height: 100vh
+    background: linear-gradient(135deg, #F7F9FF 0%, #FFFFFF 100%)
+    
+    .nav-bar
+        display: flex
+        align-items: center
+        justify-content: space-between
+        height: 88rpx
+        padding: 0 32rpx
+        background: #FFFFFF
+        box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04)
+        
+        .nav-back
+            width: 60rpx
+            height: 60rpx
+            display: flex
+            align-items: center
+            justify-content: center
+            border-radius: 50%
+            transition: background-color 0.2s ease
+            
+            &:active
+                background-color: #F5F5F5
+        
+        .nav-title
+            font-size: 32rpx
+            font-weight: 600
+            color: #333333
+        
+        .nav-placeholder
+            width: 60rpx
+    
+    .page-content
+        padding: 80rpx 48rpx 48rpx
+        
+        .security-tip
+            display: flex
+            flex-direction: column
+            align-items: center
+            justify-content: center
+            margin-bottom: 60rpx
+            padding: 32rpx
+            background: linear-gradient(135deg, rgba(37, 107, 250, 0.08) 0%, rgba(30, 91, 255, 0.04) 100%)
+            border-radius: 24rpx
+            border: 1rpx solid rgba(37, 107, 250, 0.1)
+            
+            .tip-icon
+                margin-bottom: 20rpx
+                width: 64rpx
+                height: 64rpx
+                display: flex
+                align-items: center
+                justify-content: center
+                background: #FFFFFF
+                border-radius: 50%
+                box-shadow: 0 4rpx 16rpx rgba(37, 107, 250, 0.15)
+            
+            .tip-text
+                font-size: 28rpx
+                font-weight: 500
+                color: #256BFA
+                text-align: center
+                line-height: 1.4
+        
+        .phone-display
+            text-align: center
+            margin-bottom: 80rpx
+            
+            .phone-label
+                font-size: 28rpx
+                color: #666666
+                margin-bottom: 16rpx
+                opacity: 0.8
+            
+            .phone-number
+                font-size: 44rpx
+                font-weight: 700
+                color: #333333
+                letter-spacing: 2rpx
+                background: linear-gradient(135deg, #256BFA 0%, #1E5BFF 100%)
+                -webkit-background-clip: text
+                -webkit-text-fill-color: transparent
+                background-clip: text
+        
+        .sms-input-area
+            margin-bottom: 60rpx
+            
+            .input-label
+                font-size: 28rpx
+                color: #666666
+                text-align: center
+                margin-bottom: 24rpx
+                font-weight: 500
+            
+            .single-input-container
+                margin-bottom: 16rpx
+                
+                .single-input
+                    width: 100%
+                    height: 120rpx
+                    border: 3rpx solid #E8ECF4
+                    border-radius: 20rpx
+                    font-size: 48rpx
+                    font-weight: 700
+                    color: #333333
+                    background: #FFFFFF
+                    text-align: center
+                    padding: 0 32rpx
+                    box-sizing: border-box
+                    outline: none
+                    caret-color: #256BFA
+                    transition: all 0.3s ease
+                    box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05)
+                    
+                    &:focus
+                        border-color: #256BFA
+                        background: #FFFFFF
+                        box-shadow: 0 8rpx 32rpx rgba(37, 107, 250, 0.2)
+                        transform: translateY(-2rpx)
+                    
+                    &::placeholder
+                        color: #CCCCCC
+                        font-size: 32rpx
+                        font-weight: normal
+        
+        .countdown-section
+            text-align: center
+            margin-bottom: 80rpx
+            
+            .countdown-text
+                font-size: 28rpx
+                color: #999999
+                font-weight: 500
+            
+            .resend-text
+                font-size: 28rpx
+                color: #256BFA
+                font-weight: 600
+                cursor: pointer
+                padding: 12rpx 24rpx
+                border-radius: 24rpx
+                background: rgba(37, 107, 250, 0.1)
+                display: inline-block
+                transition: all 0.2s ease
+                
+                &:active
+                    background: rgba(37, 107, 250, 0.2)
+                    transform: scale(0.98)
+        
+        .submit-btn
+            width: 100%
+            height: 96rpx
+            background: linear-gradient(135deg, #256BFA 0%, #1E5BFF 100%)
+            border-radius: 48rpx
+            color: #FFFFFF
+            font-size: 34rpx
+            font-weight: 600
+            border: none
+            display: flex
+            align-items: center
+            justify-content: center
+            box-shadow: 0 8rpx 32rpx rgba(37, 107, 250, 0.3)
+            transition: all 0.3s ease
+            position: relative
+            overflow: hidden
+            
+            &::before
+                content: ''
+                position: absolute
+                top: 0
+                left: -100%
+                width: 100%
+                height: 100%
+                background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.2), transparent)
+                transition: left 0.5s ease
+            
+            &:not(:disabled):hover::before
+                left: 100%
+            
+            &:not(:disabled):active
+                transform: translateY(2rpx)
+                box-shadow: 0 4rpx 16rpx rgba(37, 107, 250, 0.3)
+            
+            &:disabled
+                opacity: 0.5
+                cursor: not-allowed
+                box-shadow: none
+            
+            .loading-spinner
+                width: 48rpx
+                height: 48rpx
+                border: 4rpx solid rgba(255, 255, 255, 0.3)
+                border-radius: 50%
+                border-top: 4rpx solid #FFFFFF
+                animation: spin 1s linear infinite
+
+// 按钮重置样式
+button::after
+    border: none
+
+// 动画定义
+@keyframes spin
+    0%
+        transform: rotate(0deg)
+    100%
+        transform: rotate(360deg)
+
+// 页面进入动画
+.sms-verify-page
+    animation: fadeIn 0.4s ease-out
+
+@keyframes fadeIn
+    from
+        opacity: 0
+        transform: translateY(20rpx)
+    to
+        opacity: 1
+        transform: translateY(0)
+</style>
\ No newline at end of file
diff --git a/pages/login/wx-login.vue b/pages/login/wx-login.vue
new file mode 100644
index 0000000..2d45d61
--- /dev/null
+++ b/pages/login/wx-login.vue
@@ -0,0 +1,697 @@
+<template>
+    <view class="wx-login-page">
+        <!-- 顶部导航栏 -->
+        <!-- <view class="nav-bar">
+            <view class="nav-back" @click="goBack">
+                <uni-icons type="arrowleft" size="24" color="#333"></uni-icons>
+            </view>
+            <view class="nav-title">登录</view>
+            <view class="nav-placeholder"></view>
+        </view> -->
+
+        <!-- 页面内容 -->
+        <view class="page-content">
+            <!-- Logo和标题 -->
+            <view class="auth-header">
+                <image class="auth-logo" src="@/static/logo2-S.png" mode="aspectFit"></image>
+                <view class="auth-title">欢迎使用就业服务</view>
+            </view>
+            
+            <!-- 角色选择 -->
+            <view class="role-select">
+                <view class="role-title">请选择您的角色</view>
+                <view class="role-options">
+                    <view 
+                        class="role-item" 
+                        :class="{ active: userType === 1 }"
+                        @click="selectRole(1)"
+                    >
+                        <view class="role-icon">
+                            <uni-icons type="person" size="32" :color="userType === 1 ? '#256BFA' : '#999'"></uni-icons>
+                        </view>
+                        <view class="role-text">个人</view>
+                    </view>
+                    <view 
+                        class="role-item" 
+                        :class="{ active: userType === 0 }"
+                        @click="selectRole(0)"
+                    >
+                        <view class="role-icon">
+                            <uni-icons type="shop" size="32" :color="userType === 0 ? '#256BFA' : '#999'"></uni-icons>
+                        </view>
+                        <view class="role-text">单位</view>
+                    </view>
+                </view>
+            </view>
+            
+            <!-- 机构类型选择（仅单位角色显示） -->
+            <view v-if="userType === 0" class="org-type-select">
+                <view class="org-type-title">请选择机构类型</view>
+                <view class="org-type-options">
+                    <view 
+                        v-for="option in orgTypeOptions" 
+                        :key="option.value"
+                        class="org-type-item"
+                        :class="{ active: orgType === option.value }"
+                        @click="selectOrgType(option.value)"
+                    >
+                        <view class="org-type-text">{{ option.label }}</view>
+                    </view>
+                </view>
+            </view>
+            
+            <!-- 授权说明 -->
+            <view class="auth-tips">
+                <view class="tip-item">
+                    <uni-icons type="checkmarkempty" size="16" color="#256BFA"></uni-icons>
+                    <text>保护您的个人信息安全</text>
+                </view>
+                <view class="tip-item">
+                    <uni-icons type="checkmarkempty" size="16" color="#256BFA"></uni-icons>
+                    <text>为您推荐更合适的岗位</text>
+                </view>
+                <view class="tip-item">
+                    <uni-icons type="checkmarkempty" size="16" color="#256BFA"></uni-icons>
+                    <text>享受完整的就业服务</text>
+                </view>
+            </view>
+            
+            <!-- 授权按钮 -->
+            <view class="auth-actions">
+                <!-- 微信小程序使用 open-type="getPhoneNumber" -->
+                <!-- #ifdef MP-WEIXIN -->
+                <button 
+                    class="auth-btn primary" 
+                    open-type="getPhoneNumber" 
+                    @getphonenumber="onWxGetPhoneNumber"
+                >
+                    <uni-icons type="phone" size="20" color="#FFFFFF"></uni-icons>
+                    <text>手机号快捷登录</text>
+                </button>
+                <!-- #endif -->
+                
+                <!-- H5和App使用普通按钮 -->
+                <!-- #ifndef MP-WEIXIN -->
+                <button class="auth-btn primary" @click="wxLogin">
+                    <uni-icons type="phone" size="20" color="#FFFFFF"></uni-icons>
+                    <text>手机号快捷登录</text>
+                </button>
+                <!-- #endif -->
+                
+                <!-- 测试登录按钮（仅开发环境） -->
+                <!-- #ifdef APP-PLUS || H5 -->
+                <button class="auth-btn secondary" @click="testLogin">
+                    <text>测试账号登录</text>
+                </button>
+                <!-- #endif -->
+            </view>
+            
+            <!-- 用户协议 -->
+            <view class="auth-agreement">
+                <view class="agreement-checkbox" @click="toggleAgreement">
+                    <uni-icons 
+                        :type="agreedToAgreement ? 'checkbox-filled' : 'circle'" 
+                        size="20" 
+                        :color="agreedToAgreement ? '#256BFA' : '#999'"
+                    ></uni-icons>
+                    <text class="agreement-text">我已阅读并同意</text>
+                </view>
+                <text class="link" @click="openAgreement('user')">《隐私协议》</text>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import { ref, inject, onMounted, computed } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+import useUserStore from '@/stores/useUserStore';
+import useDictStore from '@/stores/useDictStore';
+
+const { $api } = inject('globalFunction');
+const userStore = useUserStore();
+const dictStore = useDictStore();
+
+const userType = ref(null); // 用户角色：1-求职者，0-企业
+const orgType = ref(null); // 机构类型
+const orgTypeOptions = ref([]); // 机构类型选项
+const agreedToAgreement = ref(false); // 是否同意用户协议
+
+// 计算是否可提交
+const canSubmit = computed(() => {
+    if (userType.value === null) return false;
+    if (userType.value === 0 && orgType.value === null) return false;
+    if (!agreedToAgreement.value) return false;
+    return true;
+});
+
+// 获取机构类型字典
+const getOrgTypeDict = async () => {
+    try {
+        const options = await dictStore.getDictSelectOption('org_type');
+        orgTypeOptions.value = options;
+    } catch (error) {
+        console.error('获取机构类型字典失败：', error);
+        // 使用备用数据
+        orgTypeOptions.value = [
+            { label: '有限责任公司', value: '1' },
+            { label: '股份有限公司', value: '2' },
+            { label: '个人独资企业', value: '3' },
+            { label: '合伙企业', value: '4' },
+            { label: '外商投资企业', value: '5' },
+            { label: '其他', value: '6' }
+        ];
+    }
+};
+
+// 选择角色
+const selectRole = (type) => {
+    userType.value = type;
+    orgType.value = null; // 切换角色时重置机构类型选择
+};
+
+// 选择机构类型
+const selectOrgType = (type) => {
+    orgType.value = type;
+};
+
+// 切换协议同意状态
+const toggleAgreement = () => {
+    agreedToAgreement.value = !agreedToAgreement.value;
+};
+
+// 打开用户协议
+const openAgreement = (type) => {
+    const urls = {
+        user: '/packageA/pages/agreement/user',
+        privacy: '/packageA/pages/agreement/privacy'
+    };
+    
+    uni.navigateTo({
+        url: urls[type]
+    });
+};
+
+// 返回上一页
+const goBack = () => {
+    uni.navigateBack();
+};
+
+// 通用的验证函数
+const validateForm = () => {
+    if (userType.value === null) {
+        uni.showToast({
+            title: '请先选择您的角色（个人或单位）',
+            icon: 'none',
+            duration: 2000
+        });
+        return false;
+    }
+    
+    if (userType.value === 0 && orgType.value === null) {
+        uni.showToast({
+            title: '请选择机构类型',
+            icon: 'none',
+            duration: 2000
+        });
+        return false;
+    }
+    
+    if (!agreedToAgreement.value) {
+        uni.showToast({
+            title: '请先阅读并同意隐私协议',
+            icon: 'none',
+            duration: 2000
+        });
+        return false;
+    }
+    
+    return true;
+};
+
+// 微信小程序授权前的检查
+const checkBeforeWxAuth = (e) => {
+    // 验证表单
+    if (!validateForm()) {
+        // 阻止微信授权流程
+        if (e && e.preventDefault) {
+            e.preventDefault();
+        }
+        return false;
+    } else {
+        console.log('Validation passed, allowing wx auth');
+    }
+};
+
+// 微信获取手机号
+const onWxGetPhoneNumber = async (e) => {
+    const { encryptedData, iv } = e.detail;
+    // 使用通用验证函数
+    if (!validateForm()) {
+        return;
+    }
+    
+    if (e.detail.errMsg === 'getPhoneNumber:ok') {
+        uni.login({
+            provider: 'weixin',
+            success: (loginRes) => {
+                const code = loginRes.code;
+                
+                // 调用接口 /app/appWxphoneSmsCode
+                uni.showLoading({ title: '获取验证码中...' });
+                
+                // 根据用户类型构建参数
+                const requestParams = {
+                    code,
+                    encryptedData,
+                    iv,
+                    userType: userType.value
+                };
+                // 只有单位用户才传递机构类型
+                if (userType.value === 0) {
+                    requestParams.orgType = orgType.value;
+                }
+                
+                $api.createRequest('/app/appWxphoneSmsCode', requestParams, 'post').then((resData) => {
+                    uni.hideLoading();
+                    // 检查可能的手机号字段
+                    const possiblePhoneFields = ['phone', 'mobile', 'phoneNumber', 'tel', 'mobilePhone'];
+                    let phoneValue = '';
+                    for (const field of possiblePhoneFields) {
+                        if (resData[field]) {
+                            phoneValue = resData[field];
+                            console.log(`从接口返回中找到手机号字段 "${field}": ${phoneValue}`);
+                            break;
+                        }
+                    }
+                    
+                    if (resData.code === 200 || resData.success) {
+                        // 跳转到短信验证页面，传递参数
+                        const params = {
+                            phone: phoneValue || '', // 接口返回的手机号
+                            openid: resData.openid || '',
+                            unionid: resData.unionid || '',
+                            userType: userType.value
+                        };
+                        // 只有单位用户才传递机构类型
+                        if (userType.value === 0) {
+                            params.orgType = orgType.value;
+                        }
+                        
+                        uni.navigateTo({
+                            url: '/pages/login/sms-verify?' + Object.keys(params)
+                                .map(key => `${key}=${encodeURIComponent(params[key])}`)
+                                .join('&')
+                        });
+                    } else {
+                        $api.msg(resData.msg || '获取验证码失败');
+                    }
+                }).catch((err) => {
+                    uni.hideLoading();
+                    $api.msg(err.msg || '获取验证码失败，请重试');
+                });
+            },
+            fail: (err) => {
+                uni.showToast({
+                    title: '获取登录信息失败，请重试',
+                    icon: 'none',
+                    duration: 2000
+                });
+            }
+        });
+    } else if (e.detail.errMsg === 'getPhoneNumber:fail user deny') {
+        uni.showToast({
+            title: '您取消了授权',
+            icon: 'none',
+            duration: 2000
+        });
+    } else {
+        uni.showToast({
+            title: '获取手机号失败',
+            icon: 'none',
+            duration: 2000
+        });
+    }
+};
+
+// H5/App 微信登录（暂保持原有逻辑，后续可调整）
+const wxLogin = () => {
+    // 使用通用验证函数
+    if (!validateForm()) {
+        console.log('Validation failed in wxLogin');
+        return;
+    }
+    // #ifdef H5
+    // H5端跳转到H5登录页面
+    uni.navigateTo({
+        url: '/pages/login/h5-login'
+    });
+    return;
+    // #endif
+    
+    // #ifdef APP-PLUS
+    // App微信登录逻辑（暂保持原有逻辑）
+    uni.getProvider({
+        service: 'oauth',
+        success: (res) => {
+            if (~res.provider.indexOf('weixin')) {
+                uni.login({
+                    provider: 'weixin',
+                    success: (loginRes) => {
+                        console.log('微信登录成功：', loginRes);
+                        
+                        // 根据用户类型构建参数
+                        const loginParams = {
+                            code: loginRes.code,
+                            userType: userType.value
+                        };
+                        // 只有单位用户才传递机构类型
+                        if (userType.value === 0) {
+                            loginParams.orgType = orgType.value;
+                        }
+                        
+                        // 调用后端接口进行登录
+                        $api.createRequest('/app/appLogin', loginParams, 'post').then((resData) => {
+                            if (resData.token) {
+                                userStore.loginSetToken(resData.token).then((resume) => {
+                                    // 更新用户类型到缓存
+                                    if (resData.isCompanyUser !== undefined) {
+                                        const userInfo = uni.getStorageSync('userInfo') || {};
+                                        userInfo.isCompanyUser = resData.isCompanyUser ? 0 : 1;
+                                        uni.setStorageSync('userInfo', userInfo);
+                                    }
+                                    
+                                    uni.showToast({
+                                        title: '登录成功',
+                                        icon: 'success',
+                                        duration: 2000
+                                    });
+                                    // 登录成功后返回上一页
+                                    uni.navigateBack();
+                                }).catch((error) => {
+                                    // 只有在非企业用户且确实需要简历信息时才显示错误
+                                    // 企业用户可能没有简历信息，这是正常的
+                                    if (userType.value !== 0) {
+                                        uni.showToast({
+                                            title: '获取用户信息失败',
+                                            icon: 'none',
+                                            duration: 2000
+                                        });
+                                    } else {
+                                        console.log('企业用户登录成功，简历信息可能为空');
+                                        uni.showToast({
+                                            title: '登录成功',
+                                            icon: 'success',
+                                            duration: 2000
+                                        });
+                                        uni.navigateBack();
+                                    }
+                                });
+                            }
+                        });
+                    },
+                    fail: (err) => {
+                        console.error('微信登录失败：', err);
+                        uni.showToast({
+                            title: '微信登录失败',
+                            icon: 'none',
+                            duration: 2000
+                        });
+                    }
+                });
+            }
+        }
+    });
+    // #endif
+};
+
+// 测试账号登录（仅开发环境）
+const testLogin = () => {
+    // 使用通用验证函数
+    if (!validateForm()) {
+        return;
+    }
+    
+    uni.showLoading({ title: '登录中...' });
+    
+    const params = {
+        username: 'test',
+        password: 'test',
+    };
+    
+    $api.createRequest('/app/login', params, 'post').then((resData) => {
+        uni.hideLoading();
+        
+        userStore.loginSetToken(resData.token).then((resume) => {
+            // 更新用户类型到缓存
+            if (resData.isCompanyUser !== undefined) {
+                const userInfo = uni.getStorageSync('userInfo') || {};
+                userInfo.isCompanyUser = resData.isCompanyUser ? 0 : 1;
+                uni.setStorageSync('userInfo', userInfo);
+            }
+            
+            uni.showToast({
+                title: '测试登录成功',
+                icon: 'success',
+                duration: 2000
+            });
+            // 登录成功后返回上一页
+            uni.navigateBack();
+        }).catch((error) => {
+            // 只有在非企业用户且确实需要简历信息时才显示错误
+            // 企业用户可能没有简历信息，这是正常的
+            if (userType.value !== 0) {
+                uni.showToast({
+                    title: '获取用户信息失败',
+                    icon: 'none',
+                    duration: 2000
+                });
+            } else {
+                console.log('企业用户测试登录成功，简历信息可能为空');
+                uni.showToast({
+                    title: '测试登录成功',
+                    icon: 'success',
+                    duration: 2000
+                });
+                uni.navigateBack();
+            }
+        });
+    }).catch((err) => {
+        uni.hideLoading();
+        uni.showToast({
+            title: err.msg || '登录失败',
+            icon: 'none',
+            duration: 2000
+        });
+    });
+};
+
+// 页面加载时获取字典数据
+onLoad(() => {
+    getOrgTypeDict();
+});
+</script>
+
+<style lang="stylus" scoped>
+.wx-login-page
+    min-height: 100vh
+    background: #FFFFFF
+    
+    .nav-bar
+        display: flex
+        align-items: center
+        justify-content: space-between
+        height: 88rpx
+        padding: 0 32rpx
+        border-bottom: 1rpx solid #f5f5f5
+        
+        .nav-back
+            width: 60rpx
+            height: 60rpx
+            display: flex
+            align-items: center
+            justify-content: center
+        
+        .nav-title
+            font-size: 32rpx
+            font-weight: 600
+            color: #333333
+        
+        .nav-placeholder
+            width: 60rpx
+    
+    .page-content
+        padding: 40rpx 40rpx 60rpx
+        
+        .auth-header
+            text-align: center
+            margin-bottom: 40rpx
+            
+            .auth-logo
+                width: 120rpx
+                height: 120rpx
+                margin: 0 auto 24rpx
+            
+            .auth-title
+                font-size: 36rpx
+                font-weight: 600
+                color: #333333
+                margin-bottom: 12rpx
+        
+        .role-select
+            margin-bottom: 32rpx
+            .role-title
+                font-size: 28rpx
+                font-weight: 500
+                color: #333333
+                margin-bottom: 20rpx
+                text-align: center
+            
+            .role-options
+                display: flex
+                justify-content: space-between
+                gap: 20rpx
+                
+                .role-item
+                    flex: 1
+                    background: #F7F8FA
+                    border: 2rpx solid #E5E5E5
+                    border-radius: 16rpx
+                    padding: 32rpx 20rpx
+                    display: flex
+                    flex-direction: column
+                    align-items: center
+                    position: relative
+                    transition: all 0.3s ease
+                    cursor: pointer
+                    
+                    &.active
+                        background: #F0F5FF
+                        border-color: #256BFA
+                        box-shadow: 0 4rpx 12rpx rgba(37, 107, 250, 0.15)
+                    
+                    .role-icon
+                        margin-bottom: 16rpx
+                    
+                    .role-text
+                        font-size: 28rpx
+                        color: #333333
+                        font-weight: 500
+        
+        .org-type-select
+            margin-bottom: 22rpx
+            
+            .org-type-title
+                font-size: 28rpx
+                font-weight: 500
+                color: #333333
+                margin-bottom: 20rpx
+                text-align: center
+            
+            .org-type-options
+                display: flex
+                flex-wrap: wrap
+                gap: 16rpx
+                
+                .org-type-item
+                    display:inline-block
+                    background: #F7F8FA
+                    border: 2rpx solid #E5E5E5
+                    border-radius: 10rpx
+                    padding: 10rpx 10rpx
+                    transition: all 0.3s ease
+                    cursor: pointer
+                    text-align: center
+                    
+                    &.active
+                        background: #F0F5FF
+                        border-color: #256BFA
+                        box-shadow: 0 4rpx 12rpx rgba(37, 107, 250, 0.15)
+                    
+                    .org-type-text
+                        font-size: 22rpx
+                        color: #333333
+                        font-weight: 500
+        
+        .auth-tips
+            background: #F7F8FA
+            border-radius: 16rpx
+            padding: 24rpx
+            margin-bottom: 40rpx
+            
+            .tip-item
+                display: flex
+                align-items: center
+                margin-bottom: 16rpx
+                font-size: 26rpx
+                color: #666666
+                
+                &:last-child
+                    margin-bottom: 0
+                
+                text
+                    margin-left: 12rpx
+        
+        .auth-actions
+            margin-bottom: 32rpx
+            
+            .auth-btn
+                width: 100%
+                height: 88rpx
+                border-radius: 44rpx
+                display: flex
+                align-items: center
+                justify-content: center
+                font-size: 32rpx
+                font-weight: 500
+                border: none
+                margin-bottom: 20rpx
+                
+                &:last-child
+                    margin-bottom: 0
+                
+                &.primary
+                    background: linear-gradient(135deg, #256BFA 0%, #1E5BFF 100%)
+                    color: #FFFFFF
+                    box-shadow: 0 8rpx 20rpx rgba(37, 107, 250, 0.3)
+                
+                &.secondary
+                    background: #F7F8FA
+                    color: #666666
+                
+                &:disabled
+                    opacity: 0.5
+                    cursor: not-allowed
+                    background: #CCCCCC !important
+                    box-shadow: none !important
+                
+                text
+                    margin-left: 12rpx
+        
+        .auth-agreement
+            display: flex
+            align-items: center
+            justify-content: center
+            font-size: 24rpx
+            color: #999999
+            line-height: 1.6
+            flex-wrap: wrap
+            gap: 8rpx
+            
+            .agreement-checkbox
+                display: flex
+                align-items: center
+                cursor: pointer
+                
+                .agreement-text
+                    margin-left: 8rpx
+                    color: #666666
+            
+            .link
+                color: #256BFA
+                text-decoration: underline
+
+// 按钮重置样式
+button::after
+    border: none
+</style>
\ No newline at end of file
diff --git a/pages/mine/company-mine.vue b/pages/mine/company-mine.vue
index dc075ec..f718609 100644
--- a/pages/mine/company-mine.vue
+++ b/pages/mine/company-mine.vue
@@ -34,13 +34,61 @@
                     {{ companyInfo.isVerified ? '已通过' : '未认证' }}
                 </view>
             </view>
-            <view class="service-item btn-feel">
+            <view class="service-item btn-feel" @click="goToMessage">
+                <view class="service-left">
+                    <uni-icons type="chat" size="20" color="#256BFA"></uni-icons>
+                    <text class="service-text">消息</text>
+                </view>
+                <view class="service-status">
+                    <uni-icons type="right" size="14" color="#909090"></uni-icons>
+                </view>
+            </view>
+            <view class="service-item btn-feel" @click="openReminderSettings">
                 <view class="service-left">
                     <uni-icons type="notification" size="20" color="#256BFA"></uni-icons>
                     <text class="service-text">通知与提醒</text>
                 </view>
-                <view class="service-status">已开启</view>
+                <view class="service-status">
+                    <switch class="reminder-switch" :checked="reminderEnabled" @change="toggleReminder"></switch>
+                </view>
             </view>
+            <view class="service-item btn-feel" @click="openFeedbackPopup">
+                <view class="service-left">
+                    <uni-icons type="chat" size="20" color="#256BFA"></uni-icons>
+                    <text class="service-text">评论与反馈</text>
+                </view>
+                <view class="service-status">
+                    <uni-icons type="right" size="14" color="#909090"></uni-icons>
+                </view>
+            </view>
+			<view class="service-item btn-feel" @click="handleInstitutionClick(1)">
+			    <view class="service-left">
+			        <uni-icons type="compose" size="20" color="#256BFA"></uni-icons>
+			        <text class="service-text">培训机构维护</text>
+			    </view>
+			    <view class="service-status">修改</view>
+			</view>
+			<view class="service-item btn-feel" @click="handleInstitutionClick(2)">
+			    <view class="service-left">
+			        <uni-icons type="compose" size="20" color="#256BFA"></uni-icons>
+			        <text class="service-text">评价机构维护</text>
+			    </view>
+			    <view class="service-status">修改</view>
+			</view>
+			<view class="service-item btn-feel" @click="handleInstitutionClick(3)">
+			    <view class="service-left">
+			        <uni-icons type="paperplane" size="20" color="#256BFA"></uni-icons>
+			        <text class="service-text">培训公告发布</text>
+			    </view>
+			    <view class="service-status">发布</view>
+			</view>
+			<view class="service-item btn-feel" @click="handleInstitutionClick(4)">
+			    <view class="service-left">
+			        <uni-icons type="paperplane" size="20" color="#256BFA"></uni-icons>
+			        <text class="service-text">评价公告发布</text>
+			    </view>
+			    <view class="service-status">发布</view>
+			</view>
         </view>
 
         <!-- 退出登录按钮 -->
@@ -60,6 +108,39 @@
                 @close="close"
             ></uni-popup-dialog>
         </uni-popup>
+        <!-- 提醒设置弹窗 -->
+        <uni-popup ref="reminderPopup" type="center">
+            <view class="reminder-popup">
+                <view class="reminder-popup-title">提醒设置</view>
+                <view class="reminder-popup-content">
+                    <view class="reminder-item" v-for="(item, index) in reminderOptions" :key="index">
+                        <view class="reminder-item-label">{{ item.label }}</view>
+                        <radio :value="item.value" :checked="reminderFrequency === item.value" @change="handleFrequencyChange"></radio>
+                    </view>
+                </view>
+                <view class="reminder-popup-footer">
+                    <button class="reminder-popup-btn" @click="closeReminderPopup">确定</button>
+                </view>
+            </view>
+        </uni-popup>
+        <!-- 评论与反馈弹窗 -->
+        <uni-popup ref="feedbackPopup" type="center">
+            <view class="feedback-popup">
+                <view class="feedback-popup-title">评论与反馈</view>
+                <view class="feedback-popup-content">
+                    <textarea class="feedback-textarea" v-model="feedbackContent" placeholder="请输入您的评论或反馈..."></textarea>
+                    <view class="feedback-rating">
+                        <text class="feedback-rating-label">满意度评分：</text>
+                        <view class="feedback-stars">
+                            <text class="feedback-star" v-for="i in 5" :key="i" @click="setRating(i)" :class="{ 'active': rating >= i }">★</text>
+                        </view>
+                    </view>
+                </view>
+                <view class="feedback-popup-footer">
+                    <button class="feedback-popup-btn" @click="submitFeedback">提交</button>
+                </view>
+            </view>
+        </uni-popup>
     </AppLayout>
 </template>
 
@@ -70,6 +151,21 @@ import useUserStore from '@/stores/useUserStore';
 
 const { $api, navTo } = inject('globalFunction');
 const popup = ref(null);
+const reminderPopup = ref(null);
+const feedbackPopup = ref(null);
+
+// 提醒设置
+const reminderEnabled = ref(true);
+const reminderFrequency = ref('realtime');
+const reminderOptions = ref([
+    { label: '实时提醒', value: 'realtime' },
+    { label: '每小时提醒', value: 'hourly' },
+    { label: '每天提醒', value: 'daily' }
+]);
+
+// 评论与反馈
+const feedbackContent = ref('');
+const rating = ref(0);
 
 // 企业信息数据
 const companyInfo = reactive({
@@ -82,6 +178,21 @@ const companyInfo = reactive({
 function goToCompanyInfo() {
     navTo('/pages/mine/company-info');
 }
+function handleInstitutionClick(i){
+	if(i==1){
+		navTo('/packageB/institution/trainingInstitutionMaintenance');
+	}else if(i==2){
+		navTo('/packageB/institution/evaluationAgencyMaintenance');
+	}else if(i==3){
+		navTo('/packageB/notice/trainingAnnouncement/postedList');
+	}else if(i==4){
+		navTo('/packageB/notice/evaluateAnnouncement/evaluateList');
+	}
+}
+// 跳转到消息页面
+function goToMessage() {
+    navTo('/pages/msglog/msglog');
+}
 
 function logOut() {
     popup.value.open();
@@ -92,10 +203,7 @@ function close() {
 }
 
 function confirm() {
-    // 调用退出登录
-    useUserStore().logOut();
-    // 关闭弹窗
-    popup.value.close();
+    useUserStore().logOut(false); // 不显示登录弹窗
     // 跳转到首页
     uni.reLaunch({
         url: '/pages/index/index'
@@ -111,9 +219,9 @@ onShow(() => {
 onMounted(() => {
     uni.$on('showLoginModal', () => {
         // 这里可以显示微信登录弹窗
-        // 由于这个页面没有 WxAuthLogin 组件，我们跳转到首页让首页处理
-        uni.reLaunch({
-            url: '/pages/index/index'
+        // 跳转到微信登录页面
+        uni.navigateTo({
+            url: '/pages/login/wx-login'
         });
     });
 });
@@ -147,6 +255,57 @@ function getCompanyInfo() {
         companyInfo.isVerified = false;
     }
 }
+
+// 切换提醒开启/关闭状态
+function toggleReminder(e) {
+    reminderEnabled.value = e.detail.value;
+}
+
+// 打开提醒设置弹窗
+function openReminderSettings() {
+    reminderPopup.value.open();
+}
+
+// 关闭提醒设置弹窗
+function closeReminderPopup() {
+    reminderPopup.value.close();
+}
+
+// 处理提醒频率变化
+function handleFrequencyChange(e) {
+    reminderFrequency.value = e.detail.value;
+}
+
+// 打开评论与反馈弹窗
+function openFeedbackPopup() {
+    feedbackPopup.value.open();
+}
+
+// 关闭评论与反馈弹窗
+function closeFeedbackPopup() {
+    feedbackPopup.value.close();
+}
+
+// 设置评分
+function setRating(score) {
+    rating.value = score;
+}
+
+// 提交反馈
+function submitFeedback() {
+    // 模拟提交成功
+    uni.showToast({
+        title: '反馈提交成功',
+        icon: 'success'
+    });
+    // 清空表单
+    feedbackContent.value = '';
+    rating.value = 0;
+    // 延迟关闭弹窗，确保用户能看到成功提示
+    setTimeout(() => {
+        closeFeedbackPopup();
+    }, 1000);
+}
 </script>
 
 <style lang="stylus" scoped>
@@ -282,4 +441,137 @@ function getCompanyInfo() {
         transform: scale(0.98);
     }
 }
+
+// 提醒开关样式
+.reminder-switch {
+    transform: scale(0.8);
+}
+
+// 提醒设置弹窗样式
+.reminder-popup {
+    width: 600rpx;
+    background: #FFFFFF;
+    border-radius: 20rpx;
+    padding: 32rpx;
+    
+    .reminder-popup-title {
+        font-size: 32rpx;
+        font-weight: 600;
+        color: #333333;
+        text-align: center;
+        margin-bottom: 32rpx;
+    }
+    
+    .reminder-popup-content {
+        margin-bottom: 40rpx;
+        
+        .reminder-item {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            padding: 24rpx 0;
+            border-bottom: 1rpx solid #F0F0F0;
+            
+            &:last-child {
+                border-bottom: none;
+            }
+            
+            .reminder-item-label {
+                font-size: 28rpx;
+                color: #333333;
+            }
+        }
+    }
+    
+    .reminder-popup-footer {
+        display: flex;
+        justify-content: center;
+        
+        .reminder-popup-btn {
+            width: 100%;
+            height: 80rpx;
+            background: #256BFA;
+            color: #FFFFFF;
+            font-size: 28rpx;
+            font-weight: 500;
+            border-radius: 10rpx;
+            border: none;
+        }
+    }
+}
+
+// 评论与反馈弹窗样式
+.feedback-popup {
+    width: 600rpx;
+    background: #FFFFFF;
+    border-radius: 20rpx;
+    padding: 32rpx;
+    
+    .feedback-popup-title {
+        font-size: 32rpx;
+        font-weight: 600;
+        color: #333333;
+        text-align: center;
+        margin-bottom: 32rpx;
+    }
+    
+    .feedback-popup-content {
+        margin-bottom: 40rpx;
+        
+        .feedback-textarea {
+            width: 100%;
+            height: 200rpx;
+            border: 1rpx solid #E5E5E5;
+            border-radius: 10rpx;
+            padding: 20rpx;
+            font-size: 28rpx;
+            color: #333333;
+            resize: none;
+            margin-bottom: 32rpx;
+            box-sizing: border-box;
+        }
+        
+        .feedback-rating {
+            display: flex;
+            align-items: center;
+            
+            .feedback-rating-label {
+                font-size: 28rpx;
+                color: #333333;
+                margin-right: 20rpx;
+            }
+            
+            .feedback-stars {
+                display: flex;
+                
+                .feedback-star {
+                    font-size: 40rpx;
+                    color: #E5E5E5;
+                    margin-right: 16rpx;
+                    cursor: pointer;
+                    
+                    &.active {
+                        color: #FFD700;
+                    }
+                }
+            }
+        }
+    }
+    
+    .feedback-popup-footer {
+        display: flex;
+        justify-content: center;
+        
+        .feedback-popup-btn {
+            width: 100%;
+            height: 80rpx;
+            background: #256BFA;
+            color: #FFFFFF;
+            font-size: 28rpx;
+            font-weight: 500;
+            border-radius: 10rpx;
+            border: none;
+        }
+    }
+}
 </style>
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index 9ad6cba..2c2c9ad 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -47,6 +47,10 @@
                 <view class="mini-num">{{ counts.fairCollecitonCount }}</view>
                 <view class="mini-text">预约</view>
             </view>
+            <view class="numbe-item button-click" @click="navTo('/packageA/pages/cancelApplication/cancelApplication')">
+                <view class="mini-num">{{ counts.applyCencalCount || 0 }}</view>
+                <view class="mini-text">取消投递</view>
+            </view>
         </view>
         <view class="mini-cards">
             <view class="card-top btn-feel">
@@ -92,12 +96,32 @@
                         <uni-icons color="#909090" type="right" size="14"></uni-icons>
                     </view>
                 </view>
-                <view class="main-row btn-feel">
+                <view class="main-row btn-feel" @click="goToMessage()">
+                    <view class="row-left">
+                        <image class="left-img" src="@/static/tabbar/chat4.png"></image>
+                        <text class="left-text">消息</text>
+                    </view>
+                    <view class="row-right">
+                        <uni-icons color="#909090" type="right" size="14"></uni-icons>
+                    </view>
+                </view>
+                <view class="main-row btn-feel" @click="openReminderSettings">
                     <view class="row-left">
                         <image class="left-img" src="@/static/icon/server4.png"></image>
                         <text class="left-text">通知与提醒</text>
                     </view>
-                    <view class="row-right">已开启</view>
+                    <view class="row-right">
+                        <switch class="reminder-switch" :checked="reminderEnabled" @change="toggleReminder"></switch>
+                    </view>
+                </view>
+                <view class="main-row btn-feel" @click="openFeedbackPopup">
+                    <view class="row-left">
+                        <image class="left-img" src="@/static/icon/feedback.png"></image>
+                        <text class="left-text">评论与反馈</text>
+                    </view>
+                    <view class="row-right">
+                        <uni-icons color="#909090" type="right" size="14"></uni-icons>
+                    </view>
                 </view>
             </view>
             <view v-if="userType === 2" class="card-help button-click" @click="goToJobHelper">求职帮</view>
@@ -113,6 +137,39 @@
                     @close="close"
                 ></uni-popup-dialog>
             </uni-popup>
+            <!-- 提醒设置弹窗 -->
+            <uni-popup ref="reminderPopup" type="center">
+                <view class="reminder-popup">
+                    <view class="reminder-popup-title">提醒设置</view>
+                    <view class="reminder-popup-content">
+                        <view class="reminder-item" v-for="(item, index) in reminderOptions" :key="index">
+                            <view class="reminder-item-label">{{ item.label }}</view>
+                            <radio :value="item.value" :checked="reminderFrequency === item.value" @change="handleFrequencyChange"></radio>
+                        </view>
+                    </view>
+                    <view class="reminder-popup-footer">
+                        <button class="reminder-popup-btn" @click="closeReminderPopup">确定</button>
+                    </view>
+                </view>
+            </uni-popup>
+            <!-- 评论与反馈弹窗 -->
+            <uni-popup ref="feedbackPopup" type="center">
+                <view class="feedback-popup">
+                    <view class="feedback-popup-title">评论与反馈</view>
+                    <view class="feedback-popup-content">
+                        <textarea class="feedback-textarea" v-model="feedbackContent" placeholder="请输入您的评论或反馈..."></textarea>
+                        <view class="feedback-rating">
+                            <text class="feedback-rating-label">满意度评分：</text>
+                            <view class="feedback-stars">
+                                <text class="feedback-star" v-for="i in 5" :key="i" @click="setRating(i)" :class="{ 'active': rating >= i }">★</text>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="feedback-popup-footer">
+                        <button class="feedback-popup-btn" @click="submitFeedback">提交</button>
+                    </view>
+                </view>
+            </uni-popup>
         </view>
         <template #footer>
             <!-- 统一使用系统tabBar -->
@@ -128,9 +185,24 @@ const { $api, navTo } = inject('globalFunction');
 import useUserStore from '@/stores/useUserStore';
 import { tabbarManager } from '@/utils/tabbarManager';
 const popup = ref(null);
+const reminderPopup = ref(null);
+const feedbackPopup = ref(null);
 const { userInfo, Completion } = storeToRefs(useUserStore());
 const counts = ref({});
 
+// 提醒设置
+const reminderEnabled = ref(true);
+const reminderFrequency = ref('realtime');
+const reminderOptions = ref([
+    { label: '实时提醒', value: 'realtime' },
+    { label: '每小时提醒', value: 'hourly' },
+    { label: '每天提醒', value: 'daily' }
+]);
+
+// 评论与反馈
+const feedbackContent = ref('');
+const rating = ref(0);
+
 // 获取用户类型，参考首页的实现方式
 const userType = computed(() => {
     // 优先从store获取，如果为空则从缓存获取
@@ -162,9 +234,9 @@ onShow(() => {
 onMounted(() => {
     uni.$on('showLoginModal', () => {
         // 这里可以显示微信登录弹窗
-        // 由于这个页面没有 WxAuthLogin 组件，我们跳转到首页让首页处理
-        uni.reLaunch({
-            url: '/pages/index/index'
+        // 跳转到微信登录页面
+        uni.navigateTo({
+            url: '/pages/login/wx-login'
         });
     });
 });
@@ -178,7 +250,11 @@ function close() {
 }
 
 function confirm() {
-    useUserStore().logOut();
+    useUserStore().logOut(false); // 不显示登录弹窗
+    // 跳转到首页
+    uni.reLaunch({
+        url: '/pages/index/index'
+    });
 }
 
 const isAbove90 = (percent) => parseFloat(percent) < 90;
@@ -201,7 +277,7 @@ function seeDetail() {
 
 function goToJobHelper() {
     // 跳转到求职者信息补全页面
-    navTo('/pages/complete-info/complete-info');
+    navTo('/packageA/pages/complete-info/complete-info');
 }
 // 跳转到素质测评
 function goCa(){
@@ -214,6 +290,62 @@ function goCaAI(){
 	navTo(`/packageCa/search/AIAudition?name=${userInfo.name}&userId=${userInfo.idCard}`);
 }
 
+// 跳转到消息页面
+function goToMessage(){
+	navTo('/pages/msglog/msglog');
+}
+
+// 切换提醒开启/关闭状态
+function toggleReminder(e) {
+    reminderEnabled.value = e.detail.value;
+}
+
+// 打开提醒设置弹窗
+function openReminderSettings() {
+    reminderPopup.value.open();
+}
+
+// 关闭提醒设置弹窗
+function closeReminderPopup() {
+    reminderPopup.value.close();
+}
+
+// 处理提醒频率变化
+function handleFrequencyChange(e) {
+    reminderFrequency.value = e.detail.value;
+}
+
+// 打开评论与反馈弹窗
+function openFeedbackPopup() {
+    feedbackPopup.value.open();
+}
+
+// 关闭评论与反馈弹窗
+function closeFeedbackPopup() {
+    feedbackPopup.value.close();
+}
+
+// 设置评分
+function setRating(score) {
+    rating.value = score;
+}
+
+// 提交反馈
+function submitFeedback() {
+    // 模拟提交成功
+    uni.showToast({
+        title: '反馈提交成功',
+        icon: 'success'
+    });
+    // 清空表单
+    feedbackContent.value = '';
+    rating.value = 0;
+    // 延迟关闭弹窗，确保用户能看到成功提示
+    setTimeout(() => {
+        closeFeedbackPopup();
+    }, 1000);
+}
+
 </script>
 
 <style lang="stylus" scoped>
@@ -448,4 +580,137 @@ function goCaAI(){
         margin-left: 20rpx;
     }
 }
+
+// 提醒设置弹窗样式
+.reminder-popup {
+    width: 600rpx;
+    background: #FFFFFF;
+    border-radius: 20rpx;
+    padding: 32rpx;
+    
+    .reminder-popup-title {
+        font-size: 32rpx;
+        font-weight: 600;
+        color: #333333;
+        text-align: center;
+        margin-bottom: 32rpx;
+    }
+    
+    .reminder-popup-content {
+        margin-bottom: 40rpx;
+        
+        .reminder-item {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            padding: 24rpx 0;
+            border-bottom: 1rpx solid #F0F0F0;
+            
+            &:last-child {
+                border-bottom: none;
+            }
+            
+            .reminder-item-label {
+                font-size: 28rpx;
+                color: #333333;
+            }
+        }
+    }
+    
+    .reminder-popup-footer {
+        display: flex;
+        justify-content: center;
+        
+        .reminder-popup-btn {
+            width: 100%;
+            height: 80rpx;
+            background: #256BFA;
+            color: #FFFFFF;
+            font-size: 28rpx;
+            font-weight: 500;
+            border-radius: 10rpx;
+            border: none;
+        }
+    }
+}
+
+// 提醒开关样式
+.reminder-switch {
+    transform: scale(0.8);
+}
+
+// 评论与反馈弹窗样式
+.feedback-popup {
+    width: 600rpx;
+    background: #FFFFFF;
+    border-radius: 20rpx;
+    padding: 32rpx;
+    
+    .feedback-popup-title {
+        font-size: 32rpx;
+        font-weight: 600;
+        color: #333333;
+        text-align: center;
+        margin-bottom: 32rpx;
+    }
+    
+    .feedback-popup-content {
+        margin-bottom: 40rpx;
+        
+        .feedback-textarea {
+            width: 100%;
+            height: 200rpx;
+            border: 1rpx solid #E5E5E5;
+            border-radius: 10rpx;
+            padding: 20rpx;
+            font-size: 28rpx;
+            color: #333333;
+            resize: none;
+            margin-bottom: 32rpx;
+            box-sizing: border-box;
+        }
+        
+        .feedback-rating {
+            display: flex;
+            align-items: center;
+            
+            .feedback-rating-label {
+                font-size: 28rpx;
+                color: #333333;
+                margin-right: 20rpx;
+            }
+            
+            .feedback-stars {
+                display: flex;
+                
+                .feedback-star {
+                    font-size: 40rpx;
+                    color: #E5E5E5;
+                    margin-right: 16rpx;
+                    cursor: pointer;
+                    
+                    &.active {
+                        color: #FFD700;
+                    }
+                }
+            }
+        }
+    }
+    
+    .feedback-popup-footer {
+        display: flex;
+        justify-content: center;
+        
+        .feedback-popup-btn {
+            width: 100%;
+            height: 80rpx;
+            background: #256BFA;
+            color: #FFFFFF;
+            font-size: 28rpx;
+            font-weight: 500;
+            border-radius: 10rpx;
+            border: none;
+        }
+    }
+}
 </style>
diff --git a/pages/msglog/msglog.vue b/pages/msglog/msglog.vue
index 84231cb..54b2d35 100644
--- a/pages/msglog/msglog.vue
+++ b/pages/msglog/msglog.vue
@@ -31,8 +31,7 @@
             <!-- 自定义tabbar -->
             <CustomTabBar :currentPage="3" />
             
-            <!-- 微信授权登录弹窗 -->
-            <WxAuthLogin ref="wxAuthLoginRef" @success="handleLoginSuccess"></WxAuthLogin>
+
 
             <!-- 统一使用系统tabBar -->
         </view>
@@ -46,14 +45,14 @@ import Tabbar from '@/components/tabbar/midell-box.vue';
 import ReadComponent from './read.vue';
 import UnreadComponent from './unread.vue';
 import { tabbarManager } from '@/utils/tabbarManager';
-import WxAuthLogin from '@/components/WxAuthLogin/WxAuthLogin.vue';
+
 const loadedMap = reactive([false, false]);
 const swiperRefs = [ref(null), ref(null)];
 const components = [ReadComponent, UnreadComponent];
 import { storeToRefs } from 'pinia';
 import { useReadMsg } from '@/stores/useReadMsg';
 const { unreadCount } = storeToRefs(useReadMsg());
-const wxAuthLoginRef = ref(null);
+
 
 onShow(() => {
     // 获取消息列表
@@ -71,7 +70,7 @@ onMounted(() => {
     
     // 监听退出登录事件，显示微信登录弹窗
     uni.$on('showLoginModal', () => {
-        wxAuthLoginRef.value?.open();
+        uni.navigateTo({ url: '/pages/login/wx-login' });
     });
 });
 
diff --git a/pages/search/search.vue b/pages/search/search.vue
index c3e0fe6..f7a26bc 100644
--- a/pages/search/search.vue
+++ b/pages/search/search.vue
@@ -134,7 +134,7 @@ function nextDetail(job) {
         const recordData = recommedIndexDb.JobParameter(job);
         recommedIndexDb.addRecord(recordData);
     }
-    navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(job.jobId)}`);
+    navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(job.jobId)}&encryptJobId=${encodeURIComponent(job.encryptJobId)}`);
 }
 
 function nextVideo(job) {
diff --git a/pages/service/career-planning.bak.vue b/pages/service/career-planning.bak.vue
new file mode 100644
index 0000000..c3abf8d
--- /dev/null
+++ b/pages/service/career-planning.bak.vue
@@ -0,0 +1,590 @@
+<template>
+    <view class="career-planning-page">
+        <!-- 提醒弹窗 -->
+        <RemindPopup 
+            ref="remindPopup"
+            :remind-list="remindList"
+            @cancel="handleCancel"
+            @confirm="handleConfirm"
+        />
+
+        <!-- 技能详情弹出层 -->
+        <SkillDetailPopup
+            ref="skillDetailPopup"
+            :job-title="selectedJobTitle"
+            :possessed-skills="selectedJobPossessedSkills"
+            :improvement-skills="selectedJobImprovementSkills"
+            @close="handleSkillPopupClose"
+        />
+
+        <!-- 页面内容 -->
+        <view class="page-content" v-if="showContent">
+            <!-- #ifdef MP-WEIXIN -->
+            <!-- 小程序背景图片 -->
+            <image class="mp-background" src="/static/icon/background2.png" mode="aspectFill"></image>
+            <!-- #endif -->
+            
+            <!-- 头部区域 -->
+            <PageHeader 
+                :active-tab="activeTab"
+                @tab-change="switchTab"
+                @search-click="handleSearchClick"
+                @menu-click="handleMenuClick"
+                @more-click="handleMoreClick"
+            />
+
+            <!-- 内容区域 -->
+            <scroll-view scroll-y class="content-scroll">
+                <CareerRecommend 
+                    v-if="activeTab === 0"
+                    :current-job-id="currentJobId"
+                    :current-job-name="currentJobName"
+                    @job-card-click="handleJobCardClick"
+                    @skills-updated="handleRecommendSkillsUpdated"
+                />
+                <CareerPath 
+                    v-else-if="activeTab === 1"
+                    :current-job-name="currentJobName"
+                    @path-data-updated="handlePathDataUpdated"
+                />
+                <SkillDevelopment 
+                    v-else 
+                    :current-job-name="currentJobName"
+                    @path-data-updated="handlePathDataUpdated"
+                />
+            </scroll-view>
+        </view>
+
+        <!-- 底部导航栏 -->
+        <view class="tabbar-wrapper" v-if="showContent">
+            <CustomTabBar :currentPage="0" />
+        </view>
+    </view>
+</template>
+
+<script setup>
+import { ref, inject, nextTick, onMounted } from 'vue';
+import { onLoad, onShow } from '@dcloudio/uni-app';
+import { appUserInfo } from '@/apiRc/user/user.js';
+import RemindPopup from './components/RemindPopup.vue';
+import PageHeader from './components/PageHeader.vue';
+import SkillDetailPopup from './components/SkillDetailPopup.vue';
+import CareerRecommend from './components/CareerRecommend.vue';
+import CareerPath from './components/CareerPath.vue';
+import SkillDevelopment from './components/SkillDevelopment.vue';
+import CustomTabBar from '@/components/CustomTabBar/CustomTabBar.vue';
+
+const { navBack, navTo } = inject('globalFunction');
+
+// 弹窗引用
+const remindPopup = ref(null);
+const skillDetailPopup = ref(null);
+// 提醒列表（由接口返回）
+const remindList = ref([]);
+// 是否显示页面内容
+const showContent = ref(false);
+// 当前激活的tab
+const activeTab = ref(0);
+// 选中的职位信息
+const selectedJobTitle = ref('');
+const selectedJobPossessedSkills = ref([]);
+const selectedJobImprovementSkills = ref([]);
+const isLoadingJobSkill = ref(false);
+const currentJobId = ref(null);
+const currentJobName = ref('');
+
+// 技能发展所需的数据
+const recommendSkillsData = ref({
+    currentJobSkills: [],
+    recommendedJobs: []
+});
+
+const pathSkillsData = ref({
+    pathData: {
+        start: { title: '', skills: [] },
+        steps: [],
+        end: { title: '', skills: [] }
+    },
+    targetCareer: ''
+});
+
+// 打开弹窗
+function openRemindPopup() {
+    nextTick(() => {
+        if (remindPopup.value) {
+            try {
+                remindPopup.value.open();
+            } catch (error) {
+                // 静默处理错误
+            }
+        } else {
+            setTimeout(() => {
+                if (remindPopup.value) {
+                    try {
+                        remindPopup.value.open();
+                    } catch (error) {
+                        // 静默处理错误
+                    }
+                } else {
+                    setTimeout(() => {
+                        if (remindPopup.value) {
+                            try {
+                                remindPopup.value.open();
+                            } catch (error) {
+                                // 静默处理错误
+                            }
+                        }
+                    }, 500);
+                }
+            }, 500);
+        }
+    });
+}
+
+// 检查用户是否完善了个人信息（调用接口获取）
+let hasCheckedRemindInfo = false;
+// 保存缺失信息的标识
+const missingInfo = ref({
+    hasJobInfo: false,
+    hasSkills: false
+});
+
+async function getRemindInfo() {
+    if (hasCheckedRemindInfo) {
+        return;
+    }
+    
+    hasCheckedRemindInfo = true;
+    
+    try {
+        const response = await appUserInfo();
+        const userInfo = response?.data || {};
+        
+        // 检查 idCard（身份证）- 必须项
+        let idCard = userInfo?.resume?.idCard ?? userInfo?.idCard ?? null;
+        const cachedUserInfo = uni.getStorageSync('userInfo') || {};
+        if (!idCard || idCard === null || idCard === '') {
+            idCard = cachedUserInfo?.resume?.idCard ?? cachedUserInfo?.idCard ?? null;
+        }
+        const hasIdCard = idCard !== null && idCard !== undefined && idCard !== '';
+        
+        // 检查职位信息：优先从 jobTitles 数组获取
+        const jobTitles = Array.isArray(userInfo?.jobTitles) ? userInfo.jobTitles : [];
+        const hasJobTitle = jobTitles.length > 0;
+        
+        // 如果 jobTitles 为空，尝试从其他字段获取
+        let jobName = '';
+        if (!hasJobTitle) {
+            jobName = userInfo?.jobName ?? 
+                     userInfo?.currentJobName ?? 
+                     userInfo?.resume?.jobName ?? 
+                     userInfo?.resume?.currentJobName ?? 
+                     '';
+        }
+        const hasJobInfo = hasJobTitle || (jobName && jobName.trim() !== '');
+        
+        // 检查技能标签：从 appSkillsList 获取
+        const appSkillsList = Array.isArray(userInfo?.appSkillsList) ? userInfo.appSkillsList : [];
+        // 检查是否有有效的技能（name 或 nameStr 不为空）
+        const hasSkills = appSkillsList.some(skill => {
+            const skillName = skill?.name || skill?.nameStr;
+            return skillName && skillName.trim() !== '';
+        });
+        
+        // 保存缺失信息标识（只保存职位信息和技能标签，身份证信息跳转到个人信息页面）
+        missingInfo.value.hasJobInfo = hasJobInfo;
+        missingInfo.value.hasSkills = hasSkills;
+        
+        // 判断信息是否完整（idCard、职位信息、技能标签都必须有）
+        const isComplete = hasIdCard && hasJobInfo && hasSkills;
+        
+        if (!isComplete) {
+            // 收集缺失的信息提示
+            const missingItems = [];
+            if (!hasIdCard) {
+                missingItems.push('身份证信息');
+            }
+            if (!hasJobInfo) {
+                missingItems.push('职位信息');
+            }
+            if (!hasSkills) {
+                missingItems.push('技能标签');
+            }
+            remindList.value = [`请完善${missingItems.join('、')}`];
+        } else {
+            // 信息完整，设置职位信息
+            if (hasJobTitle) {
+                currentJobName.value = jobTitles[0];
+            } else {
+                currentJobName.value = jobName;
+                currentJobId.value = userInfo?.jobId ?? 
+                                   userInfo?.currentJobId ?? 
+                                   userInfo?.resume?.jobId ?? 
+                                   userInfo?.resume?.currentJobId ?? 
+                                   null;
+            }
+            // 信息完整，直接显示页面内容
+            showContent.value = true;
+            return;
+        }
+        
+        setTimeout(() => {
+            openRemindPopup();
+        }, 500);
+    } catch (error) {
+        // 接口调用失败时，使用缓存作为降级方案
+        const cachedUserInfo = uni.getStorageSync('userInfo') || {};
+        
+        // 检查 idCard
+        const idCard = cachedUserInfo?.resume?.idCard ?? cachedUserInfo?.idCard ?? null;
+        const hasIdCard = idCard !== null && idCard !== undefined && idCard !== '';
+        
+        // 检查职位信息
+        const cachedJobTitles = Array.isArray(cachedUserInfo?.jobTitles) ? cachedUserInfo.jobTitles : [];
+        const hasJobTitle = cachedJobTitles.length > 0;
+        let jobName = '';
+        if (!hasJobTitle) {
+            jobName = cachedUserInfo?.jobName ?? 
+                     cachedUserInfo?.currentJobName ?? 
+                     cachedUserInfo?.resume?.jobName ?? 
+                     cachedUserInfo?.resume?.currentJobName ?? 
+                     '';
+        }
+        const hasJobInfo = hasJobTitle || (jobName && jobName.trim() !== '');
+        
+        // 检查技能标签
+        const cachedAppSkillsList = Array.isArray(cachedUserInfo?.appSkillsList) ? cachedUserInfo.appSkillsList : [];
+        const hasSkills = cachedAppSkillsList.some(skill => {
+            const skillName = skill?.name || skill?.nameStr;
+            return skillName && skillName.trim() !== '';
+        });
+        
+        // 保存缺失信息标识
+        missingInfo.value.hasJobInfo = hasJobInfo;
+        missingInfo.value.hasSkills = hasSkills;
+        
+        // 判断信息是否完整（idCard、职位信息、技能标签都必须有）
+        const isComplete = hasIdCard && hasJobInfo && hasSkills;
+        
+        if (!isComplete) {
+            // 收集缺失的信息提示
+            const missingItems = [];
+            if (!hasIdCard) {
+                missingItems.push('身份证信息');
+            }
+            if (!hasJobInfo) {
+                missingItems.push('职位信息');
+            }
+            if (!hasSkills) {
+                missingItems.push('技能标签');
+            }
+            remindList.value = [`请完善${missingItems.join('、')}`];
+        } else {
+            // 信息完整，设置职位信息
+            if (hasJobTitle) {
+                currentJobName.value = cachedJobTitles[0];
+            } else {
+                currentJobName.value = jobName;
+                currentJobId.value = cachedUserInfo?.jobId ?? 
+                                   cachedUserInfo?.currentJobId ?? 
+                                   cachedUserInfo?.resume?.jobId ?? 
+                                   cachedUserInfo?.resume?.currentJobId ?? 
+                                   null;
+            }
+            // 信息完整，直接显示页面内容
+            showContent.value = true;
+            return;
+        }
+        
+        setTimeout(() => {
+            openRemindPopup();
+        }, 500);
+    }
+}
+
+// 取消按钮
+function handleCancel() {
+    remindPopup.value?.close();
+    navBack();
+}
+
+// 确认按钮
+async function handleConfirm() {
+    remindPopup.value?.close();
+    
+    const { hasJobInfo, hasSkills } = missingInfo.value;
+    
+    // 如果同时缺少职位信息和技能标签：先跳转到职位信息页面，并传递参数表示完成后需要继续跳转到技能页面
+    if (!hasJobInfo && !hasSkills) {
+        // 跳转到职位信息页面，传递参数表示完成后需要继续跳转到技能页面
+        navTo('/packageA/pages/jobExpect/jobExpect?needSkill=true');
+    } 
+    // 如果只缺少技能标签：直接跳转到技能页面（个人信息页面的技能部分）
+    else if (!hasSkills) {
+        navTo('/packageA/pages/personalInfo/personalInfo');
+    } 
+    // 如果只缺少职位信息：直接跳转到职位信息页面
+    else if (!hasJobInfo) {
+        navTo('/packageA/pages/jobExpect/jobExpect');
+    }
+    // 如果只缺少身份证信息：跳转到个人信息页面
+    else {
+        navTo('/packageA/pages/personalInfo/personalInfo');
+    }
+}
+
+// 切换tab
+function switchTab(index) {
+    activeTab.value = index;
+    
+    if (index === 0 && !currentJobId.value) {
+        const cachedUserInfo = uni.getStorageSync('userInfo') || {};
+        
+        // 优先从缓存中的 jobTitles 数组获取职位信息（取第一个）
+        const cachedJobTitles = Array.isArray(cachedUserInfo?.jobTitles) ? cachedUserInfo.jobTitles : [];
+        let newJobName = '';
+        
+        if (cachedJobTitles.length > 0) {
+            newJobName = cachedJobTitles[0];
+        } else {
+            // 如果缓存中没有 jobTitles，从其他字段获取
+            newJobName = currentJobName.value || 
+                        (cachedUserInfo?.jobName ?? 
+                        cachedUserInfo?.currentJobName ?? 
+                        cachedUserInfo?.resume?.jobName ?? 
+                        cachedUserInfo?.resume?.currentJobName ?? 
+                        '市场专员');
+        }
+        
+        const newJobId = cachedUserInfo?.jobId ?? 
+                         cachedUserInfo?.currentJobId ?? 
+                         cachedUserInfo?.resume?.jobId ?? 
+                         cachedUserInfo?.resume?.currentJobId ?? 
+                         null;
+        
+        currentJobId.value = newJobId;
+        currentJobName.value = newJobName;
+    }
+}
+
+// 搜索点击
+function handleSearchClick() {
+    navTo('/pages/search/search');
+}
+
+// 菜单点击
+function handleMenuClick() {
+    // TODO: 实现菜单功能
+}
+
+// 更多点击
+function handleMoreClick() {
+    // TODO: 实现更多功能
+}
+
+function normalizeSkillLevel(score) {
+    const numericScore = Number(score);
+    if (Number.isNaN(numericScore)) {
+        return 0;
+    }
+    const rounded = Math.round(numericScore);
+    return Math.max(1, Math.min(6, rounded));
+}
+
+function splitSkillListByScore(skills = []) {
+    if (!Array.isArray(skills) || skills.length === 0) {
+        return {
+            possessed: [],
+            improvement: []
+        };
+    }
+
+    const sorted = [...skills].sort((a, b) => (Number(b.skillScore) || 0) - (Number(a.skillScore) || 0));
+    const midpoint = Math.ceil(sorted.length / 2);
+    const mapSkill = (item) => ({
+        name: item?.skillName || '',
+        level: normalizeSkillLevel(item?.skillScore)
+    });
+
+    return {
+        possessed: sorted.slice(0, midpoint).map(mapSkill),
+        improvement: sorted.slice(midpoint).map(mapSkill)
+    };
+}
+
+// 处理职位卡片点击
+async function handleJobCardClick(job) {
+    if (!job) {
+        return;
+    }
+
+    selectedJobTitle.value = job.title || job.jobName || '';
+    selectedJobPossessedSkills.value = [];
+    selectedJobImprovementSkills.value = [];
+
+    if (isLoadingJobSkill.value) {
+        return;
+    }
+
+    isLoadingJobSkill.value = true;
+    uni.showLoading({
+        title: '加载中...',
+        mask: true
+    });
+
+    try {
+        // 从 appUserInfo 接口获取技能数据
+        const response = await appUserInfo();
+        const userInfo = response?.data || {};
+        const appSkillsList = Array.isArray(userInfo?.appSkillsList) ? userInfo.appSkillsList : [];
+        
+        // 将 appSkillsList 转换为 splitSkillListByScore 需要的格式
+        const skillList = appSkillsList.map(item => ({
+            skillName: item?.name || item?.nameStr || '',
+            skillScore: item?.levels || item?.levelStr || 0
+        })).filter(item => item.skillName);
+        
+        const { possessed, improvement } = splitSkillListByScore(skillList);
+
+        if (possessed.length === 0 && improvement.length === 0) {
+            // 如果 appUserInfo 中没有技能数据，尝试使用推荐职位数据中的技能信息
+            const fallbackSkills = Array.isArray(job?.rawSkills) ? job.rawSkills : [];
+            if (fallbackSkills.length === 0) {
+                uni.showToast({
+                    title: '暂无技能数据',
+                    icon: 'none'
+                });
+                return;
+            }
+            const fallbackSplit = splitSkillListByScore(fallbackSkills);
+            selectedJobPossessedSkills.value = fallbackSplit.possessed;
+            selectedJobImprovementSkills.value = fallbackSplit.improvement;
+        } else {
+            selectedJobPossessedSkills.value = possessed;
+            selectedJobImprovementSkills.value = improvement;
+        }
+        skillDetailPopup.value?.open();
+    } catch (error) {
+        // 接口调用失败，尝试使用推荐职位数据中的技能信息
+        const fallbackSkills = Array.isArray(job?.rawSkills) ? job.rawSkills : [];
+        if (fallbackSkills.length > 0) {
+            const fallbackSplit = splitSkillListByScore(fallbackSkills);
+            selectedJobPossessedSkills.value = fallbackSplit.possessed;
+            selectedJobImprovementSkills.value = fallbackSplit.improvement;
+            skillDetailPopup.value?.open();
+        } else {
+            uni.showToast({
+                title: '获取技能信息失败',
+                icon: 'none'
+            });
+        }
+    } finally {
+        isLoadingJobSkill.value = false;
+        uni.hideLoading();
+    }
+}
+
+// 处理技能弹出层关闭
+function handleSkillPopupClose() {
+    // 可以在这里处理关闭后的逻辑
+}
+
+// 处理职业推荐技能数据更新
+function handleRecommendSkillsUpdated(data) {
+    recommendSkillsData.value = {
+        currentJobSkills: data.currentJobSkills || [],
+        recommendedJobs: data.recommendedJobs || []
+    };
+}
+
+// 处理职业路径数据更新
+function handlePathDataUpdated(data) {
+    pathSkillsData.value = {
+        pathData: data.pathData || {
+            start: { title: '', skills: [] },
+            steps: [],
+            end: { title: '', skills: [] }
+        },
+        targetCareer: data.targetCareer || ''
+    };
+}
+
+onLoad(() => {
+    getRemindInfo();
+});
+
+onShow(() => {
+    // 返回本页后，如果之前因为信息缺失未展示内容，则重新检查
+    if (!showContent.value) {
+        hasCheckedRemindInfo = false;
+        getRemindInfo();
+    }
+});
+
+onMounted(() => {
+    if (remindList.value.length > 0 && !showContent.value) {
+        setTimeout(() => {
+            if (remindPopup.value) {
+                openRemindPopup();
+            }
+        }, 300);
+    }
+});
+</script>
+
+<style lang="scss" scoped>
+.career-planning-page {
+    width: 100vw;
+    /* #ifdef H5 */
+    height: calc(100vh - var(--window-top) - var(--status-bar-height) - var(--window-bottom));
+    background: url('@/static/icon/background2.png') 0 0 no-repeat;
+    background-size: 100% 728rpx;
+    /* #endif */
+    /* #ifdef MP-WEIXIN */
+    height: 100vh;
+    position: relative;
+    /* #endif */
+    background-color: #FFFFFF;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+    position: relative;
+}
+
+/* #ifdef MP-WEIXIN */
+.mp-background {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 728rpx;
+    z-index: 0;
+}
+/* #endif */
+
+.page-content {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    position: relative;
+    z-index: 1;
+    overflow: hidden;
+}
+
+
+.content-scroll {
+    flex: 1;
+    height: 0;
+    width: 100%;
+    padding-bottom: calc(88rpx + env(safe-area-inset-bottom));
+    box-sizing: border-box;
+}
+
+.tabbar-wrapper {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    z-index: 999;
+}
+</style>
diff --git a/pages/service/career-planning.vue b/pages/service/career-planning.vue
index c3abf8d..ed03978 100644
--- a/pages/service/career-planning.vue
+++ b/pages/service/career-planning.vue
@@ -1,67 +1,4 @@
-<template>
-    <view class="career-planning-page">
-        <!-- 提醒弹窗 -->
-        <RemindPopup 
-            ref="remindPopup"
-            :remind-list="remindList"
-            @cancel="handleCancel"
-            @confirm="handleConfirm"
-        />
-
-        <!-- 技能详情弹出层 -->
-        <SkillDetailPopup
-            ref="skillDetailPopup"
-            :job-title="selectedJobTitle"
-            :possessed-skills="selectedJobPossessedSkills"
-            :improvement-skills="selectedJobImprovementSkills"
-            @close="handleSkillPopupClose"
-        />
-
-        <!-- 页面内容 -->
-        <view class="page-content" v-if="showContent">
-            <!-- #ifdef MP-WEIXIN -->
-            <!-- 小程序背景图片 -->
-            <image class="mp-background" src="/static/icon/background2.png" mode="aspectFill"></image>
-            <!-- #endif -->
-            
-            <!-- 头部区域 -->
-            <PageHeader 
-                :active-tab="activeTab"
-                @tab-change="switchTab"
-                @search-click="handleSearchClick"
-                @menu-click="handleMenuClick"
-                @more-click="handleMoreClick"
-            />
-
-            <!-- 内容区域 -->
-            <scroll-view scroll-y class="content-scroll">
-                <CareerRecommend 
-                    v-if="activeTab === 0"
-                    :current-job-id="currentJobId"
-                    :current-job-name="currentJobName"
-                    @job-card-click="handleJobCardClick"
-                    @skills-updated="handleRecommendSkillsUpdated"
-                />
-                <CareerPath 
-                    v-else-if="activeTab === 1"
-                    :current-job-name="currentJobName"
-                    @path-data-updated="handlePathDataUpdated"
-                />
-                <SkillDevelopment 
-                    v-else 
-                    :current-job-name="currentJobName"
-                    @path-data-updated="handlePathDataUpdated"
-                />
-            </scroll-view>
-        </view>
-
-        <!-- 底部导航栏 -->
-        <view class="tabbar-wrapper" v-if="showContent">
-            <CustomTabBar :currentPage="0" />
-        </view>
-    </view>
-</template>
-
+<!--suppress HtmlUnknownTag, NpmUsedModulesInstalled, JSFileReferences -->
 <script setup>
 import { ref, inject, nextTick, onMounted } from 'vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
@@ -89,15 +26,9 @@ const activeTab = ref(0);
 const selectedJobTitle = ref('');
 const selectedJobPossessedSkills = ref([]);
 const selectedJobImprovementSkills = ref([]);
-const isLoadingJobSkill = ref(false);
 const currentJobId = ref(null);
 const currentJobName = ref('');
 
-// 技能发展所需的数据
-const recommendSkillsData = ref({
-    currentJobSkills: [],
-    recommendedJobs: []
-});
 
 const pathSkillsData = ref({
     pathData: {
@@ -153,13 +84,13 @@ async function getRemindInfo() {
     if (hasCheckedRemindInfo) {
         return;
     }
-    
+
     hasCheckedRemindInfo = true;
-    
+
     try {
         const response = await appUserInfo();
         const userInfo = response?.data || {};
-        
+
         // 检查 idCard（身份证）- 必须项
         let idCard = userInfo?.resume?.idCard ?? userInfo?.idCard ?? null;
         const cachedUserInfo = uni.getStorageSync('userInfo') || {};
@@ -167,22 +98,22 @@ async function getRemindInfo() {
             idCard = cachedUserInfo?.resume?.idCard ?? cachedUserInfo?.idCard ?? null;
         }
         const hasIdCard = idCard !== null && idCard !== undefined && idCard !== '';
-        
+
         // 检查职位信息：优先从 jobTitles 数组获取
         const jobTitles = Array.isArray(userInfo?.jobTitles) ? userInfo.jobTitles : [];
         const hasJobTitle = jobTitles.length > 0;
-        
+
         // 如果 jobTitles 为空，尝试从其他字段获取
         let jobName = '';
         if (!hasJobTitle) {
-            jobName = userInfo?.jobName ?? 
-                     userInfo?.currentJobName ?? 
-                     userInfo?.resume?.jobName ?? 
-                     userInfo?.resume?.currentJobName ?? 
-                     '';
+            jobName = userInfo?.jobName ??
+                userInfo?.currentJobName ??
+                userInfo?.resume?.jobName ??
+                userInfo?.resume?.currentJobName ??
+                '';
         }
         const hasJobInfo = hasJobTitle || (jobName && jobName.trim() !== '');
-        
+
         // 检查技能标签：从 appSkillsList 获取
         const appSkillsList = Array.isArray(userInfo?.appSkillsList) ? userInfo.appSkillsList : [];
         // 检查是否有有效的技能（name 或 nameStr 不为空）
@@ -190,14 +121,14 @@ async function getRemindInfo() {
             const skillName = skill?.name || skill?.nameStr;
             return skillName && skillName.trim() !== '';
         });
-        
+
         // 保存缺失信息标识（只保存职位信息和技能标签，身份证信息跳转到个人信息页面）
         missingInfo.value.hasJobInfo = hasJobInfo;
         missingInfo.value.hasSkills = hasSkills;
-        
+
         // 判断信息是否完整（idCard、职位信息、技能标签都必须有）
         const isComplete = hasIdCard && hasJobInfo && hasSkills;
-        
+
         if (!isComplete) {
             // 收集缺失的信息提示
             const missingItems = [];
@@ -217,55 +148,55 @@ async function getRemindInfo() {
                 currentJobName.value = jobTitles[0];
             } else {
                 currentJobName.value = jobName;
-                currentJobId.value = userInfo?.jobId ?? 
-                                   userInfo?.currentJobId ?? 
-                                   userInfo?.resume?.jobId ?? 
-                                   userInfo?.resume?.currentJobId ?? 
-                                   null;
+                currentJobId.value = userInfo?.jobId ??
+                    userInfo?.currentJobId ??
+                    userInfo?.resume?.jobId ??
+                    userInfo?.resume?.currentJobId ??
+                    null;
             }
             // 信息完整，直接显示页面内容
             showContent.value = true;
             return;
         }
-        
+
         setTimeout(() => {
             openRemindPopup();
         }, 500);
     } catch (error) {
         // 接口调用失败时，使用缓存作为降级方案
         const cachedUserInfo = uni.getStorageSync('userInfo') || {};
-        
+
         // 检查 idCard
         const idCard = cachedUserInfo?.resume?.idCard ?? cachedUserInfo?.idCard ?? null;
         const hasIdCard = idCard !== null && idCard !== undefined && idCard !== '';
-        
+
         // 检查职位信息
         const cachedJobTitles = Array.isArray(cachedUserInfo?.jobTitles) ? cachedUserInfo.jobTitles : [];
         const hasJobTitle = cachedJobTitles.length > 0;
         let jobName = '';
         if (!hasJobTitle) {
-            jobName = cachedUserInfo?.jobName ?? 
-                     cachedUserInfo?.currentJobName ?? 
-                     cachedUserInfo?.resume?.jobName ?? 
-                     cachedUserInfo?.resume?.currentJobName ?? 
-                     '';
+            jobName = cachedUserInfo?.jobName ??
+                cachedUserInfo?.currentJobName ??
+                cachedUserInfo?.resume?.jobName ??
+                cachedUserInfo?.resume?.currentJobName ??
+                '';
         }
         const hasJobInfo = hasJobTitle || (jobName && jobName.trim() !== '');
-        
+
         // 检查技能标签
         const cachedAppSkillsList = Array.isArray(cachedUserInfo?.appSkillsList) ? cachedUserInfo.appSkillsList : [];
         const hasSkills = cachedAppSkillsList.some(skill => {
             const skillName = skill?.name || skill?.nameStr;
             return skillName && skillName.trim() !== '';
         });
-        
+
         // 保存缺失信息标识
         missingInfo.value.hasJobInfo = hasJobInfo;
         missingInfo.value.hasSkills = hasSkills;
-        
+
         // 判断信息是否完整（idCard、职位信息、技能标签都必须有）
         const isComplete = hasIdCard && hasJobInfo && hasSkills;
-        
+
         if (!isComplete) {
             // 收集缺失的信息提示
             const missingItems = [];
@@ -285,17 +216,17 @@ async function getRemindInfo() {
                 currentJobName.value = cachedJobTitles[0];
             } else {
                 currentJobName.value = jobName;
-                currentJobId.value = cachedUserInfo?.jobId ?? 
-                                   cachedUserInfo?.currentJobId ?? 
-                                   cachedUserInfo?.resume?.jobId ?? 
-                                   cachedUserInfo?.resume?.currentJobId ?? 
-                                   null;
+                currentJobId.value = cachedUserInfo?.jobId ??
+                    cachedUserInfo?.currentJobId ??
+                    cachedUserInfo?.resume?.jobId ??
+                    cachedUserInfo?.resume?.currentJobId ??
+                    null;
             }
             // 信息完整，直接显示页面内容
             showContent.value = true;
             return;
         }
-        
+
         setTimeout(() => {
             openRemindPopup();
         }, 500);
@@ -311,18 +242,18 @@ function handleCancel() {
 // 确认按钮
 async function handleConfirm() {
     remindPopup.value?.close();
-    
+
     const { hasJobInfo, hasSkills } = missingInfo.value;
-    
+
     // 如果同时缺少职位信息和技能标签：先跳转到职位信息页面，并传递参数表示完成后需要继续跳转到技能页面
     if (!hasJobInfo && !hasSkills) {
         // 跳转到职位信息页面，传递参数表示完成后需要继续跳转到技能页面
         navTo('/packageA/pages/jobExpect/jobExpect?needSkill=true');
-    } 
+    }
     // 如果只缺少技能标签：直接跳转到技能页面（个人信息页面的技能部分）
     else if (!hasSkills) {
         navTo('/packageA/pages/personalInfo/personalInfo');
-    } 
+    }
     // 如果只缺少职位信息：直接跳转到职位信息页面
     else if (!hasJobInfo) {
         navTo('/packageA/pages/jobExpect/jobExpect');
@@ -336,32 +267,32 @@ async function handleConfirm() {
 // 切换tab
 function switchTab(index) {
     activeTab.value = index;
-    
+
     if (index === 0 && !currentJobId.value) {
         const cachedUserInfo = uni.getStorageSync('userInfo') || {};
-        
+
         // 优先从缓存中的 jobTitles 数组获取职位信息（取第一个）
         const cachedJobTitles = Array.isArray(cachedUserInfo?.jobTitles) ? cachedUserInfo.jobTitles : [];
         let newJobName = '';
-        
+
         if (cachedJobTitles.length > 0) {
             newJobName = cachedJobTitles[0];
         } else {
             // 如果缓存中没有 jobTitles，从其他字段获取
-            newJobName = currentJobName.value || 
-                        (cachedUserInfo?.jobName ?? 
-                        cachedUserInfo?.currentJobName ?? 
-                        cachedUserInfo?.resume?.jobName ?? 
-                        cachedUserInfo?.resume?.currentJobName ?? 
-                        '市场专员');
+            newJobName = currentJobName.value ||
+                (cachedUserInfo?.jobName ??
+                    cachedUserInfo?.currentJobName ??
+                    cachedUserInfo?.resume?.jobName ??
+                    cachedUserInfo?.resume?.currentJobName ??
+                    '市场专员');
         }
-        
-        const newJobId = cachedUserInfo?.jobId ?? 
-                         cachedUserInfo?.currentJobId ?? 
-                         cachedUserInfo?.resume?.jobId ?? 
-                         cachedUserInfo?.resume?.currentJobId ?? 
-                         null;
-        
+
+        const newJobId = cachedUserInfo?.jobId ??
+            cachedUserInfo?.currentJobId ??
+            cachedUserInfo?.resume?.jobId ??
+            cachedUserInfo?.resume?.currentJobId ??
+            null;
+
         currentJobId.value = newJobId;
         currentJobName.value = newJobName;
     }
@@ -382,121 +313,6 @@ function handleMoreClick() {
     // TODO: 实现更多功能
 }
 
-function normalizeSkillLevel(score) {
-    const numericScore = Number(score);
-    if (Number.isNaN(numericScore)) {
-        return 0;
-    }
-    const rounded = Math.round(numericScore);
-    return Math.max(1, Math.min(6, rounded));
-}
-
-function splitSkillListByScore(skills = []) {
-    if (!Array.isArray(skills) || skills.length === 0) {
-        return {
-            possessed: [],
-            improvement: []
-        };
-    }
-
-    const sorted = [...skills].sort((a, b) => (Number(b.skillScore) || 0) - (Number(a.skillScore) || 0));
-    const midpoint = Math.ceil(sorted.length / 2);
-    const mapSkill = (item) => ({
-        name: item?.skillName || '',
-        level: normalizeSkillLevel(item?.skillScore)
-    });
-
-    return {
-        possessed: sorted.slice(0, midpoint).map(mapSkill),
-        improvement: sorted.slice(midpoint).map(mapSkill)
-    };
-}
-
-// 处理职位卡片点击
-async function handleJobCardClick(job) {
-    if (!job) {
-        return;
-    }
-
-    selectedJobTitle.value = job.title || job.jobName || '';
-    selectedJobPossessedSkills.value = [];
-    selectedJobImprovementSkills.value = [];
-
-    if (isLoadingJobSkill.value) {
-        return;
-    }
-
-    isLoadingJobSkill.value = true;
-    uni.showLoading({
-        title: '加载中...',
-        mask: true
-    });
-
-    try {
-        // 从 appUserInfo 接口获取技能数据
-        const response = await appUserInfo();
-        const userInfo = response?.data || {};
-        const appSkillsList = Array.isArray(userInfo?.appSkillsList) ? userInfo.appSkillsList : [];
-        
-        // 将 appSkillsList 转换为 splitSkillListByScore 需要的格式
-        const skillList = appSkillsList.map(item => ({
-            skillName: item?.name || item?.nameStr || '',
-            skillScore: item?.levels || item?.levelStr || 0
-        })).filter(item => item.skillName);
-        
-        const { possessed, improvement } = splitSkillListByScore(skillList);
-
-        if (possessed.length === 0 && improvement.length === 0) {
-            // 如果 appUserInfo 中没有技能数据，尝试使用推荐职位数据中的技能信息
-            const fallbackSkills = Array.isArray(job?.rawSkills) ? job.rawSkills : [];
-            if (fallbackSkills.length === 0) {
-                uni.showToast({
-                    title: '暂无技能数据',
-                    icon: 'none'
-                });
-                return;
-            }
-            const fallbackSplit = splitSkillListByScore(fallbackSkills);
-            selectedJobPossessedSkills.value = fallbackSplit.possessed;
-            selectedJobImprovementSkills.value = fallbackSplit.improvement;
-        } else {
-            selectedJobPossessedSkills.value = possessed;
-            selectedJobImprovementSkills.value = improvement;
-        }
-        skillDetailPopup.value?.open();
-    } catch (error) {
-        // 接口调用失败，尝试使用推荐职位数据中的技能信息
-        const fallbackSkills = Array.isArray(job?.rawSkills) ? job.rawSkills : [];
-        if (fallbackSkills.length > 0) {
-            const fallbackSplit = splitSkillListByScore(fallbackSkills);
-            selectedJobPossessedSkills.value = fallbackSplit.possessed;
-            selectedJobImprovementSkills.value = fallbackSplit.improvement;
-            skillDetailPopup.value?.open();
-        } else {
-            uni.showToast({
-                title: '获取技能信息失败',
-                icon: 'none'
-            });
-        }
-    } finally {
-        isLoadingJobSkill.value = false;
-        uni.hideLoading();
-    }
-}
-
-// 处理技能弹出层关闭
-function handleSkillPopupClose() {
-    // 可以在这里处理关闭后的逻辑
-}
-
-// 处理职业推荐技能数据更新
-function handleRecommendSkillsUpdated(data) {
-    recommendSkillsData.value = {
-        currentJobSkills: data.currentJobSkills || [],
-        recommendedJobs: data.recommendedJobs || []
-    };
-}
-
 // 处理职业路径数据更新
 function handlePathDataUpdated(data) {
     pathSkillsData.value = {
@@ -532,6 +348,114 @@ onMounted(() => {
 });
 </script>
 
+<template>
+    <div class="career-planning-page">
+        <!-- 提醒弹窗 -->
+        <RemindPopup
+            ref="remindPopup"
+            :remind-list="remindList"
+            @cancel="handleCancel"
+            @confirm="handleConfirm"
+        />
+
+        <!-- 技能详情弹出层 -->
+        <SkillDetailPopup
+            ref="skillDetailPopup"
+            :job-title="selectedJobTitle"
+            :possessed-skills="selectedJobPossessedSkills"
+            :improvement-skills="selectedJobImprovementSkills"
+        />
+
+        <!-- 页面内容 -->
+        <div class="page-content" v-if="showContent">
+            <!-- #ifdef MP-WEIXIN -->
+            <!-- 小程序背景图片 -->
+            <image class="mp-background" src="/static/icon/background2.png" mode="aspectFill"></image>
+            <!-- #endif -->
+
+            <!-- 头部区域 -->
+            <PageHeader
+                :active-tab="activeTab"
+                @tab-change="switchTab"
+                @search-click="handleSearchClick"
+                @menu-click="handleMenuClick"
+                @more-click="handleMoreClick"
+            />
+
+            <!-- 内容区域 -->
+            <scroll-view scroll-y class="content-scroll">
+                <CareerRecommend v-if="activeTab === 0"/>
+                <CareerPath v-else-if="activeTab === 1" />
+                <SkillDevelopment v-else />
+            </scroll-view>
+        </div>
+
+        <!-- 底部导航栏 -->
+        <div class="tabbar-wrapper" v-if="showContent">
+            <CustomTabBar :currentPage="0" />
+        </div>
+    </div>
+</template>
+
+<style lang="scss">
+.query-btn {
+    width: 100%;
+    height: 80rpx;
+    line-height: 40rpx;
+    border-radius: 14rpx;
+    background: linear-gradient(180deg, rgba(18, 125, 240, 1) 0%, rgba(59, 14, 123, 0.71) 100%);
+    color: rgba(255, 255, 255, 1);
+    font-size: 28rpx;
+    text-align: center;
+    font-family: '阿里巴巴普惠体3.0-regular', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+    border: 2rpx solid rgba(187, 187, 187, 1);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 12rpx;
+    padding: 0;
+}
+
+.empty-text {
+    font-size: 26rpx;
+    text-align: center;
+    line-height: 1.5;
+}
+
+.input-group {
+    display: flex;
+    flex-direction: column;
+    gap: 30rpx;
+}
+
+.input-item {
+    display: flex;
+    flex-direction: column;
+    gap: 12rpx;
+}
+
+.picker-field {
+    background-color: #F5F5F5;
+    border: 1rpx solid #E0E0E0;
+    border-radius: 12rpx;
+    padding: 20rpx 24rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+
+.picker-text {
+    font-size: 28rpx;
+    color: #000000;
+}
+
+.picker-placeholder {
+    font-size: 28rpx;
+    color: #999999;
+}
+
+</style>
+
 <style lang="scss" scoped>
 .career-planning-page {
     width: 100vw;
diff --git a/pages/service/components/CareerPath.vue b/pages/service/components/CareerPath.vue
index a22583f..b757ce1 100644
--- a/pages/service/components/CareerPath.vue
+++ b/pages/service/components/CareerPath.vue
@@ -1,374 +1,107 @@
+<!--suppress JSFileReferences, NpmUsedModulesInstalled, VueMissingComponentImportInspection, HtmlUnknownTag -->
+<script setup>
+import { useCareerPathStore } from '@/stores/useCareerPathStore';
+
+
+const store = useCareerPathStore();
+</script>
+
 <template>
-    <view class="career-path">
-        <!-- 职业路径查询区域 -->
-        <view class="query-section">
-            <view class="section-title">
-                <uni-icons type="search" size="18" color="#286BFA"></uni-icons>
-                <text class="title-text">职业路径查询</text>
-            </view>
-
-            <view class="input-group">
-                <view class="input-item">
-                    <text class="input-label">当前职位</text>
-                    <input
-                        class="input-field"
-                        :value="currentPosition"
-                        placeholder="市场专员"
-                        placeholder-style="color: #999999"
-                        disabled
-                    />
-                </view>
-
-                <view class="input-item">
-                    <text class="input-label">目标职业</text>
-                    <picker
-                        mode="selector"
-                        :range="targetCareerOptions"
-                        range-key="label"
-                        :value="selectedTargetIndex"
-                        @change="handleTargetChange"
-                    >
-                        <view class="picker-field">
-                            <text :class="selectedTargetIndex >= 0 ? 'picker-text' : 'picker-placeholder'">
-                                {{ selectedTargetIndex >= 0 ? targetCareerOptions[selectedTargetIndex].label : '请选择目标职业' }}
-                            </text>
-                            <uni-icons type="arrowdown" size="16" color="#999999"></uni-icons>
-                        </view>
-                    </picker>
-                </view>
-            </view>
-
-            <button class="query-btn" @click="handleQuery">
-                <text>查询职业发展路径</text>
+<div class="career-path">
+    <!-- 职业路径查询区域 -->
+    <div class="query-section">
+        <div class="section-title">
+            <uni-icons color="#286BFA" size="18" type="search"></uni-icons>
+            <span class="title-text">职业路径查询</span>
+        </div>
+        <div class="input-group">
+            <div class="input-item">
+                <span class="label">当前职位</span>
+                <picker @change="store.eventProfession" :value="store.professionIndex" :range="store.professionsRef" range-key="label">
+                    <div class="picker-field">
+                        <span :class="store.professionLabel ? 'picker-text' : 'picker-placeholder'">
+                            {{ store.professionLabel || '请选择职位' }}
+                        </span>
+                        <uni-icons color="#999999" size="16" type="down"></uni-icons>
+                    </div>
+                </picker>
+            </div>
+            <div class="input-item">
+                <span class="label">目标职业</span>
+                <picker :range="store.pathsRef" :value="store.targetCareerIndex" range-key="label" @change="store.eventTargetCareer">
+                    <div class="picker-field">
+                        <span :class="store.targetCareerLabel ? 'picker-text' : 'picker-placeholder'">
+                            {{ store.targetCareerLabel || '请选择目标职业' }}
+                        </span>
+                        <uni-icons color="#999999" size="16" type="down"></uni-icons>
+                    </div>
+                </picker>
+            </div>
+            <button class="query-btn" @click="store.eventSearch">
+                <span>查询职业发展路径</span>
                 <uni-icons type="search" size="18" color="#FFFFFF"></uni-icons>
             </button>
-            <view v-if="totalPathCount > 0" class="path-summary">
-                系统已收录 {{ totalPathCount }} 条职业路径
-            </view>
-        </view>
+        </div>
+    </div>
 
-        <!-- 职业发展路径区域 -->
-        <view class="path-section">
-            <view class="section-title">
-                <uni-icons type="person-filled" size="24" color="#000000"></uni-icons>
-                <text class="title-text">职业发展路径</text>
-            </view>
+    <!-- 职业发展路径区域 -->
+    <div class="path-section">
+        <div class="section-title">
+            <uni-icons color="#000000" size="24" type="person-filled"></uni-icons>
+            <text class="title-text">职业发展路径</text>
+        </div>
 
-            <view class="timeline">
-                <!-- 起点 -->
-                <view class="timeline-item start">
-                    <view class="timeline-marker start-marker"></view>
-                    <view class="timeline-content">
-                        <view class="step-title">起点: {{ pathData.start.title }}</view>
-                        <view class="skill-tags">
-                            <view
-                                class="skill-tag"
-                                v-for="(skill, index) in pathData.start.skills"
-                                :key="index"
-                            >
-                                {{ skill }}
-                            </view>
-                        </view>
-                    </view>
-                </view>
-
-                <!-- 步骤 -->
-                <view
-                    class="timeline-item step"
-                    v-for="(step, index) in pathData.steps"
-                    :key="index"
-                >
-                    <view class="timeline-marker step-marker"></view>
-                    <view class="timeline-content">
-                        <view class="step-title">第{{ index + 1 }}步: {{ step.title }}</view>
-                        <view class="skill-tags">
-                            <view
-                                class="skill-tag"
-                                v-for="(skill, sIndex) in step.skills"
-                                :key="sIndex"
-                            >
-                                {{ skill }}
-                            </view>
-                        </view>
-                    </view>
-                </view>
-
-                <!-- 终点 -->
-                <view class="timeline-item end">
-                    <view class="timeline-marker end-marker"></view>
-                    <view class="timeline-content">
-                        <view class="step-title">终点: {{ pathData.end.title }}</view>
-                        <view class="skill-tags">
-                            <view
-                                class="skill-tag"
-                                v-for="(skill, index) in pathData.end.skills"
-                                :key="index"
-                            >
-                                {{ skill }}
-                            </view>
-                        </view>
-                    </view>
-                </view>
-            </view>
-        </view>
-    </view>
+        <div class="timeline">
+            <div v-for="(step, index) in store.result" :key="index" class="timeline-item" :class="[step.type]">
+                <div class="timeline-marker" :class="[`${step.type}-marker`]"></div>
+                <div class="timeline-content">
+                    <div v-if="step.type === 'start'" class="step-title">起点: {{ step.title }}</div>
+                    <div v-else-if="step.type === 'end'" class="step-title">终点: {{ step.title }}</div>
+                    <div v-else class="step-title">第{{ step.step }}步: {{ step.title }}</div>
+                    <div class="skill-tags">
+                        <div v-for="(skill, sIndex) in step.tags" :key="sIndex" class="skill-tag">{{ skill }}</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
 </template>
 
-<script setup>
-import { ref, computed, onMounted } from 'vue';
-import { getJobPathPage, getJobPathDetail, getJobPathNum } from '@/apiRc/jobPath.js';
-
-// 接收父组件传递的当前职位名称
-const props = defineProps({
-    currentJobName: {
-        type: String,
-        default: ''
-    }
-});
-
-const emit = defineEmits(['path-data-updated']);
-
-// 当前职位（从父组件获取，统一使用）
-const currentPosition = computed(() => props.currentJobName || '市场专员');
-
-// 目标职业选项列表
-const targetCareerOptions = ref([]);
-const selectedTargetIndex = ref(-1);
-const selectedJobPathId = ref(null);
-
-// 职业路径数量
-const totalPathCount = ref(0);
-
-// 初始路径数据
-const emptyPathData = {
-    start: {
-        title: '暂无数据',
-        skills: []
-    },
-    steps: [],
-    end: {
-        title: '暂无数据',
-        skills: []
-    }
-};
-
-const pathData = ref({ ...emptyPathData });
-const isLoadingPath = ref(false);
-
-function parseSkillList(skillString) {
-    if (!skillString) {
-        return [];
-    }
-    return skillString
-        .split(/[,，]/)
-        .map(item => item.trim())
-        .filter(item => item.length > 0);
-}
-
-function resetPathData() {
-    pathData.value = {
-        start: { ...emptyPathData.start },
-        steps: [],
-        end: { ...emptyPathData.end }
-    };
-}
-
-async function fetchTargetCareerOptions(keyword = '') {
-    try {
-        const response = await getJobPathPage({
-            jobName: keyword,
-            pageNo: 1,
-            pageSize: 100
-        });
-
-        const list = response?.data?.list || response?.list || [];
-
-        targetCareerOptions.value = list.map(item => ({
-            label: item.endJob || item.startJob || '未知职位',
-            value: item.id,
-            startJob: item.startJob,
-            endJob: item.endJob,
-            jobOrder: item.jobOrder,
-            startJobId: item.startJobId,
-            endJobId: item.endJobId
-        }));
-
-        if (targetCareerOptions.value.length === 0) {
-            selectedTargetIndex.value = -1;
-            selectedJobPathId.value = null;
-        }
-    } catch (error) {
-        targetCareerOptions.value = [];
-        selectedTargetIndex.value = -1;
-        selectedJobPathId.value = null;
-        uni.showToast({
-            title: '职业路径列表获取失败',
-            icon: 'none'
-        });
-    }
-}
-
-async function fetchPathCount() {
-    try {
-        const response = await getJobPathNum();
-        totalPathCount.value = response?.data ?? 0;
-    } catch (error) {
-        totalPathCount.value = 0;
-    }
-}
-
-async function loadPathDetail(startJobId, endJobId) {
-    if (startJobId === null || startJobId === undefined || startJobId === '' || endJobId === null || endJobId === undefined || endJobId === '') {
-        uni.showToast({
-            title: '职业路径ID无效',
-            icon: 'none'
-        });
-        resetPathData();
-        return;
-    }
-
-    try {
-        const requestParams = {
-            startJobId,
-            endJobId
-        };
-
-        const response = await getJobPathDetail(requestParams);
-
-        const details = Array.isArray(response?.data) ? response.data : [];
-
-        if (details.length === 0) {
-            resetPathData();
-            uni.showToast({
-                title: '暂无职业路径数据',
-                icon: 'none'
-            });
-            return;
-        }
-
-        const normalized = details.map(item => ({
-            title: item?.name || '未命名职位',
-            skills: parseSkillList(item?.skillNameList)
-        }));
-
-        const start = normalized[0] || { title: '暂无数据', skills: [] };
-        const end = normalized[normalized.length - 1] || { title: '暂无数据', skills: [] };
-        const steps = normalized.slice(1, normalized.length - 1);
-
-        pathData.value = {
-            start,
-            steps,
-            end
-        };
-
-        // 通知父组件路径数据已更新
-        emit('path-data-updated', {
-            pathData: pathData.value,
-            targetCareer: targetCareerOptions.value[selectedTargetIndex.value]?.label || ''
-        });
-    } catch (error) {
-        console.warn(error, 22222);
-        uni.showToast({
-            title: '获取路径详情失败',
-            icon: 'none'
-        });
-        resetPathData();
-        emit('path-data-updated', {
-            pathData: { ...emptyPathData },
-            targetCareer: ''
-        });
-    }
-}
-
-function handleTargetChange(e) {
-    const index = Number(e.detail.value);
-    selectedTargetIndex.value = index;
-    const option = targetCareerOptions.value[index];
-    selectedJobPathId.value = option ? option.value : null;
-}
-
-async function handleQuery() {
-    if (selectedTargetIndex.value < 0) {
-        uni.showToast({
-            title: '请选择目标职业',
-            icon: 'none'
-        });
-        return;
-    }
-
-    const option = targetCareerOptions.value[selectedTargetIndex.value];
-    if (!option) {
-        uni.showToast({
-            title: '目标职业数据异常',
-            icon: 'none'
-        });
-        return;
-    }
-
-
-    isLoadingPath.value = true;
-    uni.showLoading({
-        title: '加载中...',
-        mask: true
-    });
-    console.log(option);
-    try {
-        let { value: jobPathId, startJobId, endJobId } = option;
-        /*if (!jobPathId) {
-            const response = await getJobPathPage({
-                jobName: option.label,
-                pageNo: 1,
-                pageSize: 100
-            });
-            jobPathId = response?.data?.list?.[0]?.id || null;
-        }
-
-        if (!jobPathId) {
-            uni.showToast({
-                title: '未找到职业路径',
-                icon: 'none'
-            });
-            resetPathData();
-            return;
-        }*/
-
-        // selectedJobPathId.value = jobPathId;
-        await loadPathDetail(startJobId, endJobId);
-    } catch (error) {
-        console.warn(error, 11111);
-        uni.showToast({
-            title: '查询失败，请重试',
-            icon: 'none'
-        });
-    } finally {
-        isLoadingPath.value = false;
-        uni.hideLoading();
-    }
-}
-
-// 获取当前职位信息（从接口获取）
-async function getCurrentPosition() {
-    // TODO: 调用接口获取当前职位
-    // const response = await getCareerCurrentPosition();
-    // if (response && response.code === 200) {
-    //     currentPosition.value = response.data?.position || '';
-    // }
-}
-
-onMounted(async () => {
-    await getCurrentPosition();
-    await Promise.all([
-        fetchTargetCareerOptions(),
-        fetchPathCount()
-    ]);
-});
-</script>
-
 <style lang="scss" scoped>
 .career-path {
     padding: 10rpx 28rpx 20rpx;
 }
 
+.card-content {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .label {
+        font-size: 24rpx;
+        line-height: 34rpx;
+        color: rgba(154, 154, 154, 1);
+        text-align: left;
+        font-family: 'PingFangSC-Bold', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+        font-weight: 600;
+    }
+
+    .value {
+        font-size: 32rpx;
+        line-height: 46rpx;
+        color: rgb(16, 16, 16);
+        font-weight: 600;
+        text-align: left;
+        font-family: 'PingFangSC-Bold', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
+
+        &.placeholder {
+            font-weight: 500;
+            color: #ccc;
+        }
+    }
+}
+
 .query-section {
     background-color: #FFFFFF;
     border-radius: 16rpx;
@@ -378,6 +111,8 @@ onMounted(async () => {
 }
 
 .section-title {
+    font-size: 32rpx;
+    color: #000000;
     display: flex;
     align-items: center;
     gap: 12rpx;
@@ -390,19 +125,6 @@ onMounted(async () => {
     color: #157DF0;
 }
 
-.input-group {
-    display: flex;
-    flex-direction: column;
-    gap: 20rpx;
-    margin-bottom: 24rpx;
-}
-
-.input-item {
-    display: flex;
-    flex-direction: column;
-    gap: 12rpx;
-}
-
 .input-label {
     font-size: 28rpx;
     color: #000000;
@@ -418,44 +140,6 @@ onMounted(async () => {
     color: #666666;
 }
 
-.picker-field {
-    background-color: #F5F5F5;
-    border: 1rpx solid #E0E0E0;
-    border-radius: 12rpx;
-    padding: 20rpx 24rpx;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-}
-
-.picker-text {
-    font-size: 28rpx;
-    color: #000000;
-}
-
-.picker-placeholder {
-    font-size: 28rpx;
-    color: #999999;
-}
-
-.query-btn {
-    width: 100%;
-    height: 80rpx;
-    line-height: 40rpx;
-    border-radius: 20rpx;
-    background: linear-gradient(180deg, rgba(18, 125, 240, 1) 0%, rgba(59, 14, 123, 0.71) 100%);
-    color: rgba(255, 255, 255, 1);
-    font-size: 28rpx;
-    text-align: center;
-    font-family: '阿里巴巴普惠体3.0-regular', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
-    border: 2rpx solid rgba(187, 187, 187, 1);
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    gap: 12rpx;
-    padding: 0;
-}
-
 .path-summary {
     margin-top: 16rpx;
     font-size: 24rpx;
@@ -491,11 +175,11 @@ onMounted(async () => {
         width: 2rpx;
         height: 100%;
         background: repeating-linear-gradient(
-            to bottom,
-            #E0E0E0 0,
-            #E0E0E0 6rpx,
-            transparent 6rpx,
-            transparent 12rpx
+                to bottom,
+                #E0E0E0 0,
+                #E0E0E0 6rpx,
+                transparent 6rpx,
+                transparent 12rpx
         );
         transform: translateX(-50%);
         z-index: 1;
diff --git a/pages/service/components/CareerRecommend.vue b/pages/service/components/CareerRecommend.vue
index 74a8260..c10c399 100644
--- a/pages/service/components/CareerRecommend.vue
+++ b/pages/service/components/CareerRecommend.vue
@@ -1,225 +1,84 @@
-<template>
-    <view class="career-recommend">
-        <!-- 当前职位信息卡片 -->
-        <view class="info-card">
-            <view class="card-title">当前职位信息</view>
-            <view class="card-content">
-                <text class="label">当前职位</text>
-                <text class="value">{{ currentJobDisplay }}</text>
-            </view>
-        </view>
-
-        <!-- 我的技能标签卡片 -->
-        <view class="info-card">
-            <view class="card-title">我的技能标签</view>
-            <view class="skill-tags">
-                <view 
-                    class="skill-tag" 
-                    v-for="(skill, index) in skillTags" 
-                    :key="index"
-                >
-                    {{ skill }}
-                </view>
-                <text v-if="!skillTags.length && !isLoadingSkillTags" class="empty-text">暂无技能数据</text>
-                <text v-if="isLoadingSkillTags" class="empty-text">加载中...</text>
-            </view>
-        </view>
-
-        <!-- 相似推荐职位 -->
-        <view class="section-title">
-            相似推荐职位
-        </view>
-        <view v-if="!isLoadingRecommend && recommendedJobs.length === 0" class="empty-text">暂无推荐职位</view>
-        <view 
-            class="job-item-card" 
-            v-for="(job, index) in recommendedJobs" 
-            :key="index"
-            @click="handleJobCardClick(job)"
-        >
-            <view class="job-header">
-                <text class="job-title">{{ job.title }}</text>
-            </view>
-            <view class="job-skills">
-                <view 
-                    class="job-skill-tag" 
-                    v-for="(skill, skillIndex) in job.skills" 
-                    :key="skillIndex"
-                >
-                    {{ skill }}
-                </view>
-            </view>
-        </view>
-    </view>
-</template>
-
+<!--suppress JSFileReferences, NpmUsedModulesInstalled, VueMissingComponentImportInspection, HtmlUnknownTag -->
 <script setup>
-import { ref, computed, watch, onMounted } from 'vue';
-import { recommendJob } from '@/apiRc/jobRecommend.js';
-import { appUserInfo } from '@/apiRc/user/user.js';
+import { useCareerRecommendationStore } from '@/stores/useCareerRecommendationStore';
 
-const props = defineProps({
-    currentJobId: {
-        type: [Number, String],
-        default: null
-    },
-    currentJobName: {
-        type: String,
-        default: ''
-    }
-});
 
-const emit = defineEmits(['job-card-click', 'skills-updated']);
-
-// 数据状态
-const skillTags = ref([]);
-const recommendedJobs = ref([]);
-const isLoadingSkillTags = ref(false);
-const isLoadingRecommend = ref(false);
-
-// 计算属性
-const currentJobDisplay = computed(() => props.currentJobName || '市场专员');
-
-// 从 appSkillsList 中提取技能名称
-function extractSkillsFromAppSkillsList(appSkillsList = []) {
-    return (Array.isArray(appSkillsList) ? appSkillsList : [])
-        .map(item => item?.name || item?.nameStr || '')
-        .filter(name => !!name && name.trim().length > 0);
-}
-
-// 从技能列表中提取技能名称用于显示（用于推荐职位数据）
-function extractSkillNames(skillList = []) {
-    return (Array.isArray(skillList) ? skillList : [])
-        .map(item => item?.skillName || '')
-        .filter(name => !!name && name.trim().length > 0);
-}
-
-// 获取当前职位的技能标签
-async function fetchCurrentJobSkills() {
-    isLoadingSkillTags.value = true;
-    try {
-        // 优先从 appUserInfo 接口获取技能标签
-        const response = await appUserInfo();
-        const userInfo = response?.data || {};
-        
-        // 从 appSkillsList 中提取技能名称
-        const appSkillsList = Array.isArray(userInfo?.appSkillsList) ? userInfo.appSkillsList : [];
-        const apiSkills = extractSkillsFromAppSkillsList(appSkillsList);
-        
-        // 如果接口返回了技能数据，使用接口数据
-        if (apiSkills.length > 0) {
-            skillTags.value = apiSkills;
-        } else {
-            // 如果接口没有返回技能数据，从缓存中读取
-            const cachedUserInfo = uni.getStorageSync('userInfo') || {};
-            const cachedAppSkills = Array.isArray(cachedUserInfo?.appSkillsList) ? cachedUserInfo.appSkillsList : [];
-            const cachedSkills = extractSkillsFromAppSkillsList(cachedAppSkills);
-            
-            if (cachedSkills.length > 0) {
-                skillTags.value = cachedSkills;
-            } else {
-                skillTags.value = [];
-            }
-        }
-        
-        // 通知父组件技能数据已更新
-        emit('skills-updated', {
-            currentJobSkills: skillTags.value,
-            recommendedJobs: recommendedJobs.value
-        });
-    } catch (error) {
-        // appUserInfo 接口调用失败时，从缓存中读取
-        const cachedUserInfo = uni.getStorageSync('userInfo') || {};
-        const cachedAppSkills = Array.isArray(cachedUserInfo?.appSkillsList) ? cachedUserInfo.appSkillsList : [];
-        const cachedSkills = extractSkillsFromAppSkillsList(cachedAppSkills);
-        
-        if (cachedSkills.length > 0) {
-            skillTags.value = cachedSkills;
-        } else {
-            skillTags.value = [];
-        }
-        
-        emit('skills-updated', {
-            currentJobSkills: skillTags.value,
-            recommendedJobs: recommendedJobs.value
-        });
-    } finally {
-        isLoadingSkillTags.value = false;
-    }
-}
-
-// 获取推荐职位列表
-async function fetchRecommendedJobs() {
-    isLoadingRecommend.value = true;
-    try {
-        const response = await recommendJob({
-            jobName: props.currentJobName
-        });
-        
-        const list = Array.isArray(response?.data) ? response.data : [];
-        
-        recommendedJobs.value = list.map((item, index) => {
-            const skillList = Array.isArray(item?.skillList) ? item.skillList : [];
-            const skillNames = extractSkillNames(skillList);
-            
-            return {
-                id: item?.jobId ?? index,
-                jobId: item?.jobId ?? null,
-                title: item?.jobName || `推荐职位${index + 1}`,
-                jobName: item?.jobName || '',
-                skills: skillNames,
-                rawSkills: skillList
-            };
-        });
-        
-        // 通知父组件推荐职位数据已更新
-        emit('skills-updated', {
-            currentJobSkills: skillTags.value,
-            recommendedJobs: recommendedJobs.value
-        });
-    } catch (error) {
-        recommendedJobs.value = [];
-        emit('skills-updated', {
-            currentJobSkills: skillTags.value,
-            recommendedJobs: []
-        });
-    } finally {
-        isLoadingRecommend.value = false;
-    }
-}
-
-// 组件挂载时检查并调用
-onMounted(() => {
-    setTimeout(() => {
-        if (props.currentJobName) {
-            fetchCurrentJobSkills();
-            fetchRecommendedJobs();
-        }
-    }, 100);
-});
-
-// 监听 props 变化，自动获取推荐职位和技能标签
-watch(
-    () => [props.currentJobId, props.currentJobName],
-    () => {
-        if (props.currentJobName) {
-            fetchCurrentJobSkills();
-            fetchRecommendedJobs();
-        }
-    },
-    { immediate: true }
-);
-
-// 事件处理
-function handleJobCardClick(job) {
-    emit('job-card-click', job);
-}
+const store = useCareerRecommendationStore();
 </script>
 
+<template>
+<div class="career-recommend">
+    <div class="info-card">
+        <div class="section-title">
+            <uni-icons color="#286BFA" size="18" type="search"></uni-icons>
+            <span class="title-text">我的职业</span>
+        </div>
+        <div class="input-group">
+            <div class="input-item">
+                <picker @change="store.eventProfession" :value="store.professionIndex" :range="store.professionsRef" range-key="label">
+                    <div class="picker-field">
+                        <span :class="store.professionLabel ? 'picker-text' : 'picker-placeholder'">
+                            {{ store.professionLabel || '请选择职业' }}
+                        </span>
+                        <uni-icons color="#999999" size="16" type="down"></uni-icons>
+                    </div>
+                </picker>
+            </div>
+            <button class="query-btn" @click="store.eventSearch">
+                <span>搜索</span>
+                <uni-icons type="search" size="18" color="#FFFFFF"></uni-icons>
+            </button>
+        </div>
+    </div>
+    <div class="info-card">
+        <div class="card-title">我的技能标签</div>
+        <div class="skill-tags">
+            <div v-for="(skill, index) in store.skillTags" :key="index" class="skill-tag">
+                {{ skill }}
+            </div>
+            <span v-if="!store.skillTags.length" class="empty-text">暂无技能数据</span>
+        </div>
+    </div>
+    <div class="section-title">
+        相似推荐职位
+    </div>
+    <div v-if="!store.result && store.result.length === 0" class="empty-text">暂无推荐职位</div>
+    <div v-for="(job, index) in store.result" :key="index" class="job-item-card">
+        <div class="job-header">
+            <span class="job-title">{{ job.title }}</span>
+        </div>
+        <div class="job-header">
+            <span>职业相似度：{{ job.percentage }}%</span>
+        </div>
+        <div class="job-skills">
+            <div v-for="tag in job.tags" :key="tag" class="job-skill-tag">
+                {{ tag }}
+            </div>
+        </div>
+    </div>
+</div>
+</template>
+
 <style lang="scss" scoped>
 .career-recommend {
     padding: 10rpx 28rpx 20rpx;
 }
 
+.section-title {
+    font-size: 32rpx;
+    color: #000000;
+    display: flex;
+    align-items: center;
+    gap: 12rpx;
+    margin-bottom: 24rpx;
+}
+
+.title-text {
+    font-size: 32rpx;
+    font-weight: 600;
+    color: #157DF0;
+}
+
 .info-card {
     background-color: #FFFFFF;
     border-radius: 16rpx;
@@ -239,7 +98,7 @@ function handleJobCardClick(job) {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    
+
     .label {
         font-size: 24rpx;
         line-height: 34rpx;
@@ -248,7 +107,7 @@ function handleJobCardClick(job) {
         font-family: 'PingFangSC-Bold', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
         font-weight: 600;
     }
-    
+
     .value {
         font-size: 32rpx;
         line-height: 46rpx;
@@ -274,14 +133,6 @@ function handleJobCardClick(job) {
     white-space: nowrap;
 }
 
-.section-title {
-    font-size: 32rpx;
-    font-weight: 600;
-    color: #000000;
-    margin-bottom: 20rpx;
-    margin-top: 8rpx;
-}
-
 .job-item-card {
     background-color: #FFFFFF;
     border-radius: 16rpx;
@@ -290,7 +141,6 @@ function handleJobCardClick(job) {
     box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.08);
     border-left: 6rpx solid #409EFF;
     position: relative;
-    cursor: pointer;
 }
 
 .job-header {
diff --git a/pages/service/components/SkillDevelopment.vue b/pages/service/components/SkillDevelopment.vue
index 8d0688d..968fe89 100644
--- a/pages/service/components/SkillDevelopment.vue
+++ b/pages/service/components/SkillDevelopment.vue
@@ -1,382 +1,102 @@
-<template>
-    <view class="skill-development">
-        <!-- 职业技能查询区域 -->
-        <view class="query-section">
-            <view class="section-title">
-                <uni-icons type="search" size="18" color="#286BFA"></uni-icons>
-                <text class="title-text">职业技能查询</text>
-            </view>
-            
-            <view class="input-group">
-                <view class="input-item">
-                    <text class="input-label">当前职位</text>
-                    <input 
-                        class="input-field" 
-                        :value="currentPosition"
-                        placeholder="市场专员"
-                        placeholder-style="color: #999999"
-                        disabled
-                    />
-                </view>
-                
-                <view class="input-item">
-                    <text class="input-label">目标职业</text>
-                    <picker 
-                        mode="selector"
-                        :range="targetCareerOptions"
-                        range-key="label"
-                        :value="selectedTargetIndex"
-                        @change="handleTargetChange"
-                    >
-                        <view class="picker-field">
-                            <text :class="selectedTargetIndex >= 0 ? 'picker-text' : 'picker-placeholder'">
-                                {{ selectedTargetIndex >= 0 ? targetCareerOptions[selectedTargetIndex].label : '请选择目标职业' }}
-                            </text>
-                            <uni-icons type="arrowdown" size="16" color="#999999"></uni-icons>
-                        </view>
-                    </picker>
-                </view>
-            </view>
-            
-            <button class="query-btn" @click="handleQuery">
-                <text>查询技能发展路径</text>
-                <uni-icons type="search" size="18" color="#FFFFFF"></uni-icons>
-            </button>
-            <view v-if="totalPathCount > 0" class="path-summary">
-                系统已收录 {{ totalPathCount }} 条职业路径
-            </view>
-        </view>
-
-        <view class="content-section">
-            <view class="section-title">
-                <uni-icons type="person-filled" size="18" color="#000000"></uni-icons>
-                <text class="title-text">技能发展路径</text>
-            </view>
-            
-            <view class="intro-text">
-                基于您的当前职业和目标职业,以下是您需要重点发展的技能:
-            </view>
-            
-            <view class="skill-list">
-                <view v-if="isLoadingSkills" class="empty-text">加载中...</view>
-                <view v-else-if="!hasQueried" class="empty-text">请先查询职业路径以获取技能发展数据</view>
-                <view v-else-if="skillList.length === 0" class="empty-text">暂无数据</view>
-                <view 
-                    v-else
-                    class="skill-item" 
-                    v-for="(skill, index) in skillList" 
-                    :key="index"
-                >
-                    <view class="skill-header">
-                        <text class="skill-name">{{ skill.name }}</text>
-                        <view class="skill-info">
-                            <text class="skill-score">技能分数: {{ skill.score }}</text>
-                            <text class="skill-weight">权重: {{ skill.weight }}</text>
-                        </view>
-                    </view>
-                    <view class="skill-tags" v-if="skill.tags && skill.tags.length > 0">
-                        <view 
-                            class="skill-tag" 
-                            v-for="(tag, tagIndex) in skill.tags" 
-                            :key="tagIndex"
-                        >
-                            {{ tag }}
-                        </view>
-                    </view>
-                </view>
-            </view>
-        </view>
-    </view>
-</template>
-
+<!--suppress JSFileReferences, NpmUsedModulesInstalled, VueMissingComponentImportInspection, HtmlUnknownTag -->
 <script setup>
-import { ref, computed, watch, onMounted } from 'vue';
-import { getJobPathPage, getJobPathDetail, getJobPathNum } from '@/apiRc/jobPath.js';
-import { getJobSkillWeight } from '@/apiRc/jobSkill.js';
+import { useSkillDevelopmentStore } from '@/stores/useSkillDevelopmentStore';
 
-const props = defineProps({
-    // 当前职位名称
-    currentJobName: {
-        type: String,
-        default: ''
-    }
-});
 
-const emit = defineEmits(['path-data-updated']);
-
-// 当前职位（从父组件获取）
-const currentPosition = computed(() => props.currentJobName || '市场专员');
-
-// 目标职业选项列表
-const targetCareerOptions = ref([]);
-const selectedTargetIndex = ref(-1);
-const selectedJobPathId = ref(null);
-
-// 职业路径数量
-const totalPathCount = ref(0);
-
-// 技能列表数据（从接口获取）
-const skillList = ref([]);
-const isLoadingSkills = ref(false);
-// 是否已经查询过（用于区分未查询和已查询但无数据）
-const hasQueried = ref(false);
-
-function parseSkillList(skillString) {
-    if (!skillString) {
-        return [];
-    }
-    return skillString
-        .split(/[,，]/)
-        .map(item => item.trim())
-        .filter(item => item.length > 0);
-}
-
-async function fetchTargetCareerOptions(keyword = '') {
-    try {
-        const response = await getJobPathPage({
-            jobName: keyword,
-            pageNo: 1,
-            pageSize: 100
-        });
-        
-        const list = response?.data?.list || response?.list || [];
-        
-        targetCareerOptions.value = list.map(item => ({
-            label: item.endJob || item.startJob || '未知职位',
-            value: item.id,
-            startJob: item.startJob,
-            endJob: item.endJob,
-            jobOrder: item.jobOrder
-        }));
-
-        if (targetCareerOptions.value.length === 0) {
-            selectedTargetIndex.value = -1;
-            selectedJobPathId.value = null;
-        }
-    } catch (error) {
-        targetCareerOptions.value = [];
-        selectedTargetIndex.value = -1;
-        selectedJobPathId.value = null;
-        uni.showToast({
-            title: '职业路径列表获取失败',
-            icon: 'none'
-        });
-    }
-}
-
-async function fetchPathCount() {
-    try {
-        const response = await getJobPathNum();
-        totalPathCount.value = response?.data ?? 0;
-    } catch (error) {
-        totalPathCount.value = 0;
-    }
-}
-
-async function loadPathDetail(jobPathId) {
-    if (!jobPathId || jobPathId === null || jobPathId === undefined || jobPathId === '') {
-        uni.showToast({
-            title: '职业路径ID无效',
-            icon: 'none'
-        });
-        localPathData.value = {
-            start: { title: '暂无数据', skills: [] },
-            steps: [],
-            end: { title: '暂无数据', skills: [] }
-        };
-        return;
-    }
-    
-    try {
-        const requestParams = {
-            jobPathId: jobPathId
-        };
-        
-        const response = await getJobPathDetail(requestParams);
-        
-        const details = Array.isArray(response?.data) ? response.data : [];
-        
-        if (details.length === 0) {
-            localPathData.value = {
-                start: { title: '暂无数据', skills: [] },
-                steps: [],
-                end: { title: '暂无数据', skills: [] }
-            };
-            uni.showToast({
-                title: '暂无职业路径数据',
-                icon: 'none'
-            });
-            return;
-        }
-
-        const normalized = details.map(item => ({
-            title: item?.name || '未命名职位',
-            skills: parseSkillList(item?.skillNameList)
-        }));
-
-        const start = normalized[0] || { title: '暂无数据', skills: [] };
-        const end = normalized[normalized.length - 1] || { title: '暂无数据', skills: [] };
-        const steps = normalized.slice(1, normalized.length - 1);
-
-        localPathData.value = {
-            start,
-            steps,
-            end
-        };
-        
-        // 通知父组件路径数据已更新
-        emit('path-data-updated', {
-            pathData: localPathData.value,
-            targetCareer: targetCareerOptions.value[selectedTargetIndex.value]?.label || ''
-        });
-    } catch (error) {
-        uni.showToast({
-            title: '获取路径详情失败',
-            icon: 'none'
-        });
-        localPathData.value = {
-            start: { title: '暂无数据', skills: [] },
-            steps: [],
-            end: { title: '暂无数据', skills: [] }
-        };
-        emit('path-data-updated', {
-            pathData: localPathData.value,
-            targetCareer: ''
-        });
-    }
-}
-
-function handleTargetChange(e) {
-    const index = Number(e.detail.value);
-    selectedTargetIndex.value = index;
-    const option = targetCareerOptions.value[index];
-    selectedJobPathId.value = option ? option.value : null;
-    // 重新选择目标职业时，重置查询状态和技能列表
-    hasQueried.value = false;
-    skillList.value = [];
-}
-
-async function handleQuery() {
-    if (selectedTargetIndex.value < 0) {
-        uni.showToast({
-            title: '请选择目标职业',
-            icon: 'none'
-        });
-        return;
-    }
-
-    const option = targetCareerOptions.value[selectedTargetIndex.value];
-    if (!option) {
-        uni.showToast({
-            title: '目标职业数据异常',
-            icon: 'none'
-        });
-        return;
-    }
-
-    // 获取技能权重数据
-    await fetchSkillWeight();
-}
-
-// 获取技能权重数据
-async function fetchSkillWeight() {
-    // 获取当前职位（使用界面上显示的值）
-    const currentJob = currentPosition.value || props.currentJobName || '';
-    
-    if (!currentJob) {
-        skillList.value = [];
-        uni.showToast({
-            title: '当前职位信息缺失',
-            icon: 'none'
-        });
-        return;
-    }
-    
-    // 获取目标职业（使用界面上选择的值）
-    const targetCareer = selectedTargetIndex.value >= 0 
-        ? targetCareerOptions.value[selectedTargetIndex.value]?.label 
-        : '';
-    
-    if (!targetCareer) {
-        skillList.value = [];
-        uni.showToast({
-            title: '请选择目标职业',
-            icon: 'none'
-        });
-        return;
-    }
-    
-    isLoadingSkills.value = true;
-    uni.showLoading({
-        title: '加载中...',
-        mask: true
-    });
-    
-    try {
-        const response = await getJobSkillWeight({
-            currentJobName: currentJob,
-            targetJobName: targetCareer
-        });
-        
-        // 标记已经查询过
-        hasQueried.value = true;
-        
-        // 处理接口返回的数据
-        const responseData = response?.data || response || [];
-        const dataItem = Array.isArray(responseData) ? responseData[0] : responseData;
-        
-        // 合并当前职位和目标职位的技能列表
-        const currentSkills = Array.isArray(dataItem?.currentSkillDetList) ? dataItem.currentSkillDetList : [];
-        const targetSkills = Array.isArray(dataItem?.targetSkillDetList) ? dataItem.targetSkillDetList : [];
-        const allSkills = [...currentSkills, ...targetSkills];
-        
-        // 转换为组件需要的格式
-        skillList.value = allSkills.map(item => ({
-            name: item?.skillName || item?.name || '',
-            weight: item?.skillWeight || item?.weight || '0',
-            score: item?.skillScore !== undefined && item?.skillScore !== null ? item.skillScore : 0,
-            tags: item?.tags || [],
-            currentLevel: item?.currentLevel || item?.level || 0
-        })).filter(item => item.name).sort((a, b) => {
-            // 按技能分数降序排序（skillScore）
-            const scoreA = parseFloat(a.score) || 0;
-            const scoreB = parseFloat(b.score) || 0;
-            return scoreB - scoreA;
-        });
-        
-        if (skillList.value.length === 0) {
-            uni.showToast({
-                title: '暂无技能数据',
-                icon: 'none'
-            });
-        }
-    } catch (error) {
-        // 查询失败也标记为已查询
-        hasQueried.value = true;
-        uni.showToast({
-            title: '获取技能权重失败',
-            icon: 'none'
-        });
-        skillList.value = [];
-    } finally {
-        isLoadingSkills.value = false;
-        uni.hideLoading();
-    }
-}
-
-onMounted(async () => {
-    await Promise.all([
-        fetchTargetCareerOptions(),
-        fetchPathCount()
-    ]);
-});
+const store = useSkillDevelopmentStore();
 </script>
 
+<template>
+<div class="skill-development">
+    <!-- 职业技能查询区域 -->
+    <div class="query-section">
+        <div class="section-title">
+            <uni-icons color="#286BFA" size="18" type="search"></uni-icons>
+            <span class="title-text">技能发展路径查询</span>
+        </div>
+        <div class="input-group">
+            <div class="input-item">
+                <span class="input-label">当前职位</span>
+                <picker @change="store.eventProfession" :value="store.professionIndex" :range="store.professionsRef" range-key="label">
+                    <div class="picker-field">
+                        <span :class="store.professionLabel ? 'picker-text' : 'picker-placeholder'">
+                            {{ store.professionLabel || '请选择目标职业' }}
+                        </span>
+                        <uni-icons color="#999999" size="16" type="down"></uni-icons>
+                    </div>
+                </picker>
+            </div>
+            <div class="input-item">
+                <span class="input-label">目标职业</span>
+                <picker :range="store.pathsRef" :value="store.targetCareerIndex" range-key="label" @change="store.eventTargetCareer">
+                    <div class="picker-field">
+                        <span :class="store.targetCareerLabel ? 'picker-text' : 'picker-placeholder'">
+                            {{ store.targetCareerLabel || '请选择目标职业' }}
+                        </span>
+                        <uni-icons color="#999999" size="16" type="down"></uni-icons>
+                    </div>
+                </picker>
+            </div>
+            <button class="query-btn" @click="store.eventSearch">
+                <span>查询技能发展路径</span>
+                <uni-icons color="#FFFFFF" size="18" type="search"></uni-icons>
+            </button>
+        </div>
+    </div>
+    <div v-if="store.careerPaths.length" class="content-section career-section">
+        <div class="section-title">
+            <span class="title-text">职业路径</span>
+        </div>
+        <div class="">
+            <scroll-view scroll-x>
+                <div class="career-paths">
+                    <template v-for="(item, index) in store.careerPaths" :key="item.label">
+                    <div
+                        :class="{ 'career-active': store.currentCareer && store.currentCareer.value === item.value }"
+                        class="career-path-item"
+                        @click="store.eventResult(index)"
+                    >
+                        <div
+                            class="career-index"
+                        >
+                            <span class="index">{{ item.index }}</span>
+                        </div>
+                        <div class="career-label">{{ item.label }}</div>
+                    </div>
+                    </template>
+                </div>
+            </scroll-view>
+        </div>
+    </div>
+    <div v-if="store.careerPaths.length" class="content-section">
+        <div class="section-title">
+            <uni-icons color="#000000" size="18" type="person-filled"></uni-icons>
+            <span class="title-text">{{ store.currentCareerLabel }}技能</span>
+        </div>
+        <div class="skill-list">
+            <div v-if="store.result.length === 0" class="empty-text">暂无数据</div>
+            <div v-for="(item, index) in store.result" :key="index" class="skill-card">
+                <div class="skill-label">{{ item.label }}</div>
+                <div class="skill-detail">
+                    <div v-for="d in item.children" :key="d.label" class="skill-detail-item">
+                        <div class="skill-detail-item-label">{{ d.label }}</div>
+                        <div class="skill-detail-item-value">
+                            <div class="value-item">技能得分：{{ d.value }}</div>
+                            <div class="value-item">权重：{{ d.weight }}</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</template>
+
 <style lang="scss" scoped>
 .skill-development {
     padding: 10rpx 28rpx 20rpx;
     background-color: #EBF4FF;
-    min-height:95%;
+    min-height: 95%;
 }
 
 .query-section {
@@ -385,7 +105,7 @@ onMounted(async () => {
     padding: 28rpx;
     margin-bottom: 20rpx;
     box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.08);
-    
+
     .section-title {
         margin-top: 0;
     }
@@ -395,6 +115,7 @@ onMounted(async () => {
     background-color: #FFFFFF;
     border-radius: 16rpx;
     padding: 28rpx;
+    margin-bottom: 20rpx;
     box-sizing: border-box;
     overflow: visible;
     box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.08);
@@ -407,12 +128,6 @@ onMounted(async () => {
     margin-bottom: 24rpx;
 }
 
-.input-item {
-    display: flex;
-    flex-direction: column;
-    gap: 12rpx;
-}
-
 .input-label {
     font-size: 28rpx;
     color: #000000;
@@ -428,44 +143,6 @@ onMounted(async () => {
     color: #666666;
 }
 
-.picker-field {
-    background-color: #F5F5F5;
-    border: 1rpx solid #E0E0E0;
-    border-radius: 12rpx;
-    padding: 20rpx 24rpx;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-}
-
-.picker-text {
-    font-size: 28rpx;
-    color: #000000;
-}
-
-.picker-placeholder {
-    font-size: 28rpx;
-    color: #999999;
-}
-
-.query-btn {
-    width: 100%;
-    height: 80rpx;
-    line-height: 40rpx;
-    border-radius: 20rpx;
-    background: linear-gradient(180deg, rgba(18, 125, 240, 1) 0%, rgba(59, 14, 123, 0.71) 100%);
-    color: rgba(255, 255, 255, 1);
-    font-size: 28rpx;
-    text-align: center;
-    font-family: '阿里巴巴普惠体3.0-regular', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
-    border: 2rpx solid rgba(187, 187, 187, 1);
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    gap: 12rpx;
-    padding: 0;
-}
-
 .path-summary {
     margin-top: 16rpx;
     font-size: 24rpx;
@@ -478,125 +155,201 @@ button::after {
 }
 
 .section-title {
+    font-size: 32rpx;
+    color: #000000;
     display: flex;
     align-items: center;
     gap: 12rpx;
     margin-bottom: 24rpx;
-    
+
     .content-section & {
         margin-top: 0;
     }
 }
 
+.career-paths {
+    display: grid;
+    grid-auto-flow: column;
+    gap: 20px;
+    padding-bottom: 10px;
+
+    .career-path-item {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        width: 80px;
+        padding: 5px;
+        font-weight: 700;
+        cursor: pointer;
+
+        .career-index {
+            position: relative;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            width: 48px;
+            height: 48px;
+            font-size: 20px;
+            color: #fff;
+            border-radius: 50%;
+
+            .index {
+                position: relative;
+                z-index: 10;
+            }
+
+            &:before,
+            &:after {
+                content: '';
+                position: absolute;
+            }
+
+            &:before {
+                inset: 0;
+                z-index: 1;
+                background: #6c64e7;
+                border: 3px solid #fff;
+                border-radius: 50%;
+                box-shadow: 0 1px 5px rgba(0, 0, 0, 0.3);
+            }
+
+            &:after {
+                content: '';
+                position: absolute;
+                top: 50%;
+                right: 50%;
+                z-index: 0;
+                width: 100px;
+                border-bottom: 4px solid #ccc;
+            }
+        }
+
+        .career-label {
+            margin-top: 10px;
+            font-size: 16px;
+            text-align: center;
+            color: #6c64e7;
+        }
+
+        &.career-active {
+            .career-index {
+                &:before {
+                    background: #22c55e;
+                }
+                &:after {
+                    border-color: #22c55e;
+                }
+            }
+
+            .career-label {
+                color: #000;
+            }
+
+            & + .career-path-item {
+                .career-index {
+                    &:after {
+                        border-color: #22c55e;
+                    }
+                }
+            }
+        }
+
+        &:first-child {
+            .career-index {
+                font-size: 16px;
+
+                &:after {
+                    display: none;
+                }
+            }
+        }
+
+        &:last-child {
+            .career-index {
+                font-size: 16px;
+            }
+        }
+    }
+}
+
+</style>
+
+<style lang="scss" scoped>
 .title-text {
     font-size: 32rpx;
     font-weight: 600;
     color: #167CF1;
 }
 
-.intro-text {
-    font-size: 24rpx;
-    line-height: 34rpx;
-    color: rgba(154, 154, 154, 1);
-    text-align: left;
-    font-family: 'PingFangSC-Bold', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
-    font-weight: 600;
-    margin-bottom: 90rpx;
-    width: 672rpx;
-}
-
-.skill-list {
-    display: flex;
-    flex-direction: column;
-    gap: 20rpx;
-}
-
-.skill-item {
-    width: 100%;
-    max-width: 796rpx;
-    min-height: 162rpx;
-    line-height: 40rpx;
-    border-radius: 20rpx;
-    background-color: rgba(239, 239, 239, 1);
-    color: rgba(16, 16, 16, 1);
-    font-size: 28rpx;
-    text-align: center;
-    padding: 24rpx;
+.skill-card {
+    margin-bottom: 14px;
     box-sizing: border-box;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    overflow: visible;
-    position: relative;
+    font-weight: 700;
+
+    .skill-list {
+        display: flex;
+        flex-direction: column;
+        gap: 20rpx;
+    }
+
+    .skill-item {
+        width: 100%;
+        max-width: 796rpx;
+        min-height: 162rpx;
+        line-height: 40rpx;
+        border-radius: 20rpx;
+        background-color: rgba(239, 239, 239, 1);
+        color: rgba(16, 16, 16, 1);
+        font-size: 28rpx;
+        text-align: center;
+        padding: 24rpx;
+        box-sizing: border-box;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        overflow: visible;
+        position: relative;
+    }
+
+    .skill-label {
+        margin-bottom: 10px;
+        font-size: 16px;
+        color: #94a3b8;
+    }
+
+    .skill-detail {
+        display: flex;
+        flex-direction: column;
+        gap: 8px;
+
+        .skill-detail-item {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            padding: 8px;
+            border-radius: 3px;
+            background: #c1d2ea;
+        }
+
+        .skill-detail-item-label {
+            width: 55%;
+            word-wrap: break-word;
+            white-space: pre-wrap;
+            word-break: break-all;
+            color: #334155;
+        }
+
+        .skill-detail-item-value {
+            width: 45%;
+            padding-left: 6px;
+            color: #4f46e5;
+            box-sizing: border-box;
+
+            .value-item {
+                text-wrap: nowrap;
+            }
+        }
+    }
 }
 
-.skill-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 16rpx;
-    width: 100%;
-    box-sizing: border-box;
-}
-
-.skill-name {
-    font-size: 32rpx;
-    line-height: 46rpx;
-    color: rgb(16, 16, 16);
-    text-align: left;
-    font-family: 'PingFangSC-Bold', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
-    font-weight: 600;
-    flex: 1;
-    min-width: 0;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-
-.skill-info {
-    display: flex;
-    align-items: center;
-    gap: 12rpx;
-    flex-shrink: 0;
-    margin-left: 16rpx;
-}
-
-.skill-score {
-    font-size: 24rpx;
-    line-height: 34rpx;
-    border-radius: 10rpx;
-    background-color: rgba(49, 100, 239, 0.1);
-    color: rgba(44, 101, 247, 1);
-    text-align: center;
-    padding: 6rpx 12rpx;
-    white-space: nowrap;
-}
-
-.skill-weight {
-    font-size: 24rpx;
-    line-height: 34rpx;
-    border-radius: 10rpx;
-    background-color: rgba(49, 100, 239, 0.1);
-    color: rgba(44, 101, 247, 1);
-    text-align: center;
-    padding: 6rpx 12rpx;
-    white-space: nowrap;
-}
-
-.skill-tags {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 12rpx;
-}
-
-.skill-tag {
-    background-color: rgba(49, 100, 239, 0.1);
-    color: rgba(44, 101, 247, 1);
-    padding: 6rpx 12rpx;
-    border-radius: 8rpx;
-    font-size: 24rpx;
-    line-height: 34rpx;
-    text-align: center;
-    white-space: nowrap;
-}
 </style>
diff --git a/static/tabbar/robot2.png b/static/tabbar/robot2.png
new file mode 100644
index 0000000..ed89ff6
Binary files /dev/null and b/static/tabbar/robot2.png differ
diff --git a/stores/useCareerPathStore.js b/stores/useCareerPathStore.js
new file mode 100644
index 0000000..2f4a6dd
--- /dev/null
+++ b/stores/useCareerPathStore.js
@@ -0,0 +1,233 @@
+import { computed, ref, watch } from 'vue';
+import { defineStore, storeToRefs } from 'pinia';
+import useUserStore from '@/stores/useUserStore';
+import { getCurrentPosition, getPath, getPathDetail } from '@/apiRc/service/careerPath';
+
+
+export const useCareerPathStore = defineStore('career-path', () => {
+    const { userInfo: ui } = storeToRefs(useUserStore());
+    const userInfo = ref({
+        userName: '',
+        professions: [],
+        skills: []
+    });
+
+    watch(() => ui.value, () => {
+        if (!ui.value) {
+            return;
+        }
+        try {
+            const { jobTitle, appSkillsList } = ui.value;
+
+            userInfo.value.professions = jobTitle.map((d) => {
+                return {
+                    label: d,
+                    value: d
+                };
+            });
+            userInfo.value.skills = appSkillsList.map((d) => {
+                return {
+                    label: d.name,
+                    value: d.name
+                };
+            });
+        } catch (e) {
+            console.warn(e);
+        }
+    }, {
+        immediate: true,
+        deep: true
+    });
+
+    const professionIndex = ref(0);
+    const profession = ref('');
+    const professionLabel = ref('');
+    const professions = ref([]);
+    const professionsRef = computed(() => {
+        if (!userInfo.value || !userInfo.value.professions || userInfo.value.professions.length === 0) {
+            return professions.value;
+        }
+        const userProfessionsLabels = userInfo.value.professions.map((d) => d.label);
+        let professionsA = [];
+        let professionsB = [];
+        professions.value.filter((d) => userProfessionsLabels.includes(d.label));
+        for (const d of professions.value) {
+            if (userProfessionsLabels.includes(d.label)) {
+                professionsA.push(d);
+            } else {
+                professionsB.push(d);
+            }
+        }
+        if (professionsA.length === 0) {
+            professionsA = userInfo.value.professions;
+            professionsB = professions.value;
+        }
+        return [ ...professionsA, ...professionsB ];
+    });
+
+    const targetCareerIndex = ref(0);
+    const targetCareer = ref('');
+    const targetCareerLabel = ref('');
+    const paths = ref([]);
+    const pathsRef = computed(() => {
+        return paths.value.filter((d) => {
+            return `${ d.startJobId }` === profession.value;
+        });
+    });
+
+    const result = ref([]);
+
+    const fetchData = async () => {
+        try {
+            const { code, msg, data } = await getCurrentPosition();
+            if (code !== 0) {
+                uni.showToast({
+                    title: msg,
+                    icon: 'none'
+                });
+                return;
+            }
+            if (!data) {
+                return;
+            }
+            professions.value = data.map((d) => {
+                return {
+                    label: d.name,
+                    value: `${ d.jobId }`
+                };
+            });
+        } catch (e) {
+            console.warn(e);
+        }
+    };
+
+    const fetchDataPath = async () => {
+        try {
+            const { code, msg, data } = await getPath();
+            if (code !== 0) {
+                uni.showToast({
+                    title: msg,
+                    icon: 'none'
+                });
+                return;
+            }
+            if (!data) {
+                return;
+            }
+            paths.value = data.map((d) => {
+                return {
+                    label: d.endJob,
+                    value: `${ d.startJobId }-${ d.endJobId }`,
+                    startJobId: d.startJobId
+                };
+            });
+        } catch (e) {
+            console.warn(e);
+        }
+    };
+
+    const fetchResult = async () => {
+        if (!targetCareer.value) {
+            return;
+        }
+        const [ startJobId, endJobId ] = targetCareer.value.split('-');
+        const params = {
+            startJobId: Number(startJobId),
+            endJobId: Number(endJobId)
+        };
+        try {
+            const { code, msg, data } = await getPathDetail(params);
+            if (code !== 0) {
+                uni.showToast({
+                    title: msg,
+                    icon: 'none'
+                });
+                return;
+            }
+            if (!data) {
+                return;
+            }
+            result.value = data.map((d, i) => {
+                return {
+                    type: i === 0 ? 'start' : i === data.length - 1 ? 'end' : 'step',
+                    step: i,
+                    title: d.name,
+                    tags: d.skillNameList.split(',')
+                };
+            });
+        } catch (e) {
+            console.warn(e);
+        }
+    };
+
+    const eventSearch = () => {
+        if (pathsRef.value.length === 0) {
+            uni.showToast({
+                title: '当前职业暂无发展路径，敬请期待！',
+                icon: 'none'
+            });
+            return;
+        }
+        if (!profession.value) {
+            uni.showToast({
+                title: '请选择当前职位！',
+                icon: 'none'
+            });
+            return;
+        }
+        if (!targetCareer.value) {
+            uni.showToast({
+                title: '请选择目标职业！',
+                icon: 'none'
+            });
+            return;
+        }
+        void fetchResult();
+    };
+
+    const eventProfession = (e) => {
+        professionIndex.value = Number(e.detail.value);
+        const item = professionsRef.value[e.detail.value]
+        profession.value = item.value;
+        professionLabel.value = item.label;
+        targetCareer.value = '';
+        targetCareerLabel.value = '';
+        result.value = [];
+    };
+
+    const eventTargetCareer = (e) => {
+        targetCareerIndex.value = Number(e.detail.value);
+        const item = pathsRef.value[e.detail.value]
+        targetCareer.value = item.value;
+        targetCareerLabel.value = item.label;
+        result.value = [];
+    };
+
+    void fetchData();
+    void fetchDataPath();
+
+    watch(
+        () => professionsRef.value,
+        () => {
+            if (professionsRef.value[ 0 ]) {
+                profession.value = professionsRef.value[ 0 ].value;
+                professionLabel.value = professionsRef.value[ 0 ].label;
+            }
+        }
+    );
+
+    return {
+        professionIndex,
+        professionLabel,
+        profession,
+        professionsRef,
+        targetCareerIndex,
+        targetCareer,
+        targetCareerLabel,
+        pathsRef,
+        result,
+        eventProfession,
+        eventTargetCareer,
+        eventSearch
+    };
+});
diff --git a/stores/useCareerRecommendationStore.js b/stores/useCareerRecommendationStore.js
new file mode 100644
index 0000000..519c7dd
--- /dev/null
+++ b/stores/useCareerRecommendationStore.js
@@ -0,0 +1,197 @@
+import { computed, ref, watch } from 'vue';
+import { defineStore, storeToRefs } from 'pinia';
+import useUserStore from '@/stores/useUserStore';
+import { getProfessions, getRecommend, getSkillTags } from '@/apiRc/service/careerRecommendation';
+
+
+export const useCareerRecommendationStore = defineStore('career-recommendation', () => {
+    const { userInfo: ui } = storeToRefs(useUserStore());
+    const userInfo = ref({
+        userName: '',
+        professions: [],
+        skills: []
+    });
+
+    watch(() => ui.value, () => {
+        if (!ui.value) {
+            return;
+        }
+        try {
+            const { jobTitle, appSkillsList } = ui.value;
+
+            userInfo.value.professions = jobTitle.map((d) => {
+                return {
+                    label: d,
+                    value: d
+                };
+            });
+            userInfo.value.skills = appSkillsList.map((d) => {
+                return {
+                    label: d.name,
+                    value: d.name
+                };
+            });
+        } catch (e) {
+            console.warn(e);
+        }
+    }, {
+        immediate: true,
+        deep: true
+    });
+
+    const professionIndex = ref(0);
+    const profession = ref('');
+    const professionLabel = ref('');
+    const professions = ref([]);
+    const professionsRef = computed(() => {
+        if (!userInfo.value || !userInfo.value.professions || userInfo.value.professions.length === 0) {
+            return professions.value;
+        }
+        const userProfessionsLabels = userInfo.value.professions.map((d) => d.label);
+        let professionsA = [];
+        let professionsB = [];
+        professions.value.filter((d) => userProfessionsLabels.includes(d.label));
+        for (const d of professions.value) {
+            if (userProfessionsLabels.includes(d.label)) {
+                professionsA.push(d);
+            } else {
+                professionsB.push(d);
+            }
+        }
+        if (professionsA.length === 0) {
+            professionsA = userInfo.value.professions;
+            professionsB = professions.value;
+        }
+        return [ ...professionsA, ...professionsB ];
+    });
+
+    const skills = ref([]);
+    const skillTags = computed(() => {
+        if (userInfo.value.professions[ 0 ] && professionLabel.value === userInfo.value.professions[ 0 ].value) {
+            return userInfo.value.skills.map((d) => d.label);
+        }
+        return skills.value;
+    });
+
+    const result = ref([]);
+
+    const fetchData = async () => {
+        try {
+            const { code, msg, data } = await getProfessions();
+            if (code !== 0) {
+                uni.showToast({
+                    title: msg,
+                    icon: 'none'
+                });
+                return;
+            }
+            if (!data) {
+                return;
+            }
+            professions.value = data.map((d) => {
+                return {
+                    label: d.name,
+                    value: d.name
+                };
+            });
+        } catch (e) {
+            console.warn(e);
+        }
+    };
+
+    const fetchSkillTags = async () => {
+        const params = {
+            jobName: professionLabel.value
+        };
+        try {
+            const { code, msg, data } = await getSkillTags(params);
+            if (code !== 0) {
+                uni.showToast({
+                    title: msg,
+                    icon: 'none'
+                });
+                return;
+            }
+            if (typeof data !== 'undefined' && Array.isArray(data) && data.length > 0 && data[ 0 ]) {
+                skills.value = data[ 0 ].skillDetList.map((d) => d.skillName);
+            }
+        } catch (e) {
+            console.warn(e);
+        }
+    };
+
+    const fetchRecommend = async () => {
+        const params = {
+            jobName: professionLabel.value
+        };
+        try {
+            const { code, msg, data } = await getRecommend(params);
+            if (code !== 0) {
+                uni.showToast({
+                    title: msg,
+                    icon: 'none'
+                });
+                return;
+            }
+            if (!data) {
+                return;
+            }
+            result.value = data.map((d) => {
+                return {
+                    title: d.jobName,
+                    tags: d.skillList.map((d) => d.skillName),
+                    percentage: d.similarityScore ?? 0
+                };
+            });
+        } catch (e) {
+            console.warn(e);
+        }
+    };
+
+    const eventSearch = () => {
+        void fetchRecommend();
+    };
+
+    const eventProfession = (e) => {
+        professionIndex.value = Number(e.detail.value);
+        const item = professionsRef.value[ e.detail.value ];
+        profession.value = item.value;
+        professionLabel.value = item.label;
+    };
+
+    void fetchData();
+
+    watch(
+        () => profession.value,
+        () => {
+            if (profession.value) {
+                void fetchSkillTags();
+                result.value = [];
+            }
+        },
+        {
+            immediate: true
+        }
+    );
+
+    watch(
+        () => professionsRef.value,
+        () => {
+            if (professionsRef.value[ 0 ]) {
+                profession.value = professionsRef.value[ 0 ].value;
+                professionLabel.value = professionsRef.value[ 0 ].label;
+            }
+        }
+    );
+
+    return {
+        professionIndex,
+        profession,
+        professionLabel,
+        professionsRef,
+        skillTags,
+        result,
+        eventProfession,
+        eventSearch
+    };
+});
diff --git a/stores/useDictStore.js b/stores/useDictStore.js
index eeead1d..f74bac9 100644
--- a/stores/useDictStore.js
+++ b/stores/useDictStore.js
@@ -50,7 +50,7 @@ const useDictStore = defineStore("dict", () => {
                     return data
                 })
             }
-            const [education, experience, area, scale, sex, affiliation, nature, noticeType] =
+            const [education, experience, area, scale, sex, affiliation, nature, noticeType] = 
             await Promise.all([
                 getDictSelectOption('education'),
                 getDictSelectOption('experience'),
@@ -74,6 +74,17 @@ const useDictStore = defineStore("dict", () => {
             getIndustryDict() // 获取行业
         } catch (error) {
             console.error('Error fetching dictionary data:', error);
+            // 确保即使出错也能返回空数组
+            if (!dictType && !dictName) {
+                state.education = [];
+                state.experience = [];
+                state.area = [];
+                state.scale = [];
+                state.sex = [];
+                state.affiliation = [];
+                state.nature = [];
+                state.noticeType = [];
+            }
         }
     };
 
@@ -97,31 +108,31 @@ const useDictStore = defineStore("dict", () => {
         return null
     }
 
-    function dictLabel(dictType, value) {
-        if (state[dictType] && Array.isArray(state[dictType])) {
-            for (let i = 0; i < state[dictType].length; i++) {
-                let element = state[dictType][i];
-                if (element.value === value) {
-                    return element.label
-                }
-            }
-        }
-        return ''
+    function dictLabel(dictType, value) {
+        if (state[dictType] && Array.isArray(state[dictType])) {
+            for (let i = 0; i < state[dictType].length; i++) {
+                let element = state[dictType][i];
+                if (element.value === value) {
+                    return element.label
+                }
+            }
+        }
+        return ''
     }
 
-    function oneDictData(dictType, value) {
-        if (!value) {
-            return state[dictType]
-        }
-        if (state[dictType]) {
-            for (let i = 0; i < state[dictType].length; i++) {
-                let element = state[dictType][i];
-                if (element.value === value) {
-                    return element
-                }
-            }
-        }
-        return null
+    function oneDictData(dictType, value) {
+        if (!value) {
+            return state[dictType]
+        }
+        if (state[dictType]) {
+            for (let i = 0; i < state[dictType].length; i++) {
+                let element = state[dictType][i];
+                if (element.value === value) {
+                    return element
+                }
+            }
+        }
+        return null
     }
 
     function getTransformChildren(dictType, title = '', key = '') {
@@ -129,7 +140,7 @@ const useDictStore = defineStore("dict", () => {
             return {
                 label: title,
                 key: key || dictType,
-                options: state[dictType],
+                options: state[dictType] || [],
             }
         }
         return null
diff --git a/stores/useSkillDevelopmentStore.js b/stores/useSkillDevelopmentStore.js
new file mode 100644
index 0000000..6bda9fe
--- /dev/null
+++ b/stores/useSkillDevelopmentStore.js
@@ -0,0 +1,303 @@
+import { computed, ref, watch } from 'vue';
+import { defineStore, storeToRefs } from 'pinia';
+import useUserStore from '@/stores/useUserStore';
+import { getCurrentPosition, getPath } from '@/apiRc/service/careerPath';
+import { getCareerPath, getSkillResult } from '@/apiRc/service/skillDevelopment';
+
+
+export const useSkillDevelopmentStore = defineStore('skill-development', () => {
+    const { userInfo: ui } = storeToRefs(useUserStore());
+    const userInfo = ref({
+        userName: '',
+        professions: [],
+        skills: []
+    });
+
+    watch(() => ui.value, () => {
+        if (!ui.value) {
+            return;
+        }
+        try {
+            const { jobTitle, appSkillsList } = ui.value;
+
+            userInfo.value.professions = jobTitle.map((d) => {
+                return {
+                    label: d,
+                    value: d
+                };
+            });
+            userInfo.value.skills = appSkillsList.map((d) => {
+                return {
+                    label: d.name,
+                    value: d.name
+                };
+            });
+        } catch (e) {
+            console.warn(e);
+        }
+    }, {
+        immediate: true,
+        deep: true
+    });
+
+    const professionIndex = ref(0);
+    const profession = ref('');
+    const professionLabel = ref('');
+    const professions = ref([]);
+    const professionsRef = computed(() => {
+        if (!userInfo.value || !userInfo.value.professions || userInfo.value.professions.length === 0) {
+            return professions.value;
+        }
+        const userProfessionsLabels = userInfo.value.professions.map((d) => d.label);
+        let professionsA = [];
+        let professionsB = [];
+        professions.value.filter((d) => userProfessionsLabels.includes(d.label));
+        for (const d of professions.value) {
+            if (userProfessionsLabels.includes(d.label)) {
+                professionsA.push(d);
+            } else {
+                professionsB.push(d);
+            }
+        }
+        if (professionsA.length === 0) {
+            professionsA = userInfo.value.professions;
+            professionsB = professions.value;
+        }
+        return [ ...professionsA, ...professionsB ];
+    });
+
+    const targetCareerIndex = ref(0);
+    const targetCareer = ref('');
+    const targetCareerLabel = ref('');
+    const paths = ref([]);
+    const pathsRef = computed(() => {
+        return paths.value.filter((d) => {
+            const [startJobId] = d.value.split('-');
+            return startJobId === profession.value;
+        });
+    });
+
+    const careerPaths = ref([]);
+    const currentCareer = ref(null);
+    const currentCareerIndex = ref(0);
+    const currentCareerLabel = computed(() => {
+        if (!currentCareer.value) {
+            return '';
+        }
+        return currentCareer.value.label;
+    });
+
+    const result = ref([]);
+
+    const fetchData = async () => {
+        try {
+            const { code, msg, data } = await getCurrentPosition();
+            if (code !== 0) {
+                uni.showToast({
+                    title: msg,
+                    icon: 'none'
+                });
+                return;
+            }
+            if (!data) {
+                return;
+            }
+            professions.value = data.map((d) => {
+                return {
+                    label: d.name,
+                    value: `${ d.jobId }`
+                };
+            });
+        } catch (e) {
+            console.warn(e);
+        }
+    };
+
+    const fetchDataPath = async () => {
+        try {
+            const { code, msg, data } = await getPath();
+            if (code !== 0) {
+                uni.showToast({
+                    title: msg,
+                    icon: 'none'
+                });
+                return;
+            }
+            if (!data) {
+                return;
+            }
+            paths.value = data.map((d) => {
+                return {
+                    label: d.endJob,
+                    value: `${d.startJobId}-${d.endJobId}`
+
+                };
+            });
+        } catch (e) {
+            console.warn(e);
+        }
+    };
+
+    const fetchCareerPaths = async () => {
+        if (!targetCareer.value) {
+            return;
+        }
+        const [startJobId, endJobId] = targetCareer.value.split('-');
+        const params = {
+            startJobId,
+            endJobId
+        };
+        try {
+            const { code, msg, data } = await getCareerPath(params);
+            if (code !== 0) {
+                uni.showToast({
+                    title: msg,
+                    icon: 'none'
+                });
+                return;
+            }
+            if (!data) {
+                return;
+            }
+            careerPaths.value = data.map((d, i) => {
+                let index = `${i}`;
+                let fontSize = 26;
+                if (i === 0) {
+                    index = '起点';
+                    fontSize = 18;
+                }
+                if (i === data.length - 1) {
+                    index = '终点';
+                    fontSize = 18;
+                }
+                return {
+                    index,
+                    label: d.name,
+                    value: d.jobId,
+                    fontSize
+                };
+            });
+            if (careerPaths.value[0]) {
+                void eventResult(0);
+            }
+        } catch (e) {
+            console.warn(e);
+            careerPaths.value = [];
+        }
+    };
+
+    const eventResult = async (index) => {
+        currentCareerIndex.value = index;
+        currentCareer.value = careerPaths.value[index] ?? null;
+
+        const params = {
+            jobId: currentCareer.value?.value
+        };
+        try {
+            const { code, msg, data } = await getSkillResult(params);
+            if (code !== 0) {
+                uni.showToast({
+                    title: msg,
+                    icon: 'none'
+                });
+                return;
+            }
+            if (!data) {
+                return;
+            }
+            result.value = data.map((d) => {
+                return {
+                    label: d.secDimName,
+                    value: d.secDimId,
+                    children: d.skillDetList.map((d) => {
+                        return {
+                            label: d.skillName,
+                            value: d.skillScore,
+                            weight: d.skillWeight
+                        };
+                    })
+                };
+            });
+        } catch (e) {
+            console.warn(e);
+        }
+    };
+
+    const eventSearch = () => {
+        if (pathsRef.value.length === 0) {
+            uni.showToast({
+                title: '当前职业暂无发展路径，敬请期待！',
+                icon: 'none'
+            });
+            return;
+        }
+        if (!profession.value) {
+            uni.showToast({
+                title: '请选择当前职位！',
+                icon: 'none'
+            });
+            return;
+        }
+        if (!targetCareer.value) {
+            uni.showToast({
+                title: '请选择目标职业！',
+                icon: 'none'
+            });
+            return;
+        }
+        void fetchCareerPaths();
+    };
+
+    const eventProfession = (e) => {
+        professionIndex.value = Number(e.detail.value);
+        const item = professionsRef.value[ e.detail.value ];
+        profession.value = item.value;
+        professionLabel.value = item.label;
+        targetCareer.value = '';
+        targetCareerLabel.value = '';
+        careerPaths.value = [];
+        result.value = [];
+    };
+
+    const eventTargetCareer = (e) => {
+        targetCareerIndex.value = Number(e.detail.value);
+        const item = pathsRef.value[ e.detail.value ];
+        targetCareer.value = item.value;
+        targetCareerLabel.value = item.label;
+        careerPaths.value = [];
+        result.value = [];
+    };
+
+    void fetchData();
+    void fetchDataPath();
+
+    watch(
+        () => professionsRef.value,
+        () => {
+            if (professionsRef.value[ 0 ]) {
+                profession.value = professionsRef.value[ 0 ].value;
+                professionLabel.value = professionsRef.value[ 0 ].label;
+            }
+        }
+    );
+
+    return {
+        professionIndex,
+        professionLabel,
+        profession,
+        professionsRef,
+        targetCareerIndex,
+        targetCareer,
+        targetCareerLabel,
+        pathsRef,
+        careerPaths,
+        currentCareer,
+        currentCareerLabel,
+        currentCareerIndex,
+        result,
+        eventProfession,
+        eventTargetCareer,
+        eventSearch,
+        eventResult
+    };
+});
diff --git a/stores/useUserStore.js b/stores/useUserStore.js
index 5fc5864..9388388 100644
--- a/stores/useUserStore.js
+++ b/stores/useUserStore.js
@@ -74,10 +74,17 @@ const useUserStore = defineStore("user", () => {
         uni.removeStorageSync('token')
         uni.removeStorageSync('Padmin-Token')
         // 如果需要显示登录弹窗，则通过事件通知页面显示微信登录弹窗
-        if (showLoginModal) {
-            // 通过 uni.$emit 发送全局事件，通知页面显示登录弹窗
-            uni.$emit('showLoginModal');
-        }
+        // if (showLoginModal) {
+        //     // 通过 uni.$emit 发送全局事件，通知页面显示登录弹窗
+        //     uni.$emit('showLoginModal');
+        // }
+        //#ifdef H5
+        // 跳转到首页
+        window.location.href = 'https://www.xjksly.cn/mechine-single-vue/';
+        //#endif
+         uni.reLaunch({
+            url: '/pages/index/index'
+        });
     }
 
     const getUserInfo = () => {
@@ -96,7 +103,13 @@ const useUserStore = defineStore("user", () => {
                 similarityJobs.setUserInfo(resume.data)
                 setUserInfo(resume);
                 reslove(resume)
-            }).catch(() => reject());
+            }).catch((error) => {
+                // 对于企业用户，简历接口可能失败，但这不应该阻止登录流程
+                // 记录错误但不reject，让登录流程继续
+                console.warn('获取简历信息失败，可能是企业用户或无简历信息:', error);
+                // 返回一个空的简历对象，让登录流程继续
+                reslove({ data: {} });
+            });
         })
     }
 
diff --git a/stores/userChatGroupStore.js b/stores/userChatGroupStore.js
index 9eb330f..edeab52 100644
--- a/stores/userChatGroupStore.js
+++ b/stores/userChatGroupStore.js
@@ -113,13 +113,19 @@ const useChatGroupDBStore = defineStore("messageGroup", () => {
             try {
                 toggleTyping(true);
                 const customDataID = 'message_' + UUID.generate()
+                
+                // 对话历史管理：只保留最近的N条消息，防止token超限
+                // 计算消息数量，只保留最近的10条消息（可根据实际情况调整）
+                const MAX_HISTORY_MESSAGES = 10;
+                const historyMessages = messages.value.slice(-MAX_HISTORY_MESSAGES);
+                
                 const params = {
                     data: text,
                     sessionId: chatSessionID.value,
                     dataId: customDataID
                 };
                 if (fileUrls && fileUrls.length) {
-                    params['fileUrl'] = fileUrls.map((item) => item.url);
+                    params['fileUrl'] = fileUrls.map((item) => item.serverPath || item.url);
                 }
                 // ------>
                 const MsgData = {
@@ -329,6 +335,72 @@ const useChatGroupDBStore = defineStore("messageGroup", () => {
         }))
     }
 
+    // 删除消息
+    async function deleteMessages(indices) {
+        // 按索引从大到小排序，避免删除时索引变化
+        const sortedIndices = [...indices].sort((a, b) => b - a);
+        
+        // 从内存中删除消息
+        for (const index of sortedIndices) {
+            const message = messages.value[index];
+            if (message && message.id) {
+                // 从本地数据库中删除
+                await baseDB.db.delete(massageName.value, message.id);
+            }
+            messages.value.splice(index, 1);
+        }
+    }
+
+    // 删除会话
+    async function deleteDialogue(sessionId) {
+        if (!baseDB.isDBReady) await baseDB.initDB();
+        
+        // 删除会话下的所有消息
+        const messageList = await baseDB.db.queryByField(massageName.value, 'parentGroupId', sessionId);
+        for (const message of messageList) {
+            if (message.id) {
+                await baseDB.db.delete(massageName.value, message.id);
+            }
+        }
+        
+        // 删除会话本身
+        const sessionList = await baseDB.db.queryByField(tableName.value, 'sessionId', sessionId);
+        for (const session of sessionList) {
+            if (session.id) {
+                await baseDB.db.delete(tableName.value, session.id);
+            }
+        }
+        
+        // 重新获取所有会话并重新分组
+        const allSessions = await baseDB.db.getAll(tableName.value);
+        if (allSessions.length) {
+            const [result, lastData] = insertSortData(allSessions);
+            tabeList.value = result;
+        } else {
+            tabeList.value = [];
+        }
+        
+        // 如果删除的是当前会话，切换到第一个会话或清空
+        if (chatSessionID.value === sessionId) {
+            if (tabeList.value.length > 0) {
+                // 找到第一个非标题的会话
+                const firstSession = tabeList.value.find(item => !item.isTitle);
+                if (firstSession) {
+                    chatSessionID.value = firstSession.sessionId;
+                    await initMessage(firstSession.sessionId);
+                } else {
+                    // 没有会话了
+                    chatSessionID.value = '';
+                    messages.value = [];
+                }
+            } else {
+                // 没有会话了
+                chatSessionID.value = '';
+                messages.value = [];
+            }
+        }
+    }
+
     return {
         messages,
         isTyping,
@@ -342,7 +414,9 @@ const useChatGroupDBStore = defineStore("messageGroup", () => {
         changeDialogue,
         getStearm,
         getHistory,
-        badFeedback
+        badFeedback,
+        deleteMessages,
+        deleteDialogue
     };
 });
 
diff --git a/uni_modules/custom-waterfalls-flow/components/custom-waterfalls-flow/custom-waterfalls-flow.vue b/uni_modules/custom-waterfalls-flow/components/custom-waterfalls-flow/custom-waterfalls-flow.vue
index c4eb37c..3a7ca4f 100644
--- a/uni_modules/custom-waterfalls-flow/components/custom-waterfalls-flow/custom-waterfalls-flow.vue
+++ b/uni_modules/custom-waterfalls-flow/components/custom-waterfalls-flow/custom-waterfalls-flow.vue
@@ -100,7 +100,7 @@ export default {
         return {
             data: {
                 list: this.value ? this.value : [],
-                column: this.column < 2 ? 2 : this.column,
+                column: this.column < 1 ? 1 : this.column,
                 columnSpace: this.columnSpace <= 5 ? this.columnSpace : 5,
                 imageKey: this.imageKey,
                 seat: this.seat,
@@ -179,7 +179,7 @@ export default {
                 this.isRefresh = true;
                 this.adds = [];
                 this.data.list = this.value ? this.value : [];
-                this.data.column = this.column < 2 ? 2 : this.column >= this.maxColumn ? this.maxColumn : this.column;
+                this.data.column = this.column < 1 ? 1 : this.column >= this.maxColumn ? this.maxColumn : this.column;
                 this.data.columnSpace = this.columnSpace <= 5 ? this.columnSpace : 5;
                 this.data.imageKey = this.imageKey;
                 this.data.seat = this.seat;
diff --git a/utils/loginHelper.js b/utils/loginHelper.js
index 919567d..4f19bb3 100644
--- a/utils/loginHelper.js
+++ b/utils/loginHelper.js
@@ -44,24 +44,11 @@ export function navigateToLoginPage(options = {}) {
     
     switch (platform) {
         case 'mp-weixin':
-            // 小程序端使用微信授权登录，直接显示微信授权弹窗
-            uni.$emit('showLoginModal', { loginType: 'wechat' });
-            return;
-            
-        case 'h5':
-            if (loginType === 'idCard') {
-                // H5端身份证号码登录
-                loginPage = '/pages/login/id-card-login';
-            } else {
-                // H5端账号密码登录
-                loginPage = '/pages/login/h5-login';
-            }
-            break;
-            
         case 'app':
-            // App端使用微信授权登录
-            uni.$emit('showLoginModal', { loginType: 'wechat' });
-            return;
+        case 'h5':
+            // 跳转到微信登录页面
+            loginPage = '/pages/login/wx-login';
+            break;
             
         default:
             loginPage = '/pages/login/h5-login';
diff --git a/utils/markdownParser.js b/utils/markdownParser.js
index 1611be9..59e91b0 100644
--- a/utils/markdownParser.js
+++ b/utils/markdownParser.js
@@ -1,135 +1,195 @@
-import MarkdownIt from '@/lib/markdown-it.min.js';
-import hljs from "@/lib/highlight/highlight-uni.min.js";
-import parseHtml from '@/lib/html-parser.js';
-// import DOMPurify from '@/lib/dompurify@3.2.4es.js';
-
-export let codeDataList = []
-export let jobMoreMap = new Map()
-
-const md = new MarkdownIt({
-    html: true, // 允许 HTML 标签
-    linkify: true, // 自动解析 URL
-    typographer: true, // 美化标点符号
-    tables: true,
-    breaks: true, // 让 \n 自动换行
-    langPrefix: 'language-', // 代码高亮前缀
-    // 如果结果以 <pre ... 开头，内部包装器则会跳过。
-    highlight: function(str, lang) {
-        if (lang === 'job-json') {
-            const result = safeExtractJson(str);
-            if (result) { // json解析成功
-                const jobId = result.appJobUrl.split('jobId=')[1]
-                let domContext = `
-                <a class="custom-card" data-job-id="${jobId}">
-                    <div class="card-title">
-                        <span class="title-text" >${result.jobTitle}</span>
-                        <div class="card-salary">${result.salary}</div>
-                    </div>
-                    <div class="card-company">${result.location}·${result.companyName}</div>
-                    <div class="card-info">
-                        <div class="info-item">
-                            <div class="card-tag">${result.education}</div>
-                            <div class="card-tag">${result.experience}</div>
-                        </div>
-                        <div class="info-item">查看详情<div class="position-nav"></div></div>
-                    </div>
-                </a>
-                `
-                if (result.data) {
-                    jobMoreMap.set(jobId, result.data)
-                    domContext +=
-                        `<a class="custom-more" data-job-id="${jobId}">查看更多岗位<div class="more-icon"></div></a>`
-                }
-                return domContext
-            }
-        }
-        // <div class="card-tag">${result.location}</div>
-        // <div class="info-item">${result.salary}</div>
-        // 代码块
-        let preCode = ""
-        try {
-            preCode = hljs.highlightAuto(str).value
-        } catch (err) {
-            preCode = markdownIt.utils.escapeHtml(str);
-        }
-        // 以换行进行分割 , 按行拆分代码
-        const lines = preCode.split(/\n/).slice(0, -1);
-        const html = lines
-            .map((line, index) =>
-                line ?
-                `<li><span class="line-num" data-line="${index + 1}"></span>${line}</li>` :
-                ''
-            )
-            .join('');
-
-        // 代码复制功能
-        const cacheIndex = codeDataList.length;
-        codeDataList.push(str);
-        return `
-            <div class="code-container">
-                <div class="code-header">
-                    <span class="lang-label">${lang || 'plaintext'}</span>
-                    <a class="copy-btn" data-copy-index="${cacheIndex}">复制代码</a>
-                </div>
-                <pre class="hljs"><code><ol>${html}</ol></code></pre>
-            </div>
-        `;
-    }
-})
-
-function extractFirstJson(text) {
-    let stack = [];
-    let startIndex = -1;
-    let endIndex = -1;
-
-    for (let i = 0; i < text.length; i++) {
-        const char = text[i];
-
-        if (char === '{') {
-            if (stack.length === 0) startIndex = i; // 记录第一个 '{' 的位置
-            stack.push(char);
-        } else if (char === '}') {
-            stack.pop();
-            if (stack.length === 0) {
-                endIndex = i; // 找到配对的 '}'
-                break;
-            }
-        }
-    }
-
-    if (startIndex !== -1 && endIndex !== -1) {
-        const jsonString = text.slice(startIndex, endIndex + 1);
-        try {
-            const jsonObject = JSON.parse(jsonString);
-            return jsonObject;
-        } catch (e) {
-            return null; // 如果不是有效的 JSON
-        }
-    }
-
-    return null; // 如果没有找到有效的 JSON 对象
-}
-
-
-function safeExtractJson(text) {
-    try {
-        const jsonObject = extractFirstJson(text);
-        return jsonObject
-    } catch (e) {
-        console.error('JSON 解析失败:', e);
-    }
-    return null;
-}
-
-export function clearJobMoreMap() { // 切换对话清空
-    jobMoreMap.clear()
-}
-
-export function parseMarkdown(content) {
-    if (!content) {
-        return //处理特殊情况，比如网络异常导致的响应的 content 的值为空
-    }
-    codeDataList = []
-    const unsafeHtml = md.render(content || '')
-    return unsafeHtml
-}
\ No newline at end of file
+import MarkdownIt from '@/lib/markdown-it.min.js';
+import hljs from "@/lib/highlight/highlight-uni.min.js";
+import parseHtml from '@/lib/html-parser.js';
+// import DOMPurify from '@/lib/dompurify@3.2.4es.js';
+
+export let codeDataList = []
+export let jobMoreMap = new Map()
+export let jobCardsList = []
+
+const md = new MarkdownIt({
+    html: true, // 允许 HTML 标签
+    linkify: true, // 自动解析 URL
+    typographer: true, // 美化标点符号
+    tables: true,
+    breaks: true, // 让 \n 自动换行
+    langPrefix: 'language-', // 代码高亮前缀
+    // 如果结果以 <pre ... 开头，内部包装器则会跳过。
+    highlight: function(str, lang) {
+        if (lang === 'job-json') {
+            const result = safeExtractJson(str);
+            if (result) { // json解析成功
+                let jobId = result.appJobUrl;
+                // If appJobUrl contains 'jobId=', extract the value after it, otherwise use it directly
+                if (jobId && jobId.includes('jobId=')) {
+                    jobId = jobId.split('jobId=')[1];
+                    // 如果还有额外的参数，只取jobId部分
+                    if (jobId.includes('&')) {
+                        jobId = jobId.split('&')[0];
+                    }
+                }
+                console.log('Job JSON result:', result, 'Extracted jobId:', jobId);
+                
+                // 确保jobId有效
+                if (!jobId || jobId === 'undefined' || jobId === 'null') {
+                    console.error('Invalid jobId extracted:', jobId, 'from appJobUrl:', result.appJobUrl);
+                    // 尝试从其他字段获取jobId
+                    if (result.jobId) {
+                        jobId = result.jobId;
+                        console.log('Using jobId from result.jobId:', jobId);
+                    }
+                }
+                
+                // 添加到岗位卡片列表，供小程序端单独渲染
+                jobCardsList.push({
+                    jobId,
+                    jobTitle: result.jobTitle,
+                    salary: result.salary,
+                    location: result.location,
+                    companyName: result.companyName,
+                    education: result.education,
+                    experience: result.experience
+                });
+                
+                // 生成岗位卡片HTML，注意：微信小程序rich-text组件只支持部分HTML属性
+                // 使用普通的href属性，微信小程序rich-text会将其转换为可点击链接
+                // 添加data-job-id属性，方便获取jobId
+                // 为所有平台添加onclick事件，微信小程序可能会忽略，但H5端会生效
+                // 内联基础样式确保在所有平台上正确显示（使用px单位以确保H5兼容性）
+                let domContext = `<a class="custom-card" href="/packageA/pages/post/post?jobId=${jobId}" data-job-id="${jobId}" data-jobid="${jobId}" onclick="if(typeof uni !== 'undefined'){uni.navigateTo({url: '/packageA/pages/post/post?jobId=${jobId}'});return false;}" style="display: flex; flex-direction: column; margin-bottom: 11px; background: #FFFFFF; box-shadow: 0 0 4px rgba(0,0,0,0.04); border-radius: 10px; padding: 14px 12px; font-weight: 400; font-size: 14px; color: #333333; text-decoration: none; overflow: hidden; box-sizing: border-box; width: 100%; max-width: 100%;"><div class="card-title" style="font-weight: 600; display: flex; align-items: center; justify-content: space-between; margin-bottom: 8px;"><span class="title-text" style="font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif; font-size: 16px; line-height: 1.4; color: #333333; max-width: calc(100% - 80px); overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">${result.jobTitle}</span><div class="card-salary" style="font-family: DIN-Medium; font-size: 16px; color: #4C6EFB; line-height: 1.4; font-weight: 500;">${result.salary}</div></div><div class="card-company" style="margin-bottom: 9px; font-size: 14px; color: #6C7282; line-height: 1.4; max-width: 100%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">${result.location}·${result.companyName}</div><div class="card-info" style="display: flex; align-items: center; justify-content: space-between; padding-right: 20px;"><div class="info-item" style="display: flex; position: relative; align-items: center;"><div class="card-tag" style="font-weight: 400; font-size: 12px; color: #6C7282; width: fit-content; background: #F4F4F4; border-radius: 2px; padding: 3px 10px; margin-right: 10px; display: inline-flex; align-items: center; justify-content: center; height: 15px; line-height: 15px;">${result.education}</div><div class="card-tag" style="font-weight: 400; font-size: 12px; color: #6C7282; width: fit-content; background: #F4F4F4; border-radius: 2px; padding: 3px 10px; margin-right: 10px; display: inline-flex; align-items: center; justify-content: center; height: 15px; line-height: 15px;">${result.experience}</div></div><div class="info-item" style="color: #256BFA; font-size: 14px; padding-right: 5px; position: relative;">查看详情<div class="position-nav" style="position: absolute; right: -5px; top: 50%; transform: translateY(-50%);"></div></div></div></a>`
+                if (result.data) {
+                    jobMoreMap.set(jobId, result.data)
+                    domContext += `<a class="custom-more" href="/packageA/pages/moreJobs/moreJobs?jobId=${jobId}" data-job-id="${jobId}" data-jobid="${jobId}" onclick="if(typeof uni !== 'undefined'){uni.navigateTo({url: '/packageA/pages/moreJobs/moreJobs?jobId=${jobId}'});return false;}" style="display: flex; justify-content: center; align-items: center; color: #FFFFFF; background: linear-gradient(135deg, #256BFA 0%, #9E74FD 100%); border-radius: 25px; padding: 10px 16px; margin: 10px 0; font-size: 14px; font-weight: 600; box-shadow: 0 4px 12px rgba(37, 107, 250, 0.3); text-decoration: none; box-sizing: border-box; width: 100%;">查看更多岗位<div class="more-icon" style="width: 16px; height: 16px; background: url('@/static/svg/seemore.svg') center center no-repeat; background-size: 100% 100%; margin-left: 6px;"></div></a>`
+                }
+                return domContext
+            }
+        }
+        // 代码块
+        let preCode = ""
+        try {
+            preCode = hljs.highlightAuto(str).value
+        } catch (err) {
+            preCode = md.utils.escapeHtml(str);
+        }
+        // 以换行进行分割 , 按行拆分代码
+        const lines = preCode.split(/\n/).slice(0, -1);
+        const html = lines
+            .map((line, index) =>
+                line ?
+                `<li><span class="line-num" data-line="${index + 1}"></span>${line}</li>` :
+                '<li></li>'
+            )
+            .join('');
+
+        // 代码复制功能
+        const cacheIndex = codeDataList.length;
+        codeDataList.push(str);
+        return `
+            <div class="code-container">
+                <div class="code-header">
+                    <span class="lang-label">${lang || 'plaintext'}</span>
+                    <a class="copy-btn" data-copy-index="${cacheIndex}">复制代码</a>
+                </div>
+                <pre class="hljs"><code><ol>${html}</ol></code></pre>
+            </div>
+        `;
+    }
+})
+
+function extractFirstJson(text) {
+    let stack = [];
+    let startIndex = -1;
+    let endIndex = -1;
+
+    for (let i = 0; i < text.length; i++) {
+        const char = text[i];
+
+        if (char === '{') {
+            if (stack.length === 0) startIndex = i; // 记录第一个 '{' 的位置
+            stack.push(char);
+        } else if (char === '}') {
+            stack.pop();
+            if (stack.length === 0) {
+                endIndex = i; // 找到配对的 '}'
+                break;
+            }
+        }
+    }
+
+    if (startIndex !== -1 && endIndex !== -1) {
+        const jsonString = text.slice(startIndex, endIndex + 1);
+        try {
+            const jsonObject = JSON.parse(jsonString);
+            return jsonObject;
+        } catch (e) {
+            return null; // 如果不是有效的 JSON
+        }
+    }
+
+    return null; // 如果没有找到有效的 JSON 对象
+}
+
+
+function safeExtractJson(text) {
+    try {
+        const jsonObject = extractFirstJson(text);
+        return jsonObject
+    } catch (e) {
+        console.error('JSON 解析失败:', e);
+    }
+    return null;
+}
+
+export function clearJobMoreMap() { // 切换对话清空
+    jobMoreMap.clear()
+}
+
+export function parseMarkdown(content) {
+    if (!content) {
+        return [] //处理特殊情况，比如网络异常导致的响应的 content 的值为空
+    }
+    
+    // 过滤掉<think>标签及其内容，这些是AI内部思考过程，不应该显示给用户
+    // 1. 处理原始标签（支持多行）
+    content = content.replace(/<\s*think\s*>[\s\S]*?<\s*\/\s*think\s*>/gi, '')
+    // 2. 处理HTML编码的标签
+    content = content.replace(/&lt;\s*think\s*&gt;[\s\S]*?&lt;\s*\/\s*think\s*&gt;/gi, '')
+    // 3. 处理部分编码的标签
+    content = content.replace(/&lt;\s*think\s*>/gi, '')
+    content = content.replace(/<\s*\/\s*think\s*&gt;/gi, '')
+    
+    codeDataList = []
+    jobCardsList = [] // 清空岗位卡片列表，避免重复
+    const unsafeHtml = md.render(content || '')
+    
+    // 在markdown渲染后再次过滤，确保没有遗漏
+    let filteredHtml = unsafeHtml
+    // 1. 处理原始标签（支持多行）
+    filteredHtml = filteredHtml.replace(/<\s*think\s*>[\s\S]*?<\s*\/\s*think\s*>/gi, '')
+    // 2. 处理HTML编码的标签
+    filteredHtml = filteredHtml.replace(/&lt;\s*think\s*&gt;[\s\S]*?&lt;\s*\/\s*think\s*&gt;/gi, '')
+    // 3. 处理部分编码的标签
+    filteredHtml = filteredHtml.replace(/&lt;\s*think\s*>/gi, '')
+    filteredHtml = filteredHtml.replace(/<\s*\/\s*think\s*&gt;/gi, '')
+    // 4. 单独处理剩余的think标签对
+    filteredHtml = filteredHtml.replace(/&lt;think&gt;/gi, '')
+    filteredHtml = filteredHtml.replace(/&lt;\/think&gt;/gi, '')
+    filteredHtml = filteredHtml.replace(/<think>/gi, '')
+    filteredHtml = filteredHtml.replace(/<\/think>/gi, '')
+    
+    // 根据平台返回不同的内容格式
+    // 微信小程序：返回rich-text组件支持的nodes格式
+    // H5：直接返回HTML字符串，避免HTML解析错误
+    if (process.env.UNI_PLATFORM === 'mp-weixin') {
+        try {
+            return parseHtml(filteredHtml)
+        } catch (error) {
+            console.error('HTML解析失败:', error)
+            // 解析失败时返回空数组，避免页面崩溃
+            return []
+        }
+    } else {
+        // H5端直接返回HTML字符串
+        return filteredHtml
+    }
+}
diff --git a/utils/request.js b/utils/request.js
index c41e10a..648f0fc 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -155,7 +155,7 @@ export function uploadFile(tempFilePaths, loading = false) {
 	header["Authorization"] = encodeURIComponent(Authorization);
 	return new Promise((resolve, reject) => {
 		uni.uploadFile({
-			url: config.baseUrl + '/app/file/upload',
+			url: config.baseUrl + '/app/file/uploadFile',
 			filePath: tempFilePaths,
 			name: 'file',
 			header,
@@ -176,11 +176,16 @@ export function uploadFile(tempFilePaths, loading = false) {
 	})
 }
 
-export function myRequest(url, data = {}, method = 'GET', port = 9100, headers = {}, loading = false) {
+export function myRequest(url, data = {}, method = 'GET', port = 9100, headers = {}, loading = false,urlType='') {
 	let LCBaseUrl = config.LCBaseUrl
 	if (port != 9100) {
 		LCBaseUrl = config.LCBaseUrlInner
 	}
+	if(urlType=='jobRecommend'){
+		LCBaseUrl=config.jobRecommendUrl
+	}else if(urlType=='policyRecommend'){
+		LCBaseUrl=config.policyRecommendUrl
+	}
 	const header = headers || {};
 	// 上下文
 	// /jobfair-api/jobfair/public 招聘会
diff --git a/utils/streamRequest.js b/utils/streamRequest.js
index 9a49cef..19a517c 100644
--- a/utils/streamRequest.js
+++ b/utils/streamRequest.js
@@ -27,6 +27,7 @@ function StreamRequestMiniProgram(url, data = {}, onDataReceived, onError, onCom
 
     return new Promise((resolve, reject) => {
         let buffer = '';
+        let hasReceivedContent = false;
         
         const requestTask = uni.request({
             url: config.StreamBaseURl + url,
@@ -50,20 +51,127 @@ function StreamRequestMiniProgram(url, data = {}, onDataReceived, onError, onCom
             }
         });
         
+        // UTF-8解码函数，用于微信小程序真机环境
+        function utf8Decode(uint8Array) {
+            let result = '';
+            let i = 0;
+            const len = uint8Array.length;
+            
+            while (i < len) {
+                const byte1 = uint8Array[i];
+                
+                // 1字节字符 (0xxxxxxx)
+                if (byte1 < 0x80) {
+                    result += String.fromCharCode(byte1);
+                    i++;
+                }
+                // 2字节字符 (110xxxxx 10xxxxxx)
+                else if (byte1 >= 0xC0 && byte1 < 0xE0) {
+                    if (i + 1 < len) {
+                        const byte2 = uint8Array[i + 1];
+                        if (byte2 >= 0x80 && byte2 < 0xC0) {
+                            const codePoint = ((byte1 & 0x1F) << 6) | (byte2 & 0x3F);
+                            result += String.fromCharCode(codePoint);
+                            i += 2;
+                            continue;
+                        }
+                    }
+                    // 无效的UTF-8序列，跳过
+                    result += '�';
+                    i++;
+                }
+                // 3字节字符 (1110xxxx 10xxxxxx 10xxxxxx)
+                else if (byte1 >= 0xE0 && byte1 < 0xF0) {
+                    if (i + 2 < len) {
+                        const byte2 = uint8Array[i + 1];
+                        const byte3 = uint8Array[i + 2];
+                        if ((byte2 >= 0x80 && byte2 < 0xC0) && (byte3 >= 0x80 && byte3 < 0xC0)) {
+                            const codePoint = ((byte1 & 0x0F) << 12) | ((byte2 & 0x3F) << 6) | (byte3 & 0x3F);
+                            result += String.fromCharCode(codePoint);
+                            i += 3;
+                            continue;
+                        }
+                    }
+                    // 无效的UTF-8序列，跳过
+                    result += '�';
+                    i++;
+                }
+                // 4字节字符 (11110xxx 10xxxxxx 10xxxxxx 10xxxxxx)
+                else if (byte1 >= 0xF0 && byte1 < 0xF8) {
+                    if (i + 3 < len) {
+                        const byte2 = uint8Array[i + 1];
+                        const byte3 = uint8Array[i + 2];
+                        const byte4 = uint8Array[i + 3];
+                        if ((byte2 >= 0x80 && byte2 < 0xC0) && (byte3 >= 0x80 && byte3 < 0xC0) && (byte4 >= 0x80 && byte4 < 0xC0)) {
+                            let codePoint = ((byte1 & 0x07) << 18) | ((byte2 & 0x3F) << 12) | ((byte3 & 0x3F) << 6) | (byte4 & 0x3F);
+                            // 处理UTF-16代理对
+                            if (codePoint >= 0x10000) {
+                                codePoint -= 0x10000;
+                                const highSurrogate = (codePoint >> 10) + 0xD800;
+                                const lowSurrogate = (codePoint & 0x3FF) + 0xDC00;
+                                result += String.fromCharCode(highSurrogate, lowSurrogate);
+                            } else {
+                                result += String.fromCharCode(codePoint);
+                            }
+                            i += 4;
+                            continue;
+                        }
+                    }
+                    // 无效的UTF-8序列，跳过
+                    result += '�';
+                    i++;
+                }
+                // 无效的UTF-8序列，跳过
+                else {
+                    result += '�';
+                    i++;
+                }
+            }
+            
+            return result;
+        }
+        
         // 监听分块数据
         requestTask.onChunkReceived((res) => {
             try {
-                const decoder = new TextDecoder('utf-8');
-                const chunk = decoder.decode(new Uint8Array(res.data));
+                // 微信小程序兼容处理：微信小程序不支持TextDecoder，使用自定义UTF-8解码
+                let chunk = '';
+                if (typeof TextDecoder !== 'undefined') {
+                    // 支持TextDecoder的环境（如开发者工具）
+                    const decoder = new TextDecoder('utf-8');
+                    chunk = decoder.decode(new Uint8Array(res.data));
+                } else {
+                    // 微信小程序真机环境，使用自定义UTF-8解码函数
+                    const uint8Array = new Uint8Array(res.data);
+                    chunk = utf8Decode(uint8Array);
+                }
+                console.log('📦 收到分块数据:', chunk);
                 buffer += chunk;
                 
                 let lines = buffer.split("\n");
                 buffer = lines.pop() || ''; // 保留不完整的行
+                console.log('📝 解析到行:', lines.length, '行，缓冲区剩余:', buffer.length, '字符');
                 
                 for (let line of lines) {
-                    if (line.startsWith("data: ")) {
-                        const jsonData = line.slice(6).trim();
+                    console.log('🔍 处理行:', line);
+                    // 处理重复的 data: 前缀
+                    let processedLine = line;
+                    // 移除所有开头的 data: 前缀（无论是否有空格），直到只剩下一个或没有
+                    while (processedLine.startsWith("data:")) {
+                        // 检查是否还有另一个 data: 前缀
+                        const nextPart = processedLine.slice(5).trimStart();
+                        if (nextPart.startsWith("data:")) {
+                            processedLine = nextPart;
+                        } else {
+                            break;
+                        }
+                    }
+                    
+                    if (processedLine.startsWith("data: ")) {
+                        const jsonData = processedLine.slice(6).trim();
+                        console.log('📄 提取的JSON数据:', jsonData);
                         if (jsonData === "[DONE]") {
+                            console.log('✅ 收到结束标记 [DONE]');
                             onComplete && onComplete();
                             resolve();
                             return;
@@ -72,11 +180,35 @@ function StreamRequestMiniProgram(url, data = {}, onDataReceived, onError, onCom
                         if (jsonData && jsonData.trim()) {
                             try {
                                 const parsedData = JSON.parse(jsonData);
+                                console.log('🔧 解析后的JSON:', parsedData);
                                 
+                                // 检查是否有错误信息
+                                const finishReason = parsedData?.choices?.[0]?.finish_reason;
+                                if (finishReason === "error") {
+                                    let errorContent = parsedData?.choices?.[0]?.delta?.content || "流式请求失败";
+                                    console.error('❌ 收到错误信息:', errorContent);
+                                    
+                                    // 优化token超限错误提示
+                                    if (errorContent.includes("maximum input ids length")) {
+                                        errorContent = "对话历史过长，请尝试清除部分历史记录或简化问题";
+                                    }
+                                    
+                                    // 只有当未收到正常内容时才显示错误信息
+                                    if (!hasReceivedContent) {
+                                        // 显示错误信息给用户
+                                        uni.showToast({
+                                            title: errorContent,
+                                            icon: 'none',
+                                            duration: 3000
+                                        });
+                                    }
+                                }
                                 // 处理标准的choices格式
-                                if (parsedData?.choices?.[0]?.delta?.content) {
+                                else if (parsedData?.choices?.[0]?.delta?.content) {
                                     const content = parsedData.choices[0].delta.content;
                                     if (content) {
+                                        hasReceivedContent = true;
+                                        console.log('📤 调用onDataReceived(content):', content);
                                         onDataReceived && onDataReceived(content);
                                     }
                                 }
@@ -84,6 +216,8 @@ function StreamRequestMiniProgram(url, data = {}, onDataReceived, onError, onCom
                                 else if (parsedData?.choices?.[0]?.delta?.reasoning_content) {
                                     const content = parsedData.choices[0].delta.reasoning_content;
                                     if (content) {
+                                        hasReceivedContent = true;
+                                        console.log('📤 调用onDataReceived(reasoning_content):', content);
                                         onDataReceived && onDataReceived(content);
                                     }
                                 }
@@ -91,14 +225,42 @@ function StreamRequestMiniProgram(url, data = {}, onDataReceived, onError, onCom
                                 else if (parsedData?.tool?.response) {
                                     const content = parsedData.tool.response;
                                     if (content) {
+                                        hasReceivedContent = true;
+                                        console.log('📤 调用onDataReceived(tool.response):', content);
                                         onDataReceived && onDataReceived(content);
                                     }
                                 }
+                                // 处理其他可能的内容格式
+                                else if (parsedData?.content) {
+                                    // 直接返回content字段的情况
+                                    const content = parsedData.content;
+                                    if (content) {
+                                        hasReceivedContent = true;
+                                        console.log('📤 调用onDataReceived(direct content):', content);
+                                        onDataReceived && onDataReceived(content);
+                                    }
+                                }
+                                // 处理完整的text字段（非流式）
+                                else if (parsedData?.choices?.[0]?.text) {
+                                    const content = parsedData.choices[0].text;
+                                    if (content) {
+                                        hasReceivedContent = true;
+                                        console.log('📤 调用onDataReceived(full text):', content);
+                                        onDataReceived && onDataReceived(content);
+                                    }
+                                }
+                                else {
+                                    console.warn('⚠️ 未匹配到任何内容格式:', parsedData);
+                                }
                             } catch (e) {
-                                console.error("JSON 解析失败:", e.message);
+                                console.error("JSON 解析失败:", e.message, "原始数据:", jsonData);
                             }
                         }
                     }
+                    else if (processedLine.trim()) {
+                        // 处理非data:开头的行
+                        console.warn('⚠️ 收到非data:开头的行:', processedLine);
+                    }
                 }
             } catch (error) {
                 console.error('处理分块数据失败:', error);
@@ -135,6 +297,7 @@ function StreamRequestH5(url, data = {}, onDataReceived, onError, onComplete) {
             let buffer = "";
             let retryCount = 0;
             const maxRetries = 3;
+            let hasReceivedContent = false;
             
             while (true) {
                 const {
@@ -157,9 +320,25 @@ function StreamRequestH5(url, data = {}, onDataReceived, onError, onComplete) {
                 console.log(`📦 Processing ${lines.length} lines, buffer length: ${buffer.length}`);
                 
                 for (let line of lines) {
-                    if (line.startsWith("data: ")) {
-                        const jsonData = line.slice(6).trim();
+                    console.log('🔍 处理行:', line);
+                    // 处理重复的 data: 前缀
+                    let processedLine = line;
+                    // 移除所有开头的 data: 前缀（无论是否有空格），直到只剩下一个或没有
+                    while (processedLine.startsWith("data:")) {
+                        // 检查是否还有另一个 data: 前缀
+                        const nextPart = processedLine.slice(5).trimStart();
+                        if (nextPart.startsWith("data:")) {
+                            processedLine = nextPart;
+                        } else {
+                            break;
+                        }
+                    }
+                    
+                    if (processedLine.startsWith("data: ")) {
+                        const jsonData = processedLine.slice(6).trim();
+                        console.log('📄 提取的JSON数据:', jsonData);
                         if (jsonData === "[DONE]") {
+                            console.log('✅ 收到结束标记 [DONE]');
                             onComplete && onComplete();
                             resolve();
                             return;
@@ -169,11 +348,35 @@ function StreamRequestH5(url, data = {}, onDataReceived, onError, onComplete) {
                             // 检查JSON数据是否完整
                             if (jsonData && jsonData.trim() && jsonData !== "[DONE]") {
                                 const parsedData = JSON.parse(jsonData);
+                                console.log('🔧 解析后的JSON:', parsedData);
                                 
+                                // 检查是否有错误信息
+                                const finishReason = parsedData?.choices?.[0]?.finish_reason;
+                                if (finishReason === "error") {
+                                    let errorContent = parsedData?.choices?.[0]?.delta?.content || "流式请求失败";
+                                    console.error('❌ 收到错误信息:', errorContent);
+                                    
+                                    // 优化token超限错误提示
+                                    if (errorContent.includes("maximum input ids length")) {
+                                        errorContent = "对话历史过长，请尝试清除部分历史记录或简化问题";
+                                    }
+                                    
+                                    // 只有当未收到正常内容时才显示错误信息
+                                    if (!hasReceivedContent) {
+                                        // 显示错误信息给用户
+                                        uni.showToast({
+                                            title: errorContent,
+                                            icon: 'none',
+                                            duration: 3000
+                                        });
+                                    }
+                                }
                                 // 处理标准的choices格式
-                                if (parsedData?.choices?.[0]?.delta?.content) {
+                                else if (parsedData?.choices?.[0]?.delta?.content) {
                                     const content = parsedData.choices[0].delta.content;
                                     if (content) {
+                                        hasReceivedContent = true;
+                                        console.log('📤 调用onDataReceived(content):', content);
                                         onDataReceived && onDataReceived(content);
                                     }
                                 }
@@ -181,6 +384,8 @@ function StreamRequestH5(url, data = {}, onDataReceived, onError, onComplete) {
                                 else if (parsedData?.choices?.[0]?.delta?.reasoning_content) {
                                     const content = parsedData.choices[0].delta.reasoning_content;
                                     if (content) {
+                                        hasReceivedContent = true;
+                                        console.log('📤 调用onDataReceived(reasoning_content):', content);
                                         onDataReceived && onDataReceived(content);
                                     }
                                 }
@@ -188,6 +393,27 @@ function StreamRequestH5(url, data = {}, onDataReceived, onError, onComplete) {
                                 else if (parsedData?.tool?.response) {
                                     const content = parsedData.tool.response;
                                     if (content) {
+                                        hasReceivedContent = true;
+                                        console.log('📤 调用onDataReceived(tool.response):', content);
+                                        onDataReceived && onDataReceived(content);
+                                    }
+                                }
+                                // 处理其他可能的内容格式
+                                else if (parsedData?.content) {
+                                    // 直接返回content字段的情况
+                                    const content = parsedData.content;
+                                    if (content) {
+                                        hasReceivedContent = true;
+                                        console.log('📤 调用onDataReceived(direct content):', content);
+                                        onDataReceived && onDataReceived(content);
+                                    }
+                                }
+                                // 处理完整的text字段（非流式）
+                                else if (parsedData?.choices?.[0]?.text) {
+                                    const content = parsedData.choices[0].text;
+                                    if (content) {
+                                        hasReceivedContent = true;
+                                        console.log('📤 调用onDataReceived(full text):', content);
                                         onDataReceived && onDataReceived(content);
                                     }
                                 }
@@ -201,6 +427,10 @@ function StreamRequestH5(url, data = {}, onDataReceived, onError, onComplete) {
                             // 不抛出错误，继续处理下一个数据块
                         }
                     }
+                    else if (processedLine.trim()) {
+                        // 处理非data:开头的行
+                        console.warn('⚠️ 收到非data:开头的行:', processedLine);
+                    }
                 }
             }
 
@@ -209,16 +439,55 @@ function StreamRequestH5(url, data = {}, onDataReceived, onError, onComplete) {
                 console.log("📦 Processing remaining buffer:", buffer.substring(0, 100) + "...");
                 const lines = buffer.split("\n");
                 for (let line of lines) {
-                    if (line.startsWith("data: ")) {
-                        const jsonData = line.slice(6).trim();
+                    console.log('🔍 处理剩余缓冲区行:', line);
+                    // 处理重复的 data: 前缀
+                    let processedLine = line;
+                    // 移除所有开头的 data: 前缀（无论是否有空格），直到只剩下一个或没有
+                    while (processedLine.startsWith("data:")) {
+                        // 检查是否还有另一个 data: 前缀
+                        const nextPart = processedLine.slice(5).trimStart();
+                        if (nextPart.startsWith("data:")) {
+                            processedLine = nextPart;
+                        } else {
+                            break;
+                        }
+                    }
+                    
+                    if (processedLine.startsWith("data: ")) {
+                        const jsonData = processedLine.slice(6).trim();
+                        console.log('📄 提取的剩余JSON数据:', jsonData);
                         if (jsonData && jsonData !== "[DONE]") {
                             try {
                                 const parsedData = JSON.parse(jsonData);
+                                console.log('🔧 解析后的剩余JSON:', parsedData);
                                 
+                                // 检查是否有错误信息
+                                const finishReason = parsedData?.choices?.[0]?.finish_reason;
+                                if (finishReason === "error") {
+                                    let errorContent = parsedData?.choices?.[0]?.delta?.content || "流式请求失败";
+                                    console.error('❌ 收到错误信息:', errorContent);
+                                    
+                                    // 优化token超限错误提示
+                                    if (errorContent.includes("maximum input ids length")) {
+                                        errorContent = "对话历史过长，请尝试清除部分历史记录或简化问题";
+                                    }
+                                    
+                                    // 只有当未收到正常内容时才显示错误信息
+                                    if (!hasReceivedContent) {
+                                        // 显示错误信息给用户
+                                        uni.showToast({
+                                            title: errorContent,
+                                            icon: 'none',
+                                            duration: 3000
+                                        });
+                                    }
+                                }
                                 // 处理标准的choices格式
-                                if (parsedData?.choices?.[0]?.delta?.content) {
+                                else if (parsedData?.choices?.[0]?.delta?.content) {
                                     const content = parsedData.choices[0].delta.content;
                                     if (content) {
+                                        hasReceivedContent = true;
+                                        console.log('📤 调用onDataReceived(content):', content);
                                         onDataReceived && onDataReceived(content);
                                     }
                                 }
@@ -226,6 +495,8 @@ function StreamRequestH5(url, data = {}, onDataReceived, onError, onComplete) {
                                 else if (parsedData?.choices?.[0]?.delta?.reasoning_content) {
                                     const content = parsedData.choices[0].delta.reasoning_content;
                                     if (content) {
+                                        hasReceivedContent = true;
+                                        console.log('📤 调用onDataReceived(reasoning_content):', content);
                                         onDataReceived && onDataReceived(content);
                                     }
                                 }
@@ -233,6 +504,27 @@ function StreamRequestH5(url, data = {}, onDataReceived, onError, onComplete) {
                                 else if (parsedData?.tool?.response) {
                                     const content = parsedData.tool.response;
                                     if (content) {
+                                        hasReceivedContent = true;
+                                        console.log('📤 调用onDataReceived(tool.response):', content);
+                                        onDataReceived && onDataReceived(content);
+                                    }
+                                }
+                                // 处理其他可能的内容格式
+                                else if (parsedData?.content) {
+                                    // 直接返回content字段的情况
+                                    const content = parsedData.content;
+                                    if (content) {
+                                        hasReceivedContent = true;
+                                        console.log('📤 调用onDataReceived(direct content):', content);
+                                        onDataReceived && onDataReceived(content);
+                                    }
+                                }
+                                // 处理完整的text字段（非流式）
+                                else if (parsedData?.choices?.[0]?.text) {
+                                    const content = parsedData.choices[0].text;
+                                    if (content) {
+                                        hasReceivedContent = true;
+                                        console.log('📤 调用onDataReceived(full text):', content);
                                         onDataReceived && onDataReceived(content);
                                     }
                                 }
@@ -241,6 +533,10 @@ function StreamRequestH5(url, data = {}, onDataReceived, onError, onComplete) {
                             }
                         }
                     }
+                    else if (processedLine.trim()) {
+                        // 处理非data:开头的行
+                        console.warn('⚠️ 收到非data:开头的剩余行:', processedLine);
+                    }
                 }
             }
             
@@ -295,16 +591,27 @@ export function chatRequest(url, data = {}, method = 'GET', loading = false, hea
                         return
                     }
                     uni.showToast({
-                        title: msg,
+                        title: msg || '请求失败',
                         icon: 'none'
                     })
+                    // 拒绝Promise并提供详细错误信息
+                    const err = new Error(msg || '请求失败，服务器返回错误码: ' + code)
+                    err.error = resData
+                    reject(err)
+                } else {
+                    // 处理非200状态码
+                    const errorMsg = `请求失败，HTTP状态码: ${resData.statusCode}`
+                    uni.showToast({
+                        title: errorMsg,
+                        icon: 'none'
+                    })
+                    const err = new Error(errorMsg)
+                    err.error = resData
+                    reject(err)
                 }
                 if (resData.data?.code === 401 || resData.data?.code === 402) {
                     useUserStore().logOut()
                 }
-                const err = new Error('请求出现异常，请联系工作人员')
-                err.error = resData
-                reject(err)
             },
             fail: (err) => {
                 reject(err)
diff --git a/utilsRc/config.js b/utilsRc/config.js
index 64eccf5..8813e80 100644
--- a/utilsRc/config.js
+++ b/utilsRc/config.js
@@ -11,6 +11,7 @@ let exports = {
 	// ========== baseUrl 配置方式选择 ==========
 	// 方式1：硬编码baseUrl（main分支使用，合并到main时不会影响现有功能）
 	baseUrl: 'https://www.xjksly.cn/sdrc-api', // 正式环境在济南人才上部署（不要轻易连接）
+	// baseUrl: 'http://cffe7966.natappfree.cc', // 正式环境在济南人才上部署（不要轻易连接）
 	// baseUrl: 'http://10.160.0.5:8907', // 开发环境
 	// baseUrl: 'http://172.20.1.48:8903', // 开发环境