diff --git a/api/list.js b/api/list.js
new file mode 100644
index 0000000..f83bc41
--- /dev/null
+++ b/api/list.js
@@ -0,0 +1,23 @@
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base.js';
+import useNetWork from '@/common/useNetWork.js';
+
+const List = BASE_URL + '/visitor/apply/list'
+const MessageInfo = BASE_URL + '/visitor/getMessageInfo'
+/**
+ * 获取访客提交记录列表
+ * @param {*}  
+ */
+export function getList(data) {
+	useNetWork();
+  return fetch.post(List,data).then(res => res);
+}
+
+/**
+ * 获取消息详情
+ * @param {*}  
+ */
+export function getMessageInfo(params) {
+	useNetWork();
+  return fetch.get(MessageInfo,params).then(res => res);
+}
\ No newline at end of file

diff --git a/api/list.js b/api/list.js
new file mode 100644
index 0000000..f83bc41
--- /dev/null
+++ b/api/list.js
@@ -0,0 +1,23 @@
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base.js';
+import useNetWork from '@/common/useNetWork.js';
+
+const List = BASE_URL + '/visitor/apply/list'
+const MessageInfo = BASE_URL + '/visitor/getMessageInfo'
+/**
+ * 获取访客提交记录列表
+ * @param {*}  
+ */
+export function getList(data) {
+	useNetWork();
+  return fetch.post(List,data).then(res => res);
+}
+
+/**
+ * 获取消息详情
+ * @param {*}  
+ */
+export function getMessageInfo(params) {
+	useNetWork();
+  return fetch.get(MessageInfo,params).then(res => res);
+}
\ No newline at end of file
diff --git a/common/formatTime.js b/common/formatTime.js
index e5d158e..6129cc2 100644
--- a/common/formatTime.js
+++ b/common/formatTime.js
@@ -3,4 +3,13 @@
   var timestr = new Date(parseInt(unixtime) * 1000);
   var datetime = timestr.toLocaleString().replace(/年|月/g,"-").replace(/日/g," ");
   return datetime;
+}
+
+/* 
+  获取前几个月，默认前一个月的今天
+*/
+export function getLastMonth(monthNum = 1){
+  let today = new Date() //当天
+  today.setMonth(today.getMonth()-monthNum)
+  return today;
 }
\ No newline at end of file

diff --git a/api/list.js b/api/list.js
new file mode 100644
index 0000000..f83bc41
--- /dev/null
+++ b/api/list.js
@@ -0,0 +1,23 @@
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base.js';
+import useNetWork from '@/common/useNetWork.js';
+
+const List = BASE_URL + '/visitor/apply/list'
+const MessageInfo = BASE_URL + '/visitor/getMessageInfo'
+/**
+ * 获取访客提交记录列表
+ * @param {*}  
+ */
+export function getList(data) {
+	useNetWork();
+  return fetch.post(List,data).then(res => res);
+}
+
+/**
+ * 获取消息详情
+ * @param {*}  
+ */
+export function getMessageInfo(params) {
+	useNetWork();
+  return fetch.get(MessageInfo,params).then(res => res);
+}
\ No newline at end of file
diff --git a/common/formatTime.js b/common/formatTime.js
index e5d158e..6129cc2 100644
--- a/common/formatTime.js
+++ b/common/formatTime.js
@@ -3,4 +3,13 @@
   var timestr = new Date(parseInt(unixtime) * 1000);
   var datetime = timestr.toLocaleString().replace(/年|月/g,"-").replace(/日/g," ");
   return datetime;
+}
+
+/* 
+  获取前几个月，默认前一个月的今天
+*/
+export function getLastMonth(monthNum = 1){
+  let today = new Date() //当天
+  today.setMonth(today.getMonth()-monthNum)
+  return today;
 }
\ No newline at end of file
diff --git a/pages.json b/pages.json
index b4cf49b..ab349c6 100644
--- a/pages.json
+++ b/pages.json
@@ -51,7 +51,7 @@
 			"style" :                                                                                    
 			{
 				"navigationBarTitleText": "列表",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": true
 			}	
 		},
 		{

diff --git a/api/list.js b/api/list.js
new file mode 100644
index 0000000..f83bc41
--- /dev/null
+++ b/api/list.js
@@ -0,0 +1,23 @@
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base.js';
+import useNetWork from '@/common/useNetWork.js';
+
+const List = BASE_URL + '/visitor/apply/list'
+const MessageInfo = BASE_URL + '/visitor/getMessageInfo'
+/**
+ * 获取访客提交记录列表
+ * @param {*}  
+ */
+export function getList(data) {
+	useNetWork();
+  return fetch.post(List,data).then(res => res);
+}
+
+/**
+ * 获取消息详情
+ * @param {*}  
+ */
+export function getMessageInfo(params) {
+	useNetWork();
+  return fetch.get(MessageInfo,params).then(res => res);
+}
\ No newline at end of file
diff --git a/common/formatTime.js b/common/formatTime.js
index e5d158e..6129cc2 100644
--- a/common/formatTime.js
+++ b/common/formatTime.js
@@ -3,4 +3,13 @@
   var timestr = new Date(parseInt(unixtime) * 1000);
   var datetime = timestr.toLocaleString().replace(/年|月/g,"-").replace(/日/g," ");
   return datetime;
+}
+
+/* 
+  获取前几个月，默认前一个月的今天
+*/
+export function getLastMonth(monthNum = 1){
+  let today = new Date() //当天
+  today.setMonth(today.getMonth()-monthNum)
+  return today;
 }
\ No newline at end of file
diff --git a/pages.json b/pages.json
index b4cf49b..ab349c6 100644
--- a/pages.json
+++ b/pages.json
@@ -51,7 +51,7 @@
 			"style" :                                                                                    
 			{
 				"navigationBarTitleText": "列表",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": true
 			}	
 		},
 		{
diff --git a/pages/info/info.vue b/pages/info/info.vue
index e9e9c6a..c5c9234 100644
--- a/pages/info/info.vue
+++ b/pages/info/info.vue
@@ -1,59 +1,99 @@
 <template>
 	<view class="check-message-detail">
 		<view class="detail-content">
-			<view class="detail-item" v-for="item in form"  :key="item.id">
-				<text>{{item.name}}</text>
-				<text>{{item.value}}</text>
+			<view class="detail-item" >
+			<text>申请单号</text>
+			<text>{{info.applyNo}}</text>
+			</view>
+			<view class="detail-item" >
+			<text>申请状态</text>
+			<text :class="color">{{status}}</text>
+			</view>
+			<view class="detail-item" >
+					<text>申请者工号</text>
+					<text>{{info.staffCode}}</text>
+			</view>
+			<view class="detail-item" >
+					<text>申请者姓名</text>
+					<text>{{info.staffName}}</text>
+			</view>
+			<view class="detail-item" >
+					<text>申请者手机号</text>
+					<text>{{info.staffPhone}}</text>
+			</view>
+			<view class="detail-item" >
+					<text>访客姓名</text>
+					<text>{{info.visitorName}}</text>
+			</view>
+			<view class="detail-item" >
+					<text>访客身份证</text>
+					<text>{{info.visitorIdCard}}</text>
+			</view>
+			<view class="detail-item" >
+					<text>访客联系方式</text>
+					<text>{{info.visitorPhone}}</text>
+			</view>
+			<view class="detail-item" >
+					<text>访客目的</text>
+					<text>{{info.visitReason}}</text>
+			</view>
+			<view class="detail-item" >
+					<text>访客区域</text>
+					<text>{{info.visitPosition}}</text>
+			</view>
+			<view class="detail-item" >
+					<text>访客时间</text>
+					<text>{{info.inTime }}</text>
+			</view>
+			<view class="detail-item" >
+					<text>备注</text>
+					<text>{{info.remarks}}</text>
 			</view>
 		</view>
 	</view>
 </template>
 
 <script>
+	import {getMessageInfo} from '@/api/list.js'
 	export default {
 		data() {
 			return {
-				form: [
-					{
-						id: 'odd',
-						name: '申请单号',
-						value: '1111111111'
-					},
-					{
-						id: 'number',
-						name: '申请者工号',
-						value: '1111111111'
-					},
-					{
-						id: 'name',
-						name: '申请者姓名',
-						value: '张三'
-					},
-					{
-						id: 'phone',
-						name: '申请者手机号',
-						value: '12345678912'
-					},
-					{
-						id: 'phone',
-						name: '申请者手机号',
-						value: '12345678912'
-					},
-					{
-						id: 'phone',
-						name: '访客姓名',
-						value: '12345678912'
-					},
-					{
-						id: 'phone',
-						name: '访客身份证',
-						value: '123456789126415897'
-					},
-				]
+				info: {
+					applyNo: 1254611,
+					status: 2,
+					staffCode: 123456,
+					staffName: '张三',
+					staffPhone: 123456789,
+					visitorName: '李四',
+					visitorIdCard:1234567894662552,
+					visitorPhone:123456799,
+					visitReason:'商务会议',
+					visitPosition:'一楼',
+					inTime:'2022-09-16 13:28:41',
+					outTime: "2022-10-06 13:28:46",
+                    remarks:'无'
+				},
+				color:'',
+				status:''
+			}
+		},
+		async onLoad(option){
+		   this.info = await getMessageInfo({messageId:option.messageId})
+		},
+		onShow(){
+			if(this.info.status == '1'){
+					 this.status = '申请通过'
+					 this.color = 'green'
+			}else if(this.info.status == '2'){
+					  this.status = '申请中'
+					  this.color = 'blue'
+			}else {
+					  this.status = '申请未通过'
+					  this.color = 'red'
 			}
 		},
 		methods: {
-			
+
 		}
 	}
 </script>
@@ -62,16 +102,26 @@
 	.check-message-detail {
 		padding: 18rpx;
 		height: 100%;
-		.detail-content{
+
+		.detail-content {
 			padding: 22rpx;
 			background-color: #fff;
 			border-radius: 10rpx;
 		}
-		.detail-item{
+
+		.detail-item {
 			display: flex;
 			justify-content: space-between;
 			margin-top: 44rpx;
 		}
 	}
-
+	.green{
+		color: #04ef0e;
+	}
+	.blue{
+		color: #04a4ef;
+	}
+	.red{
+		color: #ff0019;
+	}
 </style>

diff --git a/api/list.js b/api/list.js
new file mode 100644
index 0000000..f83bc41
--- /dev/null
+++ b/api/list.js
@@ -0,0 +1,23 @@
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base.js';
+import useNetWork from '@/common/useNetWork.js';
+
+const List = BASE_URL + '/visitor/apply/list'
+const MessageInfo = BASE_URL + '/visitor/getMessageInfo'
+/**
+ * 获取访客提交记录列表
+ * @param {*}  
+ */
+export function getList(data) {
+	useNetWork();
+  return fetch.post(List,data).then(res => res);
+}
+
+/**
+ * 获取消息详情
+ * @param {*}  
+ */
+export function getMessageInfo(params) {
+	useNetWork();
+  return fetch.get(MessageInfo,params).then(res => res);
+}
\ No newline at end of file
diff --git a/common/formatTime.js b/common/formatTime.js
index e5d158e..6129cc2 100644
--- a/common/formatTime.js
+++ b/common/formatTime.js
@@ -3,4 +3,13 @@
   var timestr = new Date(parseInt(unixtime) * 1000);
   var datetime = timestr.toLocaleString().replace(/年|月/g,"-").replace(/日/g," ");
   return datetime;
+}
+
+/* 
+  获取前几个月，默认前一个月的今天
+*/
+export function getLastMonth(monthNum = 1){
+  let today = new Date() //当天
+  today.setMonth(today.getMonth()-monthNum)
+  return today;
 }
\ No newline at end of file
diff --git a/pages.json b/pages.json
index b4cf49b..ab349c6 100644
--- a/pages.json
+++ b/pages.json
@@ -51,7 +51,7 @@
 			"style" :                                                                                    
 			{
 				"navigationBarTitleText": "列表",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": true
 			}	
 		},
 		{
diff --git a/pages/info/info.vue b/pages/info/info.vue
index e9e9c6a..c5c9234 100644
--- a/pages/info/info.vue
+++ b/pages/info/info.vue
@@ -1,59 +1,99 @@
 <template>
 	<view class="check-message-detail">
 		<view class="detail-content">
-			<view class="detail-item" v-for="item in form"  :key="item.id">
-				<text>{{item.name}}</text>
-				<text>{{item.value}}</text>
+			<view class="detail-item" >
+			<text>申请单号</text>
+			<text>{{info.applyNo}}</text>
+			</view>
+			<view class="detail-item" >
+			<text>申请状态</text>
+			<text :class="color">{{status}}</text>
+			</view>
+			<view class="detail-item" >
+					<text>申请者工号</text>
+					<text>{{info.staffCode}}</text>
+			</view>
+			<view class="detail-item" >
+					<text>申请者姓名</text>
+					<text>{{info.staffName}}</text>
+			</view>
+			<view class="detail-item" >
+					<text>申请者手机号</text>
+					<text>{{info.staffPhone}}</text>
+			</view>
+			<view class="detail-item" >
+					<text>访客姓名</text>
+					<text>{{info.visitorName}}</text>
+			</view>
+			<view class="detail-item" >
+					<text>访客身份证</text>
+					<text>{{info.visitorIdCard}}</text>
+			</view>
+			<view class="detail-item" >
+					<text>访客联系方式</text>
+					<text>{{info.visitorPhone}}</text>
+			</view>
+			<view class="detail-item" >
+					<text>访客目的</text>
+					<text>{{info.visitReason}}</text>
+			</view>
+			<view class="detail-item" >
+					<text>访客区域</text>
+					<text>{{info.visitPosition}}</text>
+			</view>
+			<view class="detail-item" >
+					<text>访客时间</text>
+					<text>{{info.inTime }}</text>
+			</view>
+			<view class="detail-item" >
+					<text>备注</text>
+					<text>{{info.remarks}}</text>
 			</view>
 		</view>
 	</view>
 </template>
 
 <script>
+	import {getMessageInfo} from '@/api/list.js'
 	export default {
 		data() {
 			return {
-				form: [
-					{
-						id: 'odd',
-						name: '申请单号',
-						value: '1111111111'
-					},
-					{
-						id: 'number',
-						name: '申请者工号',
-						value: '1111111111'
-					},
-					{
-						id: 'name',
-						name: '申请者姓名',
-						value: '张三'
-					},
-					{
-						id: 'phone',
-						name: '申请者手机号',
-						value: '12345678912'
-					},
-					{
-						id: 'phone',
-						name: '申请者手机号',
-						value: '12345678912'
-					},
-					{
-						id: 'phone',
-						name: '访客姓名',
-						value: '12345678912'
-					},
-					{
-						id: 'phone',
-						name: '访客身份证',
-						value: '123456789126415897'
-					},
-				]
+				info: {
+					applyNo: 1254611,
+					status: 2,
+					staffCode: 123456,
+					staffName: '张三',
+					staffPhone: 123456789,
+					visitorName: '李四',
+					visitorIdCard:1234567894662552,
+					visitorPhone:123456799,
+					visitReason:'商务会议',
+					visitPosition:'一楼',
+					inTime:'2022-09-16 13:28:41',
+					outTime: "2022-10-06 13:28:46",
+                    remarks:'无'
+				},
+				color:'',
+				status:''
+			}
+		},
+		async onLoad(option){
+		   this.info = await getMessageInfo({messageId:option.messageId})
+		},
+		onShow(){
+			if(this.info.status == '1'){
+					 this.status = '申请通过'
+					 this.color = 'green'
+			}else if(this.info.status == '2'){
+					  this.status = '申请中'
+					  this.color = 'blue'
+			}else {
+					  this.status = '申请未通过'
+					  this.color = 'red'
 			}
 		},
 		methods: {
-			
+
 		}
 	}
 </script>
@@ -62,16 +102,26 @@
 	.check-message-detail {
 		padding: 18rpx;
 		height: 100%;
-		.detail-content{
+
+		.detail-content {
 			padding: 22rpx;
 			background-color: #fff;
 			border-radius: 10rpx;
 		}
-		.detail-item{
+
+		.detail-item {
 			display: flex;
 			justify-content: space-between;
 			margin-top: 44rpx;
 		}
 	}
-
+	.green{
+		color: #04ef0e;
+	}
+	.blue{
+		color: #04a4ef;
+	}
+	.red{
+		color: #ff0019;
+	}
 </style>
diff --git a/pages/information/information.vue b/pages/information/information.vue
index fac0620..7c2fb84 100644
--- a/pages/information/information.vue
+++ b/pages/information/information.vue
@@ -53,7 +53,6 @@
 			<u-datetime-picker :show="isTimeShow" v-model="callerInfo.outTime" mode="datetime" title="请选择结束时间"
 				:formatter="formatter" :minDate="minTime" @cancel="closeTime" @change="change" @confirm="confirmTime">
 			</u-datetime-picker>
-
 		</view>
 		<view style="margin-top: 42rpx;">
 			<u-button type="error" @click="submit">{{isForm ? '提交' : '完成'}}</u-button>
@@ -123,6 +122,7 @@
 			change(e) {},
 			//点击提交访客记录
 			async submit() {
+				console.log(JSON.stringify(this.callerInfo))
 				if (this.callerInfo.visitorName.trim() == '' || this.callerInfo.visitorIdCard.trim() == '' || this.callerInfo
 					.visitorPhone.trim() == '' || this.callerInfo.visitReason.trim() == '' || this.callerInfo.visitPosition.trim() == '' || this.callerInfo.staffCode.trim() == ''){
 						return uni.showToast({
@@ -130,7 +130,7 @@
 							icon: 'none',
 							duration: 2000,
 						})
-					}else if(this.callerInfo.inTime === this.callerInfo.outTime){
+					}else if(this.callerInfo.inTime >= this.callerInfo.outTime){
 						return uni.showToast({
 							title: `访客结束时间未选择`,
 							icon: 'none',

diff --git a/api/list.js b/api/list.js
new file mode 100644
index 0000000..f83bc41
--- /dev/null
+++ b/api/list.js
@@ -0,0 +1,23 @@
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base.js';
+import useNetWork from '@/common/useNetWork.js';
+
+const List = BASE_URL + '/visitor/apply/list'
+const MessageInfo = BASE_URL + '/visitor/getMessageInfo'
+/**
+ * 获取访客提交记录列表
+ * @param {*}  
+ */
+export function getList(data) {
+	useNetWork();
+  return fetch.post(List,data).then(res => res);
+}
+
+/**
+ * 获取消息详情
+ * @param {*}  
+ */
+export function getMessageInfo(params) {
+	useNetWork();
+  return fetch.get(MessageInfo,params).then(res => res);
+}
\ No newline at end of file
diff --git a/common/formatTime.js b/common/formatTime.js
index e5d158e..6129cc2 100644
--- a/common/formatTime.js
+++ b/common/formatTime.js
@@ -3,4 +3,13 @@
   var timestr = new Date(parseInt(unixtime) * 1000);
   var datetime = timestr.toLocaleString().replace(/年|月/g,"-").replace(/日/g," ");
   return datetime;
+}
+
+/* 
+  获取前几个月，默认前一个月的今天
+*/
+export function getLastMonth(monthNum = 1){
+  let today = new Date() //当天
+  today.setMonth(today.getMonth()-monthNum)
+  return today;
 }
\ No newline at end of file
diff --git a/pages.json b/pages.json
index b4cf49b..ab349c6 100644
--- a/pages.json
+++ b/pages.json
@@ -51,7 +51,7 @@
 			"style" :                                                                                    
 			{
 				"navigationBarTitleText": "列表",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": true
 			}	
 		},
 		{
diff --git a/pages/info/info.vue b/pages/info/info.vue
index e9e9c6a..c5c9234 100644
--- a/pages/info/info.vue
+++ b/pages/info/info.vue
@@ -1,59 +1,99 @@
 <template>
 	<view class="check-message-detail">
 		<view class="detail-content">
-			<view class="detail-item" v-for="item in form"  :key="item.id">
-				<text>{{item.name}}</text>
-				<text>{{item.value}}</text>
+			<view class="detail-item" >
+			<text>申请单号</text>
+			<text>{{info.applyNo}}</text>
+			</view>
+			<view class="detail-item" >
+			<text>申请状态</text>
+			<text :class="color">{{status}}</text>
+			</view>
+			<view class="detail-item" >
+					<text>申请者工号</text>
+					<text>{{info.staffCode}}</text>
+			</view>
+			<view class="detail-item" >
+					<text>申请者姓名</text>
+					<text>{{info.staffName}}</text>
+			</view>
+			<view class="detail-item" >
+					<text>申请者手机号</text>
+					<text>{{info.staffPhone}}</text>
+			</view>
+			<view class="detail-item" >
+					<text>访客姓名</text>
+					<text>{{info.visitorName}}</text>
+			</view>
+			<view class="detail-item" >
+					<text>访客身份证</text>
+					<text>{{info.visitorIdCard}}</text>
+			</view>
+			<view class="detail-item" >
+					<text>访客联系方式</text>
+					<text>{{info.visitorPhone}}</text>
+			</view>
+			<view class="detail-item" >
+					<text>访客目的</text>
+					<text>{{info.visitReason}}</text>
+			</view>
+			<view class="detail-item" >
+					<text>访客区域</text>
+					<text>{{info.visitPosition}}</text>
+			</view>
+			<view class="detail-item" >
+					<text>访客时间</text>
+					<text>{{info.inTime }}</text>
+			</view>
+			<view class="detail-item" >
+					<text>备注</text>
+					<text>{{info.remarks}}</text>
 			</view>
 		</view>
 	</view>
 </template>
 
 <script>
+	import {getMessageInfo} from '@/api/list.js'
 	export default {
 		data() {
 			return {
-				form: [
-					{
-						id: 'odd',
-						name: '申请单号',
-						value: '1111111111'
-					},
-					{
-						id: 'number',
-						name: '申请者工号',
-						value: '1111111111'
-					},
-					{
-						id: 'name',
-						name: '申请者姓名',
-						value: '张三'
-					},
-					{
-						id: 'phone',
-						name: '申请者手机号',
-						value: '12345678912'
-					},
-					{
-						id: 'phone',
-						name: '申请者手机号',
-						value: '12345678912'
-					},
-					{
-						id: 'phone',
-						name: '访客姓名',
-						value: '12345678912'
-					},
-					{
-						id: 'phone',
-						name: '访客身份证',
-						value: '123456789126415897'
-					},
-				]
+				info: {
+					applyNo: 1254611,
+					status: 2,
+					staffCode: 123456,
+					staffName: '张三',
+					staffPhone: 123456789,
+					visitorName: '李四',
+					visitorIdCard:1234567894662552,
+					visitorPhone:123456799,
+					visitReason:'商务会议',
+					visitPosition:'一楼',
+					inTime:'2022-09-16 13:28:41',
+					outTime: "2022-10-06 13:28:46",
+                    remarks:'无'
+				},
+				color:'',
+				status:''
+			}
+		},
+		async onLoad(option){
+		   this.info = await getMessageInfo({messageId:option.messageId})
+		},
+		onShow(){
+			if(this.info.status == '1'){
+					 this.status = '申请通过'
+					 this.color = 'green'
+			}else if(this.info.status == '2'){
+					  this.status = '申请中'
+					  this.color = 'blue'
+			}else {
+					  this.status = '申请未通过'
+					  this.color = 'red'
 			}
 		},
 		methods: {
-			
+
 		}
 	}
 </script>
@@ -62,16 +102,26 @@
 	.check-message-detail {
 		padding: 18rpx;
 		height: 100%;
-		.detail-content{
+
+		.detail-content {
 			padding: 22rpx;
 			background-color: #fff;
 			border-radius: 10rpx;
 		}
-		.detail-item{
+
+		.detail-item {
 			display: flex;
 			justify-content: space-between;
 			margin-top: 44rpx;
 		}
 	}
-
+	.green{
+		color: #04ef0e;
+	}
+	.blue{
+		color: #04a4ef;
+	}
+	.red{
+		color: #ff0019;
+	}
 </style>
diff --git a/pages/information/information.vue b/pages/information/information.vue
index fac0620..7c2fb84 100644
--- a/pages/information/information.vue
+++ b/pages/information/information.vue
@@ -53,7 +53,6 @@
 			<u-datetime-picker :show="isTimeShow" v-model="callerInfo.outTime" mode="datetime" title="请选择结束时间"
 				:formatter="formatter" :minDate="minTime" @cancel="closeTime" @change="change" @confirm="confirmTime">
 			</u-datetime-picker>
-
 		</view>
 		<view style="margin-top: 42rpx;">
 			<u-button type="error" @click="submit">{{isForm ? '提交' : '完成'}}</u-button>
@@ -123,6 +122,7 @@
 			change(e) {},
 			//点击提交访客记录
 			async submit() {
+				console.log(JSON.stringify(this.callerInfo))
 				if (this.callerInfo.visitorName.trim() == '' || this.callerInfo.visitorIdCard.trim() == '' || this.callerInfo
 					.visitorPhone.trim() == '' || this.callerInfo.visitReason.trim() == '' || this.callerInfo.visitPosition.trim() == '' || this.callerInfo.staffCode.trim() == ''){
 						return uni.showToast({
@@ -130,7 +130,7 @@
 							icon: 'none',
 							duration: 2000,
 						})
-					}else if(this.callerInfo.inTime === this.callerInfo.outTime){
+					}else if(this.callerInfo.inTime >= this.callerInfo.outTime){
 						return uni.showToast({
 							title: `访客结束时间未选择`,
 							icon: 'none',
diff --git a/pages/list/list.vue b/pages/list/list.vue
index 0e5bbca..a6f9635 100644
--- a/pages/list/list.vue
+++ b/pages/list/list.vue
@@ -5,18 +5,21 @@
     <u-input
       placeholder="关键字搜索"
       prefixIcon="search"
+	  v-model="queryList.keywords"
+	  @change="change"
       prefixIconStyle="font-size: 22px;color: #909399"
     ></u-input>
     <view class="tab-th">
-      <text style="margin-left: 44rpx; margin-top: 8rpx;color: #918a8a;">筛选时间 </text>
+      <text style="margin-left: 44rpx; margin-top: 8rpx;color: #918a8a;width: 140rpx;" @click="startTimeShow = true">{{time}} </text>
       <u-icon name="clock" color="#918a8a" size="12"></u-icon>
-      <text style="margin-left: 18rpx; margin-top: 8rpx;color: #918a8a;">筛选状态</text>
+      <text style="margin-left: 18rpx; margin-top: 8rpx;color: #918a8a;width: 140rpx;"@click="statusShow=true">{{statusInfo}}</text>
       <view class="icon">
-        <u-icon name="checkmark-circle" color="#34a705" size="36" ></u-icon>
+        <u-icon name="checkmark-circle" color="#34a705" size="36" @click="pass('通过')"></u-icon>
         <u-icon
           name="close-circle"
           color="#9b1203"
           size="36"
+		  @click="pass('拒绝')"
           style="margin-left: 104rpx"
         ></u-icon>
         <u-icon
@@ -34,13 +37,12 @@
         	<u-checkbox @change="checkboxChange(item)"  shape="circle"></u-checkbox>
         </u-checkbox-group>
       </view>
-      <view class="table-time"> {{item.time}} </view>
-      <view class="table-number">{{item.number}} </view>
-      <view class="table-name"> {{item.name}} </view>
+      <view class="table-time"> {{item.inTime}} </view>
+      <view class="table-number">{{item.remarks}} </view>
+      <view class="table-name"> {{item.visitorName}} </view>
+      <view class="table-status" :class="item.color"> {{item.status }} </view>
       <view class="table-icon">
-        <u-icon name="eye" color="#000" size="18" @click="eyeLoock"></u-icon>
-        <u-icon name="checkmark-circle" color="#34a705" size="18" @click="pass(item.number,'已通过')"></u-icon>
-        <u-icon name="close-circle" color="#9b1203" size="18"  @click="pass(item.number,'已拒绝')"></u-icon>
+        <u-icon name="eye" color="#000" size="18" @click="eyeLoock(item.applyNo)"></u-icon>
       </view>
     </view>
 	<u-popup :show="isExportShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" >
@@ -61,7 +63,7 @@
 	<u-popup :show="ispassShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" >
 	<view class="popup">
 			<view class="popup-title">
-	          单号{{number}}访客申请{{text}}
+	          确定要将{{text}}的{{leixin}}
 			</view>
 			<view class="popup-buttom">
 				<view class="popup-jujue popup-jujue-fanhui" @click="ispassShow = false">
@@ -73,56 +75,101 @@
 			</view>
 		</view>
 	</u-popup>
+	<u-datetime-picker :show="startTimeShow"  mode="datetime" title="请选择开始时间"
+		:formatter="formatter" :minDate="lastMonth"  @cancel="closeTime"  @confirm="confirmTime">
+	</u-datetime-picker>
+	<u-datetime-picker :show="endTimeShow"  mode="datetime" title="请选择结束时间"
+		:formatter="formatter" :minDate="Number(new Date())"  @cancel="endTimeShow = false"  @confirm="confirmEndTime">
+	</u-datetime-picker>
+	<u-action-sheet
+	  :show="statusShow"
+	  :actions="statusList"
+	  title="请选择状态"
+	  description="只能单选"
+	  @close="statusShow = false"
+	  @select="statusSelect"
+	>
+	</u-action-sheet>
   </view>
 </template>
 
 <script>
 import TabBar from '@/components/tabBar/tabBar.vue'
+import {getList} from '@/api/list.js'
+import {debounce} from '@/common/utils.js'
+import {getLastMonth} from '@/common/formatTime.js'
 export default {
   components: {
     TabBar,
   },
   data() {
     return {
-      list: [
-        {
-          value: false,
-		  time:'2022-10-2912:25:00',
-		  number:'202210290001',
-		  name:'张三'
-        },
-		{
-		  value: false,
-		  time:'2022-10-2912:25:00',
-		  number:'202210290001',
-		  name:'李四'
-		},
-		{
-		  value: false,
-		  time:'2022-10-2912:25:00',
-		  number:'202210290001',
-		  name:'王五'
-		},
-		{
-		  value: false,
-		  time:'2022-10-2912:25:00',
-		  number:'202210290001',
-		  name:'赵六'
-		},
-      ],
+	 queryList:{
+		keywords:'' ,
+		startTime:'',
+		endTime:'',
+		status:''
+	 },
+      list: [],
 	  isExportShow:false,
 	  ispassShow:false,
-	  number:'',
+	  leixin:'',
 	  text:'已通过',
 	  checkboxList:[],
-	  checkExport:'所有'
+	  checkExport:'所有',
+	  startTimeShow:false,
+	  lastMonth: Number(new Date()) - 25920000000,
+	  endTimeShow:false,
+	  TimeNextShow:false,
+	  statusShow:false,
+	  statusList:[{name:'已通过',id:1},{name:'未通过',id:2}],
+	  time:'筛选时间',
+	  isTimeQ:'',
+	  isTimeZ:'',
+	  statusInfo:'筛选状态'
     }
   },
-  onShow() {
+  async onShow() {
     let pages = getCurrentPages()
     const curPage = pages[pages.length - 1]
     this.currentPagePath = curPage.route
     uni.setStorageSync('currentPagePath', this.currentPagePath)
+	this.queryList = {
+			keywords:'' ,
+			startTime:'',
+			endTime:'',
+			status:''  
+	}
+	const res = await getList({})
+	this.list = res.map(item=>{
+	  if(item.visitorApplyStatus == '1'){ 
+		 item.status = '申请通过'
+		 item.color = 'green'
+	  }else if(item.visitorApplyStatus == '2'){
+		  item.status = '申请中'
+		  item.color = 'blue'
+	  }else {
+		  item.status = '申请未通过'
+		  item.color = 'red'
+	  }
+	  return item
+	})
+	 
+  },
+  //下拉刷新
+  onPullDownRefresh(){
+	  this.queryList = {
+		 keywords:'' ,
+		 startTime:'',
+		 endTime:'',
+		 status:'' 
+	  }
+	  this.statusInfo = '筛选状态'
+	  this.time ='筛选时间'
+	this.searchList() 
+	setTimeout(()=>{
+	  uni.stopPullDownRefresh()
+	},1000)
   },
   methods: {
 	  //选中的数据
@@ -138,11 +185,48 @@
 			  this.checkExport = '所有'
 		  }
 	  },
+	  //搜索框发生改变
+	 async change(e){
+		 if(e.trim() === '') {
+			 const res = await getList({})
+			return this.list = res 
+		 }
+		 setTimeout(()=>{
+			 this.searchList()
+		 },1000)
+	  },
+	  //根据条件搜索
+	 async searchList(){  
+		const res = await getList(this.queryList)
+		if(res.length == 0){
+		    this.list = []
+		}else{
+	  this.list = res.map(item=>{
+      if(item.visitorApplyStatus == '1'){ 
+		 item.status = '申请通过'
+		 item.color = 'green'
+	  }else if(item.visitorApplyStatus == '2'){
+		  item.status = '申请中'
+		  item.color = 'blue'
+	  }else {
+		  item.status = '申请未通过'
+		  item.color = 'red'
+	  }
+	  return item
+	})
+		}
+	  },
+	  //选中状态
+	  statusSelect(e){
+		this.statusInfo = e.name
+		this.queryList.status = e.id
+		this.searchList()
+	  },
 	  //打开导出提示框
-	  pass(number,text){
-		  this.number = number
-		  this.text = text
-		  this.ispassShow = true
+	  pass(leixin){
+		  this.leixin = leixin
+		  this.checkboxList.length !== 0 ? this.text = '选中的' : this.text = '全部' 
+		   this.ispassShow = true
 	  },
 	  possQr(){
 		  this.ispassShow = false
@@ -150,11 +234,59 @@
 	  exportQr(){
 		  this.isExportShow = false
 	  },
-	  eyeLoock(){
+	  eyeLoock(messageId){
 		  wx.navigateTo({
-		  	url: `/pages/info/info`,
+		  	url: `/pages/info/info?messageId=${messageId}`,
 		  });
-	  }
+	  },
+	  //取消选择时间
+	  closeTime() {
+	  	this.startTimeShow = false
+	  },
+	  //确定选择结束时间
+	 async confirmEndTime(e){
+		this.queryList.endTime = await this.shijianc(e.value)
+		this.isTimeZ = await this.yueFen(e.value)
+		this.time = `${this.isTimeQ}${this.isTimeZ}`
+		this.endTimeShow = false
+		this.searchList()  
+	  },
+	  //确定选择开始时间
+	  async confirmTime(e) {
+	  	this.queryList.startTime = await this.shijianc(e.value)
+		this.isTimeQ = await this.yueFen(e.value)
+	  	this.startTimeShow = false
+		this.endTimeShow = true
+	  },
+	  shijianc(time) {
+	  	let date = new Date(time)
+	  	let Y = date.getFullYear() + '-'
+	  	let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'
+	  	let D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ' '
+	  	let h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':'
+	  	let m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':'
+	  	let s = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds())
+	  	return Y + M + D + h + m + s
+	  },
+	  yueFen(time) {
+	  	let date = new Date(time)
+	  	let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'
+	  	let D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ' '
+	  	return  M + D 
+	  },
+	  //格式化时间
+	  formatter(type, value) {
+	  	if (type === 'year') {
+	  		return `${value}年`
+	  	}
+	  	if (type === 'month') {
+	  		return `${value}月`
+	  	}
+	  	if (type === 'day') {
+	  		return `${value}日`
+	  	}
+	  	return value
+	  },
   },
 }
 </script>
@@ -179,40 +311,46 @@
     font-size: 28rpx;
     border: 0.5rpx #000 solid;
     .table-checkbox {
-      width: 50rpx;
+      width: 30rpx;
       height: 100rpx;
-      border: 0.5rpx #000 solid;
-      padding-top: 50rpx;
-      padding-left: 16rpx;
+      border-right: 0.5rpx #000 solid;
+	  padding: 50rpx 5rpx 3rpx 3rpx;
     }
     .table-time {
       width: 200rpx;
       height: 110rpx;
       padding-top: 40rpx;
       text-align: center;
-      border: 0.5rpx #000 solid;
+      border-right: 0.5rpx #000 solid;
     }
     .table-number {
-      width: 200rpx;
+      width: 160rpx;
       height: 150rpx;
       line-height: 150rpx;
       text-align: center;
-      border: 0.5rpx #000 solid;
+      border-right: 0.5rpx #000 solid;
     }
     .table-name {
-      width: 100rpx;
+      width: 140rpx;
       height: 150rpx;
       line-height: 150rpx;
       text-align: center;
-      border: 0.5rpx #000 solid;
+      border-right: 0.5rpx #000 solid;
     }
+	.table-status{
+		width: 140rpx;
+		font-size: 24rpx;
+		text-align: center;
+		line-height: 150rpx;
+		border-right: 0.5rpx #000 solid;
+	}
     .table-icon {
       display: flex;
-      justify-content: space-between;
+      justify-content: center;
 	  padding-right: 10rpx;
       height: 150rpx;
-	  width: 150rpx;
-      border: 0.5rpx #000 solid;
+	  width: 50rpx;
+      border-right: 0.5rpx #000 solid;
     }
   }
 }
@@ -255,4 +393,13 @@
 				border: 1px #000 solid;
 			}
 		}
+		.green{
+			color: #04ef0e;
+		}
+		.blue{
+			color: #04a4ef;
+		}
+		.red{
+			color: #ff0019;
+		}
 </style>