diff --git a/.DS_Store b/.DS_Store
index ae628fd..5ff22ec 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/App.vue b/App.vue
index 2b2f4c1..fdb57b1 100644
--- a/App.vue
+++ b/App.vue
@@ -42,6 +42,7 @@ onMounted(() => {
 onShow(() => {
     console.log('App Show');
 });
+
 onHide(() => {
     console.log('App Hide');
 });
@@ -52,8 +53,8 @@ onHide(() => {
 @import '@/common/common.css';
 /* 修改pages tabbar样式 H5有效 */
 .uni-tabbar .uni-tabbar__item:nth-child(4) .uni-tabbar__bd .uni-tabbar__icon {
-    height: 78rpx !important;
-    width: 78rpx !important;
+    height: 39px !important;
+    width: 39px !important;
     margin-top: -1rpx;
 }
 .uni-tabbar-border {
@@ -70,4 +71,9 @@ uni-modal,
 .uni-mask {
     z-index: 998;
 }
+
+@font-face {
+    font-family: DingTalk JinBuTi;
+    src: url('@/static/font/DingTalk JinBuTi_min.ttf');
+}
 </style>
diff --git a/common/IndexedDBHelper.js b/common/IndexedDBHelper.js
index 2406a9f..a8b5ece 100644
--- a/common/IndexedDBHelper.js
+++ b/common/IndexedDBHelper.js
@@ -250,6 +250,46 @@ class IndexedDBHelper {
             request.onerror = (event) => reject(`Delete Error: ${event.target.error}`);
         });
     }
+    /**
+     * 根据条件删除所有匹配的数据
+     * @param {string} storeName - 数据仓库名
+     * @param {function} conditionFn - 判断是否删除 (record) => boolean
+     * @returns {Promise}
+     */
+    deleteByCondition(storeName, conditionFn) {
+        return new Promise((resolve, reject) => {
+            if (!this.db) {
+                reject('Database not initialized');
+                return;
+            }
+
+            const transaction = this.db.transaction([storeName], 'readwrite');
+            const store = transaction.objectStore(storeName);
+            const request = store.openCursor();
+
+            request.onsuccess = (event) => {
+                const cursor = event.target.result;
+                if (cursor && cursor.value) {
+                    try {
+                        // console.log(cursor.value)
+                        const shouldDelete = conditionFn(cursor.value);
+                        if (shouldDelete) {
+                            cursor.delete();
+                        }
+                    } catch (err) {
+                        console.error('Condition function error:', err);
+                    }
+                    cursor.continue();
+                } else {
+                    resolve('All matching records deleted successfully');
+                }
+            };
+
+            request.onerror = (event) => {
+                reject(`Delete by condition failed: ${event.target.error}`);
+            };
+        });
+    }
 
     /**
      * 通过索引查询数据
diff --git a/common/common.css b/common/common.css
index 28bacb5..25ee668 100644
--- a/common/common.css
+++ b/common/common.css
@@ -13,7 +13,6 @@ body,
 page {
     overscroll-behavior: none;
     overflow: hidden;
-    height: 100%;
 } */
 
 image {
@@ -23,6 +22,8 @@ image {
 
 .page-body {
     height: calc(100vh - var(--window-top) - var(--status-bar-height) - var(--window-bottom));
+    /* width: 100%; */
+    /* height: 100%; */
 }
 
 body,
@@ -52,7 +53,77 @@ html {
 }
 
 .btn-light:active {
-    background-color: #2980b9;
+    background-color: rgba(189, 197, 254, 0.15);
+}
+
+.btn-incline {
+    transition: transform 0.2s ease;
+    transform-style: preserve-3d;
+}
+
+.btn-incline:active {
+    transform: perspective(600px) rotateY(6deg) rotateX(3deg);
+}
+
+.btn-feel {
+    transition: transform 0.2s ease;
+    transform-style: preserve-3d;
+}
+
+.btn-feel:active {
+    transform: perspective(600px) rotateX(6deg) scale(0.98);
+}
+
+
+/* 动画效果 */
+.btn-shaky:active {
+    animation: shakeScale 0.6s;
+}
+
+@keyframes shakeScale {
+    0% {
+        transform: scale(1);
+    }
+
+    10% {
+        transform: scale(0.9) rotate(-3deg);
+    }
+
+    20% {
+        transform: scale(1.05) rotate(3deg);
+    }
+
+    30% {
+        transform: scale(0.95) rotate(-3deg);
+    }
+
+    40% {
+        transform: scale(1.02) rotate(3deg);
+    }
+
+    50% {
+        transform: scale(0.98) rotate(-2deg);
+    }
+
+    60% {
+        transform: scale(1.01) rotate(2deg);
+    }
+
+    70% {
+        transform: scale(0.99) rotate(-1deg);
+    }
+
+    80% {
+        transform: scale(1.005) rotate(1deg);
+    }
+
+    90% {
+        transform: scale(1) rotate(0deg);
+    }
+
+    100% {
+        transform: scale(1) rotate(0deg);
+    }
 }
 
 /* 控制hover */
@@ -191,8 +262,8 @@ html {
     color: #FB7307 !important;
 }
 
-.color_4873D9 {
-    color: #4873D9 !important;
+.color_256BFA {
+    color: #256BFA !important;
 }
 
 .color_4E8ADE {
@@ -343,6 +414,14 @@ html {
     flex: 1;
 }
 
+.fl_warp {
+    flex-wrap: wrap
+}
+
+.fl_nowarp {
+    flex-wrap: nowrap
+}
+
 .line_2 {
     display: -webkit-box;
     /* 让文本内容成为弹性盒 */
@@ -354,4 +433,17 @@ html {
     /* 隐藏超出的文本 */
     text-overflow: ellipsis;
     /* 使用省略号 */
+}
+
+.line_1 {
+    display: -webkit-box;
+    /* 让文本内容成为弹性盒 */
+    -webkit-box-orient: vertical;
+    /* 设置盒子的方向为垂直 */
+    -webkit-line-clamp: 1;
+    /* 限制最多显示两行 */
+    overflow: hidden;
+    /* 隐藏超出的文本 */
+    text-overflow: ellipsis;
+    /* 使用省略号 */
 }
\ No newline at end of file
diff --git a/common/globalFunction.js b/common/globalFunction.js
index 2b9266a..df27454 100644
--- a/common/globalFunction.js
+++ b/common/globalFunction.js
@@ -51,18 +51,77 @@ const prePage = () => {
 
 
 
+/**
+ * 页面跳转封装，支持 query 参数传递和返回回调
+ * @param {string} url - 跳转路径
+ * @param {object} options
+ * @param {boolean} options.needLogin - 是否需要登录
+ * @param {object} options.query - 携带参数
+ * @param {function} options.onBack - 页面返回时的回调（目标页调用 uni.navigateBack 时传递数据）
+ */
+export const navTo = function(url, {
+    needLogin = false,
+    query = {},
+    onBack = null
+} = {}) {
+    const userStore = useUserStore();
 
-const navTo = function(url, needLogin) {
-    if (needLogin && useUserStore().hasLogin) {
+    if (needLogin && !userStore.hasLogin) {
         uni.navigateTo({
             url: '/pages/login/login'
         });
-        return
+        return;
     }
+
+    const queryStr = Object.entries(query)
+        .map(([key, val]) => `${key}=${encodeURIComponent(val)}`)
+        .join('&');
+    const finalUrl = queryStr ? `${url}?${queryStr}` : url;
+
+    if (onBack) {
+        const pages = getCurrentPages();
+        const currentPage = pages[pages.length - 1];
+        currentPage.__onBackCallback__ = onBack;
+    }
+
     uni.navigateTo({
-        url
+        url: finalUrl
     });
-}
+};
+
+export const navBack = function({
+    delta = 1,
+    data = null,
+    fallbackUrl = '/pages/index/index'
+} = {}) {
+    const pages = getCurrentPages();
+
+    if (pages.length > 1) {
+        const prevPage = pages[pages.length - 1 - delta];
+
+        // 如果上一页存在回调函数，调用
+        if (data && prevPage?.__onBackCallback__) {
+            prevPage.__onBackCallback__(data);
+        }
+
+        uni.navigateBack({
+            delta
+        });
+    } else {
+        // 没有可返回的页面，直接跳转 fallback 页面
+        uni.reLaunch({
+            url: fallbackUrl
+        });
+    }
+};
+// // 默认返回上一页
+// navBack();
+
+// // 返回上两层
+// navBack(2);
+
+// // 没有历史页面时跳转首页
+// navBack(1, '/pages/home/home');
 
 function getdeviceInfo() {
     const globalData = {
@@ -247,33 +306,33 @@ class CustomSystem {
 const customSystem = new CustomSystem()
 
 function setCheckedNodes(nodes, ids) {
-    // 处理每个第一层节点
+    const isClear = ids.length === 0;
+
     nodes.forEach((firstLayer) => {
-        // 初始化或重置计数器
+        // 每次处理都先重置
         firstLayer.checkednumber = 0;
 
-        // 递归处理子树
         const traverse = (node) => {
-            // 设置当前节点选中状态
-            const shouldCheck = ids.includes(node.id);
-            if (shouldCheck) node.checked = true;
+            if (isClear) {
+                node.checked = false;
+            } else {
+                node.checked = ids.includes(node.id);
+            }
 
-            // 统计后代节点（排除首层自身）
             if (node !== firstLayer && node.checked) {
                 firstLayer.checkednumber++;
             }
 
-            // 递归子节点
-            if (node.children) {
-                node.children.forEach((child) => traverse(child));
+            if (node.children && node.children.length) {
+                node.children.forEach(child => traverse(child));
             }
         };
 
-        // 启动当前首层节点的遍历
         traverse(firstLayer);
     });
-}
 
+    return nodes;
+}
 const formatTotal = (total) => {
     if (total < 10) return total.toString(); // 直接返回小于 10 的数
 
@@ -496,6 +555,7 @@ export const $api = {
 export default {
     $api,
     navTo,
+    navBack,
     cloneDeep,
     formatDate,
     getdeviceInfo,
@@ -513,5 +573,6 @@ export default {
     getWeeksOfMonth,
     isFutureDate,
     parseQueryParams,
-    appendScriptTagElement
+    appendScriptTagElement,
+    insertSortData
 }
\ No newline at end of file
diff --git a/components/.DS_Store b/components/.DS_Store
index e360dc4..1ef8e1f 100644
Binary files a/components/.DS_Store and b/components/.DS_Store differ
diff --git a/components/AppLayout/AppLayout.vue b/components/AppLayout/AppLayout.vue
new file mode 100644
index 0000000..57ae6dc
--- /dev/null
+++ b/components/AppLayout/AppLayout.vue
@@ -0,0 +1,146 @@
+<template>
+    <view class="app-custom-root">
+        <view
+            class="app-container"
+            :style="{ backgroundColor: backGorundColor, backgroundImage: showBgImage && `url(${img})` }"
+        >
+            <!-- 顶部头部区域 -->
+            <view
+                class="container-header"
+                :style="border ? { borderBottom: `2rpx solid ${borderColor}` } : { borderBottom: 'none' }"
+            >
+                <view class="header-btnLf">
+                    <slot name="headerleft"></slot>
+                </view>
+                <view class="header-title">
+                    <view>{{ title }}</view>
+                    <view v-show="subTitle" class="subtitle-text">{{ subTitle }}</view>
+                </view>
+                <view class="header-btnRi">
+                    <slot name="headerright"></slot>
+                </view>
+            </view>
+
+            <!-- 主体不可滚动 headContent -->
+            <view class="container-headContent">
+                <slot name="headContent"></slot>
+            </view>
+
+            <!-- 主体内容区域 -->
+            <view class="container-main">
+                <scroll-view v-if="useScrollView" scroll-y class="main-scroll" @scrolltolower="handleScrollToLower">
+                    <slot></slot>
+                </scroll-view>
+                <view class="main-scroll" v-else><slot></slot></view>
+            </view>
+
+            <!-- 底部 footer -->
+            <view class="container-footer">
+                <slot name="footer"></slot>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import img from '@/static/icon/background2.png';
+const emit = defineEmits(['onScrollBottom']);
+
+defineProps({
+    title: {
+        type: String,
+        default: '标题',
+    },
+    border: {
+        type: Boolean,
+        default: false,
+    },
+    borderColor: {
+        type: String,
+        default: '#F4F4F4',
+    },
+    subTitle: {
+        type: String,
+        default: '',
+    },
+    backGorundColor: {
+        type: String,
+        default: '#ffffff',
+    },
+    useScrollView: {
+        type: Boolean,
+        default: true,
+    },
+    showBgImage: {
+        type: Boolean,
+        default: true,
+    },
+});
+
+const handleScrollToLower = () => {
+    emit('onScrollBottom');
+};
+</script>
+
+<style lang="scss" scoped>
+.app-custom-root {
+    position: fixed;
+    z-index: 10;
+    width: 100vw;
+    height: calc(100% - var(--window-bottom));
+    overflow: hidden;
+}
+.app-container {
+    // background-image: url('@/static/icon/background2.png');
+    background-repeat: no-repeat;
+    background-position: 0 0;
+    background-size: 100% 728rpx;
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    width: 100%;
+    .container-header {
+        min-height: calc(88rpx - 14rpx);
+        text-align: center;
+        line-height: calc(88rpx - 14rpx);
+        font-size: 32rpx;
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+        align-items: center;
+        padding: 7rpx 3rpx;
+        .header-title {
+            color: #000000;
+            font-weight: bold;
+            .subtitle-text {
+                font-weight: 400;
+                font-size: 28rpx;
+                color: #333333;
+                line-height: 45rpx;
+                margin-top: -16rpx;
+                margin-bottom: 6rpx;
+            }
+        }
+        .header-btnLf,
+        .header-btnRi {
+            display: flex;
+            justify-content: flex-start;
+            align-items: center;
+            width: calc(60rpx * 3);
+        }
+        .header-btnRi {
+            justify-content: flex-end;
+        }
+    }
+}
+
+.container-main {
+    flex: 1;
+    overflow: hidden;
+}
+
+.main-scroll {
+    width: 100%;
+    height: 100%;
+}
+</style>
diff --git a/components/bing-progress/bing-progress.css b/components/bing-progress/bing-progress.css
deleted file mode 100644
index a5c5652..0000000
--- a/components/bing-progress/bing-progress.css
+++ /dev/null
@@ -1,67 +0,0 @@
-.bing-progress {
-	position: relative;
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	flex-direction: row;
-	align-items: center;
-	justify-content: space-around;
-}
-.bp-marea {
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	position: absolute;
-	left: 0;
-	top: 0;
-	flex-direction: row;
-	align-items: center;
-	text-align: center;
-	justify-content: space-around;
-	background-color: rgba(0,0,0,0);
-	z-index: 6;
-}
-.bp-mview,
-.bp-handle {
-	position: absolute;
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	align-items: center;
-	text-align: center;
-	justify-content: center;
-	z-index: 5;
-}
-.bp-handle-text {
-	text-align: center;
-	z-index: 5;
-}
-.bp-bar_max {
-	position: absolute;
-	/* #ifndef APP-NVUE */
-	display: flex;
-	/* #endif */
-	flex-direction: row;
-	align-items: center;
-	margin: 0;
-	padding: 0;
-	z-index: 1;
-	overflow: hidden;
-}
-.bp-bar_active {
-	position: absolute;
-	z-index: 3;
-}
-.bp-bar_sub_active {
-	position: absolute;
-	z-index: 2;
-}
-.bp-value {
-	position: absolute;
-	text-align: center;
-	z-index: 4;
-}
-.bp-handle-widget {
-	position: absolute;
-	z-index: 99;
-}
diff --git a/components/bing-progress/bing-progress.vue b/components/bing-progress/bing-progress.vue
deleted file mode 100644
index af59d4c..0000000
--- a/components/bing-progress/bing-progress.vue
+++ /dev/null
@@ -1,868 +0,0 @@
-<template>
-	<view class="bing-progress" :style="{width:bpWidth,height:bpHeight,borderRadius:borderRadius,
-	backgroundColor:backgroundColor,flexDirection:direction!='vertical'?'row':'column'}">
-		<!-- 进度 -->
-		<!-- #ifdef APP-NVUE -->
-		<div class="bp-bar_max"
-		:style="{width:barMaxWidth,height:barMaxHeight,backgroundColor:noActiveColor,
-		flexDirection:direction!='vertical'?'row':'column',left:barMaxLeft,borderRadius:barBorderRadius}">
-			<div class="bp-bar_sub_active"
-			:style="{width:barSubActiveWidth,height:barSubActiveHeight,backgroundColor:subActiveColor,
-			top:subActiveTop,bottom:subActiveBottom,left:subActiveLeft,right:subActiveRight,borderRadius:isActiveCircular?barBorderRadius:0}"></div>
-			<div class="bp-bar_active"
-			:style="{width:barActiveWidth,height:barActiveHeight,backgroundColor:activeColor,
-			top:activeTop,bottom:activeBottom,left:activeLeft,right:activeRight,borderRadius:isActiveCircular?barBorderRadius:0}"></div>
-		</div>
-		<!-- #endif -->
-		<!-- #ifndef APP-NVUE -->
-		<view class="bp-bar_max"
-		:style="{width:barMaxWidth,height:barMaxHeight,backgroundColor:noActiveColor,borderRadius:barBorderRadius,
-		flexDirection:direction!='vertical'?'row':'column',left:barMaxLeft}">
-			<view class="bp-bar_sub_active"
-			:style="{width:barSubActiveWidth,height:barSubActiveHeight,backgroundColor:subActiveColor,
-			top:subActiveTop,bottom:subActiveBottom,left:subActiveLeft,right:subActiveRight,borderRadius:isActiveCircular?barBorderRadius:0}"></view>
-			<view class="bp-bar_active"
-			:style="{width:barActiveWidth,height:barActiveHeight,backgroundColor:activeColor,
-			top:activeTop,bottom:activeBottom,left:activeLeft,right:activeRight,borderRadius:isActiveCircular?barBorderRadius:0}"></view>
-		</view>
-		<!-- #endif -->
-		<movable-area id="bp-marea" class="bp-marea" @touchmove.stop.prevent="touchmove" @touchstart.stop.prevent="touchstart" @touchcancel="touchend" @touchend="touchend"
-		:style="{width:mareaWidth,height:mareaHeight,left:mareaLeft}">
-			<!-- 拖柄 -->
-			<movable-view id="bp-mview" class="bp-mview" :direction="direction=='vertical'?'vertical':'horizontal'" :animation="false"
-			 :disabled="true" :x="handleX" :y="handleY" friction="10" damping="100"
-			:style="{width:mhandleWidth,height:mhandleHeight,backgroundColor:handleColor,
-			borderRadius:handleBorderRadius,fontSize:infoFontSize,top:mhandleTop}">
-				<view id="bp-handle" class="bp-handle" :style="{fontSize:infoFontSize,width:mhandleWidth,height:mhandleHeight,borderRadius:handleBorderRadius}">
-					<image class="bp-handle-img" :src="handleImgUrl" v-if="handleImgUrl" 
-					:style="{fontSize:infoFontSize,width:mhandleWidth,height:mhandleHeight,borderRadius:handleBorderRadius}"></image>
-					<!-- 进度值 -->
-					<text class="bp-handle-text" v-if="handleImgUrl=='' && infoAlign=='handle' && showInfo" 
-					:style="{fontSize:infoFontSize,color:infoColor,width:mhandleWidth,height:textHeight,borderRadius:'20px'}">{{ infoContent=='subValue'?msubValue:showValue }}{{ infoEndText }}</text>
-					<!-- 挂件 -->
-					<!-- #ifndef APP-NVUE -->
-					<!-- 图片挂件 -->
-					<image v-if="widgetPos=='top' && widgetUrl" class="bp-handle-widget" :src="widgetUrl" :style="{flexDirection: 'column',borderRadius:mwidgetBorderRadius, bottom: moffset,width:mwidgetWidth,height:mwidgetHeight,opacity:widgetOpacity,transform: mwidgetAngle}"></image>
-					<image v-if="widgetPos=='right' && widgetUrl" class="bp-handle-widget" :src="widgetUrl" :style="{flexDirection: 'row',borderRadius:mwidgetBorderRadius,left: moffset,width:mwidgetWidth,height:mwidgetHeight,opacity:widgetOpacity,transform: mwidgetAngle}"></image>
-					<image v-if="widgetPos=='bottom' && widgetUrl" class="bp-handle-widget" :src="widgetUrl" :style="{flexDirection: 'column',borderRadius:mwidgetBorderRadius,top: moffset,width:mwidgetWidth,height:mwidgetHeight,opacity:widgetOpacity,transform: mwidgetAngle}"></image>
-					<image v-if="widgetPos=='left' && widgetUrl" class="bp-handle-widget" :src="widgetUrl" :style="{flexDirection: 'row',borderRadius:mwidgetBorderRadius,right: moffset,width:mwidgetWidth,height:mwidgetHeight,opacity:widgetOpacity,transform: mwidgetAngle}"></image>
-					<!-- 自定义元素挂件 -->
-					<view v-if="widgetPos=='top' && widgetUrl==''" class="bp-handle-widget" :style="{flexDirection: 'column',borderRadius:mwidgetBorderRadius,bottom: moffset,width:mwidgetWidth,height:mwidgetHeight,opacity:widgetOpacity,transform: mwidgetAngle}">
-						<slot/>
-					</view>
-					<view v-if="widgetPos=='right' &&  widgetUrl==''" class="bp-handle-widget" :style="{flexDirection: 'row',borderRadius:mwidgetBorderRadius,left: moffset,width:mwidgetWidth,height:mwidgetHeight,opacity:widgetOpacity,transform: mwidgetAngle}">
-						<slot/>
-					</view>
-					<view v-if="widgetPos=='bottom' && widgetUrl==''" class="bp-handle-widget" :style="{flexDirection: 'column',borderRadius:mwidgetBorderRadius,top: moffset,width:mwidgetWidth,height:mwidgetHeight,opacity:widgetOpacity,transform: mwidgetAngle}">
-						<slot/>
-					</view>
-					<view v-if="widgetPos=='left' && widgetUrl==''" class="bp-handle-widget" :style="{flexDirection: 'row',borderRadius:mwidgetBorderRadius,right: moffset,width:mwidgetWidth,height:mwidgetHeight,opacity:widgetOpacity,transform: mwidgetAngle}">
-						<slot/>
-					</view>
-					<!-- #endif -->
-				</view>
-			</movable-view>
-		</movable-area>
-		<!-- 进度值 -->
-		<text class="bp-value" v-if="showValueState() || (infoAlign=='center'&&direction!='vertical' && showInfo)" 
-		:style="{color:infoColor,fontSize:infoFontSize,left:valueLeft,width:valueWidth()+'px'}">{{ infoContent=='subValue'?msubValue:showValue }}{{ infoEndText }}</text>
-	</view>
-</template>
-
-<script>
-	/**
-	 * 进度条，副进度条
-	 */
-	export default {
-		created() {
-			/**
-			 * 获取系统屏幕信息，用于后续单位换算
-			 */
-			const systemInfo = uni.getSystemInfoSync()
-			this.px2rpx = 750 / systemInfo.screenWidth
-			this.screenWidth = systemInfo.screenWidth
-			this.screenHeight = systemInfo.screenHeight
-		},
-		mounted() {
-			// #ifndef APP-NVUE
-			/**
-			 * 非NVUE movable-area 滑动事件获取到的位置是相对于文档的，获取组件位置，用于计算滑块位置
-			 */
-			this.updateRect()
-			// #endif
-			this.mmax = this.valueFormat(this.max,false)
-			this.percent = Math.abs((this.valueFormat(this.value) - this.min) / (this.mmax - this.min))
-			this.subPercent = Math.abs((this.valueFormat(this.subValue,true) - this.min) / (this.mmax - this.min))
-			if(this.reverse) {
-				if(this.direction!='vertical') {
-					this.handleX = (1 - this.percent) * this.barMaxLength
-				}
-				else {
-					this.handleY = this.percent * this.barMaxLength
-				}
-			}
-			else {
-				if(this.direction!='vertical') {
-					this.handleX = this.percent * this.barMaxLength
-				}
-				else {
-					this.handleY = (1 - this.percent) * this.barMaxLength
-				}
-			}
-			if(this.bpname=='test') {
-				console.log(this.mainInfo)
-			}
-		},
-		/**
-		 * sub表示副进度条属性
-		 */
-		props: {
-			// 组件名字
-			bpname: {
-				type: String,
-				default: ''
-			},
-			width: {
-				type: String,
-				default: '300px'
-			},
-			strokeWidth: {
-				type: String,
-				default: '30px'
-			},
-			backgroundColor: {
-				type: String,
-				default: 'rgba(0,0,0,0)'
-			},
-			noActiveColor: {
-				type: String,
-				default: "#00ffff"
-			},
-			activeColor: {
-				type: String,
-				default: "#0000ff"
-			},
-			subActiveColor: {
-				type: String,
-				default: "#ffaaaa"
-			},
-			handleColor: {
-				type: String,
-				default: "#ffff00"
-			},
-			infoColor: {
-				type: String,
-				default: "#000000"
-			},
-			// 整个进度条的外边界圆角半径
-			borderRadius: {
-				type: String,
-				default: '5px'
-			},
-			// 进度条内部滑轨圆角半径
-			barBorderRadius: {
-				type: String,
-				default: '5px'
-			},
-			// active and subActive 是否显示圆角 NVUE默认true，其他默认false
-			// #ifdef APP-NVUE
-			isActiveCircular: {
-				type: Boolean,
-				default: true
-			},
-			// #endif
-			// #ifndef APP-NVUE
-			isActiveCircular: {
-				type: Boolean,
-				default: false
-			},
-			// #endif
-			handleWidth: {
-				type: String,
-				default: '50px'
-			},
-			handleHeight: {
-				type: String,
-				default: '40px'
-			},
-			handleBorderRadius: {
-				type: String,
-				default: '5px'
-			},
-			handleImgUrl: {
-				type: String,
-				default: ''
-			},
-			disabled: {
-				type: Boolean,
-				default: false
-			},
-			direction: {
-				type: String,
-				default: 'horizontal'
-			},
-			infoEndText: {
-				type: String,
-				default: ""
-			},
-			infoFontSize: {
-				type: String,
-				default: '18px'
-			},
-			showInfo: {
-				type: Boolean,
-				default: true
-			},
-			// 进度值显示value还是subValue
-			infoContent: {
-				type: String,
-				default: 'value'
-			},
-			// 进度值显示位置 left, right, center, handle
-			infoAlign: {
-				type: String,
-				default: 'right'
-			},
-			max: {
-				type: Number,
-				default: 100
-			},
-			min: {
-				type: Number,
-				default: 0
-			},
-			value: {
-				type: Number,
-				default: 0
-			},
-			subValue: {
-				type: Number,
-				default: 0
-			},
-			step: {
-				type: Number,
-				default: 1
-			},
-			// 副进度条步长
-			subStep: {
-				type: Number,
-				default: 1
-			},
-			// true连续滑动，false步进，即以step的间隔变化
-			continuous: {
-				type: Boolean,
-				default: true
-			},
-			// 副进度条continuous
-			subContinuous: {
-				type: Boolean,
-				default: true
-			},
-			reverse: {
-				type: Boolean,
-				default: false
-			},
-			// 挂件位置 top, right, bottom, left
-			widgetPos: {
-				type: String,
-				default: "top"
-			},
-			widgetHeight: {
-				type: [String,Number],
-				default: '40px'
-			},
-			widgetWidth: {
-				type: [String,Number],
-				default: '50px'
-			},
-			widgetBorderRadius: {
-				type: [String,Number],
-				default: '5px'
-			},
-			// 挂件不透明度 0完全透明 1不透明
-			widgetOpacity: {
-				type: [String,Number],
-				default: 1
-			},
-			// 挂件距离组件的偏移量，正数原理组件，负数靠近组件
-			widgetOffset: {
-				type: [String,Number],
-				default: '0px'
-			},
-			// 挂件图片
-			widgetUrl: {
-				type: String,
-				default: ''
-			},
-			// 挂件旋转角度
-			widgetAngle: {
-				type: [String,Number],
-				default: 0
-			}
-		},
-		data() {
-			return {
-				handleX: 50,
-				handleY: 0,
-				px2rpx: 1,
-				percent: 0, // 0-1
-				subPercent: 0, // 0-1
-				mainInfo: {
-					left: 0,
-					top: 0,
-					bottom: 0,
-					right: 0
-				},
-				touchState: false,
-				screenHeight: 0,
-				screenWidth: 0,
-				msubValue: 0,
-				moveable: true,
-				lastTouchTime: 0,
-				mmax: 100
-			}
-		},
-		watch: {
-			/**
-			 * @param {Object} newValue
-			 * @param {Object} oldValue
-			 */
-			value(newValue, oldValue) {
-				if(!this.touchState) {
-					newValue = this.valueSetBoundary(newValue)
-					this.percent = Math.abs((newValue - this.min) / (this.mmax - this.min))
-				}
-			},
-			showValue(newValue, oldValue) {
-				// 步进
-				if(!this.continuous) {
-					let percent
-					if(this.reverse) {
-						if(this.direction!='vertical') {
-							percent = Math.abs(1 - (newValue - this.min) / (this.mmax - this.min))
-							this.handleX = percent * this.barMaxLength
-						}
-						else {
-							percent = Math.abs((newValue - this.min) / (this.mmax - this.min))
-							this.handleY = percent * this.barMaxLength
-						}
-					}
-					else {
-						if(this.direction!='vertical') {
-							percent = Math.abs((newValue - this.min) / (this.mmax - this.min))
-							this.handleX = percent * this.barMaxLength
-						}
-						else {
-							percent = (1 - Math.abs((newValue - this.min) / (this.mmax - this.min)))
-							this.handleY = percent * this.barMaxLength
-						}
-					}
-					
-				}
-				this.$emit("change", {bpname: this.bpname,type: 'change',value:this.showValue,subValue:this.msubValue})
-				this.$emit("valuechange", {bpname: this.bpname,type: 'valuechange',value:this.showValue,subValue:this.msubValue})
-			},
-			percent(newValue, oldValue) {
-				// 连续
-				if(this.continuous) {
-					if(this.reverse) {
-						if(this.direction!='vertical') {
-							this.handleX = (1 - newValue) * this.barMaxLength
-						}
-						else {
-							this.handleY = newValue * this.barMaxLength
-						}
-					}
-					else {
-						if(this.direction!='vertical') {
-							this.handleX = newValue * this.barMaxLength
-						}
-						else {
-							this.handleY = (1 - newValue) * this.barMaxLength
-						}
-					}
-				}
-			},
-			subValue(newValue, oldValue) {
-				newValue = this.valueSetBoundary(newValue)
-				
-				if(this.subContinuous) {
-					this.msubValue = newValue
-				}
-				else {
-					this.msubValue = this.valueFormat(newValue, true)
-				}
-				this.subPercent = Math.abs((newValue - this.min) / (this.mmax - this.min))
-				this.$emit("change", {bpname: this.bpname,type: 'change',value:this.showValue,subValue:this.msubValue})
-				this.$emit("subvaluechange", {bpname: this.bpname,type: 'subvaluechange',value:this.showValue,subValue:this.msubValue})
-				
-			},
-			max(newValue,oldValue) {
-				this.mmax = this.valueFormat(newValue,false)
-			}
-		},
-		computed: {
-			bpWidth() {
-				if(this.direction=="vertical") {
-					return this.maxHeight()[2]
-				}
-				return this.sizeDeal(this.width)[2]
-			},
-			bpHeight() {
-				if(this.direction=="vertical") {
-					return this.sizeDeal(this.width)[2]
-				}
-				return this.maxHeight()[2]
-			},
-			mareaWidth() {
-				if(this.direction=="vertical") {
-					return this.maxHeight()[2]
-				}
-				let width = this.sizeDeal(this.width)[0]
-				return (width - this.textWidth()) + 'px'
-			},
-			mareaHeight() {
-				if(this.direction=="vertical") {
-					let width = this.sizeDeal(this.width)[0]
-					return (width - this.textWidth()) + 'px'
-				}
-				return this.maxHeight()[2]
-			},
-			mareaLeft() {
-				if(this.showValueState()) {
-					if(this.infoAlign == 'left') {
-						return this.textWidth() + 'px'
-					}
-				}
-				return 0
-			},
-			barMaxHeight() {
-				if(this.direction=="vertical") {
-					let width = this.sizeDeal(this.width)[0]
-					let handleWidth = this.sizeDeal(this.handleWidth)
-					return (width - this.textWidth() - handleWidth[0]) + 'px'
-				}
-				return this.sizeDeal(this.strokeWidth)[2]
-			},
-			barMaxWidth() {
-				if(this.direction=="vertical") {
-					return this.sizeDeal(this.strokeWidth)[2]
-				}
-				let width = this.sizeDeal(this.width)[0]
-				let handleWidth = this.sizeDeal(this.handleWidth)
-				return (width - this.textWidth() - handleWidth[0]) + 'px'
-			},
-			barMaxLeft() {
-				if(this.showValueState()) {
-					if(this.infoAlign == 'left') {
-						return this.textWidth() + this.sizeDeal(this.handleWidth)[0] / 2 + 'px'
-					}
-				}
-				if(this.direction != 'vertical') {
-					return this.sizeDeal(this.handleWidth)[0] / 2 + 'px'
-				}
-				// vertical
-				return (this.maxHeight()[0] - this.sizeDeal(this.strokeWidth)[0]) / 2 + 'px'
-				
-			},
-			activeRight() {
-				if(this.reverse) {
-					return 0
-				}
-				return 'unset'
-			},
-			activeLeft() {
-				if(this.reverse) {
-					return 'unset'
-				}
-				return 0
-			},
-			activeTop() {
-				if(this.reverse) {
-					return 0
-				}
-				return 'unset'
-			},
-			activeBottom() {
-				if(this.reverse) {
-					return 'unset'
-				}
-				return 0
-			},
-			barActiveWidth() {
-				if(this.direction=="vertical") {
-					return this.sizeDeal(this.strokeWidth)[2]
-				}
-				let percent
-				if(this.continuous) {
-					percent = this.percent
-				}
-				else {
-					percent = Math.abs((this.showValue - this.min) / (this.mmax - this.min))
-				}
-				return this.barMaxLength * percent + 'px'
-			},
-			barActiveHeight() {
-				if(this.direction=="vertical") {
-					let percent
-					if(this.continuous) {
-						percent = this.percent
-					}
-					else {
-						percent = Math.abs((this.showValue - this.min) / (this.mmax - this.min))
-					}
-					return this.barMaxLength * percent + 'px'
-				}
-				return this.sizeDeal(this.strokeWidth)[2]
-			},
-			subActiveTop() {
-				if(this.reverse) {
-					return 0
-				}
-				return 'unset'
-			},
-			subActiveBottom() {
-				if(this.reverse) {
-					return 'unset'
-				}
-				return 0
-			},
-			subActiveRight() {
-				if(this.reverse) {
-					return 0
-				}
-				return 'unset'
-			},
-			subActiveLeft() {
-				if(this.reverse) {
-					return 'unset'
-				}
-				return 0
-			},
-			barSubActiveWidth() {
-				if(this.direction == "vertical") {
-					return this.sizeDeal(this.strokeWidth)[2]
-				}
-				if(this.subContinuous) {
-					return this.barMaxLength * this.subPercent + 'px'
-				}
-				else {
-					return this.barMaxLength * Math.abs((this.msubValue - this.min) / (this.mmax - this.min)) + 'px'
-				}
-				
-			},
-			barSubActiveHeight() {
-				if(this.direction == "vertical") {
-					if(this.subContinuous) {
-						return this.barMaxLength * this.subPercent + 'px'
-					}
-					else {
-						this.barMaxLength * Math.abs((this.msubValue - this.min) / (this.mmax - this.min)) + 'px'
-					}
-					
-				}
-				return this.sizeDeal(this.strokeWidth)[2]
-			},
-			mhandleWidth() {
-				if(this.direction == "vertical") {
-					return this.sizeDeal(this.handleHeight)[2]
-				}
-				return this.sizeDeal(this.handleWidth)[2]
-			},
-			mhandleHeight() {
-				if(this.direction == "vertical") {
-					return this.sizeDeal(this.handleWidth)[2]
-				}
-				return this.sizeDeal(this.handleHeight)[2]
-			},
-			mhandleTop() {
-				if(this.direction == 'vertical') {
-					return 0
-				}
-				else {
-					// 拖柄垂直居中
-					let handle = this.sizeDeal(this.handleHeight)[0]
-					let top = this.maxHeight()[0] / 2 - handle / 2 + 'px'
-					return top
-				}
-			},
-			showValue() {
-				return this.valueFormat(this.percent * (this.mmax - this.min) + this.min)
-			},
-			textHeight() {
-				let infoSize = this.sizeDeal(this.infoFontSize)
-				return infoSize[0]*1.2 + infoSize[1]
-			},
-			valueLeft() {
-				if(this.infoAlign=='left') {
-					return 0
-				}
-				else if(this.infoAlign == 'center') {
-					let width = this.sizeDeal(this.width)
-					return width[0]/2 - this.valueWidth()/2 + 'px'
-				}
-				else if(this.infoAlign=='right'){
-					let width = this.sizeDeal(this.width)
-					return width[0] - this.textWidth() + 'px'
-				}
-				return 0
-			},
-			barMaxLength() {
-				let width = this.sizeDeal(this.width)[0]
-				let handleWidth = this.sizeDeal(this.handleWidth)
-				return width - this.textWidth() - handleWidth[0]
-			},
-			mwidgetWidth() {
-				return this.sizeDeal(this.widgetWidth)[2];
-			},
-			mwidgetHeight() {
-				return this.sizeDeal(this.widgetHeight)[2];
-			},
-			moffset() {
-				let off = this.sizeDeal(this.widgetOffset);
-				// console.log(off)
-				switch(this.widgetPos) {
-					case 'top':
-						return this.sizeDeal(this.mhandleHeight)[0] + off[0] + 'px'
-					case 'right':
-						return this.sizeDeal(this.mhandleWidth)[0] + off[0] + 'px'
-					case 'bottom':
-						return this.sizeDeal(this.mhandleHeight)[0] + off[0] + 'px'
-					case 'left':
-						return this.sizeDeal(this.mhandleWidth)[0] + off[0] + 'px'
-				}
-				return 0
-			},
-			mwidgetBorderRadius() {
-				return this.sizeDeal(this.widgetBorderRadius)[2];
-			},
-			mwidgetAngle() {
-				return "rotate("+Number(this.widgetAngle)+"deg)"
-			}
-		},
-		methods: {
-			prevent(e) {
-				console.log(1)
-			},
-			updateRect() {
-				// #ifndef APP-NVUE
-				/**
-				 * 非NVUE movable-area 滑动事件获取到的位置是相对于文档的，获取组件位置，用于计算滑块位置
-				 */
-				let query = uni.createSelectorQuery().in(this)
-				query.select('.bing-progress').boundingClientRect(data => {
-					this.mainInfo.top = data.top
-					this.mainInfo.left = data.left
-					this.mainInfo.bottom = data.bottom
-					this.mainInfo.right = data.right
-				}).exec()
-				// #endif
-			},
-			touchstart(e) {
-				if(!this.disabled) {
-					// #ifdef APP-NVUE
-					e.stopPropagation()
-					e.target.attr.preventGesture = true
-					if(this.direction == 'vertical' && e.target.attr.id != 'bp-mview' && (e.timestamp - this.lastTouchTime > 100)) {
-						this.moveable = false
-					}
-					this.lastTouchTime = e.timestamp
-					// #endif
-					// #ifndef APP-NVUE
-					/**
-					 * 防止组件在文档流中的位置被修改，导致组件进度值异常
-					 */
-					this.updateRect()
-					// #endif
-					// 阻止组件信息异常情况下的进度值修改
-					if(this.mainInfo.top > this.screenHeight) {
-						this.$emit("dragstart", {bpname: this.bpname,type: 'dragstart',value:this.showValue,subValue:this.msubValue})
-						return
-					}
-					this.touchState = true
-					let detail = e.changedTouches[0]
-					this.handleMove(detail)
-					this.$emit("dragstart", {bpname: this.bpname,type: 'dragstart',value:this.showValue,subValue:this.msubValue})
-				}
-			},
-			touchmove(e) {
-				if(!this.disabled) {
-					let detail = e.changedTouches[0]
-					this.handleMove(detail)
-					this.$emit("dragging", {bpname: this.bpname,type: 'dragging',value:this.showValue,subValue:this.msubValue})
-				}
-			},
-			touchend(e) {
-				if(!this.disabled) {
-					// #ifdef APP-NVUE
-					if(!this.moveable) {
-						this.moveable = true
-						return
-					}
-					// #endif
-					let detail = e.changedTouches[0]
-					this.handleMove(detail)
-					this.touchState = false
-					this.$emit("dragend", {bpname: this.bpname,type: 'dragend',value:this.showValue,subValue:this.msubValue})
-				}
-			},
-			handleMove(detail) {
-				let width = this.sizeDeal(this.width)[0]
-				let handleWidth = this.sizeDeal(this.handleWidth)
-				let percent
-				if(this.direction!='vertical') {
-					if(this.infoAlign=='left') {
-						// #ifndef APP-NVUE
-						percent = (detail.pageX - this.mainInfo.left - this.textWidth() - handleWidth[0]/2)/ this.barMaxLength
-						// #endif
-						// #ifdef APP-NVUE
-						percent = (detail.pageX  - handleWidth[0]/2)/ this.barMaxLength
-						// #endif
-					}
-					else {
-						// #ifndef APP-NVUE
-						percent = (detail.pageX - this.mainInfo.left - handleWidth[0]/2)/ this.barMaxLength
-						// #endif
-						// #ifdef APP-NVUE
-						percent = (detail.pageX - handleWidth[0]/2)/ this.barMaxLength
-						// #endif
-					}
-				}
-				else {
-					// #ifdef APP-NVUE
-					percent = 1 - (detail.pageY - handleWidth[0]/2- 1) / this.barMaxLength
-					// #endif
-					// #ifndef APP-NVUE
-					percent = 1 - (detail.clientY - this.mainInfo.top - handleWidth[0]/2)/ this.barMaxLength
-					// #endif
-				}
-				percent = percent > 0 ? percent : 0
-				percent = percent < 1 ? percent : 1
-				if(this.reverse) {
-					this.percent = 1 - percent
-				}
-				else {
-					this.percent = percent
-				}
-			},
-			showValueState() {
-				if(this.direction != 'vertical' && this.showInfo && (this.infoAlign=='left' || this.infoAlign=='right')) {
-					return true
-				}
-				return false
-			},
-			valueSetBoundary(value) {
-				// 控制value在合法范围内
-				if(this.mmax > this.min) {
-					value = value < this.mmax ? value : this.mmax
-					value = value > this.min ? value : this.min
-				}
-				else {
-					value = value > this.mmax ? value : this.mmax
-					value = value < this.min ? value : this.min
-				}
-				return value
-			},
-			/**
-			 * @param {Object} v
-			 * @param {Object} isSub 是否是副副进度条
-			 */
-			valueFormat (v,isSub){
-				// set step
-				v = this.valueSetBoundary(v)
-				let stepInfo = this.stepInfo(isSub)
-				v = Number(v - this.min).toFixed(stepInfo[1])
-				let step = stepInfo[0] * 10 ** stepInfo[1]
-				let valueE = v * 10 ** stepInfo[1]
-				let remainder = valueE % step
-				let remainderInt = Math.floor(remainder)
-				// 对余数四舍五入0-1
-				let sub = Math.round(remainder / step)
-				let value = (Math.floor(valueE) - remainderInt + sub*step) / (10 ** stepInfo[1])
-				value = Number((value + this.min).toFixed(stepInfo[1]))
-				return value
-			},
-			/**
-			 * @param {Object} v
-			 * @param {Object} isSub 是否是副副进度条
-			 */
-			stepInfo(isSub) {
-				// return step, decimal位数
-				let step 
-				if(isSub) {
-					step = Number(this.subStep)
-				}
-				else {
-					step = Number(this.step)
-				}
-				
-				if (step <= 0 || !step){
-					return [1, 0]
-				}
-				else{
-					let steps = step.toString().split('.')
-					if (steps.length == 1){
-						return [step,0]
-					}
-					else {
-						return [step,steps[1].length]
-					}
-				}
-			},
-			textWidth() {
-				if(this.showValueState()) {
-					let numWidth = this.mmax.toString().length> this.min.toString().length? this.mmax.toString().length: this.min.toString().length
-					let textWidth = ((numWidth + this.stepInfo()[1]) * 0.7 + this.infoEndText.length) * this.sizeDeal(this.infoFontSize)[0]
-					return Number(textWidth.toFixed(2))
-				}
-				return 0
-			},
-			valueWidth() {
-				let numWidth = this.mmax.toString().length> this.min.toString().length? this.mmax.toString().length: this.min.toString().length
-				let textWidth = ((numWidth + this.stepInfo()[1]) * 0.7 + this.infoEndText.length) * this.sizeDeal(this.infoFontSize)[0]
-				return Number(textWidth.toFixed(2))
-			},
-			maxHeight() {
-				let h = []
-				if (this.direction!='vertical'){ // direction 为 vertical 时不显示info
-					let subt = this.infoEndText.match(/[^\x00-\xff]/g)
-					if (subt){
-						h.push(this.sizeDeal(this.infoFontSize)[0] * 1.1)
-					}
-					else{
-						h.push(this.sizeDeal(this.infoFontSize)[0])
-					}
-				}
-				h.push(this.sizeDeal(this.strokeWidth)[0])
-				h.push(this.sizeDeal(this.handleHeight)[0])
-				h.sort(function(a, b) {
-					return b - a
-				}) // 降序
-				return [h[0], 'px', h[0] + 'px']
-			},
-			sizeDeal(size) {
-				// 分离字体大小和单位,rpx 转 px
-				let s = Number.isNaN(parseFloat(size)) ? 0 : parseFloat(size)
-				let u = size.toString().replace(/[0-9\.]/g, '')
-				if (u == 'rpx') {
-					s /= this.px2rpx
-					u = 'px'
-				}else if (u == 'vw') {
-					u = 'px'
-					s = s / 100 * this.screenWidth
-				} else if(u == 'vh') {
-					u = 'px'
-					s = s / 100 * this.screenHeight
-				} else{
-					u = 'px'
-				}
- 				
-				return [s, u, s + u]
-			},
-		}
-	}
-</script>
-
-<style scoped>
-	@import "bing-progress.css"
-</style>
diff --git a/components/convert-distance/convert-distance.vue b/components/convert-distance/convert-distance.vue
index 67544ab..a50ba27 100644
--- a/components/convert-distance/convert-distance.vue
+++ b/components/convert-distance/convert-distance.vue
@@ -1,15 +1,17 @@
 <template>
-    <span style="padding-left: 16rpx">{{ tofixedAndKmM(distance) }}</span>
+    <span style="padding-left: 16rpx">{{ distance }}</span>
 </template>
 
 <script setup>
-import { inject } from 'vue';
+import { inject, computed, watch } from 'vue';
 const { haversine, getDistanceFromLatLonInKm } = inject('globalFunction');
-const { alat, along, blat, blong } = defineProps(['alat', 'along', 'blat', 'blong']);
-const distance = getDistanceFromLatLonInKm(alat, along, blat, blong);
-function tofixedAndKmM(data) {
-    const { km, m } = data;
-    if (!alat && !along) {
+const props = defineProps(['alat', 'along', 'blat', 'blong']);
+
+const distance = computed(() => {
+    const distance2 = getDistanceFromLatLonInKm(props.alat, props.along, props.blat, props.blong);
+    // console.log(distance2, props.alat, props.along, props.blat, props.blong);
+    const { km, m } = distance2;
+    if (!props.alat && !props.along) {
         return '--km';
     }
     if (km > 1) {
@@ -17,7 +19,8 @@ function tofixedAndKmM(data) {
     } else {
         return m.toFixed(2) + 'm';
     }
-}
+    return '';
+});
 </script>
 
 <style></style>
diff --git a/components/custom-popup/custom-popup.vue b/components/custom-popup/custom-popup.vue
deleted file mode 100644
index adf4b96..0000000
--- a/components/custom-popup/custom-popup.vue
+++ /dev/null
@@ -1,134 +0,0 @@
-<template>
-    <view
-        v-if="visible"
-        class="tianditu-popop"
-        :style="{ height: winHeight + 'px', width: winWidth + 'px', top: winTop + 'px' }"
-    >
-        <view v-if="header" class="popup-header" @click="close">
-            <slot name="header"></slot>
-        </view>
-        <view :style="{ minHeight: contentHeight + 'vh' }" class="popup-content fadeInUp animated">
-            <slot></slot>
-        </view>
-    </view>
-</template>
-
-<script>
-export default {
-    name: 'custom-popup',
-    data() {
-        return {
-            winWidth: 0,
-            winHeight: 0,
-            winTop: 0,
-            contentHeight: 30,
-        };
-    },
-    props: {
-        visible: {
-            type: Boolean,
-            require: true,
-            default: false,
-        },
-        hide: {
-            type: Number,
-            default: 0,
-        },
-        header: {
-            type: Boolean,
-            default: true,
-        },
-        contentH: {
-            type: Number,
-            default: 30,
-        },
-    },
-    created() {
-        var that = this;
-        if (this.contentH) {
-            this.contentHeight = this.contentH;
-        }
-        uni.getSystemInfo({
-            success: function (res) {
-                if (that.hide === 0) {
-                    that.winWidth = res.screenWidth;
-                    that.winHeight = res.screenHeight;
-                    that.winTop = 0;
-                } else {
-                    that.winWidth = res.windowWidth;
-                    that.winHeight = res.windowHeight;
-                    that.winTop = res.windowTop;
-                }
-            },
-        });
-    },
-    methods: {
-        close(e) {
-            this.$emit('onClose');
-        },
-    },
-};
-</script>
-
-<style scoped>
-.tianditu-popop {
-    position: fixed;
-    left: 0;
-    z-index: 999;
-    background-color: rgba(0, 0, 0, 0.6);
-    display: flex;
-    flex-direction: column;
-}
-
-.popup-header {
-    flex: 1;
-}
-
-.popup-content {
-    background-color: #ffffff;
-    min-height: 300px;
-    width: 100%;
-    /*     position: absolute;
-        bottom: 0;
-        left: 0; */
-}
-
-/*base code*/
-.animated {
-    -webkit-animation-duration: 1s;
-    animation-duration: 1s;
-    -webkit-animation-fill-mode: both;
-    animation-fill-mode: both;
-}
-
-.animated.infinite {
-    -webkit-animation-iteration-count: infinite;
-    animation-iteration-count: infinite;
-}
-
-.animated.hinge {
-    -webkit-animation-duration: 2s;
-    animation-duration: 2s;
-}
-
-@keyframes fadeInUp {
-    0% {
-        opacity: 0;
-        -webkit-transform: translate3d(0, 100%, 0);
-        -ms-transform: translate3d(0, 100%, 0);
-        transform: translate3d(0, 100%, 0);
-    }
-
-    100% {
-        opacity: 1;
-        -webkit-transform: none;
-        -ms-transform: none;
-        transform: none;
-    }
-}
-
-.fadeInUp {
-    -webkit-animation-name: fadeInUp;
-    animation-name: fadeInUp;
-}
-</style>
diff --git a/components/empty/empty.vue b/components/empty/empty.vue
new file mode 100644
index 0000000..4344136
--- /dev/null
+++ b/components/empty/empty.vue
@@ -0,0 +1,84 @@
+<template>
+    <view class="empty" :style="{ background: bgcolor, marginTop: mrTop + 'rpx' }">
+        <view class="ty_content" :style="{ paddingTop: pdTop + 'rpx' }">
+            <view class="content_top btn-shaky">
+                <image v-if="pictrue" :src="pictrue" mode=""></image>
+                <image v-else src="@/static/icon/empty.png" mode=""></image>
+            </view>
+            <view class="content_c">{{ content }}</view>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+    data() {
+        return {};
+    },
+    props: {
+        content: {
+            type: String,
+            required: false,
+            default: '暂时没有结果，下一秒也许就有惊喜',
+        },
+        bgcolor: {
+            type: String,
+            required: false,
+            default: 'transparent',
+        },
+        pdTop: {
+            type: String,
+            required: false,
+            default: '80',
+        },
+        mrTop: {
+            type: String,
+            required: false,
+            default: '20',
+        },
+        pictrue: {
+            type: String,
+            required: false,
+            default: '',
+        },
+    },
+    methods: {},
+};
+</script>
+
+<style lang="scss" scoped>
+image {
+    width: 100%;
+    height: 100%;
+}
+.empty {
+    width: 100%;
+    min-height: 100vh;
+    position: relative;
+    .ty_content {
+        position: absolute;
+        left: 50%;
+        top: 0;
+        transform: translate(-50%, 0);
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        .content_top {
+            width: 450rpx;
+            height: 322rpx;
+        }
+        .content_c {
+            margin-top: 32rpx;
+            color: #6a707c;
+            font-size: 28rpx;
+            width: 512rpx;
+            height: 44rpx;
+            font-weight: 400;
+            font-size: 32rpx;
+            color: #000000;
+            text-align: center;
+        }
+    }
+}
+</style>
diff --git a/components/expected-station/expected-station.vue b/components/expected-station/expected-station.vue
index 4ba4699..3cd0f92 100644
--- a/components/expected-station/expected-station.vue
+++ b/components/expected-station/expected-station.vue
@@ -14,12 +14,18 @@
                     @click="changeStationLog(item)"
                 >
                     {{ item.label }}
-                    <view class="positionNum" v-show="item.checkednumber">
+                    <!-- <view class="positionNum" v-show="item.checkednumber">
                         {{ item.checkednumber }}
-                    </view>
+                    </view> -->
                 </view>
             </scroll-view>
-            <scroll-view :show-scrollbar="false" :scroll-y="true" class="sex-content-right">
+            <scroll-view
+                :show-scrollbar="false"
+                :scroll-top="scrollTop"
+                @scroll="scrollTopBack"
+                :scroll-y="true"
+                class="sex-content-right"
+            >
                 <view v-for="item in rightValue" :key="item.id">
                     <view class="secondary-title">{{ item.label }}</view>
                     <view class="grid-sex">
@@ -50,6 +56,7 @@ export default {
             rightValue: [],
             stationCateLog: 0,
             copyTree: [],
+            scrollTop: 0,
         };
     },
     props: {
@@ -86,9 +93,14 @@ export default {
         changeStationLog(item) {
             this.leftValue = item;
             this.rightValue = item.children;
+            this.scrollTop = 0;
+        },
+        scrollTopBack(e) {
+            this.scrollTop = e.detail.scrollTop;
         },
         addItem(item) {
             let titiles = [];
+            let labels = [];
             let count = 0;
 
             // 先统计已选中的职位数量
@@ -121,13 +133,18 @@ export default {
                         // 统计被选中的第三层节点
                         if (thirdLayer.checked) {
                             titiles.push(`${thirdLayer.id}`);
+                            labels.push(`${thirdLayer.label}`);
                             firstLayer.checkednumber++; // 累加计数器
                         }
                     }
                 }
             }
             titiles = titiles.join(',');
-            this.$emit('onChange', titiles);
+            labels = labels.join(',');
+            this.$emit('onChange', {
+                ids: titiles,
+                labels,
+            });
         },
     },
 };
@@ -135,7 +152,8 @@ export default {
 
 <style lang="stylus" scoped>
 .secondary-title{
-    font-weight: bold;
+    color: #333333
+    font-size: 28rpx
     padding: 40rpx 0 10rpx 30rpx;
 }
 .expected-station{
@@ -143,6 +161,7 @@ export default {
     overflow: hidden;
     display: flex;
     flex-direction: column;
+    height: 100%
 }
 .sex-search
     width: calc(100% - 28rpx - 28rpx);
@@ -160,15 +179,16 @@ export default {
         padding: 10rpx 0 10rpx 58rpx;
 .sex-content
     background: #FFFFFF;
-    border-radius: 20rpx;
+    // border-radius: 20rpx;
     width: 100%;
     margin-top: 20rpx;
     display: flex;
     border-bottom: 2px solid #D9D9D9;
     overflow: hidden;
-    height: 100%
+    height: 100%;
     .sex-content-left
-        width: 250rpx;
+        width: 198rpx;
+        padding: 20rpx 0 0 0;
         .left-list-btn
             padding: 0 40rpx 0 24rpx;
             display: grid;
@@ -178,49 +198,57 @@ export default {
             color: #606060;
             font-size: 28rpx;
             position: relative
-        .positionNum
-            position: absolute
-            right: 0
-            top: 50%;
-            transform: translate(0, -50%)
-            color: #FFFFFF
-            background: #4778EC
-            border-radius: 50%
-            width: 36rpx;
-            height: 36rpx;
+            margin-top: 60rpx
+        .left-list-btn:first-child
+            margin-top: 0
+        // .positionNum
+        //     position: absolute
+        //     right: 0
+        //     top: 50%;
+        //     transform: translate(0, -50%)
+        //     color: #FFFFFF
+        //     background: #4778EC
+        //     border-radius: 50%
+        //     width: 36rpx;
+        //     height: 36rpx;
         .left-list-btned
             color: #4778EC;
             position: relative;
-        .left-list-btned::after
-            position: absolute;
-            left: 20rpx;
-            content: '';
-            width: 7rpx;
-            height: 38rpx;
-            background: #4778EC;
-            border-radius: 0rpx 0rpx 0rpx 0rpx;
+        // .left-list-btned::after
+        //     position: absolute;
+        //     left: 20rpx;
+        //     content: '';
+        //     width: 7rpx;
+        //     height: 38rpx;
+        //     background: #4778EC;
+        //     border-radius: 0rpx 0rpx 0rpx 0rpx;
 
     .sex-content-right
-        border-left: 2px solid #D9D9D9;
+        // border-left: 2px solid #D9D9D9;
+        background: #F6F6F6;
         flex: 1;
         .grid-sex
             display: grid;
             grid-template-columns: 50% 50%;
             place-items: center;
-            padding: 0 0 40rpx 0;
+            padding: 0 20rpx 40rpx 20rpx;
             .sex-right-btn
-                width: 211rpx;
-                height: 84rpx;
-                font-size: 32rpx;
+                width: 228rpx;
+                height: 80rpx;
+                font-size: 28rpx;
                 line-height: 41rpx;
                 text-align: center;
                 display: grid;
                 place-items: center;
-                background: #D9D9D9;
-                border-radius: 20rpx;
-                margin-top:30rpx;
+                border-radius: 12rpx;
+                margin-top: 30rpx;
+                background: #E8EAEE;
                 color: #606060;
             .sex-right-btned
-                color: #FFFFFF;
-                background: #4778EC;
+                font-weight: 500
+                width: 224rpx;
+                height: 76rpx;
+                background: rgba(37,107,250,0.06);
+                border: 2rpx solid #256BFA;
+                color: #256BFA
 </style>
diff --git a/components/latestHotestStatus/latestHotestStatus.vue b/components/latestHotestStatus/latestHotestStatus.vue
deleted file mode 100644
index cba2d08..0000000
--- a/components/latestHotestStatus/latestHotestStatus.vue
+++ /dev/null
@@ -1,27 +0,0 @@
-<template>
-    <view>
-        <picker range-key="text" @change="changeLatestHotestStatus" :value="rangeVal" :range="rangeOptions">
-            <view class="uni-input">{{ rangeOptions[rangeVal].text }}</view>
-        </picker>
-    </view>
-</template>
-
-<script setup>
-import { reactive, inject, watch, ref, onMounted, getCurrentInstance } from 'vue';
-const rangeVal = ref(0);
-const emit = defineEmits(['confirm', 'close']);
-const rangeOptions = ref([
-    { value: 0, text: '推荐' },
-    { value: 1, text: '最热' },
-    { value: 2, text: '最新发布' },
-]);
-
-function changeLatestHotestStatus(e) {
-    const id = e.detail.value;
-    rangeVal.value = id;
-    const obj = rangeOptions.value.filter((item) => item.value === id)[0];
-    emit('confirm', obj);
-}
-</script>
-
-<style lang="stylus"></style>
diff --git a/components/matchingDegree/matchingDegree.vue b/components/matchingDegree/matchingDegree.vue
index 1b0f162..1406c40 100644
--- a/components/matchingDegree/matchingDegree.vue
+++ b/components/matchingDegree/matchingDegree.vue
@@ -3,6 +3,7 @@
 </template>
 
 <script setup>
+// 匹配度
 import { inject, computed } from 'vue';
 const { job } = defineProps(['job']);
 const { similarityJobs, throttle } = inject('globalFunction');
diff --git a/components/modifyExpectedPosition/modifyExpectedPosition.vue b/components/modifyExpectedPosition/modifyExpectedPosition.vue
deleted file mode 100644
index 16a4577..0000000
--- a/components/modifyExpectedPosition/modifyExpectedPosition.vue
+++ /dev/null
@@ -1,323 +0,0 @@
-<template>
-    <view v-if="show" class="popup-container">
-        <view class="popup-content">
-            <!-- 标题 -->
-            <view class="title">岗位推荐</view>
-
-            <!-- 圆环 -->
-            <view class="circle-content" :style="{ height: contentHeight * 2 + 'rpx' }">
-                <!-- 渲染岗位标签 -->
-                <view class="tabs">
-                    <!-- 动画 -->
-                    <view
-                        class="circle"
-                        :style="{ height: circleDiameter * 2 + 'rpx', width: circleDiameter * 2 + 'rpx' }"
-                        @click="serchforIt"
-                    >
-                        搜一搜
-                    </view>
-                    <view
-                        v-for="(item, index) in jobList"
-                        :key="index"
-                        class="tab"
-                        :style="getLabelStyle(index)"
-                        @click="selectTab(item)"
-                    >
-                        {{ item.name }}
-                    </view>
-                </view>
-            </view>
-
-            <!-- 关闭按钮 -->
-            <button class="close-btn" @click="closePopup">完成</button>
-        </view>
-        <!-- piker -->
-        <custom-popup :content-h="100" :visible="state.visible" :header="false">
-            <view class="popContent">
-                <view class="s-header">
-                    <view class="heade-lf" @click="state.visible = false">取消</view>
-                    <view class="heade-ri" @click="confimPopup">确认</view>
-                </view>
-                <view class="sex-content fl_1">
-                    <expected-station
-                        :search="false"
-                        @onChange="changeJobTitleId"
-                        :station="state.stations"
-                        :max="5"
-                    ></expected-station>
-                </view>
-            </view>
-        </custom-popup>
-    </view>
-</template>
-
-<script setup>
-import { ref, inject, computed, onMounted, defineProps, defineEmits, reactive } from 'vue';
-import useUserStore from '@/stores/useUserStore';
-const { $api, navTo, setCheckedNodes } = inject('globalFunction');
-const { getUserResume } = useUserStore();
-const props = defineProps({
-    show: Boolean, // 是否显示弹窗
-    jobList: Array, // 职位列表
-});
-const contentHeight = ref(373);
-const circleDiameter = ref(113);
-const screenWidth = ref(375); // 默认值，避免初始化报错
-const screenHeight = ref(667);
-const centerX = ref(187.5); // 圆心X
-const centerY = ref(333.5); // 圆心Y
-const radius = ref(120); // 圆半径
-const tabPositions = ref([]); // 存储计算好的随机坐标
-const emit = defineEmits(['update:show']);
-const userInfo = ref({});
-
-const state = reactive({
-    jobTitleId: '',
-    stations: [],
-    visible: false,
-});
-
-const closePopup = () => {
-    emit('update:show', false);
-};
-
-const updateScreenSize = () => {
-    const systemInfo = uni.getSystemInfoSync();
-    screenWidth.value = systemInfo.windowWidth;
-    screenHeight.value = systemInfo.windowHeight;
-    centerX.value = screenWidth.value / 2;
-    centerY.value = screenHeight.value / 2 - contentHeight.value / 2; // 让圆心稍微上移
-};
-
-function serchforIt() {
-    if (state.stations.length) {
-        state.visible = true;
-        return;
-    }
-    $api.createRequest('/app/common/jobTitle/treeselect', {}, 'GET').then((resData) => {
-        if (userInfo.value.jobTitleId) {
-            const ids = userInfo.value.jobTitleId.split(',').map((id) => Number(id));
-            setCheckedNodes(resData.data, ids);
-        }
-        state.jobTitleId = userInfo.value.jobTitleId;
-        state.stations = resData.data;
-        state.visible = true;
-    });
-}
-
-function confimPopup() {
-    $api.createRequest('/app/user/resume', { jobTitleId: state.jobTitleId }, 'post').then((resData) => {
-        $api.msg('完成');
-        state.visible = false;
-        getUserResume().then(() => {
-            initload();
-        });
-    });
-}
-
-function selectTab(item) {
-    console.log(item);
-}
-
-function changeJobTitleId(ids) {
-    state.jobTitleId = ids;
-}
-
-function getLabelStyle(index) {
-    // 基础半径（根据标签数量动态调整）
-    const baseRadius = Math.min(Math.max(props.jobList.length * 15, 130), screenWidth.value * 0.4);
-
-    // 基础角度间隔
-    const angleStep = 360 / props.jobList.length;
-
-    // 随机扰动参数
-    const randomRadius = baseRadius + Math.random() * 60 - 50;
-    const randomAngle = angleStep * index + Math.random() * 20 - 10;
-
-    // 极坐标转笛卡尔坐标
-    const radians = (randomAngle * Math.PI) / 180;
-    const x = Math.cos(radians) * randomRadius;
-    const y = Math.sin(radians) * randomRadius;
-
-    return {
-        left: `calc(50% + ${x}px)`,
-        top: `calc(50% + ${y}px)`,
-        transform: 'translate(-50%, -50%)',
-    };
-}
-
-onMounted(() => {
-    userInfo.value = useUserStore().userInfo;
-    updateScreenSize();
-});
-</script>
-
-<style scoped>
-/* 全屏弹窗 */
-.popup-container {
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100vw;
-    height: 100vh;
-    background: rgba(0, 0, 0, 0.5);
-    overflow: hidden;
-    z-index: 999;
-}
-
-/* 弹窗内容 */
-.popup-content {
-    position: relative;
-    width: 100%;
-    height: 100%;
-    background: linear-gradient(to bottom, #007aff, #005bbb);
-    text-align: center;
-    flex-direction: column;
-    display: flex;
-    justify-content: space-around;
-    align-items: center;
-}
-
-.title {
-    padding-left: 20rpx;
-    width: calc(100% - 20rpx);
-    height: 68rpx;
-    font-family: Inter, Inter;
-    font-weight: 400;
-    font-size: 56rpx;
-    color: #ffffff;
-    line-height: 65rpx;
-    text-align: left;
-    font-style: normal;
-    text-transform: none;
-}
-
-.circle-content {
-    width: 731rpx;
-    height: 747rpx;
-    position: relative;
-}
-.circle {
-    width: 225rpx;
-    height: 225rpx;
-    background: linear-gradient(145deg, #13c57c 0%, #8dc5ae 100%);
-    border-radius: 50%;
-    position: absolute;
-    left: 50%;
-    top: 50%;
-    transform: translate(-50%, -50%);
-    font-weight: 400;
-    font-size: 35rpx;
-    color: #ffffff;
-    text-align: center;
-    line-height: 225rpx;
-}
-.circle::before,
-.circle::after {
-    width: 225rpx;
-    height: 225rpx;
-    background: linear-gradient(145deg, #13c57c 0%, #8dc5ae 100%);
-    border-radius: 50%;
-    position: absolute;
-    left: 0;
-    top: 0;
-    z-index: -1;
-    content: '';
-}
-
-@keyframes larger2 {
-    0% {
-        transform: scale(1);
-    }
-    100% {
-        transform: scale(2.5);
-        opacity: 0;
-    }
-}
-.circle::after {
-    animation: larger1 2s infinite;
-}
-@keyframes larger1 {
-    0% {
-        transform: scale(1);
-    }
-    100% {
-        transform: scale(3.5);
-        opacity: 0;
-    }
-}
-
-.circle::before {
-    animation: larger2 2s infinite;
-}
-
-/* 岗位标签 */
-.tabs {
-    position: relative;
-    width: 100%;
-    height: 100%;
-    border-radius: 50%;
-    z-index: 3;
-}
-
-.tab {
-    position: absolute;
-    white-space: nowrap;
-    padding: 8rpx 16rpx;
-    background: #fff;
-    border-radius: 40rpx;
-    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.15);
-    transition: all 0.5s ease;
-}
-
-/* 关闭按钮 */
-.close-btn {
-    width: 549rpx;
-    line-height: 85rpx;
-    height: 85rpx;
-    background: #2ecc71;
-    color: #ffffff;
-}
-
-/* popup */
-.popContent {
-    padding: 24rpx;
-    background: #4778ec;
-    height: calc(100% - 49rpx);
-    .sex-content {
-        border-radius: 20rpx;
-        width: 100%;
-        margin-top: 20rpx;
-        margin-bottom: 40rpx;
-        display: flex;
-        overflow: hidden;
-        height: calc(100% - 100rpx);
-        border: 1px solid #4778ec;
-    }
-    .s-header {
-        display: flex;
-        justify-content: space-between;
-        text-align: center;
-        font-size: 16px;
-        .heade-lf {
-            line-height: 30px;
-            width: 50px;
-            height: 30px;
-            border-radius: 4px;
-            border: 1px solid #666666;
-            color: #666666;
-            background: #ffffff;
-        }
-
-        .heade-ri {
-            line-height: 30px;
-            width: 50px;
-            height: 30px;
-            border-radius: 4px;
-            border: 1px solid #1b66ff;
-            background-color: #1b66ff;
-            color: #ffffff;
-        }
-    }
-}
-</style>
diff --git a/components/renderCompanys/renderCompanys.vue b/components/renderCompanys/renderCompanys.vue
new file mode 100644
index 0000000..b0a6003
--- /dev/null
+++ b/components/renderCompanys/renderCompanys.vue
@@ -0,0 +1,124 @@
+<template>
+    <view v-for="job in listData" :key="job.id">
+        <view class="cards" @click="nextDetail(job)">
+            <view class="card-company">
+                <text class="company line_1">{{ job.name }}</text>
+            </view>
+            <view class="card-bottom">
+                <view class="fl_box fs_14">
+                    <dict-tree-Label class="mar_ri10" dictType="industry" :value="job.industry"></dict-tree-Label>
+                    <dict-Label dictType="scale" :value="job.scale"></dict-Label>
+                </view>
+                <view>
+                    <text class="color_256BFA fs_14">在招职位·{{ job.totalRecruitment || '-' }}个</text>
+                </view>
+            </view>
+            <view class="card-tags">
+                <view class="tag" v-if="job.nature">
+                    <dict-Label dictType="nature" :value="job.nature"></dict-Label>
+                </view>
+                <view class="tag">
+                    {{ vacanciesTo(job.vacancies) }}
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import { inject, computed, toRaw } from 'vue';
+const { insertSortData, navTo, vacanciesTo } = inject('globalFunction');
+import { useRecommedIndexedDBStore } from '@/stores/useRecommedIndexedDBStore.js';
+const recommedIndexDb = useRecommedIndexedDBStore();
+const props = defineProps({
+    list: {
+        type: Array,
+        default: '标题',
+    },
+    longitude: {
+        type: Number,
+        default: 120.382665,
+    },
+    latitude: {
+        type: Number,
+        default: 36.066938,
+    },
+    seeDate: {
+        type: String,
+        default: '',
+    },
+});
+
+const listData = computed(() => {
+    return props.list;
+});
+
+function nextDetail(company) {
+    navTo(`/packageA/pages/UnitDetails/UnitDetails?companyId=${company.companyId}`);
+}
+</script>
+
+<style lang="stylus" scoped>
+.date-jobTitle{
+    font-weight: 400;
+    font-size: 28rpx;
+    color: #495265;
+    padding: 28rpx 0 0 20rpx
+}
+.cards{
+    padding: 32rpx;
+    background: #FFFFFF;
+    box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04);
+    border-radius: 20rpx 20rpx 20rpx 20rpx;
+    margin-top: 22rpx;
+    .card-company{
+        display: flex
+        justify-content: space-between
+        align-items: flex-start
+        .company{
+            font-weight: 500;
+            font-size: 32rpx;
+            color: #333333;
+        }
+        .salary{
+            font-weight: 500;
+            font-size: 28rpx;
+            color: #4C6EFB;
+            white-space: nowrap
+            line-height: 48rpx
+        }
+    }
+    .card-companyName{
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #6C7282;
+    }
+    .card-tags{
+        display: flex
+        flex-wrap: wrap
+        .tag{
+            width: fit-content;
+            height: 30rpx;
+            background: #F4F4F4;
+            border-radius: 4rpx;
+            padding: 6rpx 20rpx;
+            line-height: 30rpx;
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #6C7282;
+            text-align: center;
+            margin-top: 14rpx;
+            white-space: nowrap
+            margin-right: 20rpx
+        }
+    }
+    .card-bottom{
+        margin-top: 4rpx
+        margin-bottom: 10rpx
+        display: flex
+        justify-content: space-between
+        font-size: 28rpx;
+        color: #6C7282;
+    }
+}
+</style>
diff --git a/components/renderJobs/renderJobs.vue b/components/renderJobs/renderJobs.vue
new file mode 100644
index 0000000..ead65a2
--- /dev/null
+++ b/components/renderJobs/renderJobs.vue
@@ -0,0 +1,148 @@
+<template>
+    <view v-for="job in listData" :key="job.id">
+        <view v-if="!job.isTitle" class="cards" @click="nextDetail(job)">
+            <view class="card-company">
+                <text class="company">{{ job.jobTitle }}</text>
+                <view class="salary">
+                    <Salary-Expectation :max-salary="job.maxSalary" :min-salary="job.minSalary"></Salary-Expectation>
+                </view>
+            </view>
+            <view class="card-companyName">{{ job.companyName }}</view>
+            <view class="card-tags">
+                <view class="tag">
+                    <dict-Label dictType="education" :value="job.education"></dict-Label>
+                </view>
+                <view class="tag">
+                    <dict-Label dictType="experience" :value="job.experience"></dict-Label>
+                </view>
+                <view class="tag">
+                    {{ vacanciesTo(job.vacancies) }}
+                </view>
+            </view>
+            <view class="card-bottom">
+                <view>{{ job.postingDate }}</view>
+                <view>
+                    <convert-distance
+                        :alat="job.latitude"
+                        :along="job.longitude"
+                        :blat="latitude"
+                        :blong="longitude"
+                    ></convert-distance>
+                    <dict-Label class="mar_le10" dictType="area" :value="job.jobLocationAreaCode"></dict-Label>
+                </view>
+            </view>
+        </view>
+        <view class="date-jobTitle" v-else>
+            {{ job.title }}
+        </view>
+    </view>
+</template>
+
+<script setup>
+import { inject, computed, toRaw } from 'vue';
+const { insertSortData, navTo, vacanciesTo } = inject('globalFunction');
+import { useRecommedIndexedDBStore } from '@/stores/useRecommedIndexedDBStore.js';
+const recommedIndexDb = useRecommedIndexedDBStore();
+const props = defineProps({
+    list: {
+        type: Array,
+        default: '标题',
+    },
+    longitude: {
+        type: Number,
+        default: 120.382665,
+    },
+    latitude: {
+        type: Number,
+        default: 36.066938,
+    },
+    seeDate: {
+        type: String,
+        default: '',
+    },
+});
+
+const listData = computed(() => {
+    if (props.seeDate && props.list.length) {
+        const ulist = toRaw(props.list);
+        const [reslist, lastDate] = insertSortData(ulist, props.seeDate);
+        return reslist;
+    }
+    console.log(props.list);
+
+    return props.list;
+});
+
+function nextDetail(job) {
+    // 记录岗位类型，用作数据分析
+    if (job.jobCategory) {
+        const recordData = recommedIndexDb.JobParameter(job);
+        recommedIndexDb.addRecord(recordData);
+    }
+    navTo(`/packageA/pages/post/post?jobId=${btoa(job.jobId)}`);
+}
+</script>
+
+<style lang="stylus" scoped>
+.date-jobTitle{
+    font-weight: 400;
+    font-size: 28rpx;
+    color: #495265;
+    padding: 28rpx 0 0 20rpx
+}
+.cards{
+    padding: 32rpx;
+    background: #FFFFFF;
+    box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04);
+    border-radius: 20rpx 20rpx 20rpx 20rpx;
+    margin-top: 22rpx;
+    .card-company{
+        display: flex
+        justify-content: space-between
+        align-items: flex-start
+        .company{
+            font-weight: 500;
+            font-size: 32rpx;
+            color: #333333;
+        }
+        .salary{
+            font-weight: 500;
+            font-size: 28rpx;
+            color: #4C6EFB;
+            white-space: nowrap
+            line-height: 48rpx
+        }
+    }
+    .card-companyName{
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #6C7282;
+    }
+    .card-tags{
+        display: flex
+        flex-wrap: wrap
+        .tag{
+            width: fit-content;
+            height: 30rpx;
+            background: #F4F4F4;
+            border-radius: 4rpx;
+            padding: 6rpx 20rpx;
+            line-height: 30rpx;
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #6C7282;
+            text-align: center;
+            margin-top: 14rpx;
+            white-space: nowrap
+            margin-right: 20rpx
+        }
+    }
+    .card-bottom{
+        margin-top: 32rpx
+        display: flex
+        justify-content: space-between
+        font-size: 28rpx;
+        color: #6C7282;
+    }
+}
+</style>
diff --git a/components/selectFilter/selectFilter.vue b/components/selectFilter/selectFilter.vue
new file mode 100644
index 0000000..f791533
--- /dev/null
+++ b/components/selectFilter/selectFilter.vue
@@ -0,0 +1,360 @@
+<template>
+    <uni-popup
+        ref="popup"
+        type="bottom"
+        borderRadius="10px 10px 0 0"
+        background-color="#FFFFFF"
+        @maskClick="maskClickFn"
+        :mask-click="maskClick"
+    >
+        <view class="popup-content">
+            <view class="popup-header">
+                <view class="btn-cancel" @click="cancel">取消</view>
+                <view class="title">
+                    <text>{{ title }}</text>
+                    <text style="color: #256bfa">·{{ count }}</text>
+                </view>
+                <view class="btn-confirm" @click="confirm">&nbsp;&nbsp;</view>
+            </view>
+            <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>
+                        <template v-for="(item, index) in filterOptions" :key="index">
+                            <view class="content-item">
+                                <view class="item-title" :id="item.key">{{ item.label }}</view>
+                                <checkbox-group class="check-content" @change="(e) => handleSelect(item.key, e)">
+                                    <label
+                                        v-for="option in item.options"
+                                        :key="option.value"
+                                        class="checkbox-item button-click"
+                                        :class="{
+                                            checkedstyle: selectedValues[item.key]?.includes(String(option.value)),
+                                        }"
+                                    >
+                                        <checkbox
+                                            style="display: none"
+                                            :value="String(option.value)"
+                                            :checked="selectedValues[item.key]?.includes(String(option.value))"
+                                        />
+                                        <text class="option-label">{{ option.label }}</text>
+                                    </label>
+                                </checkbox-group>
+                            </view>
+                        </template>
+                    </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>
+</template>
+
+<script setup>
+import { ref, reactive, nextTick, onBeforeMount } from 'vue';
+import useDictStore from '@/stores/useDictStore';
+const { getTransformChildren } = useDictStore();
+
+const area = ref(true);
+const maskClick = ref(false);
+const maskClickFn = ref(null);
+
+const title = ref('标题');
+const confirmCallback = ref(null);
+const cancelCallback = ref(null);
+const changeCallback = ref(null);
+const popup = ref(null);
+const selectedValues = reactive({});
+const count = ref(0);
+// 当前激活的筛选类别
+const activeTab = ref('');
+const filterOptions = ref([]);
+
+const open = (newConfig = {}) => {
+    const { title: configTitle, success, cancel, change, data, maskClick: configMaskClick = false } = newConfig;
+
+    // reset();
+
+    if (configTitle) title.value = configTitle;
+    if (typeof success === 'function') confirmCallback.value = success;
+    if (typeof cancel === 'function') cancelCallback.value = cancel;
+    if (typeof change === 'function') changeCallback.value = change;
+
+    if (configMaskClick) {
+        maskClick.value = configMaskClick;
+        maskClickFn.value = cancel;
+    }
+
+    getoptions();
+
+    nextTick(() => {
+        popup.value?.open();
+    });
+};
+
+const close = () => {
+    popup.value?.close();
+};
+
+const cancel = () => {
+    handleClick(cancelCallback.value);
+};
+
+const confirm = () => {
+    handleClick(confirmCallback.value);
+};
+
+const handleClick = async (callback) => {
+    if (typeof callback !== 'function') {
+        close();
+        return;
+    }
+
+    try {
+        const result = await callback(selectedValues);
+        if (result !== false) close();
+    } catch (error) {
+        console.error('confirmCallback 执行出错:', error);
+    }
+};
+
+// 处理选项选择
+const handleSelect = (key, e) => {
+    selectedValues[key] = e.detail.value.map(String);
+    let va = 0;
+    for (const [key, value] of Object.entries(selectedValues)) {
+        va += value.length;
+    }
+    count.value = va;
+};
+
+const cleanup = () => {
+    Object.keys(selectedValues).forEach((key) => {
+        delete selectedValues[key];
+    });
+};
+
+const scrollTo = (key) => {
+    activeTab.value = key;
+};
+
+function getoptions() {
+    const arr = [
+        getTransformChildren('education', '学历要求'),
+        getTransformChildren('experience', '工作经验'),
+        getTransformChildren('scale', '公司规模'),
+    ];
+    if (area.value) {
+        arr.push(getTransformChildren('area', '区域'));
+    }
+    filterOptions.value = arr;
+    activeTab.value = 'education';
+}
+
+const reset = () => {
+    maskClick.value = false;
+    confirmCallback.value = null;
+    cancelCallback.value = null;
+    changeCallback.value = null;
+    Object.keys(selectedValues).forEach((key) => delete selectedValues[key]);
+};
+
+// 暴露方法给父组件
+defineExpose({
+    open,
+    close,
+});
+</script>
+
+<style lang="scss" scoped>
+.popup-content {
+    color: #000000;
+    height: 80vh;
+}
+.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(80vh - 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;
+    //     }
+    // }
+}
+.popup-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 40rpx 40rpx 10rpx 40rpx;
+    .title {
+        font-weight: 500;
+        font-size: 36rpx;
+        color: #333333;
+        text-align: center;
+    }
+    .btn-cancel {
+        font-weight: 400;
+        font-size: 32rpx;
+        color: #666d7f;
+        line-height: 38rpx;
+    }
+    .btn-confirm {
+        font-weight: 400;
+        font-size: 32rpx;
+        color: #256bfa;
+    }
+}
+.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: 40rpx;
+        .item-title {
+            font-weight: 400;
+            font-size: 28rpx;
+            color: #333333;
+        }
+    }
+    .content-item:first-child {
+        margin-top: 0rpx;
+    }
+
+    .check-content {
+        display: grid;
+        grid-template-columns: 50% 50%;
+        place-items: center;
+
+        .checkbox-item {
+            display: flex;
+            align-items: center;
+            margin: 20rpx 20rpx 0 0;
+            text-align: center;
+            background-color: #d9d9d9;
+            width: 228rpx;
+            height: 80rpx;
+            background: #e8eaee;
+            border-radius: 12rpx 12rpx 12rpx 12rpx;
+
+            .option-label {
+                font-size: 28rpx;
+                width: 100%;
+            }
+        }
+        .checkedstyle {
+            width: 224rpx;
+            height: 76rpx;
+            background: rgba(37, 107, 250, 0.06);
+            border-radius: 12rpx 12rpx 12rpx 12rpx;
+            border: 2rpx solid #256bfa;
+            color: #256bfa;
+        }
+    }
+}
+</style>
diff --git a/components/selectJobs/selectJobs.vue b/components/selectJobs/selectJobs.vue
new file mode 100644
index 0000000..98468f3
--- /dev/null
+++ b/components/selectJobs/selectJobs.vue
@@ -0,0 +1,287 @@
+<template>
+    <uni-popup
+        ref="popup"
+        type="bottom"
+        borderRadius="10px 10px 0 0"
+        background-color="#FFFFFF"
+        :mask-click="maskClick"
+    >
+        <view class="popup-content">
+            <view class="popup-header">
+                <view class="btn-cancel" @click="cancel">取消</view>
+                <view class="title">
+                    <text>{{ title }}</text>
+                    <text style="color: #256bfa">·{{ count }}</text>
+                </view>
+                <view class="btn-confirm" @click="confirm">&nbsp;&nbsp;</view>
+            </view>
+            <view class="popup-list">
+                <expected-station
+                    :search="false"
+                    @onChange="changeJobTitleId"
+                    :station="state.stations"
+                    :max="5"
+                ></expected-station>
+            </view>
+            <view class="popup-bottom">
+                <view class="btn-cancel" @click="cleanup">清除</view>
+                <view class="btn-confirm" @click="confirm">确认</view>
+            </view>
+        </view>
+    </uni-popup>
+</template>
+
+<script setup>
+import { ref, reactive, computed, inject, nextTick, defineExpose, onMounted } from 'vue';
+const { $api, navTo, setCheckedNodes, cloneDeep } = inject('globalFunction');
+import useUserStore from '@/stores/useUserStore';
+import { storeToRefs } from 'pinia';
+const { userInfo } = storeToRefs(useUserStore());
+const maskClick = ref(false);
+const title = ref('标题');
+const confirmCallback = ref(null);
+const cancelCallback = ref(null);
+const changeCallback = ref(null);
+const listData = ref([]);
+const selectedIndex = ref([0, 0, 0]);
+const rowLabel = ref('label');
+const rowKey = ref('value');
+const selectedItems = ref([]);
+const popup = ref(null);
+const count = ref(0);
+const JobsIdsValue = ref('');
+const JobsLabelValue = ref('');
+
+const state = reactive({
+    jobTitleId: '',
+    stations: [],
+    visible: false,
+});
+
+onMounted(() => {
+    serchforIt();
+});
+
+// 统一处理二维数组格式
+const processedListData = computed(() => {
+    return listData.value.map((column) => {
+        if (!Array.isArray(column)) return [];
+        return column.map((item) => {
+            return typeof item === 'object' ? item : { [rowLabel.value]: item, [rowKey.value]: item };
+        });
+    });
+});
+
+const open = (newConfig = {}) => {
+    const {
+        title: configTitle,
+        success,
+        cancel,
+        change,
+        data,
+        rowLabel: configRowLabel = 'label',
+        rowKey: configRowKey = 'value',
+        maskClick: configMaskClick = false,
+        defaultIndex = [],
+    } = newConfig;
+
+    reset();
+    serchforIt();
+
+    if (configTitle) title.value = configTitle;
+    if (typeof success === 'function') confirmCallback.value = success;
+    if (typeof cancel === 'function') cancelCallback.value = cancel;
+    if (typeof change === 'function') changeCallback.value = change;
+    if (Array.isArray(data)) listData.value = data;
+
+    rowLabel.value = configRowLabel;
+    rowKey.value = configRowKey;
+    maskClick.value = configMaskClick;
+    nextTick(() => {
+        popup.value?.open();
+    });
+};
+
+const close = () => {
+    popup.value?.close();
+};
+
+const cancel = () => {
+    handleClick(cancelCallback.value);
+};
+
+const confirm = () => {
+    if (JobsIdsValue.value) {
+        handleClick(confirmCallback.value);
+    } else {
+        $api.msg('请选择期望岗位');
+    }
+};
+
+const cleanup = () => {
+    setCheckedNodes(state.stations, []);
+    count.value = 0;
+    reset();
+};
+
+const changeJobTitleId = (e) => {
+    const ids = e.ids.split(',').map((id) => Number(id));
+    count.value = ids.length;
+    JobsIdsValue.value = e.ids;
+    JobsLabelValue.value = e.labels;
+};
+const handleClick = async (callback) => {
+    if (typeof callback !== 'function') {
+        close();
+        return;
+    }
+
+    try {
+        const result = await callback(JobsIdsValue.value, JobsLabelValue.value);
+        if (result !== false) close();
+    } catch (error) {
+        console.error('confirmCallback 执行出错:', error);
+    }
+};
+function serchforIt() {
+    if (state.stations.length) {
+        const ids = userInfo.value.jobTitleId.split(',').map((id) => Number(id));
+        count.value = ids.length;
+        state.jobTitleId = userInfo.value.jobTitleId;
+        setCheckedNodes(state.stations, ids);
+        state.visible = true;
+        return;
+    }
+    $api.createRequest('/app/common/jobTitle/treeselect', {}, 'GET').then((resData) => {
+        if (userInfo.value.jobTitleId) {
+            const ids = userInfo.value.jobTitleId.split(',').map((id) => Number(id));
+            count.value = ids.length;
+            setCheckedNodes(resData.data, ids);
+        }
+        state.jobTitleId = userInfo.value.jobTitleId;
+        state.stations = resData.data;
+        state.visible = true;
+    });
+}
+
+const reset = () => {
+    maskClick.value = false;
+    confirmCallback.value = null;
+    cancelCallback.value = null;
+    changeCallback.value = null;
+    listData.value = [];
+    selectedIndex.value = [0, 0, 0];
+    rowLabel.value = 'label';
+    rowKey.value = 'value';
+    selectedItems.value = [];
+};
+
+// 暴露方法给父组件
+defineExpose({
+    open,
+    close,
+});
+</script>
+
+<style lang="scss" scoped>
+.popup-content {
+    color: #000000;
+    height: 80vh;
+}
+.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(80vh - 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;
+    //     }
+    // }
+}
+.popup-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 40rpx 40rpx 10rpx 40rpx;
+    .title {
+        font-weight: 500;
+        font-size: 36rpx;
+        color: #333333;
+        text-align: center;
+    }
+    .btn-cancel {
+        font-weight: 400;
+        font-size: 32rpx;
+        color: #666d7f;
+        line-height: 38rpx;
+    }
+    .btn-confirm {
+        font-weight: 400;
+        font-size: 32rpx;
+        color: #256bfa;
+    }
+}
+</style>
diff --git a/components/selectPopup/selectPopup.vue b/components/selectPopup/selectPopup.vue
new file mode 100644
index 0000000..c91a6f7
--- /dev/null
+++ b/components/selectPopup/selectPopup.vue
@@ -0,0 +1,233 @@
+<template>
+    <uni-popup
+        ref="popup"
+        type="bottom"
+        borderRadius="10px 10px 0 0"
+        background-color="#FFFFFF"
+        :mask-click="maskClick"
+    >
+        <view class="popup-content">
+            <view class="popup-header">
+                <view class="btn-cancel" @click="cancel">取消</view>
+                <view class="title">{{ title }}</view>
+                <view class="btn-confirm" @click="confirm">确认</view>
+            </view>
+            <view class="popup-list">
+                <picker-view
+                    indicator-style="height: 84rpx;"
+                    :value="selectedIndex"
+                    @change="bindChange"
+                    class="picker-view"
+                >
+                    <template v-for="(list, lsIndex) in processedListData" :key="lsIndex">
+                        <picker-view-column>
+                            <view
+                                v-for="(item, index) in list"
+                                :key="index"
+                                class="item"
+                                :class="{ 'item-active': selectedIndex[lsIndex] === index }"
+                            >
+                                <text>{{ getLabel(item) }}</text>
+                                <text>{{ unit }}</text>
+                            </view>
+                        </picker-view-column>
+                    </template>
+                </picker-view>
+            </view>
+        </view>
+    </uni-popup>
+</template>
+
+<script>
+export default {
+    name: 'selectPopup',
+    data() {
+        return {
+            maskClick: false,
+            title: '标题',
+            confirmCallback: null,
+            cancelCallback: null,
+            changeCallback: null,
+            listData: [],
+            selectedIndex: [0, 0, 0],
+            rowLabel: 'label',
+            rowKey: 'value',
+            selectedItems: [],
+            unit: '',
+        };
+    },
+    computed: {
+        // 统一处理二维数组格式
+        processedListData() {
+            return this.listData.map((column) => {
+                if (!Array.isArray(column)) return [];
+                return column.map((item) => {
+                    return typeof item === 'object' ? item : { [this.rowLabel]: item, [this.rowKey]: item };
+                });
+            });
+        },
+    },
+    methods: {
+        open(newConfig = {}) {
+            const {
+                title,
+                success,
+                cancel,
+                change,
+                data,
+                unit = '',
+                rowLabel = 'label',
+                rowKey = 'value',
+                maskClick = false,
+                defaultIndex = [],
+            } = newConfig;
+            this.reset();
+            if (title) this.title = title;
+            if (typeof success === 'function') this.confirmCallback = success;
+            if (typeof cancel === 'function') this.cancelCallback = cancel;
+            if (typeof change === 'function') this.changeCallback = change;
+            if (Array.isArray(data)) this.listData = data;
+
+            this.rowLabel = rowLabel;
+            this.rowKey = rowKey;
+            this.maskClick = maskClick;
+            this.unit = unit;
+
+            this.selectedIndex =
+                defaultIndex.length === this.listData.length ? defaultIndex : new Array(this.listData.length).fill(0);
+            this.selectedItems = this.selectedIndex.map((val, index) => this.processedListData[index][val]);
+            this.$nextTick(() => {
+                this.$refs.popup.open();
+            });
+        },
+        close() {
+            this.$refs.popup.close();
+        },
+        bindChange(e) {
+            this.selectedIndex = e.detail.value;
+            this.selectedItems = this.selectedIndex.map((val, index) => this.processedListData[index][val]);
+            this.changeCallback && this.changeCallback(e, this.selectedIndex, this.selectedItems);
+        },
+        cancel() {
+            this.clickCallback(this.cancelCallback);
+        },
+        confirm() {
+            this.clickCallback(this.confirmCallback);
+        },
+        getLabel(item) {
+            return item?.[this.rowLabel] ?? '';
+        },
+        setColunm(index, list) {
+            if (index > this.listData.length) {
+                return console.warn('最长' + this.listData.length);
+            }
+            if (!list.length) {
+                return console.warn(list + '不能为空');
+            }
+            this.listData[index] = list;
+            this.selectedIndex[index] = 0;
+            this.selectedItems = this.selectedIndex.map((val, index) => this.processedListData[index][val]);
+        },
+        async clickCallback(callback) {
+            if (typeof callback !== 'function') {
+                this.$refs.popup.close();
+                return;
+            }
+
+            try {
+                const result = await callback(this.selectedIndex, this.selectedItems); // 无论是 async 还是返回 Promise 的函数都可以 await
+                if (result !== false) {
+                    this.$refs.popup.close();
+                }
+            } catch (error) {
+                console.error('confirmCallback 执行出错:', error);
+            }
+        },
+        reset() {
+            this.maskClick = false;
+            this.confirmCallback = null;
+            this.cancelCallback = null;
+            this.changeCallback = null;
+            this.listData = [];
+            this.selectedIndex = [0, 0, 0];
+            this.rowLabel = 'label';
+            this.rowKey = 'value';
+            this.selectedItems = [];
+            this.unit = '';
+        },
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+.popup-content {
+    color: #000000;
+    height: 50vh;
+}
+.popup-list {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    align-items: center;
+    justify-content: space-evenly;
+    flex: 1;
+    overflow: hidden;
+    .picker-view {
+        width: 100%;
+        height: calc(50vh - 100rpx);
+        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;
+    //     }
+    // }
+}
+.popup-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 40rpx 40rpx 10rpx 40rpx;
+    .title {
+        font-weight: 500;
+        font-size: 36rpx;
+        color: #333333;
+        text-align: center;
+    }
+    .btn-cancel {
+        font-weight: 400;
+        font-size: 32rpx;
+        color: #666d7f;
+        line-height: 38rpx;
+    }
+    .btn-confirm {
+        font-weight: 400;
+        font-size: 32rpx;
+        color: #256bfa;
+    }
+}
+</style>
diff --git a/components/selectPopup/selectPopupPlugin.js b/components/selectPopup/selectPopupPlugin.js
new file mode 100644
index 0000000..f61b746
--- /dev/null
+++ b/components/selectPopup/selectPopupPlugin.js
@@ -0,0 +1,21 @@
+// plugins/selectPopup.js
+import {
+    createApp
+} from 'vue';
+import SelectPopup from './selectPopup.vue';
+
+export default {
+    install(app) {
+        const popupApp = createApp(SelectPopup);
+        const popupInstance = popupApp.mount(document.createElement('div'));
+        document.body.appendChild(popupInstance.$el);
+
+        // 提供 open 方法
+        const openPopup = (config) => {
+            popupInstance.open(config);
+        };
+
+        // 提供给所有组件使用
+        app.provide('openSelectPopup', openPopup);
+    }
+};
\ No newline at end of file
diff --git a/hook/.DS_Store b/hook/.DS_Store
index c099f54..ddc7ff6 100644
Binary files a/hook/.DS_Store and b/hook/.DS_Store differ
diff --git a/hook/useColumnCount.js b/hook/useColumnCount.js
new file mode 100644
index 0000000..33ced58
--- /dev/null
+++ b/hook/useColumnCount.js
@@ -0,0 +1,44 @@
+// composables/useColumnCount.js
+import {
+    ref,
+    onMounted,
+    onUnmounted,
+    watch
+} from 'vue'
+
+export function useColumnCount(onChange = () => {}) {
+    const columnCount = ref(0)
+
+    const calcColumn = () => {
+        const width = uni.getSystemInfoSync().windowWidth
+        const count = Math.min(5, Math.floor(width / 375) + 1)
+        if (count !== columnCount.value) {
+            columnCount.value = count
+        }
+    }
+
+    onMounted(() => {
+        columnCount.value = 2
+        calcColumn()
+        if (process.client) {
+            window.addEventListener('resize', calcColumn)
+        }
+    })
+
+    onUnmounted(() => {
+        if (process.client) {
+            window.removeEventListener('resize', calcColumn)
+        }
+    })
+
+    // 列数变化时执行回调
+    watch(columnCount, (newVal, oldVal) => {
+        if (newVal !== oldVal) {
+            onChange(newVal)
+        }
+    })
+
+    return {
+        columnCount,
+    }
+}
\ No newline at end of file
diff --git a/hook/useScrollDirection.js b/hook/useScrollDirection.js
new file mode 100644
index 0000000..3af826e
--- /dev/null
+++ b/hook/useScrollDirection.js
@@ -0,0 +1,49 @@
+import {
+    ref
+} from 'vue'
+
+export function useScrollDirection(options = {}) {
+    const {
+        threshold = 200, // 滚动偏移阈值
+            throttleTime = 100, // 节流时间（毫秒）
+            onChange = null // 滚动方向变化的回调
+    } = options
+
+    const lastScrollTop = ref(0)
+    const accumulatedScroll = ref(0)
+    const isScrollingDown = ref(false)
+    let lastInvoke = 0
+
+    function handleScroll(e) {
+        const now = Date.now()
+        if (now - lastInvoke < throttleTime) return
+        lastInvoke = now
+
+        const scrollTop = e.detail.scrollTop
+        const delta = scrollTop - lastScrollTop.value
+        accumulatedScroll.value += delta
+
+        if (accumulatedScroll.value > threshold) {
+            if (!isScrollingDown.value) {
+                isScrollingDown.value = true
+                onChange?.(true) // 通知变更为向下
+            }
+            accumulatedScroll.value = 0
+        }
+
+        if (accumulatedScroll.value < -threshold) {
+            if (isScrollingDown.value) {
+                isScrollingDown.value = false
+                onChange?.(false) // 通知变更为向上
+            }
+            accumulatedScroll.value = 0
+        }
+
+        lastScrollTop.value = scrollTop
+    }
+
+    return {
+        isScrollingDown,
+        handleScroll
+    }
+}
\ No newline at end of file
diff --git a/lib/lunar-javascript@1.7.2.js b/lib/lunar-javascript@1.7.2.js
new file mode 100644
index 0000000..8d5ad17
--- /dev/null
+++ b/lib/lunar-javascript@1.7.2.js
@@ -0,0 +1,8 @@
+/**
+ * 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/main.js b/main.js
index d60cf6f..1b037be 100644
--- a/main.js
+++ b/main.js
@@ -3,8 +3,15 @@ import * as Pinia from 'pinia'
 import globalFunction from '@/common/globalFunction'
 import '@/lib/string-similarity.min.js'
 import similarityJobs from '@/utils/similarity_Job.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 Tabbar from '@/components/tabbar/midell-box.vue'
 // 自动导入 directives 目录下所有指令
 const directives = import.meta.glob('./directives/*.js', {
@@ -19,8 +26,13 @@ import {
 export function createApp() {
     const app = createSSRApp(App)
 
+    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('tabbar-custom', Tabbar)
 
     for (const path in directives) {
@@ -36,7 +48,9 @@ export function createApp() {
     });
     app.provide('deviceInfo', globalFunction.getdeviceInfo());
 
+    app.use(SelectPopupPlugin);
     app.use(Pinia.createPinia());
+
     return {
         app,
         Pinia
diff --git a/packageA/pages/Intendedposition/Intendedposition.vue b/packageA/pages/Intendedposition/Intendedposition.vue
index 1d20817..c3607b9 100644
--- a/packageA/pages/Intendedposition/Intendedposition.vue
+++ b/packageA/pages/Intendedposition/Intendedposition.vue
@@ -1,45 +1,13 @@
 <template>
     <view class="collection-content">
-        <view class="one-cards">
-            <view class="card-box" v-for="(item, index) in pageState.list" :key="index" @click="navToPost(item.jobId)">
-                <view class="box-row mar_top0">
-                    <view class="row-left">{{ item.jobTitle }}</view>
-                    <view class="row-right">
-                        <Salary-Expectation
-                            :max-salary="item.maxSalary"
-                            :min-salary="item.minSalary"
-                        ></Salary-Expectation>
-                    </view>
-                </view>
-                <view class="box-row">
-                    <view class="row-left">
-                        <view class="row-tag" v-if="item.educatio">
-                            <dict-Label dictType="education" :value="item.education"></dict-Label>
-                        </view>
-                        <view class="row-tag" v-if="item.experience">
-                            <dict-Label dictType="experience" :value="item.experience"></dict-Label>
-                        </view>
-                    </view>
-                </view>
-                <view class="box-row mar_top0">
-                    <view class="row-item mineText">{{ item.postingDate || '发布日期' }}</view>
-                    <view class="row-item mineText">{{ vacanciesTo(item.vacancies) }}</view>
-                    <view class="row-item mineText textblue"><matchingDegree :job="item"></matchingDegree></view>
-                    <view class="row-item">
-                        <!-- <uni-icons type="star" size="28"></uni-icons> -->
-                        <!-- <uni-icons type="star-filled" color="#FFCB47" size="30"></uni-icons> -->
-                    </view>
-                </view>
-                <view class="box-row">
-                    <view class="row-left mineText">{{ item.companyName }}</view>
-                    <view class="row-right mineText">
-                        青岛
-                        <dict-Label dictType="area" :value="item.jobLocationAreaCode"></dict-Label>
-                        <!-- 550m -->
-                    </view>
-                </view>
-            </view>
-        </view>
+        <renderJobs
+            seeDate="applyTime"
+            v-if="pageState.list.length"
+            :list="pageState.list"
+            :longitude="longitudeVal"
+            :latitude="latitudeVal"
+        ></renderJobs>
+        <empty v-else pdTop="200"></empty>
     </view>
 </template>
 
@@ -49,6 +17,9 @@ 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({
@@ -99,47 +70,16 @@ function getJobList(type = 'add') {
         // pageState.list = resData.rows;
         pageState.total = resData.total;
         pageState.maxPage = Math.ceil(pageState.total / pageState.pageSize);
+        console.log(pageState.list);
     });
 }
 </script>
 
-<style lang="stylus">
-.collection-content
-    padding: 20rpx 0 20rpx 0;
-.one-cards
-    display: flex;
-    flex-direction: column;
-    padding: 0 20rpx;
-    .card-box
-        width: calc(100% - 36rpx - 36rpx);
-        border-radius: 0rpx 0rpx 0rpx 0rpx;
-        background: #FFFFFF;
-        border-radius: 17rpx;
-        padding: 15rpx 36rpx;
-        margin-top: 24rpx;
-        .box-row
-            display: flex;
-            justify-content: space-between;
-            margin-top: 8rpx;
-            align-items: center;
-            .mineText
-                font-weight: 400;
-                font-size: 21rpx;
-                color: #606060;
-            .textblue
-                color: #4778EC;
-            .row-left
-                display: flex;
-                justify-content: space-between;
-                .row-tag
-                    background: #13C57C;
-                    border-radius: 17rpx 17rpx 17rpx 17rpx;
-                    font-size: 21rpx;
-                    color: #FFFFFF;
-                    line-height: 25rpx;
-                    text-align: center;
-                    padding: 4rpx 8rpx;
-                    margin-right: 23rpx;
-    .card-box:first-child
-        margin-top: 6rpx;
+<style lang="stylus" scoped>
+.collection-content{
+    padding: 1rpx 28rpx 20rpx 28rpx;
+    background: #F4F4F4;
+    height: 100%
+    min-height: calc(100vh - var(--window-top) - var(--status-bar-height) - var(--window-bottom));
+}
 </style>
diff --git a/packageA/pages/UnitDetails/UnitDetails.vue b/packageA/pages/UnitDetails/UnitDetails.vue
index 24bdf9a..1096c9b 100644
--- a/packageA/pages/UnitDetails/UnitDetails.vue
+++ b/packageA/pages/UnitDetails/UnitDetails.vue
@@ -1,68 +1,79 @@
 <template>
-    <view class="container">
-        <!-- 单位基本信息 -->
-        <view class="company-header">
-            <text class="company-name">{{ companyInfo.name }}</text>
-            <view class="company-info">
-                <view class="location">
-                    <uni-icons type="location-filled" color="#4778EC" size="24"></uni-icons>
-                    青岛 {{ companyInfo.location }}
-                </view>
-                <view class="industry" style="display: inline-block">
-                    {{ companyInfo.industry }}
-                    <dict-Label dictType="scale" :value="companyInfo.scale"></dict-Label>
-                </view>
+    <AppLayout title="" :use-scroll-view="false">
+        <template #headerleft>
+            <view class="btn">
+                <image src="@/static/icon/back.png" @click="navBack"></image>
             </view>
-        </view>
-        <view class="hr"></view>
-        <!-- 单位介绍 -->
-        <view class="company-description">
-            <view class="section-title">单位介绍</view>
-            <text class="description">
-                {{ companyInfo.description }}
-            </text>
-        </view>
-
-        <!-- 在招职位 -->
-        <view class="job-list">
-            <text class="section-title">在招职位</text>
-            <view
-                class="job-row"
-                v-for="job in pageState.list"
-                :key="job.id"
-                @click="navTo(`/packageA/pages/post/post?jobId=${job.jobId}`)"
-            >
-                <view class="left">
-                    <text class="job-title">{{ job.jobTitle }}</text>
-                    <view class="job-tags">
-                        <!-- <view class="tag" v-for="tag in job.tags" :key="tag">{{ tag }}</view> -->
-                        <view class="tag">
-                            <dict-Label dictType="education" :value="job.education"></dict-Label>
-                        </view>
-                        <view class="tag">
-                            <dict-Label dictType="experience" :value="job.experience"></dict-Label>
-                        </view>
-                        <view class="tag">{{ job.vacancies }}人</view>
+        </template>
+        <template #headerright>
+            <view class="btn mar_ri10">
+                <image
+                    src="@/static/icon/collect3.png"
+                    v-if="!companyInfo.isCollection"
+                    @click="companyCollection"
+                ></image>
+                <image src="@/static/icon/collect2.png" v-else @click="companyCollection"></image>
+            </view>
+        </template>
+        <view class="content">
+            <view class="content-top">
+                <view class="companyinfo-left">
+                    <image src="@/static/icon/companyIcon.png" mode=""></image>
+                </view>
+                <view class="companyinfo-right">
+                    <view class="row1">{{ companyInfo?.name }}</view>
+                    <view class="row2">
+                        <dict-tree-Label
+                            v-if="companyInfo?.industry"
+                            dictType="industry"
+                            :value="companyInfo?.industry"
+                        ></dict-tree-Label>
+                        <span v-if="companyInfo?.industry">&nbsp;</span>
+                        <dict-Label dictType="scale" :value="companyInfo?.scale"></dict-Label>
                     </view>
-                    <text class="location">
-                        青岛
-                        <dict-Label dictType="area" :value="job.jobLocationAreaCode"></dict-Label>
-                    </text>
-                </view>
-                <view class="right">
-                    <text class="salary">{{ job.minSalary }}-{{ job.maxSalary }}/月</text>
-                    <text class="hot" v-if="job.isHot">🔥</text>
                 </view>
             </view>
+            <view class="conetent-info" :class="{ expanded: isExpanded }">
+                <view class="info-title">公司介绍</view>
+                <view class="info-desirption">{{ companyInfo.description }}</view>
+                <!-- <view class="info-title title2">公司地址</view>
+                <view class="locationCompany"></view> -->
+            </view>
+            <view class="expand" @click="expand">
+                <text>{{ isExpanded ? '收起' : '展开' }}</text>
+                <image
+                    class="expand-img"
+                    :class="{ 'expand-img-active': !isExpanded }"
+                    src="@/static/icon/downs.png"
+                ></image>
+            </view>
+            <scroll-view scroll-y class="Detailscroll-view" @scrolltolower="getJobsList('add')">
+                <view class="views">
+                    <view class="Detail-title"><text class="title">在招职位</text></view>
+                    <renderJobs
+                        v-if="pageState.list.length"
+                        :list="pageState.list"
+                        :longitude="longitudeVal"
+                        :latitude="latitudeVal"
+                    ></renderJobs>
+                    <empty v-else pdTop="200"></empty>
+                </view>
+            </scroll-view>
         </view>
-    </view>
+    </AppLayout>
 </template>
 
 <script setup>
-import { reactive, inject, watch, ref, onMounted } from 'vue';
+import point from '@/static/icon/point.png';
+import { reactive, inject, watch, ref, onMounted, computed } from 'vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
 import dictLabel from '@/components/dict-Label/dict-Label.vue';
-const { $api, navTo } = inject('globalFunction');
+import { storeToRefs } from 'pinia';
+import useLocationStore from '@/stores/useLocationStore';
+const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
+const { $api, navTo, vacanciesTo, navBack } = inject('globalFunction');
+
+const isExpanded = ref(false);
 const pageState = reactive({
     page: 0,
     list: [],
@@ -71,11 +82,27 @@ const pageState = reactive({
     pageSize: 10,
 });
 const companyInfo = ref({});
+
 onLoad((options) => {
     console.log(options);
     getCompanyInfo(options.companyId);
 });
 
+function companyCollection() {
+    const companyId = companyInfo.value.companyId;
+    if (companyInfo.value.isCollection) {
+        $api.createRequest(`/app/company/collection/${companyId}`, {}, 'DELETE').then((resData) => {
+            getCompanyInfo(companyId);
+            $api.msg('取消收藏成功');
+        });
+    } else {
+        $api.createRequest(`/app/company/collection/${companyId}`, {}, 'POST').then((resData) => {
+            getCompanyInfo(companyId);
+            $api.msg('收藏成功');
+        });
+    }
+}
+
 function getCompanyInfo(id) {
     $api.createRequest(`/app/company/${id}`).then((resData) => {
         companyInfo.value = resData.data;
@@ -97,99 +124,193 @@ function getJobsList(type = 'add') {
     };
     $api.createRequest(`/app/company/job/${companyInfo.value.companyId}`, params).then((resData) => {
         const { rows, total } = resData;
-        pageState.list = resData.rows;
+        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);
     });
 }
+
+function expand() {
+    isExpanded.value = !isExpanded.value;
+}
 </script>
 
-<style lang="stylus">
-.container
-  display flex
-  flex-direction column
-  background-color #f8f8f8
-.hr
-    height: 10rpx;
-.company-header
-  padding 20rpx 40rpx
-  background-color #fff
-  .company-name
-    font-size 56rpx
-    font-weight bold
-    color #333
-    margin-bottom 10rpx
-  .company-info
-    font-size 24rpx
-    color #666
-    display flex
-    align-items center
-    justify-content space-between
-    .location
-      display flex
-      align-items center
+<style lang="stylus" scoped>
+.btn {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    width: 60rpx;
+    height: 60rpx;
+}
+image {
+    height: 100%;
+    width: 100%;
+}
+.content{
+    height: 100%
+    display: flex;
+    flex-direction: column
+    .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-right{
 
-.company-description
-  padding 20rpx 40rpx
-  background-color #fff
-  margin-bottom 10rpx
-  .section-title
-    font-size 42rpx
-    font-weight bold
-    margin-bottom 10rpx
-
-  .description
-    font-size 24rpx
-    color #333
-    line-height 36rpx
-
-.job-list
-  padding 20rpx 40rpx
-  background-color #fff
-  .section-title
-    font-size 42rpx
-    font-weight bold
-    margin-bottom 10rpx
-  .job-row
-    display flex
-    justify-content space-between
-    align-items flex-start
-    padding 20rpx
-    border 2rpx solid #D9D9D9
-    margin-top 20rpx
-    border-radius 17rpx 17rpx 17rpx 17rpx
-    .left
-      display flex
-      flex-direction column
-      flex-grow 1
-      .job-title
-        font-size 28rpx
-        font-weight bold
-        color #333
-        margin-bottom 10rpx
-      .job-tags
-        display flex
-        gap 10rpx
-        margin-bottom 10rpx
-        .tag
-          background-color #22c55e
-          color #fff
-          padding 5rpx 10rpx
-          border-radius 12rpx
-          font-size 20rpx
-      .location
-        font-size 24rpx
-        color #666
-    .right
-      display flex
-      flex-direction column
-      align-items flex-end
-      .salary
-        font-size 28rpx
-        color #3b82f6
-        font-weight bold
-      .hot
-        color #ff6b6b
-        font-size 24rpx
-        margin-top 5rpx
+            .row1{
+                font-weight: 500;
+                font-size: 32rpx;
+                color: #333333;
+            }
+            .row2{
+                font-weight: 400;
+                font-size: 28rpx;
+                color: #6C7282;
+                line-height: 45rpx;
+            }
+        }
+    }
+    .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-desirption{
+            margin-top: 12rpx
+            font-weight: 400;
+            font-size: 28rpx;
+            color: #495265;
+            text-align: justified;
+        }
+        .title2{
+            margin-top: 48rpx
+        }
+    }
+    .expanded {
+        max-height: 1000rpx; // 足够显示完整内容
+    }
+    .expand{
+        display: flex
+        flex-wrap: nowrap
+        white-space: nowrap
+        justify-content: center
+        margin-top: 20rpx
+        margin-bottom: 28rpx
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #256BFA;
+        .expand-img{
+            width: 40rpx;
+            height: 40rpx;
+        }
+        .expand-img-active{
+            transform: rotate(180deg)
+        }
+    }
+}
+.Detailscroll-view{
+    flex: 1;
+    overflow: hidden;
+    background: #F4F4F4;
+    .views{
+        padding: 28rpx
+        .Detail-title{
+            font-weight: 600;
+            font-size: 32rpx;
+            color: #000000;
+            position: relative;
+            display: flex
+            justify-content: space-between
+            .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;
+        }
+        .cards{
+            padding: 32rpx;
+            background: #FFFFFF;
+            box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04);
+            border-radius: 20rpx 20rpx 20rpx 20rpx;
+            margin-top: 22rpx;
+            .card-company{
+                display: flex
+                justify-content: space-between
+                align-items: flex-start
+                .company{
+                    font-weight: 500;
+                    font-size: 32rpx;
+                    color: #333333;
+                }
+                .salary{
+                    font-weight: 500;
+                    font-size: 28rpx;
+                    color: #4C6EFB;
+                    white-space: nowrap
+                    line-height: 48rpx
+                }
+            }
+            .card-companyName{
+                font-weight: 400;
+                font-size: 28rpx;
+                color: #6C7282;
+            }
+            .card-tags{
+                display: flex
+                flex-wrap: wrap
+                .tag{
+                    width: fit-content;
+                    height: 30rpx;
+                    background: #F4F4F4;
+                    border-radius: 4rpx;
+                    padding: 6rpx 20rpx;
+                    line-height: 30rpx;
+                    font-weight: 400;
+                    font-size: 24rpx;
+                    color: #6C7282;
+                    text-align: center;
+                    margin-top: 14rpx;
+                    white-space: nowrap
+                    margin-right: 20rpx
+                }
+            }
+            .card-bottom{
+                margin-top: 32rpx
+                display: flex
+                justify-content: space-between
+                font-size: 28rpx;
+                color: #6C7282;
+            }
+        }
+    }
+}
 </style>
diff --git a/packageA/pages/addPosition/addPosition.vue b/packageA/pages/addPosition/addPosition.vue
new file mode 100644
index 0000000..35d1892
--- /dev/null
+++ b/packageA/pages/addPosition/addPosition.vue
@@ -0,0 +1,133 @@
+<template>
+    <AppLayout title="添加岗位">
+        <template #headerleft>
+            <view class="btn">
+                <image src="@/static/icon/back.png" @click="navBack"></image>
+            </view>
+        </template>
+        <view class="main">
+            <view class="content-title">
+                <view class="title-lf">
+                    <view class="lf-h1">想找什么工作？</view>
+                    <view class="lf-text">选择想找的工作，我的将在首页为你推荐</view>
+                </view>
+                <view class="title-ri">
+                    <!--    <text style="color: #256bfa">2</text>
+                    <text>/2</text> -->
+                </view>
+            </view>
+            <view class="content-list">
+                <view class="list-row" v-for="(item, index) in userInfo.jobTitle" :key="index">
+                    <text>{{ item }}</text>
+                    <image
+                        class="row-image button-click"
+                        @click="deleteItem(item, index)"
+                        src="@/static/icon/delete1.png"
+                        mode=""
+                    ></image>
+                </view>
+                <view class="list-row-add button-click" @click="changeJobs">添加求职岗位</view>
+            </view>
+        </view>
+        <SelectJobs ref="selectJobsModel"></SelectJobs>
+    </AppLayout>
+</template>
+
+<script setup>
+import { inject, ref, reactive } from 'vue';
+import SelectJobs from '@/components/selectJobs/selectJobs.vue';
+const { $api, navBack } = inject('globalFunction');
+import { storeToRefs } from 'pinia';
+import useUserStore from '@/stores/useUserStore';
+const { getUserResume } = useUserStore();
+const { userInfo } = storeToRefs(useUserStore());
+const selectJobsModel = ref(null);
+
+function deleteItem(item, index) {
+    const ids = userInfo.value.jobTitleId
+        .split(',')
+        .filter((_, vIndex) => vIndex !== index)
+        .join(',');
+    complete({ jobTitleId: ids });
+}
+
+function changeJobs() {
+    selectJobsModel.value?.open({
+        title: '添加岗位',
+        maskClick: true,
+        success: (ids, labels) => {
+            complete({ jobTitleId: ids });
+        },
+    });
+}
+
+function complete(values) {
+    if (!values.jobTitleId.length) {
+        return $api.msg('至少添加一份期望岗位');
+    }
+    $api.createRequest('/app/user/resume', values, 'post').then((resData) => {
+        $api.msg('完成');
+        getUserResume();
+    });
+}
+</script>
+
+<style lang="stylus" scoped>
+.btn {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    width: 60rpx;
+    height: 60rpx;
+    image {
+        height: 100%;
+        width: 100%;
+    }
+}
+.main{
+    padding: 54rpx 28rpx 28rpx 28rpx
+    .content-list{
+        .list-row{
+            background: #FFFFFF;
+            border-radius: 12rpx 12rpx 12rpx 12rpx;
+            border: 2rpx solid #DCDCDC;
+            padding: 30rpx 28rpx
+            display: flex;
+            align-items: center
+            justify-content: space-between
+            margin-bottom: 28rpx;
+            .row-image{
+                width: 36rpx;
+                height: 36rpx;
+            }
+        }
+        .list-row-add{
+            background: #FFFFFF;
+            color: #256BFA
+            font-size: 28rpx
+            font-weight: 500
+            border-radius: 12rpx 12rpx 12rpx 12rpx;
+            border: 2rpx dashed #256BFA;
+            padding: 30rpx 28rpx
+            text-align: center
+        }
+    }
+}
+.content-title
+    display: flex
+    justify-content: space-between;
+    align-items: center
+    margin-bottom: 50rpx
+    .title-lf
+        font-size: 44rpx;
+        color: #000000;
+        font-weight: 600;
+        .lf-text
+            font-weight: 400;
+            font-size: 28rpx;
+            color: #6C7282;
+    .title-ri
+        font-size: 36rpx;
+        color: #000000;
+        font-weight: 600;
+</style>
diff --git a/packageA/pages/browseJob/browseJob.vue b/packageA/pages/browseJob/browseJob.vue
index 1ae50e0..7bc6f04 100644
--- a/packageA/pages/browseJob/browseJob.vue
+++ b/packageA/pages/browseJob/browseJob.vue
@@ -1,114 +1,60 @@
 <template>
-    <view class="collection-content">
-        <view class="collection-search">
-            <view class="search-content">
-                <input class="uni-input collInput" type="text" @confirm="searchCollection" >
-                    <uni-icons class="iconsearch" color="#616161" type="search" size="20"></uni-icons>
-                </input>
+    <AppLayout title="我的浏览" :show-bg-image="false" :use-scroll-view="false">
+        <template #headerleft>
+            <view class="btn">
+                <image src="@/static/icon/back.png" @click="navBack"></image>
             </view>
-            <view class="search-date">
-                <view class="date-7days AllDay" v-if="state.isAll">
-                    <view class="day" v-for="item in weekday" :key="item.weekday">
-                        {{item.weekday}}
+        </template>
+        <view class="collection-content">
+            <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"
+                            @confirm="searchCollection"
+                            placeholder="招聘会"
+                            placeholder-class="inputplace"
+                        />
                     </view>
-                    <!-- 日期 -->
-                    <view class="day" v-for="(item, index) in monthDay" :key="index" :class="{active: item.fullDate === currentDay, nothemonth: !item.isCurrent, optional: findBrowseData(item.fullDate)}" @click="selectDay(item)">
-                        {{item.day}}
+                    <view class="data-all">
+                        <image class="allimg button-click" @click="toSelectDate" src="/static/icon/date1.png"></image>
                     </view>
-                    <view class="monthSelect">
-                        <uni-icons size="14" class="monthIcon" 
-                        :color="state.lastDisable ? '#e8e8e8' : '#333333'" type="left" 
-                        @click="changeMonth('lastmonth')"></uni-icons>
-                        {{state.currentMonth}}
-                        <uni-icons size="14" class="monthIcon" 
-                        :color="state.nextDisable ? '#e8e8e8' : '#333333'" type="right" 
-                        @click="changeMonth('nextmonth')"></uni-icons>
-                    </view>
-                </view>
-                <view class="date-7days" v-else>
-                    <view class="day" v-for="item in weekday" :key="item.weekday">
-                        {{item.weekday}}
-                    </view>
-                    <!-- 日期 -->
-                    <view class="day" v-for="(item, index) in weekday" :key="index" :class="{active: item.fullDate === currentDay, optional: findBrowseData(item.fullDate)}" @click="selectDay(item)">
-                        {{item.day}}
-                    </view>
-                </view>
-                <view class="downDate">
-                    <uni-icons class="downIcon" v-if="state.isAll" type="up" color="#FFFFFF" size="17" @click="upDateList"></uni-icons>
-                    <uni-icons class="downIcon" v-else type="down" color="#FFFFFF" size="18" @click="downDateList"></uni-icons>
                 </view>
             </view>
+            <scroll-view scroll-y class="main-scroll" @scrolltolower="getJobList('add')">
+                <view class="one-cards">
+                    <view class="mian">
+                        <renderJobs
+                            :list="pageState.list"
+                            v-if="pageState.list.length"
+                            :longitude="longitudeVal"
+                            :latitude="latitudeVal"
+                        ></renderJobs>
+                        <empty v-else pdTop="200"></empty>
+                        <!-- <loadmore ref="loadmoreRef"></loadmore> -->
+                    </view>
+                </view>
+            </scroll-view>
         </view>
-        <view class="one-cards">
-            <view
-                class="card-box "
-                v-for="(item, index) in pageState.list"
-                :key="index"
-                :class="{'card-transprent': item.isTitle}"
-                @click="navToPost(item.jobId)"
-            >
-                <view class="card-title" v-if="item.isTitle">{{item.title}}</view>
-                <view v-else>
-                    <view class="box-row mar_top0">
-                        <view class="row-left">{{ item.jobTitle }}</view>
-                        <view class="row-right"><Salary-Expectation
-                            :max-salary="item.maxSalary"
-                            :min-salary="item.minSalary"
-                        ></Salary-Expectation></view>
-                    </view>
-                    <view class="box-row">
-                        <view class="row-left">
-                            <view class="row-tag" v-if="item.educatio">
-                                <dict-Label dictType="education" :value="item.education"></dict-Label>
-                            </view>
-                            <view class="row-tag" v-if="item.experience">
-                                <dict-Label dictType="experience" :value="item.experience"></dict-Label>
-                            </view>
-                        </view>
-                    </view>
-                    <view class="box-row mar_top0">
-                        <view class="row-item mineText">{{ item.postingDate || '发布日期' }}</view>
-                        <view class="row-item mineText">{{ vacanciesTo(item.vacancies) }}</view>
-                        <view class="row-item mineText textblue"><matchingDegree :job="item"></matchingDegree></view>
-                        <view class="row-item">
-                            <!-- <uni-icons type="star" size="28"></uni-icons> -->
-                            <!-- <uni-icons type="star-filled" color="#FFCB47" size="30"></uni-icons> -->
-                        </view>
-                    </view>
-                    <view class="box-row">
-                        <view class="row-left mineText">{{ item.companyName }}</view>
-                        <view class="row-right mineText">
-                            青岛
-                            <dict-Label dictType="area" :value="item.jobLocationAreaCode"></dict-Label>
-                            <!-- 550m -->
-                        </view>
-                    </view>
-                </view>
-            </view>
-        </view>
-    </view>
+    </AppLayout>
 </template>
 
 <script setup>
 import dictLabel from '@/components/dict-Label/dict-Label.vue';
 import { reactive, inject, watch, ref, onMounted } from 'vue';
+import { storeToRefs } from 'pinia';
 import { onLoad, onShow, onReachBottom } from '@dcloudio/uni-app';
 import useUserStore from '@/stores/useUserStore';
-const { $api, navTo, vacanciesTo, getWeeksOfMonth, isFutureDate } = inject('globalFunction');
+const { $api, navTo, navBack } = inject('globalFunction');
+import useLocationStore from '@/stores/useLocationStore';
+const { userInfo } = storeToRefs(useUserStore());
+const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
 const userStore = useUserStore();
-const state = reactive({
-    isAll: false,
-    fiveMonth: [],
-    currentMonth: '',
-    currentMonthNumber: 0,
-    lastDisable: false,
-    nextDisable: true,
-});
-const browseDate = ref('')
-const weekday = ref([])
-const monthDay = ref([])
-const currentDay = ref('')
+const browseDate = ref('');
+const weekday = ref([]);
+const monthDay = ref([]);
+const currentDay = ref('');
 const pageState = reactive({
     page: 0,
     list: [],
@@ -116,104 +62,47 @@ const pageState = reactive({
     maxPage: 1,
     pageSize: 10,
     search: {},
-    lastDate: ''
+    lastDate: '',
 });
+const currentDate = ref('');
 
 onLoad(() => {
-    getBrowseDate()
-    const five = getLastFiveMonths()
-    state.fiveMonth = five
-    state.currentMonth = five[0]
-    state.nextDisable = true
-    const today = new Date().toISOString().split('T')[0]
-    // currentDay.value = new Date().toISOString().split('T')[0]
-    state.currentMonthNumber = new Date().getMonth() + 1
-    weekday.value = getWeekFromDate(today)
+    getBrowseDate();
+    const today = new Date().toISOString().split('T')[0];
     getJobList('refresh');
+    currentDate.value = today;
 });
 
-onReachBottom(() => {
-    getJobList();
-});
+function toSelectDate() {
+    navTo('/packageA/pages/selectDate/selectDate', {
+        query: {
+            date: currentDate.value,
+        },
+        onBack: (res) => {
+            currentDate.value = res.date;
+            pageState.search.startDate = getPreviousDay(res.date);
+            pageState.search.endDate = res.date;
+            getJobList('refresh');
+        },
+    });
+}
 
 function navToPost(jobId) {
     navTo(`/packageA/pages/post/post?jobId=${btoa(jobId)}`);
 }
 
-function findBrowseData(date) {
-    const reg = new RegExp(date, 'g')
-    return reg.test(browseDate.value)
-}
-
 function searchCollection(e) {
-    const value = e.detail.value
-    pageState.search.jobTitle = value
-    getJobList('refresh')
-}
-
-function selectDay(item) {
-    if(isFutureDate(item.fullDate) || !findBrowseData(item.fullDate)) {
-        $api.msg("这一天没有浏览记录")
-    } else {
-        pageState.search.startDate = getPreviousDay(item.fullDate)
-        pageState.search.endDate = item.fullDate
-        currentDay.value = item.fullDate
-        getJobList('refresh')
-        if(item.month !== state.currentMonthNumber) {
-            const today = new Date(item.fullDate);
-            monthDay.value = getWeeksOfMonth(today.getFullYear(), today.getMonth() + 1).flat(1);
-            if(item.month > state.currentMonthNumber) {
-                changeMonth('nextmonth')
-            }  else {
-                changeMonth('lastmonth')
-            }
-            state.currentMonthNumber = item.month
-        } 
-    }
-}
-
-function changeMonth(type) {
-    const currentIndex = state.fiveMonth.findIndex((item) => item === state.currentMonth)
-    switch(type) {
-        case 'lastmonth':
-            if(currentIndex === state.fiveMonth.length - 2) state.lastDisable = true
-            if(currentIndex === state.fiveMonth.length - 1) return
-            state.currentMonth = state.fiveMonth[currentIndex + 1]
-            state.nextDisable = false
-            $api.msg("上一月")
-            break
-        case 'nextmonth':
-            if(currentIndex === 1) state.nextDisable = true
-            if(currentIndex === 0) return
-            state.currentMonth = state.fiveMonth[currentIndex - 1]
-            state.lastDisable = false
-            $api.msg("下一月")
-            break
-    }
-    const today = new Date(state.currentMonth);
-    monthDay.value = getWeeksOfMonth(today.getFullYear(), today.getMonth() + 1).flat(1);
-}
-
-function downDateList(str) {
-    const today = new Date();
-    monthDay.value = getWeeksOfMonth(today.getFullYear(), today.getMonth() + 1).flat(1);
-    state.isAll = true
+    const value = e.detail.value;
+    pageState.search.jobTitle = value;
+    getJobList('refresh');
 }
 
 function getBrowseDate() {
     $api.createRequest('/app/user/review/array').then((res) => {
-        browseDate.value = res.data.join(',')
-    })
+        browseDate.value = res.data.join(',');
+    });
 }
 
-function upDateList() {
-    if(currentDay.value) {
-        weekday.value = getWeekFromDate(currentDay.value)
-    }
-    state.isAll = false
-}
-
-
 function getJobList(type = 'add', loading = true) {
     if (type === 'refresh') {
         pageState.page = 1;
@@ -225,25 +114,26 @@ function getJobList(type = 'add', loading = true) {
     let params = {
         current: pageState.page,
         pageSize: pageState.pageSize,
-        ...pageState.search
+        ...pageState.search,
     };
     $api.createRequest('/app/user/review', params, 'GET', loading).then((resData) => {
         const { rows, total } = resData;
         if (type === 'add') {
             const str = pageState.pageSize * (pageState.page - 1);
             const end = pageState.list.length;
-            const [reslist, lastDate] = $api.insertSortData(rows, 'reviewDate')
-            if(reslist.length) { // 日期监测是否一致
-               if (reslist[0].title === pageState.lastDate) {
-                    reslist.shift()
+            const [reslist, lastDate] = $api.insertSortData(rows, 'reviewDate');
+            if (reslist.length) {
+                // 日期监测是否一致
+                if (reslist[0].title === pageState.lastDate) {
+                    reslist.shift();
                 }
             }
             pageState.list.splice(str, end, ...reslist);
-            pageState.lastDate = lastDate
+            pageState.lastDate = lastDate;
         } else {
-            const [reslist, lastDate] = $api.insertSortData(rows, 'reviewDate')
-            pageState.list = reslist
-            pageState.lastDate = lastDate
+            const [reslist, lastDate] = $api.insertSortData(rows, 'reviewDate');
+            pageState.list = reslist;
+            pageState.lastDate = lastDate;
         }
         // pageState.list = resData.rows;
         pageState.total = resData.total;
@@ -251,28 +141,6 @@ function getJobList(type = 'add', loading = true) {
     });
 }
 
-function getWeekFromDate(dateStr) {
-    const days = [];
-    const targetDate = new Date(dateStr);
-    const currentDay = targetDate.getDay(); // 获取星期几（0 表示星期日）
-    const sundayIndex = currentDay === 0 ? 7 : currentDay; // 让星期日变为 7
-
-    // 计算本周的起始和结束日期
-    for (let i = 1; i <= 7; i++) {
-        const date = new Date(targetDate);
-        date.setDate(targetDate.getDate() - (sundayIndex - i)); // 计算日期
-        days.push({
-            weekday: ['周一', '周二', '周三', '周四', '周五', '周六', '周日'][i - 1],
-            fullDate: date.toISOString().split('T')[0], // YYYY-MM-DD 格式
-            day: date.getDate(),
-            month: date.getMonth() + 1,
-            year: date.getFullYear(),
-        });
-    }
-
-    return days;
-}
-
 function getPreviousDay(dateStr) {
     const date = new Date(dateStr);
     date.setDate(date.getDate() - 1); // 减去一天
@@ -280,155 +148,72 @@ function getPreviousDay(dateStr) {
     // 格式化成 YYYY-MM-DD
     return date.toISOString().split('T')[0];
 }
-
-function getLastFiveMonths() {
-    const result = [];
-    const today = new Date();
-
-    for (let i = 0; i < 5; i++) {
-        const date = new Date(today);
-        date.setMonth(today.getMonth() - i); // 往前推 i 个月
-
-        const year = date.getFullYear();
-        const month = String(date.getMonth() + 1).padStart(2, '0'); // 补零
-
-        result.push(`${year}-${month}`);
-    }
-
-    return result;
-}
 </script>
 
-<style lang="stylus">
-.card-title
-    color: #5d5d5d;
-    font-weight: bold;
-    font-size: 24rpx
-.nothemonth
-    color: #bfbfbf
-    
-.downDate
-    display: flex
-    align-items: center
-    justify-content: center
-    width: 100%
-    margin-top: 20rpx
-    .downIcon
-        background: #e8e8e8
-        border-radius: 50%
-        width: 40rpx
-        height: 40rpx
-.AllDay
-    position: relative
-    padding-top: 70rpx
-    .monthSelect
-        position: absolute;
-        top: 0
-        left: 50%
-        transform: translate(-50%, 0)
-        text-align: center;
-        line-height: 50rpx
-        display: flex
-        align-items: center
-        justify-content: center
-        font-size: 28rpx
-        .monthIcon
-            padding: 0 10rpx
-        
-.date-7days
-    display: grid;
-    grid-template-columns: repeat(7, 1fr);
-    text-align: center
-    margin-top: 10rpx 
-    font-size: 24rpx
-    grid-gap: 26rpx
-    .day
-        position: relative
-        z-index: 2
-    .active
-        color: #FFFFFF
-    .active::before
-        position: absolute
-        content: ''
-        top: 50%
-        left: 50%
-        transform: translate(-50%, -50%)
-        width: 40rpx
-        height: 40rpx
-        background: #4679ef
-        border-radius: 7rpx
-        z-index: -1
-    .optional::after
-        border 2rpx solid #4679ef
-        position: absolute
-        content: ''
-        top: 50%
-        left: 50%
-        border-radius: 10rpx
-        transform: translate(-50%, -50%)
-        width: 40rpx
-        height: 40rpx
-        z-index: -1
-        
-    
+<style lang="stylus" scoped>
+.btn {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    width: 60rpx;
+    height: 60rpx;
+}
+image {
+    height: 100%;
+    width: 100%;
+}
 .collection-content
-    padding: 0 0 20rpx 0;
-
+    height: 100%
+    display: flex
+    flex-direction: column
 .collection-search
     padding: 10rpx 20rpx;
+
     .search-content
         position: relative
-        .collInput
-            padding: 6rpx 10rpx 6rpx 50rpx;
-            background: #e8e8e8
-            border-radius: 10rpx
-        .iconsearch 
-            position: absolute
-            left: 10rpx
-            top: 50%
-            transform: translate(0, -50%)
-
-.one-cards
-    display: flex;
-    flex-direction: column;
-    padding: 0 20rpx;
-    .card-box
-        width: calc(100% - 36rpx - 36rpx);
-        border-radius: 0rpx 0rpx 0rpx 0rpx;
-        background: #FFFFFF;
-        border-radius: 17rpx;
-        padding: 15rpx 36rpx;
-        margin-top: 24rpx;
-        .box-row
-            display: flex;
-            justify-content: space-between;
-            margin-top: 8rpx;
-            align-items: center;
-            .mineText
+        display: flex
+        align-items: center
+        padding: 14rpx 0
+        .header-input{
+            padding: 0
+            width: calc(100% - 48rpx);
+            position: relative
+            .iconsearch{
+                position: absolute
+                left: 30rpx;
+                top: 50%
+                transform: translate(0, -50%)
+            }
+            .input{
+                padding: 0 30rpx 0 80rpx
+                height: 80rpx;
+                background: #FFFFFF;
+                border-radius: 75rpx 75rpx 75rpx 75rpx;
+                border: 2rpx solid #ECECEC
+                font-size: 28rpx;
+            }
+            .inputplace{
                 font-weight: 400;
-                font-size: 21rpx;
-                color: #606060;
-            .textblue
-                color: #4778EC;
-            .row-left
-                display: flex;
-                justify-content: space-between;
-                .row-tag
-                    background: #13C57C;
-                    border-radius: 17rpx 17rpx 17rpx 17rpx;
-                    font-size: 21rpx;
-                    color: #FFFFFF;
-                    line-height: 25rpx;
-                    text-align: center;
-                    padding: 4rpx 8rpx;
-                    margin-right: 23rpx;
-    .card-box:first-child
-        margin-top: 6rpx;
-        
-.card-transprent
-    background: transparent !important;
+                font-size: 28rpx;
+                color: #B5B5B5;
+            }
+        }
+        .data-all{
+            width: 66rpx;
+            height: 66rpx;
+            margin-left: 18rpx
+            .allimg{
+                width: 100%;
+                height: 100%
+            }
+        }
+.main-scroll{
+    flex: 1
+    overflow: hidden
+}
+.one-cards{
+    padding: 0 20rpx 20rpx 20rpx;
+    background: #f4f4f4
 
-.card-transprent:first-child
-    margin: 0 !important;
-    padding: 0 !important
+}
 </style>
diff --git a/packageA/pages/choiceness/choiceness.vue b/packageA/pages/choiceness/choiceness.vue
index a1377bd..e1b2e3e 100644
--- a/packageA/pages/choiceness/choiceness.vue
+++ b/packageA/pages/choiceness/choiceness.vue
@@ -1,128 +1,151 @@
 <template>
-  <view class="container">
-    <!-- 搜索栏 -->
-    <view class="search-bar">精选企业</view>
-
-    <!-- 格子布局 -->
-    <view class="grid-container">
-      <view
-        class="grid-item"
-        :style="{ backgroundColor: item.backgroudColor }"
-        v-for="item in list"
-        :key="item.companyCardId"
-      >
-        <text class="title">{{ item.name }}</text>
-        <view class="status" v-if="item.isCollection" @click="delCollectionCard(item)">已关注 ✓</view>
-        <view class="status" v-else @click="CollectionCard(item)">特别关注</view>
-      </view>
-
-      <!--   <view class="grid-item green">
-        <text class="title">银行招聘</text>
-        <view class="status">特别关注</view>
-      </view>
-
-      <view class="grid-item orange">
-        <text class="title">世界500强</text>
-        <view class="status">特别关注</view>
-      </view>
-
-      <view class="grid-item red">
-        <text class="title">中国500强</text>
-        <view class="status">特别关注</view>
-      </view> -->
-    </view>
-  </view>
+    <AppLayout title="精选企业">
+        <template #headerleft>
+            <view class="btn">
+                <image src="@/static/icon/back.png" @click="navBack"></image>
+            </view>
+        </template>
+        <view class="main">
+            <view class="main-header">
+                <view class="header-title btn-feel">企业推荐站</view>
+                <view class="header-text btn-feel">AI智联青岛，岗位触手可“职”！</view>
+                <image class="header-img btn-shaky" src="/static/icon/companyBG.png"></image>
+            </view>
+            <view class="main-content">
+                <view class="cards btn-feel" v-for="item in list" :key="item.companyCardId" @click="seeDetail(item)">
+                    <view class="card-title">{{ item.name }}</view>
+                    <view class="card-text">{{ item.description }}</view>
+                </view>
+            </view>
+        </view>
+    </AppLayout>
 </template>
 
 <script setup>
-import dictLabel from '@/components/dict-Label/dict-Label.vue';
-import { reactive, inject, watch, ref, onMounted } from 'vue';
+import { inject, ref, reactive } from 'vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
+const { $api, navBack, navTo } = inject('globalFunction');
+import { storeToRefs } from 'pinia';
 import useUserStore from '@/stores/useUserStore';
-const { $api, navTo } = inject('globalFunction');
+const { getUserResume } = useUserStore();
+const { userInfo } = storeToRefs(useUserStore());
 const list = ref([]);
 
 onLoad(() => {
-  getPremiumList();
+    getPremiumList();
 });
 
 function CollectionCard(item) {
-  $api.createRequest(`/app/company/card/collection/${item.companyCardId}`, {}, 'PUT').then((resData) => {
-    getPremiumList();
-    $api.msg('关注成功');
-  });
+    $api.createRequest(`/app/company/card/collection/${item.companyCardId}`, {}, 'PUT').then((resData) => {
+        getPremiumList();
+        $api.msg('关注成功');
+    });
 }
 
 function delCollectionCard(item) {
-  $api.createRequest(`/app/company/card/collection/${item.companyCardId}`, {}, 'DELETE').then((resData) => {
-    getPremiumList();
-    $api.msg('取消关注');
-  });
+    $api.createRequest(`/app/company/card/collection/${item.companyCardId}`, {}, 'DELETE').then((resData) => {
+        getPremiumList();
+        $api.msg('取消关注');
+    });
 }
 
 function getPremiumList() {
-  $api.createRequest('/app/company/card').then((resData) => {
-    const { rows, total } = resData;
-    list.value = rows;
-  });
+    $api.createRequest('/app/company/card').then((resData) => {
+        const { rows, total } = resData;
+        list.value = rows;
+    });
+}
+
+function seeDetail(item) {
+    uni.setStorageSync('jinxuan', item);
+    navTo('/packageA/pages/choicenessList/choicenessList');
 }
 </script>
 
 <style lang="stylus" scoped>
-/* 页面整体样式 */
-.container
-  background-color #edf4ff
-  height 100%
-  display flex
-  flex-direction column
-  padding 20rpx
+.btn {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    width: 60rpx;
+    height: 60rpx;
+    image {
+        height: 100%;
+        width: 100%;
+    }
+}
+.main{
+    .main-content{
+        padding: 28rpx
+        .cards{
+            padding: 32rpx
+            border-radius: 12rpx 12rpx 12rpx 12rpx;
+            border: 2rpx solid #DCDCDC;
+            margin-bottom: 36rpx;
+            position: relative;
+            .card-title{
+                font-family: PingFang SC, PingFang SC;
+                font-weight: 600;
+                font-size: 32rpx;
+                color: #333333;
+            }
+            .card-text{
+                margin-top: 16rpx
+                width: 502rpx;
+                height: 80rpx;
+                font-weight: 400;
+                font-size: 28rpx;
+                color: #6C7282;
+            }
+        }
+        .cards::before{
+            position: absolute;
+            right: 40rpx;
+            top: 50%;
+            content: '';
+            width: 4rpx;
+            height: 18rpx;
+            border-radius: 2rpx
+            background: #6C7282;
+            transform: translate(0, -50%) rotate(-45deg) ;
+        }
 
-/* 搜索栏样式 */
-.search-bar
-  font-size 32rpx
-  font-weight bold
-  color #333
-  margin-bottom 20rpx
+        .cards::after{
+            position: absolute;
+            right: 40rpx;
+            top: calc(50% + 1rpx);
+            content: '';
+            width: 4rpx;
+            height: 18rpx;
+            border-radius: 2rpx
+            background: #6C7282;
+            transform: rotate(45deg)
+        }
 
-/* 格子布局样式 */
-.grid-container
-  display flex
-  flex-wrap wrap
-  justify-content space-between
-  gap 20rpx
-
-.grid-item
-  width 48%
-  height 200rpx
-  border-radius 20rpx
-  display flex
-  flex-direction column
-  justify-content center
-  align-items center
-  color #fff
-  font-size 28rpx
-  font-weight bold
-  position relative
-
-  .status
-    position absolute
-    bottom 20rpx
-    font-size 24rpx
-    background-color rgba(255, 255, 255, 0.9)
-    color #333
-    padding 5rpx 15rpx
-    border-radius 15rpx
-
-/* 每种格子对应的颜色 */
-.blue
-  background-color #3b82f6
-
-.green
-  background-color #22c55e
-
-.orange
-  background-color #f59e0b
-
-.red
-  background-color #ef4444
+    }
+    .main-header{
+        padding: 80rpx 40rpx
+        position: relative
+        .header-title{
+            font-weight: 400;
+            font-size: 56rpx;
+            color: #333333;
+            font-family: DingTalk JinBuTi;
+        }
+        .header-text{
+            font-weight: 400;
+            font-size: 32rpx;
+            color: rgba(3,3,3,0.5);
+            margin-top: 10rpx
+        }
+        .header-img{
+            position: absolute
+            right: 0
+            bottom: 0
+            // transform: translate(0, -50%)
+            width: 280rpx;
+            height: 272rpx;
+        }
+    }
+}
 </style>
diff --git a/packageA/pages/choicenessList/choicenessList.vue b/packageA/pages/choicenessList/choicenessList.vue
new file mode 100644
index 0000000..f0be602
--- /dev/null
+++ b/packageA/pages/choicenessList/choicenessList.vue
@@ -0,0 +1,152 @@
+<template>
+    <AppLayout :title="title" :show-bg-image="false" @onScrollBottom="getDataList('add')">
+        <template #headerleft>
+            <view class="btn">
+                <image src="@/static/icon/back.png" @click="navBack"></image>
+            </view>
+        </template>
+        <template #headContent>
+            <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"
+                            @confirm="searchCollection"
+                            placeholder="输入企业名称"
+                            placeholder-class="inputplace"
+                        />
+                    </view>
+                </view>
+            </view>
+        </template>
+        <view class="main-list">
+            <renderCompanys
+                v-if="pageState.list.length"
+                :list="pageState.list"
+                :longitude="longitudeVal"
+                :latitude="latitudeVal"
+            ></renderCompanys>
+            <empty v-else pdTop="200"></empty>
+        </view>
+    </AppLayout>
+</template>
+
+<script setup>
+import { inject, ref, reactive } from 'vue';
+import { onLoad, onShow } from '@dcloudio/uni-app';
+import { storeToRefs } from 'pinia';
+const { $api, navTo, navBack } = inject('globalFunction');
+import useLocationStore from '@/stores/useLocationStore';
+const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
+// state
+const title = ref('事业单位');
+const cardInfo = ref({});
+const pageState = reactive({
+    page: 0,
+    list: [],
+    total: 0,
+    maxPage: 1,
+    pageSize: 10,
+    search: {},
+});
+
+onLoad(() => {
+    const options = uni.getStorageSync('jinxuan');
+    if (options) {
+        cardInfo.value = options;
+        title.value = options.name;
+    } else {
+        $api.msg('请传入精选企业参数');
+    }
+    getDataList('refresh');
+});
+
+// search
+function searchCollection(e) {
+    const value = e.detail.value;
+    pageState.search.companyName = value;
+    getDataList('refresh');
+}
+
+// list
+function getDataList(type = 'add') {
+    if (type === 'refresh') {
+        pageState.page = 0;
+        pageState.maxPage = 1;
+    }
+    if (type === 'add' && pageState.page < pageState.maxPage) {
+        pageState.page += 1;
+    }
+    let params = {
+        current: pageState.page,
+        pageSize: pageState.pageSize,
+        cardId: cardInfo.value.companyCardId,
+        ...pageState.search,
+    };
+    $api.createRequest('/app/company/label', params).then((resData) => {
+        const { rows, total } = resData;
+        if (type === 'add') {
+            const str = pageState.pageSize * (pageState.page - 1);
+            const end = pageState.list.length;
+            const reslist = rows;
+            pageState.list.splice(str, end, ...reslist);
+        } else {
+            pageState.list = rows;
+        }
+        pageState.total = resData.total;
+        pageState.maxPage = Math.ceil(pageState.total / pageState.pageSize);
+    });
+}
+</script>
+
+<style lang="stylus" scoped>
+.btn {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    width: 60rpx;
+    height: 60rpx;
+}
+image {
+    height: 100%;
+    width: 100%;
+}
+.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%)
+            }
+            .input{
+                padding: 0 30rpx 0 80rpx
+                height: 80rpx;
+                background: #FFFFFF;
+                border-radius: 75rpx 75rpx 75rpx 75rpx;
+                border: 2rpx solid #ECECEC
+                font-size: 28rpx;
+            }
+            .inputplace{
+                font-weight: 400;
+                font-size: 28rpx;
+                color: #B5B5B5;
+            }
+        }
+    }
+}
+.main-list{
+    background-color: #F4F4F4;
+    padding: 1rpx 28rpx 28rpx 28rpx
+}
+</style>
diff --git a/packageA/pages/collection/collection.vue b/packageA/pages/collection/collection.vue
index fe5815c..6308601 100644
--- a/packageA/pages/collection/collection.vue
+++ b/packageA/pages/collection/collection.vue
@@ -1,57 +1,58 @@
 <template>
-    <view class="collection-content">
-        <view class="one-cards">
-            <view class="card-box" v-for="(item, index) in pageState.list" :key="index" @click="navToPost(item.jobId)">
-                <view class="box-row mar_top0">
-                    <view class="row-left">{{ item.jobTitle }}</view>
-                    <view class="row-right">
-                        <Salary-Expectation
-                            :max-salary="item.maxSalary"
-                            :min-salary="item.minSalary"
-                        ></Salary-Expectation>
-                    </view>
-                </view>
-                <view class="box-row">
-                    <view class="row-left">
-                        <view class="row-tag" v-if="item.educatio">
-                            <dict-Label dictType="education" :value="item.education"></dict-Label>
-                        </view>
-                        <view class="row-tag" v-if="item.experience">
-                            <dict-Label dictType="experience" :value="item.experience"></dict-Label>
-                        </view>
-                    </view>
-                </view>
-                <view class="box-row mar_top0">
-                    <view class="row-item mineText">{{ item.postingDate || '发布日期' }}</view>
-                    <view class="row-item mineText">{{ vacanciesTo(item.vacancies) }}</view>
-                    <view class="row-item mineText textblue"><matchingDegree :job="item"></matchingDegree></view>
-                    <view class="row-item">
-                        <!-- <uni-icons type="star" size="28"></uni-icons> -->
-                        <!-- <uni-icons type="star-filled" color="#FFCB47" size="30"></uni-icons> -->
-                    </view>
-                </view>
-                <view class="box-row">
-                    <view class="row-left mineText">{{ item.companyName }}</view>
-                    <view class="row-right mineText">
-                        青岛
-                        <dict-Label dictType="area" :value="item.jobLocationAreaCode"></dict-Label>
-                        <!-- 550m -->
-                    </view>
-                </view>
+    <AppLayout title="我的收藏" :show-bg-image="false" :use-scroll-view="false">
+        <template #headerleft>
+            <view class="btn">
+                <image src="@/static/icon/back.png" @click="navBack"></image>
+            </view>
+        </template>
+        <view class="collection-content">
+            <view class="header">
+                <view class="button-click" :class="{ active: type === 0 }" @click="changeType(0)">工作职位</view>
+                <view class="button-click" :class="{ active: type === 1 }" @click="changeType(1)">公司企业</view>
+            </view>
+            <view class="coll-main">
+                <swiper class="swiper" :current="type" @change="changeSwiperType">
+                    <swiper-item class="list">
+                        <scroll-view scroll-y class="main-scroll" @scrolltolower="handleScrollToLower">
+                            <view class="mian">
+                                <renderJobs
+                                    :list="pageState.list"
+                                    v-if="pageState.list.length"
+                                    :longitude="longitudeVal"
+                                    :latitude="latitudeVal"
+                                ></renderJobs>
+                                <empty v-else pdTop="200"></empty>
+                            </view>
+                        </scroll-view>
+                    </swiper-item>
+                    <swiper-item class="list">
+                        <scroll-view scroll-y class="main-scroll" @scrolltolower="handleScrollToLowerCompany">
+                            <view class="mian">
+                                <renderCompanys
+                                    :list="pageCompanyState.list"
+                                    v-if="pageCompanyState.list.length"
+                                    :longitude="longitudeVal"
+                                    :latitude="latitudeVal"
+                                ></renderCompanys>
+                                <empty v-else pdTop="200"></empty>
+                            </view>
+                        </scroll-view>
+                    </swiper-item>
+                </swiper>
             </view>
         </view>
-    </view>
+    </AppLayout>
 </template>
 
 <script setup>
-import img from '/static/icon/filter.png';
-import dictLabel from '@/components/dict-Label/dict-Label.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');
-const userStore = useUserStore();
-const state = reactive({});
+import { inject, ref, reactive } from 'vue';
+import { onLoad, onShow } from '@dcloudio/uni-app';
+import { storeToRefs } from 'pinia';
+import useLocationStore from '@/stores/useLocationStore';
+const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
+const { $api, navBack } = inject('globalFunction');
+const type = ref(0);
+
 const pageState = reactive({
     page: 0,
     list: [],
@@ -59,15 +60,35 @@ const pageState = reactive({
     maxPage: 1,
     pageSize: 10,
 });
-onLoad(() => {
-    getJobList();
+
+const pageCompanyState = reactive({
+    page: 0,
+    list: [],
+    total: 0,
+    maxPage: 1,
+    pageSize: 10,
 });
 
-onReachBottom(() => {
+onShow(() => {
     getJobList();
+    getCompanyList();
 });
-function navToPost(jobId) {
-    navTo(`/packageA/pages/post/post?jobId=${btoa(jobId)}`);
+
+function changeSwiperType(e) {
+    const current = e.detail.current;
+    type.value = current;
+}
+
+function changeType(e) {
+    type.value = e;
+}
+
+function handleScrollToLower() {
+    getJobList();
+}
+
+function handleScrollToLowerCompany() {
+    getCompanyList();
 }
 
 function getJobList(type = 'add') {
@@ -97,45 +118,78 @@ function getJobList(type = 'add') {
         pageState.maxPage = Math.ceil(pageState.total / pageState.pageSize);
     });
 }
+
+function getCompanyList(type = 'add') {
+    if (type === 'refresh') {
+        pageCompanyState.page = 0;
+        pageCompanyState.maxPage = 1;
+    }
+    if (type === 'add' && pageCompanyState.page < pageCompanyState.maxPage) {
+        pageCompanyState.page += 1;
+    }
+    let params = {
+        current: pageCompanyState.page,
+        pageSize: pageCompanyState.pageSize,
+    };
+    $api.createRequest('/app/user/collection/company', params).then((resData) => {
+        const { rows, total } = resData;
+        if (type === 'add') {
+            const str = pageCompanyState.pageSize * (pageCompanyState.page - 1);
+            const end = pageCompanyState.list.length;
+            const reslist = rows;
+            pageCompanyState.list.splice(str, end, ...reslist);
+        } else {
+            pageCompanyState.list = rows;
+        }
+        // pageCompanyState.list = resData.rows;
+        pageCompanyState.total = resData.total;
+        pageCompanyState.maxPage = Math.ceil(pageCompanyState.total / pageCompanyState.pageSize);
+    });
+}
 </script>
 
-<style lang="stylus">
-.collection-content
-    padding: 20rpx 0 20rpx 0;
-.one-cards
+<style lang="stylus" scoped>
+.btn {
     display: flex;
-    flex-direction: column;
-    padding: 0 20rpx;
-    .card-box
-        width: calc(100% - 36rpx - 36rpx);
-        border-radius: 0rpx 0rpx 0rpx 0rpx;
+    justify-content: space-between;
+    align-items: center;
+    width: 60rpx;
+    height: 60rpx;
+    image {
+        height: 100%;
+        width: 100%;
+    }
+}
+.collection-content{
+   background: #F4F4F4;
+   height: 100%
+   display: flex
+   flex-direction: column
+   .header{
         background: #FFFFFF;
-        border-radius: 17rpx;
-        padding: 15rpx 36rpx;
-        margin-top: 24rpx;
-        .box-row
-            display: flex;
-            justify-content: space-between;
-            margin-top: 8rpx;
-            align-items: center;
-            .mineText
-                font-weight: 400;
-                font-size: 21rpx;
-                color: #606060;
-            .textblue
-                color: #4778EC;
-            .row-left
-                display: flex;
-                justify-content: space-between;
-                .row-tag
-                    background: #13C57C;
-                    border-radius: 17rpx 17rpx 17rpx 17rpx;
-                    font-size: 21rpx;
-                    color: #FFFFFF;
-                    line-height: 25rpx;
-                    text-align: center;
-                    padding: 4rpx 8rpx;
-                    margin-right: 23rpx;
-    .card-box:first-child
-        margin-top: 6rpx;
+        display: flex
+        justify-content: space-evenly;
+        align-items: center
+        padding: 28rpx 100rpx
+        font-weight: 400;
+        font-size: 32rpx;
+        color: #666D7F;
+        .active {
+            font-weight: 500;
+            font-size: 32rpx;
+            color: #000000;
+        }
+    }
+   .coll-main{
+        flex: 1
+        overflow: hidden
+        .main-scroll,
+        .swiper{
+            height: 100%
+            .mian{
+                padding: 0 28rpx 28rpx 28rpx
+            }
+        }
+   }
+}
 </style>
diff --git a/packageA/pages/exhibitors/exhibitors.vue b/packageA/pages/exhibitors/exhibitors.vue
index eabaeb4..73b8dc6 100644
--- a/packageA/pages/exhibitors/exhibitors.vue
+++ b/packageA/pages/exhibitors/exhibitors.vue
@@ -1,147 +1,536 @@
 <template>
-    <view class="container">
-        <!-- 招聘会详情标题 -->
-        <view class="header">
-            <text class="header-title">2024年春季青岛市商贸服务业招聘会</text>
-            <view class="header-info">
-                <view class="location">
-                    <uni-icons type="location-filled" color="#4778EC" size="24"></uni-icons>
-                    青岛 市南区延安三路105号
-                </view>
-                <text class="date">2024年7月31日 周三</text>
+    <AppLayout title="" :use-scroll-view="false">
+        <template #headerleft>
+            <view class="btn">
+                <image src="@/static/icon/back.png" @click="navBack"></image>
             </view>
-        </view>
-
-        <!-- 参会单位列表 -->
-        <view class="company-list">
-            <text class="section-title">参会单位</text>
-            <view class="company-row" v-for="company in companies" :key="company.id">
-                <view class="left">
-                    <view class="logo" :class="'logo-' + company.id">{{ company.id }}</view>
-                    <view class="company-info">
-                        <text class="company-name line_2">{{ company.name }}</text>
-                        <text class="industry">{{ company.industry }}</text>
-                        <view class="details">
-                            <text>查看详情</text>
-                            <uni-icons type="star" size="26"></uni-icons>
-                            <!-- <uni-icons type="star-filled" color="#FFCB47" size="26"></uni-icons> -->
+        </template>
+        <view class="content">
+            <view class="content-top">
+                <view class="companyinfo-left">
+                    <image src="@/static/icon/companyIcon.png" mode=""></image>
+                </view>
+                <view class="companyinfo-right">
+                    <view class="row1 line_2">{{ fairInfo?.name }}</view>
+                    <view class="row2">
+                        <text>{{ fairInfo.location }}</text>
+                        <convert-distance
+                            :alat="fairInfo.latitude"
+                            :along="fairInfo.longitude"
+                            :blat="latitudeVal"
+                            :blong="longitudeVal"
+                        ></convert-distance>
+                    </view>
+                </view>
+            </view>
+            <view class="locations">
+                <image class="location-img" src="/static/icon/mapLine.png"></image>
+                <view class="location-info">
+                    <view class="info">
+                        <text class="info-title">{{ fairInfo.address }}</text>
+                        <text class="info-text">位置</text>
+                    </view>
+                </view>
+            </view>
+            <view class="conetent-info" :class="{ expanded: isExpanded }">
+                <view class="info-title">内容描述</view>
+                <view class="info-desirption">{{ fairInfo.description }}</view>
+                <!-- <view class="info-title title2">公司地址</view>
+                <view class="locationCompany"></view> -->
+                <view class="company-times">
+                    <view class="info-title">内容描述</view>
+                    <view class="card-times">
+                        <view class="time-left">
+                            <view class="left-date">{{ parseDateTime(fairInfo.startTime).time }}</view>
+                            <view class="left-dateDay">{{ parseDateTime(fairInfo.startTime).date }}</view>
+                        </view>
+                        <view class="line"></view>
+                        <view class="time-center">
+                            <view class="center-date">
+                                {{ getTimeStatus(fairInfo.startTime, fairInfo.endTime).statusText }}
+                            </view>
+                            <view class="center-dateDay">
+                                {{ getHoursBetween(fairInfo.startTime, fairInfo.endTime) }}小时
+                            </view>
+                        </view>
+                        <view class="line"></view>
+                        <view class="time-right">
+                            <view class="left-date">{{ parseDateTime(fairInfo.endTime).time }}</view>
+                            <view class="left-dateDay">{{ parseDateTime(fairInfo.endTime).date }}</view>
                         </view>
                     </view>
                 </view>
             </view>
+            <view class="expand" @click="expand">
+                <text>{{ isExpanded ? '收起' : '展开' }}</text>
+                <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">
+                        <text class="title">参会单位（{{ companyList.length }}）</text>
+                    </view>
+                    <renderCompanys
+                        v-if="companyList.length"
+                        :list="companyList"
+                        :longitude="longitudeVal"
+                        :latitude="latitudeVal"
+                    ></renderCompanys>
+                    <empty v-else pdTop="200"></empty>
+                </view>
+            </scroll-view>
         </view>
-    </view>
+        <template #footer>
+            <view class="footer" v-if="hasnext">
+                <view
+                    class="btn-wq button-click"
+                    :class="{ 'btn-desbel': fairInfo.isCollection }"
+                    @click="applyExhibitors"
+                >
+                    {{ fairInfo.isCollection ? '已预约招聘会' : '预约招聘会' }}
+                </view>
+            </view>
+        </template>
+    </AppLayout>
 </template>
-<script>
-export default {
-    data() {
-        return {
-            companies: [
-                {
-                    id: 1,
-                    name: '湖南沃森电器科技有限公司',
-                    industry: '制造业 100-299人',
-                },
-                {
-                    id: 2,
-                    name: '青岛成达汽车销售集团',
-                    industry: '制造业 100-299人',
-                },
-                {
-                    id: 3,
-                    name: '青岛日森电器有限公司',
-                    industry: '制造业 100-299人',
-                },
-                {
-                    id: 4,
-                    name: '青岛融合网络通信有限公司',
-                    industry: '制造业 100-299人',
-                },
-            ],
-        };
-    },
+
+<script setup>
+import point from '@/static/icon/point.png';
+import { reactive, inject, watch, ref, onMounted, computed } from 'vue';
+import { onLoad, onShow } from '@dcloudio/uni-app';
+import dictLabel from '@/components/dict-Label/dict-Label.vue';
+import useLocationStore from '@/stores/useLocationStore';
+const { $api, navTo, vacanciesTo, navBack } = inject('globalFunction');
+import { storeToRefs } from 'pinia';
+const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
+
+const isExpanded = ref(false);
+const fairInfo = ref({});
+const companyList = ref([]);
+const hasnext = ref(true);
+onLoad((options) => {
+    getCompanyInfo(options.jobFairId);
+});
+
+function getCompanyInfo(id) {
+    $api.createRequest(`/app/fair/${id}`).then((resData) => {
+        fairInfo.value = resData.data;
+        companyList.value = resData.data.companyList;
+        hasAppointment();
+    });
+}
+
+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);
 };
+
+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;
+}
+
+function expand() {
+    isExpanded.value = !isExpanded.value;
+}
+
+// 取消/收藏岗位
+function applyExhibitors() {
+    const fairId = fairInfo.value.jobFairId;
+    if (fairInfo.value.isCollection) {
+        // $api.createRequest(`/app/fair/collection/${fairId}`, {}, 'DELETE').then((resData) => {
+        //     getCompanyInfo(fairId);
+        //     $api.msg('取消预约成功');
+        // });
+        $api.msg('已预约成功');
+    } else {
+        $api.createRequest(`/app/fair/collection/${fairId}`, {}, 'POST').then((resData) => {
+            getCompanyInfo(fairId);
+            $api.msg('预约成功');
+        });
+    }
+}
+
+function parseDateTime(datetimeStr) {
+    if (!datetimeStr) return { time: '', date: '' };
+
+    const dateObj = new Date(datetimeStr);
+
+    if (isNaN(dateObj.getTime())) return { time: '', date: '' }; // 无效时间
+
+    const year = dateObj.getFullYear();
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0');
+    const day = String(dateObj.getDate()).padStart(2, '0');
+    const hours = String(dateObj.getHours()).padStart(2, '0');
+    const minutes = String(dateObj.getMinutes()).padStart(2, '0');
+
+    return {
+        time: `${hours}:${minutes}`,
+        date: `${year}年${month}月${day}日`,
+    };
+}
+
+function getTimeStatus(startTimeStr, endTimeStr) {
+    const now = new Date();
+    const startTime = new Date(startTimeStr);
+    const endTime = new Date(endTimeStr);
+
+    // 判断状态：0 开始中，1 过期，2 待开始
+    let status = 0;
+    let statusText = '开始中';
+    if (now < startTime) {
+        status = 2; // 待开始
+        statusText = '待开始';
+    } else if (now > endTime) {
+        status = 1; // 已过期
+        statusText = '已过期';
+    } else {
+        status = 0; // 进行中
+        statusText = '进行中';
+    }
+    return {
+        status, // 0: 进行中，1: 已过期，2: 待开始
+        statusText,
+    };
+}
+
+function getHoursBetween(startTimeStr, endTimeStr) {
+    const start = new Date(startTimeStr);
+    const end = new Date(endTimeStr);
+
+    const diffMs = end - start;
+    const diffHours = diffMs / (1000 * 60 * 60);
+
+    return +diffHours.toFixed(2); // 保留 2 位小数
+}
 </script>
 
 <style lang="stylus" scoped>
-.container
-  display flex
-  flex-direction column
-  background-color #f8f8f8
-
-.header
-  padding 20rpx 40rpx
-  background-color #fff
-  .header-title
-    font-size 56rpx
-    font-weight bold
-    color #333
-    margin-bottom 10rpx
-  .header-info
-    margin-top: 20rpx
-    font-size 24rpx
-    color #666
-    display flex
-    align-items center
-    justify-content space-between
-    .location
-      display flex
-      align-items center
-    .date
-      flex-shrink 0
-
-.company-list
-  padding 20rpx
-  background-color #fff
-  margin-top 10rpx
-  .section-title
-    padding 20rpx
-    font-size 40rpx
-    font-weight bold
-    margin-bottom 10rpx
-
-.company-row
-  display flex
-  justify-content space-between
-  align-items center
-  padding 20rpx
-  border 2rpx solid #D9D9D9
-  margin-top 20rpx
-  border-radius 17rpx 17rpx 17rpx 17rpx
-  .left
-    display flex
-    align-items center
-    width: 100%
+.btn {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    width: 60rpx;
+    height: 60rpx;
+}
+image {
+    height: 100%;
+    width: 100%;
+}
+.content{
     height: 100%
-    .logo
-      background-color #22c55e
-      color #fff
-      font-size 24rpx
-      font-weight bold
-      width: 235rpx;
-      height: 164rpx;
-      display flex
-      align-items center
-      justify-content center
-      border-radius 12rpx
-      margin-right 20rpx
-    .company-info
-      min-height 164rpx
-      flex 1
-      display flex
-      flex-direction column
-      justify-content space-between
-      .company-name
-        font-size 28rpx
-        color #333
-        font-weight bold
-      .industry
-        font-size 24rpx
-        color #666
-      .details
-        font-size 24rpx
-        color #666
-        display flex
-        align-items center
-        justify-content space-between
+    display: flex;
+    flex-direction: column
+    .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-right{
+            flex: 1
+            .row1{
+                font-weight: 500;
+                font-size: 32rpx;
+                color: #333333;
+            }
+            .row2{
+                font-weight: 400;
+                font-size: 28rpx;
+                color: #6C7282;
+                line-height: 45rpx;
+                display: flex
+                justify-content: space-between
+            }
+        }
+    }
+    .locations{
+        padding: 0 28rpx
+        height: 86rpx;
+        position: relative
+        margin-bottom: 36rpx
+        .location-img{
+            border-radius: 8rpx 8rpx 8rpx 8rpx;
+            border: 2rpx solid #EFEFEF;
+        }
+        .location-info{
+            position: absolute
+            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
+               padding-top:  rpx
+               .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::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)
+               }
+
+            }
+        }
+    }
+    .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-desirption{
+            margin-top: 12rpx
+            font-weight: 400;
+            font-size: 28rpx;
+            color: #495265;
+            text-align: justified;
+        }
+        .title2{
+            margin-top: 48rpx
+        }
+    }
+    .company-times{
+        padding-top: 40rpx
+        .info-title{
+            font-weight: 600;
+            font-size: 28rpx;
+            color: #000000;
+        }
+    }
+    .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-img{
+            width: 40rpx;
+            height: 40rpx;
+        }
+        .expand-img-active{
+            transform: rotate(180deg)
+        }
+    }
+}
+.Detailscroll-view{
+    flex: 1;
+    overflow: hidden;
+    background: #F4F4F4;
+    .views{
+        padding: 28rpx
+        .Detail-title{
+            font-weight: 600;
+            font-size: 32rpx;
+            color: #000000;
+            position: relative;
+            display: flex
+            justify-content: space-between
+            .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;
+        }
+        .cards{
+            padding: 32rpx;
+            background: #FFFFFF;
+            box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04);
+            border-radius: 20rpx 20rpx 20rpx 20rpx;
+            margin-top: 22rpx;
+            .card-company{
+                display: flex
+                justify-content: space-between
+                align-items: flex-start
+                .company{
+                    font-weight: 500;
+                    font-size: 32rpx;
+                    color: #333333;
+                }
+                .salary{
+                    font-weight: 500;
+                    font-size: 28rpx;
+                    color: #4C6EFB;
+                    white-space: nowrap
+                    line-height: 48rpx
+                }
+            }
+            .card-companyName{
+                font-weight: 400;
+                font-size: 28rpx;
+                color: #6C7282;
+            }
+            .card-tags{
+                display: flex
+                flex-wrap: wrap
+                .tag{
+                    width: fit-content;
+                    height: 30rpx;
+                    background: #F4F4F4;
+                    border-radius: 4rpx;
+                    padding: 6rpx 20rpx;
+                    line-height: 30rpx;
+                    font-weight: 400;
+                    font-size: 24rpx;
+                    color: #6C7282;
+                    text-align: center;
+                    margin-top: 14rpx;
+                    white-space: nowrap
+                    margin-right: 20rpx
+                }
+            }
+            .card-bottom{
+                margin-top: 32rpx
+                display: flex
+                justify-content: space-between
+                font-size: 28rpx;
+                color: #6C7282;
+            }
+        }
+    }
+}
+.card-times{
+    display: flex;
+    justify-content: space-between
+    align-items: center
+    padding: 24rpx 30rpx 10rpx 30rpx
+    .time-left,
+    .time-right{
+        text-align: center
+        .left-date{
+            font-weight: 500;
+            font-size: 48rpx;
+            color: #333333;
+        }
+        .left-dateDay{
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #333333;
+            margin-top: 12rpx
+        }
+    }
+    .line{
+        width: 40rpx;
+        height: 0rpx;
+        border: 2rpx solid #D4D4D4;
+        margin-top: 64rpx
+    }
+    .time-center{
+        text-align: center;
+        display: flex
+        flex-direction: column
+        justify-content: center
+        align-items: center
+        .center-date{
+            font-weight: 400;
+            font-size: 28rpx;
+            color: #FF881A;
+            padding-top: 10rpx
+        }
+        .center-dateDay{
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #333333;
+            margin-top: 6rpx
+            line-height: 48rpx;
+            width: 104rpx;
+            height: 48rpx;
+            background: #F9F9F9;
+            border-radius: 8rpx 8rpx 8rpx 8rpx;
+        }
+    }
+}
+.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>
diff --git a/packageA/pages/jobExpect/jobExpect.vue b/packageA/pages/jobExpect/jobExpect.vue
new file mode 100644
index 0000000..b86871e
--- /dev/null
+++ b/packageA/pages/jobExpect/jobExpect.vue
@@ -0,0 +1,271 @@
+<template>
+    <AppLayout
+        title="求职期望"
+        :sub-title="`完成度${percent}`"
+        border
+        back-gorund-color="#ffffff"
+        :show-bg-image="false"
+    >
+        <template #headerleft>
+            <view class="btn mar_le20 button-click" @click="navBack">取消</view>
+        </template>
+        <template #headerright>
+            <view class="btn mar_ri20 button-click" @click="confirm">确认</view>
+        </template>
+        <view class="content">
+            <view class="content-input" @click="changeSalary">
+                <view class="input-titile">期望薪资</view>
+                <input class="input-con triangle" v-model="state.salayText" disabled placeholder="请选择您的期望薪资" />
+            </view>
+            <view class="content-input" @click="changeArea">
+                <view class="input-titile">期望工作地</view>
+                <input
+                    class="input-con triangle"
+                    v-model="state.areaText"
+                    disabled
+                    placeholder="请选择您的期望工作地"
+                />
+            </view>
+            <view class="content-input" @click="changeJobs">
+                <view class="input-titile">求职岗位</view>
+                <input
+                    class="input-con triangle"
+                    disabled
+                    v-if="!state.jobsText.length"
+                    placeholder="请选择您的求职岗位"
+                />
+                <view class="input-nx" @click="changeJobs" v-else>
+                    <view class="nx-item button-click" v-for="item in state.jobsText">{{ item }}</view>
+                </view>
+            </view>
+        </view>
+        <SelectJobs ref="selectJobsModel"></SelectJobs>
+    </AppLayout>
+</template>
+
+<script setup>
+import { reactive, inject, watch, ref, onMounted, computed } from 'vue';
+import { onLoad, onShow } from '@dcloudio/uni-app';
+import SelectJobs from '@/components/selectJobs/selectJobs.vue';
+const { $api, navTo, navBack } = inject('globalFunction');
+const openSelectPopup = inject('openSelectPopup');
+import { storeToRefs } from 'pinia';
+import useUserStore from '@/stores/useUserStore';
+import useDictStore from '@/stores/useDictStore';
+const { userInfo } = storeToRefs(useUserStore());
+const { getUserResume } = useUserStore();
+const { dictLabel, oneDictData } = useDictStore();
+
+const selectJobsModel = ref();
+const percent = ref('0%');
+const salay = [2, 5, 10, 15, 20, 25, 30, 50, 80, 100];
+const state = reactive({
+    lfsalay: [2, 5, 10, 15, 20, 25, 30, 50],
+    risalay: JSON.parse(JSON.stringify(salay)),
+    salayText: '',
+    areaText: '',
+    jobsText: [],
+});
+const fromValue = reactive({
+    salaryMin: 0,
+    salaryMax: 0,
+    area: '',
+    jobTitleId: [],
+});
+onLoad(() => {
+    initLoad();
+});
+const confirm = () => {
+    if (!fromValue.jobTitleId) {
+        return $api.msg('请选择您的求职岗位');
+    }
+    $api.createRequest('/app/user/resume', fromValue, 'post').then((resData) => {
+        $api.msg('完成');
+        state.disbleDate = true;
+        getUserResume().then(() => {
+            navBack();
+        });
+    });
+};
+
+watch(userInfo, (newValue, oldValue) => {
+    initLoad();
+});
+
+function initLoad() {
+    fromValue.salaryMin = userInfo.value.salaryMin;
+    fromValue.salaryMax = userInfo.value.salaryMax;
+    fromValue.area = userInfo.value.area;
+    fromValue.jobTitleId = userInfo.value.jobTitleId;
+    // 回显
+    state.areaText = dictLabel('area', Number(userInfo.value.area));
+    state.salayText = `${userInfo.value.salaryMin}-${userInfo.value.salaryMax}`;
+    state.jobsText = userInfo.value.jobTitle;
+    const result = getFormCompletionPercent(fromValue);
+    percent.value = result;
+}
+
+const changeSalary = () => {
+    let leftIndex = 0;
+    openSelectPopup({
+        title: '薪资',
+        maskClick: true,
+        data: [state.lfsalay, state.risalay],
+        unit: 'k',
+        success: (_, [min, max]) => {
+            fromValue.salaryMin = min.value * 1000;
+            fromValue.salaryMax = max.value * 1000;
+            state.salayText = `${fromValue.salaryMin}-${fromValue.salaryMax}`;
+        },
+        change(e) {
+            const salayData = e.detail.value;
+            if (leftIndex !== salayData[0]) {
+                const copyri = JSON.parse(JSON.stringify(salay));
+                const [lf, ri] = e.detail.value;
+                const risalay = copyri.slice(lf, copyri.length);
+                this.setColunm(1, risalay);
+                leftIndex = salayData[0];
+            }
+        },
+    });
+};
+
+function changeArea() {
+    openSelectPopup({
+        title: '区域',
+        maskClick: true,
+        data: [oneDictData('area')],
+        success: (_, [value]) => {
+            fromValue.area = value.value;
+            state.areaText = '青岛市-' + value.label;
+        },
+    });
+}
+
+function changeJobs() {
+    selectJobsModel.value?.open({
+        title: '添加岗位',
+        success: (ids, labels) => {
+            fromValue.jobTitleId = ids;
+            state.jobsText = labels.split(',');
+        },
+    });
+}
+
+function getFormCompletionPercent(form) {
+    let total = Object.keys(form).length;
+    let filled = 0;
+
+    for (const key in form) {
+        const value = form[key];
+        if (value !== '' && value !== null && value !== undefined) {
+            if (typeof value === 'number') {
+                filled += 1;
+            } else if (typeof value === 'string' && value.trim() !== '') {
+                filled += 1;
+            }
+        }
+    }
+
+    if (total === 0) return '0%';
+    const percent = (filled / total) * 100;
+    return percent.toFixed(0) + '%'; // 取整，不要小数点
+}
+</script>
+
+<style lang="stylus" scoped>
+.btn{
+    margin-top: -30rpx
+}
+.content{
+    padding: 28rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start
+    height: calc(100% - 120rpx)
+
+}
+.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;
+    .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)
+.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
+.input-nx
+    position: relative
+    border-bottom: 2rpx solid #EBEBEB
+    padding-bottom: 30rpx
+    display: flex
+    flex-wrap: wrap
+    .nx-item
+        padding: 20rpx 28rpx
+        width: fit-content
+        border-radius: 12rpx 12rpx 12rpx 12rpx;
+        border: 2rpx solid #E8EAEE;
+        margin-right: 24rpx
+        margin-top: 24rpx
+</style>
diff --git a/packageA/pages/myResume/myResume.vue b/packageA/pages/myResume/myResume.vue
index 7fe6959..2018d66 100644
--- a/packageA/pages/myResume/myResume.vue
+++ b/packageA/pages/myResume/myResume.vue
@@ -1,631 +1,179 @@
 <template>
-    <view class="container">
-        <!-- 头部信息 -->
-        <view class="header">
-            <view class="avatar"></view>
-            <view class="info">
-                <view class="name-row">
-                    <text class="name" v-if="state.disbleName">{{ state.name || '编辑用户名' }}</text>
-                    <input
-                        class="uni-input name"
-                        style="padding-top: 6px"
-                        v-else
-                        v-model="state.name"
-                        placeholder-class="name"
-                        type="text"
-                        placeholder="输入用户名"
-                    />
-                    <view class="edit-icon">
+    <view class="mys-container">
+        <!-- 个人信息 -->
+        <view class="mys-tops btn-feel">
+            <view class="tops-left">
+                <view class="name">
+                    <text>{{ userInfo.name || '编辑用户名' }}</text>
+                    <view class="edit-icon mar_le10">
                         <image
-                            class="img"
-                            v-if="state.disbleName"
-                            src="../../../static/icon/edit.png"
-                            @click="editName"
-                        ></image>
-                        <image v-else class="img" src="../../../static/icon/save.png" @click="completeUserName"></image>
-                    </view>
-                </view>
-                <text class="details">
-                    <dict-Label dictType="sex" :value="userInfo.sex"></dict-Label>
-                    {{ state.age }}岁
-                </text>
-            </view>
-        </view>
-
-        <!-- 简历信息 -->
-        <view class="resume-info">
-            <view class="info-card">
-                <view class="card-content">
-                    <text class="label">出生年月：</text>
-                    <!-- <text class="value">2001/01/01</text> -->
-                    <picker
-                        mode="date"
-                        :disabled="state.disbleDate"
-                        :value="state.date"
-                        :start="startDate"
-                        :end="endDate"
-                        @change="bindDateChange"
-                    >
-                        <view class="uni-input">{{ state.date }}</view>
-                    </picker>
-                    <view class="edit-icon">
-                        <image
-                            v-if="state.disbleDate"
-                            class="img"
-                            src="../../../static/icon/edit.png"
-                            @click="editResume"
-                        ></image>
-                        <image v-else class="img" src="../../../static/icon/save.png" @click="completeResume"></image>
-                    </view>
-                </view>
-                <view class="card-content">
-                    <text class="label">学历：</text>
-                    <!--     <text class="value">
-                        <dict-Label dictType="education" :value="userInfo.education"></dict-Label>
-                    </text> -->
-                    <picker
-                        @change="bindEducationChange"
-                        range-key="label"
-                        :disabled="state.disbleDate"
-                        :value="state.education"
-                        :range="state.educationList"
-                    >
-                        <view class="uni-input">{{ state.educationList[state.education].label }}</view>
-                    </picker>
-                </view>
-                <view class="card-content">
-                    <text class="label">政治面貌：</text>
-                    <!-- <text class="value">2001/01/01</text> -->
-                    <picker
-                        @change="bindPoliticalAffiliationChange"
-                        range-key="label"
-                        :disabled="state.disbleDate"
-                        :value="state.politicalAffiliation"
-                        :range="state.affiliationList"
-                    >
-                        <view class="uni-input">{{ state.affiliationList[state.politicalAffiliation].label }}</view>
-                    </picker>
-                </view>
-                <view class="card-content" style="padding-bottom: 3px">
-                    <text class="label">联系方式：</text>
-                    <!-- <text class="value">2001/01/01</text> -->
-                    <input
-                        class="uni-input"
-                        style="padding-top: 6px"
-                        :disabled="state.disbleDate"
-                        v-model="state.phone"
-                        placeholder-class="value"
-                        type="number"
-                        placeholder="输入手机号"
-                    />
-                </view>
-            </view>
-        </view>
-
-        <!-- 期望职位 -->
-        <view class="resume-info">
-            <view class="info-card">
-                <view class="card-content">
-                    <text class="label">期望职位：</text>
-                    <view class="value">
-                        <view v-for="item in userInfo.jobTitle" :key="item">{{ item }}</view>
-                    </view>
-                    <view class="edit-icon">
-                        <image class="img" @click="editJobs" src="../../../static/icon/edit.png"></image>
-                    </view>
-                </view>
-            </view>
-        </view>
-
-        <!-- 期望薪资 -->
-        <view class="resume-info">
-            <view class="info-card">
-                <view class="card-content">
-                    <text class="label">期望薪资：</text>
-                    <view class="value">
-                        <picker
-                            @change="changeSalary"
-                            @columnchange="changeColumeSalary"
-                            range-key="label"
-                            :disabled="state.disbleSalary"
-                            :value="state.salary"
-                            :range="state.salayList"
-                            mode="multiSelector"
-                        >
-                            <view class="uni-input">{{ state.salaryMin / 1000 }}k-{{ state.salaryMax / 1000 }}k</view>
-                        </picker>
-                    </view>
-                    <view class="edit-icon">
-                        <image
-                            v-if="state.disbleSalary"
-                            class="img"
-                            src="../../../static/icon/edit.png"
-                            @click="salaryExpectation"
-                        ></image>
-                        <image
-                            v-else
-                            class="img"
-                            src="../../../static/icon/save.png"
-                            @click="completesalaryExpectation"
+                            class="button-click"
+                            src="@/static/icon/edit1.png"
+                            @click="navTo('/packageA/pages/personalInfo/personalInfo')"
                         ></image>
                     </view>
                 </view>
+                <view class="subName">
+                    <dict-Label class="mar_ri10" dictType="sex" :value="userInfo.sex"></dict-Label>
+                    <text class="mar_ri10">{{ userInfo.age }}岁</text>
+                    <dict-Label class="mar_ri10" dictType="education" :value="userInfo.education"></dict-Label>
+                    <dict-Label
+                        class="mar_ri10"
+                        dictType="affiliation"
+                        :value="userInfo.politicalAffiliation"
+                    ></dict-Label>
+                </view>
+                <view class="subName">{{ userInfo.phone }}</view>
             </view>
-        </view>
-
-        <!-- 期望工作地 -->
-        <view class="resume-info">
-            <view class="info-card">
-                <view class="card-content">
-                    <text class="label long">期望工作地：</text>
-                    <view class="value">
-                        <view v-if="state.disaleArea">
-                            青岛 -
-                            <dict-Label dictType="area" :value="Number(state.area)"></dict-Label>
-                        </view>
-                        <view v-else>
-                            <picker
-                                @change="bindAreaChange"
-                                range-key="label"
-                                :disabled="state.disaleArea"
-                                :value="state.area"
-                                :range="state.areaList"
-                            >
-                                <view class="uni-input">
-                                    青岛 -
-                                    {{ state.areaList[state.area].label }}
-                                </view>
-                            </picker>
-                        </view>
-                    </view>
-                    <view class="edit-icon">
-                        <image
-                            v-if="state.disaleArea"
-                            class="img"
-                            src="../../../static/icon/edit.png"
-                            @click="state.disaleArea = false"
-                        ></image>
-                        <image v-else class="img" src="../../../static/icon/save.png" @click="completeArea"></image>
-                    </view>
+            <view class="tops-right">
+                <view class="right-imghead">
+                    <image v-if="userInfo.sex === '0'" src="@/static/icon/boy.png"></image>
+                    <image v-else src="@/static/icon/girl.png"></image>
+                </view>
+                <view class="right-sex">
+                    <image v-if="userInfo.sex === '0'" src="@/static/icon/boy1.png"></image>
+                    <image v-else src="@/static/icon/girl1.png"></image>
                 </view>
             </view>
         </view>
-
-        <!-- 上传按钮 -->
-        <view class="upload-btn">
-            <button class="btn">
-                <uni-icons type="cloud-upload" size="30" color="#FFFFFF"></uni-icons>
-                上传简历
-            </button>
-        </view>
-
-        <!-- piker -->
-        <custom-popup :content-h="100" :visible="state.visible" :header="false">
-            <view class="popContent">
-                <view class="s-header">
-                    <view class="heade-lf" @click="state.visible = false">取消</view>
-                    <view class="heade-ri" @click="confimPopup">确认</view>
-                </view>
-                <view class="sex-content fl_1">
-                    <expected-station
-                        :search="false"
-                        @onChange="changeJobTitleId"
-                        :station="state.stations"
-                        :max="5"
-                    ></expected-station>
+        <!-- 求职期望 -->
+        <view class="mys-line"></view>
+        <view class="mys-info">
+            <view class="mys-h4">
+                <text>求职期望</text>
+                <view class="mys-edit-icon">
+                    <image
+                        class="button-click"
+                        src="@/static/icon/edit1.png"
+                        @click="navTo('/packageA/pages/jobExpect/jobExpect')"
+                    ></image>
                 </view>
             </view>
-        </custom-popup>
-        <uni-popup ref="popup" type="dialog">
-            <uni-popup-dialog
-                mode="base"
-                title="确定退出登录吗？"
-                type="info"
-                :duration="2000"
-                :before-close="true"
-                @confirm="confirm"
-                @close="close"
-            ></uni-popup-dialog>
-        </uni-popup>
+            <view class="mys-text">
+                <text>期望薪资：</text>
+                <text>{{ userInfo.salaryMin / 1000 }}k-{{ userInfo.salaryMax / 1000 }}k</text>
+            </view>
+            <view class="mys-text">
+                <text>期望工资地：</text>
+                <text>青岛市-</text>
+                <dict-Label dictType="area" :value="Number(userInfo.area)"></dict-Label>
+            </view>
+            <view class="mys-list">
+                <view class="cards button-click" v-for="(title, index) in userInfo.jobTitle" :key="index">
+                    {{ title }}
+                </view>
+            </view>
+        </view>
     </view>
 </template>
 
 <script setup>
 import { reactive, inject, watch, ref, onMounted, computed } from 'vue';
+const { $api, navTo } = inject('globalFunction');
 import { onLoad, onShow } from '@dcloudio/uni-app';
-import dictLabel from '@/components/dict-Label/dict-Label.vue';
-const { $api, navTo, checkingPhoneRegExp, salaryGlobal, setCheckedNodes } = inject('globalFunction');
+import { storeToRefs } from 'pinia';
 import useUserStore from '@/stores/useUserStore';
 import useDictStore from '@/stores/useDictStore';
+const { userInfo } = storeToRefs(useUserStore());
 const { getUserResume } = useUserStore();
 const { getDictData, oneDictData } = useDictStore();
-const userInfo = ref({});
-const salay = salaryGlobal();
-const state = reactive({
-    date: getDate(),
-    education: 0,
-    politicalAffiliation: 0,
-    phone: '',
-    name: '',
-    jobTitleId: '',
-    salaryMin: 2000,
-    salaryMax: 2000,
-    area: 0,
-    salary: [0, 0],
-    disbleDate: true,
-    disbleName: true,
-    disbleSalary: true,
-    disaleArea: true,
-    visible: false,
-    educationList: oneDictData('education'),
-    affiliationList: oneDictData('affiliation'),
-    areaList: oneDictData('area'),
-    stations: [],
-    copyData: {},
-    salayList: [salay, salay[0].children],
-});
-
-const startDate = computed(() => {
-    return getDate('start');
-});
-
-const endDate = computed(() => {
-    return getDate('end');
-});
-
-onShow(() => {
-    initload();
-});
-
-onLoad(() => {
-    setTimeout(() => {
-        const { age, birthDate } = useUserStore().userInfo;
-        const newAge = calculateAge(birthDate);
-        // 计算年龄是否对等
-        if (age != newAge) {
-            console.log(age, newAge);
-            completeResume();
-        }
-    }, 1000);
-});
-
-const calculateAge = (birthDate) => {
-    const birth = new Date(birthDate);
-    const today = new Date();
-    let age = today.getFullYear() - birth.getFullYear();
-    const monthDiff = today.getMonth() - birth.getMonth();
-    const dayDiff = today.getDate() - birth.getDate();
-
-    // 如果生日的月份还没到，或者刚到生日月份但当天还没过，则年龄减 1
-    if (monthDiff < 0 || (monthDiff === 0 && dayDiff < 0)) {
-        age--;
-    }
-
-    return age;
-};
-
-function initload() {
-    userInfo.value = useUserStore().userInfo;
-    state.name = userInfo.value.name;
-    state.date = userInfo.value.birthDate;
-    state.age = userInfo.value.age;
-    state.phone = userInfo.value.phone;
-    state.salaryMax = userInfo.value.salaryMax;
-    state.salaryMin = userInfo.value.salaryMin;
-    state.area = userInfo.value.area;
-    state.educationList.map((iv, index) => {
-        if (iv.value === userInfo.value.education) state.education = index;
-    });
-    state.affiliationList.map((iv, index) => {
-        if (iv.value === userInfo.value.politicalAffiliation) state.politicalAffiliation = index;
-    });
-    $api.createRequest('/app/common/jobTitle/treeselect', {}, 'GET').then((resData) => {
-        if (userInfo.value.jobTitleId) {
-            const ids = userInfo.value.jobTitleId.split(',').map((id) => Number(id));
-            setCheckedNodes(resData.data, ids);
-        }
-        state.jobTitleId = userInfo.value.jobTitleId;
-        state.stations = resData.data;
-    });
-}
-
-function bindAreaChange(val) {
-    state.area = val.detail.value;
-}
-
-function bindDateChange(val) {
-    state.date = val.detail.value;
-}
-
-function bindEducationChange(val) {
-    state.education = val.detail.value;
-}
-function bindPoliticalAffiliationChange(val) {
-    state.politicalAffiliation = val.detail.value;
-}
-
-function completeArea() {
-    let params = {
-        area: state.area,
-    };
-    $api.createRequest('/app/user/resume', params, 'post').then((resData) => {
-        $api.msg('完成');
-        state.disaleArea = true;
-        getUserResume().then(() => {
-            initload();
-        });
-    });
-}
-
-function completesalaryExpectation() {
-    let params = {
-        salaryMin: state.salaryMin,
-        salaryMax: state.salaryMax,
-    };
-    $api.createRequest('/app/user/resume', params, 'post').then((resData) => {
-        $api.msg('完成');
-        state.disbleSalary = true;
-        getUserResume().then(() => {
-            initload();
-        });
-    });
-}
-
-function completeResume() {
-    let params = {
-        birthDate: state.date,
-        age: calculateAge(state.date),
-        education: state.educationList[state.education].value,
-        politicalAffiliation: state.affiliationList[state.politicalAffiliation].value,
-        phone: state.phone,
-    };
-    if (!params.birthDate) {
-        return $api.msg('请选择出生年月');
-    }
-    if (!params.education) {
-        return $api.msg('请选择学历');
-    }
-    if (!params.politicalAffiliation) {
-        return $api.msg('请选择政治面貌');
-    }
-    if (!checkingPhoneRegExp(params.phone)) {
-        return $api.msg('请输入正确手机号');
-    }
-    $api.createRequest('/app/user/resume', params, 'post').then((resData) => {
-        $api.msg('完成');
-        state.disbleDate = true;
-        getUserResume().then(() => {
-            initload();
-        });
-    });
-}
-
-function completeUserName() {
-    if (!state.name) {
-        return $api.msg('请输入用户名称');
-    }
-    $api.createRequest('/app/user/resume', { name: state.name }, 'post').then((resData) => {
-        $api.msg('完成');
-        state.disbleName = true;
-        getUserResume().then(() => {
-            initload();
-        });
-    });
-}
-
-function confimPopup() {
-    $api.createRequest('/app/user/resume', { jobTitleId: state.jobTitleId }, 'post').then((resData) => {
-        $api.msg('完成');
-        state.visible = false;
-        getUserResume().then(() => {
-            initload();
-        });
-    });
-}
-function editResume() {
-    state.copyData.date = state.date;
-    state.copyData.education = state.education;
-    state.copyData.politicalAffiliation = state.politicalAffiliation;
-    state.copyData.phone = state.phone;
-    state.disbleDate = false;
-}
-
-function salaryExpectation() {
-    state.disbleSalary = false;
-}
-
-function editName() {
-    state.name = userInfo.value.name;
-    state.disbleName = false;
-}
-function changeJobTitleId(ids) {
-    state.jobTitleId = ids;
-}
-function editJobs() {
-    state.visible = true;
-}
-function changeColumeSalary(e) {
-    const { column, value } = e.detail;
-    if (column === 0) {
-        state.salary[1] = 0;
-        state.salayList[1] = salay[value].children;
-    }
-}
-
-function changeSalary(e) {
-    const [minIndex, maxIndex] = e.detail.value;
-    const min = state.salayList[0][minIndex];
-    const max = state.salayList[0][minIndex].children[maxIndex];
-    state.salaryMin = min.value;
-    state.salaryMax = max.value;
-}
-
-function getDate(type) {
-    const date = new Date();
-    let year = date.getFullYear();
-    let month = date.getMonth() + 1;
-    let day = date.getDate();
-
-    if (type === 'start') {
-        year = year - 60;
-    } else if (type === 'end') {
-        year = year + 2;
-    }
-    month = month > 9 ? month : '0' + month;
-    day = day > 9 ? day : '0' + day;
-    return `${year}-${month}-${day}`;
-}
 </script>
 
 <style lang="stylus" scoped>
-.container
+image{
     width: 100%;
-    height: calc(100vh - var(--window-top) - var(--status-bar-height) - var(--window-bottom));
-    background: linear-gradient( 180deg, #4778EC 0%, #002979 100%);
-    display: flex;
-    flex-direction: column;
-    align-items center
+    height: 100%
+}
+.mys-container{
+    .mys-tops{
+        display: flex
+        justify-content: space-between
+        padding: 52rpx 48rpx
+        .tops-left{
+            .name{
+                font-weight: 600;
+                font-size: 44rpx;
+                color: #333333;
+                display: flex
+                align-items: center
+                justify-content: flex-start
+                .edit-icon{
+                    display: inline-block
+                    width: 40rpx;
+                    height: 40rpx
+                    padding-bottom: 10rpx
+                }
+            }
+            .subName{
+                margin-top: 12rpx
+                font-weight: 400;
+                font-size: 32rpx;
+                color: #333333;
+            }
 
-.header
-  display flex
-  align-items center
-  padding  30rpx 60rpx
-  width calc(100% - 120rpx)
-  border-radius 0 0 20rpx 20rpx
-  .avatar
-    width 100rpx
-    height 100rpx
-    background-color #ccc
-    border-radius 50%
-    margin-right 20rpx
-  .info
-    display flex
-    flex-direction column
-    .name-row
-      display flex
-      align-items center
-      position relative
-      .name
-        font-size 36rpx
-        font-weight bold
-        color #fff
-      .edit-icon
-        width 40rpx
-        height 40rpx
-        border-radius 50%
-        position: absolute
-        right: -60rpx
-        top: 6rpx
-        .img
-          width: 100%
-          height: 100%
-    .details
-      font-size 24rpx
-      color #dbeafe
-
-.resume-info
-    padding: 0 26rpx
-    width calc(100% - 52rpx)
-    margin-top 20rpx
-  .info-card
-    display flex
-    flex-direction: column
-    justify-content space-between
-    align-items center
-    color #fff
-    padding 10rpx 24rpx
-    border-radius 12rpx
-    margin-bottom 10rpx
-    background: #4778EC;
-    box-shadow: 0rpx 7rpx 7rpx 0rpx rgba(0,0,0,0.25);
-    border-radius: 17rpx 17rpx 17rpx 17rpx;
-    position: relative
-    .card-content
-        width: 100%
-        display flex
-        line-height: 58rpx
-        margin-top 16rpx
-        position: relative
-      .label
-        width 160rpx
-        height: 32rpx
-        font-size 28rpx
-        color #FFFFFF
-        text-align:justify;
-        margin-right: 20rpx
-      .long
-        width 180rpx
-        margin-right: 0rpx
-      .label:after
-        content: '';
-        display: inline-block;
-        width: 100%;
-      .value
-        font-size: 28rpx;
-        color: #FFFFFF;
-    .card-content:first-child
-        margin-top 0
-    .edit-icon
-      position: absolute
-      right: 10rpx
-      top: 10rpx
-      width 40rpx
-      height 40rpx
-      .img
-        width: 100%
-        height: 100%
-
-
-.upload-btn
-  margin-top 20rpx
-  .btn
-    display: flex
-    align-items: center
-    box-shadow: 0rpx 7rpx 7rpx 0rpx rgba(0,0,0,0.25);
-    height 80rpx
-    background-color #22c55e
-    color #fff
-    font-size 28rpx
-    font-weight bold
-    border-radius 20rpx
-/* popup */
-.popContent {
-    padding: 24rpx;
-    background: #4778ec;
-    height: calc(100% - 49rpx);
-    .sex-content {
-        border-radius: 20rpx;
-        width: 100%;
-        margin-top: 20rpx;
-        margin-bottom: 40rpx;
-        display: flex;
-        overflow: hidden;
-        height: calc(100% - 100rpx);
-        border: 1px solid #4778ec;
-    }
-    .s-header {
-        display: flex;
-        justify-content: space-between;
-        text-align: center;
-        font-size: 16px;
-        .heade-lf {
-            line-height: 30px;
-            width: 50px;
-            height: 30px;
-            border-radius: 4px;
-            border: 1px solid #666666;
-            color: #666666;
-            background: #ffffff;
         }
-
-        .heade-ri {
-            line-height: 30px;
-            width: 50px;
-            height: 30px;
-            border-radius: 4px;
-            border: 1px solid #1b66ff;
-            background-color: #1b66ff;
-            color: #ffffff;
+        .tops-right{
+            position: relative
+            .right-imghead{
+                width: 136rpx;
+                height: 136rpx;
+                border-radius: 50%;
+                background: #e8e8e8
+                overflow: hidden
+            }
+            .right-sex{
+                position: absolute
+                right: -10rpx
+                top: -10rpx
+                width: 50rpx
+                height: 50rpx
+            }
+        }
+    }
+    .mys-line{
+        margin: 0 28rpx
+        height: 0rpx;
+        border-radius: 0rpx 0rpx 0rpx 0rpx;
+        border: 2rpx dashed #000000;
+        opacity: 0.16;
+    }
+    .mys-info{
+        padding: 28rpx
+        .mys-h4{
+            font-weight: 600;
+            font-size: 32rpx;
+            color: #000000;
+            margin-bottom: 8rpx
+            display: flex;
+            justify-content: space-between
+            align-items: center
+            .mys-edit-icon{
+                display: inline-block
+                width: 40rpx;
+                height: 40rpx
+            }
+        }
+        .mys-text{
+            font-weight: 400;
+            font-size: 28rpx;
+            color: #333333;
+            margin-top: 16rpx
+        }
+        .mys-list{
+            display: flex
+            align-items: center
+            flex-wrap: wrap;
+            .cards{
+                margin: 28rpx 28rpx 0 0
+                height: 80rpx;
+                padding: 0 38rpx;
+                width: fit-content
+                display: flex
+                align-items: center
+                justify-content: center
+                border-radius: 12rpx 12rpx 12rpx 12rpx;
+                border: 2rpx solid #E8EAEE;
+            }
         }
     }
 }
diff --git a/packageA/pages/personalInfo/personalInfo.vue b/packageA/pages/personalInfo/personalInfo.vue
new file mode 100644
index 0000000..cd2a968
--- /dev/null
+++ b/packageA/pages/personalInfo/personalInfo.vue
@@ -0,0 +1,340 @@
+<template>
+    <AppLayout
+        title="个人信息"
+        :sub-title="`完成度${percent}`"
+        border
+        back-gorund-color="#ffffff"
+        :show-bg-image="false"
+    >
+        <template #headerleft>
+            <view class="btn mar_le20 button-click" @click="navBack">取消</view>
+        </template>
+        <template #headerright>
+            <view class="btn mar_ri20 button-click" @click="confirm">确认</view>
+        </template>
+        <view class="content">
+            <view class="content-input">
+                <view class="input-titile">姓名</view>
+                <input class="input-con" v-model="fromValue.name" placeholder="请输入您的姓名" />
+            </view>
+            <view class="content-sex">
+                <view class="sex-titile">性别</view>
+                <view class="sext-ri">
+                    <view class="sext-box" :class="{ 'sext-boxactive': fromValue.sex === 0 }" @click="changeSex(0)">
+                        男
+                    </view>
+                    <view class="sext-box" :class="{ 'sext-boxactive': fromValue.sex === 1 }" @click="changeSex(1)">
+                        女
+                    </view>
+                </view>
+            </view>
+            <view class="content-input" @click="changeDateBirt">
+                <view class="input-titile">出生年月</view>
+                <input
+                    class="input-con triangle"
+                    v-model="fromValue.birthDate"
+                    disabled
+                    placeholder="请选择您的出生年月"
+                />
+            </view>
+            <view class="content-input" @click="changeEducation">
+                <view class="input-titile">学历</view>
+                <input class="input-con triangle" v-model="state.educationText" disabled placeholder="请选择您的学历" />
+            </view>
+            <view class="content-input" @click="changePoliticalAffiliation">
+                <view class="input-titile">政治面貌</view>
+                <input
+                    class="input-con triangle"
+                    v-model="state.politicalAffiliationText"
+                    disabled
+                    placeholder="请选择您的政治面貌"
+                />
+            </view>
+            <view class="content-input">
+                <view class="input-titile">手机号码</view>
+                <input class="input-con" v-model="fromValue.phone" placeholder="请输入您的手机号码" />
+            </view>
+        </view>
+    </AppLayout>
+</template>
+
+<script setup>
+import { reactive, inject, watch, ref, onMounted } from 'vue';
+import { onLoad, onShow } from '@dcloudio/uni-app';
+const { $api, navTo, navBack, checkingPhoneRegExp } = inject('globalFunction');
+import { storeToRefs } from 'pinia';
+import useUserStore from '@/stores/useUserStore';
+import useDictStore from '@/stores/useDictStore';
+const { userInfo } = storeToRefs(useUserStore());
+const { getUserResume } = useUserStore();
+const { dictLabel, oneDictData } = useDictStore();
+const openSelectPopup = inject('openSelectPopup');
+
+const percent = ref('0%');
+const state = reactive({
+    educationText: '',
+    politicalAffiliationText: '',
+});
+const fromValue = reactive({
+    name: '',
+    sex: 0,
+    birthDate: '',
+    education: '',
+    politicalAffiliation: '',
+});
+onLoad(() => {
+    initLoad();
+    // setTimeout(() => {
+    //     const { age, birthDate } = useUserStore().userInfo;
+    //     const newAge = calculateAge(birthDate);
+    //     // 计算年龄是否对等
+    //     if (age != newAge) {
+    //         completeResume();
+    //     }
+    // }, 1000);
+});
+
+function initLoad() {
+    fromValue.name = userInfo.value.name;
+    fromValue.sex = Number(userInfo.value.sex);
+    fromValue.phone = userInfo.value.phone;
+    fromValue.birthDate = userInfo.value.birthDate;
+    fromValue.education = userInfo.value.education;
+    fromValue.politicalAffiliation = userInfo.value.politicalAffiliation;
+    // 回显
+    state.educationText = dictLabel('education', userInfo.value.education);
+    state.politicalAffiliationText = dictLabel('affiliation', userInfo.value.politicalAffiliation);
+    const result = getFormCompletionPercent(fromValue);
+    percent.value = result;
+}
+const confirm = () => {
+    if (!fromValue.name) {
+        return $api.msg('请输入姓名');
+    }
+    if (!fromValue.birthDate) {
+        return $api.msg('请选择出生年月');
+    }
+    if (!fromValue.education) {
+        return $api.msg('请选择学历');
+    }
+    if (!fromValue.politicalAffiliation) {
+        return $api.msg('请选择政治面貌');
+    }
+    if (!checkingPhoneRegExp(fromValue.phone)) {
+        return $api.msg('请输入正确手机号');
+    }
+    const params = {
+        ...fromValue,
+        age: calculateAge(fromValue.birthDate),
+    };
+    $api.createRequest('/app/user/resume', params, 'post').then((resData) => {
+        $api.msg('完成');
+        state.disbleDate = true;
+        getUserResume().then(() => {
+            navBack();
+        });
+    });
+};
+
+const changeDateBirt = () => {
+    const datearray = generateDatePickerArrays();
+    const defaultIndex = getDatePickerIndexes(fromValue.birthDate);
+    openSelectPopup({
+        title: '年龄段',
+        maskClick: true,
+        data: datearray,
+        defaultIndex,
+        success: (_, value) => {
+            const [year, month, day] = value;
+            const dateStr = `${year.value}-${month.value}-${day.value}`;
+            if (isValidDate(dateStr)) {
+                fromValue.birthDate = dateStr;
+            } else {
+                $api.msg('没有这一天');
+            }
+        },
+    });
+};
+const changeEducation = () => {
+    openSelectPopup({
+        title: '学历',
+        maskClick: true,
+        data: [oneDictData('education')],
+        success: (_, [value]) => {
+            fromValue.education = value.value;
+            state.educationText = value.label;
+        },
+    });
+};
+const changeSex = (sex) => {
+    fromValue.sex = sex;
+};
+
+const changePoliticalAffiliation = () => {
+    openSelectPopup({
+        title: '政治面貌',
+        maskClick: true,
+        data: [oneDictData('affiliation')],
+        success: (_, [value]) => {
+            fromValue.politicalAffiliation = value.value;
+            state.politicalAffiliationText = value.label;
+        },
+    });
+};
+
+function generateDatePickerArrays(startYear = 1975, endYear = new Date().getFullYear()) {
+    const years = [];
+    const months = [];
+    const days = [];
+
+    for (let y = startYear; y <= endYear; y++) {
+        years.push(y.toString());
+    }
+    for (let m = 1; m <= 12; m++) {
+        months.push(m.toString().padStart(2, '0'));
+    }
+    for (let d = 1; d <= 31; d++) {
+        days.push(d.toString().padStart(2, '0'));
+    }
+
+    return [years, months, days];
+}
+
+function isValidDate(dateString) {
+    const [year, month, day] = dateString.split('-').map(Number);
+
+    const date = new Date(year, month - 1, day); // 月份从0开始
+    return date.getFullYear() === year && date.getMonth() === month - 1 && date.getDate() === day;
+}
+
+const calculateAge = (birthDate) => {
+    const birth = new Date(birthDate);
+    const today = new Date();
+    let age = today.getFullYear() - birth.getFullYear();
+    const monthDiff = today.getMonth() - birth.getMonth();
+    const dayDiff = today.getDate() - birth.getDate();
+
+    // 如果生日的月份还没到，或者刚到生日月份但当天还没过，则年龄减 1
+    if (monthDiff < 0 || (monthDiff === 0 && dayDiff < 0)) {
+        age--;
+    }
+
+    return age;
+};
+
+function getFormCompletionPercent(form) {
+    let total = Object.keys(form).length;
+    let filled = 0;
+
+    for (const key in form) {
+        const value = form[key];
+        if (value !== '' && value !== null && value !== undefined) {
+            if (typeof value === 'number') {
+                filled += 1;
+            } else if (typeof value === 'string' && value.trim() !== '') {
+                filled += 1;
+            }
+        }
+    }
+
+    if (total === 0) return '0%';
+    const percent = (filled / total) * 100;
+    return percent.toFixed(0) + '%'; // 取整，不要小数点
+}
+// 主函数
+function getDatePickerIndexes(dateStr) {
+    const [year, month, day] = dateStr.split('-');
+
+    const [years, months, days] = generateDatePickerArrays();
+
+    const yearIndex = years.indexOf(year);
+    const monthIndex = months.indexOf(month);
+    const dayIndex = days.indexOf(day);
+
+    return [yearIndex, monthIndex, dayIndex];
+}
+</script>
+
+<style lang="stylus" scoped>
+.btn{
+    margin-top: -30rpx
+}
+.content{
+    padding: 28rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start
+    height: calc(100% - 120rpx)
+
+}
+.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;
+    .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)
+.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
+</style>
diff --git a/packageA/pages/post/component/radarMap.vue b/packageA/pages/post/component/radarMap.vue
new file mode 100644
index 0000000..0d7084e
--- /dev/null
+++ b/packageA/pages/post/component/radarMap.vue
@@ -0,0 +1,167 @@
+<template>
+    <view style="display: flex; justify-content: center; padding: 0px 0">
+        <canvas canvas-id="radarCanvas" id="radarCanvas" style="width: 300px; height: 250px"></canvas>
+    </view>
+</template>
+
+<script setup>
+import { reactive, inject, watch, ref, onMounted, computed } from 'vue';
+import { onLoad, onShow } from '@dcloudio/uni-app';
+// const src = ref('');
+
+const props = defineProps({
+    value: {
+        type: Object,
+        default: () => ({}),
+    },
+});
+
+// 监听页面初始化
+onMounted(() => {
+    if (Object.keys(props.value).length > 0) {
+        rawRadarChart();
+    }
+});
+
+// 监听 props.value 变化
+watch(
+    () => props.value,
+    (newVal) => {
+        if (newVal && Object.keys(newVal).length > 0) {
+            const { skill, experience, education, salary, age, location } = newVal.radarChart;
+            const labels = ['学历', '年龄', '工作地', '技能', '工作经验', '期望薪资'];
+            const data = [education, age, location, skill, experience, salary].map((item) => item * 0.05);
+            rawRadarChart(labels, data);
+        }
+    },
+    { deep: true, immediate: false } // deep 递归监听对象内部变化
+);
+
+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 colors = ['#F5F5F5', '#F5F5F5', '#F5F5F5', '#F5F5F5', '#F5F5F5'];
+    const maxScore = 5; // 数据最大值
+
+    const angleStep = (2 * Math.PI) / labels.length;
+
+    // 绘制背景多边形
+    ctx.setLineWidth(1);
+    ctx.setStrokeStyle('#F6F6F6');
+
+    //底部圆盘
+    ctx.beginPath();
+    ctx.arc(centerX, centerY, width, 0, 2 * Math.PI);
+    ctx.setFillStyle('#FFFFFF');
+    ctx.closePath();
+    ctx.fill();
+
+    //多边形圈
+    // 多边形圈
+    for (let i = 5; i > 0; i--) {
+        ctx.setStrokeStyle(colors[i - 1]); // 设置边框颜色
+        ctx.beginPath();
+        labels.forEach((label, index) => {
+            const x = centerX + (width / 5) * i * Math.cos(angleStep * index - Math.PI / 2);
+            const y = centerY + (height / 5) * i * Math.sin(angleStep * index - Math.PI / 2);
+            if (index === 0) {
+                ctx.moveTo(x, y);
+            } else {
+                ctx.lineTo(x, y);
+            }
+        });
+        ctx.closePath();
+        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.lineTo(x, y);
+
+        ctx.closePath();
+        ctx.stroke();
+    });
+
+    // 绘制雷达图数据
+    ctx.setStrokeStyle('#256BFA');
+    ctx.setFillStyle('rgba(37,107,250, 0.24)');
+    ctx.setLineWidth(2);
+    ctx.beginPath();
+    const pointList = []; // 记录每个点的位置，等会画小圆点
+    data.forEach((score, index) => {
+        const x = centerX + width * (score / maxScore) * Math.cos(angleStep * index - Math.PI / 2);
+        const y = centerY + height * (score / maxScore) * Math.sin(angleStep * index - Math.PI / 2);
+        pointList.push({ x, y }); // 保存位置
+        if (index === 0) {
+            ctx.moveTo(x, y);
+        } else {
+            ctx.lineTo(x, y);
+        }
+    });
+    ctx.closePath();
+    ctx.fill();
+    ctx.stroke();
+
+    // 绘制每个小圆点
+    ctx.setFillStyle('#256BFA'); // 小圆点颜色（你可以改）
+    pointList.forEach((point) => {
+        ctx.beginPath();
+        ctx.arc(point.x, point.y, 4, 0, 2 * Math.PI); // 半径 4，可以自己调大小
+        ctx.fill();
+    });
+
+    // 绘制标签
+    ctx.setTextAlign('center');
+
+    labels.forEach((label, index) => {
+        const x = centerX + (width + 30) * Math.cos(angleStep * index - Math.PI / 2);
+        const y = centerY + (height + 26) * Math.sin(angleStep * index - Math.PI / 2);
+
+        //标题
+        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>
diff --git a/packageA/pages/post/component/videoPlayer.vue b/packageA/pages/post/component/videoPlayer.vue
new file mode 100644
index 0000000..2b026ee
--- /dev/null
+++ b/packageA/pages/post/component/videoPlayer.vue
@@ -0,0 +1,158 @@
+<template>
+    <!-- 小窗播放容器 -->
+    <view
+        v-if="visible"
+        class="mini-player"
+        :style="{
+            left: position.x + 'px',
+            top: position.y + 'px',
+            width: isFullScreen ? '100%' : '300rpx',
+            height: isFullScreen ? '100vh' : '200rpx',
+        }"
+        @touchstart="handleTouchStart"
+        @touchmove="handleTouchMove"
+        @touchend="handleTouchEnd"
+        @touchmove.stop.prevent
+    >
+        <!-- 视频组件 -->
+        <video
+            :src="videoUrl"
+            :controls="true"
+            :show-progress="isFullScreen"
+            :style="{
+                width: '100%',
+                height: '100%',
+            }"
+            id="myVideo"
+            @play="onPlay"
+            @pause="onPause"
+        ></video>
+
+        <!-- 控制栏 -->
+        <view class="controls">
+            <!--   <text @click="togglePlay">{{ isPlaying ? '暂停' : '播放' }}</text>
+            <text @click="toggleFullScreen">{{ isFullScreen ? '退出全屏' : '全屏' }}</text> -->
+            <text @click="close">关闭</text>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import { ref, reactive, onMounted } from 'vue';
+import { nextTick } from 'vue';
+
+const visible = ref(false);
+const isPlaying = ref(false);
+const isFullScreen = ref(false);
+const videoUrl = ref('');
+const position = reactive({ x: 20, y: 100 });
+const videoContext = ref(null);
+const startPos = reactive({ x: 0, y: 0 });
+const moving = ref(false);
+
+// 初始化视频上下文
+onMounted(() => {
+    videoContext.value = uni.createVideoContext('myVideo');
+});
+
+// 触摸开始
+const handleTouchStart = (e) => {
+    if (isFullScreen.value) return;
+    startPos.x = e.touches[0].clientX - position.x;
+    startPos.y = e.touches[0].clientY - position.y;
+    moving.value = true;
+};
+
+// 触摸移动
+const handleTouchMove = (e) => {
+    if (!moving.value || isFullScreen.value) return;
+
+    const newX = e.touches[0].clientX - startPos.x;
+    const newY = e.touches[0].clientY - startPos.y;
+
+    // 边界检测
+    const maxX = window.innerWidth - 150; // 300rpx换算后的值
+    const maxY = 50 + window.innerHeight - 200;
+
+    position.x = Math.max(0, Math.min(newX, maxX));
+    position.y = Math.max(0, Math.min(newY, maxY));
+};
+
+// 触摸结束
+const handleTouchEnd = () => {
+    moving.value = false;
+};
+
+// 播放状态变化
+const onPlay = () => {
+    isPlaying.value = true;
+};
+
+const onPause = () => {
+    isPlaying.value = false;
+};
+
+// 切换播放状态
+const togglePlay = () => {
+    isPlaying.value ? videoContext.value.pause() : videoContext.value.play();
+};
+
+// 切换全屏
+const toggleFullScreen = () => {
+    isFullScreen.value = !isFullScreen.value;
+    if (!isFullScreen.value) {
+        // 退出全屏时恢复原位
+        position.x = 20;
+        position.y = 100;
+    }
+};
+
+// 关闭播放器
+const close = () => {
+    visible.value = false;
+    videoContext.value.stop();
+    isPlaying.value = false;
+    isFullScreen.value = false;
+};
+
+// 打开播放器方法
+const open = (url) => {
+    videoUrl.value = url;
+    visible.value = true;
+    nextTick(() => {
+        videoContext.value.play();
+    });
+};
+
+// 暴露方法
+defineExpose({ open });
+</script>
+
+<style scoped>
+.mini-player {
+    position: fixed;
+    z-index: 999;
+    background: #000;
+    border-radius: 8rpx;
+    overflow: hidden;
+    box-shadow: 0 0 20rpx rgba(0, 0, 0, 0.3);
+}
+
+.controls {
+    position: absolute;
+    top: 0;
+    right: 0;
+    /* background: rgba(0, 0, 0, 0.7); */
+    padding: 10rpx;
+    display: flex;
+    justify-content: space-around;
+}
+
+.controls text {
+    color: #fff;
+    font-size: 24rpx;
+    padding: 8rpx 16rpx;
+    background: rgba(255, 255, 255, 0.2);
+    border-radius: 4rpx;
+}
+</style>
diff --git a/packageA/pages/post/post.vue b/packageA/pages/post/post.vue
index 3faffe7..7a98d83 100644
--- a/packageA/pages/post/post.vue
+++ b/packageA/pages/post/post.vue
@@ -1,80 +1,153 @@
 <template>
-    <view class="container">
-        <view class="job-header">
-            <view class="job-title">{{ jobInfo.jobTitle }}</view>
-            <view class="job-info">
-                <text class="salary">{{ jobInfo.minSalary }}-{{ jobInfo.maxSalary }}/月</text>
-                <text class="views">{{ jobInfo.view }}浏览</text>
+    <AppLayout title="" backGorundColor="#F4F4F4">
+        <template #headerleft>
+            <view class="btn">
+                <image src="@/static/icon/back.png" @click="navBack"></image>
             </view>
-            <view class="location-info">
-                <view class="location" style="display: inline-block">
-                    📍 青岛
-                    <dict-Label dictType="area" :value="jobInfo.jobLocationAreaCode"></dict-Label>
+        </template>
+        <template #headerright>
+            <view class="btn mar_ri10">
+                <image src="@/static/icon/collect3.png" v-if="!jobInfo.isCollection" @click="jobCollection"></image>
+                <image src="@/static/icon/collect2.png" v-else @click="jobCollection"></image>
+            </view>
+        </template>
+        <view class="content">
+            <view class="content-top btn-feel">
+                <view class="top-salary">{{ jobInfo.minSalary }}-{{ jobInfo.maxSalary }}/月</view>
+                <view class="top-name">{{ jobInfo.jobTitle }}</view>
+                <view class="top-info">
+                    <view class="info-img"><image src="/static/icon/post12.png"></image></view>
+                    <view class="info-text">
+                        <dict-Label dictType="experience" :value="jobInfo.experience"></dict-Label>
+                    </view>
+                    <view class="info-img mar_le20"><image src="/static/icon/post13.png"></image></view>
+                    <view class="info-text">
+                        <dict-Label dictType="education" :value="jobInfo.education"></dict-Label>
+                    </view>
+                </view>
+                <view class="position-source">
+                    <text>来源&nbsp;</text>
+                    {{ jobInfo.dataSource }}
                 </view>
-                <text class="date">{{ jobInfo.postingDate || '发布日期' }}</text>
-                <view class="source">来源 智联招聘</view>
             </view>
-        </view>
+            <view class="ai-explain" v-if="jobInfo.isExplain">
+                <view class="exbg">
+                    <view class="explain-left btn-shaky">
+                        <view class="leftText">AI+智能讲解，职位一听就懂</view>
+                        <view class="leftdownText">懒得看文字？我用AI讲给你听</view>
+                    </view>
+                    <view class="explain-right button-click" @click="seeExplain">点击查看</view>
+                </view>
+            </view>
+            <view class="content-card">
+                <view class="card-title">
+                    <text class="title">职位描述</text>
+                </view>
+                <view class="description" :style="{ whiteSpace: 'pre-wrap' }">
+                    {{ jobInfo.description }}
+                </view>
+            </view>
+            <view class="content-card">
+                <view class="card-title">
+                    <text class="title">公司信息</text>
+                    <text
+                        class="btntext button-click"
+                        @click="navTo(`/packageA/pages/UnitDetails/UnitDetails?companyId=${jobInfo.company.companyId}`)"
+                    >
+                        单位详情
+                    </text>
+                </view>
+                <view class="company-info">
+                    <view class="companyinfo-left">
+                        <image src="@/static/icon/companyIcon.png" mode=""></image>
+                    </view>
+                    <view class="companyinfo-right">
+                        <view class="row1">{{ jobInfo.company?.name }}</view>
+                        <view class="row2">
+                            <dict-tree-Label
+                                v-if="jobInfo.company?.industry"
+                                dictType="industry"
+                                :value="jobInfo.company?.industry"
+                            ></dict-tree-Label>
+                            <span v-if="jobInfo.company?.industry">&nbsp;</span>
+                            <dict-Label dictType="scale" :value="jobInfo.company?.scale"></dict-Label>
+                        </view>
+                        <view class="row2">
+                            <text>在招</text>
+                            <text style="color: #256bfa">{{ companyCount }}</text>
+                            <text>个职位</text>
+                        </view>
+                    </view>
+                </view>
+                <view class="company-map" v-if="jobInfo.latitude && jobInfo.longitude">
+                    <map
+                        style="width: 100%; height: 100%"
+                        :latitude="jobInfo.latitude"
+                        :longitude="jobInfo.longitude"
+                        :markers="mapCovers"
+                    ></map>
+                </view>
+            </view>
+            <view class="content-card">
+                <view class="card-title">
+                    <text class="title">竞争力分析</text>
+                </view>
+                <view class="description">
+                    三个月内共15位求职者申请，你的简历匹配度为{{ raderData.matchScore }}分，排名位于第{{
+                        raderData.rank
+                    }}位，超过{{ raderData.percentile }}%的竞争者，处在优秀位置。
+                </view>
+                <RadarMap :value="raderData"></RadarMap>
 
-        <view class="job-details">
-            <text class="details-title">职位详情</text>
-            <view class="tags">
-                <view class="tag"><dict-Label dictType="education" :value="jobInfo.education"></dict-Label></view>
-                <view class="tag"><dict-Label dictType="experience" :value="jobInfo.experience"></dict-Label></view>
-            </view>
-            <view class="description" :style="{ whiteSpace: 'pre-wrap' }">
-                {{ jobInfo.description }}
+                <view class="card-footer">
+                    <view class="footer-title">你与职位的匹配度</view>
+                    <view class="footer-content">
+                        <view class="progress-container">
+                            <view
+                                v-for="(item, index) in matchingDegree"
+                                :key="index"
+                                class="progress-item"
+                                :class="{
+                                    active: index < currentStep - 1,
+                                    half: index < currentStep && currentStep < index + 1, // 半条
+                                }"
+                            />
+                        </view>
+                    </view>
+                    <view class="progress-text">
+                        <view class="text-rpx" v-for="(item, index) in matchingDegree" :key="index">{{ item }}</view>
+                    </view>
+                </view>
             </view>
+            <view style="height: 24px"></view>
         </view>
-
-        <view
-            class="company-info"
-            @click="navTo(`/packageA/pages/UnitDetails/UnitDetails?companyId=${jobInfo.company.companyId}`)"
-        >
-            <view class="company-name">{{ jobInfo.company?.name }}</view>
-            <view class="company-details">
-                <dict-tree-Label
-                    v-if="jobInfo.company?.industry"
-                    dictType="industry"
-                    :value="jobInfo.company?.industry"
-                ></dict-tree-Label>
-                <span v-if="jobInfo.company?.industry">&nbsp;</span>
-                <dict-Label dictType="scale" :value="jobInfo.company?.scale"></dict-Label>
-                单位详情
+        <template #footer>
+            <view class="footer">
+                <view class="btn-wq button-click" @click="jobApply">立即前往</view>
             </view>
-            <view class="company-map" v-if="jobInfo.latitude && jobInfo.longitude">
-                <map
-                    style="width: 100%; height: 100%"
-                    :latitude="jobInfo.latitude"
-                    :longitude="jobInfo.longitude"
-                    :markers="mapCovers"
-                ></map>
-            </view>
-        </view>
-
-        <view class="footer">
-            <!-- <button class="apply-btn" v-if="!jobInfo.isApply" @click="jobApply">立即申请</button> -->
-            <button class="apply-btn" @click="jobApply">立即申请</button>
-            <!-- <button class="apply-btn btned" v-else>已申请</button> -->
-            <view class="falls-card-matchingrate" @click="jobCollection">
-                <uni-icons v-if="!jobInfo.isCollection" type="star" size="40"></uni-icons>
-                <uni-icons v-else type="star-filled" color="#FFCB47" size="40"></uni-icons>
-            </view>
-        </view>
-    </view>
+        </template>
+        <VideoPlayer ref="videoPalyerRef" />
+    </AppLayout>
 </template>
 
 <script setup>
 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 } from '@dcloudio/uni-app';
 import dictLabel from '@/components/dict-Label/dict-Label.vue';
-const { $api, navTo, getLenPx, parseQueryParams } = inject('globalFunction');
-
+const { $api, navTo, getLenPx, parseQueryParams, navBack } = inject('globalFunction');
+import RadarMap from './component/radarMap.vue';
+const matchingDegree = ref(['一般', '良好', '优秀', '极好']);
+const currentStep = ref(1);
+const companyCount = ref(0);
 const jobInfo = ref({});
 const state = reactive({});
 const mapCovers = ref([]);
 const jobIdRef = ref();
+const raderData = ref({});
+const videoPalyerRef = ref(null);
+const explainUrlRef = ref('');
 
 onLoad((option) => {
     if (option.jobId) {
@@ -94,13 +167,23 @@ function initLoad(option) {
     if (jobId !== jobIdRef.value) {
         jobIdRef.value = jobId;
         getDetail(jobId);
+        getCompetivetuveness(jobId);
+    }
+}
+
+function seeExplain() {
+    if (jobInfo.value.explainUrl) {
+        videoPalyerRef.value?.open(jobInfo.value.explainUrl);
+        // console.log(jobInfo.value.explainUrl);
+        // explainUrlRef.value = jobInfo.value.explainUrl;
     }
 }
 
 function getDetail(jobId) {
     $api.createRequest(`/app/job/${jobId}`).then((resData) => {
-        const { latitude, longitude, companyName } = resData.data;
+        const { latitude, longitude, companyName, companyId } = resData.data;
         jobInfo.value = resData.data;
+        getCompanyIsAJobs(companyId);
         if (latitude && longitude) {
             mapCovers.value = [
                 {
@@ -123,6 +206,12 @@ function getDetail(jobId) {
     });
 }
 
+function getCompanyIsAJobs(companyId) {
+    $api.createRequest(`/app/company/count/${companyId}`).then((resData) => {
+        companyCount.value = resData.data;
+    });
+}
+
 function getTextWidth(text, size = 12) {
     const canvas = document.createElement('canvas');
     const context = canvas.getContext('2d');
@@ -130,6 +219,13 @@ function getTextWidth(text, size = 12) {
     return -(context.measureText(text).width / 2) - 20; // 计算文字中心点
 }
 
+function getCompetivetuveness(jobId) {
+    $api.createRequest(`/app/job/competitiveness/${jobId}`, {}, 'GET').then((resData) => {
+        raderData.value = resData.data;
+        currentStep.value = resData.data.matchScore * 0.04;
+    });
+}
+
 // 申请岗位
 function jobApply() {
     const jobId = jobInfo.value.jobId;
@@ -164,105 +260,273 @@ function jobCollection() {
 </script>
 
 <style lang="stylus" scoped>
-
-::v-deep .amap-logo {
-  opacity: 0 !important;
+.btn {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    width: 60rpx;
+    height: 60rpx;
 }
-::v-deep .amap-copyright {
-  opacity: 0 !important;
+image {
+    height: 100%;
+    width: 100%;
 }
-.container
-    display flex
-    flex-direction column
-    background-color #f8f8f8
-.job-header
-  padding 20rpx 40rpx
-  background-color #ffffff
-  margin-bottom 10rpx
-  .job-title
-    font-size 55rpx
-    font-weight bold
-    color #333
-    margin-bottom 10rpx
-  .job-info
-    display flex
-    justify-content space-between
-    margin-bottom 10rpx
-    .salary
-      color #3b82f6
-      font-size 42rpx
-      font-weight bold
-    .views
-      font-size 24rpx
-      color #999
-  .location-info
-    font-size 24rpx
-    color #666
-    .location, .source, .date
-      margin-right 10rpx
-      margin-top: 20rpx
-    .source
-      margin-left: 30rpx;
+.progress-container {
+  display: flex;
+  align-items: center;
+  gap: 8rpx; /* 间距 */
+  margin-top: 24rpx
 
-.job-details
-  background-color #fff
-  padding 20rpx 40rpx
-  margin-bottom 10rpx
-  .details-title
-    font-size 41rpx
-    font-weight bold
-    margin-bottom 15rpx
-  .tags
-    display flex
-    gap 10rpx
-    margin 15rpx 0
-    .tag
-      background-color #3b82f6
-      color #fff
-      padding 5rpx 15rpx
-      border-radius 15rpx
-      font-size 22rpx
-  .description
-    font-size 24rpx
-    line-height 36rpx
-    color #333
-
-.company-info
-  background-color #fff
-  padding 20rpx 40rpx
-  margin-bottom 300rpx
-  .company-name
-    font-size 28rpx
-    font-weight bold
-    margin-bottom 10rpx
-  .company-details
-    font-size 24rpx
-    color #666
-  .company-map
-    height: 340rpx
+}
+.progress-text{
+    margin-top: 8rpx
+    display: flex;
+    align-items: center;
+    gap: 8rpx; /* 间距 */
+    justify-content: space-around
     width: 100%
-    background: #e8e8e8
-    margin-top: 10rpx
-    border-radius: 16rpx
-    overflow: hidden
+    font-weight: 400;
+    font-size: 20rpx;
+    color: #999999;
+    text-align: center;
+}
 
-.footer
-  position fixed
-  bottom calc(var(--status-bar-height) + var(--window-bottom))
-  left 0
-  width calc(100% - 40rpx)
-  padding 20rpx
-  background-color #fff
-  text-align center
-  display flex
-  align-items: center
-  .apply-btn
-    flex: 1
-    background-color #22c55e
-    color #fff
-    border-radius 30rpx
-    font-size 32rpx
-    margin-right: 30rpx
-  .btned
-    background-color #666666
+.progress-item {
+  width: 25%;
+  height: 24rpx;
+  background-color: #eee;
+  border-radius: 24rpx;
+  overflow: hidden;
+  position: relative;
+    transition: background-color 0.3s;
+}
+
+/* 完整激活格子 */
+.progress-item.active {
+  background: linear-gradient(to right, #256bfa, #8c68ff);
+}
+
+/* 当前进度进行中的格子 */
+.progress-item.half::before {
+  content: '';
+  position: absolute;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  width: 100%; /* 根据 currentStep 小数动态控制 */
+  // background: linear-gradient(to right, #256bfa, #8c68ff);
+  background: linear-gradient(to right, #256bfa 50%, #eaeaea 50%);
+  border-radius: 24rpx;
+}
+.card-footer{
+    .footer-title{
+        font-weight: 600;
+        font-size: 28rpx;
+        color: #000000;
+    }
+
+    .footer-content{
+        .content-line{
+            display: grid
+            grid-template-columns: repeat(4, 1fr)
+            background: linear-gradient( to left, #9E74FD 0%, #256BFA 100%);
+            border-radius: 10rpx
+            .line-pargrah{
+                height: 20rpx;
+                position: relative
+            }
+            .line-pargrah::after{
+                position: absolute;
+                content: '';
+                right: 10
+                top: 0
+                width: 6rpx
+                height: 20rpx
+                background: #FFFFFF
+            }
+        }
+    }
+}
+// ai
+.ai-explain{
+    margin-top: 28rpx
+    background-color: #FFFFFF
+    border-radius: 20rpx 20rpx 20rpx 20rpx;
+    overflow: hidden
+    .exbg{
+        padding: 28rpx 40rpx;
+        display: flex
+        align-items: center
+        justify-content: space-between
+        background: url('@/static/icon/aibg.png') center center no-repeat;
+        background-size: 100% 100%
+        box-shadow: 0 4px 10px rgba(0, 0, 0, 0.05);
+    }
+    .explain-left{
+        .leftText{
+            font-weight: 600;
+            font-size: 32rpx;
+        }
+        .leftdownText{
+            margin-top: 12rpx
+            font-weight: 400;
+            font-size: 28rpx;
+            color: #495265;
+        }
+    }
+    .explain-right{
+        width: 168rpx;
+        height: 72rpx;
+        border-radius: 40rpx 40rpx 40rpx 40rpx;
+        border: 2rpx solid #E7E9ED;
+        text-align: center;
+        line-height: 72rpx
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #333333;
+    }
+}
+.content{
+    padding: 0 28rpx
+    height: 100%
+    .content-top{
+        background: #FFFFFF;
+        box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04);
+        border-radius: 20rpx 20rpx 20rpx 20rpx;
+        padding: 52rpx 32rpx 34rpx 32rpx
+        position: relative
+        overflow: hidden
+        .top-salary{
+            font-weight: 500;
+            font-size: 32rpx;
+            color: #4C6EFB;
+        }
+        .top-name{
+            font-weight: 600;
+            font-size: 36rpx;
+            color: #000000;
+            margin-top: 8rpx
+        }
+        .top-info{
+            margin-top: 22rpx
+            display: flex;
+            align-items: center
+            .info-img{
+                width: 40rpx;
+                height: 40rpx
+            }
+            .info-text{
+                font-weight: 400;
+                font-size: 28rpx;
+                color: #6C7282;
+                margin-left: 10rpx
+            }
+        }
+        .position-source{
+            position: absolute
+            top: 0
+            right: 0
+            width: fit-content;
+            height: 76rpx;
+            padding: 0 24rpx
+            background: rgba(37,107,250,0.1);
+            box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04);
+            text-align: center
+            line-height: 76rpx
+            font-weight: 400;
+            font-size: 28rpx;
+            color: #64779F;
+            border-bottom-left-radius: 20rpx
+        }
+    }
+    .content-card{
+        padding: 24rpx
+        margin-top: 28rpx
+        background: #FFFFFF;
+        box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04);
+        border-radius: 20rpx 20rpx 20rpx 20rpx;
+        .card-title{
+            font-weight: 600;
+            font-size: 32rpx;
+            color: #000000;
+            position: relative;
+            display: flex
+            justify-content: space-between
+            .title{
+                position: relative;
+                z-index: 2;
+            }
+            .btntext{
+                white-space: nowrap
+                font-weight: 400;
+                font-size: 28rpx;
+                color: #256BFA;
+            }
+        }
+        .card-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;
+        }
+        .description{
+            margin-top: 30rpx
+            font-weight: 400;
+            font-size: 28rpx;
+            color: #495265;
+        }
+        .company-info{
+            padding-top: 30rpx
+            display: flex
+            flex-direction: row
+            flex-wrap: nowrap
+            .companyinfo-left{
+                width: 96rpx;
+                height: 96rpx;
+                margin-right: 24rpx
+            }
+            .companyinfo-right{
+
+                .row1{
+                    font-weight: 500;
+                    font-size: 32rpx;
+                    color: #333333;
+                }
+                .row2{
+                    font-weight: 400;
+                    font-size: 28rpx;
+                    color: #6C7282;
+                    line-height: 45rpx;
+                }
+            }
+        }
+        .company-map{
+            margin-top: 28rpx
+            height: 416rpx;
+            border-radius: 20rpx 20rpx 20rpx 20rpx;
+            overflow: hidden
+        }
+    }
+}
+.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
+    }
+}
 </style>
diff --git a/packageA/pages/reservation/component/countdown.vue b/packageA/pages/reservation/component/countdown.vue
new file mode 100644
index 0000000..3027d82
--- /dev/null
+++ b/packageA/pages/reservation/component/countdown.vue
@@ -0,0 +1,161 @@
+<template>
+    <div class="countdown-wrapper" style="width: 100%">
+        <template v-if="isNotStarted">
+            <view class="fl_box fl_nowarp fl_justbet" style="width: 100%">
+                <view class="fl_box">
+                    <span class="colon">距离开始还剩</span>
+                    <div class="time-block">{{ days }}</div>
+                    <span class="colon">天</span>
+                </view>
+                <view style="color: #ff881a">待开始</view>
+            </view>
+        </template>
+
+        <template v-else-if="isEnd">
+            <view class="fl_box fl_nowarp fl_justbet" style="width: 100%">
+                <view class="fl_box">
+                    <span class="colon hui">距离结束还剩</span>
+                    <div class="time-block huibg">00</div>
+                    <span class="colon hui">:</span>
+                    <div class="time-block huibg">00</div>
+                    <span class="colon hui">:</span>
+                    <div class="time-block huibg">00</div>
+                </view>
+                <view class="hui">已结束</view>
+            </view>
+        </template>
+
+        <template v-else>
+            <template v-if="showDays">
+                <view class="fl_box fl_nowarp fl_justbet" style="width: 100%">
+                    <view class="fl_box">
+                        <span class="colon">距离结束还剩</span>
+                        <div class="time-block">{{ days }}</div>
+                        <span class="colon">天</span>
+                    </view>
+                    <view style="color: #18a14f">进行中</view>
+                </view>
+            </template>
+            <template v-else>
+                <view class="fl_box fl_nowarp fl_justbet" style="width: 100%">
+                    <view class="fl_box">
+                        <span class="colon">距离结束还剩</span>
+                        <div class="time-block">{{ hours }}</div>
+                        <span class="colon">:</span>
+                        <div class="time-block">{{ minutes }}</div>
+                        <span class="colon">:</span>
+                        <div class="time-block">{{ seconds }}</div>
+                    </view>
+                    <view style="color: #18a14f">进行中</view>
+                </view>
+            </template>
+        </template>
+    </div>
+</template>
+
+<script setup>
+import { ref, computed, onMounted, onUnmounted } from 'vue';
+
+const props = defineProps({
+    startTime: { type: [String, Number, Date], required: true },
+    endTime: { type: [String, Number, Date], required: true },
+    interval: { type: Number, default: 1000 },
+});
+
+const now = ref(Date.now());
+let timer = null;
+
+const startTimestamp = computed(() => new Date(props.startTime).getTime());
+const endTimestamp = computed(() => new Date(props.endTime).getTime());
+
+const isEnd = computed(() => now.value >= endTimestamp.value);
+const isNotStarted = computed(() => now.value < startTimestamp.value);
+
+const targetTimestamp = computed(() => {
+    if (isNotStarted.value) return startTimestamp.value;
+    if (!isEnd.value) return endTimestamp.value;
+    return now.value;
+});
+
+const remainingMs = computed(() => Math.max(0, targetTimestamp.value - now.value));
+const secondsTotal = computed(() => Math.floor(remainingMs.value / 1000));
+
+const showDays = computed(() => secondsTotal.value >= 86400);
+const days = computed(() => Math.ceil(secondsTotal.value / 86400));
+
+const hours = computed(() => {
+    const h = Math.floor(secondsTotal.value / 3600) % 24;
+    return h.toString().padStart(2, '0');
+});
+const minutes = computed(() => {
+    const m = Math.floor((secondsTotal.value % 3600) / 60);
+    return m.toString().padStart(2, '0');
+});
+const seconds = computed(() => {
+    const s = secondsTotal.value % 60;
+    return s.toString().padStart(2, '0');
+});
+
+const startTimer = () => {
+    timer = setInterval(() => {
+        now.value = Date.now();
+    }, props.interval);
+};
+
+const stopTimer = () => {
+    if (timer) {
+        clearInterval(timer);
+        timer = null;
+    }
+};
+
+onMounted(() => {
+    startTimer();
+});
+
+onUnmounted(() => {
+    stopTimer();
+});
+</script>
+
+<style scoped>
+.countdown-wrapper {
+    display: flex;
+    align-items: center;
+}
+
+.time-block {
+    text-align: center;
+    font-weight: 500;
+    font-size: 28rpx;
+    color: #ffffff;
+    height: 44rpx;
+    line-height: 44rpx;
+    padding: 0 14rpx;
+    background: #256bfa;
+    border-radius: 8rpx 8rpx 8rpx 8rpx;
+    margin: 0 10rpx;
+}
+
+.colon {
+    font-family: PingFang SC, PingFang SC;
+    font-weight: 400;
+    font-size: 28rpx;
+    color: #256bfa;
+}
+
+.day-text {
+    font-size: 18px;
+    color: #333;
+}
+
+.hui {
+    color: #b6b6b6;
+}
+.huibg {
+    background-color: #b6b6b6;
+}
+.lan {
+    color: #256bfa;
+}
+</style>
diff --git a/packageA/pages/reservation/reservation.vue b/packageA/pages/reservation/reservation.vue
new file mode 100644
index 0000000..a34f8df
--- /dev/null
+++ b/packageA/pages/reservation/reservation.vue
@@ -0,0 +1,193 @@
+<template>
+    <view class="reser-content">
+        <view class="content-top">
+            <view
+                class="top-item"
+                :class="{ active: ranItem.value === item.value }"
+                v-for="(item, index) in ranOptions"
+                :key="index"
+                @click="chnageRanOption(item)"
+            >
+                {{ item.label }}
+            </view>
+        </view>
+        <view class="main">
+            <scroll-view scroll-y>
+                <view v-if="pageState.list.length">
+                    <view class="card" v-for="(item, index) in pageState.list" :key="index">
+                        <view @click="navTo('/packageA/pages/exhibitors/exhibitors?jobFairId=' + item.jobFairId)">
+                            <view class="card-row">
+                                <Countdown startTime="item.startTime" :endTime="item.endTime" />
+                            </view>
+                            <view class="card-Title">{{ item.name }}</view>
+                            <view class="card-row">
+                                <view class="rowleft">{{ item.location }}</view>
+                                <view class="rowright">
+                                    <convert-distance
+                                        :alat="item.latitude"
+                                        :along="item.longitude"
+                                        :blat="latitudeVal"
+                                        :blong="longitudeVal"
+                                    ></convert-distance>
+                                </view>
+                            </view>
+                        </view>
+                        <view class="footer" v-if="isTimePassed(item.startTime)">
+                            <view class="card_cancel" @click="updateCancel(item)">取消预约</view>
+                        </view>
+                    </view>
+                </view>
+                <empty v-else pdTop="200"></empty>
+            </scroll-view>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import { reactive, inject, watch, ref, onMounted, onBeforeUnmount } from 'vue';
+import { onLoad, onShow } from '@dcloudio/uni-app';
+const { $api, navTo, debounce, customSystem } = inject('globalFunction');
+import Countdown from './component/countdown.vue';
+import { storeToRefs } from 'pinia';
+import useLocationStore from '@/stores/useLocationStore';
+import useUserStore from '@/stores/useUserStore';
+const { userInfo } = storeToRefs(useUserStore());
+const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
+
+const pageState = reactive({
+    page: 0,
+    list: [],
+    total: 0,
+    maxPage: 1,
+    pageSize: 10,
+    search: {},
+    lastDate: '',
+});
+const ranItem = ref({});
+const ranOptions = ref([
+    { label: '全部', value: 0 },
+    { label: '待开始', value: 1 },
+    { label: '进行中', value: 2 },
+    { label: '已结束', value: 3 },
+]);
+
+function isTimePassed(timeStr) {
+    const targetTime = new Date(timeStr.replace(/-/g, '/')).getTime(); // 兼容格式
+    const now = Date.now();
+    return now < targetTime;
+}
+
+onLoad(() => {
+    ranItem.value = ranOptions.value[0];
+    getList();
+});
+
+function chnageRanOption(item) {
+    ranItem.value = item;
+    getList();
+}
+
+function updateCancel(item) {
+    const fairId = item.jobFairId;
+    $api.createRequest(`/app/fair/collection/${fairId}`, {}, 'DELETE').then((resData) => {
+        getList('refresh');
+        $api.msg('取消预约成功');
+    });
+}
+
+function getList(type = 'add', loading = true) {
+    if (type === 'refresh') {
+        pageState.page = 0;
+        pageState.maxPage = 1;
+    }
+    if (type === 'add' && pageState.page < pageState.maxPage) {
+        pageState.page += 1;
+    }
+    let params = {
+        current: pageState.page,
+        pageSize: pageState.pageSize,
+        type: ranItem.value.value,
+    };
+    $api.createRequest('/app/user/collection/fair', params).then((resData) => {
+        const { rows, total } = resData;
+        if (type === 'add') {
+            const str = pageState.pageSize * (pageState.page - 1);
+            const end = pageState.list.length;
+            const reslist = rows;
+            pageState.list.splice(str, end, ...reslist);
+        } else {
+            pageState.list = rows;
+        }
+        // pageState.list = resData.rows;
+        pageState.total = resData.total;
+        pageState.maxPage = Math.ceil(pageState.total / pageState.pageSize);
+    });
+}
+</script>
+
+<style lang="stylus" scoped>
+.reser-content{
+    width: 100%;
+    height: calc(100vh - var(--window-top) - var(--status-bar-height) - var(--window-bottom));
+    display: flex;
+    flex-direction: column;
+    .content-top{
+        display: flex
+        padding: 28rpx
+        .top-item{
+            font-weight: 400;
+            font-size: 32rpx;
+            margin-right: 48rpx
+            color: #666D7F;
+        }
+        .active{
+            font-weight: 500;
+            font-size: 32rpx;
+            color: #000000;
+        }
+    }
+    .main{
+        flex: 1
+        overflow: hidden
+        background: #F4F4F4
+        padding: 28rpx
+        .card{
+            padding: 30rpx
+            background: #FFFFFF;
+            box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04);
+            border-radius: 20rpx 20rpx 20rpx 20rpx;
+            color: #495264
+            margin-bottom: 28rpx
+            .card-row{
+                display: flex
+                justify-content: space-between
+                .rowleft{
+                    display: flex
+                    align-items: center
+                }
+            }
+            .card-Title{
+                font-weight: 500;
+                font-size: 32rpx;
+                line-height: 70rpx
+                color: #333333;
+            }
+            .footer{
+                display: flex
+                align-items: center
+                justify-content: flex-end
+            }
+            .card_cancel{
+                width: 228rpx;
+                height: 80rpx;
+                line-height: 80rpx;
+                text-align: center;
+                border-radius: 12rpx 12rpx 12rpx 12rpx;
+                border: 2rpx solid #E8EAEE;
+                margin-top: 32rpx
+            }
+        }
+
+    }
+}
+</style>
diff --git a/packageA/pages/selectDate/selectDate.vue b/packageA/pages/selectDate/selectDate.vue
new file mode 100644
index 0000000..b01a15a
--- /dev/null
+++ b/packageA/pages/selectDate/selectDate.vue
@@ -0,0 +1,290 @@
+<template>
+    <AppLayout title="选择日期" :use-scroll-view="false" back-gorund-color="#FAFAFA">
+        <template #headerleft>
+            <view class="btn">
+                <image src="@/static/icon/back.png" @click="navBack"></image>
+            </view>
+        </template>
+        <template #headerright>
+            <view class="btn mar_ri10 button-click" @click="backParams">确认</view>
+        </template>
+        <view class="content">
+            <view class="top-date">
+                <view
+                    class="weekText"
+                    :class="{ color_256BFA: item === '日' || item === '六' }"
+                    v-for="(item, index) in weekMap"
+                    :key="index"
+                >
+                    {{ item }}
+                </view>
+            </view>
+            <scroll-view scroll-y class="main-scroll" @scrolltolower="onScrollBottom">
+                <view class="date-list" v-for="(vItem, vIndex) in calendarData" :key="vIndex">
+                    <view class="list-title">{{ vItem.title }}</view>
+                    <view class="list-item">
+                        <view
+                            class="item button-click"
+                            :class="{
+                                noOptional: !item.isThisMonth,
+                                active: current.date === item.date && item.isThisMonth,
+                            }"
+                            v-for="(item, index) in vItem.list"
+                            :key="index"
+                            @click="selectDay(item)"
+                        >
+                            <view class="item-top">{{ item.day }}</view>
+                            <view class="item-nong">{{ item.nl }}</view>
+                        </view>
+                    </view>
+                </view>
+            </scroll-view>
+        </view>
+    </AppLayout>
+</template>
+
+<script setup>
+import { reactive, inject, watch, ref, onMounted } from 'vue';
+import { onLoad, onShow } from '@dcloudio/uni-app';
+const { $api, navTo, navBack } = inject('globalFunction');
+const weekMap = ['日', '一', '二', '三', '四', '五', '六'];
+const calendarData = ref([]);
+const current = ref({});
+import { Solar, Lunar } from '@/lib/lunar-javascript@1.7.2.js';
+
+const pages = reactive({
+    year: 0,
+    month: 0,
+});
+
+onLoad((options) => {
+    if (options.date) {
+        current.value = {
+            date: options?.date || null,
+        };
+    }
+    console.log(options);
+    initPagesDate();
+    addMonth();
+    addMonth();
+    addMonth();
+});
+
+function backParams() {
+    console.log(isValidDateString(current.value.date));
+    if (isValidDateString(current.value.date)) {
+        navBack({
+            data: current.value,
+        });
+    } else {
+        $api.msg('请选择日期');
+    }
+}
+
+function isValidDateString(dateStr) {
+    const regex = /^\d{4}-\d{2}-\d{2}$/;
+    if (!regex.test(dateStr)) return false;
+
+    const date = new Date(dateStr);
+    if (isNaN(date.getTime())) return false;
+
+    // 检查日期部分是否一致（防止 "2020-02-31" 这种被 Date 自动修正）
+    const [year, month, day] = dateStr.split('-').map(Number);
+    return date.getFullYear() === year && date.getMonth() + 1 === month && date.getDate() === day;
+}
+
+function onScrollBottom() {
+    addMonth();
+}
+
+function selectDay(item) {
+    current.value = item;
+}
+
+function initPagesDate() {
+    const d = new Date();
+    pages.year = d.getFullYear();
+    pages.month = d.getMonth();
+}
+
+function addMonth() {
+    if (pages.month >= 12) {
+        pages.year += 1;
+        pages.month = 1;
+    } else {
+        pages.month += 1;
+    }
+    const month = getMonthCalendarData(pages);
+    calendarData.value.push(month);
+}
+/**
+ *
+ * @param {Array<string>} selectedDates - 选中的日期数组 ['2025-04-21', ...]
+ * @returns {Array<Object>} 六个月日历数据
+ */
+function getMonthCalendarData({ year, month, selectableDates = [] }) {
+    const todayStr = new Date().toISOString().split('T')[0];
+    const isSelected = (y, m, d) =>
+        selectableDates.includes(`${y}-${String(m).padStart(2, '0')}-${String(d).padStart(2, '0')}`);
+
+    const list = [];
+
+    const firstDay = new Date(year, month - 1, 1);
+    const firstWeekday = firstDay.getDay(); // 0 是周日
+    const lastDate = new Date(year, month, 0).getDate();
+
+    // 补全前一月天数（上月最后几天）
+    if (firstWeekday !== 0) {
+        const prevLastDate = new Date(year, month - 1, 0).getDate();
+        for (let i = firstWeekday - 1; i >= 0; i--) {
+            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 dateStr = `${prevYear}-${String(prevMonth).padStart(2, '0')}-${String(d).padStart(2, '0')}`;
+            list.push({
+                day: d,
+                nl: lunar.getDayInChinese(),
+                isThisMonth: false,
+                isToday: dateStr === todayStr,
+                isSelectable: isSelected(prevYear, prevMonth, d),
+                week: weekMap[new Date(prevYear, prevMonth - 1, d).getDay()],
+                date: dateStr,
+            });
+        }
+    }
+
+    // 当前月天数
+    for (let d = 1; d <= lastDate; d++) {
+        const solar = Solar.fromYmd(year, month, d);
+        const lunar = Lunar.fromSolar(solar);
+        const dateStr = `${year}-${String(month).padStart(2, '0')}-${String(d).padStart(2, '0')}`;
+        list.push({
+            day: d,
+            nl: lunar.getDayInChinese(),
+            isThisMonth: true,
+            isToday: dateStr === todayStr,
+            isSelectable: isSelected(year, month, d),
+            week: weekMap[new Date(year, month - 1, d).getDay()],
+            date: dateStr,
+        });
+    }
+
+    // 补全下个月天数（让最后一行完整 7 个）
+    const remaining = 7 - (list.length % 7);
+    if (remaining < 7) {
+        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 dateStr = `${nextYear}-${String(nextMonth).padStart(2, '0')}-${String(d).padStart(2, '0')}`;
+            list.push({
+                day: d,
+                nl: lunar.getDayInChinese(),
+                isThisMonth: false,
+                isToday: dateStr === todayStr,
+                isSelectable: isSelected(nextYear, nextMonth, d),
+                week: weekMap[new Date(nextYear, nextMonth - 1, d).getDay()],
+                date: dateStr,
+            });
+        }
+    }
+
+    return {
+        title: `${year}年${month}月`,
+        list,
+    };
+}
+</script>
+
+<style lang="stylus" scoped>
+.btn {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    white-space: nowrap
+    width: 60rpx;
+    height: 60rpx;
+    image {
+        height: 100%;
+        width: 100%;
+    }
+}
+.content{
+    height: 100%
+    display: flex
+    flex-direction: column
+    border-radius: 40rpx 40rpx 0 0
+    background: #FFFFFF;
+    overflow: hidden
+    margin-top: 20rpx
+    .top-date{
+        display: flex
+        justify-content: space-between
+        padding: 28rpx
+        .weekText{
+            text-align: center
+            width: 99rpx;
+        }
+
+    }
+    .main-scroll{
+        flex: 1
+        overflow: hidden
+    }
+    .date-list{
+        .list-title{
+            height: 84rpx;
+            line-height: 84rpx
+            background: #FAFAFA;
+            font-weight: 600;
+            font-size: 32rpx;
+            color: #1A1A1A;
+            padding: 0 28rpx;
+            box-sizing: border-box
+        }
+        .list-item{
+            padding: 16rpx 28rpx 20rpx 28rpx;
+            display: grid
+            grid-template-columns: repeat(7, 1fr)
+            grid-gap: 0rpx
+            .item{
+                display: flex
+                flex-direction: column
+                align-items: center
+                justify-content: center
+                border-radius: 20rpx 20rpx 20rpx 20rpx;
+                padding: 16rpx 0
+                margin-bottom: 20rpx
+                .item-top{
+                    font-weight: 600;
+                    font-size: 32rpx;
+                }
+                .item-nong{
+                    font-size: 16rpx;
+                    color: #666666
+                    margin-top: 2rpx
+                }
+            }
+            .optional{
+                // height: 96rpx;
+                border: 2rpx solid #92B5FC;
+            }
+            .noOptional{
+                color: #B8B8B8;
+            }
+            .active{
+                background: linear-gradient( 225deg, #9E74FD 0%, #256BFA 100%);
+                color: #FFFFFF
+                .item-nong{
+                    font-size: 16rpx;
+                    color: #FFFFFF
+                    margin-top: 2rpx
+                }
+            }
+        }
+    }
+}
+</style>
diff --git a/pages.json b/pages.json
index dff83c7..3bac979 100644
--- a/pages.json
+++ b/pages.json
@@ -5,6 +5,7 @@
             "style": {
                 "navigationBarTitleText": "青岛智慧就业平台",
                 "navigationStyle": "custom"
+
             }
         },
         {
@@ -32,7 +33,7 @@
         {
             "path": "pages/login/login",
             "style": {
-                "navigationBarTitleText": "登录",
+                "navigationBarTitleText": "AI+就业服务程序",
                 "navigationStyle": "custom"
             }
         },
@@ -41,7 +42,8 @@
             "style": {
                 "navigationBarTitleText": "附近",
                 "navigationBarBackgroundColor": "#4778EC",
-                "navigationBarTextStyle": "white"
+                "navigationBarTextStyle": "white",
+                "navigationStyle": "custom"
             }
         },
         {
@@ -55,7 +57,15 @@
                 "navigationStyle": "custom"
                 //#endif
             }
+        },
+        {
+            "path": "pages/search/search",
+            "style": {
+                "navigationBarTitleText": "",
+                "navigationStyle": "custom"
+            }
         }
+
     ],
     "subpackages": [{
         "root": "packageA",
@@ -64,57 +74,102 @@
                 "style": {
                     "navigationBarTitleText": "精选",
                     "navigationBarBackgroundColor": "#4778EC",
-                    "navigationBarTextStyle": "white"
+                    "navigationBarTextStyle": "white",
+                    "navigationStyle": "custom"
                 }
             }, {
                 "path": "pages/post/post",
                 "style": {
                     "navigationBarTitleText": "职位详情",
                     "navigationBarBackgroundColor": "#4778EC",
-                    "navigationBarTextStyle": "white"
+                    "navigationBarTextStyle": "white",
+                    "navigationStyle": "custom"
                 }
             }, {
                 "path": "pages/UnitDetails/UnitDetails",
                 "style": {
                     "navigationBarTitleText": "单位详情",
                     "navigationBarBackgroundColor": "#4778EC",
-                    "navigationBarTextStyle": "white"
+                    "navigationBarTextStyle": "white",
+                    "navigationStyle": "custom"
                 }
             }, {
                 "path": "pages/exhibitors/exhibitors",
                 "style": {
                     "navigationBarTitleText": "参展单位",
                     "navigationBarBackgroundColor": "#4778EC",
-                    "navigationBarTextStyle": "white"
+                    "navigationBarTextStyle": "white",
+                    "navigationStyle": "custom"
                 }
             }, {
                 "path": "pages/myResume/myResume",
                 "style": {
                     "navigationBarTitleText": "我的简历",
-                    "navigationBarBackgroundColor": "#4778EC",
-                    "navigationBarTextStyle": "white"
+                    "navigationBarBackgroundColor": "#FFFFFF"
                 }
             }, {
                 "path": "pages/Intendedposition/Intendedposition",
                 "style": {
-                    "navigationBarTitleText": "意向岗位",
-                    "navigationBarBackgroundColor": "#4778EC",
-                    "navigationBarTextStyle": "white"
+                    "navigationBarTitleText": "投递记录",
+                    "navigationBarBackgroundColor": "#FFFFFF"
                 }
             }, {
                 "path": "pages/collection/collection",
                 "style": {
                     "navigationBarTitleText": "我的收藏",
-                    "navigationBarBackgroundColor": "#4778EC",
-                    "navigationBarTextStyle": "white"
+                    "navigationBarBackgroundColor": "#FFFFFF",
+                    "navigationStyle": "custom"
                 }
             },
             {
                 "path": "pages/browseJob/browseJob",
                 "style": {
                     "navigationBarTitleText": "我的浏览",
-                    "navigationBarBackgroundColor": "#4778EC",
-                    "navigationBarTextStyle": "white"
+                    "navigationBarBackgroundColor": "#FFFFFF",
+                    "navigationStyle": "custom"
+                }
+            },
+            {
+                "path": "pages/addPosition/addPosition",
+                "style": {
+                    "navigationBarTitleText": "添加岗位",
+                    "navigationStyle": "custom"
+                }
+            },
+            {
+                "path": "pages/selectDate/selectDate",
+                "style": {
+                    "navigationBarTitleText": "",
+                    "navigationStyle": "custom"
+                }
+            },
+            {
+                "path": "pages/personalInfo/personalInfo",
+                "style": {
+                    "navigationBarTitleText": "个人信息",
+                    "navigationStyle": "custom"
+                }
+            },
+            {
+                "path": "pages/jobExpect/jobExpect",
+                "style": {
+                    "navigationBarTitleText": "求职期望",
+                    "navigationStyle": "custom"
+                }
+            },
+            {
+                "path": "pages/reservation/reservation",
+                "style": {
+                    "navigationBarTitleText": "我的预约",
+                    "navigationBarBackgroundColor": "#FFFFFF"
+                }
+            },
+            {
+                "path": "pages/choicenessList/choicenessList",
+                "style": {
+                    "navigationBarTitleText": "精选企业",
+                    "navigationBarBackgroundColor": "#FFFFFF",
+                    "navigationStyle": "custom"
                 }
             }
         ]
@@ -165,6 +220,11 @@
         "navigationBarTitleText": "uni-app",
         "navigationBarBackgroundColor": "#F8F8F8",
         "backgroundColor": "#F8F8F8"
+        // "enablePullDownRefresh": false,
+        // "navigationStyle": "custom",
+        // "rpxCalcBaseDeviceWidth": 3840,
+        // "rpxCalcMaxDeviceWidth": 3840,
+        // "rpxCalcIncludeWidth": 750
     },
     "uniIdRouter": {}
 }
\ No newline at end of file
diff --git a/pages/careerfair/careerfair.vue b/pages/careerfair/careerfair.vue
index 13e7c0f..434ea47 100644
--- a/pages/careerfair/careerfair.vue
+++ b/pages/careerfair/careerfair.vue
@@ -1,199 +1,521 @@
 <template>
-    <view class="app-container">
-        <view class="careerfair-AI">AI+就业服务程序</view>
-        <view class="careerfair-tab">
-            <view class="careerfair-tab-options actived">现场招聘</view>
-            <view class="careerfair-tab-options" @click="textXcx">VR虚拟招聘会</view>
+    <view class="app-custom-root">
+        <view class="app-container">
+            <!-- 顶部头部区域 -->
+            <view class="container-header">
+                <view class="header-top">
+                    <view class="header-btnLf button-click" @click="seemsg(0)" :class="{ active: state.current === 0 }">
+                        现场招聘
+                    </view>
+                    <view class="header-btnLf button-click" @click="seemsg(1)" :class="{ active: state.current === 1 }">
+                        VR虚拟招聘会
+                    </view>
+                </view>
+                <view class="header-input btn-feel">
+                    <uni-icons class="iconsearch" color="#666666" type="search" size="18"></uni-icons>
+                    <input class="input" placeholder="招聘会" placeholder-class="inputplace" />
+                </view>
+                <view class="header-date">
+                    <view class="data-week">
+                        <view
+                            class="weel-days button-click"
+                            :class="{ active: currentDay.fullDate === item.fullDate }"
+                            v-for="(item, index) in weekList"
+                            :key="index"
+                            @click="selectDate(item)"
+                        >
+                            <view class="label">{{ item.day }}</view>
+                            <view class="day">{{ item.date }}</view>
+                        </view>
+                    </view>
+                    <view class="data-all">
+                        <image class="allimg button-click" @click="toSelectDate" src="/static/icon/date1.png"></image>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 主体内容区域 -->
+            <view class="container-main">
+                <scroll-view scroll-y class="main-scroll" @scrolltolower="handleScrollToLower">
+                    <view class="cards" v-if="fairList.length">
+                        <view
+                            class="card btn-incline"
+                            v-for="(item, index) in fairList"
+                            :key="index"
+                            @click="navTo('/packageA/pages/exhibitors/exhibitors?jobFairId=' + item.jobFairId)"
+                        >
+                            <view class="card-title">{{ item.name }}</view>
+                            <view class="card-row">
+                                <text class="">{{ item.location }}</text>
+                                <text class="">
+                                    <convert-distance
+                                        :alat="item.latitude"
+                                        :along="item.longitude"
+                                        :blat="latitudeVal"
+                                        :blong="longitudeVal"
+                                    ></convert-distance>
+                                </text>
+                            </view>
+                            <view class="card-times">
+                                <view class="time-left">
+                                    <view class="left-date">{{ parseDateTime(item.startTime).time }}</view>
+                                    <view class="left-dateDay">{{ parseDateTime(item.startTime).date }}</view>
+                                </view>
+                                <view class="line"></view>
+                                <view class="time-center">
+                                    <view class="center-date">
+                                        {{ getTimeStatus(item.startTime, item.endTime).statusText }}
+                                    </view>
+                                    <view class="center-dateDay">
+                                        {{ getHoursBetween(item.startTime, item.endTime) }}小时
+                                    </view>
+                                </view>
+                                <view class="line"></view>
+                                <view class="time-right">
+                                    <view class="left-date">{{ parseDateTime(item.endTime).time }}</view>
+                                    <view class="left-dateDay">{{ parseDateTime(item.endTime).date }}</view>
+                                </view>
+                            </view>
+                            <view class="recommend-card-line"></view>
+                            <view class="card-footer">内容简介：{{ item.description }}</view>
+                        </view>
+                    </view>
+                    <empty v-else pdTop="200"></empty>
+                </scroll-view>
+            </view>
         </view>
-        <scroll-view :scroll-x="true" :show-scrollbar="false" class="careerfair-scroll">
-            <view class="careerfair-date">
-                <view class="date-list" v-for="(item, index) in state.dateList" :key="index">
-                    <view class="date-list-item">{{ item.day }}</view>
-                    <view class="date-list-item active">{{ item.date }}</view>
-                </view>
-            </view>
-        </scroll-view>
-        <scroll-view :scroll-y="true" class="careerfair-list-scroll">
-            <view class="careerfair-list">
-                <view class="careerfair-list-card" v-for="(item, index) in 10" :key="index">
-                    <view class="card-title">2024年春季青岛市商贸服务业招聘会</view>
-                    <view class="card-intro">
-                        <view class="line_2">内容简介……</view>
-                        <view class="intro-distance">500m以内</view>
-                    </view>
-                    <view class="card-address">市南区延安三路105号</view>
-                    <view class="card-footer">
-                        <view class="cardfooter-lf">
-                            <view class="card-company">市南区就业人才中心</view>
-                            <view class="card-date">7月31日（周三）14:00-18:00</view>
-                        </view>
-                        <view class="cardfooter-ri" @click="navTo('/packageA/pages/exhibitors/exhibitors')">
-                            查看详情
-                        </view>
-                    </view>
-                </view>
-            </view>
-        </scroll-view>
-        <!-- 自定义tabbar -->
-        <!-- <tabbar-custom :currentpage="1"></tabbar-custom> -->
     </view>
 </template>
 
 <script setup>
 import { reactive, inject, watch, ref, onMounted } from 'vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
-const { $api, navTo } = inject('globalFunction');
+import useLocationStore from '@/stores/useLocationStore';
+import { storeToRefs } from 'pinia';
+const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
+const { $api, navTo, cloneDeep } = inject('globalFunction');
+const weekList = ref([]);
+const fairList = ref([]);
+const currentDay = ref({});
 const state = reactive({
-    dateList: [],
+    current: 0,
+    all: [{}],
+});
+const pageState = reactive({
+    page: 0,
+    total: 0,
+    maxPage: 2,
+    pageSize: 10,
+    search: {},
 });
 
 onLoad(() => {
-    state.dateList = getNextMonthDates();
+    const result = getNextDates({
+        startDate: '2025-04-21',
+    });
+    weekList.value = result;
+    getFair('refresh');
 });
 
-function textXcx() {
-    $api.msg('测试给小程序发送消息');
-    $api.sendingMiniProgramMessage();
+function toSelectDate() {
+    navTo('/packageA/pages/selectDate/selectDate', {
+        query: {
+            date: currentDay.value.fullDate,
+        },
+        onBack: (res) => {
+            const result = getNextDates({
+                startDate: res.date,
+            });
+            weekList.value = result;
+            getFair('refresh');
+        },
+    });
+}
+// 查看消息类型
+function changeSwiperMsgType(e) {
+    const currented = e.detail.current;
+    state.current = currented;
 }
 
-//  获取往后三十天日期
-function getNextMonthDates() {
-    const today = new Date();
+function seemsg(index) {
+    if (index === 1) {
+        return $api.msg('功能确定中');
+    }
+    state.current = index;
+}
+
+const handleScrollToLower = () => {
+    getFair();
+    console.log('触底');
+};
+
+function getFair(type = 'add') {
+    if (type === 'refresh') {
+        pageState.page = 0;
+        pageState.maxPage = 1;
+    }
+    if (type === 'add' && pageState.page < pageState.maxPage) {
+        pageState.page += 1;
+    }
+    let params = {
+        ...pageState.search,
+        current: pageState.page,
+        pageSize: pageState.pageSize,
+    };
+    if (currentDay.value?.fullDate) {
+        params.queryDate = currentDay.value.fullDate;
+    }
+    $api.createRequest('/app/fair', params).then((resData) => {
+        const { rows, total } = resData;
+        console.log(rows);
+        if (type === 'add') {
+            const str = pageState.pageSize * (pageState.page - 1);
+            const end = fairList.value.length;
+            const reslist = rows;
+            fairList.value.splice(str, end, ...reslist);
+        } else {
+            fairList.value = rows;
+        }
+        // pageState.list = resData.rows;
+        pageState.total = resData.total;
+        pageState.maxPage = Math.ceil(pageState.total / pageState.pageSize);
+    });
+}
+
+function parseDateTime(datetimeStr) {
+    if (!datetimeStr) return { time: '', date: '' };
+
+    const dateObj = new Date(datetimeStr);
+
+    if (isNaN(dateObj.getTime())) return { time: '', date: '' }; // 无效时间
+
+    const year = dateObj.getFullYear();
+    const month = String(dateObj.getMonth() + 1).padStart(2, '0');
+    const day = String(dateObj.getDate()).padStart(2, '0');
+    const hours = String(dateObj.getHours()).padStart(2, '0');
+    const minutes = String(dateObj.getMinutes()).padStart(2, '0');
+
+    return {
+        time: `${hours}:${minutes}`,
+        date: `${year}年${month}月${day}日`,
+    };
+}
+
+function getTimeStatus(startTimeStr, endTimeStr) {
+    const now = new Date();
+    const startTime = new Date(startTimeStr);
+    const endTime = new Date(endTimeStr);
+
+    // 判断状态：0 开始中，1 过期，2 待开始
+    let status = 0;
+    let statusText = '开始中';
+    if (now < startTime) {
+        status = 2; // 待开始
+        statusText = '待开始';
+    } else if (now > endTime) {
+        status = 1; // 已过期
+        statusText = '已过期';
+    } else {
+        status = 0; // 进行中
+        statusText = '进行中';
+    }
+    return {
+        status, // 0: 进行中，1: 已过期，2: 待开始
+        statusText,
+    };
+}
+
+function getHoursBetween(startTimeStr, endTimeStr) {
+    const start = new Date(startTimeStr);
+    const end = new Date(endTimeStr);
+
+    const diffMs = end - start;
+    const diffHours = diffMs / (1000 * 60 * 60);
+
+    return +diffHours.toFixed(2); // 保留 2 位小数
+}
+
+const selectDate = (item) => {
+    if (currentDay.value?.fullDate === item.fullDate) {
+        currentDay.value = {};
+        getFair('refresh');
+        return;
+    }
+    currentDay.value = item;
+    getFair('refresh');
+};
+
+function getNextDates({ startDate = '', count = 6 }) {
+    const baseDate = startDate ? new Date(startDate) : new Date(); // 指定起点或今天
     const dates = [];
     const dayNames = ['日', '一', '二', '三', '四', '五', '六'];
-    for (let i = 0; i < 30; i++) {
-        const date = new Date(today); // 创建当天的副本
-        date.setDate(today.getDate() + i); // 设置日期为往后第 i 天
-        const formattedDate = date.toISOString().slice(0, 10).slice(8); // 格式化为 YYYY-MM-DD
-        const dayOfWeek = dayNames[date.getDay()]; // 获取星期几
+
+    for (let i = 0; i < count; i++) {
+        const date = new Date(baseDate);
+        date.setDate(baseDate.getDate() + i);
+
+        const fullDate = date.toISOString().slice(0, 10); // YYYY-MM-DD
+        const formattedDate = fullDate.slice(5); // MM-DD
+        const dayOfWeek = dayNames[date.getDay()];
+
         dates.push({
             date: formattedDate,
-            day: dayOfWeek,
+            fullDate,
+            day: '周' + dayOfWeek,
+            isToday: i === 0,
         });
     }
-    dates[0].date = '今天';
-    dates[1].date = '明天';
+
+    // 可选设置默认选中项
+    // currentDay.value = dates[0];
+
     return dates;
 }
 </script>
 
 <style lang="stylus" scoped>
-.app-container
-    width: 100%;
-    height: calc(100vh - var(--window-top) - var(--status-bar-height) - var(--window-bottom));
-    background: linear-gradient( 180deg, #4778EC 0%, #002979 100%);
+.app-custom-root {
+    position: fixed;
+    z-index: 10;
+    width: 100vw;
+    height: calc(100% - var(--window-bottom));
+    overflow: hidden;
+}
+.app-container {
     display: flex;
     flex-direction: column;
-    position: fixed
-    .careerfair-AI
-        height: 42rpx;
-        font-family: Inter, Inter;
-        font-weight: 400;
-        font-size: 35rpx;
-        color: #FFFFFF;
-        line-height: 41rpx;
-        padding: 85rpx 0 0 30rpx;
-    .careerfair-tab
-        margin: 20rpx 0 0 30rpx;
-        width: fit-content;
-        display: flex;
-        flex-wrap: nowrap;
-        .careerfair-tab-options
-            background: #4778EC;
-            padding: 0 20rpx;
-            height: 63rpx;
-            line-height: 63rpx;
+    height: 100%;
+    width: 100%;
+    .container-header {
+        background: url('@/static/icon/background2.png') 0 0 no-repeat;
+        background-size: 100% 400rpx;
+        .header-top{
+            display: flex;
+            line-height: calc(88rpx - 14rpx);
+            padding: 16rpx 44rpx 14rpx 44rpx;
+            .header-btnLf {
+                display: flex;
+                width: fit-content;
+                white-space: nowrap
+                justify-content: flex-start;
+                align-items: center;
+                width: calc(60rpx * 3);
+                font-weight: 500;
+                font-size: 40rpx;
+                color: #696969;
+                margin-right: 44rpx;
+                position: relative;
+                .btns-wd{
+                    position: absolute
+                    top: 2rpx;
+                    right: 2rpx
+                    width: 16rpx;
+                    height: 16rpx;
+                    background: #F73636;
+                    border-radius: 50%;
+                    border: 4rpx solid #EEEEFF;
+                }
+            }
+            .active {
+                font-weight: 600;
+                font-size: 40rpx;
+                color: #000000;
+            }
+        }
+        .header-input{
+            padding: 0 24rpx
+            width: calc(100% - 48rpx);
+            position: relative
+            .iconsearch{
+                position: absolute
+                left: 50rpx;
+                top: 50%
+                transform: translate(0, -50%)
+            }
+            .input{
+                padding: 0 30rpx 0 80rpx
+                height: 80rpx;
+                background: #FFFFFF;
+                border-radius: 75rpx 75rpx 75rpx 75rpx;
+                font-size: 28rpx;
+            }
+            .inputplace{
+                font-weight: 400;
+                font-size: 28rpx;
+                color: #B5B5B5;
+            }
+
+        }
+        .header-date{
+            padding: 28rpx
+            display: flex
+            justify-content: space-between
+            align-items: center
+            .data-week{
+                flex: 1
+                display: flex
+                justify-content: space-between
+                flex-wrap: nowrap
+                overflow: hidden
+                .weel-days{
+                    display: flex
+                    justify-content: center
+                    flex-direction: column
+                    text-align: center
+                    font-weight: 400;
+                    font-size: 24rpx;
+                    color: #333333;
+                    width: 96rpx;
+                    height: 88rpx;
+
+                    .label{}
+                    .day{
+                        font-weight: 500;
+                    }
+                }
+                .active{
+                    background: rgba(37,107,250,0.1);
+                    border-radius: 12rpx 12rpx 12rpx 12rpx;
+                    color: #256BFA;
+                }
+            }
+            .data-all{
+                width: 66rpx;
+                height: 66rpx;
+                margin-left: 18rpx
+                .allimg{
+                    width: 100%;
+                    height: 100%
+                }
+            }
+        }
+    }
+}
+
+.container-main {
+    flex: 1;
+    overflow: hidden;
+    background-color: #f4f4f4;
+}
+.main-scroll {
+    width: 100%
+    height: 100%;
+}
+.cards{
+    padding: 28rpx 28rpx 28rpx 28rpx;
+    .card{
+        margin-top: 28rpx
+        padding: 32rpx;
+        background: #FFFFFF
+        background: #FFFFFF;
+        box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04);
+        border-radius: 20rpx 20rpx 20rpx 20rpx;
+        .card-title{
+            font-weight: 500;
+            font-size: 32rpx;
+            color: #333333;
+        }
+        .card-row{
+            display: flex
+            justify-content: space-between
             font-weight: 400;
             font-size: 28rpx;
-            color: #FFFFFF;
-            text-align: center;
-        .actived
-            position: relative;
-            background: #FFAD47;
-            box-shadow: 0rpx 7rpx 7rpx 0rpx rgba(0,0,0,0.25);
-        .careerfair-tab-options:first-child
-            border-radius: 17rpx 0rpx 0rpx 0rpx;
-        .careerfair-tab-options:last-child
-            border-radius: 0rpx 17rpx 0rpx 0rpx;
-    .careerfair-scroll
-        background: #4778EC;
-    .careerfair-date
-        height: 119rpx;
-        display: flex;
-        flex-wrap: nowrap;
-        align-items: center;
-        color: #FFFFFF;
-        width: fit-content;
-        .date-list
+            color: #495265;
+            margin-top: 4rpx
+        }
+        .card-times{
             display: flex;
-            flex-direction: column;
-            align-items: center;
-            justify-content: center;
-            width: calc(750rpx / 7);
-            .date-list-item:nth-child(2)
-                font-size: 19rpx;
-                margin-top: 10rpx;
-            .active
-                width: 52rpx;
-                height: 52rpx;
-                background: #FFAD47;
-                border-radius: 0rpx 0rpx 0rpx 0rpx;
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                border-radius: 50%;
-    .careerfair-list-scroll
-        overflow: hidden;
-        background: linear-gradient( 180deg, rgba(255,255,255,0.2) 0%, #FFFFFF 100%);
-    .careerfair-list
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        padding: 25rpx 28rpx;
-        .careerfair-list-card
-            margin-top: 36rpx;
-            width: calc(100% - 40rpx);
-            background: #FFFFFF;
-            border-radius: 17rpx 17rpx 17rpx 17rpx;
-            padding: 20rpx;
-            .card-title
-                height: 68rpx;
-                font-size: 35rpx;
-                color: #606060;
-                line-height: 68rpx;
-            .card-intro,.card-address,.card-company,.card-date
-                font-weight: 400;
-                font-size: 21rpx;
-                color: #606060;
-                line-height: 25rpx;
-                margin-top: 13rpx;
-            .card-footer
-                display: flex;
-                flex-wrap: nowrap;
-                justify-content: space-between;
-                align-items: center;
-                .cardfooter-ri
-                    width: 206rpx;
-                    height: 56rpx;
-                    line-height: 56rpx;
+            justify-content: space-between
+            align-items: center
+            margin-top: 24rpx
+            .time-left,
+            .time-right{
+                text-align: center
+                .left-date{
+                    font-weight: 500;
+                    font-size: 48rpx;
+                    color: #333333;
+                }
+                .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;
-                    text-align: center;
-                    color: #FFFFFF;
-                    background: #FFAD47;
-                    border-radius: 17rpx 17rpx 17rpx 17rpx;
-            .card-intro
-                display: flex;
-                justify-content: space-between;
-                align-items: center;
-                flex-wrap: nowrap;
-                .intro-distance
-                    height: 30rpx;
-                    background: #13C57C;
-                    padding: 3rpx 8rpx;
-                    line-height: 30rpx;
-                    color: #FFFFFF;
-                    font-size: 21rpx;
-                    border-radius: 17rpx 17rpx 17rpx 17rpx;
-        .careerfair-list-card:first-child
-            margin-top: 0;
+                    color: #FF881A;
+                    padding-top: 10rpx
+                }
+                .center-dateDay{
+                    font-weight: 400;
+                    font-size: 24rpx;
+                    color: #333333;
+                    margin-top: 6rpx
+                    line-height: 48rpx;
+                    width: 104rpx;
+                    height: 48rpx;
+                    background: #F9F9F9;
+                    border-radius: 8rpx 8rpx 8rpx 8rpx;
+                }
+            }
+        }
+        .recommend-card-line{
+            width: calc(100%);
+            height: 0rpx;
+            border-radius: 0rpx 0rpx 0rpx 0rpx;
+            border: 2rpx dashed rgba(0,0,0,0.14);
+            margin-top: 32rpx
+            position: relative
+        }
+
+        .recommend-card-line::before{
+            position: absolute
+            content: ''
+            left: 0
+            top: 0
+            transform: translate(-50% - 110rpx, -50%)
+            width: 28rpx;
+            height: 28rpx;
+            background: #F4F4F4;
+            border-radius: 50%;
+        }
+
+        .recommend-card-line::after{
+            position: absolute
+            content: ''
+            right: 0
+            top: 0
+            transform: translate(50% + 100rpx, -50%)
+            width: 28rpx;
+            height: 28rpx;
+            background: #F4F4F4;
+            border-radius: 50%;
+        }
+        .card-footer{
+            margin-top: 32rpx
+            min-height: 50rpx;
+            font-weight: 400;
+            font-size: 28rpx;
+            color: #6C7282;
+        }
+    }
+    .card:first-child{
+        margin-top: 0
+    }
+}
 </style>
diff --git a/pages/chat/chat.vue b/pages/chat/chat.vue
index 749661b..f2fc092 100644
--- a/pages/chat/chat.vue
+++ b/pages/chat/chat.vue
@@ -40,11 +40,11 @@
                     <image class="drawer-user-img" v-if="userInfo.age === '0'" src="/static/icon/boy.png"></image>
                     <image class="drawer-user-img" v-else src="/static/icon/girl.png"></image>
                     <text>{{ userInfo.name || '暂无用户名' }}</text>
-                    <image
+                    <!--      <image
                         class="drawer-user-setting button-click"
                         src="/static/icon/setting.png"
                         @click="updateSetting"
-                    ></image>
+                    ></image> -->
                 </view>
             </view>
         </view>
@@ -315,4 +315,4 @@ header-height = 88rpx
 .main-content.shift {
     margin-left: 500rpx;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/chat/components/ai-paging.vue b/pages/chat/components/ai-paging.vue
index ce1cae1..ea67261 100644
--- a/pages/chat/components/ai-paging.vue
+++ b/pages/chat/components/ai-paging.vue
@@ -7,7 +7,12 @@
                 我可以根据您的简历和求职需求，帮你精准匹配青岛市互联网招聘信息，对比招聘信息的优缺点，提供面试指导等，请把你的任务交给我吧~
             </view>
             <view class="back-rowh3">猜你所想</view>
-            <view class="back-rowmsg" v-for="item in queries" @click="sendMessageGuess(item)">
+            <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">
@@ -738,6 +743,8 @@ image-margin-top = 40rpx
     justify-content: flex-start
     align-items: center
     width: calc(100% - 88rpx)
+    position: relative
+    z-index: 1
     .backlogo
         width: 313rpx;
         height: 190rpx;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 49a6c14..72a1df0 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,133 +1,137 @@
 <template>
     <view class="app-container">
-        <view class="index-AI">AI+就业服务程序</view>
-        <view class="index-option">
-            <view class="option-left">
-                <view class="left-item" @click="navTo('/pages/nearby/nearby')">附近</view>
-                <view class="left-item" @click="navTo('/packageA/pages/choiceness/choiceness')">精选</view>
-                <view class="left-item">职业图谱</view>
+        <view class="nav-hidden hidden-animation" :class="{ 'hidden-height': isScrollingDown }">
+            <view class="container-search">
+                <view class="search-input button-click" @click="navTo('/pages/search/search')">
+                    <uni-icons class="iconsearch" color="#666666" type="search" size="18"></uni-icons>
+                    <text class="inpute">职位名称、薪资要求等</text>
+                </view>
+                <view class="chart button-click">职业图谱</view>
             </view>
-            <view class="option-right">
-                <input
-                    class="uni-input right-input"
-                    adjust-position="false"
-                    confirm-type="search"
-                    v-model="inputText"
-                    @confirm="searchJobTitle"
-                />
-                <uni-icons
-                    class="iconsearch"
-                    color="#FFFFFF"
-                    type="search"
-                    size="20"
-                    @click="searchJobTitle"
-                ></uni-icons>
+            <view class="cards">
+                <view class="card btn-feel" @click="navTo('/pages/nearby/nearby')">
+                    <view class="card-title">附近工作</view>
+                    <view class="card-text">好岗职等你来</view>
+                </view>
+                <view class="card btn-feel" @click="navTo('/packageA/pages/choiceness/choiceness')">
+                    <view class="card-title">精选企业</view>
+                    <view class="card-text">优选职得信赖</view>
+                </view>
             </view>
         </view>
-        <!-- tab -->
-        <view class="tab-options">
-            <scroll-view :scroll-x="true" :show-scrollbar="false" class="tab-scroll">
-                <view class="tab-op-left">
-                    <view
-                        class="tab-list"
-                        :class="{ tabchecked: state.tabIndex === 'all' }"
-                        @click="choosePosition('all')"
-                    >
-                        全部
+        <view class="nav-filter">
+            <view class="filter-top">
+                <scroll-view :scroll-x="true" :show-scrollbar="false" class="tab-scroll">
+                    <view class="jobs-left">
+                        <view
+                            class="job button-click"
+                            :class="{ active: state.tabIndex === 'all' }"
+                            @click="choosePosition('all')"
+                        >
+                            全部
+                        </view>
+                        <view
+                            class="job button-click"
+                            :class="{ active: state.tabIndex === index }"
+                            v-for="(item, index) in userInfo.jobTitle"
+                            :key="index"
+                            @click="choosePosition(index)"
+                        >
+                            {{ item }}
+                        </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>
+            <view class="filter-bottom">
+                <view class="btm-left">
                     <view
-                        class="tab-list"
-                        :class="{ tabchecked: state.tabIndex === index }"
-                        v-for="(item, index) in userInfo.jobTitle"
-                        :key="index"
-                        @click="choosePosition(index)"
+                        class="button-click filterbtm"
+                        :class="{ active: pageState.search.order === item.value }"
+                        v-for="item in rangeOptions"
+                        @click="handelHostestSearch(item)"
+                        :key="item.value"
                     >
-                        {{ item }}
+                        {{ item.text }}
                     </view>
                 </view>
+                <view class="btm-right button-click" @click="openFilter">
+                    筛选
+                    <image class="right-sx" :class="{ active: showFilter }" src="@/static/icon/shaixun.png"></image>
+                </view>
+            </view>
+        </view>
+        <view class="table-list">
+            <scroll-view :scroll-y="true" class="falls-scroll" @scroll="handleScroll" @scrolltolower="scrollBottom">
+                <view class="falls" v-if="list.length">
+                    <custom-waterfalls-flow :column="columnCount" ref="waterfallsFlowRef" :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="falls-card-pay">
+                                        <view class="pay-text">
+                                            <Salary-Expectation
+                                                :max-salary="job.maxSalary"
+                                                :min-salary="job.minSalary"
+                                                :is-month="true"
+                                            ></Salary-Expectation>
+                                        </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>
+                                    <view class="falls-card-company">{{ job.companyName }}</view>
+                                    <view class="falls-card-company">
+                                        青岛
+                                        <dict-Label dictType="area" :value="job.jobLocationAreaCode"></dict-Label>
+                                    </view>
+                                    <view class="falls-card-pepleNumber">
+                                        <view>{{ job.postingDate || '发布日期' }}</view>
+                                        <view>{{ vacanciesTo(job.vacancies) }}</view>
+                                    </view>
+                                    <!--  <view class="falls-card-matchingrate">
+                                        <view class=""><matchingDegree :job="job"></matchingDegree></view>
+                                        <uni-icons type="star" size="30"></uni-icons>
+                                    </view> -->
+                                </view>
+                            </view>
+                            <view class="item" :class="{ isBut: job.isBut }" v-else>
+                                <view class="recommend-card">
+                                    <view class="card-content">
+                                        <view class="recommend-card-title">在找「{{ job.jobCategory }}」工作吗？</view>
+                                        <view class="recommend-card-tip">{{ job.tip }}</view>
+                                        <view class="recommend-card-line"></view>
+                                        <view class="recommend-card-controll">
+                                            <view class="controll-no" @click="clearfindJob(job)">不是</view>
+                                            <view class="controll-yes" @click="findJob(job)">是的</view>
+                                        </view>
+                                    </view>
+                                </view>
+                            </view>
+                        </template>
+                    </custom-waterfalls-flow>
+                    <loadmore ref="loadmoreRef"></loadmore>
+                </view>
+                <empty v-else pdTop="200"></empty>
             </scroll-view>
-            <view class="tab-op-right">
-                <uni-icons type="plusempty" style="margin-right: 10rpx" size="20" @click="editojobs"></uni-icons>
-                <view class="tab-recommend">
-                    <latestHotestStatus @confirm="handelHostestSearch"></latestHotestStatus>
-                </view>
-                <view class="tab-filter" @click="showFilter = true">
-                    <view class="tab-number" v-show="pageState.total">{{ formatTotal(pageState.total) }}</view>
-                    <image class="image" src="/static/icon/filter.png"></image>
-                </view>
-            </view>
         </view>
-        <!-- waterfalls -->
-        <scroll-view :scroll-y="true" class="falls-scroll" @scrolltolower="scrollBottom">
-            <view class="falls">
-                <custom-waterfalls-flow ref="waterfallsFlowRef" :value="list">
-                    <template v-slot:default="job">
-                        <view class="item" v-if="!job.recommend">
-                            <view class="falls-card" @click="nextDetail(job)">
-                                <view class="falls-card-title">{{ job.jobTitle }}</view>
-                                <view class="falls-card-pay">
-                                    <view class="pay-text">
-                                        <Salary-Expectation
-                                            :max-salary="job.maxSalary"
-                                            :min-salary="job.minSalary"
-                                            :is-month="true"
-                                        ></Salary-Expectation>
-                                    </view>
-                                    <image v-if="job.isHot" class="flame" src="/static/icon/flame.png"></image>
-                                </view>
-
-                                <view class="falls-card-education" 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="falls-card-company">{{ job.companyName }}</view>
-                                <view class="falls-card-company">
-                                    青岛
-                                    <dict-Label dictType="area" :value="job.jobLocationAreaCode"></dict-Label>
-                                </view>
-                                <view class="falls-card-pepleNumber">
-                                    <view>{{ job.postingDate || '发布日期' }}</view>
-                                    <view>{{ vacanciesTo(job.vacancies) }}</view>
-                                </view>
-                                <view class="falls-card-matchingrate">
-                                    <view class=""><matchingDegree :job="job"></matchingDegree></view>
-                                    <uni-icons type="star" size="30"></uni-icons>
-                                    <!-- <uni-icons type="star-filled" color="#FFCB47" size="30"></uni-icons> -->
-                                </view>
-                            </view>
-                        </view>
-                        <view class="item" v-else>
-                            <view class="recommend-card">
-                                <view class="card-content">
-                                    <view class="recommend-card-title">在找「{{ job.jobCategory }}」工作吗？</view>
-                                    <view class="recommend-card-tip">{{ job.tip }}</view>
-                                    <view class="recommend-card-controll">
-                                        <view class="controll-yes" @click="findJob(job)">是的</view>
-                                        <view class="controll-no">不是</view>
-                                    </view>
-                                </view>
-                            </view>
-                        </view>
-                    </template>
-                </custom-waterfalls-flow>
-                <loadmore ref="loadmoreRef"></loadmore>
-            </view>
-        </scroll-view>
-        <screeningJobRequirementsVue
-            v-model:show="showFilter"
-            @confirm="handleFilterConfirm"
-        ></screeningJobRequirementsVue>
-        <!-- 岗位推荐组件 -->
-        <modify-expected-position-vue v-model:show="showModel" :jobList="jobList" />
-        <!-- 自定义tabbar -->
-        <!-- <tabbar-custom :currentpage="0"></tabbar-custom> -->
+        <!-- 筛选 -->
+        <select-filter ref="selectFilterModel"></select-filter>
     </view>
 </template>
 
 <script setup>
-import { reactive, inject, watch, ref, onMounted, getCurrentInstance } from 'vue';
+import { reactive, inject, watch, ref, onMounted, watchEffect, nextTick } from 'vue';
 import img from '@/static/icon/filter.png';
 import dictLabel from '@/components/dict-Label/dict-Label.vue';
 const { $api, navTo, vacanciesTo, formatTotal } = inject('globalFunction');
@@ -136,16 +140,21 @@ import { storeToRefs } from 'pinia';
 import useUserStore from '@/stores/useUserStore';
 const { userInfo } = storeToRefs(useUserStore());
 import useDictStore from '@/stores/useDictStore';
-const { getTransformChildren } = useDictStore();
-import screeningJobRequirementsVue from '@/components/screening-job-requirements/screening-job-requirements.vue';
-import modifyExpectedPositionVue from '@/components/modifyExpectedPosition/modifyExpectedPosition.vue';
+const { getTransformChildren, oneDictData } = useDictStore();
+import useLocationStore from '@/stores/useLocationStore';
+import selectFilter from '@/components/selectFilter/selectFilter.vue';
 import { useRecommedIndexedDBStore, jobRecommender } from '@/stores/useRecommedIndexedDBStore.js';
+import { useScrollDirection } from '@/hook/useScrollDirection';
+import { useColumnCount } from '@/hook/useColumnCount';
+const { isScrollingDown, handleScroll } = useScrollDirection();
 const recommedIndexDb = useRecommedIndexedDBStore();
+
 const waterfallsFlowRef = ref(null);
 const loadmoreRef = ref(null);
+const conditionSearch = ref({});
+const waterfallcolumn = ref(2);
 const state = reactive({
     tabIndex: 'all',
-    search: '',
 });
 const list = ref([]);
 const pageState = reactive({
@@ -159,7 +168,13 @@ const pageState = reactive({
 });
 const inputText = ref('');
 const showFilter = ref(false);
+const selectFilterModel = ref(null);
 const showModel = ref(false);
+const rangeOptions = ref([
+    { value: 0, text: '推荐' },
+    { value: 1, text: '最热' },
+    { value: 2, text: '最新发布' },
+]);
 const jobList = ref([
     { name: '销售顾问', highlight: true },
     { name: '销售管理', highlight: true },
@@ -172,41 +187,18 @@ const jobList = ref([
     { name: '创意总监', highlight: false },
 ]);
 
-onLoad(() => {
+const { columnCount } = useColumnCount(() => {
+    pageState.pageSize = 10 * (columnCount.value - 1);
     getJobRecommend('refresh');
+    nextTick(() => {
+        waterfallsFlowRef.value?.refresh?.();
+        useLocationStore().getLocation();
+    });
 });
 
-function nextDetail(job) {
-    // 记录岗位类型，用作数据分析
-    if (job.jobCategory) {
-        const recordData = recommedIndexDb.JobParameter(job);
-        recommedIndexDb.addRecord(recordData);
-    }
-    navTo(`/packageA/pages/post/post?jobId=${btoa(job.jobId)}`);
-}
-
-function handleModelConfirm(val) {
-    console.log(val);
-}
-
-function findJob(item) {
-    console.log(item);
-}
-
-function handleFilterConfirm(val) {
-    pageState.search = {
-        order: pageState.search.order,
-    };
-    for (const [key, value] of Object.entries(val)) {
-        pageState.search[key] = value.join(',');
-    }
-    getJobList('refresh');
-}
-
-function handelHostestSearch(val) {
-    pageState.search.order = val.value;
-    getJobList('refresh');
-}
+// onLoad(() => {
+//     getJobRecommend('refresh');
+// });
 
 function scrollBottom() {
     loadmoreRef.value.change('loading');
@@ -217,16 +209,97 @@ function scrollBottom() {
     }
 }
 
-function editojobs() {
-    console.log('jobs');
-    showModel.value = true;
+function findJob(job) {
+    if (job.isBut) {
+        $api.msg('已确认');
+    } else {
+        list.value = list.value.map((item) => {
+            if (item.recommend && item.jobCategory === job.jobCategory) {
+                return {
+                    ...item,
+                    isBut: true,
+                };
+            }
+            return item;
+        });
+        const jobstr = job.jobCategory;
+        const jobsObj = {
+            地区: 'area',
+            岗位: 'jobTitle',
+            经验: 'experience',
+        };
+        const [name, value] = jobstr.split(':');
+        const nameAttr = jobsObj[name];
+        if (name === '岗位') {
+            conditionSearch.value[nameAttr] = value;
+        } else {
+            const valueAttr = oneDictData(nameAttr).filter((item) => item.label === value);
+            if (valueAttr.length) {
+                const val = valueAttr[0].value;
+                conditionSearch.value[nameAttr] = val;
+            }
+        }
+    }
+}
+
+function clearfindJob(job) {
+    if (job.isBut) {
+        $api.msg('已确认');
+    } else {
+        list.value = list.value.map((item) => {
+            if (item.recommend && item.jobCategory === job.jobCategory) {
+                return {
+                    ...item,
+                    isBut: true,
+                };
+            }
+            return item;
+        });
+        recommedIndexDb.deleteRecords(job);
+    }
+}
+
+function nextDetail(job) {
+    // 记录岗位类型，用作数据分析
+    if (job.jobCategory) {
+        const recordData = recommedIndexDb.JobParameter(job);
+        recommedIndexDb.addRecord(recordData);
+    }
+    navTo(`/packageA/pages/post/post?jobId=${btoa(job.jobId)}`);
+}
+
+function openFilter() {
+    showFilter.value = true;
+    selectFilterModel.value?.open({
+        title: '筛选',
+        maskClick: true,
+        success: (values) => {
+            pageState.search = {
+                ...pageState.search,
+            };
+            for (const [key, value] of Object.entries(values)) {
+                pageState.search[key] = value.join(',');
+            }
+            showFilter.value = false;
+            getJobList('refresh');
+        },
+        cancel: () => {
+            showFilter.value = false;
+        },
+    });
+}
+
+function handleFilterConfirm(e) {
+    console.log(e);
 }
 
 function choosePosition(index) {
     state.tabIndex = index;
     list.value = [];
     if (index === 'all') {
-        pageState.search = {};
+        pageState.search = {
+            order: pageState.search.order,
+        };
         inputText.value = '';
         getJobRecommend('refresh');
     } else {
@@ -237,18 +310,15 @@ function choosePosition(index) {
     }
 }
 
-function searchJobTitle() {
-    state.tabIndex = '-1';
-    pageState.search = {
-        jobTitle: inputText.value,
-    };
-    getJobList('refresh');
+function handelHostestSearch(val) {
+    pageState.search.order = val.value;
+    if (state.tabIndex === 'all') {
+        getJobRecommend('refresh');
+    } else {
+        getJobList('refresh');
+    }
 }
 
-function changeRecommend() {}
-
-function changeLatestHotestStatus(e) {}
-
 function getJobRecommend(type = 'add') {
     if (type === 'refresh') {
         list.value = [];
@@ -258,6 +328,7 @@ function getJobRecommend(type = 'add') {
         pageSize: pageState.pageSize,
         sessionId: useUserStore().seesionId,
         ...pageState.search,
+        ...conditionSearch.value,
     };
     let comd = { recommend: true, jobCategory: '', tip: '确认你的兴趣，为您推荐更多合适的岗位' };
     $api.createRequest('/app/job/recommend', params).then((resData) => {
@@ -277,6 +348,7 @@ function getJobRecommend(type = 'add') {
                     jobRecommender.updateConditions(conditionCounts);
 
                     const question = jobRecommender.getNextQuestion();
+
                     if (question) {
                         comd.jobCategory = question;
                         data.unshift(comd);
@@ -347,6 +419,228 @@ function dataToImg(data) {
 </script>
 
 <style lang="stylus" scoped>
+
+.app-container
+    width: 100%;
+    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;
+    background-color: #FFFFFF;
+    display: flex;
+    flex-direction: column
+    .hidden-animation
+        max-height: 1000px;
+        transition: all 0.3s ease;
+        overflow: hidden;
+    .hidden-height
+        max-height: 0;
+        padding-top: 0;
+        padding-bottom: 0;
+.container-search
+    padding: 16rpx 24rpx
+    display: flex
+    justify-content: space-between
+    .search-input
+        display: flex
+        align-items: center;
+        width: 100%
+        height: 80rpx;
+        line-height: 80rpx
+        margin-right: 24rpx
+        background: #FFFFFF;
+        border-radius: 75rpx 75rpx 75rpx 75rpx;
+        .iconsearch
+            padding-left: 36rpx
+        .inpute
+            margin-left: 20rpx
+            font-weight: 400;
+            font-size: 28rpx;
+            color: #B5B5B5;
+            width: 100%
+    .chart
+        width: 170rpx;
+        background: radial-gradient( 0% 56% at 87% 61%, rgba(255,255,255,0.82) 0%, rgba(255,255,255,0.47) 100%);
+        box-shadow: 0rpx 8rpx 40rpx 0rpx rgba(210,210,210,0.14);
+        border-radius: 80rpx 80rpx 80rpx 80rpx;
+        border: 2rpx solid #FFFFFF;
+        text-align: center
+        font-weight: 500;
+        font-size: 28rpx;
+        height: 36rpx;
+        color: #000000;
+        padding: 20rpx 30rpx
+.cards
+    padding: 10rpx 28rpx
+    display: grid
+    grid-gap: 38rpx;
+    grid-template-columns: 1fr 1fr;
+    .card
+        height: calc(158rpx - 40rpx);
+        padding: 22rpx 26rpx
+        box-shadow: 0rpx 8rpx 40rpx 0rpx rgba(210,210,210,0.14);
+        border-radius: 16rpx 16rpx 16rpx 16rpx;
+        border: 2rpx solid #FFFFFF;
+        .card-title
+            font-weight: 600;
+            font-size: 32rpx;
+            color: #000000;
+        .card-text
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #9E9E9E;
+            margin-top: 4rpx
+    .card:first-child
+        background: radial-gradient( 0% 56% at 87% 61%, rgba(255,255,255,0.82) 0%, rgba(255,255,255,0.47) 100%),
+            url('@/static/icon/fujin.png');
+        background-size: 100%, 100%
+    .card:last-child
+        background: radial-gradient( 0% 56% at 87% 61%, rgba(255,255,255,0.82) 0%, rgba(255,255,255,0.47) 100%),
+            url('@/static/icon/jinxuan.png');
+        background-size: 100%, 100%
+        background-size: cover;
+        background-position: center;
+
+.nav-filter
+    padding: 16rpx 28rpx 0 28rpx
+    .filter-top
+        display: flex
+        justify-content: space-between;
+        .tab-scroll
+            flex: 1;
+            overflow: hidden;
+            margin-right: 20rpx
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: clip;
+            -webkit-mask-image: linear-gradient(to right, black 60%, transparent);
+            mask-image: linear-gradient(to right, black 60%, transparent);
+            .jobs-left
+                display: flex
+                flex-wrap: nowrap
+                .job
+                    font-weight: 400;
+                    font-size: 36rpx;
+                    color: #666D7F;
+                    margin-right: 32rpx;
+                    white-space: nowrap
+                .active
+                    font-weight: 500;
+                    font-size: 36rpx;
+                    color: #000000;
+        .jobs-add
+            display: flex
+            align-items: center;
+            justify-content: center;
+            font-weight: 400;
+            font-size: 32rpx;
+            color: #666D7F;
+            line-height: 38rpx;
+    .filter-bottom
+        display: flex
+        justify-content: space-between
+        padding: 24rpx 0
+        .btm-left
+            display: flex
+            .filterbtm
+                font-weight: 400;
+                font-size: 32rpx;
+                color: #666D7F;
+                margin-right: 24rpx
+                padding: 0rpx 16rpx
+            .active
+                font-weight: 500;
+                font-size: 32rpx;
+                color: #256BFA;
+        .btm-right
+            font-weight: 400;
+            font-size: 32rpx;
+            color: #6C7282;
+            .right-sx
+                width: 26rpx;
+                height: 26rpx;
+            .active
+                transform: rotate(180deg)
+.table-list
+    background: #F4F4F4
+    flex: 1
+    overflow: hidden
+    .falls-scroll
+        width: 100%
+        height: 100%
+        .falls
+            padding: 28rpx 28rpx;
+            .item
+                position: relative;
+                // background: linear-gradient( 180deg, rgba(19, 197, 124, 0.4) 0%, rgba(255, 255, 255, 0) 30%), rgba(255, 255, 255, 0);
+                .falls-card
+                    padding: 30rpx;
+                    .falls-card-title
+                        color: #606060;
+                        line-height: 49rpx;
+                        text-align: left;
+                        word-break:break-all
+                        font-weight: 500;
+                        font-size: 32rpx;
+                        color: #333333;
+                    .falls-card-pay
+                        // height: 50rpx;
+                        word-break:break-all
+                        color: #002979;
+                        text-align: left;
+                        display: flex;
+                        align-items: end;
+                        position: relative
+                        .pay-text
+                            color: #4C6EFB;
+                            padding-right: 10rpx
+                            font-weight: 500;
+                            font-size: 28rpx;
+                            color: #4C6EFB;
+                            line-height: 45rpx;
+                            text-align: left;
+                        .flame
+                            position: absolute
+                            bottom: 0
+                            right: -10rpx
+                            transform: translate(0, -30%)
+                            width: 24rpx
+                            height: 31rpx
+                    .falls-card-education,.falls-card-experience
+                        width: fit-content;
+                        height: 30rpx;
+                        background: #F4F4F4;
+                        border-radius: 4rpx;
+                        padding: 6rpx 20rpx;
+                        line-height: 30rpx;
+                        font-weight: 400;
+                        font-size: 24rpx;
+                        color: #6C7282;
+                        text-align: center;
+                        margin-top: 14rpx;
+                        white-space: nowrap
+
+                    .falls-card-company,.falls-card-pepleNumber
+                        margin-top: 20rpx;
+                        font-size: 24rpx;
+                        color: #606060;
+                        line-height: 25rpx;
+                        text-align: left;
+                    .falls-card-pepleNumber
+                        display: flex;
+                        justify-content: space-between;
+                        align-items: center;
+                        margin-top: 38rpx;
+                        font-weight: 400;
+                        font-size: 28rpx;
+                        color: #6C7282;
+                    .falls-card-matchingrate
+                        margin-top: 10rpx;
+                        display: flex;
+                        justify-content: space-between;
+                        align-items: center;
+                        font-size: 21rpx;
+                        color: #4778EC;
+                        text-align: left;
 // 推荐卡片
 .recommend-card::before
     position: absolute
@@ -355,223 +649,81 @@ function dataToImg(data) {
     content: ''
     height: 60rpx
     width: 100%
-    background: linear-gradient(to bottom, #FFAD47, #FFFFFF)
-.recommend-card::after
-    position: absolute
-    right: -20rpx
-    top: 40rpx
-    content: ''
-    height: 100rpx
-    width: 200rpx
-    background: url('@/static/icon/Group1.png') center center no-repeat
-    background-size: 100rpx 140rpx
+    height: 8rpx;
+    background: linear-gradient( to left, #9E74FD 0%, #256BFA 100%);
+    box-shadow: 0rpx 8rpx 40rpx 0rpx rgba(0,54,170,0.15);
 .recommend-card
-    padding: 20rpx
+    padding: 24rpx
     .card-content
         position: relative;
         z-index: 2;
         .recommend-card-title
-            color: #333333
-            font-size: 32rpx
+            font-weight: 500;
+            font-size: 32rpx;
+            color: #333333;
         .recommend-card-tip
-            font-size: 24rpx;
-            color: #606060;
-            margin-top: 10rpx
+            font-weight: 400;
+            font-size: 28rpx;
+            color: #6C7282;
+            margin-top: 20rpx
+        .recommend-card-line
+            width: calc(100%);
+            height: 0rpx;
+            border-radius: 0rpx 0rpx 0rpx 0rpx;
+            border: 2rpx dashed rgba(0,0,0,0.14);
+            margin-top: 50rpx
+            position: relative
+        .recommend-card-line::before
+            position: absolute
+            content: ''
+            left: 0
+            top: 0
+            transform: translate(-50% - 90rpx, -50%)
+            width: 28rpx;
+            height: 28rpx;
+            background: #F4F4F4;
+            border-radius: 50%;
+        .recommend-card-line::after
+            position: absolute
+            content: ''
+            right: 0
+            top: 0
+            transform: translate(50% + 90rpx, -50%)
+            width: 28rpx;
+            height: 28rpx;
+            background: #F4F4F4;
+            border-radius: 50%;
         .recommend-card-controll
             display: flex
             align-items: center
-            justify-content: space-around
+            justify-content: space-between
             margin-top: 40rpx
+            padding: 0 6rpx;
             .controll-yes
-                border-radius:  39rpx
-                padding: 0rpx 30rpx
-                background: rgba(255, 173, 71, 1)
-                border: 2rpx solid rgba(255, 173, 71, 1)
-                color: #FFFFFF
+                width: 124rpx;
+                height: 70rpx;
+                background: rgba(37,107,250,0.1);
+                border-radius: 12rpx 12rpx 12rpx 12rpx;
+                text-align: center;
+                line-height:70rpx
+                color: #256BFA
             .controll-no
-                border-radius:  39rpx
-                border: 2rpx solid rgba(255, 173, 71, 1)
-                padding: 0rpx 30rpx
-                color: rgba(255, 173, 71, 1)
+                width: 124rpx;
+                height: 66rpx;
+                line-height: 66rpx
+                border-radius: 12rpx 12rpx 12rpx 12rpx;
+                border: 2rpx solid #DEDEDE;
+                font-weight: 400;
+                font-size: 28rpx;
+                color: #333333;
+                text-align: center;
             .controll-yes:active, .controll-no:active
+                width: 120rpx;
+                height: 66rpx;
+                line-height: 66rpx
                 background: #e8e8e8
                 border: 2rpx solid #e8e8e8
-
-.app-container
-    width: 100%;
-    height: calc(100vh - var(--window-top) - var(--status-bar-height) - var(--window-bottom));
-    background: linear-gradient( 180deg, #4778EC 0%, #002979 100%);
-    // background: linear-gradient(180deg, rgba(255,255,255,0.2) 0%, #fff 100%);
-    display: flex;
-    flex-direction: column;
-    position: fixed
-    .index-AI
-        height: 42rpx;
-        font-family: Inter, Inter;
-        font-weight: 400;
-        font-size: 35rpx;
-        color: #FFFFFF;
-        line-height: 41rpx;
-        padding: 85rpx 0 0 30rpx;
-    .index-option
-        margin-top: 27rpx;
-        display: flex;
-        .option-left
-            display: flex;
-            width: 427rpx;
-            height: 56rpx;
-            background: #4778EC;
-            border-radius: 0rpx 17rpx 17rpx 0rpx;
-            align-items: center;
-            .left-item
-                width: 117rpx;
-                text-align: center;
-                line-height: 47rpx;
-                height: 47rpx;
-                margin-right: 27rpx;
-                color: #FFFFFF;
-            .left-item:active
-                color: blue;
-        .option-right
-            flex: 1;
-            position: relative;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            padding: 0 49rpx;
-            .right-input
-                width: 100%;
-                height: 45rpx;
-                background: rgba(255,255,255,0.5);
-                border-radius: 17rpx 17rpx 17rpx 17rpx;
-                border: 3rpx solid #FFFFFF;
-                padding: 0 50rpx 0 10rpx;
-                color: #FFFFFF;
-            .iconsearch
-                position: absolute;
-                right: 60rpx;
-    .tab-options
-        margin-top: 10rpx;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        height: 77rpx;
-        background: #FFFFFF;
-        border-radius: 17rpx 17rpx 0rpx 0rpx;
-        padding: 0 24rpx;
-        overflow: hidden;
-        .tab-scroll
-            height: 77rpx;
-            line-height: 77rpx;
-            flex: 1;
-            overflow: hidden;
-            padding-right: 10rpx;
-            .tab-op-left
-                display: flex;
-                align-items: center;
-                flex-wrap: nowrap;
-                .tab-list
-                    text-align: center;
-                    white-space: nowrap;
-                    margin-right: 30rpx;
-                    font-size: 28rpx;
-                    color: #606060;
-        .tab-op-right
-            display: flex;
-            align-items: center;
-            .tab-recommend
-                white-space: nowrap;
-                width: fit-content;
-                padding: 0 10rpx;
-                height: 42rpx;
-                background: #4778EC;
-                border-radius: 17rpx 17rpx 0rpx 17rpx;
-                text-align: center;
-                color: #FFFFFF;
-                font-size: 21rpx;
-                line-height: 42rpx;
-                margin-right: 14rpx;
-            .tab-number
-                font-size: 21rpx;
-                color: #606060;
-                line-height: 25rpx;
-                text-align: center;
-            .tab-filter
-                display: flex;
-                .image
-                    width: 28rpx;
-                    height: 27rpx;
-    .falls-scroll
-        flex: 1;
-        overflow: hidden;
-        background: linear-gradient(180deg, rgba(255,255,255,0.2) 0%, #fff 100%)
-    .falls
-        padding: 20rpx 40rpx;
-        .item
-            position: relative;
-            // background: linear-gradient( 180deg, rgba(19, 197, 124, 0.4) 0%, rgba(255, 255, 255, 0) 30%), rgba(255, 255, 255, 0);
-            .falls-card
-                padding: 30rpx;
-                .falls-card-title
-                    // height: 49rpx;
-                    font-size: 42rpx;
-                    color: #606060;
-                    line-height: 49rpx;
-                    text-align: left;
-                    word-break:break-all
-                .falls-card-pay
-                    // height: 50rpx;
-                    word-break:break-all
-                    font-size: 34rpx;
-                    color: #002979;
-                    line-height: 50rpx;
-                    text-align: left;
-                    display: flex;
-                    align-items: end;
-                    position: relative
-                    .pay-text
-                        color: #002979;
-                        padding-right: 10rpx
-                    .flame
-                        position: absolute
-                        bottom: 0
-                        right: -10rpx
-                        transform: translate(0, -30%)
-                        width: 24rpx
-                        height: 31rpx
-                .falls-card-education,.falls-card-experience
-                    width: fit-content;
-                    height: 30rpx;
-                    background: #13C57C;
-                    border-radius: 17rpx 17rpx 17rpx 17rpx;
-                    padding: 0 10rpx;
-                    line-height: 30rpx;
-                    font-weight: 400;
-                    font-size: 21rpx;
-                    color: #FFFFFF;
-                    text-align: center;
-                    margin-top: 14rpx;
-                .falls-card-company,.falls-card-pepleNumber
-                    margin-top: 14rpx;
-                    font-size: 21rpx;
-                    color: #606060;
-                    line-height: 25rpx;
-                    text-align: left;
-                .falls-card-pepleNumber
-                    display: flex;
-                    justify-content: space-between;
-                    align-items: center;
-                .falls-card-matchingrate
-                    margin-top: 10rpx;
-                    display: flex;
-                    justify-content: space-between;
-                    align-items: center;
-                    font-size: 21rpx;
-                    color: #4778EC;
-                    text-align: left;
-.logo
-    width: 200rpx;
-    height: 200rpx;
-.tabchecked
-    color:  #4778EC !important
+.isBut{
+    filter: grayscale(100%);
+}
 </style>
diff --git a/pages/login/components/tabcontrol.vue b/pages/login/components/tabcontrol.vue
index 65ecf9b..227435a 100644
--- a/pages/login/components/tabcontrol.vue
+++ b/pages/login/components/tabcontrol.vue
@@ -21,6 +21,9 @@
                 <swiper-item @touchmove.stop="false">
                     <slot name="tab3"></slot>
                 </swiper-item>
+                <swiper-item @touchmove.stop="false">
+                    <slot name="tab3"></slot>
+                </swiper-item>
                 <swiper-item @touchmove.stop="false">
                     <slot name="tab4"></slot>
                 </swiper-item>
@@ -52,8 +55,9 @@ export default {
 
 <style lang="stylus" scoped>
 .tab-container
-    width: 100%
+    // flex: 1
     height: 100%
+    width: 100%
     display: flex
     align-items: center
     justify-content: center
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 1b9b411..ea4add3 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -1,239 +1,240 @@
 <template>
-    <view class="container">
-        <view :style="{ height: statusBarHeight + 'px' }"></view>
+    <AppLayout title="AI+就业服务程序">
         <tabcontrolVue :current="tabCurrent">
-            <!-- tab0 -->
             <template v-slot:tab0>
                 <view class="login-content">
                     <image class="logo" src="../../static/logo.png"></image>
                     <view class="logo-title">就业</view>
                 </view>
                 <view class="btns">
-                    <button class="wxlogin" @click="loginTest">登录</button>
-                    <!-- <button open-type="getUserInfo" @getuserinfo="getuserinfo" class="wxlogin">登录</button> -->
+                    <button class="wxlogin" @click="loginTest">内测登录</button>
                     <view class="wxaddress">青岛市公共就业和人才服务中心</view>
                 </view>
             </template>
-            <!-- tab1 -->
             <template v-slot:tab1>
-                <view class="tabtwo">
-                    <view class="tabtwo-top">
-                        <view class="color_FFFFFF fs_30">选择您的性别1/6</view>
-                        <view class="color_D9D9D9">个人信息仅用于推送优质内容</view>
-                    </view>
-                    <view class="fl_box fl_justmiddle fl_1 fl_alstart">
-                        <view class="tabtwo-sex" @click="changeSex(1)">
-                            <image class="sex-img" src="../../static/icon/woman.png"></image>
-                            <view class="mar_top5">女</view>
-                            <view v-if="fromValue.sex === 1" class="dot doted"></view>
-                            <view v-else class="dot"></view>
+                <view class="content-one">
+                    <view>
+                        <view class="content-title">
+                            <view class="title-lf">
+                                <view class="lf-h1">请您完善求职名片</view>
+                                <view class="lf-text">个人信息仅用于推送优质内容</view>
+                            </view>
+                            <view class="title-ri">
+                                <text style="color: #256bfa">1</text>
+                                <text>/2</text>
+                            </view>
                         </view>
-                        <view class="tabtwo-sex" @click="changeSex(0)">
-                            <image class="sex-img" src="../../static/icon/man.png"></image>
-                            <view class="mar_top5">男</view>
-                            <view v-if="fromValue.sex === 0" class="dot doted"></view>
-                            <view v-else class="dot"></view>
+                        <view class="content-input" @click="changeExperience">
+                            <view class="input-titile">工作经验</view>
+                            <input
+                                class="input-con"
+                                v-model="state.experienceText"
+                                disabled
+                                placeholder="请选择您的工作经验"
+                            />
+                        </view>
+                        <view class="content-sex">
+                            <view class="sex-titile">求职区域</view>
+                            <view class="sext-ri">
+                                <view
+                                    class="sext-box"
+                                    :class="{ 'sext-boxactive': fromValue.sex === 0 }"
+                                    @click="changeSex(0)"
+                                >
+                                    男
+                                </view>
+                                <view
+                                    class="sext-box"
+                                    :class="{ 'sext-boxactive': fromValue.sex === 1 }"
+                                    @click="changeSex(1)"
+                                >
+                                    女
+                                </view>
+                            </view>
+                        </view>
+                        <view class="content-input" @click="changeEducation">
+                            <view class="input-titile">学历</view>
+                            <input class="input-con" v-model="state.educationText" disabled placeholder="本科" />
                         </view>
                     </view>
-                    <view class="nextstep" @tap="nextStep">下一步</view>
+                    <view class="next-btn" @tap="nextStep">下一步</view>
                 </view>
             </template>
-            <!-- tab2 -->
             <template v-slot:tab2>
-                <view class="tabtwo">
-                    <view class="tabtwo-top">
-                        <view class="color_FFFFFF fs_30">选择您的年龄断段2/6</view>
-                        <view class="color_D9D9D9">个人信息仅用于推送优质内容</view>
-                    </view>
-                    <view class="fl_box fl_deri fl_almiddle">
-                        <!-- <view class="agebtn agebtned">30岁以下</view> -->
-                        <view
-                            class="agebtn"
-                            :class="{ agebtned: item.value === fromValue.age }"
-                            v-for="item in state.ageList"
-                            :key="item.value"
-                            @click="changeAge(item.value)"
-                        >
-                            {{ item.label }}
+                <view class="content-one">
+                    <view>
+                        <view class="content-title">
+                            <view class="title-lf">
+                                <view class="lf-h1">请您完善求职名片</view>
+                                <view class="lf-text">个人信息仅用于推送优质内容</view>
+                            </view>
+                            <view class="title-ri">
+                                <text style="color: #256bfa">2</text>
+                                <text>/2</text>
+                            </view>
+                        </view>
+                        <view class="content-input" @click="changeArea">
+                            <view class="input-titile">求职区域</view>
+                            <input
+                                class="input-con"
+                                v-model="state.areaText"
+                                disabled
+                                placeholder="请选择您的求职区域"
+                            />
+                        </view>
+                        <view class="content-input" @click="changeJobs">
+                            <view class="input-titile">求职岗位</view>
+                            <input
+                                class="input-con"
+                                disabled
+                                v-if="!state.jobsText.length"
+                                placeholder="请选择您的求职岗位"
+                            />
+                            <view class="input-nx" @click="changeJobs" v-else>
+                                <view class="nx-item" v-for="item in state.jobsText">{{ item }}</view>
+                            </view>
+                        </view>
+                        <view class="content-input" @click="changeSalay">
+                            <view class="input-titile">期望薪资</view>
+                            <input
+                                class="input-con"
+                                v-model="state.salayText"
+                                disabled
+                                placeholder="请选择您的期望薪资"
+                            />
                         </view>
                     </view>
-                    <view class="fl_box fl_justmiddle"></view>
-                    <view class="nextstep" @tap="nextStep">下一步</view>
-                </view>
-            </template>
-            <!-- tab3 -->
-            <template v-slot:tab3>
-                <view class="tabtwo">
-                    <view class="tabtwo-top">
-                        <view class="color_FFFFFF fs_30">选择您的学历3/6</view>
-                        <view class="color_D9D9D9">个人信息仅用于推送优质内容</view>
-                    </view>
-                    <view class="eduction-content">
-                        <view
-                            class="eductionbtn"
-                            :class="{ eductionbtned: item.value === fromValue.education }"
-                            v-for="item in oneDictData('education')"
-                            @click="changeEducation(item.value)"
-                            :key="item.value"
-                        >
-                            {{ item.label }}
-                        </view>
-                    </view>
-                    <view class="nextstep" @tap="nextStep">下一步</view>
-                </view>
-            </template>
-            <!-- tab4 -->
-            <template v-slot:tab4>
-                <view class="tabtwo">
-                    <view class="tabtwo-top">
-                        <view class="color_FFFFFF fs_30">您期望的薪资范围4/6</view>
-                        <view class="color_D9D9D9">个人信息仅用于推送优质内容</view>
-                    </view>
-                    <view class="salary">
-                        <picker-view
-                            indicator-style="height: 140rpx;"
-                            :value="state.salayData"
-                            @change="bindChange"
-                            class="picker-view"
-                        >
-                            <picker-view-column>
-                                <view class="item" v-for="(item, index) in state.lfsalay" :key="index">
-                                    <view class="item-child" :class="{ 'item-childed': state.salayData[0] === index }">
-                                        {{ item }}k
-                                    </view>
-                                </view>
-                            </picker-view-column>
-                            <view class="item-center">至</view>
-                            <picker-view-column>
-                                <view class="item" v-for="(item, index) in state.risalay" :key="index">
-                                    <view class="item-child" :class="{ 'item-childed': state.salayData[2] === index }">
-                                        {{ item }}k
-                                    </view>
-                                </view>
-                            </picker-view-column>
-                        </picker-view>
-                    </view>
-                    <view class="fl_box fl_justmiddle"></view>
-                    <view class="nextstep" @tap="nextStep">下一步</view>
-                </view>
-            </template>
-            <!-- tab5 -->
-            <template v-slot:tab5>
-                <view class="tabtwo">
-                    <view class="tabtwo-top">
-                        <view class="color_FFFFFF fs_30">您期望的求职区域5/6</view>
-                        <view class="color_D9D9D9">个人信息仅用于推送优质内容</view>
-                    </view>
-                    <view class="eduction-content">
-                        <!-- <view class="eductionbtn eductionbtned">市南区</view> -->
-                        <view
-                            class="eductionbtn"
-                            :class="{ eductionbtned: item.value === fromValue.area }"
-                            v-for="item in oneDictData('area')"
-                            :key="item.value"
-                            @click="changeArea(item.value)"
-                        >
-                            {{ item.label }}
-                        </view>
-                        <!-- <view class="eductionbtn">不限区域</view> -->
-                    </view>
-                    <view class="nextstep" @tap="nextStep">下一步</view>
-                </view>
-            </template>
-            <!-- tab6 -->
-            <template v-slot:tab6>
-                <view class="tabtwo sex-two">
-                    <view class="tabtwo-top mar_top25 mar_le25">
-                        <view class="color_FFFFFF fs_30">您的期望岗位6/6</view>
-                        <view class="color_D9D9D9">个人信息仅用于推送优质内容</view>
-                    </view>
-                    <view class="sex-content fl_1">
-                        <expected-station @onChange="changeJobTitleId" :station="state.station"></expected-station>
-                    </view>
-                    <button class="nextstep confirmStep" @click="complete">完成</button>
-                    <!-- <navigator url="/pages/index/index" open-type="reLaunch" hover-class="other-navigator-hover">
-                        <button class="nextstep confirmStep" @click="complete">完成</button>
-                    </navigator> -->
+                    <view class="next-btn" @tap="complete">开启求职之旅</view>
                 </view>
             </template>
         </tabcontrolVue>
-    </view>
+        <SelectJobs ref="selectJobsModel"></SelectJobs>
+    </AppLayout>
 </template>
 
 <script setup>
 import tabcontrolVue from './components/tabcontrol.vue';
-import { reactive, inject, watch, ref } from 'vue';
+import SelectJobs from '@/components/selectJobs/selectJobs.vue';
+import { reactive, inject, watch, ref, onMounted } from 'vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
 import useUserStore from '@/stores/useUserStore';
 import useDictStore from '@/stores/useDictStore';
-const { statusBarHeight } = inject('deviceInfo');
 const { $api, navTo } = inject('globalFunction');
 const { loginSetToken, getUserResume } = useUserStore();
 const { getDictSelectOption, oneDictData } = useDictStore();
+const openSelectPopup = inject('openSelectPopup');
 // status
+const selectJobsModel = ref();
 const tabCurrent = ref(0);
 const salay = [2, 5, 10, 15, 20, 25, 30, 50, 80, 100];
 const state = reactive({
     station: [],
     stationCateLog: 1,
-    ageList: [],
     lfsalay: [2, 5, 10, 15, 20, 25, 30, 50],
     risalay: JSON.parse(JSON.stringify(salay)),
-    salayData: [0, 0, 0],
+    areaText: '',
+    educationText: '',
+    experienceText: '',
+    salayText: '',
+    jobsText: [],
 });
 const fromValue = reactive({
     sex: 1,
-    age: '0',
     education: '4',
     salaryMin: 2000,
     salaryMax: 2000,
     area: 0,
     jobTitleId: '',
+    experience: '1',
 });
 
 onLoad((parmas) => {
-    getDictSelectOption('age').then((data) => {
-        state.ageList = data;
-    });
     getTreeselect();
 });
 
-// 选择薪资
-function bindChange(val) {
-    state.salayData = val.detail.value;
-    const copyri = JSON.parse(JSON.stringify(salay));
-    const [lf, _, ri] = val.detail.value;
-    state.risalay = copyri.slice(lf, copyri.length);
-    fromValue.salaryMin = copyri[lf] * 1000;
-    fromValue.salaryMax = state.risalay[ri] * 1000;
-}
+onMounted(() => {});
+
 function changeSex(sex) {
     fromValue.sex = sex;
 }
-function changeAge(age) {
-    fromValue.age = age;
+function changeExperience() {
+    openSelectPopup({
+        title: '工作经验',
+        maskClick: true,
+        data: [oneDictData('experience')],
+        success: (_, [value]) => {
+            fromValue.experience = value.value;
+            state.experienceText = value.label;
+        },
+        change(_, [value]) {
+            // this.setColunm(1, [123, 123]);
+            console.log(this);
+        },
+    });
 }
-function changeEducation(education) {
-    fromValue.education = education;
+
+function changeEducation() {
+    openSelectPopup({
+        title: '学历',
+        maskClick: true,
+        data: [oneDictData('education')],
+        success: (_, [value]) => {
+            fromValue.area = value.value;
+            state.educationText = value.label;
+        },
+    });
 }
-function changeArea(area) {
-    fromValue.area = area;
+
+function changeArea() {
+    openSelectPopup({
+        title: '区域',
+        maskClick: true,
+        data: [oneDictData('area')],
+        success: (_, [value]) => {
+            fromValue.area = value.value;
+            state.areaText = '青岛市-' + value.label;
+        },
+    });
 }
-function changeJobTitleId(jobTitleId) {
-    fromValue.jobTitleId = jobTitleId;
+
+function changeSalay() {
+    let leftIndex = 0;
+    openSelectPopup({
+        title: '薪资',
+        maskClick: true,
+        data: [state.lfsalay, state.risalay],
+        unit: 'k',
+        success: (_, [min, max]) => {
+            fromValue.salaryMin = min.value * 1000;
+            fromValue.salaryMax = max.value * 1000;
+            state.salayText = `${fromValue.salaryMin}-${fromValue.salaryMax}`;
+        },
+        change(e) {
+            const salayData = e.detail.value;
+            if (leftIndex !== salayData[0]) {
+                const copyri = JSON.parse(JSON.stringify(salay));
+                const [lf, ri] = e.detail.value;
+                const risalay = copyri.slice(lf, copyri.length);
+                this.setColunm(1, risalay);
+                leftIndex = salayData[0];
+            }
+        },
+    });
 }
-// 行为
-// function changeStationLog(item) {
-//     state.stationCateLog = item.value;
-// }
+
+function changeJobs() {
+    selectJobsModel.value?.open({
+        title: '添加岗位',
+        success: (ids, labels) => {
+            fromValue.jobTitleId = ids;
+            state.jobsText = labels.split(',');
+        },
+    });
+}
+
 function nextStep() {
     tabCurrent.value += 1;
 }
-// function handleScroll(event) {
-//     console.log('滚动条滚动', event.detail.scrollTop);
-//     console.log(Math.round(event.detail.scrollTop / 75));
-//     // this.activeIndex = Math.round(event.detail.scrollTop / 75);
-// }
 
 // 获取职位
 function getTreeselect() {
@@ -276,12 +277,55 @@ function complete() {
 </script>
 
 <style lang="stylus" scoped>
-
+.input-nx
+    position: relative
+    border-bottom: 2rpx solid #EBEBEB
+    padding-bottom: 30rpx
+    display: flex
+    flex-wrap: wrap
+    .nx-item
+        padding: 20rpx 28rpx
+        width: fit-content
+        border-radius: 12rpx 12rpx 12rpx 12rpx;
+        border: 2rpx solid #E8EAEE;
+        margin-right: 24rpx
+        margin-top: 24rpx
+.nx-item::before
+    position: absolute;
+    right: 20rpx;
+    top: 60rpx;
+    content: '';
+    width: 4rpx;
+    height: 18rpx;
+    border-radius: 2rpx
+    background: #697279;
+    transform: translate(0, -50%) rotate(-45deg) ;
+.nx-item::after
+    position: absolute;
+    right: 20rpx;
+    top: 61rpx;
+    content: '';
+    width: 4rpx;
+    height: 18rpx;
+    border-radius: 2rpx
+    background: #697279;
+    transform: rotate(45deg)
 .container
-    background: linear-gradient(#4778EC, #002979);
+    // background: linear-gradient(#4778EC, #002979);
     width: 100%;
     height: calc(100vh - var(--window-top) - var(--status-bar-height) - var(--window-bottom));
     position: fixed;
+    background: url('@/static/icon/background2.png') 0 0 no-repeat;
+    background-size: 100% 728rpx;
+    display: flex;
+    flex-direction: column
+    .container-hader
+        height: 88rpx;
+        text-align: center;
+        line-height: 88rpx;
+        color: #000000;
+        font-weight: bold
+        font-size: 32rpx
 
 .login-content
     position: absolute;
@@ -296,7 +340,7 @@ function complete() {
         height: 182rpx;
     .logo-title
         font-size: 88rpx;
-        color: #FFFFFF;
+        color: #22c984;
         width: 180rpx;
 .btns
     position: absolute;
@@ -316,179 +360,97 @@ function complete() {
         color: #BBBBBB;
         margin-top: 70rpx;
         text-align: center;
-//  2
-.tabtwo
-    padding: 40rpx;
+.content-one
+    padding: 60rpx 28rpx;
     display: flex;
     flex-direction: column;
-    align-items: center;
-    justify-content: space-between;
-    height: calc(100% - 40rpx);
-.tabtwo-top
-    margin: 222rpx  0 0 0;
-    width: 100%;
-.tabtwo-sex
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    color: #FFFFFF;
-    font-size: 40rpx;
-    margin: 200rpx 60rpx 0 60rpx;
-    .sex-img
-        width: 184rpx;
-        height: 184rpx;
-.dot
-    width: 68rpx;
-    height: 68rpx;
-    border-radius: 50%;
-    background: #d1d1d6;
-    position: relative;
-.dot:before
-    content: '';
-    width: 44rpx;
-    height: 44rpx;
-    position: absolute;
-    left: 50%;
-    top: 50%;
-    transform: translate(-50%, -50%);
-    border-radius: 50%;
-    background: #1e4baa;
-.doted
-    background: #13C57C;
-.doted:after{
-    content: '';
-    width: 34rpx;
-    height: 34rpx;
-    position: absolute;
-    left: 50%;
-    top: 50%;
-    transform: translate(-50%, -50%);
-    border-radius: 50%
-    background: #13C57C;
-}
-.agebtn
-    width: 630rpx;
-    height: 108rpx;
-    border-radius: 20rpx;
-    background: #d9d9d9;
-    text-align: center;
-    line-height: 108rpx;
-    font-size: 40rpx;
-    margin-top: 50rpx;
-    color: #606060;
-.agebtned
-    background: #13C57C;
-    color: #FFFFFF;
-.nextstep
-    width: 630rpx;
-    height: 98rpx;
-    border-radius: 20rpx;
-    background: #13C57C;
-    text-align: center;
-    line-height: 98rpx;
-    font-size: 36rpx;
-    color: #FFFFFF;
-    margin-bottom: 150rpx;
-.confirmStep
-    margin-bottom: 50rpx;
-.eduction-content
-    width: fit-content;
-    display: grid;
-    grid-template-columns: 300rpx 300rpx;
-    grid-gap: 20rpx;
-    margin-top: 50rpx;
-    .eductionbtn
-        width: 300rpx;
-        height: 108rpx;
-        border-radius: 20rpx;
-        background: #d9d9d9;
-        text-align: center;
-        line-height: 108rpx;
-        font-size: 36rpx;
-        color: #606060;
-    .eductionbtned
-        background: #13C57C;
-        color: #FFFFFF;
-.salary
-    width: fit-content;
-    display: grid;
-    grid-template-columns: 640rpx;
-    grid-gap: 20rpx;
-    margin-top: 50rpx;
-    .picker-view {
+    justify-content: space-between
+    height: calc(100% - 120rpx)
+    .content-title
+        display: flex
+        justify-content: space-between;
+        align-items: center
+        margin-bottom: 70rpx
+        .title-lf
+            font-size: 44rpx;
+            color: #000000;
+            font-weight: 600;
+            .lf-text
+                font-weight: 400;
+                font-size: 28rpx;
+                color: #6C7282;
+        .title-ri
+            font-size: 36rpx;
+            color: #000000;
+            font-weight: 600;
+    .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;
+        .input-con::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) ;
+        .input-con::after
+            position: absolute;
+            right: 20rpx;
+            top: 50%;
+            content: '';
+            width: 4rpx;
+            height: 18rpx;
+            border-radius: 2rpx
+            background: #697279;
+            transform: rotate(45deg)
+    .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: 600rpx;
-        margin-top: 20rpx;
-        .uni-picker-view-mask{
-            background: rgba(0,0,0,0);
-        }
-    }
-    .item {
-        .item-child{
-            line-height: 90rpx;
-            font-size: 38rpx;
-            color: #606060;
-            text-align: center;
-            background: #D9D9D9;
-            border-radius: 20rpx;
-            margin: 20rpx 10rpx 20rpx 10rpx;
-        }
-        .item-childed{
-             line-height: 105rpx;
-            margin: 10rpx 5rpx 10rpx 5rpx;
-            background: #13C57C;
-            color: #FFFFFF;
-        }
-    }
-    .item-center{
-        width: 40rpx;
-        line-height: 600rpx;
-        width: 51rpx;
-        height: 47rpx;
-        font-family: Inter, Inter;
-        font-weight: 400;
-        font-size: 28rpx;
+        height: 90rpx;
+        background: #256BFA;
+        border-radius: 12rpx 12rpx 12rpx 12rpx;
+        font-weight: 500;
+        font-size: 32rpx;
         color: #FFFFFF;
         text-align: center;
-        font-style: normal;
-        text-transform: none;
-    }
-    .uni-picker-view-indicator:after{
-        border: 0
-    }
-    .uni-picker-view-indicator:before{
-        border: 0
-    }
-    .center-text
-        color: #FFFFFF;
-        text-align: center;
-        line-height: 400rpx;
-    .salary-content
-        width: 300rpx;
-        height: 380rpx;
-        .salary-content-item
-            height: 104rpx;
-            line-height: 104rpx;
-            margin: 20rpx 10rpx 20rpx 10rpx;
-            border-radius: 20rpx;
-            background: #d9d9d9;
-            text-align: center;
-            font-size: 38rpx;
-        .salary-content-item-selected
-            margin: 10rpx 5rpx 10rpx 5rpx;
-            background: #13C57C;
-            color: #FFFFFF;
-.sex-two
-    padding-left: 0;
-    padding-right: 0;
-    background: #4678ec;
-.sex-content
-    border-radius: 20rpx;
-    width: 100%;
-    margin-top: 20rpx;
-    margin-bottom: 40rpx;
-    display: flex;
-    overflow: hidden;
-    height: 100%
+        line-height: 90rpx
 </style>
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index 2dc5aa5..8dc7b14 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -1,9 +1,8 @@
 <template>
-    <view class="app-container">
-        <view class="mine-AI">AI+就业服务程序</view>
-        <view class="mine-userinfo">
+    <AppLayout title="我的" back-gorund-color="#F4F4F4">
+        <view class="mine-userinfo btn-feel" @click="navTo('/packageA/pages/myResume/myResume')">
             <view class="userindo-head">
-                <image class="userindo-head-img" v-if="userInfo.age === '0'" src="/static/icon/boy.png"></image>
+                <image class="userindo-head-img" v-if="userInfo.sex === '0'" src="/static/icon/boy.png"></image>
                 <image class="userindo-head-img" v-else src="/static/icon/girl.png"></image>
             </view>
             <view class="userinfo-ls">
@@ -14,46 +13,90 @@
                 <view class="userinfo-ls-resume" v-else>简历完成度 {{ Completion }}</view>
             </view>
         </view>
-        <view class="mine-tab">
-            <view class="tab-item" @click="navTo('/packageA/pages/myResume/myResume')">
-                <image class="item-img" src="/static/icon/resume.png"></image>
-                <view class="item-text">我的简历</view>
+        <view class="mini-number">
+            <view class="numbe-item button-click" @click="navTo('/packageA/pages/Intendedposition/Intendedposition')">
+                <view class="mini-num">{{ counts.applyCount }}</view>
+                <view class="mini-text">投递</view>
             </view>
-            <view class="tab-item" @click="navTo('/packageA/pages/collection/collection')">
-                <image class="item-img" src="/static/icon/collect.png"></image>
-                <view class="item-text">我的收藏</view>
+            <view class="numbe-item button-click" @click="navTo('/packageA/pages/collection/collection')">
+                <view class="mini-num">{{ counts.collectionCount }}</view>
+                <view class="mini-text">收藏</view>
             </view>
-            <view class="tab-item" @click="navTo('/packageA/pages/browseJob/browseJob')">
-                <image class="item-img" src="/static/icon/browse.png"></image>
-                <view class="item-text">我的浏览</view>
+            <view class="numbe-item button-click" @click="navTo('/packageA/pages/browseJob/browseJob')">
+                <view class="mini-num">{{ counts.jobReviewCount }}</view>
+                <view class="mini-text">足迹</view>
             </view>
-            <view class="tab-item" @click="navTo('/packageA/pages/Intendedposition/Intendedposition')">
-                <image class="item-img" src="/static/icon/quaters.png"></image>
-                <view class="item-text">意向岗位</view>
+            <view class="numbe-item button-click" @click="navTo('/packageA/pages/reservation/reservation')">
+                <view class="mini-num">{{ counts.fairCollecitonCount }}</view>
+                <view class="mini-text">预约</view>
             </view>
         </view>
-        <view class="mine-options">
-            <view class="mine-options-item">实名认证</view>
-            <view class="mine-options-item">素质测评</view>
-            <view class="mine-options-item">AI面试</view>
-            <!-- <view class="mine-options-item">账号与安全</view> -->
-            <view class="mine-options-item">通知与提醒</view>
-            <view class="mine-logout" @click="logOut">退出登录</view>
+        <view class="mini-cards">
+            <view class="card-top btn-feel">
+                <view class="top-title line_1">
+                    <text>{{ userInfo.name || '暂无用户名' }}</text>
+                    &nbsp;|&nbsp;
+                    <dict-Label dictType="education" :value="userInfo.education"></dict-Label>
+                </view>
+                <view class="top-subTitle line_1">
+                    <text v-for="(item, index) in userInfo.jobTitle" :key="index">
+                        &nbsp;{{ item }}&nbsp;
+                        <text v-if="userInfo.jobTitle.length - 1 !== index">|</text>
+                    </text>
+                </view>
+                <view class="top-btn button-click" @click="navTo('/packageA/pages/personalInfo/personalInfo')">
+                    修改简历
+                </view>
+            </view>
+            <view class="card-main">
+                <view class="main-title">服务专区</view>
+                <view class="main-row btn-feel">
+                    <view class="row-left">
+                        <image class="left-img" src="@/static/icon/server1.png"></image>
+                        <text class="left-text">实名认证</text>
+                    </view>
+                    <view class="row-right">已认证</view>
+                </view>
+                <view class="main-row btn-feel">
+                    <view class="row-left">
+                        <image class="left-img" src="@/static/icon/server2.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">
+                    <view class="row-left">
+                        <image class="left-img" src="@/static/icon/server3.png"></image>
+                        <text class="left-text">AI面试</text>
+                    </view>
+                    <view class="row-right">
+                        <uni-icons color="#909090" type="right" size="14"></uni-icons>
+                    </view>
+                </view>
+                <view class="main-row btn-feel">
+                    <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>
+            </view>
+            <view class="card-back button-click" @click="logOut">退出登录</view>
+            <uni-popup ref="popup" type="dialog">
+                <uni-popup-dialog
+                    mode="base"
+                    title="确定退出登录吗？"
+                    type="info"
+                    :duration="2000"
+                    :before-close="true"
+                    @confirm="confirm"
+                    @close="close"
+                ></uni-popup-dialog>
+            </uni-popup>
         </view>
-        <uni-popup ref="popup" type="dialog">
-            <uni-popup-dialog
-                mode="base"
-                title="确定退出登录吗？"
-                type="info"
-                :duration="2000"
-                :before-close="true"
-                @confirm="confirm"
-                @close="close"
-            ></uni-popup-dialog>
-        </uni-popup>
-        <!-- 自定义tabbar -->
-        <!-- <tabbar-custom :currentpage="4"></tabbar-custom> -->
-    </view>
+    </AppLayout>
 </template>
 
 <script setup>
@@ -64,10 +107,13 @@ const { $api, navTo } = inject('globalFunction');
 import useUserStore from '@/stores/useUserStore';
 const popup = ref(null);
 const { userInfo, Completion } = storeToRefs(useUserStore());
-
+const counts = ref({});
 function logOut() {
     popup.value.open();
 }
+onShow(() => {
+    getUserstatistics();
+});
 
 function close() {
     popup.value.close();
@@ -78,120 +124,180 @@ function confirm() {
 }
 
 const isAbove90 = (percent) => parseFloat(percent) < 90;
+
+function getUserstatistics() {
+    $api.createRequest('/app/user/statistics').then((resData) => {
+        console.log(resData);
+        counts.value = resData.data;
+    });
+}
 </script>
 
 <style lang="stylus" scoped>
-.app-container
-    width: 100%;
-    min-height: calc(100vh - var(--window-top) - var(--status-bar-height) - var(--window-bottom));
-    background: linear-gradient( 180deg, #4778EC 0%, #002979 100%);
+
+.card-top {
+  transition: transform 0.3s ease;
+  transform-style: preserve-3d;
+}
+
+.card-top.tilt {
+  transform: perspective(600px) rotateY(8deg) rotateX(4deg);
+}
+.mini-cards{
+    padding: 28rpx
+    .card-top{
+        background-image: url('@/static/icon/backAI2.png'), linear-gradient(to left, #9E74FD 0%, #256BFA 63%, #4180FF 100%);
+        background-repeat: no-repeat, no-repeat;
+        background-position: right top, center;
+        background-size: 396rpx 212rpx, cover;
+        padding: 36rpx 36rpx 64rpx 36rpx
+        border-radius: 20rpx 20rpx 0rpx 0rpx;
+        position: relative
+        .top-title{
+            font-weight: 500;
+            font-size: 32rpx;
+            color: #FFFFFF;
+            width: 452rpx;
+        }
+        .top-subTitle{
+            margin-top: 8rpx;
+            font-weight: 500;
+            font-size: 32rpx;
+            color: #FFFFFF;
+            width: 400rpx;
+        }
+        .top-btn{
+            width: 164rpx;
+            height: 64rpx;
+            background: radial-gradient( 0% 24% at 57% 42%, rgba(255,255,255,0) 0%, rgba(255,255,255,0.27) 100%);
+            box-shadow: 0rpx 8rpx 40rpx 0rpx rgba(210,210,210,0.14);
+            border-radius: 80rpx 80rpx 80rpx 80rpx;
+            border: 2rpx solid #D2D2D2;
+            text-align: center
+            line-height: 64rpx
+            font-weight: 500;
+            font-size: 28rpx;
+            color: #FFFFFF;
+            position: absolute
+            right: 44rpx
+            top: 50rpx
+        }
+    }
+    .card-main{
+        background: #FFFFFF;
+        border-radius: 20rpx 20rpx 20rpx 20rpx;
+        position: relative;
+        top: -28rpx
+        padding: 26rpx 60rpx 0 32rpx
+        .main-title{
+            font-weight: 600;
+            font-size: 32rpx;
+            color: #000000;
+        }
+        .main-row{
+            display: flex
+            align-items: center
+            justify-content: space-between
+            .row-left{
+                display: flex
+                align-items: center
+                .left-img{
+                    width: 44rpx;
+                    height: 44rpx;
+                    margin: 32rpx 16rpx 32rpx 10rpx
+                }
+                .left-text{
+                    font-weight: 500;
+                    font-size: 28rpx;
+                    color: #333333;
+                }
+            }
+            .row-right{
+                color: #6E6E6E;
+                font-size: 28rpx;
+            }
+        }
+        .main-row:last-child{
+            margin: 0
+        }
+    }
+    .card-back{
+        height: 96rpx;
+        background: #FFFFFF;
+        border-radius: 20rpx 20rpx 20rpx 20rpx;
+        text-align: center;
+        line-height: 96rpx
+        font-size: 28rpx;
+        color: #256BFA;
+    }
+}
+.mini-number{
+    padding: 24rpx
+    display: flex
+    justify-content: space-around
+    .numbe-item{
+        display: flex
+        flex-direction: column
+        justify-content: center
+        align-items: center
+        .mini-num{
+            font-weight: 500;
+            font-size: 44rpx;
+            color: #333333;
+        }
+        .mini-text{
+            font-weight: 400;
+            font-size: 28rpx;
+            color: #6C7282;
+        }
+    }
+}
+.mine-userinfo
     display: flex;
-    flex-direction: column;
-    .mine-AI
-        height: 42rpx;
-        font-family: Inter, Inter;
-        font-weight: 400;
-        font-size: 35rpx;
-        color: #FFFFFF;
-        line-height: 41rpx;
-        padding: 85rpx 0 0 30rpx;
-    .mine-userinfo
-        display: flex;
-        justify-content: flex-start;
-        align-items: center;
-        padding: 64rpx;
-        .userindo-head
-            width: 101rpx;
-            height: 101rpx;
-            background: #D9D9D9;
-            border-radius: 50%
-            overflow: hidden
-            margin-right: 40rpx;
-            .userindo-head-img
-                width: 100%;
-                height: 100%;
-        .userinfo-ls
-            display: flex;
-            flex-direction: column;
-            align-items: flex-start;
-            .userinfo-ls-name
-                font-size: 42rpx;
-                color: #FFFFFF;
-            .userinfo-ls-resume
-                font-size: 21rpx;
-                color: #D9D9D9;
-    .mine-tab
-        margin: 0 30rpx;
-        height: calc(155rpx - 30rpx);
-        background: #FFFFFF;
-        border-radius: 17rpx 17rpx 17rpx 17rpx;
-        display: flex;
-        padding: 15rpx;
-        .tab-item
-            display: flex;
-            flex-direction: column;
-            width: calc(100% / 4);
-            align-items: center;
-            justify-content: center;
-            position: relative;
-            .item-img
-                height: 55rpx;
-                width: 50rpx;
-            .item-text
-                font-size: 21rpx;
-                color: #000000;
-                line-height: 25rpx;
-                text-align: center;
-                margin-top: 10rpx;
-        .tab-item::after
-            position: absolute;
-            right: 0;
-            content: '';
-            width: 0rpx;
-            height: 96rpx;
-            border-radius: 0rpx 0rpx 0rpx 0rpx;
-            border-right: 2rpx solid #4778EC;
-        .tab-item:last-child::after
-            border-right: 0;
-        .tab-item:nth-child(2)>.item-img
-            width: 51rpx;
-            height: 45rpx;
-            margin-top: 6rpx;
-            margin-bottom: 4rpx;
-        .tab-item:nth-child(3)>.item-img
-            width: 62rpx;
-            height: 41rpx;
-            margin-top: 6rpx
-            margin-bottom: 10rpx;
-        .tab-item:nth-child(4)>.item-img
-            width: 45rpx;
-            height: 47rpx;
-            margin-bottom: 8rpx;
-    .mine-options
-        margin: 43rpx 30rpx;
-        min-height: 155rpx;
-        background: #FFFFFF;
-        border-radius: 17rpx 17rpx 17rpx 17rpx;
-        display: flex;
-        padding: 24rpx 45rpx;
+    justify-content: flex-start;
+    align-items: center;
+    padding: 30rpx;
+    position: relative;
+    .userindo-head
+        width: 101rpx;
+        height: 101rpx;
+        overflow: hidden
+        border-radius: 50%
+        margin-right: 22rpx;
+        .userindo-head-img
+            width: 100%;
+            height: 100%;
+    .userinfo-ls
         display: flex;
         flex-direction: column;
-        min-height: min-content;
-        .mine-options-item
-            height: 80rpx;
+        align-items: flex-start;
+        .userinfo-ls-name
+            font-weight: 600;
+            font-size: 40rpx;
+            color: #333333;
+            border-radius: 50%
+        .userinfo-ls-resume
+            font-weight: 400;
             font-size: 28rpx;
-            color: #000000;
-            line-height: 80rpx;
-            border-bottom: 2rpx solid #4778EC;
-            padding: 0 30rpx;
-        .mine-logout
-            margin: 250rpx auto 0 auto;
-            width: 399rpx;
-            height: 96rpx;
-            background: #FFAD47;
-            border-radius: 17rpx 17rpx 17rpx 17rpx;
-            text-align: center;
-            line-height: 96rpx;
-            color: #FFFFFF;
-            font-size: 35rpx;
+            color: #6C7282;
+.mine-userinfo::before
+    position: absolute;
+    right: 40rpx;
+    top: 50%;
+    content: '';
+    width: 4rpx;
+    height: 18rpx;
+    border-radius: 2rpx
+    background: #A2A2A2;
+    transform: translate(0, -50%) rotate(-45deg);
+.mine-userinfo::after
+    position: absolute;
+    right: 40rpx;
+    top: calc(50% + 1rpx);
+    content: '';
+    width: 4rpx;
+    height: 18rpx;
+    border-radius: 2rpx
+    background: #A2A2A2;
+    transform: rotate(45deg)
 </style>
diff --git a/pages/msglog/msglog.vue b/pages/msglog/msglog.vue
index d54d9c9..683d9fe 100644
--- a/pages/msglog/msglog.vue
+++ b/pages/msglog/msglog.vue
@@ -1,132 +1,152 @@
 <template>
-    <view class="app-container">
-        <view class="msg-AI">AI+就业服务程序</view>
-        <view class="msg-tab">
-            <view class="msg-tab-item" :class="{ actived: state.current === 0 }" @click="seemsg(0)">全部</view>
-            <view class="msg-tab-item" :class="{ actived: state.current === 1 }" @click="seemsg(1)">未读</view>
+    <view class="app-custom-root">
+        <view class="app-container">
+            <!-- 顶部头部区域 -->
+            <view class="container-header">
+                <view class="header-btnLf button-click" @click="changeType(0)" :class="{ active: state.current === 0 }">
+                    已读消息
+                    <view class="btns-wd"></view>
+                </view>
+                <view class="header-btnLf button-click" @click="changeType(1)" :class="{ active: state.current === 1 }">
+                    未读消息
+                    <view class="btns-wd"></view>
+                </view>
+            </view>
+
+            <!-- 主体内容区域 -->
+            <view class="container-main">
+                <swiper class="swiper" :current="state.current" @change="changeSwiperType">
+                    <swiper-item class="swiper-item" v-for="(_, index) in 2" :key="index">
+                        <component :is="components[index]" :ref="(el) => handelComponentsRef(el, index)" />
+                    </swiper-item>
+                </swiper>
+            </view>
         </view>
-        <view class="msg-list">
-            <swiper class="swiper" :current="state.current" @change="changeSwiperMsgType">
-                <swiper-item class="list">
-                    <view class="list-card">
-                        <view class="card-img">
-                            <image class="card-img-flame" src="/static/icon/recommendday.png"></image>
-                        </view>
-                        <view class="card-info">
-                            <view class="info-title">今日推荐</view>
-                            <view class="info-text">这里有9个职位很适合你，快来看看吧</view>
-                        </view>
-                        <view class="card-time">刚才</view>
-                    </view>
-                </swiper-item>
-                <swiper-item class="list">
-                    <view class="list-card">
-                        <view class="card-img">
-                            <image class="card-img-flame" src="/static/icon/recommendday.png"></image>
-                        </view>
-                        <view class="card-info">
-                            <view class="info-title">今日推荐</view>
-                            <view class="info-text">这里有9个职位很适合你，快来看看吧</view>
-                        </view>
-                        <view class="card-time">刚才</view>
-                    </view>
-                </swiper-item>
-            </swiper>
-        </view>
-        <!-- 自定义tabbar -->
-        <!-- <tabbar-custom :currentpage="3"></tabbar-custom> -->
     </view>
 </template>
 
 <script setup>
 import { reactive, inject, watch, ref, onMounted } from 'vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
+import readComponent from './read.vue';
+import unreadComponent from './unread.vue';
+const loadedMap = reactive([false, false]);
+const swiperRefs = [ref(null), ref(null)];
+const components = [readComponent, unreadComponent];
+
 const state = reactive({
     current: 0,
     all: [{}],
 });
 
-onLoad(() => {});
+onMounted(() => {
+    handleTabChange(state.current);
+});
+
+const handelComponentsRef = (el, index) => {
+    if (el) {
+        swiperRefs[index].value = el;
+    }
+};
+// 查看消息类型
+function changeSwiperType(e) {
+    const index = e.detail.current;
+    state.current = index;
+    handleTabChange(index);
+}
+function changeType(index) {
+    state.current = index;
+    handleTabChange(index);
+}
+
+function handleTabChange(index) {
+    if (!loadedMap[index]) {
+        swiperRefs[index].value?.loadData();
+        loadedMap[index] = true;
+    }
+}
 
 // 查看消息类型
 function changeSwiperMsgType(e) {
     const currented = e.detail.current;
     state.current = currented;
 }
-function seemsg(index) {
-    state.current = index;
-}
 </script>
 
 <style lang="stylus" scoped>
-.app-container
-    width: 100%;
-    height: calc(100vh - var(--window-top) - var(--status-bar-height) - var(--window-bottom));
-    background: linear-gradient( 180deg, #4778EC 0%, #002979 100%);
+.app-custom-root {
+    position: fixed;
+    z-index: 10;
+    width: 100vw;
+    height: calc(100% - var(--window-bottom));
+    overflow: hidden;
+}
+.app-container {
     display: flex;
     flex-direction: column;
-    .msg-AI
-        height: 42rpx;
-        font-family: Inter, Inter;
-        font-weight: 400;
-        font-size: 35rpx;
-        color: #FFFFFF;
-        line-height: 41rpx;
-        padding: 85rpx 0 0 30rpx;
-    .msg-tab
-        padding: 85rpx 0 0 30rpx;
+    height: 100%;
+    width: 100%;
+    .container-header {
+        height: calc(88rpx - 14rpx);
+        text-align: center;
+        line-height: calc(88rpx - 14rpx);
+        font-size: 32rpx;
         display: flex;
-        justify-content: flex-start;
+        flex-direction: row;
         align-items: center;
-        color: #D9D9D9;
-        .msg-tab-item
-            margin-right: 40rpx;
-        .actived
-            font-size: 28rpx;
-            color: #FFFFFF;
-            text-shadow: 0rpx 14rpx 14rpx rgba(0,0,0,0.25);
-    .msg-list
-        flex: 1;
-        overflow: hidden;
-        .swiper
-            height: 100%;
-            .list
-                display: flex;
-                flex-direction: column;
-                .list-card
-                    height: calc(119rpx - 26rpx - 26rpx);
-                    width: calc(100% - 36rpx - 36rpx - 23rpx - 23rpx);
-                    background: #FFFFFF;
-                    border-radius: 17rpx;
-                    display: flex;
-                    justify-content: flex-start;
-                    align-items: center;
-                    padding: 26rpx 36rpx;
-                    margin: 36rpx 23rpx;
-                    .card-img
-                        width: 63rpx;
-                        height: 63rpx;
-                        background: #D9D9D9;
-                        border-radius: 50%
-                        display: grid;
-                        place-items: center;
-                        margin-right: 30rpx;
-                        .card-img-flame
-                            width: 100%;
-                            height: 100%
-                    .card-info
-                        flex: 1;
-                        display: flex;
-                        align-items: flex-start;
-                        flex-direction: column;
-                        .info-title
-                            font-weight: 400;
-                            font-size: 28rpx;
-                            color: #000000;
-                        .info-text
-                            font-size: 17rpx;
-                            color: #606060;
-                    .card-time
-                        font-size: 17rpx;
-                        color: #606060;
+        padding: 16rpx 44rpx 36rpx 44rpx;
+        background: url('@/static/icon/msgTopbg.png') 0 0 no-repeat;
+        background-size: 100% 100%;
+        .header-title {
+            color: #000000;
+            font-weight: bold;
+        }
+        .header-btnLf {
+            display: flex;
+            justify-content: flex-start;
+            align-items: center;
+            width: calc(60rpx * 3);
+            font-weight: 500;
+            font-size: 40rpx;
+            color: #696969;
+            margin-right: 44rpx;
+            position: relative;
+            .btns-wd{
+                position: absolute
+                top: 2rpx;
+                right: 2rpx
+                width: 16rpx;
+                height: 16rpx;
+                background: #F73636;
+                border-radius: 50%;
+                border: 4rpx solid #EEEEFF;
+            }
+        }
+        .active {
+            font-weight: 600;
+            font-size: 40rpx;
+            color: #000000;
+        }
+    }
+}
+
+.container-main {
+    flex: 1;
+    overflow: hidden;
+    background-color: #f4f4f4;
+}
+.main-scroll {
+    width: 100%
+    height: 100%;
+}
+.scrollmain{
+    padding: 28rpx
+}
+.swiper
+    height: 100%;
+    width: 100%
+    .list
+        width: 100%
+        display: flex;
+        flex-direction: column;
 </style>
diff --git a/pages/msglog/read.vue b/pages/msglog/read.vue
new file mode 100644
index 0000000..7355663
--- /dev/null
+++ b/pages/msglog/read.vue
@@ -0,0 +1,86 @@
+<template>
+    <scroll-view scroll-y class="main-scroll" @scrolltolower="handleScrollToLower">
+        <view class="scrollmain">
+            <view class="list-card btn-feel" v-for="(item, index) in 20" :key="index">
+                <view class="card-img">
+                    <image class="card-img-flame" src="/static/icon/msgtype.png"></image>
+                </view>
+                <view class="card-info">
+                    <view class="info-title">
+                        <text>今日推荐</text>
+                        <view class="card-time">刚才</view>
+                    </view>
+                    <view class="info-text line_2">这里有9个职位很适合你，快来看看吧</view>
+                </view>
+            </view>
+        </view>
+    </scroll-view>
+</template>
+
+<script setup>
+import { reactive, inject, ref } from 'vue';
+const isLoaded = ref(false);
+async function loadData() {
+    try {
+        if (isLoaded.value) return;
+        isLoaded.value = true;
+    } catch (err) {
+        isLoaded.value = false; // 重置状态允许重试
+        throw err;
+    }
+}
+
+function handleScrollToLower() {}
+defineExpose({ loadData });
+</script>
+
+<style lang="stylus" scoped>
+.main-scroll {
+    width: 100%
+    height: 100%;
+}
+.scrollmain{
+    padding: 28rpx
+}
+.list-card
+    background: #FFFFFF;
+    border-radius: 17rpx;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    padding: 26rpx 36rpx;
+    margin: 0 0 28rpx 0
+    .card-img
+        width: 96rpx;
+        height: 96rpx;
+        border-radius: 50%
+        display: grid;
+        place-items: center;
+        margin-right: 30rpx;
+        .card-img-flame
+            width: 100%;
+            height: 100%
+    .card-info
+        flex: 1;
+        display: flex;
+        align-items: flex-start;
+        flex-direction: column;
+        .info-title
+            font-weight: 500;
+            font-size: 32rpx;
+            color: #333333;
+            display: flex;
+            justify-content: space-between;
+            width: 100%
+            .card-time
+                font-weight: 400;
+                font-size: 28rpx;
+                color: #AAAAAA;
+                height: 100%
+                margin: 4rpx;
+        .info-text
+            font-weight: 400;
+            font-size: 28rpx;
+            color: #6C7282;
+            margin-top: 4rpx;
+</style>
diff --git a/pages/msglog/unread.vue b/pages/msglog/unread.vue
new file mode 100644
index 0000000..7355663
--- /dev/null
+++ b/pages/msglog/unread.vue
@@ -0,0 +1,86 @@
+<template>
+    <scroll-view scroll-y class="main-scroll" @scrolltolower="handleScrollToLower">
+        <view class="scrollmain">
+            <view class="list-card btn-feel" v-for="(item, index) in 20" :key="index">
+                <view class="card-img">
+                    <image class="card-img-flame" src="/static/icon/msgtype.png"></image>
+                </view>
+                <view class="card-info">
+                    <view class="info-title">
+                        <text>今日推荐</text>
+                        <view class="card-time">刚才</view>
+                    </view>
+                    <view class="info-text line_2">这里有9个职位很适合你，快来看看吧</view>
+                </view>
+            </view>
+        </view>
+    </scroll-view>
+</template>
+
+<script setup>
+import { reactive, inject, ref } from 'vue';
+const isLoaded = ref(false);
+async function loadData() {
+    try {
+        if (isLoaded.value) return;
+        isLoaded.value = true;
+    } catch (err) {
+        isLoaded.value = false; // 重置状态允许重试
+        throw err;
+    }
+}
+
+function handleScrollToLower() {}
+defineExpose({ loadData });
+</script>
+
+<style lang="stylus" scoped>
+.main-scroll {
+    width: 100%
+    height: 100%;
+}
+.scrollmain{
+    padding: 28rpx
+}
+.list-card
+    background: #FFFFFF;
+    border-radius: 17rpx;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    padding: 26rpx 36rpx;
+    margin: 0 0 28rpx 0
+    .card-img
+        width: 96rpx;
+        height: 96rpx;
+        border-radius: 50%
+        display: grid;
+        place-items: center;
+        margin-right: 30rpx;
+        .card-img-flame
+            width: 100%;
+            height: 100%
+    .card-info
+        flex: 1;
+        display: flex;
+        align-items: flex-start;
+        flex-direction: column;
+        .info-title
+            font-weight: 500;
+            font-size: 32rpx;
+            color: #333333;
+            display: flex;
+            justify-content: space-between;
+            width: 100%
+            .card-time
+                font-weight: 400;
+                font-size: 28rpx;
+                color: #AAAAAA;
+                height: 100%
+                margin: 4rpx;
+        .info-text
+            font-weight: 400;
+            font-size: 28rpx;
+            color: #6C7282;
+            margin-top: 4rpx;
+</style>
diff --git a/pages/nearby/components/four.vue b/pages/nearby/components/four.vue
index 4bf002a..8ae482b 100644
--- a/pages/nearby/components/four.vue
+++ b/pages/nearby/components/four.vue
@@ -1,125 +1,108 @@
 <template>
     <scroll-view :scroll-y="true" class="nearby-scroll" @scrolltolower="scrollBottom">
         <view class="two-head">
-            <!-- <view class="head-item active">市北区</view> -->
             <view
                 class="head-item"
                 :class="{ active: state.comId === item.commercialAreaId }"
                 v-for="(item, index) in state.comlist"
-                :key="item.commercialAreaId"
+                :key="item.commercialAreaName"
                 @click="clickCommercialArea(item)"
             >
                 {{ item.commercialAreaName }}
             </view>
         </view>
         <view class="nearby-list">
-            <view class="list-head" @touchmove.stop.prevent>
-                <view class="tab-options">
-                    <scroll-view :scroll-x="true" :show-scrollbar="false" class="tab-scroll" @touchmove.stop>
-                        <view class="tab-op-left">
+            <view class="nav-filter" @touchmove.stop.prevent>
+                <view class="filter-top">
+                    <scroll-view :scroll-x="true" :show-scrollbar="false" class="tab-scroll">
+                        <view class="jobs-left">
                             <view
-                                class="tab-list"
-                                :class="{ tabchecked: state.tabIndex === 'all' }"
+                                class="job button-click"
+                                :class="{ active: state.tabIndex === 'all' }"
                                 @click="choosePosition('all')"
                             >
                                 全部
                             </view>
                             <view
-                                class="tab-list"
-                                :class="{ tabchecked: state.tabIndex === index }"
-                                @click="choosePosition(index)"
+                                class="job button-click"
+                                :class="{ active: state.tabIndex === index }"
                                 v-for="(item, index) in userInfo.jobTitle"
                                 :key="index"
+                                @click="choosePosition(index)"
                             >
                                 {{ item }}
                             </view>
                         </view>
                     </scroll-view>
-                    <view class="tab-op-right">
-                        <uni-icons type="plusempty" style="margin-right: 10rpx" size="20"></uni-icons>
-                        <view class="tab-recommend">
-                            <latestHotestStatus @confirm="handelHostestSearch"></latestHotestStatus>
-                        </view>
-                        <view class="tab-filter" @click="emit('onFilter', 3)">
-                            <view class="tab-number" v-show="pageState.total">{{ formatTotal(pageState.total) }}</view>
-                            <image class="image" src="/static/icon/filter.png"></image>
+                    <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>
+                <view class="filter-bottom">
+                    <view class="btm-left">
+                        <view
+                            class="button-click filterbtm"
+                            :class="{ active: pageState.search.order === item.value }"
+                            v-for="item in rangeOptions"
+                            @click="handelHostestSearch(item)"
+                            :key="item.value"
+                        >
+                            {{ item.text }}
                         </view>
                     </view>
+                    <view class="btm-right button-click" @click="openFilter">
+                        筛选
+                        <image class="right-sx" :class="{ active: showFilter }" src="@/static/icon/shaixun.png"></image>
+                    </view>
                 </view>
             </view>
             <view class="one-cards">
-                <view class="card-box" v-for="(item, index) in list" :key="item.jobId" @click="navToPost(item.jobId)">
-                    <view class="box-row mar_top0">
-                        <view class="row-left">{{ item.jobTitle }}</view>
-                        <view class="row-right">
-                            <Salary-Expectation
-                                :max-salary="item.maxSalary"
-                                :min-salary="item.minSalary"
-                            ></Salary-Expectation>
-                        </view>
-                    </view>
-                    <view class="box-row">
-                        <view class="row-left">
-                            <view class="row-tag" v-if="item.education">
-                                <dict-Label dictType="education" :value="item.education"></dict-Label>
-                            </view>
-                            <view class="row-tag" v-if="item.experience">
-                                <dict-Label dictType="experience" :value="item.experience"></dict-Label>
-                            </view>
-                        </view>
-                    </view>
-                    <view class="box-row mar_top0">
-                        <view class="row-item mineText">{{ item.postingDate || '发布日期' }}</view>
-                        <view class="row-item mineText">{{ vacanciesTo(item.vacancies) }}</view>
-                        <view class="row-item mineText textblue"><matchingDegree :job="item"></matchingDegree></view>
-                        <view class="row-item">
-                            <uni-icons type="star" size="28"></uni-icons>
-                            <!-- <uni-icons type="star-filled" color="#FFCB47" size="30"></uni-icons> -->
-                        </view>
-                    </view>
-                    <view class="box-row">
-                        <view class="row-left mineText">{{ item.companyName }}</view>
-                        <view class="row-right mineText">
-                            青岛
-                            <dict-Label dictType="area" :value="item.jobLocationAreaCode"></dict-Label>
-                            <convert-distance
-                                :alat="item.latitude"
-                                :along="item.longitude"
-                                :blat="latitude()"
-                                :blong="longitude()"
-                            ></convert-distance>
-                        </view>
-                    </view>
-                </view>
+                <renderJobs
+                    v-if="list.length"
+                    :list="list"
+                    :longitude="longitudeVal"
+                    :latitude="latitudeVal"
+                ></renderJobs>
+                <empty v-else pdTop="60"></empty>
+                <loadmore ref="loadmoreRef"></loadmore>
             </view>
         </view>
-        <loadmore ref="loadmoreRef"></loadmore>
+        <!-- 筛选 -->
+        <select-filter ref="selectFilterModel"></select-filter>
     </scroll-view>
 </template>
 
 <script setup>
-import dictLabel from '@/components/dict-Label/dict-Label.vue';
-import { reactive, inject, watch, ref, onMounted } from 'vue';
+import { reactive, inject, watch, ref, onMounted, onBeforeUnmount } from 'vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
-import useDictStore from '@/stores/useDictStore';
-import useUserStore from '@/stores/useUserStore';
-const { getDictSelectOption, oneDictData } = useDictStore();
-const { $api, navTo, vacanciesTo, formatTotal } = inject('globalFunction');
+const { $api, navTo, debounce, customSystem } = inject('globalFunction');
+import { storeToRefs } from 'pinia';
 import useLocationStore from '@/stores/useLocationStore';
-const { getLocation, longitude, latitude } = useLocationStore();
+import useUserStore from '@/stores/useUserStore';
+import useDictStore from '@/stores/useDictStore';
+const { oneDictData } = useDictStore();
+const { userInfo } = storeToRefs(useUserStore());
+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';
+
 const emit = defineEmits(['onFilter']);
 const state = reactive({
     tabIndex: 'all',
+    tabBxText: 'buxianquyu',
     comlist: [],
     comId: 0,
-});
-const fromValue = reactive({
-    area: 0,
     areaInfo: {},
 });
-const loadmoreRef = ref(null);
-const userInfo = ref({});
 const isLoaded = ref(false);
+const showFilter = ref(false);
+const selectFilterModel = ref();
+const fromValue = reactive({
+    area: 0,
+});
+const loadmoreRef = ref(null);
 const pageState = reactive({
     page: 0,
     total: 0,
@@ -131,20 +114,59 @@ const pageState = reactive({
 });
 const list = ref([]);
 
-onShow(() => {
-    userInfo.value = useUserStore().userInfo;
-});
+const rangeOptions = ref([
+    { value: 0, text: '推荐' },
+    { value: 1, text: '最热' },
+    { value: 2, text: '最新发布' },
+]);
+
+function choosePosition(index) {
+    state.tabIndex = index;
+    list.value = [];
+    if (index === 'all') {
+        pageState.search = {
+            ...pageState.search,
+            jobTitle: '',
+        };
+        getJobList('refresh');
+    } else {
+        // const id = useUserStore().userInfo.jobTitleId.split(',')[index];
+        pageState.search.jobTitle = userInfo.value.jobTitle[index];
+        getJobList('refresh');
+    }
+}
+
+function openFilter() {
+    showFilter.value = true;
+    selectFilterModel.value?.open({
+        title: '筛选',
+        maskClick: true,
+        success: (values) => {
+            pageState.search = {
+                ...pageState.search,
+            };
+            for (const [key, value] of Object.entries(values)) {
+                pageState.search[key] = value.join(',');
+            }
+            showFilter.value = false;
+            console.log(pageState.search);
+            getJobList('refresh');
+        },
+        cancel: () => {
+            showFilter.value = false;
+        },
+    });
+}
+
 onLoad(() => {
     getBusinessDistrict();
 });
 
-function navToPost(jobId) {
-    navTo(`/packageA/pages/post/post?jobId=${btoa(jobId)}`);
-}
-
 async function loadData() {
     try {
         if (isLoaded.value) return;
+        const area = oneDictData('area')[0];
+        fromValue.area = area.value;
         getJobList('refresh');
         isLoaded.value = true;
     } catch (err) {
@@ -152,19 +174,6 @@ async function loadData() {
         throw err;
     }
 }
-function scrollBottom() {
-    getJobList();
-    loadmoreRef.value.change('loading');
-}
-function choosePosition(index) {
-    state.tabIndex = index;
-    if (index === 'all') {
-        pageState.search.jobTitle = '';
-    } else {
-        pageState.search.jobTitle = useUserStore().userInfo.jobTitle[index];
-    }
-    getJobList('refresh');
-}
 
 function clickCommercialArea(area) {
     state.areaInfo = area;
@@ -172,6 +181,25 @@ function clickCommercialArea(area) {
     getJobList('refresh');
 }
 
+function scrollBottom() {
+    getJobList();
+    loadmoreRef.value.change('loading');
+}
+
+// function choosePosition(index) {
+//     state.tabIndex = index;
+//     if (index === 'all') {
+//         pageState.search.jobTitle = '';
+//     } else {
+//         pageState.search.jobTitle = userInfo.jobTitle[index];
+//     }
+//     getJobList('refresh');
+// }
+function changeArea(area, item) {
+    fromValue.area = area;
+    getJobList('refresh');
+}
+
 function getBusinessDistrict() {
     $api.createRequest(`/app/common/commercialArea`).then((resData) => {
         if (resData.data.length) {
@@ -181,6 +209,7 @@ function getBusinessDistrict() {
         }
     });
 }
+
 function getJobList(type = 'add') {
     if (type === 'add' && pageState.page < pageState.maxPage) {
         pageState.page += 1;
@@ -197,7 +226,10 @@ function getJobList(type = 'add') {
         radius: 2,
         ...pageState.search,
     };
-    $api.createRequest('/app/job/commercialArea', params, 'POST').then((resData) => {
+    if (fromValue.area === state.tabBxText) {
+        params.countyIds = [];
+    }
+    $api.createRequest('/app/job/countyJob', params, 'POST').then((resData) => {
         const { rows, total } = resData;
         if (type === 'add') {
             const str = pageState.pageSize * (pageState.page - 1);
@@ -241,125 +273,96 @@ defineExpose({ loadData, handleFilterConfirm });
 .nearby-scroll
     overflow: hidden;
     .two-head
-        margin: 24rpx;
-        padding: 26rpx;
-        background: #FFFFFF;
-        display: grid;
-        grid-template-columns: repeat(4, 1fr);
-        grid-column-gap: 40rpx;
-        grid-row-gap: 30rpx;
+        margin: 22rpx;
+        display: flex;
+        flex-wrap: wrap
+        // grid-template-columns: repeat(4, 1fr);
+        // grid-column-gap: 10rpx;
+        // grid-row-gap: 24rpx;
         border-radius: 17rpx 17rpx 17rpx 17rpx;
         .head-item
-            min-width: 129rpx;
-            height: 44rpx;
-            line-height: 44rpx;
+            margin: 10rpx
+            white-space: nowrap
+            min-width: 156rpx
+            line-height: 64rpx
             text-align: center;
             width: fit-content;
-            background: #D9D9D9;
-            border-radius: 17rpx 17rpx 17rpx 17rpx;
             font-size: 21rpx;
-            color: #606060;
+            font-weight: 400;
+            font-size: 28rpx;
+            color: #6C7282;
+            background: #F6F6F6;
+            border-radius: 12rpx 12rpx 12rpx 12rpx;
         .active
-            background: #4778EC;
-            color: #FFFFFF;
-    .nearby-list
-        margin-top: 40rpx;
-        // background: linear-gradient( 180deg, #4778EC 0%, #002979 100%);
-        .list-head
-            height: 77rpx;
-            background-color: #FFFFFF;
-            border-radius: 17rpx 17rpx 0rpx 0rpx;
-            position: relative;
-            top: -17rpx;
-            z-index: 9999;
-    .tab-options
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        height: 77rpx;
-        background: #FFFFFF;
-        border-radius: 17rpx 17rpx 0rpx 0rpx;
-        padding: 0 24rpx;
-        overflow: hidden;
-        .tab-scroll
-            height: 77rpx;
-            line-height: 77rpx;
-            flex: 1;
-            overflow: hidden;
-            padding-right: 10rpx;
-            .tab-op-left
-                display: flex;
-                align-items: center;
-                flex-wrap: nowrap;
-                .tab-list
-                    text-align: center;
-                    white-space: nowrap;
-                    margin-right: 30rpx;
-                    font-size: 28rpx;
-                    color: #606060;
-        .tab-op-right
-            display: flex;
-            align-items: center;
-            .tab-recommend
-                white-space: nowrap;
-                width: fit-content;
-                padding: 0 10rpx;
-                height: 42rpx;
-                background: #4778EC;
-                border-radius: 17rpx 17rpx 0rpx 17rpx;
-                text-align: center;
-                color: #FFFFFF;
-                font-size: 21rpx;
-                line-height: 42rpx;
-                margin-right: 12rpx;
-            .tab-number
-                font-size: 21rpx;
-                color: #606060;
-                line-height: 25rpx;
-                text-align: center;
-            .tab-filter
-                display: flex;
-                .image
-                    width: 28rpx;
-                    height: 27rpx;
-
-    .one-cards
+            color: #256BFA;
+            background: #E9F0FF;
+            border-radius: 12rpx 12rpx 12rpx 12rpx;
+.nearby-list
+    border-top: 2rpx solid #EBEBEB;
+    height: 100%
+    .one-cards{
         display: flex;
         flex-direction: column;
-        padding: 20rpx;
-        .card-box
-            width: calc(100% - 36rpx - 36rpx);
-            border-radius: 0rpx 0rpx 0rpx 0rpx;
-            background: #FFFFFF;
-            border-radius: 17rpx;
-            padding: 15rpx 36rpx;
-            margin-top: 24rpx;
-            .box-row
-                display: flex;
-                justify-content: space-between;
-                margin-top: 8rpx;
+        padding: 0 20rpx 20rpx 20rpx;
+        background: #f4f4f4
+    }
+    .nav-filter
+        padding: 16rpx 28rpx 0 28rpx
+        .filter-top
+            display: flex
+            justify-content: space-between;
+            .tab-scroll
+                flex: 1;
+                overflow: hidden;
+                margin-right: 20rpx
+                white-space: nowrap;
+                overflow: hidden;
+                text-overflow: clip;
+                -webkit-mask-image: linear-gradient(to right, black 60%, transparent);
+                mask-image: linear-gradient(to right, black 60%, transparent);
+                .jobs-left
+                    display: flex
+                    flex-wrap: nowrap
+                    .job
+                        font-weight: 400;
+                        font-size: 36rpx;
+                        color: #666D7F;
+                        margin-right: 32rpx;
+                        white-space: nowrap
+                    .active
+                        font-weight: 500;
+                        font-size: 36rpx;
+                        color: #000000;
+            .jobs-add
+                display: flex
                 align-items: center;
-                .mineText
+                justify-content: center;
+                font-weight: 400;
+                font-size: 32rpx;
+                color: #666D7F;
+                line-height: 38rpx;
+        .filter-bottom
+            display: flex
+            justify-content: space-between
+            padding: 24rpx 0
+            .btm-left
+                display: flex
+                .filterbtm
                     font-weight: 400;
-                    font-size: 21rpx;
-                    color: #606060;
-                .textblue
-                    color: #4778EC;
-                .row-right
-                    min-width: 120rpx
-                    text-align: right
-                .row-left
-                    display: flex;
-                    justify-content: space-between;
-                    .row-tag
-                        background: #13C57C;
-                        border-radius: 17rpx 17rpx 17rpx 17rpx;
-                        font-size: 21rpx;
-                        color: #FFFFFF;
-                        line-height: 25rpx;
-                        text-align: center;
-                        padding: 4rpx 8rpx;
-                        margin-right: 23rpx;
-        .card-box:first-child
-            margin-top: -14rpx;
+                    font-size: 32rpx;
+                    color: #666D7F;
+                    margin-right: 40rpx
+                .active
+                    font-weight: 500;
+                    font-size: 32rpx;
+                    color: #256BFA;
+            .btm-right
+                font-weight: 400;
+                font-size: 32rpx;
+                color: #6C7282;
+                .right-sx
+                    width: 26rpx;
+                    height: 26rpx;
+                .active
+                    transform: rotate(180deg)
 </style>
diff --git a/pages/nearby/components/one.vue b/pages/nearby/components/one.vue
index d168768..b282e79 100644
--- a/pages/nearby/components/one.vue
+++ b/pages/nearby/components/one.vue
@@ -2,112 +2,111 @@
     <scroll-view :scroll-y="true" class="nearby-scroll" @scrolltolower="scrollBottom">
         <view class="nearby-map" @touchmove.stop.prevent>
             <map
-                style="width: 100%; height: 300px"
-                :latitude="latitude()"
-                :longitude="longitude()"
+                style="width: 100%; height: 400px"
+                :latitude="latitudeVal"
+                :longitude="longitudeVal"
                 :markers="mapCovers"
                 :circles="mapCircles"
                 :controls="mapControls"
                 @controltap="handleControl"
             ></map>
+            <view class="nearby-select">
+                <view class="select-view" @click="changeRangeShow">
+                    <text>{{ pageState.search.radius }}km</text>
+                    <image class="view-sx" :class="{ active: rangeShow }" src="@/static/icon/shaixun.png"></image>
+                </view>
+                <transition name="fade-slide">
+                    <view class="select-list" v-if="rangeShow">
+                        <view class="list-item button-click" v-for="(item, index) in range" @click="changeRadius(item)">
+                            {{ item }}km
+                        </view>
+                    </view>
+                </transition>
+                <!-- <view class="select-list" v-show="!rangeShow">
+                    <view class="list-item" v-for="(item, index) in range">{{ item }}km</view>
+                </view> -->
+            </view>
         </view>
         <view class="nearby-list">
-            <view class="list-head" @touchmove.stop.prevent>
-                <view class="tab-options">
-                    <view class="tab-scroll" ref="progress">
-                        <view class="tab-scr-d" :style="`width: ${state.progressWidth}`">
-                            <view class="">1km</view>
-                            <view class="">5km</view>
-                            <view class="">10km</view>
+            <view class="nav-filter" @touchmove.stop.prevent>
+                <view class="filter-top">
+                    <scroll-view :scroll-x="true" :show-scrollbar="false" class="tab-scroll">
+                        <view class="jobs-left">
+                            <view
+                                class="job button-click"
+                                :class="{ active: state.tabIndex === 'all' }"
+                                @click="choosePosition('all')"
+                            >
+                                全部
+                            </view>
+                            <view
+                                class="job button-click"
+                                :class="{ active: state.tabIndex === index }"
+                                v-for="(item, index) in userInfo.jobTitle"
+                                :key="index"
+                                @click="choosePosition(index)"
+                            >
+                                {{ item }}
+                            </view>
                         </view>
-                        <bingProgressComponent
-                            strokeWidth="7px"
-                            :max="10"
-                            activeColor="#13C57C"
-                            handleWidth="10px"
-                            handleHeight="10px"
-                            handleBorderRadius="5px"
-                            handleColor="#4778EC"
-                            @change="progressChange"
-                            :showInfo="false"
-                            :width="state.progressWidth"
-                        ></bingProgressComponent>
+                    </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="tab-op-right">
-                        <view class="tab-recommend">
-                            <latestHotestStatus @confirm="handelHostestSearch"></latestHotestStatus>
-                        </view>
-                        <view class="tab-filter" @click="emit('onFilter', 0)">
-                            <view class="tab-number" v-show="pageState.total">{{ formatTotal(pageState.total) }}</view>
-                            <image class="image" src="/static/icon/filter.png"></image>
+                </view>
+                <view class="filter-bottom">
+                    <view class="btm-left">
+                        <view
+                            class="button-click filterbtm"
+                            :class="{ active: pageState.search.order === item.value }"
+                            v-for="item in rangeOptions"
+                            @click="handelHostestSearch(item)"
+                            :key="item.value"
+                        >
+                            {{ item.text }}
                         </view>
                     </view>
+                    <view class="btm-right button-click" @click="openFilter">
+                        筛选
+                        <image class="right-sx" :class="{ active: showFilter }" src="@/static/icon/shaixun.png"></image>
+                    </view>
                 </view>
             </view>
             <view class="one-cards">
-                <view class="card-box" v-for="(item, index) in list" :key="item.jobId" @click="navToPost(item.jobId)">
-                    <view class="box-row mar_top0">
-                        <view class="row-left">{{ item.jobTitle }}</view>
-                        <view class="row-right">
-                            <Salary-Expectation
-                                :max-salary="item.maxSalary"
-                                :min-salary="item.minSalary"
-                            ></Salary-Expectation>
-                        </view>
-                    </view>
-                    <view class="box-row">
-                        <view class="row-left">
-                            <view class="row-tag" v-if="item.education">
-                                <dict-Label dictType="education" :value="item.education"></dict-Label>
-                            </view>
-                            <view class="row-tag" v-if="item.experience">
-                                <dict-Label dictType="experience" :value="item.experience"></dict-Label>
-                            </view>
-                        </view>
-                    </view>
-                    <view class="box-row mar_top0">
-                        <view class="row-item mineText">{{ item.postingDate || '发布日期' }}</view>
-                        <view class="row-item mineText">{{ vacanciesTo(item.vacancies) }}</view>
-                        <view class="row-item mineText textblue"><matchingDegree :job="item"></matchingDegree></view>
-                        <view class="row-item">
-                            <uni-icons type="star" size="28"></uni-icons>
-                            <!-- <uni-icons type="star-filled" color="#FFCB47" size="30"></uni-icons> -->
-                        </view>
-                    </view>
-                    <view class="box-row">
-                        <view class="row-left mineText">{{ item.companyName }}</view>
-                        <view class="row-right mineText">
-                            青岛
-                            <dict-Label dictType="area" :value="item.jobLocationAreaCode"></dict-Label>
-                            <convert-distance
-                                :alat="item.latitude"
-                                :along="item.longitude"
-                                :blat="latitude()"
-                                :blong="longitude()"
-                            ></convert-distance>
-                        </view>
-                    </view>
-                </view>
+                <renderJobs
+                    v-if="list.length"
+                    :list="list"
+                    :longitude="longitudeVal"
+                    :latitude="latitudeVal"
+                ></renderJobs>
+                <empty v-else pdTop="60"></empty>
+                <loadmore ref="loadmoreRef"></loadmore>
             </view>
         </view>
-        <loadmore ref="loadmoreRef"></loadmore>
+        <!-- 筛选 -->
+        <select-filter ref="selectFilterModel"></select-filter>
     </scroll-view>
 </template>
 
 <script setup>
-import point2 from '@/static/icon/point2.png';
-import LocationPng from '@/static/icon/Location.png';
-import dictLabel from '@/components/dict-Label/dict-Label.vue';
-import useLocationStore from '@/stores/useLocationStore';
-import bingProgressComponent from '/components/bing-progress/bing-progress.vue';
-import screeningJobRequirementsVue from '@/components/screening-job-requirements/screening-job-requirements.vue';
 import { reactive, inject, watch, ref, onMounted, onBeforeUnmount } from 'vue';
-const { getLocation, longitude, latitude } = useLocationStore();
 import { onLoad, onShow } from '@dcloudio/uni-app';
-import { msg } from '../../../common/globalFunction';
-const { $api, navTo, debounce, vacanciesTo, customSystem, formatTotal } = inject('globalFunction');
-const emit = defineEmits(['onFilter']);
+const { $api, navTo, debounce, customSystem } = inject('globalFunction');
+import { storeToRefs } from 'pinia';
+import useLocationStore from '@/stores/useLocationStore';
+import useUserStore from '@/stores/useUserStore';
+const { userInfo } = storeToRefs(useUserStore());
+const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
+import point2 from '@/static/icon/Location1.png';
+import LocationPng from '@/static/icon/Location12.png';
+import selectFilter from '@/components/selectFilter/selectFilter.vue';
 
+const emit = defineEmits(['onFilter']);
+const range = ref([1, 2, 4, 6, 8, 10]);
+const rangeShow = ref(false);
+
+const selectFilterModel = ref(null);
 const tMap = ref();
 const progress = ref();
 const mapCovers = ref([]);
@@ -117,10 +116,10 @@ const mapControls = ref([
         id: 1,
         position: {
             // 控件位置
-            left: customSystem.systemInfo.screenWidth - 50,
-            top: 180,
-            width: 30,
-            height: 30,
+            left: customSystem.systemInfo.screenWidth - 48 - 14,
+            top: 320,
+            width: 48,
+            height: 48,
         },
         iconPath: LocationPng, // 控件图标
     },
@@ -137,17 +136,67 @@ const pageState = reactive({
     },
 });
 const isLoaded = ref(false);
+const showFilter = ref(false);
 const list = ref([]);
 const state = reactive({
     progressWidth: '200px',
 });
+const rangeOptions = ref([
+    { value: 0, text: '推荐' },
+    { value: 1, text: '最热' },
+    { value: 2, text: '最新发布' },
+]);
+
+function changeRangeShow() {
+    rangeShow.value = !rangeShow.value;
+}
+
+function changeRadius(item) {
+    pageState.search.radius = item;
+    rangeShow.value = false;
+    progressChange(item);
+}
+
+function choosePosition(index) {
+    state.tabIndex = index;
+    list.value = [];
+    if (index === 'all') {
+        pageState.search = {
+            ...pageState.search,
+            jobTitle: '',
+        };
+        getJobList('refresh');
+    } else {
+        // const id = useUserStore().userInfo.jobTitleId.split(',')[index];
+        pageState.search.jobTitle = useUserStore().userInfo.jobTitle[index];
+        getJobList('refresh');
+    }
+}
+
+function openFilter() {
+    showFilter.value = true;
+    selectFilterModel.value?.open({
+        title: '筛选',
+        maskClick: true,
+        success: (values) => {
+            pageState.search = {
+                ...pageState.search,
+            };
+            for (const [key, value] of Object.entries(values)) {
+                pageState.search[key] = value.join(',');
+            }
+            showFilter.value = false;
+            console.log(pageState.search);
+            getJobList('refresh');
+        },
+        cancel: () => {
+            showFilter.value = false;
+        },
+    });
+}
 
 onLoad(() => {});
 
-function navToPost(jobId) {
-    navTo(`/packageA/pages/post/post?jobId=${btoa(jobId)}`);
-}
-
 async function loadData() {
     try {
         if (isLoaded.value) return;
@@ -176,35 +225,39 @@ onMounted(() => {
 });
 
 function getInit() {
-    getLocation().then((res) => {
-        mapCovers.value = [
-            {
-                latitude: res.latitude,
-                longitude: res.longitude,
-                iconPath: point2,
-            },
-        ];
-        mapCircles.value = [
-            {
-                latitude: res.latitude,
-                longitude: res.longitude,
-                radius: 1000,
-                fillColor: '#00b8002e',
-            },
-        ];
-        getJobList('refresh');
-    });
+    useLocationStore()
+        .getLocation()
+        .then((res) => {
+            mapCovers.value = [
+                {
+                    latitude: res.latitude,
+                    longitude: res.longitude,
+                    iconPath: point2,
+                },
+            ];
+            mapCircles.value = [
+                {
+                    latitude: res.latitude,
+                    longitude: res.longitude,
+                    radius: 1000,
+                    fillColor: '#1c52fa25',
+                    color: '#256BFA',
+                },
+            ];
+            getJobList('refresh');
+        });
 }
 
-function progressChange(e) {
-    const range = 1 + e.value;
+function progressChange(value) {
+    const range = 1 + value;
     pageState.search.radius = range;
     mapCircles.value = [
         {
-            latitude: latitude(),
-            longitude: longitude(),
+            latitude: latitudeVal.value,
+            longitude: longitudeVal.value,
             radius: range * 1000,
-            fillColor: '#00b8002e',
+            fillColor: '#1c52fa25',
+            color: '#256BFA',
         },
     ];
     debounceAjax('refresh');
@@ -222,8 +275,8 @@ function getJobList(type = 'add') {
     let params = {
         current: pageState.page,
         pageSize: pageState.pageSize,
-        longitude: longitude(),
-        latitude: latitude(),
+        longitude: longitudeVal.value,
+        latitude: latitudeVal.value,
         ...pageState.search,
     };
 
@@ -267,118 +320,117 @@ defineExpose({ loadData, handleFilterConfirm });
 </script>
 
 <style lang="stylus" scoped>
+.nearby-select{
+    width: 184rpx;
+    height: 64rpx;
+    background: #FFFFFF;
+    border-radius: 12rpx 12rpx 12rpx 12rpx;
+    position: absolute
+    right: 28rpx;
+    top: 28rpx
+    .select-view{
+        display: flex
+        align-items: center
+        justify-content: center
+        height: 100%
+        .view-sx{
+            width: 26rpx;
+            height: 26rpx;
+        }
+        .active{
+            transform: rotate(180deg)
+        }
+    }
+    .select-list{
+        border-radius: 12rpx 12rpx 12rpx 12rpx;
+        overflow: hidden
+        position: absolute
+        top: 76rpx
+        left: 0
+        display: flex
+        flex-direction: column
+        background: #FFFFFF;
+        text-align: center
+
+        .list-item{
+            width: 184rpx;
+            line-height: 68rpx;
+            height: 68rpx;
+            border-radius: 0rpx 0rpx 0rpx 0rpx;
+        }
+    }
+}
 .nearby-scroll
     overflow: hidden;
     .nearby-map
-        height: 467rpx;
+        height: 767rpx;
         background: #e8e8e8;
         overflow: hidden
-    .nearby-list
-        // background: linear-gradient( 180deg, #4778EC 0%, #002979 100%);
-        .list-head
-            height: 77rpx;
-            background-color: #FFFFFF;
-            border-radius: 17rpx 17rpx 0rpx 0rpx;
-            position: relative;
-            top: -17rpx;
-            z-index: 9999;
-    .tab-options
-        margin-top: -15rpx;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        height: 77rpx;
-        background: #FFFFFF;
-        border-radius: 17rpx 17rpx 0rpx 0rpx;
-        padding: 0 24rpx;
-        overflow: hidden;
-        .tab-scroll
-            height: 77rpx;
-            flex: 1;
-            padding-right: 20rpx;
-            display: flex;
-            flex-direction: column;
-            justify-content: center;
-            align-items: flex-start;
-            .tab-scr-d
-                display: flex;
-                justify-content: space-between;
-                font-weight: 400;
-                font-size: 21rpx;
-                color: #000000;
-            .tab-op-left
-                display: flex;
-                align-items: center;
-                flex-wrap: nowrap;
-                .tab-list
-                    text-align: center;
-                    white-space: nowrap;
-                    margin-right: 30rpx;
-                    font-size: 28rpx;
-                    color: #606060;
-        .tab-op-right
-            display: flex;
-            align-items: center;
-            .tab-recommend
-                white-space: nowrap;
-                width: fit-content;
-                padding: 0 10rpx;
-                height: 42rpx;
-                background: #4778EC;
-                border-radius: 17rpx 17rpx 0rpx 17rpx;
-                text-align: center;
-                color: #FFFFFF;
-                font-size: 21rpx;
-                line-height: 42rpx;
-                margin-right: 12rpx;
-            .tab-number
-                font-size: 21rpx;
-                color: #606060;
-                line-height: 25rpx;
-                text-align: center;
-            .tab-filter
-                display: flex;
-                .image
-                    width: 28rpx;
-                    height: 27rpx;
-
-    .one-cards
+.nearby-list
+    .one-cards{
         display: flex;
         flex-direction: column;
         padding: 0 20rpx 20rpx 20rpx;
-        .card-box
-            width: calc(100% - 36rpx - 36rpx);
-            border-radius: 0rpx 0rpx 0rpx 0rpx;
-            background: #FFFFFF;
-            border-radius: 17rpx;
-            padding: 15rpx 36rpx;
-            margin-top: 24rpx;
-            .box-row
-                display: flex;
-                justify-content: space-between;
-                margin-top: 8rpx;
+        background: #f4f4f4
+        height: 100%
+    }
+    .nav-filter
+        padding: 16rpx 28rpx 0 28rpx
+        .filter-top
+            display: flex
+            justify-content: space-between;
+            .tab-scroll
+                flex: 1;
+                overflow: hidden;
+                margin-right: 20rpx
+                white-space: nowrap;
+                overflow: hidden;
+                text-overflow: clip;
+                -webkit-mask-image: linear-gradient(to right, black 60%, transparent);
+                mask-image: linear-gradient(to right, black 60%, transparent);
+                .jobs-left
+                    display: flex
+                    flex-wrap: nowrap
+                    .job
+                        font-weight: 400;
+                        font-size: 36rpx;
+                        color: #666D7F;
+                        margin-right: 32rpx;
+                        white-space: nowrap
+                    .active
+                        font-weight: 500;
+                        font-size: 36rpx;
+                        color: #000000;
+            .jobs-add
+                display: flex
                 align-items: center;
-                .mineText
+                justify-content: center;
+                font-weight: 400;
+                font-size: 32rpx;
+                color: #666D7F;
+                line-height: 38rpx;
+        .filter-bottom
+            display: flex
+            justify-content: space-between
+            padding: 24rpx 0
+            .btm-left
+                display: flex
+                .filterbtm
                     font-weight: 400;
-                    font-size: 21rpx;
-                    color: #606060;
-                .textblue
-                    color: #4778EC;
-                .row-right
-                    min-width: 120rpx
-                    text-align: right
-                .row-left
-                    display: flex;
-                    justify-content: space-between;
-                    .row-tag
-                        background: #13C57C;
-                        border-radius: 17rpx 17rpx 17rpx 17rpx;
-                        font-size: 21rpx;
-                        color: #FFFFFF;
-                        line-height: 25rpx;
-                        text-align: center;
-                        padding: 4rpx 8rpx;
-                        margin-right: 23rpx;
-        .card-box:first-child
-            margin-top: 6rpx;
+                    font-size: 32rpx;
+                    color: #666D7F;
+                    margin-right: 40rpx
+                .active
+                    font-weight: 500;
+                    font-size: 32rpx;
+                    color: #256BFA;
+            .btm-right
+                font-weight: 400;
+                font-size: 32rpx;
+                color: #6C7282;
+                .right-sx
+                    width: 26rpx;
+                    height: 26rpx;
+                .active
+                    transform: rotate(180deg)
 </style>
diff --git a/pages/nearby/components/three.vue b/pages/nearby/components/three.vue
index 7697e2f..628d113 100644
--- a/pages/nearby/components/three.vue
+++ b/pages/nearby/components/three.vue
@@ -1,26 +1,21 @@
 <template>
     <scroll-view :scroll-y="true" class="nearby-scroll" @scrolltolower="scrollBottom">
         <view class="three-head" @touchmove.stop.prevent>
+            <view class="one-picker">
+                <view class="oneleft button-click" @click="openFilterSubway">
+                    <view class="uni-input">{{ inputText(state.subwayId) }}</view>
+                    <view class="btm-right">
+                        <image
+                            class="right-sx"
+                            :class="{ active: showFiltersubway }"
+                            src="@/static/icon/shaixun.png"
+                        ></image>
+                    </view>
+                </view>
+                <view class="oneright">{{ state.subwayStart.stationName }}-{{ state.subwayEnd.stationName }}</view>
+            </view>
             <scroll-view class="scroll-head" :scroll-x="true" :show-scrollbar="false">
                 <view class="metro">
-                    <view class="metro-one">
-                        <picker
-                            class="one-picker"
-                            @change="bindPickerChange"
-                            @cancel="state.downup = true"
-                            @click="state.downup = false"
-                            :value="state.value"
-                            range-key="text"
-                            :range="range"
-                        >
-                            <view class="one-picker">
-                                <view class="uni-input">{{ inputText(state.subwayId) }}</view>
-                                <uni-icons v-if="state.downup" type="down" size="16"></uni-icons>
-                                <uni-icons v-else type="up" size="16"></uni-icons>
-                            </view>
-                        </picker>
-                    </view>
-                    <view class="metro-two">{{ state.subwayStart.stationName }}-{{ state.subwayEnd.stationName }}</view>
                     <view class="metro-three">
                         <view class="three-background">
                             <view class="three-items">
@@ -47,20 +42,20 @@
             </scroll-view>
         </view>
         <view class="nearby-list">
-            <view class="list-head" @touchmove.stop.prevent>
-                <view class="tab-options">
-                    <scroll-view :scroll-x="true" :show-scrollbar="false" class="tab-scroll" @touchmove.stop>
-                        <view class="tab-op-left">
+            <view class="nav-filter" @touchmove.stop.prevent>
+                <view class="filter-top">
+                    <scroll-view :scroll-x="true" :show-scrollbar="false" class="tab-scroll">
+                        <view class="jobs-left">
                             <view
-                                class="tab-list"
-                                :class="{ tabchecked: state.tabIndex === 'all' }"
+                                class="job button-click"
+                                :class="{ active: state.tabIndex === 'all' }"
                                 @click="choosePosition('all')"
                             >
                                 全部
                             </view>
                             <view
-                                class="tab-list"
-                                :class="{ tabchecked: state.tabIndex === index }"
+                                class="job button-click"
+                                :class="{ active: state.tabIndex === index }"
                                 v-for="(item, index) in userInfo.jobTitle"
                                 :key="index"
                                 @click="choosePosition(index)"
@@ -69,82 +64,68 @@
                             </view>
                         </view>
                     </scroll-view>
-                    <view class="tab-op-right">
-                        <uni-icons type="plusempty" style="margin-right: 10rpx" size="20"></uni-icons>
-                        <view class="tab-recommend">
-                            <latestHotestStatus @confirm="handelHostestSearch"></latestHotestStatus>
-                        </view>
-                        <view class="tab-filter" @click="emit('onFilter', 2)">
-                            <view class="tab-number" v-show="pageState.total">{{ formatTotal(pageState.total) }}</view>
-                            <image class="image" src="/static/icon/filter.png"></image>
+                    <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>
+                <view class="filter-bottom">
+                    <view class="btm-left">
+                        <view
+                            class="button-click filterbtm"
+                            :class="{ active: pageState.search.order === item.value }"
+                            v-for="item in rangeOptions"
+                            @click="handelHostestSearch(item)"
+                            :key="item.value"
+                        >
+                            {{ item.text }}
                         </view>
                     </view>
+                    <view class="btm-right button-click" @click="openFilter">
+                        筛选
+                        <image class="right-sx" :class="{ active: showFilter }" src="@/static/icon/shaixun.png"></image>
+                    </view>
                 </view>
             </view>
             <view class="one-cards">
-                <view class="card-box" v-for="(item, index) in list" :key="item.jobId" @click="navToPost(item.jobId)">
-                    <view class="box-row mar_top0">
-                        <view class="row-left">{{ item.jobTitle }}</view>
-                        <view class="row-right">
-                            <Salary-Expectation
-                                :max-salary="item.maxSalary"
-                                :min-salary="item.minSalary"
-                            ></Salary-Expectation>
-                        </view>
-                    </view>
-                    <view class="box-row">
-                        <view class="row-left">
-                            <view class="row-tag" v-if="item.education">
-                                <dict-Label dictType="education" :value="item.education"></dict-Label>
-                            </view>
-                            <view class="row-tag" v-if="item.experience">
-                                <dict-Label dictType="experience" :value="item.experience"></dict-Label>
-                            </view>
-                        </view>
-                    </view>
-                    <view class="box-row mar_top0">
-                        <view class="row-item mineText">{{ item.postingDate || '发布日期' }}</view>
-                        <view class="row-item mineText">{{ vacanciesTo(item.vacancies) }}</view>
-                        <view class="row-item mineText textblue"><matchingDegree :job="item"></matchingDegree></view>
-                        <view class="row-item">
-                            <uni-icons type="star" size="28"></uni-icons>
-                            <!-- <uni-icons type="star-filled" color="#FFCB47" size="30"></uni-icons> -->
-                        </view>
-                    </view>
-                    <view class="box-row">
-                        <view class="row-left mineText">{{ item.companyName }}</view>
-                        <view class="row-right mineText">
-                            青岛
-                            <dict-Label dictType="area" :value="item.jobLocationAreaCode"></dict-Label>
-                            <convert-distance
-                                :alat="item.latitude"
-                                :along="item.longitude"
-                                :blat="latitude()"
-                                :blong="longitude()"
-                            ></convert-distance>
-                        </view>
-                    </view>
-                </view>
+                <renderJobs
+                    v-if="list.length"
+                    :list="list"
+                    :longitude="longitudeVal"
+                    :latitude="latitudeVal"
+                ></renderJobs>
+                <empty v-else pdTop="60"></empty>
+                <loadmore ref="loadmoreRef"></loadmore>
             </view>
         </view>
-        <loadmore ref="loadmoreRef"></loadmore>
+        <!-- 筛选 -->
+        <select-filter ref="selectFilterModel"></select-filter>
     </scroll-view>
 </template>
 
 <script setup>
-import dictLabel from '@/components/dict-Label/dict-Label.vue';
-import { reactive, inject, watch, ref, onMounted } from 'vue';
+import { reactive, inject, watch, ref, onMounted, onBeforeUnmount } from 'vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
-import useUserStore from '@/stores/useUserStore';
-const { $api, navTo, vacanciesTo, formatTotal } = inject('globalFunction');
+const { $api, navTo, debounce, customSystem } = inject('globalFunction');
+const openSelectPopup = inject('openSelectPopup');
+import { storeToRefs } from 'pinia';
 import useLocationStore from '@/stores/useLocationStore';
-const { getLocation, longitude, latitude } = useLocationStore();
+import useUserStore from '@/stores/useUserStore';
+import useDictStore from '@/stores/useDictStore';
+const { oneDictData } = useDictStore();
+const { userInfo } = storeToRefs(useUserStore());
+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';
 const emit = defineEmits(['onFilter']);
 // status
+const showFiltersubway = ref(false);
+const showFilter = ref(false);
+const selectFilterModel = ref();
 const subwayCurrent = ref([]);
 const isLoaded = ref(false);
 const range = ref([]);
-const userInfo = ref({});
 const state = reactive({
     subwayList: [],
     subwayStart: {},
@@ -167,15 +148,15 @@ const pageState = reactive({
 });
 const list = ref([]);
 const loadmoreRef = ref(null);
-
+const rangeOptions = ref([
+    { value: 0, text: '推荐' },
+    { value: 1, text: '最热' },
+    { value: 2, text: '最新发布' },
+]);
 onLoad(() => {
     getSubway();
 });
 
-onShow(() => {
-    userInfo.value = useUserStore().userInfo;
-});
-
 function navToPost(jobId) {
     navTo(`/packageA/pages/post/post?jobId=${btoa(jobId)}`);
 }
@@ -191,6 +172,51 @@ async function loadData() {
     }
 }
 
+function openFilter() {
+    showFilter.value = true;
+    selectFilterModel.value?.open({
+        title: '筛选',
+        maskClick: true,
+        success: (values) => {
+            pageState.search = {
+                ...pageState.search,
+            };
+            for (const [key, value] of Object.entries(values)) {
+                pageState.search[key] = value.join(',');
+            }
+            showFilter.value = false;
+            console.log(pageState.search);
+            getJobList('refresh');
+        },
+        cancel: () => {
+            showFilter.value = false;
+        },
+    });
+}
+
+function openFilterSubway() {
+    const diti = state.subwayList.map((item) => ({ ...item, label: item.lineName, value: item.lineId }));
+    openSelectPopup({
+        title: '地铁',
+        maskClick: true,
+        data: [diti],
+        success: (_, [value]) => {
+            subwayCurrent.value = value;
+            state.subwayId = value.value;
+            state.value = value.value;
+            const points = value.subwayStationList;
+            state.downup = true;
+            if (points.length) {
+                state.dont = 0;
+                state.dontObj = points[0];
+                state.subwayStart = points[0];
+                state.subwayEnd = points[points.length - 1];
+                getJobList('refresh');
+            }
+        },
+    });
+}
+
 function scrollBottom() {
     getJobList();
     loadmoreRef.value.change('loading');
@@ -201,7 +227,7 @@ function choosePosition(index) {
     if (index === 'all') {
         pageState.search.jobTitle = '';
     } else {
-        pageState.search.jobTitle = useUserStore().userInfo.jobTitle[index];
+        pageState.search.jobTitle = userInfo.value.jobTitle[index];
     }
     getJobList('refresh');
 }
@@ -312,15 +338,36 @@ defineExpose({ loadData, handleFilterConfirm });
 </script>
 
 <style lang="stylus" scoped>
+.btm-right
+    font-weight: 400;
+    font-size: 32rpx;
+    color: #6C7282;
+    .right-sx
+        width: 26rpx;
+        height: 26rpx;
+    .active
+        transform: rotate(180deg)
 .tabchecked
     color:  #4778EC !important;
 .nearby-scroll
     overflow: hidden;
     .three-head
-        margin: 24rpx;
-        padding: 26rpx;
-        background: #FFFFFF;
+        margin: 24rpx 0 0 0;
+        padding: 26rpx 0 0 0;
         border-radius: 17rpx 17rpx 17rpx 17rpx;
+        .one-picker
+            height: 100%
+            padding: 0 28rpx
+            display: flex;
+            flex-wrap: nowrap;
+            align-items: center;
+            justify-content: space-between
+            .oneleft
+                display: flex;
+                flex-wrap: nowrap;
+            .oneright
+                display: flex;
+                flex-wrap: nowrap;
         .scroll-head
             width: 100%;
             overflow: hidden;
@@ -330,14 +377,9 @@ defineExpose({ loadData, handleFilterConfirm });
                 font-size: 28rpx;
                 color: #000000;
                 line-height: 33rpx;
-                width: fit-content;
+                width: 100%;
                 min-width: 100rpx;
-                .one-picker
-                    width: 100%
-                    height: 100%
-                    display: flex;
-                    flex-wrap: nowrap;
-                    align-items: center;
+
             .metro-two
                 font-size: 21rpx;
                 color: #606060;
@@ -345,7 +387,8 @@ defineExpose({ loadData, handleFilterConfirm });
                 margin-top: 6rpx;
             .metro-three
                 width: fit-content;
-                margin-top: 26rpx;
+                margin-top: 100rpx;
+                padding: 0 64rpx;
                 .three-background
                     position: relative;
                     .three-items
@@ -354,15 +397,17 @@ defineExpose({ loadData, handleFilterConfirm });
                         display: flex;
                         justify-content: space-between;
                         z-index: 2;
+                        height: 90rpx
                         .three-item
-                            margin-right: 70rpx;
+                            margin-right: 124rpx;
+                            position: relative
                             .item-dont
                                 width: 17rpx;
                                 height: 17rpx;
                                 background: #FFFFFF;
                                 border-radius: 50%;
                                 position: relative;
-                                margin-bottom: 10rpx;
+                                margin-bottom: 20rpx;
                             .donted::after
                                 position: absolute;
                                 content: '';
@@ -389,27 +434,33 @@ defineExpose({ loadData, handleFilterConfirm });
                                 line-height: 28rpx;
                                 background: #666666;
                                 border-radius: 50%;
-                            .dontend::after
-                                position: absolute;
-                                content: '终点';
-                                color: #FFFFFF;
-                                font-size: 20rpx;
-                                text-align: center;
-                                left: 0;
-                                top: -5rpx;
-                                width: 27rpx;
-                                height: 27rpx;
-                                line-height: 28rpx;
-                                background: #666666;
-                                border-radius: 50%;
+                            // .dontend::after
+                            //     position: absolute;
+                            //     content: '终';
+                            //     color: #FFFFFF;
+                            //     font-size: 20rpx;
+                            //     text-align: center;
+                            //     left: 0;
+                            //     top: -5rpx;
+                            //     width: 27rpx;
+                            //     height: 27rpx;
+                            //     line-height: 28rpx;
+                            //     background: #666666;
+                            //     border-radius: 50%;
                             .item-text
-                                width: 23rpx;
-                                font-size: 21rpx;
-                                color: #606060;
+                                position: absolute
+                                left: 0
+                                width: fit-content;
+                                font-weight: 400;
+                                font-size: 28rpx;
+                                color: #333333;
                                 line-height: 25rpx;
                                 text-align: center;
-                        .three-item:last-child
-                            margin-right: 0;
+                                white-space: nowrap
+                                transform: translate(-50% + 8rpx, 0)
+                        .three-item:nth-child(2n)
+                            .item-text
+                                margin-top: -90rpx;
                 .three-background::after
                     position: absolute;
                     content: '';
@@ -420,104 +471,71 @@ defineExpose({ loadData, handleFilterConfirm });
                     background: #FFCB47;
                     border-radius: 17rpx 17rpx 17rpx 17rpx;
                     z-index: 1;
-    .nearby-list
-        margin-top: 40rpx;
-        // background: linear-gradient( 180deg, #4778EC 0%, #002979 100%);
-        .list-head
-            height: 77rpx;
-            background-color: #FFFFFF;
-            border-radius: 17rpx 17rpx 0rpx 0rpx;
-            position: relative;
-            top: -17rpx;
-            z-index: 2;
-    .tab-options
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        height: 77rpx;
-        background: #FFFFFF;
-        border-radius: 17rpx 17rpx 0rpx 0rpx;
-        padding: 0 24rpx;
-        overflow: hidden;
-        .tab-scroll
-            height: 77rpx;
-            line-height: 77rpx;
-            flex: 1;
-            overflow: hidden;
-            padding-right: 10rpx;
-            .tab-op-left
-                display: flex;
-                align-items: center;
-                flex-wrap: nowrap;
-                .tab-list
-                    text-align: center;
-                    white-space: nowrap;
-                    margin-right: 30rpx;
-                    font-size: 28rpx;
-                    color: #606060;
-        .tab-op-right
-            display: flex;
-            align-items: center;
-            .tab-recommend
-                white-space: nowrap;
-                width: fit-content;
-                padding: 0 10rpx;
-                height: 42rpx;
-                background: #4778EC;
-                border-radius: 17rpx 17rpx 0rpx 17rpx;
-                text-align: center;
-                color: #FFFFFF;
-                font-size: 21rpx;
-                line-height: 42rpx;
-                margin-right: 12rpx;
-            .tab-number
-                font-size: 21rpx;
-                color: #606060;
-                line-height: 25rpx;
-                text-align: center;
-            .tab-filter
-                display: flex;
-                .image
-                    width: 28rpx;
-                    height: 27rpx;
-
-    .one-cards
+.nearby-list
+    border-top: 2rpx solid #EBEBEB;
+    .one-cards{
         display: flex;
         flex-direction: column;
-        padding: 20rpx;
-        .card-box
-            width: calc(100% - 36rpx - 36rpx);
-            border-radius: 0rpx 0rpx 0rpx 0rpx;
-            background: #FFFFFF;
-            border-radius: 17rpx;
-            padding: 15rpx 36rpx;
-            margin-top: 24rpx;
-            .box-row
-                display: flex;
-                justify-content: space-between;
-                margin-top: 8rpx;
+        padding: 0 20rpx 20rpx 20rpx;
+        background: #f4f4f4
+    }
+    .nav-filter
+        padding: 16rpx 28rpx 0 28rpx
+        .filter-top
+            display: flex
+            justify-content: space-between;
+            .tab-scroll
+                flex: 1;
+                overflow: hidden;
+                margin-right: 20rpx
+                white-space: nowrap;
+                overflow: hidden;
+                text-overflow: clip;
+                -webkit-mask-image: linear-gradient(to right, black 60%, transparent);
+                mask-image: linear-gradient(to right, black 60%, transparent);
+                .jobs-left
+                    display: flex
+                    flex-wrap: nowrap
+                    .job
+                        font-weight: 400;
+                        font-size: 36rpx;
+                        color: #666D7F;
+                        margin-right: 32rpx;
+                        white-space: nowrap
+                    .active
+                        font-weight: 500;
+                        font-size: 36rpx;
+                        color: #000000;
+            .jobs-add
+                display: flex
                 align-items: center;
-                .mineText
+                justify-content: center;
+                font-weight: 400;
+                font-size: 32rpx;
+                color: #666D7F;
+                line-height: 38rpx;
+        .filter-bottom
+            display: flex
+            justify-content: space-between
+            padding: 24rpx 0
+            .btm-left
+                display: flex
+                .filterbtm
                     font-weight: 400;
-                    font-size: 21rpx;
-                    color: #606060;
-                .textblue
-                    color: #4778EC;
-                .row-right
-                    min-width: 120rpx
-                    text-align: right
-                .row-left
-                    display: flex;
-                    justify-content: space-between;
-                    .row-tag
-                        background: #13C57C;
-                        border-radius: 17rpx 17rpx 17rpx 17rpx;
-                        font-size: 21rpx;
-                        color: #FFFFFF;
-                        line-height: 25rpx;
-                        text-align: center;
-                        padding: 4rpx 8rpx;
-                        margin-right: 23rpx;
-        .card-box:first-child
-            margin-top: -14rpx;
+                    font-size: 32rpx;
+                    color: #666D7F;
+                    margin-right: 40rpx
+                .active
+                    font-weight: 500;
+                    font-size: 32rpx;
+                    color: #256BFA;
+            .btm-right
+                font-weight: 400;
+                font-size: 32rpx;
+                color: #6C7282;
+                .right-sx
+                    width: 26rpx;
+                    height: 26rpx;
+                .active
+                    transform: rotate(180deg)
 </style>
diff --git a/pages/nearby/components/two.vue b/pages/nearby/components/two.vue
index 3290bc0..687d812 100644
--- a/pages/nearby/components/two.vue
+++ b/pages/nearby/components/two.vue
@@ -19,111 +19,94 @@
             </view>
         </view>
         <view class="nearby-list">
-            <view class="list-head" @touchmove.stop.prevent>
-                <view class="tab-options">
-                    <scroll-view :scroll-x="true" :show-scrollbar="false" class="tab-scroll" @touchmove.stop>
-                        <view class="tab-op-left">
+            <view class="nav-filter" @touchmove.stop.prevent>
+                <view class="filter-top">
+                    <scroll-view :scroll-x="true" :show-scrollbar="false" class="tab-scroll">
+                        <view class="jobs-left">
                             <view
-                                class="tab-list"
-                                :class="{ tabchecked: state.tabIndex === 'all' }"
+                                class="job button-click"
+                                :class="{ active: state.tabIndex === 'all' }"
                                 @click="choosePosition('all')"
                             >
                                 全部
                             </view>
                             <view
-                                class="tab-list"
-                                :class="{ tabchecked: state.tabIndex === index }"
-                                @click="choosePosition(index)"
+                                class="job button-click"
+                                :class="{ active: state.tabIndex === index }"
                                 v-for="(item, index) in userInfo.jobTitle"
                                 :key="index"
+                                @click="choosePosition(index)"
                             >
                                 {{ item }}
                             </view>
                         </view>
                     </scroll-view>
-                    <view class="tab-op-right">
-                        <uni-icons type="plusempty" style="margin-right: 10rpx" size="20"></uni-icons>
-                        <view class="tab-recommend">
-                            <latestHotestStatus @confirm="handelHostestSearch"></latestHotestStatus>
-                        </view>
-                        <view class="tab-filter" @click="emit('onFilter', 1)">
-                            <view class="tab-number" v-show="pageState.total">{{ formatTotal(pageState.total) }}</view>
-                            <image class="image" src="/static/icon/filter.png"></image>
+                    <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>
+                <view class="filter-bottom">
+                    <view class="btm-left">
+                        <view
+                            class="button-click filterbtm"
+                            :class="{ active: pageState.search.order === item.value }"
+                            v-for="item in rangeOptions"
+                            @click="handelHostestSearch(item)"
+                            :key="item.value"
+                        >
+                            {{ item.text }}
                         </view>
                     </view>
+                    <view class="btm-right button-click" @click="openFilter">
+                        筛选
+                        <image class="right-sx" :class="{ active: showFilter }" src="@/static/icon/shaixun.png"></image>
+                    </view>
                 </view>
             </view>
             <view class="one-cards">
-                <view class="card-box" v-for="(item, index) in list" :key="item.jobId" @click="navToPost(item.jobId)">
-                    <view class="box-row mar_top0">
-                        <view class="row-left">{{ item.jobTitle }}</view>
-                        <view class="row-right">
-                            <Salary-Expectation
-                                :max-salary="item.maxSalary"
-                                :min-salary="item.minSalary"
-                            ></Salary-Expectation>
-                        </view>
-                    </view>
-                    <view class="box-row">
-                        <view class="row-left">
-                            <view class="row-tag" v-if="item.education">
-                                <dict-Label dictType="education" :value="item.education"></dict-Label>
-                            </view>
-                            <view class="row-tag" v-if="item.experience">
-                                <dict-Label dictType="experience" :value="item.experience"></dict-Label>
-                            </view>
-                        </view>
-                    </view>
-                    <view class="box-row mar_top0">
-                        <view class="row-item mineText">{{ item.postingDate || '发布日期' }}</view>
-                        <view class="row-item mineText">{{ vacanciesTo(item.vacancies) }}</view>
-                        <view class="row-item mineText textblue"><matchingDegree :job="item"></matchingDegree></view>
-                        <view class="row-item">
-                            <uni-icons type="star" size="28"></uni-icons>
-                            <!-- <uni-icons type="star-filled" color="#FFCB47" size="30"></uni-icons> -->
-                        </view>
-                    </view>
-                    <view class="box-row">
-                        <view class="row-left mineText">{{ item.companyName }}</view>
-                        <view class="row-right mineText">
-                            青岛
-                            <dict-Label dictType="area" :value="item.jobLocationAreaCode"></dict-Label>
-                            <convert-distance
-                                :alat="item.latitude"
-                                :along="item.longitude"
-                                :blat="latitude()"
-                                :blong="longitude()"
-                            ></convert-distance>
-                        </view>
-                    </view>
-                </view>
+                <renderJobs
+                    v-if="list.length"
+                    :list="list"
+                    :longitude="longitudeVal"
+                    :latitude="latitudeVal"
+                ></renderJobs>
+                <empty v-else pdTop="60"></empty>
+                <loadmore ref="loadmoreRef"></loadmore>
             </view>
         </view>
-        <loadmore ref="loadmoreRef"></loadmore>
+        <!-- 筛选 -->
+        <select-filter ref="selectFilterModel"></select-filter>
     </scroll-view>
 </template>
 
 <script setup>
-import dictLabel from '@/components/dict-Label/dict-Label.vue';
-import { reactive, inject, watch, ref, onMounted } from 'vue';
+import { reactive, inject, watch, ref, onMounted, onBeforeUnmount } from 'vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
-import useDictStore from '@/stores/useDictStore';
-import useUserStore from '@/stores/useUserStore';
+const { $api, navTo, debounce, customSystem } = inject('globalFunction');
+import { storeToRefs } from 'pinia';
 import useLocationStore from '@/stores/useLocationStore';
-const { getLocation, longitude, latitude } = useLocationStore();
-const { getDictSelectOption, oneDictData } = useDictStore();
-const { $api, navTo, vacanciesTo, formatTotal } = inject('globalFunction');
+import useUserStore from '@/stores/useUserStore';
+import useDictStore from '@/stores/useDictStore';
+const { oneDictData } = useDictStore();
+const { userInfo } = storeToRefs(useUserStore());
+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';
+
 const emit = defineEmits(['onFilter']);
 const state = reactive({
     tabIndex: 'all',
     tabBxText: 'buxianquyu',
 });
 const isLoaded = ref(false);
+const showFilter = ref(false);
+const selectFilterModel = ref();
 const fromValue = reactive({
     area: 0,
 });
 const loadmoreRef = ref(null);
-const userInfo = ref({});
 const pageState = reactive({
     page: 0,
     total: 0,
@@ -135,12 +118,48 @@ const pageState = reactive({
 });
 const list = ref([]);
 
-onShow(() => {
-    userInfo.value = useUserStore().userInfo;
-});
+const rangeOptions = ref([
+    { value: 0, text: '推荐' },
+    { value: 1, text: '最热' },
+    { value: 2, text: '最新发布' },
+]);
 
-function navToPost(jobId) {
-    navTo(`/packageA/pages/post/post?jobId=${btoa(jobId)}`);
+function choosePosition(index) {
+    state.tabIndex = index;
+    list.value = [];
+    if (index === 'all') {
+        pageState.search = {
+            ...pageState.search,
+            jobTitle: '',
+        };
+        getJobList('refresh');
+    } else {
+        // const id = useUserStore().userInfo.jobTitleId.split(',')[index];
+        pageState.search.jobTitle = userInfo.value.jobTitle[index];
+        getJobList('refresh');
+    }
+}
+
+function openFilter() {
+    showFilter.value = true;
+    selectFilterModel.value?.open({
+        title: '筛选',
+        maskClick: true,
+        success: (values) => {
+            pageState.search = {
+                ...pageState.search,
+            };
+            for (const [key, value] of Object.entries(values)) {
+                pageState.search[key] = value.join(',');
+            }
+            showFilter.value = false;
+            console.log(pageState.search);
+            getJobList('refresh');
+        },
+        cancel: () => {
+            showFilter.value = false;
+        },
+    });
 }
 
 async function loadData() {
@@ -161,15 +180,15 @@ function scrollBottom() {
     loadmoreRef.value.change('loading');
 }
 
-function choosePosition(index) {
-    state.tabIndex = index;
-    if (index === 'all') {
-        pageState.search.jobTitle = '';
-    } else {
-        pageState.search.jobTitle = useUserStore().userInfo.jobTitle[index];
-    }
-    getJobList('refresh');
-}
+// function choosePosition(index) {
+//     state.tabIndex = index;
+//     if (index === 'all') {
+//         pageState.search.jobTitle = '';
+//     } else {
+//         pageState.search.jobTitle = userInfo.jobTitle[index];
+//     }
+//     getJobList('refresh');
+// }
 function changeArea(area, item) {
     fromValue.area = area;
     getJobList('refresh');
@@ -235,125 +254,96 @@ defineExpose({ loadData, handleFilterConfirm });
 .nearby-scroll
     overflow: hidden;
     .two-head
-        margin: 24rpx;
-        padding: 26rpx;
-        background: #FFFFFF;
-        display: grid;
-        grid-template-columns: repeat(4, 1fr);
-        grid-column-gap: 40rpx;
-        grid-row-gap: 30rpx;
+        margin: 22rpx;
+        display: flex;
+        flex-wrap: wrap
+        // grid-template-columns: repeat(4, 1fr);
+        // grid-column-gap: 10rpx;
+        // grid-row-gap: 24rpx;
+
         border-radius: 17rpx 17rpx 17rpx 17rpx;
         .head-item
-            min-width: 129rpx;
-            height: 44rpx;
-            line-height: 44rpx;
+            margin: 10rpx
+            white-space: nowrap
+            min-width: 156rpx
+            line-height: 64rpx
             text-align: center;
             width: fit-content;
-            background: #D9D9D9;
-            border-radius: 17rpx 17rpx 17rpx 17rpx;
             font-size: 21rpx;
-            color: #606060;
+            font-weight: 400;
+            font-size: 28rpx;
+            color: #6C7282;
+            background: #F6F6F6;
+            border-radius: 12rpx 12rpx 12rpx 12rpx;
         .active
-            background: #4778EC;
-            color: #FFFFFF;
-    .nearby-list
-        margin-top: 40rpx;
-        // background: linear-gradient( 180deg, #4778EC 0%, #002979 100%);
-        .list-head
-            height: 77rpx;
-            background-color: #FFFFFF;
-            border-radius: 17rpx 17rpx 0rpx 0rpx;
-            position: relative;
-            top: -17rpx;
-            z-index: 9999;
-    .tab-options
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        height: 77rpx;
-        background: #FFFFFF;
-        border-radius: 17rpx 17rpx 0rpx 0rpx;
-        padding: 0 24rpx;
-        overflow: hidden;
-        .tab-scroll
-            height: 77rpx;
-            line-height: 77rpx;
-            flex: 1;
-            overflow: hidden;
-            padding-right: 10rpx;
-            .tab-op-left
-                display: flex;
-                align-items: center;
-                flex-wrap: nowrap;
-                .tab-list
-                    text-align: center;
-                    white-space: nowrap;
-                    margin-right: 30rpx;
-                    font-size: 28rpx;
-                    color: #606060;
-        .tab-op-right
-            display: flex;
-            align-items: center;
-            .tab-recommend
-                white-space: nowrap;
-                width: fit-content;
-                padding: 0 10rpx;
-                height: 42rpx;
-                background: #4778EC;
-                border-radius: 17rpx 17rpx 0rpx 17rpx;
-                text-align: center;
-                color: #FFFFFF;
-                font-size: 21rpx;
-                line-height: 42rpx;
-                margin-right: 12rpx;
-            .tab-number
-                font-size: 21rpx;
-                color: #606060;
-                line-height: 25rpx;
-                text-align: center;
-            .tab-filter
-                display: flex;
-                .image
-                    width: 28rpx;
-                    height: 27rpx;
-
-    .one-cards
+            color: #256BFA;
+            background: #E9F0FF;
+            border-radius: 12rpx 12rpx 12rpx 12rpx;
+.nearby-list
+    border-top: 2rpx solid #EBEBEB;
+    .one-cards{
         display: flex;
         flex-direction: column;
-        padding: 20rpx;
-        .card-box
-            width: calc(100% - 36rpx - 36rpx);
-            border-radius: 0rpx 0rpx 0rpx 0rpx;
-            background: #FFFFFF;
-            border-radius: 17rpx;
-            padding: 15rpx 36rpx;
-            margin-top: 24rpx;
-            .box-row
-                display: flex;
-                justify-content: space-between;
-                margin-top: 8rpx;
+        padding: 0 20rpx 20rpx 20rpx;
+        background: #f4f4f4
+    }
+    .nav-filter
+        padding: 16rpx 28rpx 0 28rpx
+        .filter-top
+            display: flex
+            justify-content: space-between;
+            .tab-scroll
+                flex: 1;
+                overflow: hidden;
+                margin-right: 20rpx
+                white-space: nowrap;
+                overflow: hidden;
+                text-overflow: clip;
+                -webkit-mask-image: linear-gradient(to right, black 60%, transparent);
+                mask-image: linear-gradient(to right, black 60%, transparent);
+                .jobs-left
+                    display: flex
+                    flex-wrap: nowrap
+                    .job
+                        font-weight: 400;
+                        font-size: 36rpx;
+                        color: #666D7F;
+                        margin-right: 32rpx;
+                        white-space: nowrap
+                    .active
+                        font-weight: 500;
+                        font-size: 36rpx;
+                        color: #000000;
+            .jobs-add
+                display: flex
                 align-items: center;
-                .mineText
+                justify-content: center;
+                font-weight: 400;
+                font-size: 32rpx;
+                color: #666D7F;
+                line-height: 38rpx;
+        .filter-bottom
+            display: flex
+            justify-content: space-between
+            padding: 24rpx 0
+            .btm-left
+                display: flex
+                .filterbtm
                     font-weight: 400;
-                    font-size: 21rpx;
-                    color: #606060;
-                .textblue
-                    color: #4778EC;
-                .row-right
-                    min-width: 120rpx
-                    text-align: right
-                .row-left
-                    display: flex;
-                    justify-content: space-between;
-                    .row-tag
-                        background: #13C57C;
-                        border-radius: 17rpx 17rpx 17rpx 17rpx;
-                        font-size: 21rpx;
-                        color: #FFFFFF;
-                        line-height: 25rpx;
-                        text-align: center;
-                        padding: 4rpx 8rpx;
-                        margin-right: 23rpx;
-        .card-box:first-child
-            margin-top: -14rpx;
+                    font-size: 32rpx;
+                    color: #666D7F;
+                    margin-right: 40rpx
+                .active
+                    font-weight: 500;
+                    font-size: 32rpx;
+                    color: #256BFA;
+            .btm-right
+                font-weight: 400;
+                font-size: 32rpx;
+                color: #6C7282;
+                .right-sx
+                    width: 26rpx;
+                    height: 26rpx;
+                .active
+                    transform: rotate(180deg)
 </style>
diff --git a/pages/nearby/nearby.vue b/pages/nearby/nearby.vue
index 4ee80e6..0e06d0e 100644
--- a/pages/nearby/nearby.vue
+++ b/pages/nearby/nearby.vue
@@ -1,56 +1,36 @@
 <template>
-    <view class="app-container">
-        <view class="nearby-head">
-            <view class="head-item" :class="{ actived: state.current === 0 }" @click="changeType(0)">附近工作</view>
-            <view class="head-item" :class="{ actived: state.current === 1 }" @click="changeType(1)">区县工作</view>
-            <view class="head-item" :class="{ actived: state.current === 2 }" @click="changeType(2)">地铁周边</view>
-            <view class="head-item" :class="{ actived: state.current === 3 }" @click="changeType(3)">商圈附近</view>
+    <AppLayout title="附近" :use-scroll-view="false">
+        <template #headerleft>
+            <view class="btn">
+                <image src="@/static/icon/back.png" @click="navBack"></image>
+            </view>
+        </template>
+        <view class="app-container">
+            <view class="nearby-head">
+                <view class="head-item" :class="{ actived: state.current === 0 }" @click="changeType(0)">附近工作</view>
+                <view class="head-item" :class="{ actived: state.current === 1 }" @click="changeType(1)">区县工作</view>
+                <view class="head-item" :class="{ actived: state.current === 2 }" @click="changeType(2)">地铁周边</view>
+                <view class="head-item" :class="{ actived: state.current === 3 }" @click="changeType(3)">商圈附近</view>
+            </view>
+            <view class="nearby-content">
+                <swiper class="swiper" :current="state.current" @change="changeSwiperType">
+                    <swiper-item class="swiper-item" v-for="(_, index) in 4" :key="index">
+                        <component :is="components[index]" :ref="(el) => handelComponentsRef(el, index)" />
+                    </swiper-item>
+                </swiper>
+            </view>
         </view>
-        <view class="nearby-content">
-            <swiper class="swiper" :current="state.current" @change="changeSwiperType">
-                <!-- 动态绑定ref -->
-                <swiper-item class="swiper-item" v-for="(_, index) in 4" :key="index">
-                    <component
-                        :is="components[index]"
-                        @onFilter="addfileter"
-                        :ref="(el) => handelComponentsRef(el, index)"
-                    />
-                </swiper-item>
-            </swiper>
-        </view>
-        <!-- 弹窗  -->
-        <screeningJobRequirementsVue
-            :area="false"
-            v-model:show="showFilter"
-            @confirm="handleFilterConfirm"
-        ></screeningJobRequirementsVue>
-        <screeningJobRequirementsVue
-            :area="false"
-            v-model:show="showFilter1"
-            @confirm="handleFilterConfirm"
-        ></screeningJobRequirementsVue>
-        <screeningJobRequirementsVue
-            :area="false"
-            v-model:show="showFilter2"
-            @confirm="handleFilterConfirm"
-        ></screeningJobRequirementsVue>
-        <screeningJobRequirementsVue
-            :area="false"
-            v-model:show="showFilter3"
-            @confirm="handleFilterConfirm"
-        ></screeningJobRequirementsVue>
-    </view>
+    </AppLayout>
 </template>
 
 <script setup>
-import screeningJobRequirementsVue from '@/components/screening-job-requirements/screening-job-requirements.vue';
 import oneComponent from './components/one.vue';
 import twoComponent from './components/two.vue';
 import threeComponent from './components/three.vue';
 import fourComponent from './components/four.vue';
 import { reactive, inject, watch, ref, onMounted } from 'vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
-const { $api, debounce, throttle } = inject('globalFunction');
+const { $api, debounce, throttle, navBack } = inject('globalFunction');
 const loadedMap = reactive([false, false, false, false]);
 const swiperRefs = [ref(null), ref(null), ref(null), ref(null)];
 const components = [oneComponent, twoComponent, threeComponent, fourComponent];
@@ -66,35 +46,13 @@ const state = reactive({
     all: [{}],
 });
 
-// filter education aera scale 。。。。
-function handleFilterConfirm(e) {
-    swiperRefs[filterId.value].value?.handleFilterConfirm(e);
-}
-
-function addfileter(val) {
-    filterId.value = val;
-    switch (val) {
-        case 0:
-            showFilter.value = true;
-            break;
-        case 1:
-            showFilter1.value = true;
-            break;
-        case 2:
-            showFilter2.value = true;
-            break;
-        case 3:
-            showFilter3.value = true;
-            break;
-    }
-}
-
 onMounted(() => {
     handleTabChange(state.current);
 });
 
 const handelComponentsRef = (el, index) => {
     if (el) {
+        console.log(el);
         swiperRefs[index].value = el;
     }
 };
@@ -118,29 +76,43 @@ function handleTabChange(index) {
 </script>
 
 <style lang="stylus" scoped>
+.btn {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    width: 60rpx;
+    height: 60rpx;
+}
+image {
+    height: 100%;
+    width: 100%;
+}
 .app-container
     width: 100%;
-    height: calc(100vh - var(--window-top) - var(--status-bar-height) - var(--window-bottom));
-    background: linear-gradient( 180deg, #4778EC 0%, #002979 100%);
+    height: 100%;
     display: flex;
     flex-direction: column;
     .nearby-head
         height: 63rpx;
-        font-size: 28rpx;
-        color: #FFFFFF;
         line-height: 63rpx;
         text-align: center;
         display: flex;
         align-items: center;
+        font-weight: 400;
+        font-size: 32rpx;
+        color: #666D7F;
         .head-item
             width: calc(100%  / 4);
             z-index: 9
         .actived
             // width: 169rpx;
-            height: 63rpx;
-            background: #13C57C;
-            box-shadow: 0rpx 7rpx 7rpx 0rpx rgba(0,0,0,0.25);
-            border-radius: 0rpx 0rpx 0rpx 0rpx;
+            // height: 63rpx;
+            // background: #13C57C;
+            // box-shadow: 0rpx 7rpx 7rpx 0rpx rgba(0,0,0,0.25);
+            // border-radius: 0rpx 0rpx 0rpx 0rpx;
+            font-weight: 500;
+            font-size: 32rpx;
+            color: #000000;
     .nearby-content
         flex: 1;
         overflow: hidden;
diff --git a/pages/search/search.vue b/pages/search/search.vue
new file mode 100644
index 0000000..24cdc37
--- /dev/null
+++ b/pages/search/search.vue
@@ -0,0 +1,247 @@
+<template>
+    <view class="container">
+        <view class="top">
+            <image class="btnback button-click" src="@/static/icon/back.png" @click="navBack"></image>
+            <view class="search-box">
+                <uni-icons
+                    class="iconsearch"
+                    color="#666666"
+                    type="search"
+                    size="18"
+                    @confirm="searchCollection"
+                ></uni-icons>
+                <input
+                    class="inputed"
+                    type="text"
+                    focus
+                    v-model="searchValue"
+                    placeholder="搜索职位名称"
+                    placeholder-class="placeholder"
+                />
+            </view>
+            <view class="search-btn button-click" @click="searchBtn">搜索</view>
+        </view>
+        <scroll-view scroll-y class="Detailscroll-view" v-show="list.length" @scrolltolower="getJobList('add')">
+            <view class="cards-box">
+                <renderJobs :list="list" :longitude="longitude" :latitude="latitude"></renderJobs>
+            </view>
+        </scroll-view>
+        <view class="main-content" v-show="!list.length">
+            <view class="content-top">
+                <view class="top-left">历史搜索</view>
+                <view class="top-right button-click" @click="remove">
+                    <uni-icons type="trash" color="#C1C1C1" size="20"></uni-icons>
+                </view>
+            </view>
+            <view class="content-history">
+                <view class="history-tag" v-for="(item, index) in historyList" :key="index" @click="searchFn(item)">
+                    {{ item }}
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import { inject, ref, reactive } from 'vue';
+import { onLoad, onShow, onReachBottom } from '@dcloudio/uni-app';
+import SelectJobs from '@/components/selectJobs/selectJobs.vue';
+const { $api, navBack } = inject('globalFunction');
+import useLocationStore from '@/stores/useLocationStore';
+const { getLocation, longitude, latitude } = useLocationStore();
+import { storeToRefs } from 'pinia';
+const searchValue = ref('');
+const historyList = ref([]);
+const list = ref([]);
+const pageState = reactive({
+    page: 0,
+    total: 0,
+    maxPage: 2,
+    pageSize: 10,
+    search: {
+        order: 0,
+    },
+});
+
+onLoad(() => {
+    let arr = uni.getStorageSync('searchList');
+    if (arr) {
+        historyList.value = uni.getStorageSync('searchList');
+    }
+});
+
+function searchFn(item) {
+    searchValue.value = item;
+    searchBtn();
+}
+
+function searchBtn() {
+    if (!searchValue.value) {
+        return;
+    }
+    historyList.value.unshift(searchValue.value);
+    historyList.value = unique(historyList.value);
+    uni.setStorageSync('searchList', historyList.value);
+    getJobList('refresh');
+}
+
+function searchCollection(e) {
+    const value = e.detail.value;
+    pageState.search.jobTitle = value;
+    getJobList('refresh');
+}
+
+function unique(arr) {
+    for (var i = 0; i < arr.length; i++) {
+        for (var j = i + 1; j < arr.length; j++) {
+            if (arr[i] == arr[j]) {
+                //第一个等同于第二个，splice方法删除第二个
+                arr.splice(j, 1);
+                j--;
+            }
+        }
+    }
+    return arr;
+}
+
+function remove() {
+    uni.removeStorage({
+        key: 'searchList',
+    });
+    historyList.value = [];
+}
+
+function getJobList(type = 'add') {
+    console.log(type);
+    if (type === 'add' && pageState.page < pageState.maxPage) {
+        pageState.page += 1;
+    }
+    if (type === 'refresh') {
+        list.value = [];
+        pageState.page = 1;
+        pageState.maxPage = 2;
+    }
+    let params = {
+        current: pageState.page,
+        pageSize: pageState.pageSize,
+        ...pageState.search,
+        jobTitle: searchValue.value,
+    };
+
+    $api.createRequest('/app/job/list', params).then((resData) => {
+        const { rows, total } = resData;
+        if (type === 'add') {
+            const str = pageState.pageSize * (pageState.page - 1);
+            const end = list.value.length;
+            const reslist = rows;
+            list.value.splice(str, end, ...reslist);
+        } else {
+            list.value = rows;
+        }
+        pageState.total = resData.total;
+        pageState.maxPage = Math.ceil(pageState.total / pageState.pageSize);
+        if (rows.length < pageState.pageSize) {
+            // loadmoreRef.value?.change('noMore');
+        } else {
+            // loadmoreRef.value?.change('more');
+        }
+    });
+}
+</script>
+
+<style lang="stylus" scoped>
+.cards-box{
+     padding: 0 28rpx 28rpx 28rpx
+}
+.Detailscroll-view{
+    flex: 1
+    overflow: hidden
+}
+.container{
+    display: flex
+    flex-direction: column
+    background: #F4f4f4
+    height: calc(100vh - var(--window-top) - var(--status-bar-height) - var(--window-bottom));
+    .main-content{
+        background: #FFFFFF
+        height: 100%
+        .content-top{
+            padding: 28rpx
+            display: flex
+            justify-content: space-between
+            align-items: center
+            .top-left{
+                font-weight: 600;
+                font-size: 36rpx;
+                color: #000000;
+                line-height: 42rpx;
+            }
+        }
+        .content-history{
+            padding: 0 28rpx;
+            display: flex
+            flex-wrap: wrap
+            .history-tag{
+                margin-right: 40rpx
+                margin-bottom: 20rpx
+                white-space: nowrap
+                font-weight: 400;
+                font-size: 28rpx;
+                color: #333333;
+                background: #F5F5F5;
+                border-radius: 12rpx 12rpx 12rpx 12rpx;
+                width: fit-content;
+                padding: 12rpx 20rpx
+            }
+        }
+    }
+    .top {
+		display: flex;
+		align-items: center;
+        justify-content: space-between
+		background-color: #fff;
+		padding: 20rpx 20rpx;
+        position: sticky;
+        top: 0
+        .btnback{
+            width: 60rpx;
+            height: 60rpx;
+        }
+        .search-box{
+            flex: 1;
+            padding: 0 24rpx 0 6rpx;
+            position: relative
+            .inputed {
+                padding-left: 30rpx
+                width: 100%;
+            	background: #F8F8F8;
+            	font-size: 28rpx;
+            	font-family: PingFang SC;
+            	font-weight: 400;
+            	line-height: 36rpx;
+            	color: #666666;
+            	padding: 0 30rpx 0 80rpx;
+            	box-sizing: border-box;
+                height: 80rpx;
+                background: #F5F5F5;
+                border-radius: 75rpx 75rpx 75rpx 75rpx;
+            }
+            .iconsearch{
+                position: absolute
+                top: 50%
+                left: 36rpx
+                transform: translate(0, -50%)
+            }
+        }
+		.search-btn {
+            padding-right: 18rpx;
+			text-align: center;
+			height: 64rpx;
+			line-height: 64rpx;
+			font-size: 32rpx;
+			font-weight: 500;
+			color: #256BFA;
+		}
+	}
+}
+</style>
diff --git a/static/.DS_Store b/static/.DS_Store
index 6c4f25a..22acbde 100644
Binary files a/static/.DS_Store and b/static/.DS_Store differ
diff --git a/static/font/.DS_Store b/static/font/.DS_Store
new file mode 100644
index 0000000..6d99f85
Binary files /dev/null and b/static/font/.DS_Store differ
diff --git a/static/font/DingTalk JinBuTi_min.ttf b/static/font/DingTalk JinBuTi_min.ttf
new file mode 100644
index 0000000..1d8ae5d
Binary files /dev/null and b/static/font/DingTalk JinBuTi_min.ttf differ
diff --git a/static/icon/.DS_Store b/static/icon/.DS_Store
index 15ee272..0dc73a7 100644
Binary files a/static/icon/.DS_Store and b/static/icon/.DS_Store differ
diff --git a/static/icon/Location1.png b/static/icon/Location1.png
new file mode 100644
index 0000000..a990a12
Binary files /dev/null and b/static/icon/Location1.png differ
diff --git a/static/icon/Location12.png b/static/icon/Location12.png
new file mode 100644
index 0000000..ac6a3b6
Binary files /dev/null and b/static/icon/Location12.png differ
diff --git a/static/icon/aibg.png b/static/icon/aibg.png
new file mode 100644
index 0000000..83474f3
Binary files /dev/null and b/static/icon/aibg.png differ
diff --git a/static/icon/back.png b/static/icon/back.png
new file mode 100644
index 0000000..db6e87e
Binary files /dev/null and b/static/icon/back.png differ
diff --git a/static/icon/backAI2.png b/static/icon/backAI2.png
new file mode 100644
index 0000000..e266e3b
Binary files /dev/null and b/static/icon/backAI2.png differ
diff --git a/static/icon/background2.png b/static/icon/background2.png
new file mode 100644
index 0000000..a01bf88
Binary files /dev/null and b/static/icon/background2.png differ
diff --git a/static/icon/boy1.png b/static/icon/boy1.png
new file mode 100644
index 0000000..5417adf
Binary files /dev/null and b/static/icon/boy1.png differ
diff --git a/static/icon/broadcast1.png b/static/icon/broadcast1.png
index 3d3e514..e9e189c 100644
Binary files a/static/icon/broadcast1.png and b/static/icon/broadcast1.png differ
diff --git a/static/icon/collect2.png b/static/icon/collect2.png
new file mode 100644
index 0000000..8af5939
Binary files /dev/null and b/static/icon/collect2.png differ
diff --git a/static/icon/collect3.png b/static/icon/collect3.png
new file mode 100644
index 0000000..e53ddc5
Binary files /dev/null and b/static/icon/collect3.png differ
diff --git a/static/icon/companyBG.png b/static/icon/companyBG.png
new file mode 100644
index 0000000..f2279c1
Binary files /dev/null and b/static/icon/companyBG.png differ
diff --git a/static/icon/companyIcon.png b/static/icon/companyIcon.png
new file mode 100644
index 0000000..45a6114
Binary files /dev/null and b/static/icon/companyIcon.png differ
diff --git a/static/icon/companyLocation.png b/static/icon/companyLocation.png
new file mode 100644
index 0000000..bd2fab6
Binary files /dev/null and b/static/icon/companyLocation.png differ
diff --git a/static/icon/copy1.png b/static/icon/copy1.png
index 5da8c50..33c7b1d 100644
Binary files a/static/icon/copy1.png and b/static/icon/copy1.png differ
diff --git a/static/icon/date1.png b/static/icon/date1.png
new file mode 100644
index 0000000..1ca2c73
Binary files /dev/null and b/static/icon/date1.png differ
diff --git a/static/icon/delete1.png b/static/icon/delete1.png
new file mode 100644
index 0000000..521d152
Binary files /dev/null and b/static/icon/delete1.png differ
diff --git a/static/icon/downs.png b/static/icon/downs.png
new file mode 100644
index 0000000..dd240a2
Binary files /dev/null and b/static/icon/downs.png differ
diff --git a/static/icon/edit1.png b/static/icon/edit1.png
new file mode 100644
index 0000000..5a34886
Binary files /dev/null and b/static/icon/edit1.png differ
diff --git a/static/icon/empty.png b/static/icon/empty.png
new file mode 100644
index 0000000..0f9bad9
Binary files /dev/null and b/static/icon/empty.png differ
diff --git a/static/icon/feedback1.png b/static/icon/feedback1.png
index aa7ad87..fe148d1 100644
Binary files a/static/icon/feedback1.png and b/static/icon/feedback1.png differ
diff --git a/static/icon/fujin.png b/static/icon/fujin.png
new file mode 100644
index 0000000..61f35d3
Binary files /dev/null and b/static/icon/fujin.png differ
diff --git a/static/icon/girl1.png b/static/icon/girl1.png
new file mode 100644
index 0000000..08ffc95
Binary files /dev/null and b/static/icon/girl1.png differ
diff --git a/static/icon/jinxuan.png b/static/icon/jinxuan.png
new file mode 100644
index 0000000..dff5a39
Binary files /dev/null and b/static/icon/jinxuan.png differ
diff --git a/static/icon/location3.png b/static/icon/location3.png
new file mode 100644
index 0000000..212eeda
Binary files /dev/null and b/static/icon/location3.png differ
diff --git a/static/icon/mapLine.png b/static/icon/mapLine.png
new file mode 100644
index 0000000..bd2fab6
Binary files /dev/null and b/static/icon/mapLine.png differ
diff --git a/static/icon/msgTopbg.png b/static/icon/msgTopbg.png
new file mode 100644
index 0000000..8b8e9e9
Binary files /dev/null and b/static/icon/msgTopbg.png differ
diff --git a/static/icon/msgtyoe2.png b/static/icon/msgtyoe2.png
new file mode 100644
index 0000000..3e4ddd6
Binary files /dev/null and b/static/icon/msgtyoe2.png differ
diff --git a/static/icon/msgtype.png b/static/icon/msgtype.png
new file mode 100644
index 0000000..1a6d8df
Binary files /dev/null and b/static/icon/msgtype.png differ
diff --git a/static/icon/msgtype3.png b/static/icon/msgtype3.png
new file mode 100644
index 0000000..e11673e
Binary files /dev/null and b/static/icon/msgtype3.png differ
diff --git a/static/icon/post12.png b/static/icon/post12.png
new file mode 100644
index 0000000..6ee8cd3
Binary files /dev/null and b/static/icon/post12.png differ
diff --git a/static/icon/post13.png b/static/icon/post13.png
new file mode 100644
index 0000000..aded0e8
Binary files /dev/null and b/static/icon/post13.png differ
diff --git a/static/icon/refresh1.png b/static/icon/refresh1.png
index 33d4172..8ec850c 100644
Binary files a/static/icon/refresh1.png and b/static/icon/refresh1.png differ
diff --git a/static/icon/server1.png b/static/icon/server1.png
new file mode 100644
index 0000000..980ac7e
Binary files /dev/null and b/static/icon/server1.png differ
diff --git a/static/icon/server2.png b/static/icon/server2.png
new file mode 100644
index 0000000..af47843
Binary files /dev/null and b/static/icon/server2.png differ
diff --git a/static/icon/server3.png b/static/icon/server3.png
new file mode 100644
index 0000000..94130f6
Binary files /dev/null and b/static/icon/server3.png differ
diff --git a/static/icon/server4.png b/static/icon/server4.png
new file mode 100644
index 0000000..62ad641
Binary files /dev/null and b/static/icon/server4.png differ
diff --git a/static/icon/shaixun.png b/static/icon/shaixun.png
new file mode 100644
index 0000000..b7b4c27
Binary files /dev/null and b/static/icon/shaixun.png differ
diff --git a/static/icon/stop1.png b/static/icon/stop1.png
index 40960db..7cfbdb7 100644
Binary files a/static/icon/stop1.png and b/static/icon/stop1.png differ
diff --git a/stores/useDictStore.js b/stores/useDictStore.js
index e7c7078..e1e75ee 100644
--- a/stores/useDictStore.js
+++ b/stores/useDictStore.js
@@ -37,7 +37,8 @@ const useDictStore = defineStore("dict", () => {
         isPublish: [],
         sex: [],
         affiliation: [],
-        industry: []
+        industry: [],
+        nature: []
     })
     // political_affiliation
     const getDictData = async (dictType, dictName) => {
@@ -48,13 +49,14 @@ const useDictStore = defineStore("dict", () => {
                     return data
                 })
             }
-            const [education, experience, area, scale, sex, affiliation] = await Promise.all([
+            const [education, experience, area, scale, sex, affiliation, nature] = await Promise.all([
                 getDictSelectOption('education'),
                 getDictSelectOption('experience'),
                 getDictSelectOption('area', true),
                 getDictSelectOption('scale'),
                 getDictSelectOption('app_sex'),
                 getDictSelectOption('political_affiliation'),
+                getDictSelectOption('company_nature'),
             ]);
 
             state.education = education;
@@ -63,6 +65,7 @@ const useDictStore = defineStore("dict", () => {
             state.scale = scale;
             state.sex = sex;
             state.affiliation = affiliation;
+            state.nature = nature
             complete.value = true
             getIndustryDict() // 获取行业
         } catch (error) {
diff --git a/stores/useLocationStore.js b/stores/useLocationStore.js
index 60fa145..09aaae0 100644
--- a/stores/useLocationStore.js
+++ b/stores/useLocationStore.js
@@ -9,8 +9,8 @@ import {
 } from '@/common/globalFunction.js'
 const useLocationStore = defineStore("location", () => {
     // 定义状态
-    const longitudeVal = ref('') // 经度
-    const latitudeVal = ref('') //纬度
+    const longitudeVal = ref(null) // 经度
+    const latitudeVal = ref(null) //纬度
 
     function getLocation() {
         return new Promise((resole, reject) => {
@@ -63,6 +63,9 @@ const useLocationStore = defineStore("location", () => {
         getLocation,
         longitude,
         latitude,
+        longitudeVal,
+        latitudeVal
+
     }
 })
 
diff --git a/stores/useRecommedIndexedDBStore.js b/stores/useRecommedIndexedDBStore.js
index d0ea38c..10e6475 100644
--- a/stores/useRecommedIndexedDBStore.js
+++ b/stores/useRecommedIndexedDBStore.js
@@ -28,6 +28,15 @@ class JobRecommendation {
         return Date.now();
     }
 
+    deleteHostiry(name) {
+        for (const [key, value] of Object.entries(this.conditions)) {
+            if (key === name) {
+                delete this.conditions[key]
+            }
+        }
+        this.askHistory.delete(name)
+    }
+
     /**
      * 获取下一个符合条件的推荐问题
      * @returns {string|null} 返回推荐的问题，或 null（无可询问的）
@@ -71,6 +80,23 @@ export const useRecommedIndexedDBStore = defineStore("indexedDB", () => {
         if (!baseDB.isDBReady) await baseDB.initDB();
         return await baseDB.db.add(tableName.value, payload);
     }
+    // 清除数据 1、清除数据库数据
+    async function deleteRecords(payload) {
+        if (!baseDB.isDBReady) await baseDB.initDB();
+        try {
+            const jobstr = payload.jobCategory
+            const jobsObj = {
+                '地区': 'jobLocationAreaCodeLabel',
+                '岗位': 'jobCategory',
+                '经验': 'experIenceLabel',
+            }
+            const [name, value] = jobstr.split(':')
+            const nameAttr = jobsObj[name]
+            jobRecommender.deleteHostiry(jobstr)
+            return await baseDB.db.deleteByCondition(tableName.value, (record) => record[nameAttr] ===
+                value);
+        } catch {}
+    }
 
     // 获取所有数据
     async function getRecord() {
@@ -108,6 +134,7 @@ export const useRecommedIndexedDBStore = defineStore("indexedDB", () => {
         addRecord,
         getRecord,
         JobParameter,
-        analyzer
+        analyzer,
+        deleteRecords
     };
 });
\ No newline at end of file
diff --git a/unpackage/.DS_Store b/unpackage/.DS_Store
index 86154e4..01f80a7 100644
Binary files a/unpackage/.DS_Store and b/unpackage/.DS_Store differ
diff --git a/unpackage/dist/.DS_Store b/unpackage/dist/.DS_Store
index fd4f020..22a2115 100644
Binary files a/unpackage/dist/.DS_Store and b/unpackage/dist/.DS_Store differ
diff --git a/unpackage/dist/build/.DS_Store b/unpackage/dist/build/.DS_Store
index 8614cff..defd879 100644
Binary files a/unpackage/dist/build/.DS_Store and b/unpackage/dist/build/.DS_Store differ