diff --git a/pages.json b/pages.json
index 302ed83..ad3a7fe 100644
--- a/pages.json
+++ b/pages.json
@@ -30,14 +30,6 @@
 			}	
 		},
 		{
-			"path" : "pages/findPassword/findPassword",
-			"style" :                                                                                    
-			{
-				"navigationBarTitleText": "找回密码",
-				"enablePullDownRefresh": false
-			}	
-		},
-		{
 			"path" : "pages/register/register",
 			"style" :                                                                                    
 			{

diff --git a/pages.json b/pages.json
index 302ed83..ad3a7fe 100644
--- a/pages.json
+++ b/pages.json
@@ -30,14 +30,6 @@
 			}	
 		},
 		{
-			"path" : "pages/findPassword/findPassword",
-			"style" :                                                                                    
-			{
-				"navigationBarTitleText": "找回密码",
-				"enablePullDownRefresh": false
-			}	
-		},
-		{
 			"path" : "pages/register/register",
 			"style" :                                                                                    
 			{
diff --git a/pages/findPassword/findPassword.vue b/pages/findPassword/findPassword.vue
deleted file mode 100644
index ce99c13..0000000
--- a/pages/findPassword/findPassword.vue
+++ /dev/null
@@ -1,285 +0,0 @@
-/**
- * 找回密码页面
- */
-<template>
-	<view class="find-password">
-		<view v-if="isShow">
-			<p class="title">请验证以下信息</p>
-			<u--form labelPosition="left" :model="form" :rules="rules" ref="form1">
-				<u-form-item label="员工号" prop="number" labelWidth="80" class="form-item">
-					<u--input v-model="form.number" placeholder="请输入员工号"></u--input>
-				</u-form-item>
-				<u-form-item label="姓名" prop="name" labelWidth="80" class="form-item">
-					<u--input v-model="form.name" placeholder="请输入员姓名"></u--input>
-				</u-form-item>
-				<u-form-item label="手机号码" prop="phone"  labelWidth="80" class="form-item">
-					<u-button v-model="form.phone"  @click="getUserInfo" border="none">{{form.phone || '获取手机号'}}</u-button>
-				</u-form-item>
-			</u--form>
-			<u-button type="primary" text="下一步" @click="nextGo" style="margin-top: 36rpx;"></u-button>
-		</view>
-		<view  v-else>
-			<p class="title">请设置新密码</p>
-			<u--form labelPosition="left" :model="form" :rules="rules" ref="form1">
-				<u-form-item label="密码" prop="password" labelWidth="80" class="form-item">
-					<u--input v-model="form.password" placeholder="请输入密码" password></u--input>
-				</u-form-item>
-				<u-form-item label="确认密码" prop="confirmPassword" labelWidth="80" class="form-item">
-					<u--input v-model="form.confirmPassword" placeholder="请再次输入密码" password></u--input>
-				</u-form-item>
-			</u--form>
-			<u-button type="primary" text="完成" @click="passwordOk" style="margin-top: 36rpx;"></u-button>
-		</view>
-		<u-popup :show="sqShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
-			<view class="popup">
-				<view class="popup-title"> 微信授权</view>
-				<view class="popup-content">
-					申请获取你微信绑定的手机号***********？
-				</view>
-				<view class="popup-buttom">
-					<view class="popup-jujue" @click="reject">
-						拒绝
-					</view>
-					<view class="popup-yunxu" @click="permit">
-						允许
-					</view>
-				</view>
-			</view>
-		</u-popup>
-		<u-popup :show="jujueShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
-			<view class="popup">
-				<view class="popup-all-title">
-					拒绝将无法进行修改密码!
-				</view>
-				<view class="popup-buttom">
-					<view class="popup-jujue" @click="rejectAll">
-						仍要拒绝
-					</view>
-					<view class="popup-yunxu" @click="permit">
-						允许授权
-					</view>
-				</view>
-			</view>
-		</u-popup>
-		<u-popup :show="errorShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
-			<view class="popup">
-				<view class="popup-error-title">
-                 您的账号信息验证不通过，请重新填写。
-				</view>
-				<view class="popup-buttom-error">
-					<view class=" popup-jujue-fanhui" @click="errorFh">
-						返回
-					</view>
-					<view class=" popup-jujue-queren" @click="errorQr">
-						确认
-					</view>
-				</view>
-			</view>
-		</u-popup>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-			form:{
-				number:''  ,//员工号
-				name: '', //姓名
-				phone: '', //电话
-			},
-			rules: {
-				name: [{
-					required: true,
-					message: '请填写姓名',
-					trigger: ['blur', 'change'],
-				}],
-				number: [{
-					required: true,
-					message: '请填写员工号',
-					trigger: ['blur', 'change'],
-				}],
-				password: [{
-						required: true,
-						message: '请填写密码',
-						trigger: ['blur', 'change']
-					},
-					{
-						pattern: /^[0-9a-zA-Z]*$/g,
-						transform(value) {
-							return String(value);
-						},
-						message: '只能包含字母或数字'
-					},
-					{
-						min: 8,
-						max: 15,
-						message: '长度在8-15个字符之间'
-					}
-				],
-			},
-			sqShow:false,
-			jujueShow:false,
-			errorShow: false,
-			isShow:true
-			}
-		},
-		methods: {
-			//设置密码完成
-			passwordOk(){
-			wx.navigateTo({
-				url: '/pages/login/login'
-			})
-			},
-			//注册失败确认
-			errorQr() {
-				this.errorShow = false
-			},
-			//注册失败返回
-			errorFh() {
-				this.errorShow = false
-			},
-			//点击下一步
-			nextGo(){  
-			console.log(this.form)
-			this.isShow = false
-			// this.errorShow = true
-			},
-			//任然要拒绝
-			rejectAll() {
-				this.jujueShow = false
-			},
-			//允许获取
-			permit() {
-				this.sqShow = false
-				this.jujueShow = false
-			},
-			//拒绝获取
-			reject() {
-				this.sqShow = false
-				this.jujueShow = true
-			},
-			open() {
-			
-			},
-			//收起键盘
-			hideKeyBorder(e) {
-			      wx.hideKeyboard({
-               complete: res => {
-                 console.log('hideKeyboard res', res)
-                }
-                 });
-			    },
-			//关闭授权获取手机号弹窗
-			close() {
-				this.sqShow = false
-			},
-			//获取用户手机号
-			 getUserInfo() {
-			 this.hideKeyBorder()
-			 setTimeout(()=>{
-				 this.sqShow = true
-				 wx.getUserInfo({
-				 	success: function(res) {
-				 		console.log(res)
-				 	}
-				 })
-			 },30)
-				
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.find-password{
-		padding: 32rpx;
-	}
-	.title {
-		font-size: 42rpx;
-		font-weight: 500;
-		margin-bottom: 32rpx;
-			}
-			.popup {
-				width: 700rpx;
-				height: 450rpx;
-			
-				.popup-title {
-					text-align: center;
-					font-size: 36rpx;
-					margin: 35rpx;
-				}
-			
-				.popup-content {
-					width: 70%;
-					margin-left: 135rpx;
-					line-height: 54rpx;
-				}
-			
-				.popup-error-title {
-					margin-left: 36rpx;
-					margin-right: 36rpx;
-					margin-top: 50rpx;
-					font-size: 38rpx
-				}
-			
-				.popup-login {
-					margin-left: 240rpx;
-					margin-top: 120rpx;
-					width: 180rpx;
-					height: 52rpx;
-					background-color: skyblue;
-					border-radius: 8rpx;
-					line-height: 52rpx;
-					border: #000 1px solid;
-					text-align: center;
-					color: #fff;
-				}
-				.popup-buttom {
-					padding: 70rpx;
-					margin-top: 24rpx;
-					display: flex;
-					justify-content: space-between;
-				}
-				.popup-buttom-error{
-					padding: 70rpx;
-					margin-top: 54rpx;
-					display: flex;
-					justify-content: space-between;
-				}
-			
-				.popup-jujue-fanhui {
-					width: 160rpx;
-                    height: 62rpx;
-					text-align: center;
-					line-height: 62rpx;
-					border-radius: 8rpx;
-					background-color: gray;
-					color: #fff;
-				}
-			
-				.popup-jujue-queren {
-					width: 160rpx;
-					height: 62rpx;
-					text-align: center;
-					line-height: 62rpx;
-					border-radius: 8rpx;
-					background-color: skyblue;
-					color: #fff;
-				}
-			
-				.popup-buttom view {
-					width: 180rpx;
-					height: 56rpx;
-					text-align: center;
-					line-height: 56rpx;
-					border-radius: 6rpx;
-					border: 1px #000 solid;
-				}
-				.popup-all-title {
-					text-align: center;
-					font-size: 42rpx;
-					margin-top: 142rpx;
-				}
-				}
-</style>

diff --git a/pages.json b/pages.json
index 302ed83..ad3a7fe 100644
--- a/pages.json
+++ b/pages.json
@@ -30,14 +30,6 @@
 			}	
 		},
 		{
-			"path" : "pages/findPassword/findPassword",
-			"style" :                                                                                    
-			{
-				"navigationBarTitleText": "找回密码",
-				"enablePullDownRefresh": false
-			}	
-		},
-		{
 			"path" : "pages/register/register",
 			"style" :                                                                                    
 			{
diff --git a/pages/findPassword/findPassword.vue b/pages/findPassword/findPassword.vue
deleted file mode 100644
index ce99c13..0000000
--- a/pages/findPassword/findPassword.vue
+++ /dev/null
@@ -1,285 +0,0 @@
-/**
- * 找回密码页面
- */
-<template>
-	<view class="find-password">
-		<view v-if="isShow">
-			<p class="title">请验证以下信息</p>
-			<u--form labelPosition="left" :model="form" :rules="rules" ref="form1">
-				<u-form-item label="员工号" prop="number" labelWidth="80" class="form-item">
-					<u--input v-model="form.number" placeholder="请输入员工号"></u--input>
-				</u-form-item>
-				<u-form-item label="姓名" prop="name" labelWidth="80" class="form-item">
-					<u--input v-model="form.name" placeholder="请输入员姓名"></u--input>
-				</u-form-item>
-				<u-form-item label="手机号码" prop="phone"  labelWidth="80" class="form-item">
-					<u-button v-model="form.phone"  @click="getUserInfo" border="none">{{form.phone || '获取手机号'}}</u-button>
-				</u-form-item>
-			</u--form>
-			<u-button type="primary" text="下一步" @click="nextGo" style="margin-top: 36rpx;"></u-button>
-		</view>
-		<view  v-else>
-			<p class="title">请设置新密码</p>
-			<u--form labelPosition="left" :model="form" :rules="rules" ref="form1">
-				<u-form-item label="密码" prop="password" labelWidth="80" class="form-item">
-					<u--input v-model="form.password" placeholder="请输入密码" password></u--input>
-				</u-form-item>
-				<u-form-item label="确认密码" prop="confirmPassword" labelWidth="80" class="form-item">
-					<u--input v-model="form.confirmPassword" placeholder="请再次输入密码" password></u--input>
-				</u-form-item>
-			</u--form>
-			<u-button type="primary" text="完成" @click="passwordOk" style="margin-top: 36rpx;"></u-button>
-		</view>
-		<u-popup :show="sqShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
-			<view class="popup">
-				<view class="popup-title"> 微信授权</view>
-				<view class="popup-content">
-					申请获取你微信绑定的手机号***********？
-				</view>
-				<view class="popup-buttom">
-					<view class="popup-jujue" @click="reject">
-						拒绝
-					</view>
-					<view class="popup-yunxu" @click="permit">
-						允许
-					</view>
-				</view>
-			</view>
-		</u-popup>
-		<u-popup :show="jujueShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
-			<view class="popup">
-				<view class="popup-all-title">
-					拒绝将无法进行修改密码!
-				</view>
-				<view class="popup-buttom">
-					<view class="popup-jujue" @click="rejectAll">
-						仍要拒绝
-					</view>
-					<view class="popup-yunxu" @click="permit">
-						允许授权
-					</view>
-				</view>
-			</view>
-		</u-popup>
-		<u-popup :show="errorShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
-			<view class="popup">
-				<view class="popup-error-title">
-                 您的账号信息验证不通过，请重新填写。
-				</view>
-				<view class="popup-buttom-error">
-					<view class=" popup-jujue-fanhui" @click="errorFh">
-						返回
-					</view>
-					<view class=" popup-jujue-queren" @click="errorQr">
-						确认
-					</view>
-				</view>
-			</view>
-		</u-popup>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-			form:{
-				number:''  ,//员工号
-				name: '', //姓名
-				phone: '', //电话
-			},
-			rules: {
-				name: [{
-					required: true,
-					message: '请填写姓名',
-					trigger: ['blur', 'change'],
-				}],
-				number: [{
-					required: true,
-					message: '请填写员工号',
-					trigger: ['blur', 'change'],
-				}],
-				password: [{
-						required: true,
-						message: '请填写密码',
-						trigger: ['blur', 'change']
-					},
-					{
-						pattern: /^[0-9a-zA-Z]*$/g,
-						transform(value) {
-							return String(value);
-						},
-						message: '只能包含字母或数字'
-					},
-					{
-						min: 8,
-						max: 15,
-						message: '长度在8-15个字符之间'
-					}
-				],
-			},
-			sqShow:false,
-			jujueShow:false,
-			errorShow: false,
-			isShow:true
-			}
-		},
-		methods: {
-			//设置密码完成
-			passwordOk(){
-			wx.navigateTo({
-				url: '/pages/login/login'
-			})
-			},
-			//注册失败确认
-			errorQr() {
-				this.errorShow = false
-			},
-			//注册失败返回
-			errorFh() {
-				this.errorShow = false
-			},
-			//点击下一步
-			nextGo(){  
-			console.log(this.form)
-			this.isShow = false
-			// this.errorShow = true
-			},
-			//任然要拒绝
-			rejectAll() {
-				this.jujueShow = false
-			},
-			//允许获取
-			permit() {
-				this.sqShow = false
-				this.jujueShow = false
-			},
-			//拒绝获取
-			reject() {
-				this.sqShow = false
-				this.jujueShow = true
-			},
-			open() {
-			
-			},
-			//收起键盘
-			hideKeyBorder(e) {
-			      wx.hideKeyboard({
-               complete: res => {
-                 console.log('hideKeyboard res', res)
-                }
-                 });
-			    },
-			//关闭授权获取手机号弹窗
-			close() {
-				this.sqShow = false
-			},
-			//获取用户手机号
-			 getUserInfo() {
-			 this.hideKeyBorder()
-			 setTimeout(()=>{
-				 this.sqShow = true
-				 wx.getUserInfo({
-				 	success: function(res) {
-				 		console.log(res)
-				 	}
-				 })
-			 },30)
-				
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.find-password{
-		padding: 32rpx;
-	}
-	.title {
-		font-size: 42rpx;
-		font-weight: 500;
-		margin-bottom: 32rpx;
-			}
-			.popup {
-				width: 700rpx;
-				height: 450rpx;
-			
-				.popup-title {
-					text-align: center;
-					font-size: 36rpx;
-					margin: 35rpx;
-				}
-			
-				.popup-content {
-					width: 70%;
-					margin-left: 135rpx;
-					line-height: 54rpx;
-				}
-			
-				.popup-error-title {
-					margin-left: 36rpx;
-					margin-right: 36rpx;
-					margin-top: 50rpx;
-					font-size: 38rpx
-				}
-			
-				.popup-login {
-					margin-left: 240rpx;
-					margin-top: 120rpx;
-					width: 180rpx;
-					height: 52rpx;
-					background-color: skyblue;
-					border-radius: 8rpx;
-					line-height: 52rpx;
-					border: #000 1px solid;
-					text-align: center;
-					color: #fff;
-				}
-				.popup-buttom {
-					padding: 70rpx;
-					margin-top: 24rpx;
-					display: flex;
-					justify-content: space-between;
-				}
-				.popup-buttom-error{
-					padding: 70rpx;
-					margin-top: 54rpx;
-					display: flex;
-					justify-content: space-between;
-				}
-			
-				.popup-jujue-fanhui {
-					width: 160rpx;
-                    height: 62rpx;
-					text-align: center;
-					line-height: 62rpx;
-					border-radius: 8rpx;
-					background-color: gray;
-					color: #fff;
-				}
-			
-				.popup-jujue-queren {
-					width: 160rpx;
-					height: 62rpx;
-					text-align: center;
-					line-height: 62rpx;
-					border-radius: 8rpx;
-					background-color: skyblue;
-					color: #fff;
-				}
-			
-				.popup-buttom view {
-					width: 180rpx;
-					height: 56rpx;
-					text-align: center;
-					line-height: 56rpx;
-					border-radius: 6rpx;
-					border: 1px #000 solid;
-				}
-				.popup-all-title {
-					text-align: center;
-					font-size: 42rpx;
-					margin-top: 142rpx;
-				}
-				}
-</style>
diff --git a/pages/information/information.vue b/pages/information/information.vue
index 4f7ea5c..4b36443 100644
--- a/pages/information/information.vue
+++ b/pages/information/information.vue
@@ -1,61 +1,65 @@
 <template>
 	<view class="information">
-		<u--form labelPosition="left" :model="callerInfo" :rules="rules" ref="form1" v-if="isForm">
-			<u-form-item label="访客姓名" prop="callerNmae" labelWidth="100" borderBottom>
-				<u--input v-model="callerInfo.callerNmae" border="none" placeholder="请输入访客姓名"></u--input>
-			</u-form-item>
-			<u-form-item label="访客身份证" prop="id" borderBottom labelWidth="100">
-				<u--input v-model="callerInfo.id" border="none" placeholder="请输入访客身份证"></u--input>
-			</u-form-item>
-			<u-form-item label="访客联系方式" prop="contact" borderBottom labelWidth="100">
-				<u--input v-model="callerInfo.contact" border="none" placeholder="请输入访客联系方式"></u--input>
-			</u-form-item>
-			<u-form-item label="访客目的" prop="purpose" borderBottom labelWidth="100">
-				<u-button v-model="callerInfo.purpose" @click="show=true">{{callerInfo.purpose || '请选择访客目的'}}</u-button>
-			</u-form-item>
-			<u-form-item label="访客楼栋" prop="building" borderBottom labelWidth="100">
-				<u-button v-model="callerInfo.building" @click="buildingShow=true">{{callerInfo.building || '请选择访客楼栋'}}
-				</u-button>
-			</u-form-item>
-			<u-form-item label="访客时间" prop="time" borderBottom labelWidth="100">
-				<button  @click="isTimeShow=true">
-					<view style="font-size: 24rpx;">{{`开始时间:${callerInfo.time}`}}</view>
-					<view style="font-size: 24rpx;">{{`结束时间:${callerInfo.endTime}`}}</view>
-				</button>
-			</u-form-item>
-			<u-form-item label="申请者工号" prop="number" borderBottom labelWidth="100">
-				<u--input v-model="callerInfo.number" border="none" placeholder="请输入申请者工号"></u--input>
-			</u-form-item>
-			<u-form-item label="申请者名字"  borderBottom labelWidth="100">
-				<u--input v-model="callerInfo.name" border="none" placeholder="请输入申请者姓名"></u--input>
-			</u-form-item>
-			<u-form-item label="备注"  borderBottom labelWidth="100">
-				<u--input v-model="callerInfo.bz" border="none" placeholder="请输入备注"></u--input>
-			</u-form-item>
-		</u--form>
-		<view v-else class="informationSubmit">
-			<view class="informationSubmit-box">
-				<u-icon name="checkbox-mark" color="#fff" size="72"></u-icon>
-			</view>
-			<view class="informationSubmit-text">
-			 信息提交成功，请等待物业管理员处理。
-			</view>
+		<view class="form">
+			<u--form labelPosition="left" :model="callerInfo" :rules="rules" ref="form1" v-if="isForm" >
+					<u-form-item label="访客姓名" prop="callerNmae" labelWidth="100" borderBottom>
+						<u--input v-model="callerInfo.callerNmae" border="none" placeholder="请输入访客姓名"></u--input>
+					</u-form-item>
+					<u-form-item label="访客身份证" prop="id" borderBottom labelWidth="100">
+						<u--input v-model="callerInfo.id" border="none" placeholder="请输入访客身份证"></u--input>
+					</u-form-item>
+					<u-form-item label="访客联系方式" prop="contact" borderBottom labelWidth="100">
+						<u--input v-model="callerInfo.contact" border="none" placeholder="请输入访客联系方式"></u--input>
+					</u-form-item>
+					<u-form-item label="访客目的" prop="purpose" borderBottom labelWidth="100">
+						<u-button v-model="callerInfo.purpose" @click="show=true">{{callerInfo.purpose || '请选择访客目的'}}</u-button>
+					</u-form-item>
+					<u-form-item label="访客楼栋" prop="building" borderBottom labelWidth="100">
+						<u-button v-model="callerInfo.building" @click="buildingShow=true">{{callerInfo.building || '请选择访客楼栋'}}
+						</u-button>
+					</u-form-item>
+					<u-form-item label="访客时间" prop="time" borderBottom labelWidth="100">
+						<u-button  @click="isTimeShow=true">
+							<view style="font-size: 24rpx;">{{`开始时间:${callerInfo.time}`}}</view>
+							<view style="font-size: 24rpx;">{{`结束时间:${callerInfo.endTime}`}}</view>
+						</u-button>
+					</u-form-item>
+					<u-form-item label="申请者工号" prop="number" borderBottom labelWidth="100">
+						<u--input v-model="callerInfo.number" border="none" placeholder="请输入申请者工号"></u--input>
+					</u-form-item>
+					<u-form-item label="申请者名字"  borderBottom labelWidth="100">
+						<u--input v-model="callerInfo.name" border="none" placeholder="请输入申请者姓名"></u--input>
+					</u-form-item>
+					<u-form-item label="备注"  borderBottom labelWidth="100">
+						<u--input v-model="callerInfo.bz" border="none" placeholder="请输入备注"></u--input>
+					</u-form-item>
+				</u--form>
+				<view v-else class="informationSubmit">
+					<view class="informationSubmit-box">
+						<u-icon name="checkbox-mark" color="#fff" size="72"></u-icon>
+					</view>
+					<view class="informationSubmit-text">
+					 信息提交成功，请等待物业管理员处理。
+					</view>
+				</view>
+				<u-picker :show="show" :columns="columns" @close="show=false" @confirm="getPurpose"></u-picker>
+				<u-picker :show="buildingShow" :columns="buildingColumns" @close="buildingShow=false" @confirm="getBuilding">
+				</u-picker>
+				<u-datetime-picker
+					:show="isTimeShow"
+					v-model="callerInfo.endTime"
+					mode="datetime"
+					title="请选择结束时间"
+					:formatter="formatter"
+					:minDate="minTime"
+					@change="changeTime"
+					@cancel="closeTime"
+					@confirm="confirmTime"
+			></u-datetime-picker>
+				
 		</view>
-		<u-picker :show="show" :columns="columns" @close="show=false" @confirm="getPurpose"></u-picker>
-		<u-picker :show="buildingShow" :columns="buildingColumns" @close="buildingShow=false" @confirm="getBuilding">
-		</u-picker>
-		<u-datetime-picker
-			:show="isTimeShow"
-			v-model="callerInfo.endTime"
-			mode="datetime"
-			title="请选择结束时间"
-			:formatter="formatter"
-			@change="changeTime"
-			@cancel="closeTime"
-			@confirm="confirmTime"
-	></u-datetime-picker>
 		<view style="margin-top: 42rpx;">
-			<u-button type="primary" @click="submit">{{isForm ? '提交' : '完成'}}</u-button>
+			<u-button type="error" @click="submit" >{{isForm ? '提交' : '完成'}}</u-button>
 		</view>
 	</view>
 </template>
@@ -74,8 +78,9 @@
 			number: '',
 			name: '',
 			bz: '',
-			endTime:Number(new Date()) + 1000
+			endTime:Number(new Date()) 
 		},
+		minTime:Number(new Date()),
 		rules:{
 			callerNmae:[{
 						required: true,
@@ -172,7 +177,12 @@
 
 <style scoped lang="scss">
 	.information{
-		padding: 52rpx;
+		padding: 22rpx;
+		.form{
+			padding: 0 32rpx 0;
+			border-radius: 10rpx;
+			background-color: #fff;
+		}
 	}
 	.informationSubmit{
 		display: flex;

diff --git a/pages.json b/pages.json
index 302ed83..ad3a7fe 100644
--- a/pages.json
+++ b/pages.json
@@ -30,14 +30,6 @@
 			}	
 		},
 		{
-			"path" : "pages/findPassword/findPassword",
-			"style" :                                                                                    
-			{
-				"navigationBarTitleText": "找回密码",
-				"enablePullDownRefresh": false
-			}	
-		},
-		{
 			"path" : "pages/register/register",
 			"style" :                                                                                    
 			{
diff --git a/pages/findPassword/findPassword.vue b/pages/findPassword/findPassword.vue
deleted file mode 100644
index ce99c13..0000000
--- a/pages/findPassword/findPassword.vue
+++ /dev/null
@@ -1,285 +0,0 @@
-/**
- * 找回密码页面
- */
-<template>
-	<view class="find-password">
-		<view v-if="isShow">
-			<p class="title">请验证以下信息</p>
-			<u--form labelPosition="left" :model="form" :rules="rules" ref="form1">
-				<u-form-item label="员工号" prop="number" labelWidth="80" class="form-item">
-					<u--input v-model="form.number" placeholder="请输入员工号"></u--input>
-				</u-form-item>
-				<u-form-item label="姓名" prop="name" labelWidth="80" class="form-item">
-					<u--input v-model="form.name" placeholder="请输入员姓名"></u--input>
-				</u-form-item>
-				<u-form-item label="手机号码" prop="phone"  labelWidth="80" class="form-item">
-					<u-button v-model="form.phone"  @click="getUserInfo" border="none">{{form.phone || '获取手机号'}}</u-button>
-				</u-form-item>
-			</u--form>
-			<u-button type="primary" text="下一步" @click="nextGo" style="margin-top: 36rpx;"></u-button>
-		</view>
-		<view  v-else>
-			<p class="title">请设置新密码</p>
-			<u--form labelPosition="left" :model="form" :rules="rules" ref="form1">
-				<u-form-item label="密码" prop="password" labelWidth="80" class="form-item">
-					<u--input v-model="form.password" placeholder="请输入密码" password></u--input>
-				</u-form-item>
-				<u-form-item label="确认密码" prop="confirmPassword" labelWidth="80" class="form-item">
-					<u--input v-model="form.confirmPassword" placeholder="请再次输入密码" password></u--input>
-				</u-form-item>
-			</u--form>
-			<u-button type="primary" text="完成" @click="passwordOk" style="margin-top: 36rpx;"></u-button>
-		</view>
-		<u-popup :show="sqShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
-			<view class="popup">
-				<view class="popup-title"> 微信授权</view>
-				<view class="popup-content">
-					申请获取你微信绑定的手机号***********？
-				</view>
-				<view class="popup-buttom">
-					<view class="popup-jujue" @click="reject">
-						拒绝
-					</view>
-					<view class="popup-yunxu" @click="permit">
-						允许
-					</view>
-				</view>
-			</view>
-		</u-popup>
-		<u-popup :show="jujueShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
-			<view class="popup">
-				<view class="popup-all-title">
-					拒绝将无法进行修改密码!
-				</view>
-				<view class="popup-buttom">
-					<view class="popup-jujue" @click="rejectAll">
-						仍要拒绝
-					</view>
-					<view class="popup-yunxu" @click="permit">
-						允许授权
-					</view>
-				</view>
-			</view>
-		</u-popup>
-		<u-popup :show="errorShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
-			<view class="popup">
-				<view class="popup-error-title">
-                 您的账号信息验证不通过，请重新填写。
-				</view>
-				<view class="popup-buttom-error">
-					<view class=" popup-jujue-fanhui" @click="errorFh">
-						返回
-					</view>
-					<view class=" popup-jujue-queren" @click="errorQr">
-						确认
-					</view>
-				</view>
-			</view>
-		</u-popup>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-			form:{
-				number:''  ,//员工号
-				name: '', //姓名
-				phone: '', //电话
-			},
-			rules: {
-				name: [{
-					required: true,
-					message: '请填写姓名',
-					trigger: ['blur', 'change'],
-				}],
-				number: [{
-					required: true,
-					message: '请填写员工号',
-					trigger: ['blur', 'change'],
-				}],
-				password: [{
-						required: true,
-						message: '请填写密码',
-						trigger: ['blur', 'change']
-					},
-					{
-						pattern: /^[0-9a-zA-Z]*$/g,
-						transform(value) {
-							return String(value);
-						},
-						message: '只能包含字母或数字'
-					},
-					{
-						min: 8,
-						max: 15,
-						message: '长度在8-15个字符之间'
-					}
-				],
-			},
-			sqShow:false,
-			jujueShow:false,
-			errorShow: false,
-			isShow:true
-			}
-		},
-		methods: {
-			//设置密码完成
-			passwordOk(){
-			wx.navigateTo({
-				url: '/pages/login/login'
-			})
-			},
-			//注册失败确认
-			errorQr() {
-				this.errorShow = false
-			},
-			//注册失败返回
-			errorFh() {
-				this.errorShow = false
-			},
-			//点击下一步
-			nextGo(){  
-			console.log(this.form)
-			this.isShow = false
-			// this.errorShow = true
-			},
-			//任然要拒绝
-			rejectAll() {
-				this.jujueShow = false
-			},
-			//允许获取
-			permit() {
-				this.sqShow = false
-				this.jujueShow = false
-			},
-			//拒绝获取
-			reject() {
-				this.sqShow = false
-				this.jujueShow = true
-			},
-			open() {
-			
-			},
-			//收起键盘
-			hideKeyBorder(e) {
-			      wx.hideKeyboard({
-               complete: res => {
-                 console.log('hideKeyboard res', res)
-                }
-                 });
-			    },
-			//关闭授权获取手机号弹窗
-			close() {
-				this.sqShow = false
-			},
-			//获取用户手机号
-			 getUserInfo() {
-			 this.hideKeyBorder()
-			 setTimeout(()=>{
-				 this.sqShow = true
-				 wx.getUserInfo({
-				 	success: function(res) {
-				 		console.log(res)
-				 	}
-				 })
-			 },30)
-				
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.find-password{
-		padding: 32rpx;
-	}
-	.title {
-		font-size: 42rpx;
-		font-weight: 500;
-		margin-bottom: 32rpx;
-			}
-			.popup {
-				width: 700rpx;
-				height: 450rpx;
-			
-				.popup-title {
-					text-align: center;
-					font-size: 36rpx;
-					margin: 35rpx;
-				}
-			
-				.popup-content {
-					width: 70%;
-					margin-left: 135rpx;
-					line-height: 54rpx;
-				}
-			
-				.popup-error-title {
-					margin-left: 36rpx;
-					margin-right: 36rpx;
-					margin-top: 50rpx;
-					font-size: 38rpx
-				}
-			
-				.popup-login {
-					margin-left: 240rpx;
-					margin-top: 120rpx;
-					width: 180rpx;
-					height: 52rpx;
-					background-color: skyblue;
-					border-radius: 8rpx;
-					line-height: 52rpx;
-					border: #000 1px solid;
-					text-align: center;
-					color: #fff;
-				}
-				.popup-buttom {
-					padding: 70rpx;
-					margin-top: 24rpx;
-					display: flex;
-					justify-content: space-between;
-				}
-				.popup-buttom-error{
-					padding: 70rpx;
-					margin-top: 54rpx;
-					display: flex;
-					justify-content: space-between;
-				}
-			
-				.popup-jujue-fanhui {
-					width: 160rpx;
-                    height: 62rpx;
-					text-align: center;
-					line-height: 62rpx;
-					border-radius: 8rpx;
-					background-color: gray;
-					color: #fff;
-				}
-			
-				.popup-jujue-queren {
-					width: 160rpx;
-					height: 62rpx;
-					text-align: center;
-					line-height: 62rpx;
-					border-radius: 8rpx;
-					background-color: skyblue;
-					color: #fff;
-				}
-			
-				.popup-buttom view {
-					width: 180rpx;
-					height: 56rpx;
-					text-align: center;
-					line-height: 56rpx;
-					border-radius: 6rpx;
-					border: 1px #000 solid;
-				}
-				.popup-all-title {
-					text-align: center;
-					font-size: 42rpx;
-					margin-top: 142rpx;
-				}
-				}
-</style>
diff --git a/pages/information/information.vue b/pages/information/information.vue
index 4f7ea5c..4b36443 100644
--- a/pages/information/information.vue
+++ b/pages/information/information.vue
@@ -1,61 +1,65 @@
 <template>
 	<view class="information">
-		<u--form labelPosition="left" :model="callerInfo" :rules="rules" ref="form1" v-if="isForm">
-			<u-form-item label="访客姓名" prop="callerNmae" labelWidth="100" borderBottom>
-				<u--input v-model="callerInfo.callerNmae" border="none" placeholder="请输入访客姓名"></u--input>
-			</u-form-item>
-			<u-form-item label="访客身份证" prop="id" borderBottom labelWidth="100">
-				<u--input v-model="callerInfo.id" border="none" placeholder="请输入访客身份证"></u--input>
-			</u-form-item>
-			<u-form-item label="访客联系方式" prop="contact" borderBottom labelWidth="100">
-				<u--input v-model="callerInfo.contact" border="none" placeholder="请输入访客联系方式"></u--input>
-			</u-form-item>
-			<u-form-item label="访客目的" prop="purpose" borderBottom labelWidth="100">
-				<u-button v-model="callerInfo.purpose" @click="show=true">{{callerInfo.purpose || '请选择访客目的'}}</u-button>
-			</u-form-item>
-			<u-form-item label="访客楼栋" prop="building" borderBottom labelWidth="100">
-				<u-button v-model="callerInfo.building" @click="buildingShow=true">{{callerInfo.building || '请选择访客楼栋'}}
-				</u-button>
-			</u-form-item>
-			<u-form-item label="访客时间" prop="time" borderBottom labelWidth="100">
-				<button  @click="isTimeShow=true">
-					<view style="font-size: 24rpx;">{{`开始时间:${callerInfo.time}`}}</view>
-					<view style="font-size: 24rpx;">{{`结束时间:${callerInfo.endTime}`}}</view>
-				</button>
-			</u-form-item>
-			<u-form-item label="申请者工号" prop="number" borderBottom labelWidth="100">
-				<u--input v-model="callerInfo.number" border="none" placeholder="请输入申请者工号"></u--input>
-			</u-form-item>
-			<u-form-item label="申请者名字"  borderBottom labelWidth="100">
-				<u--input v-model="callerInfo.name" border="none" placeholder="请输入申请者姓名"></u--input>
-			</u-form-item>
-			<u-form-item label="备注"  borderBottom labelWidth="100">
-				<u--input v-model="callerInfo.bz" border="none" placeholder="请输入备注"></u--input>
-			</u-form-item>
-		</u--form>
-		<view v-else class="informationSubmit">
-			<view class="informationSubmit-box">
-				<u-icon name="checkbox-mark" color="#fff" size="72"></u-icon>
-			</view>
-			<view class="informationSubmit-text">
-			 信息提交成功，请等待物业管理员处理。
-			</view>
+		<view class="form">
+			<u--form labelPosition="left" :model="callerInfo" :rules="rules" ref="form1" v-if="isForm" >
+					<u-form-item label="访客姓名" prop="callerNmae" labelWidth="100" borderBottom>
+						<u--input v-model="callerInfo.callerNmae" border="none" placeholder="请输入访客姓名"></u--input>
+					</u-form-item>
+					<u-form-item label="访客身份证" prop="id" borderBottom labelWidth="100">
+						<u--input v-model="callerInfo.id" border="none" placeholder="请输入访客身份证"></u--input>
+					</u-form-item>
+					<u-form-item label="访客联系方式" prop="contact" borderBottom labelWidth="100">
+						<u--input v-model="callerInfo.contact" border="none" placeholder="请输入访客联系方式"></u--input>
+					</u-form-item>
+					<u-form-item label="访客目的" prop="purpose" borderBottom labelWidth="100">
+						<u-button v-model="callerInfo.purpose" @click="show=true">{{callerInfo.purpose || '请选择访客目的'}}</u-button>
+					</u-form-item>
+					<u-form-item label="访客楼栋" prop="building" borderBottom labelWidth="100">
+						<u-button v-model="callerInfo.building" @click="buildingShow=true">{{callerInfo.building || '请选择访客楼栋'}}
+						</u-button>
+					</u-form-item>
+					<u-form-item label="访客时间" prop="time" borderBottom labelWidth="100">
+						<u-button  @click="isTimeShow=true">
+							<view style="font-size: 24rpx;">{{`开始时间:${callerInfo.time}`}}</view>
+							<view style="font-size: 24rpx;">{{`结束时间:${callerInfo.endTime}`}}</view>
+						</u-button>
+					</u-form-item>
+					<u-form-item label="申请者工号" prop="number" borderBottom labelWidth="100">
+						<u--input v-model="callerInfo.number" border="none" placeholder="请输入申请者工号"></u--input>
+					</u-form-item>
+					<u-form-item label="申请者名字"  borderBottom labelWidth="100">
+						<u--input v-model="callerInfo.name" border="none" placeholder="请输入申请者姓名"></u--input>
+					</u-form-item>
+					<u-form-item label="备注"  borderBottom labelWidth="100">
+						<u--input v-model="callerInfo.bz" border="none" placeholder="请输入备注"></u--input>
+					</u-form-item>
+				</u--form>
+				<view v-else class="informationSubmit">
+					<view class="informationSubmit-box">
+						<u-icon name="checkbox-mark" color="#fff" size="72"></u-icon>
+					</view>
+					<view class="informationSubmit-text">
+					 信息提交成功，请等待物业管理员处理。
+					</view>
+				</view>
+				<u-picker :show="show" :columns="columns" @close="show=false" @confirm="getPurpose"></u-picker>
+				<u-picker :show="buildingShow" :columns="buildingColumns" @close="buildingShow=false" @confirm="getBuilding">
+				</u-picker>
+				<u-datetime-picker
+					:show="isTimeShow"
+					v-model="callerInfo.endTime"
+					mode="datetime"
+					title="请选择结束时间"
+					:formatter="formatter"
+					:minDate="minTime"
+					@change="changeTime"
+					@cancel="closeTime"
+					@confirm="confirmTime"
+			></u-datetime-picker>
+				
 		</view>
-		<u-picker :show="show" :columns="columns" @close="show=false" @confirm="getPurpose"></u-picker>
-		<u-picker :show="buildingShow" :columns="buildingColumns" @close="buildingShow=false" @confirm="getBuilding">
-		</u-picker>
-		<u-datetime-picker
-			:show="isTimeShow"
-			v-model="callerInfo.endTime"
-			mode="datetime"
-			title="请选择结束时间"
-			:formatter="formatter"
-			@change="changeTime"
-			@cancel="closeTime"
-			@confirm="confirmTime"
-	></u-datetime-picker>
 		<view style="margin-top: 42rpx;">
-			<u-button type="primary" @click="submit">{{isForm ? '提交' : '完成'}}</u-button>
+			<u-button type="error" @click="submit" >{{isForm ? '提交' : '完成'}}</u-button>
 		</view>
 	</view>
 </template>
@@ -74,8 +78,9 @@
 			number: '',
 			name: '',
 			bz: '',
-			endTime:Number(new Date()) + 1000
+			endTime:Number(new Date()) 
 		},
+		minTime:Number(new Date()),
 		rules:{
 			callerNmae:[{
 						required: true,
@@ -172,7 +177,12 @@
 
 <style scoped lang="scss">
 	.information{
-		padding: 52rpx;
+		padding: 22rpx;
+		.form{
+			padding: 0 32rpx 0;
+			border-radius: 10rpx;
+			background-color: #fff;
+		}
 	}
 	.informationSubmit{
 		display: flex;
diff --git a/pages/list/list.vue b/pages/list/list.vue
index 7814121..3a1c8ec 100644
--- a/pages/list/list.vue
+++ b/pages/list/list.vue
@@ -8,9 +8,9 @@
       prefixIconStyle="font-size: 22px;color: #909399"
     ></u-input>
     <view class="tab-th">
-      <text style="margin-left: 44rpx; margin-top: 8rpx">筛选时间 </text>
-      <u-icon name="clock" color="#000" size="12"></u-icon>
-      <text style="margin-left: 18rpx; margin-top: 8rpx">筛选状态</text>
+      <text style="margin-left: 44rpx; margin-top: 8rpx;color: #918a8a;">筛选时间 </text>
+      <u-icon name="clock" color="#918a8a" size="12"></u-icon>
+      <text style="margin-left: 18rpx; margin-top: 8rpx;color: #918a8a;">筛选状态</text>
       <view class="icon">
         <u-icon name="checkmark-circle" color="#34a705" size="36" ></u-icon>
         <u-icon
@@ -30,8 +30,8 @@
     </view>
     <view class="table" v-for="(item,index) in list" :key="index">
       <view class="table-checkbox">
-        <u-checkbox-group v-model="item.value">
-        	<u-checkbox   shape="circle"></u-checkbox>
+        <u-checkbox-group v-model="item.value" >
+        	<u-checkbox @change="checkboxChange(item)"  shape="circle"></u-checkbox>
         </u-checkbox-group>
       </view>
       <view class="table-time"> {{item.time}} </view>
@@ -46,7 +46,7 @@
 	<u-popup :show="isExportShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" >
 		<view class="popup">
 			<view class="popup-title">
-              确认将所有访客表单导出吗？
+              确认将{{checkExport}}访客表单导出吗？
 			</view>
 			<view class="popup-buttom">
 				<view class="popup-jujue popup-jujue-fanhui" @click="isExportShow = false">
@@ -95,25 +95,27 @@
 		  value: false,
 		  time:'2022-10-2912:25:00',
 		  number:'202210290001',
-		  name:'张三'
+		  name:'李四'
 		},
 		{
 		  value: false,
 		  time:'2022-10-2912:25:00',
 		  number:'202210290001',
-		  name:'张三'
+		  name:'王五'
 		},
 		{
 		  value: false,
 		  time:'2022-10-2912:25:00',
 		  number:'202210290001',
-		  name:'张三'
+		  name:'赵六'
 		},
       ],
 	  isExportShow:false,
 	  ispassShow:false,
 	  number:'',
-	  text:'已通过'
+	  text:'已通过',
+	  checkboxList:[],
+	  checkExport:'所有'
     }
   },
   onShow() {
@@ -123,6 +125,20 @@
     uni.setStorageSync('currentPagePath', this.currentPagePath)
   },
   methods: {
+	  //选中的数据
+	  checkboxChange(item){ 
+		  if(this.checkboxList.indexOf(item) == -1){
+			  this.checkboxList.push(item)
+		  }else {
+			  this.checkboxList.splice(this.checkboxList.indexOf(item))
+		  }
+		  if(this.checkboxList.length > 0){
+			  this.checkExport = '选中的'
+		  }else {
+			  this.checkExport = '所有'
+		  }
+	  },
+	  //打开导出提示框
 	  pass(number,text){
 		  this.number = number
 		  this.text = text
@@ -195,6 +211,7 @@
       justify-content: space-between;
 	  padding-right: 10rpx;
       height: 150rpx;
+	  width: 150rpx;
       border: 0.5rpx #000 solid;
     }
   }
@@ -209,11 +226,11 @@
 				text-align: center;
 				font-size: 36rpx;
 				margin: 35rpx;
-				margin-top: 76rpx;
+				margin-top: 96rpx;
 			}
 			.popup-buttom {
 				padding: 70rpx;
-				margin-top: 100rpx;
+				margin-top: 150rpx;
 				display: flex;
 				justify-content: space-between;
 			}

diff --git a/pages.json b/pages.json
index 302ed83..ad3a7fe 100644
--- a/pages.json
+++ b/pages.json
@@ -30,14 +30,6 @@
 			}	
 		},
 		{
-			"path" : "pages/findPassword/findPassword",
-			"style" :                                                                                    
-			{
-				"navigationBarTitleText": "找回密码",
-				"enablePullDownRefresh": false
-			}	
-		},
-		{
 			"path" : "pages/register/register",
 			"style" :                                                                                    
 			{
diff --git a/pages/findPassword/findPassword.vue b/pages/findPassword/findPassword.vue
deleted file mode 100644
index ce99c13..0000000
--- a/pages/findPassword/findPassword.vue
+++ /dev/null
@@ -1,285 +0,0 @@
-/**
- * 找回密码页面
- */
-<template>
-	<view class="find-password">
-		<view v-if="isShow">
-			<p class="title">请验证以下信息</p>
-			<u--form labelPosition="left" :model="form" :rules="rules" ref="form1">
-				<u-form-item label="员工号" prop="number" labelWidth="80" class="form-item">
-					<u--input v-model="form.number" placeholder="请输入员工号"></u--input>
-				</u-form-item>
-				<u-form-item label="姓名" prop="name" labelWidth="80" class="form-item">
-					<u--input v-model="form.name" placeholder="请输入员姓名"></u--input>
-				</u-form-item>
-				<u-form-item label="手机号码" prop="phone"  labelWidth="80" class="form-item">
-					<u-button v-model="form.phone"  @click="getUserInfo" border="none">{{form.phone || '获取手机号'}}</u-button>
-				</u-form-item>
-			</u--form>
-			<u-button type="primary" text="下一步" @click="nextGo" style="margin-top: 36rpx;"></u-button>
-		</view>
-		<view  v-else>
-			<p class="title">请设置新密码</p>
-			<u--form labelPosition="left" :model="form" :rules="rules" ref="form1">
-				<u-form-item label="密码" prop="password" labelWidth="80" class="form-item">
-					<u--input v-model="form.password" placeholder="请输入密码" password></u--input>
-				</u-form-item>
-				<u-form-item label="确认密码" prop="confirmPassword" labelWidth="80" class="form-item">
-					<u--input v-model="form.confirmPassword" placeholder="请再次输入密码" password></u--input>
-				</u-form-item>
-			</u--form>
-			<u-button type="primary" text="完成" @click="passwordOk" style="margin-top: 36rpx;"></u-button>
-		</view>
-		<u-popup :show="sqShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
-			<view class="popup">
-				<view class="popup-title"> 微信授权</view>
-				<view class="popup-content">
-					申请获取你微信绑定的手机号***********？
-				</view>
-				<view class="popup-buttom">
-					<view class="popup-jujue" @click="reject">
-						拒绝
-					</view>
-					<view class="popup-yunxu" @click="permit">
-						允许
-					</view>
-				</view>
-			</view>
-		</u-popup>
-		<u-popup :show="jujueShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
-			<view class="popup">
-				<view class="popup-all-title">
-					拒绝将无法进行修改密码!
-				</view>
-				<view class="popup-buttom">
-					<view class="popup-jujue" @click="rejectAll">
-						仍要拒绝
-					</view>
-					<view class="popup-yunxu" @click="permit">
-						允许授权
-					</view>
-				</view>
-			</view>
-		</u-popup>
-		<u-popup :show="errorShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
-			<view class="popup">
-				<view class="popup-error-title">
-                 您的账号信息验证不通过，请重新填写。
-				</view>
-				<view class="popup-buttom-error">
-					<view class=" popup-jujue-fanhui" @click="errorFh">
-						返回
-					</view>
-					<view class=" popup-jujue-queren" @click="errorQr">
-						确认
-					</view>
-				</view>
-			</view>
-		</u-popup>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-			form:{
-				number:''  ,//员工号
-				name: '', //姓名
-				phone: '', //电话
-			},
-			rules: {
-				name: [{
-					required: true,
-					message: '请填写姓名',
-					trigger: ['blur', 'change'],
-				}],
-				number: [{
-					required: true,
-					message: '请填写员工号',
-					trigger: ['blur', 'change'],
-				}],
-				password: [{
-						required: true,
-						message: '请填写密码',
-						trigger: ['blur', 'change']
-					},
-					{
-						pattern: /^[0-9a-zA-Z]*$/g,
-						transform(value) {
-							return String(value);
-						},
-						message: '只能包含字母或数字'
-					},
-					{
-						min: 8,
-						max: 15,
-						message: '长度在8-15个字符之间'
-					}
-				],
-			},
-			sqShow:false,
-			jujueShow:false,
-			errorShow: false,
-			isShow:true
-			}
-		},
-		methods: {
-			//设置密码完成
-			passwordOk(){
-			wx.navigateTo({
-				url: '/pages/login/login'
-			})
-			},
-			//注册失败确认
-			errorQr() {
-				this.errorShow = false
-			},
-			//注册失败返回
-			errorFh() {
-				this.errorShow = false
-			},
-			//点击下一步
-			nextGo(){  
-			console.log(this.form)
-			this.isShow = false
-			// this.errorShow = true
-			},
-			//任然要拒绝
-			rejectAll() {
-				this.jujueShow = false
-			},
-			//允许获取
-			permit() {
-				this.sqShow = false
-				this.jujueShow = false
-			},
-			//拒绝获取
-			reject() {
-				this.sqShow = false
-				this.jujueShow = true
-			},
-			open() {
-			
-			},
-			//收起键盘
-			hideKeyBorder(e) {
-			      wx.hideKeyboard({
-               complete: res => {
-                 console.log('hideKeyboard res', res)
-                }
-                 });
-			    },
-			//关闭授权获取手机号弹窗
-			close() {
-				this.sqShow = false
-			},
-			//获取用户手机号
-			 getUserInfo() {
-			 this.hideKeyBorder()
-			 setTimeout(()=>{
-				 this.sqShow = true
-				 wx.getUserInfo({
-				 	success: function(res) {
-				 		console.log(res)
-				 	}
-				 })
-			 },30)
-				
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.find-password{
-		padding: 32rpx;
-	}
-	.title {
-		font-size: 42rpx;
-		font-weight: 500;
-		margin-bottom: 32rpx;
-			}
-			.popup {
-				width: 700rpx;
-				height: 450rpx;
-			
-				.popup-title {
-					text-align: center;
-					font-size: 36rpx;
-					margin: 35rpx;
-				}
-			
-				.popup-content {
-					width: 70%;
-					margin-left: 135rpx;
-					line-height: 54rpx;
-				}
-			
-				.popup-error-title {
-					margin-left: 36rpx;
-					margin-right: 36rpx;
-					margin-top: 50rpx;
-					font-size: 38rpx
-				}
-			
-				.popup-login {
-					margin-left: 240rpx;
-					margin-top: 120rpx;
-					width: 180rpx;
-					height: 52rpx;
-					background-color: skyblue;
-					border-radius: 8rpx;
-					line-height: 52rpx;
-					border: #000 1px solid;
-					text-align: center;
-					color: #fff;
-				}
-				.popup-buttom {
-					padding: 70rpx;
-					margin-top: 24rpx;
-					display: flex;
-					justify-content: space-between;
-				}
-				.popup-buttom-error{
-					padding: 70rpx;
-					margin-top: 54rpx;
-					display: flex;
-					justify-content: space-between;
-				}
-			
-				.popup-jujue-fanhui {
-					width: 160rpx;
-                    height: 62rpx;
-					text-align: center;
-					line-height: 62rpx;
-					border-radius: 8rpx;
-					background-color: gray;
-					color: #fff;
-				}
-			
-				.popup-jujue-queren {
-					width: 160rpx;
-					height: 62rpx;
-					text-align: center;
-					line-height: 62rpx;
-					border-radius: 8rpx;
-					background-color: skyblue;
-					color: #fff;
-				}
-			
-				.popup-buttom view {
-					width: 180rpx;
-					height: 56rpx;
-					text-align: center;
-					line-height: 56rpx;
-					border-radius: 6rpx;
-					border: 1px #000 solid;
-				}
-				.popup-all-title {
-					text-align: center;
-					font-size: 42rpx;
-					margin-top: 142rpx;
-				}
-				}
-</style>
diff --git a/pages/information/information.vue b/pages/information/information.vue
index 4f7ea5c..4b36443 100644
--- a/pages/information/information.vue
+++ b/pages/information/information.vue
@@ -1,61 +1,65 @@
 <template>
 	<view class="information">
-		<u--form labelPosition="left" :model="callerInfo" :rules="rules" ref="form1" v-if="isForm">
-			<u-form-item label="访客姓名" prop="callerNmae" labelWidth="100" borderBottom>
-				<u--input v-model="callerInfo.callerNmae" border="none" placeholder="请输入访客姓名"></u--input>
-			</u-form-item>
-			<u-form-item label="访客身份证" prop="id" borderBottom labelWidth="100">
-				<u--input v-model="callerInfo.id" border="none" placeholder="请输入访客身份证"></u--input>
-			</u-form-item>
-			<u-form-item label="访客联系方式" prop="contact" borderBottom labelWidth="100">
-				<u--input v-model="callerInfo.contact" border="none" placeholder="请输入访客联系方式"></u--input>
-			</u-form-item>
-			<u-form-item label="访客目的" prop="purpose" borderBottom labelWidth="100">
-				<u-button v-model="callerInfo.purpose" @click="show=true">{{callerInfo.purpose || '请选择访客目的'}}</u-button>
-			</u-form-item>
-			<u-form-item label="访客楼栋" prop="building" borderBottom labelWidth="100">
-				<u-button v-model="callerInfo.building" @click="buildingShow=true">{{callerInfo.building || '请选择访客楼栋'}}
-				</u-button>
-			</u-form-item>
-			<u-form-item label="访客时间" prop="time" borderBottom labelWidth="100">
-				<button  @click="isTimeShow=true">
-					<view style="font-size: 24rpx;">{{`开始时间:${callerInfo.time}`}}</view>
-					<view style="font-size: 24rpx;">{{`结束时间:${callerInfo.endTime}`}}</view>
-				</button>
-			</u-form-item>
-			<u-form-item label="申请者工号" prop="number" borderBottom labelWidth="100">
-				<u--input v-model="callerInfo.number" border="none" placeholder="请输入申请者工号"></u--input>
-			</u-form-item>
-			<u-form-item label="申请者名字"  borderBottom labelWidth="100">
-				<u--input v-model="callerInfo.name" border="none" placeholder="请输入申请者姓名"></u--input>
-			</u-form-item>
-			<u-form-item label="备注"  borderBottom labelWidth="100">
-				<u--input v-model="callerInfo.bz" border="none" placeholder="请输入备注"></u--input>
-			</u-form-item>
-		</u--form>
-		<view v-else class="informationSubmit">
-			<view class="informationSubmit-box">
-				<u-icon name="checkbox-mark" color="#fff" size="72"></u-icon>
-			</view>
-			<view class="informationSubmit-text">
-			 信息提交成功，请等待物业管理员处理。
-			</view>
+		<view class="form">
+			<u--form labelPosition="left" :model="callerInfo" :rules="rules" ref="form1" v-if="isForm" >
+					<u-form-item label="访客姓名" prop="callerNmae" labelWidth="100" borderBottom>
+						<u--input v-model="callerInfo.callerNmae" border="none" placeholder="请输入访客姓名"></u--input>
+					</u-form-item>
+					<u-form-item label="访客身份证" prop="id" borderBottom labelWidth="100">
+						<u--input v-model="callerInfo.id" border="none" placeholder="请输入访客身份证"></u--input>
+					</u-form-item>
+					<u-form-item label="访客联系方式" prop="contact" borderBottom labelWidth="100">
+						<u--input v-model="callerInfo.contact" border="none" placeholder="请输入访客联系方式"></u--input>
+					</u-form-item>
+					<u-form-item label="访客目的" prop="purpose" borderBottom labelWidth="100">
+						<u-button v-model="callerInfo.purpose" @click="show=true">{{callerInfo.purpose || '请选择访客目的'}}</u-button>
+					</u-form-item>
+					<u-form-item label="访客楼栋" prop="building" borderBottom labelWidth="100">
+						<u-button v-model="callerInfo.building" @click="buildingShow=true">{{callerInfo.building || '请选择访客楼栋'}}
+						</u-button>
+					</u-form-item>
+					<u-form-item label="访客时间" prop="time" borderBottom labelWidth="100">
+						<u-button  @click="isTimeShow=true">
+							<view style="font-size: 24rpx;">{{`开始时间:${callerInfo.time}`}}</view>
+							<view style="font-size: 24rpx;">{{`结束时间:${callerInfo.endTime}`}}</view>
+						</u-button>
+					</u-form-item>
+					<u-form-item label="申请者工号" prop="number" borderBottom labelWidth="100">
+						<u--input v-model="callerInfo.number" border="none" placeholder="请输入申请者工号"></u--input>
+					</u-form-item>
+					<u-form-item label="申请者名字"  borderBottom labelWidth="100">
+						<u--input v-model="callerInfo.name" border="none" placeholder="请输入申请者姓名"></u--input>
+					</u-form-item>
+					<u-form-item label="备注"  borderBottom labelWidth="100">
+						<u--input v-model="callerInfo.bz" border="none" placeholder="请输入备注"></u--input>
+					</u-form-item>
+				</u--form>
+				<view v-else class="informationSubmit">
+					<view class="informationSubmit-box">
+						<u-icon name="checkbox-mark" color="#fff" size="72"></u-icon>
+					</view>
+					<view class="informationSubmit-text">
+					 信息提交成功，请等待物业管理员处理。
+					</view>
+				</view>
+				<u-picker :show="show" :columns="columns" @close="show=false" @confirm="getPurpose"></u-picker>
+				<u-picker :show="buildingShow" :columns="buildingColumns" @close="buildingShow=false" @confirm="getBuilding">
+				</u-picker>
+				<u-datetime-picker
+					:show="isTimeShow"
+					v-model="callerInfo.endTime"
+					mode="datetime"
+					title="请选择结束时间"
+					:formatter="formatter"
+					:minDate="minTime"
+					@change="changeTime"
+					@cancel="closeTime"
+					@confirm="confirmTime"
+			></u-datetime-picker>
+				
 		</view>
-		<u-picker :show="show" :columns="columns" @close="show=false" @confirm="getPurpose"></u-picker>
-		<u-picker :show="buildingShow" :columns="buildingColumns" @close="buildingShow=false" @confirm="getBuilding">
-		</u-picker>
-		<u-datetime-picker
-			:show="isTimeShow"
-			v-model="callerInfo.endTime"
-			mode="datetime"
-			title="请选择结束时间"
-			:formatter="formatter"
-			@change="changeTime"
-			@cancel="closeTime"
-			@confirm="confirmTime"
-	></u-datetime-picker>
 		<view style="margin-top: 42rpx;">
-			<u-button type="primary" @click="submit">{{isForm ? '提交' : '完成'}}</u-button>
+			<u-button type="error" @click="submit" >{{isForm ? '提交' : '完成'}}</u-button>
 		</view>
 	</view>
 </template>
@@ -74,8 +78,9 @@
 			number: '',
 			name: '',
 			bz: '',
-			endTime:Number(new Date()) + 1000
+			endTime:Number(new Date()) 
 		},
+		minTime:Number(new Date()),
 		rules:{
 			callerNmae:[{
 						required: true,
@@ -172,7 +177,12 @@
 
 <style scoped lang="scss">
 	.information{
-		padding: 52rpx;
+		padding: 22rpx;
+		.form{
+			padding: 0 32rpx 0;
+			border-radius: 10rpx;
+			background-color: #fff;
+		}
 	}
 	.informationSubmit{
 		display: flex;
diff --git a/pages/list/list.vue b/pages/list/list.vue
index 7814121..3a1c8ec 100644
--- a/pages/list/list.vue
+++ b/pages/list/list.vue
@@ -8,9 +8,9 @@
       prefixIconStyle="font-size: 22px;color: #909399"
     ></u-input>
     <view class="tab-th">
-      <text style="margin-left: 44rpx; margin-top: 8rpx">筛选时间 </text>
-      <u-icon name="clock" color="#000" size="12"></u-icon>
-      <text style="margin-left: 18rpx; margin-top: 8rpx">筛选状态</text>
+      <text style="margin-left: 44rpx; margin-top: 8rpx;color: #918a8a;">筛选时间 </text>
+      <u-icon name="clock" color="#918a8a" size="12"></u-icon>
+      <text style="margin-left: 18rpx; margin-top: 8rpx;color: #918a8a;">筛选状态</text>
       <view class="icon">
         <u-icon name="checkmark-circle" color="#34a705" size="36" ></u-icon>
         <u-icon
@@ -30,8 +30,8 @@
     </view>
     <view class="table" v-for="(item,index) in list" :key="index">
       <view class="table-checkbox">
-        <u-checkbox-group v-model="item.value">
-        	<u-checkbox   shape="circle"></u-checkbox>
+        <u-checkbox-group v-model="item.value" >
+        	<u-checkbox @change="checkboxChange(item)"  shape="circle"></u-checkbox>
         </u-checkbox-group>
       </view>
       <view class="table-time"> {{item.time}} </view>
@@ -46,7 +46,7 @@
 	<u-popup :show="isExportShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" >
 		<view class="popup">
 			<view class="popup-title">
-              确认将所有访客表单导出吗？
+              确认将{{checkExport}}访客表单导出吗？
 			</view>
 			<view class="popup-buttom">
 				<view class="popup-jujue popup-jujue-fanhui" @click="isExportShow = false">
@@ -95,25 +95,27 @@
 		  value: false,
 		  time:'2022-10-2912:25:00',
 		  number:'202210290001',
-		  name:'张三'
+		  name:'李四'
 		},
 		{
 		  value: false,
 		  time:'2022-10-2912:25:00',
 		  number:'202210290001',
-		  name:'张三'
+		  name:'王五'
 		},
 		{
 		  value: false,
 		  time:'2022-10-2912:25:00',
 		  number:'202210290001',
-		  name:'张三'
+		  name:'赵六'
 		},
       ],
 	  isExportShow:false,
 	  ispassShow:false,
 	  number:'',
-	  text:'已通过'
+	  text:'已通过',
+	  checkboxList:[],
+	  checkExport:'所有'
     }
   },
   onShow() {
@@ -123,6 +125,20 @@
     uni.setStorageSync('currentPagePath', this.currentPagePath)
   },
   methods: {
+	  //选中的数据
+	  checkboxChange(item){ 
+		  if(this.checkboxList.indexOf(item) == -1){
+			  this.checkboxList.push(item)
+		  }else {
+			  this.checkboxList.splice(this.checkboxList.indexOf(item))
+		  }
+		  if(this.checkboxList.length > 0){
+			  this.checkExport = '选中的'
+		  }else {
+			  this.checkExport = '所有'
+		  }
+	  },
+	  //打开导出提示框
 	  pass(number,text){
 		  this.number = number
 		  this.text = text
@@ -195,6 +211,7 @@
       justify-content: space-between;
 	  padding-right: 10rpx;
       height: 150rpx;
+	  width: 150rpx;
       border: 0.5rpx #000 solid;
     }
   }
@@ -209,11 +226,11 @@
 				text-align: center;
 				font-size: 36rpx;
 				margin: 35rpx;
-				margin-top: 76rpx;
+				margin-top: 96rpx;
 			}
 			.popup-buttom {
 				padding: 70rpx;
-				margin-top: 100rpx;
+				margin-top: 150rpx;
 				display: flex;
 				justify-content: space-between;
 			}
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 97ac094..6d57f8c 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -23,7 +23,7 @@
 		<u-button type="primary"  @click="login" class="login-button">登录</u-button>
 		<!-- 忘记密码、注册部分 -->
 		<view class="bottom">
-			<view @click="goFindPassword">忘记密码</view>
+			<!-- <view @click="goFindPassword">忘记密码</view> -->
 			<view @click="goRegister">未有账号，点击注册</view>
 		</view>
 	</view>
@@ -92,12 +92,6 @@
 			       }
 				   })
 				   },
-			//跳转找回密码页面
-			goFindPassword() {
-				wx.navigateTo({
-					url: '/pages/findPassword/findPassword'
-				})
-			},
 			//跳转注册页面
 			goRegister() {
 				wx.navigateTo({

diff --git a/pages.json b/pages.json
index 302ed83..ad3a7fe 100644
--- a/pages.json
+++ b/pages.json
@@ -30,14 +30,6 @@
 			}	
 		},
 		{
-			"path" : "pages/findPassword/findPassword",
-			"style" :                                                                                    
-			{
-				"navigationBarTitleText": "找回密码",
-				"enablePullDownRefresh": false
-			}	
-		},
-		{
 			"path" : "pages/register/register",
 			"style" :                                                                                    
 			{
diff --git a/pages/findPassword/findPassword.vue b/pages/findPassword/findPassword.vue
deleted file mode 100644
index ce99c13..0000000
--- a/pages/findPassword/findPassword.vue
+++ /dev/null
@@ -1,285 +0,0 @@
-/**
- * 找回密码页面
- */
-<template>
-	<view class="find-password">
-		<view v-if="isShow">
-			<p class="title">请验证以下信息</p>
-			<u--form labelPosition="left" :model="form" :rules="rules" ref="form1">
-				<u-form-item label="员工号" prop="number" labelWidth="80" class="form-item">
-					<u--input v-model="form.number" placeholder="请输入员工号"></u--input>
-				</u-form-item>
-				<u-form-item label="姓名" prop="name" labelWidth="80" class="form-item">
-					<u--input v-model="form.name" placeholder="请输入员姓名"></u--input>
-				</u-form-item>
-				<u-form-item label="手机号码" prop="phone"  labelWidth="80" class="form-item">
-					<u-button v-model="form.phone"  @click="getUserInfo" border="none">{{form.phone || '获取手机号'}}</u-button>
-				</u-form-item>
-			</u--form>
-			<u-button type="primary" text="下一步" @click="nextGo" style="margin-top: 36rpx;"></u-button>
-		</view>
-		<view  v-else>
-			<p class="title">请设置新密码</p>
-			<u--form labelPosition="left" :model="form" :rules="rules" ref="form1">
-				<u-form-item label="密码" prop="password" labelWidth="80" class="form-item">
-					<u--input v-model="form.password" placeholder="请输入密码" password></u--input>
-				</u-form-item>
-				<u-form-item label="确认密码" prop="confirmPassword" labelWidth="80" class="form-item">
-					<u--input v-model="form.confirmPassword" placeholder="请再次输入密码" password></u--input>
-				</u-form-item>
-			</u--form>
-			<u-button type="primary" text="完成" @click="passwordOk" style="margin-top: 36rpx;"></u-button>
-		</view>
-		<u-popup :show="sqShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
-			<view class="popup">
-				<view class="popup-title"> 微信授权</view>
-				<view class="popup-content">
-					申请获取你微信绑定的手机号***********？
-				</view>
-				<view class="popup-buttom">
-					<view class="popup-jujue" @click="reject">
-						拒绝
-					</view>
-					<view class="popup-yunxu" @click="permit">
-						允许
-					</view>
-				</view>
-			</view>
-		</u-popup>
-		<u-popup :show="jujueShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
-			<view class="popup">
-				<view class="popup-all-title">
-					拒绝将无法进行修改密码!
-				</view>
-				<view class="popup-buttom">
-					<view class="popup-jujue" @click="rejectAll">
-						仍要拒绝
-					</view>
-					<view class="popup-yunxu" @click="permit">
-						允许授权
-					</view>
-				</view>
-			</view>
-		</u-popup>
-		<u-popup :show="errorShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
-			<view class="popup">
-				<view class="popup-error-title">
-                 您的账号信息验证不通过，请重新填写。
-				</view>
-				<view class="popup-buttom-error">
-					<view class=" popup-jujue-fanhui" @click="errorFh">
-						返回
-					</view>
-					<view class=" popup-jujue-queren" @click="errorQr">
-						确认
-					</view>
-				</view>
-			</view>
-		</u-popup>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-			form:{
-				number:''  ,//员工号
-				name: '', //姓名
-				phone: '', //电话
-			},
-			rules: {
-				name: [{
-					required: true,
-					message: '请填写姓名',
-					trigger: ['blur', 'change'],
-				}],
-				number: [{
-					required: true,
-					message: '请填写员工号',
-					trigger: ['blur', 'change'],
-				}],
-				password: [{
-						required: true,
-						message: '请填写密码',
-						trigger: ['blur', 'change']
-					},
-					{
-						pattern: /^[0-9a-zA-Z]*$/g,
-						transform(value) {
-							return String(value);
-						},
-						message: '只能包含字母或数字'
-					},
-					{
-						min: 8,
-						max: 15,
-						message: '长度在8-15个字符之间'
-					}
-				],
-			},
-			sqShow:false,
-			jujueShow:false,
-			errorShow: false,
-			isShow:true
-			}
-		},
-		methods: {
-			//设置密码完成
-			passwordOk(){
-			wx.navigateTo({
-				url: '/pages/login/login'
-			})
-			},
-			//注册失败确认
-			errorQr() {
-				this.errorShow = false
-			},
-			//注册失败返回
-			errorFh() {
-				this.errorShow = false
-			},
-			//点击下一步
-			nextGo(){  
-			console.log(this.form)
-			this.isShow = false
-			// this.errorShow = true
-			},
-			//任然要拒绝
-			rejectAll() {
-				this.jujueShow = false
-			},
-			//允许获取
-			permit() {
-				this.sqShow = false
-				this.jujueShow = false
-			},
-			//拒绝获取
-			reject() {
-				this.sqShow = false
-				this.jujueShow = true
-			},
-			open() {
-			
-			},
-			//收起键盘
-			hideKeyBorder(e) {
-			      wx.hideKeyboard({
-               complete: res => {
-                 console.log('hideKeyboard res', res)
-                }
-                 });
-			    },
-			//关闭授权获取手机号弹窗
-			close() {
-				this.sqShow = false
-			},
-			//获取用户手机号
-			 getUserInfo() {
-			 this.hideKeyBorder()
-			 setTimeout(()=>{
-				 this.sqShow = true
-				 wx.getUserInfo({
-				 	success: function(res) {
-				 		console.log(res)
-				 	}
-				 })
-			 },30)
-				
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.find-password{
-		padding: 32rpx;
-	}
-	.title {
-		font-size: 42rpx;
-		font-weight: 500;
-		margin-bottom: 32rpx;
-			}
-			.popup {
-				width: 700rpx;
-				height: 450rpx;
-			
-				.popup-title {
-					text-align: center;
-					font-size: 36rpx;
-					margin: 35rpx;
-				}
-			
-				.popup-content {
-					width: 70%;
-					margin-left: 135rpx;
-					line-height: 54rpx;
-				}
-			
-				.popup-error-title {
-					margin-left: 36rpx;
-					margin-right: 36rpx;
-					margin-top: 50rpx;
-					font-size: 38rpx
-				}
-			
-				.popup-login {
-					margin-left: 240rpx;
-					margin-top: 120rpx;
-					width: 180rpx;
-					height: 52rpx;
-					background-color: skyblue;
-					border-radius: 8rpx;
-					line-height: 52rpx;
-					border: #000 1px solid;
-					text-align: center;
-					color: #fff;
-				}
-				.popup-buttom {
-					padding: 70rpx;
-					margin-top: 24rpx;
-					display: flex;
-					justify-content: space-between;
-				}
-				.popup-buttom-error{
-					padding: 70rpx;
-					margin-top: 54rpx;
-					display: flex;
-					justify-content: space-between;
-				}
-			
-				.popup-jujue-fanhui {
-					width: 160rpx;
-                    height: 62rpx;
-					text-align: center;
-					line-height: 62rpx;
-					border-radius: 8rpx;
-					background-color: gray;
-					color: #fff;
-				}
-			
-				.popup-jujue-queren {
-					width: 160rpx;
-					height: 62rpx;
-					text-align: center;
-					line-height: 62rpx;
-					border-radius: 8rpx;
-					background-color: skyblue;
-					color: #fff;
-				}
-			
-				.popup-buttom view {
-					width: 180rpx;
-					height: 56rpx;
-					text-align: center;
-					line-height: 56rpx;
-					border-radius: 6rpx;
-					border: 1px #000 solid;
-				}
-				.popup-all-title {
-					text-align: center;
-					font-size: 42rpx;
-					margin-top: 142rpx;
-				}
-				}
-</style>
diff --git a/pages/information/information.vue b/pages/information/information.vue
index 4f7ea5c..4b36443 100644
--- a/pages/information/information.vue
+++ b/pages/information/information.vue
@@ -1,61 +1,65 @@
 <template>
 	<view class="information">
-		<u--form labelPosition="left" :model="callerInfo" :rules="rules" ref="form1" v-if="isForm">
-			<u-form-item label="访客姓名" prop="callerNmae" labelWidth="100" borderBottom>
-				<u--input v-model="callerInfo.callerNmae" border="none" placeholder="请输入访客姓名"></u--input>
-			</u-form-item>
-			<u-form-item label="访客身份证" prop="id" borderBottom labelWidth="100">
-				<u--input v-model="callerInfo.id" border="none" placeholder="请输入访客身份证"></u--input>
-			</u-form-item>
-			<u-form-item label="访客联系方式" prop="contact" borderBottom labelWidth="100">
-				<u--input v-model="callerInfo.contact" border="none" placeholder="请输入访客联系方式"></u--input>
-			</u-form-item>
-			<u-form-item label="访客目的" prop="purpose" borderBottom labelWidth="100">
-				<u-button v-model="callerInfo.purpose" @click="show=true">{{callerInfo.purpose || '请选择访客目的'}}</u-button>
-			</u-form-item>
-			<u-form-item label="访客楼栋" prop="building" borderBottom labelWidth="100">
-				<u-button v-model="callerInfo.building" @click="buildingShow=true">{{callerInfo.building || '请选择访客楼栋'}}
-				</u-button>
-			</u-form-item>
-			<u-form-item label="访客时间" prop="time" borderBottom labelWidth="100">
-				<button  @click="isTimeShow=true">
-					<view style="font-size: 24rpx;">{{`开始时间:${callerInfo.time}`}}</view>
-					<view style="font-size: 24rpx;">{{`结束时间:${callerInfo.endTime}`}}</view>
-				</button>
-			</u-form-item>
-			<u-form-item label="申请者工号" prop="number" borderBottom labelWidth="100">
-				<u--input v-model="callerInfo.number" border="none" placeholder="请输入申请者工号"></u--input>
-			</u-form-item>
-			<u-form-item label="申请者名字"  borderBottom labelWidth="100">
-				<u--input v-model="callerInfo.name" border="none" placeholder="请输入申请者姓名"></u--input>
-			</u-form-item>
-			<u-form-item label="备注"  borderBottom labelWidth="100">
-				<u--input v-model="callerInfo.bz" border="none" placeholder="请输入备注"></u--input>
-			</u-form-item>
-		</u--form>
-		<view v-else class="informationSubmit">
-			<view class="informationSubmit-box">
-				<u-icon name="checkbox-mark" color="#fff" size="72"></u-icon>
-			</view>
-			<view class="informationSubmit-text">
-			 信息提交成功，请等待物业管理员处理。
-			</view>
+		<view class="form">
+			<u--form labelPosition="left" :model="callerInfo" :rules="rules" ref="form1" v-if="isForm" >
+					<u-form-item label="访客姓名" prop="callerNmae" labelWidth="100" borderBottom>
+						<u--input v-model="callerInfo.callerNmae" border="none" placeholder="请输入访客姓名"></u--input>
+					</u-form-item>
+					<u-form-item label="访客身份证" prop="id" borderBottom labelWidth="100">
+						<u--input v-model="callerInfo.id" border="none" placeholder="请输入访客身份证"></u--input>
+					</u-form-item>
+					<u-form-item label="访客联系方式" prop="contact" borderBottom labelWidth="100">
+						<u--input v-model="callerInfo.contact" border="none" placeholder="请输入访客联系方式"></u--input>
+					</u-form-item>
+					<u-form-item label="访客目的" prop="purpose" borderBottom labelWidth="100">
+						<u-button v-model="callerInfo.purpose" @click="show=true">{{callerInfo.purpose || '请选择访客目的'}}</u-button>
+					</u-form-item>
+					<u-form-item label="访客楼栋" prop="building" borderBottom labelWidth="100">
+						<u-button v-model="callerInfo.building" @click="buildingShow=true">{{callerInfo.building || '请选择访客楼栋'}}
+						</u-button>
+					</u-form-item>
+					<u-form-item label="访客时间" prop="time" borderBottom labelWidth="100">
+						<u-button  @click="isTimeShow=true">
+							<view style="font-size: 24rpx;">{{`开始时间:${callerInfo.time}`}}</view>
+							<view style="font-size: 24rpx;">{{`结束时间:${callerInfo.endTime}`}}</view>
+						</u-button>
+					</u-form-item>
+					<u-form-item label="申请者工号" prop="number" borderBottom labelWidth="100">
+						<u--input v-model="callerInfo.number" border="none" placeholder="请输入申请者工号"></u--input>
+					</u-form-item>
+					<u-form-item label="申请者名字"  borderBottom labelWidth="100">
+						<u--input v-model="callerInfo.name" border="none" placeholder="请输入申请者姓名"></u--input>
+					</u-form-item>
+					<u-form-item label="备注"  borderBottom labelWidth="100">
+						<u--input v-model="callerInfo.bz" border="none" placeholder="请输入备注"></u--input>
+					</u-form-item>
+				</u--form>
+				<view v-else class="informationSubmit">
+					<view class="informationSubmit-box">
+						<u-icon name="checkbox-mark" color="#fff" size="72"></u-icon>
+					</view>
+					<view class="informationSubmit-text">
+					 信息提交成功，请等待物业管理员处理。
+					</view>
+				</view>
+				<u-picker :show="show" :columns="columns" @close="show=false" @confirm="getPurpose"></u-picker>
+				<u-picker :show="buildingShow" :columns="buildingColumns" @close="buildingShow=false" @confirm="getBuilding">
+				</u-picker>
+				<u-datetime-picker
+					:show="isTimeShow"
+					v-model="callerInfo.endTime"
+					mode="datetime"
+					title="请选择结束时间"
+					:formatter="formatter"
+					:minDate="minTime"
+					@change="changeTime"
+					@cancel="closeTime"
+					@confirm="confirmTime"
+			></u-datetime-picker>
+				
 		</view>
-		<u-picker :show="show" :columns="columns" @close="show=false" @confirm="getPurpose"></u-picker>
-		<u-picker :show="buildingShow" :columns="buildingColumns" @close="buildingShow=false" @confirm="getBuilding">
-		</u-picker>
-		<u-datetime-picker
-			:show="isTimeShow"
-			v-model="callerInfo.endTime"
-			mode="datetime"
-			title="请选择结束时间"
-			:formatter="formatter"
-			@change="changeTime"
-			@cancel="closeTime"
-			@confirm="confirmTime"
-	></u-datetime-picker>
 		<view style="margin-top: 42rpx;">
-			<u-button type="primary" @click="submit">{{isForm ? '提交' : '完成'}}</u-button>
+			<u-button type="error" @click="submit" >{{isForm ? '提交' : '完成'}}</u-button>
 		</view>
 	</view>
 </template>
@@ -74,8 +78,9 @@
 			number: '',
 			name: '',
 			bz: '',
-			endTime:Number(new Date()) + 1000
+			endTime:Number(new Date()) 
 		},
+		minTime:Number(new Date()),
 		rules:{
 			callerNmae:[{
 						required: true,
@@ -172,7 +177,12 @@
 
 <style scoped lang="scss">
 	.information{
-		padding: 52rpx;
+		padding: 22rpx;
+		.form{
+			padding: 0 32rpx 0;
+			border-radius: 10rpx;
+			background-color: #fff;
+		}
 	}
 	.informationSubmit{
 		display: flex;
diff --git a/pages/list/list.vue b/pages/list/list.vue
index 7814121..3a1c8ec 100644
--- a/pages/list/list.vue
+++ b/pages/list/list.vue
@@ -8,9 +8,9 @@
       prefixIconStyle="font-size: 22px;color: #909399"
     ></u-input>
     <view class="tab-th">
-      <text style="margin-left: 44rpx; margin-top: 8rpx">筛选时间 </text>
-      <u-icon name="clock" color="#000" size="12"></u-icon>
-      <text style="margin-left: 18rpx; margin-top: 8rpx">筛选状态</text>
+      <text style="margin-left: 44rpx; margin-top: 8rpx;color: #918a8a;">筛选时间 </text>
+      <u-icon name="clock" color="#918a8a" size="12"></u-icon>
+      <text style="margin-left: 18rpx; margin-top: 8rpx;color: #918a8a;">筛选状态</text>
       <view class="icon">
         <u-icon name="checkmark-circle" color="#34a705" size="36" ></u-icon>
         <u-icon
@@ -30,8 +30,8 @@
     </view>
     <view class="table" v-for="(item,index) in list" :key="index">
       <view class="table-checkbox">
-        <u-checkbox-group v-model="item.value">
-        	<u-checkbox   shape="circle"></u-checkbox>
+        <u-checkbox-group v-model="item.value" >
+        	<u-checkbox @change="checkboxChange(item)"  shape="circle"></u-checkbox>
         </u-checkbox-group>
       </view>
       <view class="table-time"> {{item.time}} </view>
@@ -46,7 +46,7 @@
 	<u-popup :show="isExportShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" >
 		<view class="popup">
 			<view class="popup-title">
-              确认将所有访客表单导出吗？
+              确认将{{checkExport}}访客表单导出吗？
 			</view>
 			<view class="popup-buttom">
 				<view class="popup-jujue popup-jujue-fanhui" @click="isExportShow = false">
@@ -95,25 +95,27 @@
 		  value: false,
 		  time:'2022-10-2912:25:00',
 		  number:'202210290001',
-		  name:'张三'
+		  name:'李四'
 		},
 		{
 		  value: false,
 		  time:'2022-10-2912:25:00',
 		  number:'202210290001',
-		  name:'张三'
+		  name:'王五'
 		},
 		{
 		  value: false,
 		  time:'2022-10-2912:25:00',
 		  number:'202210290001',
-		  name:'张三'
+		  name:'赵六'
 		},
       ],
 	  isExportShow:false,
 	  ispassShow:false,
 	  number:'',
-	  text:'已通过'
+	  text:'已通过',
+	  checkboxList:[],
+	  checkExport:'所有'
     }
   },
   onShow() {
@@ -123,6 +125,20 @@
     uni.setStorageSync('currentPagePath', this.currentPagePath)
   },
   methods: {
+	  //选中的数据
+	  checkboxChange(item){ 
+		  if(this.checkboxList.indexOf(item) == -1){
+			  this.checkboxList.push(item)
+		  }else {
+			  this.checkboxList.splice(this.checkboxList.indexOf(item))
+		  }
+		  if(this.checkboxList.length > 0){
+			  this.checkExport = '选中的'
+		  }else {
+			  this.checkExport = '所有'
+		  }
+	  },
+	  //打开导出提示框
 	  pass(number,text){
 		  this.number = number
 		  this.text = text
@@ -195,6 +211,7 @@
       justify-content: space-between;
 	  padding-right: 10rpx;
       height: 150rpx;
+	  width: 150rpx;
       border: 0.5rpx #000 solid;
     }
   }
@@ -209,11 +226,11 @@
 				text-align: center;
 				font-size: 36rpx;
 				margin: 35rpx;
-				margin-top: 76rpx;
+				margin-top: 96rpx;
 			}
 			.popup-buttom {
 				padding: 70rpx;
-				margin-top: 100rpx;
+				margin-top: 150rpx;
 				display: flex;
 				justify-content: space-between;
 			}
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 97ac094..6d57f8c 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -23,7 +23,7 @@
 		<u-button type="primary"  @click="login" class="login-button">登录</u-button>
 		<!-- 忘记密码、注册部分 -->
 		<view class="bottom">
-			<view @click="goFindPassword">忘记密码</view>
+			<!-- <view @click="goFindPassword">忘记密码</view> -->
 			<view @click="goRegister">未有账号，点击注册</view>
 		</view>
 	</view>
@@ -92,12 +92,6 @@
 			       }
 				   })
 				   },
-			//跳转找回密码页面
-			goFindPassword() {
-				wx.navigateTo({
-					url: '/pages/findPassword/findPassword'
-				})
-			},
 			//跳转注册页面
 			goRegister() {
 				wx.navigateTo({
diff --git a/pages/register/register.vue b/pages/register/register.vue
index 8ce6117..bcef374 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -5,16 +5,16 @@
 	<view class="register">
 		<p class="title">请填写以下信息</p>
 		<u--form labelPosition="left" :model="form" :rules="rules" ref="form1">
-			<u-form-item label="员工号" prop="number" labelWidth="80" class="form-item">
-				<u--input v-model="form.number" placeholder="请输入员工号"></u--input>
+			<u-form-item label="员工号" prop="number" borderBottom labelWidth="80" class="form-item">
+				<u--input v-model="form.number" border="none" placeholder="请输入员工号"></u--input>
 			</u-form-item>
-			<u-form-item label="姓名" prop="name" labelWidth="80" class="form-item">
-				<u--input v-model="form.name" placeholder="请输入员姓名"></u--input>
+			<u-form-item label="姓名" prop="name" borderBottom labelWidth="80" class="form-item">
+				<u--input v-model="form.name" border="none" placeholder="请输入员姓名"></u--input>
 			</u-form-item>
-			<u-form-item label="员工类型" prop="type" :borderBottom="false" class="form-item" labelWidth="80">
-				<u-button @click="typeLx" v-model="form.type" border="none">{{form.type || '点击选择'}}</u-button>
+			<u-form-item label="员工类型" prop="type" borderBottom :borderBottom="false" class="form-item" labelWidth="80">
+				<u-button @click="typeLx" v-model="form.type" >{{form.type || '点击选择'}}</u-button>
 			</u-form-item>
-			<u-form-item label="手机号码" prop="phone" labelWidth="80" class="form-item">
+			<u-form-item label="手机号码" prop="phone" borderBottom labelWidth="80" class="form-item">
 				<u-button v-model="form.phone" 
 				@click="getUserInfo"
 				open-type="getPhoneNumber" 
@@ -24,7 +24,7 @@
 				</u-button>
 			</u-form-item>
 		</u--form>
-		<u-button type="primary" text="注册" @click="registerGo"></u-button>
+		<u-button type="error" text="注册" @click="registerGo"></u-button>
 		<view @click="goRegister" class="link-login">已有账号，点击登录</view>
 		<u-action-sheet :show="show" :actions="list" title="请选择员工类型" description="只能单选" @close="show = false"
 			@select="sexSelect">