diff --git a/App.vue b/App.vue
index 127baa3..c48d99b 100644
--- a/App.vue
+++ b/App.vue
@@ -47,22 +47,4 @@
 		line-height: 60rpx;
 		color: #aaa;
 	}
-
-	.moreFormItem-enter-active,
-	.moreFormItem-leave-active {
-		transition: max-height 0.3s ease, opacity 0.3s ease;
-		overflow: hidden;
-	}
-
-	.moreFormItem-enter-from,
-	.moreFormItem-leave-to {
-		max-height: 0;
-		opacity: 0;
-	}
-
-	.moreFormItem-enter-to,
-	.moreFormItem-leave-from {
-		max-height: 500rpx;
-		opacity: 1;
-	}
 </style>
\ No newline at end of file
diff --git a/api/contractInfo.js b/api/contractInfo.js
new file mode 100644
index 0000000..21ce137
--- /dev/null
+++ b/api/contractInfo.js
@@ -0,0 +1,11 @@
+import {
+	request
+} from '@/utils/request'
+
+export const listContractInfo = (query) => {
+	return request({
+		url: '/oa/erp/contractInfo/list',
+		method: 'get',
+		data: query
+	});
+};
\ No newline at end of file
diff --git a/api/user.js b/api/user.js
new file mode 100644
index 0000000..ebc3a4d
--- /dev/null
+++ b/api/user.js
@@ -0,0 +1,17 @@
+import {
+	request
+} from '@/utils/request'
+
+export function getInfo() {
+	return request({
+		url: '/system/user/getInfo',
+		method: 'get'
+	});
+}
+
+export function getRouters() {
+	return request({
+		url: '/system/menu/getRouters',
+		method: 'get'
+	});
+}
\ No newline at end of file
diff --git a/api/workHourReporting.js b/api/workHourReporting.js
new file mode 100644
index 0000000..1d7dbe8
--- /dev/null
+++ b/api/workHourReporting.js
@@ -0,0 +1,11 @@
+import {
+	request
+} from '@/utils/request'
+
+export const listProjectInfo = (query) => {
+	return request({
+		url: '/oa/erp/projectInfo/list',
+		method: 'get',
+		data: query
+	});
+};
\ No newline at end of file
diff --git a/components/Card.vue b/components/Card.vue
index fa99789..165d8c6 100644
--- a/components/Card.vue
+++ b/components/Card.vue
@@ -26,11 +26,10 @@
 
 		.title {
 			color: #333;
-			font-size: 32rpx
+			font-size: 32rpx;
+			margin-bottom: 30rpx;
 		}
 
-		.content {
-			margin-top: 30rpx;
-		}
+		.content {}
 	}
 </style>
\ No newline at end of file
diff --git a/components/DictTag.vue b/components/DictTag.vue
index f754a4a..722f038 100644
--- a/components/DictTag.vue
+++ b/components/DictTag.vue
@@ -1,4 +1,4 @@
-<template>
+<template> 
 	<span v-if="type==='text'">{{optionValue}}</span>
 	<uni-tag v-else-if="values.includes(value)" :text="optionValue||''" :type="tagType" :inverted="true"></uni-tag>
 	<uni-tag v-else :text="value||''" :inverted="true"></uni-tag>
@@ -10,7 +10,7 @@
 	} from 'vue'
 	const props = defineProps({
 		options: Array,
-		value: Number | String | Array,
+		value: [Number, String, Array],
 		showValue: Boolean,
 		separator: String,
 		type: String,
@@ -21,7 +21,7 @@
 		return Array.isArray(props.value) ? props.value.map((item) => '' + item) : String(props.value).split(props
 			.separator || ',');
 	});
-	const optionValue = computed(() => {
+	const optionValue = computed(() => { 
 		let obj = (props.options || []).find(e => e.value === props.value)
 		return obj?.label || ''
 	});
diff --git a/components/SearchInput.vue b/components/SearchInput.vue
new file mode 100644
index 0000000..5ebbbdc
--- /dev/null
+++ b/components/SearchInput.vue
@@ -0,0 +1,54 @@
+<template>
+	<view class="searchInput">
+		<view class="input">
+			<input style="height: 60rpx;" @input="onInput" v-model="input" />
+		</view>
+		<button class="btn" type="primary" @tap="btnClick">搜索</button>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted
+	} from 'vue'
+	const input = ref('')
+	const props = defineProps(['title', 'modelValue'])
+	const emit = defineEmits(['search'])
+	const btnClick = (e) => {
+		emit('search', props.value)
+	}
+	const onInput = (e) => {
+		emit('update:modelValue', e.detail.value)
+	}
+	onMounted(() => {
+		input.value = props.modelValue
+	})
+</script>
+
+<style scoped lang="scss">
+	.searchInput {
+		width: 100%;
+		height: 60rpx;
+		border: 1px solid #ccc;
+		border-radius: 30rpx;
+
+		.input {
+			display: inline-block;
+			margin: 0 10rpx 0 20rpx;
+			width: calc(100% - 10rpx - 20rpx - 100rpx - 6rpx);
+		}
+
+		.btn {
+			display: inline-block;
+			width: 100rpx;
+			height: 48rpx;
+			line-height: 48rpx;
+			vertical-align: top;
+			margin-top: 6rpx;
+			padding: 0;
+			border-radius: 24rpx;
+			font-size: 26rpx
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/Top.vue b/components/Top.vue
new file mode 100644
index 0000000..88c6306
--- /dev/null
+++ b/components/Top.vue
@@ -0,0 +1,52 @@
+<template>
+	<view class="top">
+		<view class="back">
+			<image class="back" :src="`${imgUrl}/icon/back.png`" mode="aspectFit" @tap="toback">
+			</image>
+		</view>
+		<view class="text">
+			{{text}}
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		imgUrl
+	} from '@/common/config';
+	import {
+		router
+	} from '../utils/router';
+	const props = defineProps(['text'])
+	const toback = () => {
+		router.back()
+	}
+</script>
+
+<style scoped lang="scss">
+	.top {
+		width: 750rpx;
+		height: 100rpx;
+		line-height: 100rpx;
+		text-align: center;
+		background-color: #fff;
+		position: relative;
+
+		.back {
+			position: absolute;
+			display: inline-block;
+			height: 40rpx;
+			width: 40rpx;
+			top: 50%;
+			left: 40rpx;
+			transform: translate(-50%, -50%);
+		}
+
+		.text {
+			vertical-align: top;
+			display: inline-block;
+			width: 750rpx;
+			height: 100%;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/form/FormItem.vue b/components/form/FormItem.vue
new file mode 100644
index 0000000..88f57d5
--- /dev/null
+++ b/components/form/FormItem.vue
@@ -0,0 +1,27 @@
+<template>
+	<view class="form-item">
+		<view class="title" :style="{width : (width || 'auto')}">{{title}}</view>
+		<view class="item">
+			<slot></slot>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	const props = defineProps(['title', 'width'])
+</script>
+
+<style scoped>
+	.title {
+		display: inline-block;
+		margin-right: 20rpx;
+		line-height: 60rpx;
+	}
+
+	.item {
+		flex: 1;
+		width: 200rpx;
+		display: inline-block;
+		vertical-align: top;
+	}
+</style>
\ No newline at end of file
diff --git a/components/form/Input.vue b/components/form/Input.vue
new file mode 100644
index 0000000..a06f689
--- /dev/null
+++ b/components/form/Input.vue
@@ -0,0 +1,46 @@
+<template>
+	<view>
+		<input :disabled="disabled" class="input" v-model="model" :placeholder="props.placeholder" @change="onChange" />
+	</view>
+</template>
+
+<script setup>
+	import {
+		computed
+	} from 'vue'
+
+	const props = defineProps({
+		modelValue: Object,
+		placeholder: String,
+		disabled:Boolean
+	})
+
+	const emit = defineEmits(['update:modelValue', 'change'])
+
+	const model = computed({
+		get() {
+			return props.modelValue
+		},
+		set(val) {
+			emit('update:modelValue', val)
+		}
+	})
+
+	const onChange = (val) => {
+		let data = props.modelValue?.[val.detail.value]?.value || ''
+		emit('change', modelValue)
+	}
+</script>
+
+<style lang="scss" scoped>
+	.input {
+		height: 50rpx;
+		line-height: 50rpx;
+		font-size: 24rpx;
+		color: #333;
+
+		.uni-input-placeholder {
+			font-size: 24rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/form/Picker.vue b/components/form/Picker.vue
new file mode 100644
index 0000000..0049d3a
--- /dev/null
+++ b/components/form/Picker.vue
@@ -0,0 +1,35 @@
+<template>
+	<view>
+		<picker mode="selector" @change="onChange" :range-key="key||'label'" :value="valueIndex" :range="data">
+			<view class="picker">
+				{{(data.find(e=>e.value == value)||{}).label}}
+			</view>
+		</picker>
+	</view>
+</template>
+
+<script setup>
+	import {
+		computed,
+	} from 'vue'
+	const props = defineProps(['key', 'value', 'data'])
+	const emit = defineEmits(['change'])
+	const onChange = (val) => {
+		let data = props.data?.[val.detail.value]?.value || ''
+		emit('change', data)
+	}
+	const valueIndex = computed(() => {
+		if (!props.data) return 0
+		const index = props.data.findIndex(e => e.value === props.value)
+		return index >= 0 ? index : 0
+	})
+</script>
+
+<style lang="scss" scoped>
+	.picker {
+		height: 50rpx;
+		line-height: 50rpx;
+		font-size: 24rpx;
+		color: #333;
+	}
+</style>
\ No newline at end of file
diff --git a/components/form/Popup.vue b/components/form/Popup.vue
new file mode 100644
index 0000000..def7d6a
--- /dev/null
+++ b/components/form/Popup.vue
@@ -0,0 +1,85 @@
+<template>
+	<!-- 遮罩层 -->
+	<view v-if="visible" class="popup-mask" @click="close">
+		<view @click.stop class="popup-content" :style="{ transform: transformStyle }">
+			<slot></slot>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		computed,
+		defineExpose
+	} from 'vue'
+
+	const props = defineProps({
+		position: {
+			type: String,
+			default: 'bottom'
+		},
+		duration: {
+			type: Number,
+			default: 300
+		}
+	})
+
+	const emit = defineEmits(['open', 'close'])
+
+	const visible = ref(false)
+	const animating = ref(false)
+
+	// 动画样式
+	const transformStyle = computed(() => {
+		if (animating.value) return 'translateY(0%)'
+		if (props.position === 'bottom') return 'translateY(100%)'
+		if (props.position === 'top') return 'translateY(-100%)'
+		return 'scale(0.8)'
+	})
+
+	// 对外暴露的方法
+	function open() {
+		visible.value = true
+		animating.value = false
+		setTimeout(() => {
+			animating.value = true
+			emit('open')
+		}, 20)
+	}
+
+	function close() {
+		animating.value = false
+		setTimeout(() => {
+			visible.value = false
+			emit('close')
+		}, props.duration)
+	}
+
+	defineExpose({
+		open,
+		close
+	})
+</script>
+
+<style>
+	.popup-mask {
+		position: fixed;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		background: rgba(0, 0, 0, 0.5);
+		display: flex;
+		justify-content: center;
+		align-items: flex-end;
+		z-index: 999;
+	}
+
+	.popup-content {
+		width: 100%;
+		background: #fff;
+		border-radius: 16rpx 16rpx 0 0;
+		transition: transform 0.3s ease;
+	}
+</style>
\ No newline at end of file
diff --git a/components/index.js b/components/index.js
new file mode 100644
index 0000000..af50906
--- /dev/null
+++ b/components/index.js
@@ -0,0 +1,15 @@
+import Top from './Top.vue'
+import Card from './Card.vue'
+import DictTag from './DictTag.vue'
+import FormItem from './form/FormItem.vue'
+import SearchInput from './SearchInput.vue'
+import Picker from './form/Picker.vue'
+
+export {
+	Top,
+	Card,
+	DictTag,
+	FormItem,
+	SearchInput,
+	Picker
+}
\ No newline at end of file
diff --git a/main.js b/main.js
index 0be544c..6bc0f0b 100644
--- a/main.js
+++ b/main.js
@@ -5,6 +5,8 @@ import DictTag from '@/components/DictTag.vue'
 import FormItem from '@/components/form/FormItem.vue'
 import SearchInput from '@/components/SearchInput.vue'
 import Picker from '@/components/form/Picker.vue'
+import Input from '@/components/form/Input.vue'
+import Popup from '@/components/form/Popup.vue'
 
 // #ifndef VUE3
 import Vue from 'vue'
@@ -28,7 +30,9 @@ export function createApp() {
 	app.component('DictTag', DictTag)
 	app.component('FormItem', FormItem)
 	app.component('SearchInput', SearchInput)
-	app.component('Pickera', Picker) 
+	app.component('Picker', Picker)
+	app.component('Input', Input)
+	app.component('Popup', Popup)
 	return {
 		app
 	}
diff --git a/pages/contract/index.vue b/pages/contract/index.vue
index a863262..08f9eb9 100644
--- a/pages/contract/index.vue
+++ b/pages/contract/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<view :style="{marginTop:barHeight+'px'}">
 		<Top text="合同查询" />
-		<scroll-view scroll-y="" style="background-color: #F2F3F5;"
+		<scroll-view scroll-y style="background-color: #F2F3F5;"
 			:style="{height:`calc(${pageHeight+'px'} - 30rpx - 100rpx)`,paddingBottom:'30rpx'}"
 			@scrolltolower="onScrollToLower">
 			<view id="contain" ref="containRef">
@@ -13,7 +13,8 @@
 						<FormItem :title="'合同编号'" width="180rpx" v-if="moreFormItem">
 							<input class="uni-input" v-model="searchForm.contractCode" />
 						</FormItem>
-						<transition name="moreFormItem">
+						<!-- <transition name="moreFormItem"> -->
+						<view class="moreFormItem" :class="{ open: moreFormItem }">
 							<view v-show="moreFormItem">
 								<FormItem :title="'客户合同编号'" width="201rpx">
 									<input class="uni-input" v-model="searchForm.customerContractCode" />
@@ -22,19 +23,21 @@
 									<input class="uni-input" v-model="searchForm.contractName" />
 								</FormItem>
 								<FormItem :title="'业务方向'" width="180rpx">
-									<Pickera key="label" :data="business_direction" :value="searchForm.businessDirection"
+									<Picker key="label" :data="business_direction" :value="searchForm.businessDirection"
 										@change="e=>searchForm.businessDirection =e" />
 								</FormItem>
 								<FormItem :title="'合同状态'" width="180rpx">
-									<Pickera key="label" :data="contract_status" :value="searchForm.contractStatus"
+									<Picker key="label" :data="contract_status" :value="searchForm.contractStatus"
 										@change="e=>searchForm.contractStatus =e" />
 								</FormItem>
 							</view>
-						</transition>
+						</view>
+						<!-- </transition> -->
 						<view style="text-align: center;">
-							<button style="height:60rpx;width: 150rpx;line-height: 60rpx;display: inline-block;" v-if="moreFormItem"
-								form-type="submit" type="primary">搜索</button>
-							<button style="height:60rpx;width: 150rpx;line-height: 60rpx;display: inline-block;margin-left: 20rpx;"
+							<button style="height:60rpx;width: 150rpx;line-height: 60rpx;display: inline-block;font-size: 28rpx;"
+								v-if="moreFormItem" form-type="submit" type="primary">搜索</button>
+							<button
+								style="height:60rpx;width: 150rpx;line-height: 60rpx;display: inline-block;margin-left: 20rpx;font-size: 28rpx;"
 								v-if="moreFormItem" form-type="reset" plain="true" type="primary">重置</button>
 						</view>
 						<view class="toggle" @tap="toggleForm">
@@ -91,6 +94,9 @@
 				</Card>
 			</view>
 		</scroll-view>
+		<view v-if="infoShow">
+			<Info :data="infoData" />
+		</view>
 	</view>
 </template>
 
@@ -110,6 +116,7 @@
 	import {
 		getHeight
 	} from '@/utils/index.js'
+	import Info from './info.vue'
 
 	const {
 		contract_category,
@@ -123,6 +130,8 @@
 			'contract_status'
 		])
 	);
+	const infoShow = ref(false)
+	const infoData = ref({})
 	const containRef = ref(null)
 	const moreFormItem = ref(false)
 	const toggleForm = () => {
@@ -139,7 +148,7 @@
 		let res = false
 		return new Promise(resolve => {
 			uni.createSelectorQuery()
-				.select('#contain') // 页面级查询，不用 .in(proxy)
+				.select('#contain')
 				.boundingClientRect(rect => {
 					resolve(rect?.height < pageHeight.value)
 				})
@@ -176,15 +185,18 @@
 		}
 	}
 	const itemOperation = (e) => {
+		infoShow.value = true
 		if (e.contractStatus !== '1') {
-			uni.navigateTo({
-				url: '/pages/contract/info?type=1&id=' + e.contractId
-			})
+			infoData.value = {
+				type: 1,
+				id: e.contractId
+			}
 		}
 		if (e.contractStatus === '1') {
-			uni.navigateTo({
-				url: '/pages/contract/info?type=2&id=' + e.contractId
-			})
+			infoData.value = {
+				type: 2,
+				id: e.contractId
+			}
 		}
 	}
 	const pageHeight = ref(0)
@@ -197,7 +209,10 @@
 				barHeight.value = statusBarHeight
 				pageHeight.value = sys.windowHeight - statusBarHeight
 			} else {
-				pageHeight.value = sys.windowHeight
+				const systemInfo = uni.getSystemInfoSync()
+				const statusBarHeight = systemInfo.statusBarHeight || 0
+				barHeight.value = statusBarHeight || 0
+				pageHeight.value = sys.windowHeight - statusBarHeight
 			}
 			search()
 		}, 100)
@@ -264,4 +279,35 @@
 		min-width: calc(45% - 20rpx);
 		color: #999
 	}
+
+
+	.moreFormItem-enter-active,
+	.moreFormItem-leave-active {
+		transition: max-height 0.3s ease, opacity 0.3s ease;
+		overflow: hidden;
+	}
+
+	.moreFormItem-enter-from,
+	.moreFormItem-leave-to {
+		max-height: 0;
+		opacity: 0;
+	}
+
+	.moreFormItem-enter-to,
+	.moreFormItem-leave-from {
+		max-height: 500rpx;
+		opacity: 1;
+	}
+
+	.moreFormItem {
+		max-height: 0;
+		opacity: 0;
+		overflow: hidden;
+		transition: max-height 0.3s ease, opacity 0.3s ease;
+	}
+
+	.moreFormItem.open {
+		max-height: 600rpx; // 不要用 200 / 400 这种边界值
+		opacity: 1;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/contract/info.vue b/pages/contract/info.vue
index 764008d..081c594 100644
--- a/pages/contract/info.vue
+++ b/pages/contract/info.vue
@@ -1,68 +1,70 @@
 <template>
-	<Card>
-		<form>
-			<FormItem :title="'有无合同'">
-				<input class="uni-input" v-model="searchForm.contractCode" />
-			</FormItem>
-			<FormItem :title="'合同编号'">
-				<input class="uni-input" v-model="form.contractCode" />
-			</FormItem>
-			<FormItem :title="'合同名称'">
-				<input class="uni-input" v-model="form.contractCode" />
-			</FormItem>
-			<FormItem :title="'合同大类'">
-				<input class="uni-input" v-model="form.contractCode" />
-			</FormItem>
-			<FormItem :title="'业务方向'">
-				<input class="uni-input" v-model="form.contractCode" />
-			</FormItem>
-			<FormItem :title="'部门'">
-				<input class="uni-input" v-model="form.contractCode" />
-			</FormItem>
-			<FormItem :title="'合同签订日期'">
-				<input class="uni-input" v-model="form.contractCode" />
-			</FormItem>
-			<FormItem :title="'合同总价'">
-				<input class="uni-input" v-model="form.contractCode" />
-			</FormItem>
-			<FormItem :title="'甲方公司'">
-				<input class="uni-input" v-model="form.contractCode" />
-			</FormItem>
-			<FormItem :title="'乙方公司'">
-				<input class="uni-input" v-model="form.contractCode" />
-			</FormItem>
-			<FormItem :title="'甲方授权代表'">
-				<input class="uni-input" v-model="form.contractCode" />
-			</FormItem>
-			<FormItem :title="'乙方授权代表'">
-				<input class="uni-input" v-model="form.contractCode" />
-			</FormItem>
-			<FormItem :title="'甲方签字日期'">
-				<input class="uni-input" v-model="form.contractCode" />
-			</FormItem>
-			<FormItem :title="'乙方签字日期'">
-				<input class="uni-input" v-model="form.contractCode" />
-			</FormItem>
-			<FormItem :title="'合同状态'">
-				<input class="uni-input" v-model="form.contractCode" />
-			</FormItem>
-			<FormItem :title="'合同模板标识'">
-				<input class="uni-input" v-model="form.contractCode" />
-			</FormItem>
-			<FormItem :title="'合同负责人'">
-				<input class="uni-input" v-model="form.contractCode" />
-			</FormItem>
-			<FormItem :title="'合同模板'">
-				<input class="uni-input" v-model="form.contractCode" />
-			</FormItem>
-			<FormItem :title="'附件'">
-				<input class="uni-input" v-model="form.contractCode" />
-			</FormItem>
-			<FormItem :title="'备注'">
-				<input class="uni-input" v-model="form.contractCode" />
-			</FormItem>
-		</form>
-	</Card>
+	<view>
+		<Card class="container">
+			<form>
+				<FormItem :title="'有无合同'">
+					<input class="uni-input" v-model="searchForm.contractCode" />
+				</FormItem>
+				<FormItem :title="'合同编号'">
+					<input class="uni-input" v-model="form.contractCode" />
+				</FormItem>
+				<FormItem :title="'合同名称'">
+					<input class="uni-input" v-model="form.contractCode" />
+				</FormItem>
+				<FormItem :title="'合同大类'">
+					<input class="uni-input" v-model="form.contractCode" />
+				</FormItem>
+				<FormItem :title="'业务方向'">
+					<input class="uni-input" v-model="form.contractCode" />
+				</FormItem>
+				<FormItem :title="'部门'">
+					<input class="uni-input" v-model="form.contractCode" />
+				</FormItem>
+				<FormItem :title="'合同签订日期'">
+					<input class="uni-input" v-model="form.contractCode" />
+				</FormItem>
+				<FormItem :title="'合同总价'">
+					<input class="uni-input" v-model="form.contractCode" />
+				</FormItem>
+				<FormItem :title="'甲方公司'">
+					<input class="uni-input" v-model="form.contractCode" />
+				</FormItem>
+				<FormItem :title="'乙方公司'">
+					<input class="uni-input" v-model="form.contractCode" />
+				</FormItem>
+				<FormItem :title="'甲方授权代表'">
+					<input class="uni-input" v-model="form.contractCode" />
+				</FormItem>
+				<FormItem :title="'乙方授权代表'">
+					<input class="uni-input" v-model="form.contractCode" />
+				</FormItem>
+				<FormItem :title="'甲方签字日期'">
+					<input class="uni-input" v-model="form.contractCode" />
+				</FormItem>
+				<FormItem :title="'乙方签字日期'">
+					<input class="uni-input" v-model="form.contractCode" />
+				</FormItem>
+				<FormItem :title="'合同状态'">
+					<input class="uni-input" v-model="form.contractCode" />
+				</FormItem>
+				<FormItem :title="'合同模板标识'">
+					<input class="uni-input" v-model="form.contractCode" />
+				</FormItem>
+				<FormItem :title="'合同负责人'">
+					<input class="uni-input" v-model="form.contractCode" />
+				</FormItem>
+				<FormItem :title="'合同模板'">
+					<input class="uni-input" v-model="form.contractCode" />
+				</FormItem>
+				<FormItem :title="'附件'">
+					<input class="uni-input" v-model="form.contractCode" />
+				</FormItem>
+				<FormItem :title="'备注'">
+					<input class="uni-input" v-model="form.contractCode" />
+				</FormItem>
+			</form>
+		</Card>
+	</view>
 </template>
 
 <script setup>
@@ -79,4 +81,14 @@
 </script>
 
 <style lang="scss" scoped>
+	.container {
+		width: 600rpx;
+		height: 80vh;
+		overflow: auto;
+		position: fixed;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		margin: 0
+	}
 </style>
\ No newline at end of file
diff --git a/pages/workHourReporting/index.vue b/pages/workHourReporting/index.vue
new file mode 100644
index 0000000..3966104
--- /dev/null
+++ b/pages/workHourReporting/index.vue
@@ -0,0 +1,199 @@
+<template>
+	<view :style="{marginTop:barHeight+'px'}">
+		<Top text="出差申请" />
+		<scroll-view scroll-y
+			:style="{height:`calc(${pageHeight+'px'} - 30rpx - 100rpx)`,paddingBottom:'30rpx',backgroundColor:'#eee9'}">
+			<view class="list">
+				<view class="item">
+					<view class="formItem">
+						<view class="title">申请单号</view>
+						<view class="inputBg">
+							<Input v-model="applicatioData.applyCode" placeholder="自动生成" />
+						</view>
+					</view>
+					<view class="formItem">
+						<view class="title">申请人</view>
+						<view class="inputBg">
+							<Input v-model="applicatioData.applicantName" placeholder="自动填充" />
+						</view>
+					</view>
+					<view class="formItem">
+						<view class="title">申请人部门</view>
+						<view class="inputBg">
+							<Input v-model="applicatioData.deptName" placeholder="自动填充" />
+						</view>
+					</view>
+				</view>
+
+				<view class="item" v-for="(i,k) in list">
+					<view class="itemTitle">行程明细 {{k+1}}</view>
+					<view class="formItem">
+						<view class="title">出差类型</view>
+						<view class="inputBg">
+							<Picker key="label" :data="trip_type" :value="i.tripType" @change="e=>i.tripType =e" />
+						</view>
+					</view>
+					<view class="formItem">
+						<view class="title">项目名称</view>
+						<view class="inputBg" @tap="getProject(k)">
+							<Input style="pointer-events:none" disabled v-model="i.projectName" placeholder="点击选择" />
+							<Input v-show="false" v-model="i.projectId" placeholder="projectId" />
+						</view>
+					</view>
+					<view class="formItem">
+						<view class="title">项目号</view>
+						<view class="inputBg" @tap="getProject(k)">
+							<Input style="pointer-events:none" disabled v-model="i.projectCode" placeholder="点击选择" />
+						</view>
+					</view>
+					<view class="formItem">
+						<view class="title">出差事由</view>
+						<view class="inputBg">
+							<textarea class="textArea" v-model="i.tripReason" placeholder="出差事由" />
+						</view>
+					</view>
+					
+					<view class="formItem">
+						<view class="title">开始时间</view>
+						<view class="inputBg">
+							<uni-section :title="'日期范围用法：' + '[' + range + ']'" type="line"></uni-section> 
+						</view>
+					</view>
+				</view>
+
+				<Popup ref="popupRef" v-model="show" position="bottom" :duration="300">
+					<view class="search">
+						<FormItem :title="'项目名称'">
+							<SearchInput @search="getList" v-model="form.projectName" />
+						</FormItem>
+					</view>
+					<scroll-view scroll-y style="height: 600rpx;">
+						<view @tap="pitchOnProject(i)" v-for="i in projectList">
+							<Card style="pointer-events:none" hideTitle class="projectList">
+								<DictTag style="position: absolute;top: 30rpx;right: 30rpx;" :options="project_category"
+									:value="i.projectCategory" />
+								<view>
+									{{i.projectName}}
+								</view>
+								<view style="font-size: 24rpx;color: #999;margin-right: 24rpx;display: inline-block;">
+									{{i.projectCode}}
+								</view>
+								<view style="font-size: 24rpx;color: #999;display: inline-block;">
+									项目经理:{{i.managerName}}
+								</view>
+							</Card>
+						</view>
+					</scroll-view>
+				</Popup>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		toRefs,
+		ref,
+		onMounted,
+		computed
+	} from 'vue'
+	import {
+		useDict
+	} from '@/utils/dict.js'
+	const {
+		trip_type,
+		business_direction,
+		project_category,
+	} = toRefs(
+		useDict(['trip_type', 'business_direction', 'project_category'])
+	);
+	import {
+		listProjectInfo
+	} from '@/api/workHourReporting.js' 
+	const popupRef = ref()
+	const applicatioData = ref({})
+	const form = ref({})
+	const projectIndex = ref(null)
+	const list = ref([{}])
+	const projectList = ref([])
+	const getProject = (index) => {
+		projectIndex.value = index
+		popupRef.value.open()
+	}
+	const getProjectList = async () => {
+		const res = await listProjectInfo();
+		projectList.value = res.rows;
+	}
+	const getList = async () => {
+		const res = await listProjectInfo(form.value);
+		projectList.value = res.rows;
+	}
+	const pitchOnProject = (e) => {
+		list.value[projectIndex.value].projectName = e.projectName
+		list.value[projectIndex.value].projectId = e.projectId
+		list.value[projectIndex.value].projectCode = e.projectCode
+		popupRef.value.close()
+	}
+	const pageHeight = ref(0)
+	const barHeight = ref(0)
+	const sys = uni.getSystemInfoSync()
+	onMounted(() => {
+		setTimeout(() => {
+			if ((process.env.UNI_PLATFORM === 'app-plus' || process.env.UNI_PLATFORM === 'app')) {
+				const statusBarHeight = plus.navigator.getStatusbarHeight()
+				barHeight.value = statusBarHeight
+				pageHeight.value = sys.windowHeight - statusBarHeight
+			} else {
+				pageHeight.value = sys.windowHeight
+			}
+		}, 100)
+	})
+</script>
+
+<style lang="scss" scoped>
+	.list {
+		margin-top: 20rpx;
+	}
+
+	.item {
+		width: 670rpx;
+		margin-left: 20rpx;
+		background-color: #fff;
+		border-radius: 20rpx;
+		padding: 20rpx;
+		margin-bottom: 20rpx;
+
+		.itemTitle {
+			font-size: 24rpx;
+			margin-bottom: 24rpx;
+		}
+
+		.formItem {
+			margin-bottom: 24rpx;
+		}
+
+		.title {
+			font-size: 24rpx;
+			margin-bottom: 12rpx;
+		}
+
+		.inputBg {
+			border-radius: 10rpx;
+			font-size: 24rpx;
+			padding-left: 10rpx;
+			border: 1rpx solid #eee;
+			color: #666;
+		}
+	}
+
+	.projectList {
+		background-color: #eee;
+		margin-bottom: 20rpx;
+	}
+
+	.textArea {
+		font-size: 24rpx;
+		color: #333;
+
+	}
+</style>
\ No newline at end of file
diff --git a/pages/workbench/index.vue b/pages/workbench/index.vue
index e95c011..da03800 100644
--- a/pages/workbench/index.vue
+++ b/pages/workbench/index.vue
@@ -3,8 +3,8 @@
 		<scroll-view scroll-y="true" :style="{height:pageHeight+'px'}" style="position: relative">
 			<view class="workbenchIcon"></view>
 			<view class="headPortrait"></view>
-			<view class="userName">名称</view>
-			<view class="department">青岛海威物联科技有限公司</view>
+			<view class="userName">{{userInfo.nickName}}</view>
+			<view class="department">{{userInfo.deptName}}</view>
 			<Card class="card1" title="全员">
 				<view class="viewMore">
 					查看更多
@@ -33,17 +33,24 @@
 	import {
 		imgUrl
 	} from '@/common/config';
+	import {
+		syncGlobalData
+	} from '@/store/index.js'
+	const {
+		userInfo
+	} = syncGlobalData(['userInfo'])
+	console.log(userInfo.value);
 
 	const list = computed(() => {
 		return [{
 				icon: `${imgUrl}/icon/attendancePunch.png`,
-				name: '考勤打卡',
+				name: '合同信息',
 				color: '#E7F8FD',
 				path: '/pages/contract/index'
 			},
 			{
 				icon: `${imgUrl}/icon/oa.png`,
-				name: 'OA审批',
+				name: '出差申请',
 				color: '#FFEBE9',
 				path: '/pages/workHourReporting/index'
 			},
@@ -56,18 +63,9 @@
 	}
 
 	const pageHeight = ref()
-	const barHeight = ref()
 	const sys = uni.getSystemInfoSync()
 	onMounted(() => {
-		setTimeout(() => {
-			if ((process.env.UNI_PLATFORM === 'app-plus' || process.env.UNI_PLATFORM === 'app')) {
-				const statusBarHeight = plus.navigator.getStatusbarHeight()
-				barHeight.value = statusBarHeight
-				pageHeight.value = sys.windowHeight - statusBarHeight
-			} else {
-				pageHeight.value = sys.windowHeight
-			}
-		}, 1000)
+		pageHeight.value = sys.windowHeight
 	})
 </script>
 
diff --git a/uni.scss b/uni.scss
index ba1afb9..8706248 100644
--- a/uni.scss
+++ b/uni.scss
@@ -13,7 +13,7 @@
  */
  
 /* 图片地址 */
-// $img-url: 'https://hw-bm-1307203087.cos.ap-beijing.myqcloud.com';
+// $img-url: 'https://hw-bm-1307203087.cos.ap-beijing.myqcloud.com/mom-app';
 
 $img-url: 'https://frp-off.com:47543/appstatic';
 
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons.ttf b/uni_modules/uni-icons/components/uni-icons/uniicons.ttf
index 14696d0..e69de29 100644
Binary files a/uni_modules/uni-icons/components/uni-icons/uniicons.ttf and b/uni_modules/uni-icons/components/uni-icons/uniicons.ttf differ
diff --git a/utils/1.json b/utils/1.json
deleted file mode 100644
index a1c441a..0000000
--- a/utils/1.json
+++ /dev/null
@@ -1,1007 +0,0 @@
-[{
-		"nodeType": 0,
-		"nodeCode": "start",
-		"nodeName": "开始",
-		"version": null,
-		"permissionFlag": null,
-		"nodeRatio": "0.000",
-		"coordinate": "260,200|260,200",
-		"anyNodeSkip": null,
-		"listenerType": null,
-		"listenerPath": null,
-		"handlerType": null,
-		"handlerPath": null,
-		"formCustom": "N",
-		"formPath": null,
-		"ext": "[]",
-		"status": 2,
-		"extMap": {},
-		"promptContent": {
-			"dialogStyle": {
-				"border": "1px solid #ccc",
-				"scrollbarWidth": "thin",
-				"boxShadow": "0 2px 8px rgba(0, 0, 0, 0.15)",
-				"padding": "8px 12px",
-				"backgroundColor": "#fff",
-				"color": "#333",
-				"overflowX": "hidden",
-				"overflowY": "auto",
-				"borderRadius": "4px",
-				"maxHeight": "300px",
-				"pointerEvents": "auto",
-				"fontSize": "14px",
-				"position": "absolute",
-				"zIndex": "1000",
-				"maxWidth": "500px"
-			},
-			"info": [{
-				"prefix": "任务名称: ",
-				"prefixStyle": null,
-				"content": "开始",
-				"contentStyle": {
-					"border": "1px solid #d1e9ff",
-					"backgroundColor": "#e8f4ff",
-					"borderRadius": "4px",
-					"padding": "4px 8px"
-				},
-				"rowStyle": {
-					"margin": "0 0 6px 0",
-					"fontWeight": "bold",
-					"borderBottom": "1px solid #ccc",
-					"padding": "0 0 8px 0"
-				}
-			}]
-		},
-		"skipList": [{
-			"nowNodeCode": "start",
-			"nextNodeCode": "submit",
-			"skipName": null,
-			"skipType": "PASS",
-			"skipCondition": null,
-			"coordinate": "280,200;370,200",
-			"status": 2,
-			"extMap": null,
-			"promptContent": null
-		}]
-	},
-	{
-		"nodeType": 1,
-		"nodeCode": "submit",
-		"nodeName": "申请人",
-		"version": null,
-		"permissionFlag": null,
-		"nodeRatio": "0.000",
-		"coordinate": "420,200|420,200",
-		"anyNodeSkip": null,
-		"listenerType": null,
-		"listenerPath": null,
-		"handlerType": null,
-		"handlerPath": null,
-		"formCustom": null,
-		"formPath": null,
-		"ext": "[{\"code\":\"ButtonPermissionEnum\",\"value\":\"back,termination\"}]",
-		"status": 2,
-		"extMap": {},
-		"promptContent": {
-			"dialogStyle": {
-				"border": "1px solid #ccc",
-				"scrollbarWidth": "thin",
-				"boxShadow": "0 2px 8px rgba(0, 0, 0, 0.15)",
-				"padding": "8px 12px",
-				"backgroundColor": "#fff",
-				"color": "#333",
-				"overflowX": "hidden",
-				"overflowY": "auto",
-				"borderRadius": "4px",
-				"maxHeight": "300px",
-				"pointerEvents": "auto",
-				"fontSize": "14px",
-				"position": "absolute",
-				"zIndex": "1000",
-				"maxWidth": "500px"
-			},
-			"info": [{
-					"prefix": "任务名称: ",
-					"prefixStyle": null,
-					"content": "申请人",
-					"contentStyle": {
-						"border": "1px solid #d1e9ff",
-						"backgroundColor": "#e8f4ff",
-						"borderRadius": "4px",
-						"padding": "4px 8px"
-					},
-					"rowStyle": {
-						"margin": "0 0 6px 0",
-						"fontWeight": "bold",
-						"borderBottom": "1px solid #ccc",
-						"padding": "0 0 8px 0"
-					}
-				},
-				{
-					"prefix": "👥 殷强（软件产品部）",
-					"prefixStyle": {
-						"fontSize": "15px",
-						"color": "#333",
-						"fontWeight": "bold"
-					},
-					"content": null,
-					"contentStyle": null,
-					"rowStyle": {
-						"margin": "8px 0",
-						"borderBottom": "1px dashed #ccc"
-					}
-				},
-				{
-					"prefix": "用户账号: ",
-					"prefixStyle": {
-						"fontSize": "14px",
-						"userSelect": "none",
-						"paddingRight": "8px",
-						"fontWeight": "500",
-						"width": "100px",
-						"lineHeight": "24px",
-						"textAlign": "right",
-						"verticalAlign": "middle",
-						"display": "inline-block",
-						"color": "#444"
-					},
-					"content": "yinq",
-					"contentStyle": {
-						"userSelect": "text",
-						"backgroundColor": "#f7faff",
-						"padding": "4px 8px",
-						"whiteSpace": "normal",
-						"border": "1px solid #d0e5ff",
-						"lineHeight": "20px",
-						"borderRadius": "4px",
-						"fontSize": "14px",
-						"color": "#005cbf"
-					},
-					"rowStyle": {
-						"color": "#222",
-						"marginBottom": "6px",
-						"fontSize": "14px",
-						"alignItems": "center",
-						"fontWeight": "400",
-						"display": "flex"
-					}
-				},
-				{
-					"prefix": "审批状态: ",
-					"prefixStyle": {
-						"fontSize": "14px",
-						"userSelect": "none",
-						"paddingRight": "8px",
-						"fontWeight": "500",
-						"width": "100px",
-						"lineHeight": "24px",
-						"textAlign": "right",
-						"verticalAlign": "middle",
-						"display": "inline-block",
-						"color": "#444"
-					},
-					"content": "通过",
-					"contentStyle": {
-						"userSelect": "text",
-						"backgroundColor": "#f7faff",
-						"padding": "4px 8px",
-						"whiteSpace": "normal",
-						"border": "1px solid #d0e5ff",
-						"lineHeight": "20px",
-						"borderRadius": "4px",
-						"fontSize": "14px",
-						"color": "#005cbf"
-					},
-					"rowStyle": {
-						"color": "#222",
-						"marginBottom": "6px",
-						"fontSize": "14px",
-						"alignItems": "center",
-						"fontWeight": "400",
-						"display": "flex"
-					}
-				},
-				{
-					"prefix": "审批耗时: ",
-					"prefixStyle": {
-						"fontSize": "14px",
-						"userSelect": "none",
-						"paddingRight": "8px",
-						"fontWeight": "500",
-						"width": "100px",
-						"lineHeight": "24px",
-						"textAlign": "right",
-						"verticalAlign": "middle",
-						"display": "inline-block",
-						"color": "#444"
-					},
-					"content": "4秒",
-					"contentStyle": {
-						"userSelect": "text",
-						"backgroundColor": "#f7faff",
-						"padding": "4px 8px",
-						"whiteSpace": "normal",
-						"border": "1px solid #d0e5ff",
-						"lineHeight": "20px",
-						"borderRadius": "4px",
-						"fontSize": "14px",
-						"color": "#005cbf"
-					},
-					"rowStyle": {
-						"color": "#222",
-						"marginBottom": "6px",
-						"fontSize": "14px",
-						"alignItems": "center",
-						"fontWeight": "400",
-						"display": "flex"
-					}
-				},
-				{
-					"prefix": "办理时间: ",
-					"prefixStyle": {
-						"fontSize": "14px",
-						"userSelect": "none",
-						"paddingRight": "8px",
-						"fontWeight": "500",
-						"width": "100px",
-						"lineHeight": "24px",
-						"textAlign": "right",
-						"verticalAlign": "middle",
-						"display": "inline-block",
-						"color": "#444"
-					},
-					"content": "2025-12-15 18:12:08",
-					"contentStyle": {
-						"userSelect": "text",
-						"backgroundColor": "#f7faff",
-						"padding": "4px 8px",
-						"whiteSpace": "normal",
-						"border": "1px solid #d0e5ff",
-						"lineHeight": "20px",
-						"borderRadius": "4px",
-						"fontSize": "14px",
-						"color": "#005cbf"
-					},
-					"rowStyle": {
-						"color": "#222",
-						"marginBottom": "6px",
-						"fontSize": "14px",
-						"alignItems": "center",
-						"fontWeight": "400",
-						"display": "flex"
-					}
-				}
-			]
-		},
-		"skipList": [{
-			"nowNodeCode": "submit",
-			"nextNodeCode": "dcb97063-cea5-4374-acfb-684d2b364710",
-			"skipName": null,
-			"skipType": "PASS",
-			"skipCondition": null,
-			"coordinate": "470,200;522,200;522,200;575,200",
-			"status": 2,
-			"extMap": null,
-			"promptContent": null
-		}]
-	},
-	{
-		"nodeType": 2,
-		"nodeCode": "end",
-		"nodeName": "结束",
-		"version": null,
-		"permissionFlag": null,
-		"nodeRatio": "0.000",
-		"coordinate": "1125,200|1125,200",
-		"anyNodeSkip": null,
-		"listenerType": null,
-		"listenerPath": null,
-		"handlerType": null,
-		"handlerPath": null,
-		"formCustom": "N",
-		"formPath": null,
-		"ext": "[]",
-		"status": 2,
-		"extMap": {},
-		"promptContent": {
-			"dialogStyle": {
-				"border": "1px solid #ccc",
-				"scrollbarWidth": "thin",
-				"boxShadow": "0 2px 8px rgba(0, 0, 0, 0.15)",
-				"padding": "8px 12px",
-				"backgroundColor": "#fff",
-				"color": "#333",
-				"overflowX": "hidden",
-				"overflowY": "auto",
-				"borderRadius": "4px",
-				"maxHeight": "300px",
-				"pointerEvents": "auto",
-				"fontSize": "14px",
-				"position": "absolute",
-				"zIndex": "1000",
-				"maxWidth": "500px"
-			},
-			"info": [{
-				"prefix": "任务名称: ",
-				"prefixStyle": null,
-				"content": "结束",
-				"contentStyle": {
-					"border": "1px solid #d1e9ff",
-					"backgroundColor": "#e8f4ff",
-					"borderRadius": "4px",
-					"padding": "4px 8px"
-				},
-				"rowStyle": {
-					"margin": "0 0 6px 0",
-					"fontWeight": "bold",
-					"borderBottom": "1px solid #ccc",
-					"padding": "0 0 8px 0"
-				}
-			}]
-		},
-		"skipList": []
-	},
-	{
-		"nodeType": 1,
-		"nodeCode": "dcb97063-cea5-4374-acfb-684d2b364710",
-		"nodeName": "部门负责人",
-		"version": null,
-		"permissionFlag": "#{@spelRuleComponent.selectDeptLeaderById(#initiatorDeptId)}",
-		"nodeRatio": "0.000",
-		"coordinate": "625,200|625,200",
-		"anyNodeSkip": "submit",
-		"listenerType": null,
-		"listenerPath": null,
-		"handlerType": null,
-		"handlerPath": null,
-		"formCustom": "N",
-		"formPath": null,
-		"ext": "[{\"code\":\"ButtonPermissionEnum\",\"value\":\"back,termination,copy\"}]",
-		"status": 2,
-		"extMap": {},
-		"promptContent": {
-			"dialogStyle": {
-				"border": "1px solid #ccc",
-				"scrollbarWidth": "thin",
-				"boxShadow": "0 2px 8px rgba(0, 0, 0, 0.15)",
-				"padding": "8px 12px",
-				"backgroundColor": "#fff",
-				"color": "#333",
-				"overflowX": "hidden",
-				"overflowY": "auto",
-				"borderRadius": "4px",
-				"maxHeight": "300px",
-				"pointerEvents": "auto",
-				"fontSize": "14px",
-				"position": "absolute",
-				"zIndex": "1000",
-				"maxWidth": "500px"
-			},
-			"info": [{
-					"prefix": "任务名称: ",
-					"prefixStyle": null,
-					"content": "部门负责人",
-					"contentStyle": {
-						"border": "1px solid #d1e9ff",
-						"backgroundColor": "#e8f4ff",
-						"borderRadius": "4px",
-						"padding": "4px 8px"
-					},
-					"rowStyle": {
-						"margin": "0 0 6px 0",
-						"fontWeight": "bold",
-						"borderBottom": "1px solid #ccc",
-						"padding": "0 0 8px 0"
-					}
-				},
-				{
-					"prefix": "👥 尹治丰（软件产品部）",
-					"prefixStyle": {
-						"fontSize": "15px",
-						"color": "#333",
-						"fontWeight": "bold"
-					},
-					"content": null,
-					"contentStyle": null,
-					"rowStyle": {
-						"margin": "8px 0",
-						"borderBottom": "1px dashed #ccc"
-					}
-				},
-				{
-					"prefix": "用户账号: ",
-					"prefixStyle": {
-						"fontSize": "14px",
-						"userSelect": "none",
-						"paddingRight": "8px",
-						"fontWeight": "500",
-						"width": "100px",
-						"lineHeight": "24px",
-						"textAlign": "right",
-						"verticalAlign": "middle",
-						"display": "inline-block",
-						"color": "#444"
-					},
-					"content": "yinzf",
-					"contentStyle": {
-						"userSelect": "text",
-						"backgroundColor": "#f7faff",
-						"padding": "4px 8px",
-						"whiteSpace": "normal",
-						"border": "1px solid #d0e5ff",
-						"lineHeight": "20px",
-						"borderRadius": "4px",
-						"fontSize": "14px",
-						"color": "#005cbf"
-					},
-					"rowStyle": {
-						"color": "#222",
-						"marginBottom": "6px",
-						"fontSize": "14px",
-						"alignItems": "center",
-						"fontWeight": "400",
-						"display": "flex"
-					}
-				},
-				{
-					"prefix": "审批状态: ",
-					"prefixStyle": {
-						"fontSize": "14px",
-						"userSelect": "none",
-						"paddingRight": "8px",
-						"fontWeight": "500",
-						"width": "100px",
-						"lineHeight": "24px",
-						"textAlign": "right",
-						"verticalAlign": "middle",
-						"display": "inline-block",
-						"color": "#444"
-					},
-					"content": "通过",
-					"contentStyle": {
-						"userSelect": "text",
-						"backgroundColor": "#f7faff",
-						"padding": "4px 8px",
-						"whiteSpace": "normal",
-						"border": "1px solid #d0e5ff",
-						"lineHeight": "20px",
-						"borderRadius": "4px",
-						"fontSize": "14px",
-						"color": "#005cbf"
-					},
-					"rowStyle": {
-						"color": "#222",
-						"marginBottom": "6px",
-						"fontSize": "14px",
-						"alignItems": "center",
-						"fontWeight": "400",
-						"display": "flex"
-					}
-				},
-				{
-					"prefix": "审批耗时: ",
-					"prefixStyle": {
-						"fontSize": "14px",
-						"userSelect": "none",
-						"paddingRight": "8px",
-						"fontWeight": "500",
-						"width": "100px",
-						"lineHeight": "24px",
-						"textAlign": "right",
-						"verticalAlign": "middle",
-						"display": "inline-block",
-						"color": "#444"
-					},
-					"content": "13分钟 35秒",
-					"contentStyle": {
-						"userSelect": "text",
-						"backgroundColor": "#f7faff",
-						"padding": "4px 8px",
-						"whiteSpace": "normal",
-						"border": "1px solid #d0e5ff",
-						"lineHeight": "20px",
-						"borderRadius": "4px",
-						"fontSize": "14px",
-						"color": "#005cbf"
-					},
-					"rowStyle": {
-						"color": "#222",
-						"marginBottom": "6px",
-						"fontSize": "14px",
-						"alignItems": "center",
-						"fontWeight": "400",
-						"display": "flex"
-					}
-				},
-				{
-					"prefix": "办理时间: ",
-					"prefixStyle": {
-						"fontSize": "14px",
-						"userSelect": "none",
-						"paddingRight": "8px",
-						"fontWeight": "500",
-						"width": "100px",
-						"lineHeight": "24px",
-						"textAlign": "right",
-						"verticalAlign": "middle",
-						"display": "inline-block",
-						"color": "#444"
-					},
-					"content": "2025-12-15 18:25:42",
-					"contentStyle": {
-						"userSelect": "text",
-						"backgroundColor": "#f7faff",
-						"padding": "4px 8px",
-						"whiteSpace": "normal",
-						"border": "1px solid #d0e5ff",
-						"lineHeight": "20px",
-						"borderRadius": "4px",
-						"fontSize": "14px",
-						"color": "#005cbf"
-					},
-					"rowStyle": {
-						"color": "#222",
-						"marginBottom": "6px",
-						"fontSize": "14px",
-						"alignItems": "center",
-						"fontWeight": "400",
-						"display": "flex"
-					}
-				}
-			]
-		},
-		"skipList": [{
-			"nowNodeCode": "dcb97063-cea5-4374-acfb-684d2b364710",
-			"nextNodeCode": "581734cf-5984-4c9e-b804-f6278fa7b577",
-			"skipName": null,
-			"skipType": "PASS",
-			"skipCondition": null,
-			"coordinate": "675,200;763,200",
-			"status": 2,
-			"extMap": null,
-			"promptContent": null
-		}]
-	},
-	{
-		"nodeType": 1,
-		"nodeCode": "b13cb15b-31e4-4a9c-a566-86f6bf830d21",
-		"nodeName": "财务经理",
-		"version": null,
-		"permissionFlag": "role:1985260797582036993",
-		"nodeRatio": "0.000",
-		"coordinate": "989,200|989,200",
-		"anyNodeSkip": "submit",
-		"listenerType": null,
-		"listenerPath": null,
-		"handlerType": null,
-		"handlerPath": null,
-		"formCustom": null,
-		"formPath": null,
-		"ext": "[{\"code\":\"ButtonPermissionEnum\",\"value\":\"back,termination\"}]",
-		"status": 2,
-		"extMap": {},
-		"promptContent": {
-			"dialogStyle": {
-				"border": "1px solid #ccc",
-				"scrollbarWidth": "thin",
-				"boxShadow": "0 2px 8px rgba(0, 0, 0, 0.15)",
-				"padding": "8px 12px",
-				"backgroundColor": "#fff",
-				"color": "#333",
-				"overflowX": "hidden",
-				"overflowY": "auto",
-				"borderRadius": "4px",
-				"maxHeight": "300px",
-				"pointerEvents": "auto",
-				"fontSize": "14px",
-				"position": "absolute",
-				"zIndex": "1000",
-				"maxWidth": "500px"
-			},
-			"info": [{
-					"prefix": "任务名称: ",
-					"prefixStyle": null,
-					"content": "财务经理",
-					"contentStyle": {
-						"border": "1px solid #d1e9ff",
-						"backgroundColor": "#e8f4ff",
-						"borderRadius": "4px",
-						"padding": "4px 8px"
-					},
-					"rowStyle": {
-						"margin": "0 0 6px 0",
-						"fontWeight": "bold",
-						"borderBottom": "1px solid #ccc",
-						"padding": "0 0 8px 0"
-					}
-				},
-				{
-					"prefix": "👥 刘家欢（财务管理部）",
-					"prefixStyle": {
-						"fontSize": "15px",
-						"color": "#333",
-						"fontWeight": "bold"
-					},
-					"content": null,
-					"contentStyle": null,
-					"rowStyle": {
-						"margin": "8px 0",
-						"borderBottom": "1px dashed #ccc"
-					}
-				},
-				{
-					"prefix": "用户账号: ",
-					"prefixStyle": {
-						"fontSize": "14px",
-						"userSelect": "none",
-						"paddingRight": "8px",
-						"fontWeight": "500",
-						"width": "100px",
-						"lineHeight": "24px",
-						"textAlign": "right",
-						"verticalAlign": "middle",
-						"display": "inline-block",
-						"color": "#444"
-					},
-					"content": "liujh",
-					"contentStyle": {
-						"userSelect": "text",
-						"backgroundColor": "#f7faff",
-						"padding": "4px 8px",
-						"whiteSpace": "normal",
-						"border": "1px solid #d0e5ff",
-						"lineHeight": "20px",
-						"borderRadius": "4px",
-						"fontSize": "14px",
-						"color": "#005cbf"
-					},
-					"rowStyle": {
-						"color": "#222",
-						"marginBottom": "6px",
-						"fontSize": "14px",
-						"alignItems": "center",
-						"fontWeight": "400",
-						"display": "flex"
-					}
-				},
-				{
-					"prefix": "审批状态: ",
-					"prefixStyle": {
-						"fontSize": "14px",
-						"userSelect": "none",
-						"paddingRight": "8px",
-						"fontWeight": "500",
-						"width": "100px",
-						"lineHeight": "24px",
-						"textAlign": "right",
-						"verticalAlign": "middle",
-						"display": "inline-block",
-						"color": "#444"
-					},
-					"content": "通过",
-					"contentStyle": {
-						"userSelect": "text",
-						"backgroundColor": "#f7faff",
-						"padding": "4px 8px",
-						"whiteSpace": "normal",
-						"border": "1px solid #d0e5ff",
-						"lineHeight": "20px",
-						"borderRadius": "4px",
-						"fontSize": "14px",
-						"color": "#005cbf"
-					},
-					"rowStyle": {
-						"color": "#222",
-						"marginBottom": "6px",
-						"fontSize": "14px",
-						"alignItems": "center",
-						"fontWeight": "400",
-						"display": "flex"
-					}
-				},
-				{
-					"prefix": "审批耗时: ",
-					"prefixStyle": {
-						"fontSize": "14px",
-						"userSelect": "none",
-						"paddingRight": "8px",
-						"fontWeight": "500",
-						"width": "100px",
-						"lineHeight": "24px",
-						"textAlign": "right",
-						"verticalAlign": "middle",
-						"display": "inline-block",
-						"color": "#444"
-					},
-					"content": "58秒",
-					"contentStyle": {
-						"userSelect": "text",
-						"backgroundColor": "#f7faff",
-						"padding": "4px 8px",
-						"whiteSpace": "normal",
-						"border": "1px solid #d0e5ff",
-						"lineHeight": "20px",
-						"borderRadius": "4px",
-						"fontSize": "14px",
-						"color": "#005cbf"
-					},
-					"rowStyle": {
-						"color": "#222",
-						"marginBottom": "6px",
-						"fontSize": "14px",
-						"alignItems": "center",
-						"fontWeight": "400",
-						"display": "flex"
-					}
-				},
-				{
-					"prefix": "办理时间: ",
-					"prefixStyle": {
-						"fontSize": "14px",
-						"userSelect": "none",
-						"paddingRight": "8px",
-						"fontWeight": "500",
-						"width": "100px",
-						"lineHeight": "24px",
-						"textAlign": "right",
-						"verticalAlign": "middle",
-						"display": "inline-block",
-						"color": "#444"
-					},
-					"content": "2025-12-15 18:27:08",
-					"contentStyle": {
-						"userSelect": "text",
-						"backgroundColor": "#f7faff",
-						"padding": "4px 8px",
-						"whiteSpace": "normal",
-						"border": "1px solid #d0e5ff",
-						"lineHeight": "20px",
-						"borderRadius": "4px",
-						"fontSize": "14px",
-						"color": "#005cbf"
-					},
-					"rowStyle": {
-						"color": "#222",
-						"marginBottom": "6px",
-						"fontSize": "14px",
-						"alignItems": "center",
-						"fontWeight": "400",
-						"display": "flex"
-					}
-				}
-			]
-		},
-		"skipList": [{
-			"nowNodeCode": "b13cb15b-31e4-4a9c-a566-86f6bf830d21",
-			"nextNodeCode": "end",
-			"skipName": null,
-			"skipType": "PASS",
-			"skipCondition": null,
-			"coordinate": "1039,200;1105,200",
-			"status": 2,
-			"extMap": null,
-			"promptContent": null
-		}]
-	},
-	{
-		"nodeType": 1,
-		"nodeCode": "581734cf-5984-4c9e-b804-f6278fa7b577",
-		"nodeName": "业务方向负责人",
-		"version": null,
-		"permissionFlag": "#{@spelRuleComponent.selectBusinessDirectionLeaderById(#businessDirection)}",
-		"nodeRatio": "0.000",
-		"coordinate": "813,200|813,200",
-		"anyNodeSkip": "submit",
-		"listenerType": null,
-		"listenerPath": null,
-		"handlerType": null,
-		"handlerPath": null,
-		"formCustom": "N",
-		"formPath": null,
-		"ext": "[{\"code\":\"ButtonPermissionEnum\",\"value\":\"back,termination,copy\"}]",
-		"status": 2,
-		"extMap": {},
-		"promptContent": {
-			"dialogStyle": {
-				"border": "1px solid #ccc",
-				"scrollbarWidth": "thin",
-				"boxShadow": "0 2px 8px rgba(0, 0, 0, 0.15)",
-				"padding": "8px 12px",
-				"backgroundColor": "#fff",
-				"color": "#333",
-				"overflowX": "hidden",
-				"overflowY": "auto",
-				"borderRadius": "4px",
-				"maxHeight": "300px",
-				"pointerEvents": "auto",
-				"fontSize": "14px",
-				"position": "absolute",
-				"zIndex": "1000",
-				"maxWidth": "500px"
-			},
-			"info": [{
-					"prefix": "任务名称: ",
-					"prefixStyle": null,
-					"content": "业务方向负责人",
-					"contentStyle": {
-						"border": "1px solid #d1e9ff",
-						"backgroundColor": "#e8f4ff",
-						"borderRadius": "4px",
-						"padding": "4px 8px"
-					},
-					"rowStyle": {
-						"margin": "0 0 6px 0",
-						"fontWeight": "bold",
-						"borderBottom": "1px solid #ccc",
-						"padding": "0 0 8px 0"
-					}
-				},
-				{
-					"prefix": "👥 尹治丰（软件产品部）",
-					"prefixStyle": {
-						"fontSize": "15px",
-						"color": "#333",
-						"fontWeight": "bold"
-					},
-					"content": null,
-					"contentStyle": null,
-					"rowStyle": {
-						"margin": "8px 0",
-						"borderBottom": "1px dashed #ccc"
-					}
-				},
-				{
-					"prefix": "用户账号: ",
-					"prefixStyle": {
-						"fontSize": "14px",
-						"userSelect": "none",
-						"paddingRight": "8px",
-						"fontWeight": "500",
-						"width": "100px",
-						"lineHeight": "24px",
-						"textAlign": "right",
-						"verticalAlign": "middle",
-						"display": "inline-block",
-						"color": "#444"
-					},
-					"content": "yinzf",
-					"contentStyle": {
-						"userSelect": "text",
-						"backgroundColor": "#f7faff",
-						"padding": "4px 8px",
-						"whiteSpace": "normal",
-						"border": "1px solid #d0e5ff",
-						"lineHeight": "20px",
-						"borderRadius": "4px",
-						"fontSize": "14px",
-						"color": "#005cbf"
-					},
-					"rowStyle": {
-						"color": "#222",
-						"marginBottom": "6px",
-						"fontSize": "14px",
-						"alignItems": "center",
-						"fontWeight": "400",
-						"display": "flex"
-					}
-				},
-				{
-					"prefix": "审批状态: ",
-					"prefixStyle": {
-						"fontSize": "14px",
-						"userSelect": "none",
-						"paddingRight": "8px",
-						"fontWeight": "500",
-						"width": "100px",
-						"lineHeight": "24px",
-						"textAlign": "right",
-						"verticalAlign": "middle",
-						"display": "inline-block",
-						"color": "#444"
-					},
-					"content": "通过",
-					"contentStyle": {
-						"userSelect": "text",
-						"backgroundColor": "#f7faff",
-						"padding": "4px 8px",
-						"whiteSpace": "normal",
-						"border": "1px solid #d0e5ff",
-						"lineHeight": "20px",
-						"borderRadius": "4px",
-						"fontSize": "14px",
-						"color": "#005cbf"
-					},
-					"rowStyle": {
-						"color": "#222",
-						"marginBottom": "6px",
-						"fontSize": "14px",
-						"alignItems": "center",
-						"fontWeight": "400",
-						"display": "flex"
-					}
-				},
-				{
-					"prefix": "审批耗时: ",
-					"prefixStyle": {
-						"fontSize": "14px",
-						"userSelect": "none",
-						"paddingRight": "8px",
-						"fontWeight": "500",
-						"width": "100px",
-						"lineHeight": "24px",
-						"textAlign": "right",
-						"verticalAlign": "middle",
-						"display": "inline-block",
-						"color": "#444"
-					},
-					"content": "28秒",
-					"contentStyle": {
-						"userSelect": "text",
-						"backgroundColor": "#f7faff",
-						"padding": "4px 8px",
-						"whiteSpace": "normal",
-						"border": "1px solid #d0e5ff",
-						"lineHeight": "20px",
-						"borderRadius": "4px",
-						"fontSize": "14px",
-						"color": "#005cbf"
-					},
-					"rowStyle": {
-						"color": "#222",
-						"marginBottom": "6px",
-						"fontSize": "14px",
-						"alignItems": "center",
-						"fontWeight": "400",
-						"display": "flex"
-					}
-				},
-				{
-					"prefix": "办理时间: ",
-					"prefixStyle": {
-						"fontSize": "14px",
-						"userSelect": "none",
-						"paddingRight": "8px",
-						"fontWeight": "500",
-						"width": "100px",
-						"lineHeight": "24px",
-						"textAlign": "right",
-						"verticalAlign": "middle",
-						"display": "inline-block",
-						"color": "#444"
-					},
-					"content": "2025-12-15 18:26:10",
-					"contentStyle": {
-						"userSelect": "text",
-						"backgroundColor": "#f7faff",
-						"padding": "4px 8px",
-						"whiteSpace": "normal",
-						"border": "1px solid #d0e5ff",
-						"lineHeight": "20px",
-						"borderRadius": "4px",
-						"fontSize": "14px",
-						"color": "#005cbf"
-					},
-					"rowStyle": {
-						"color": "#222",
-						"marginBottom": "6px",
-						"fontSize": "14px",
-						"alignItems": "center",
-						"fontWeight": "400",
-						"display": "flex"
-					}
-				}
-			]
-		},
-		"skipList": [{
-			"nowNodeCode": "581734cf-5984-4c9e-b804-f6278fa7b577",
-			"nextNodeCode": "b13cb15b-31e4-4a9c-a566-86f6bf830d21",
-			"skipName": null,
-			"skipType": "PASS",
-			"skipCondition": null,
-			"coordinate": "863,200;939,200",
-			"status": 2,
-			"extMap": null,
-			"promptContent": null
-		}]
-	}
-]
\ No newline at end of file
diff --git a/utils/index.js b/utils/index.js
new file mode 100644
index 0000000..569f5b1
--- /dev/null
+++ b/utils/index.js
@@ -0,0 +1,12 @@
+export const getHeight = (dom, proxy) => {
+	let height = 0
+
+	uni.createSelectorQuery()
+		.in(proxy)
+		.select(dom)
+		.boundingClientRect(rect => {
+			height = rect.height
+		})
+		.exec()
+	return height
+};
\ No newline at end of file
diff --git a/utils/request.js b/utils/request.js
index 6e32879..a1a331e 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -17,6 +17,8 @@ import {
 const encryptHeader = getGlobalData('encryptHeader');
 
 const baseURL = 'https://frp-off.com:47543'
+// const baseURL = 'http://192.168.100.101:8095'
+// const baseURL = 'http://localhost:5174/prod-api'
 
 const getToken = () => {
 	return uni.getStorageSync('token')
diff --git a/utils/router.js b/utils/router.js
new file mode 100644
index 0000000..9c6cec3
--- /dev/null
+++ b/utils/router.js
@@ -0,0 +1,25 @@
+import {
+	getGlobalData
+} from '@/store/index.js'
+const back = () => {
+	const pages = getCurrentPages()
+	if (pages.length === 1) {
+		uni.reLaunch({
+			url: '/pages/workbench/index'
+		})
+	} else {
+		uni.navigateBack()
+	}
+}
+const push = (a, b) => {
+	let routeList = getGlobalData('route')
+	let type = b || 1
+	if (type === 1) {
+		uni.navigateTo(a)
+	}
+}
+
+export const router = {
+	back,
+	push
+}
\ No newline at end of file