diff --git a/api/information.js b/api/information.js
index 53cb95e..70d566b 100644
--- a/api/information.js
+++ b/api/information.js
@@ -5,6 +5,7 @@
 const Submit = BASE_URL + '/visitor/apply/submit'
 const visitReason = BASE_URL + '/sys/dict/code/visitReason'
 const devicePosition = BASE_URL + '/sys/dict/code/devicePosition'
+const DEL_APPLY = BASE_URL + 'visitor/delApply'
 
 /**
  * 提交访客记录
@@ -31,4 +32,15 @@
 export function getResourceType(code) {
 	useNetWork();
   return fetch.get(devicePosition).then(res => res);
-}
\ No newline at end of file
+}
+/**
+ * 申请者删除申请
+ * @param {Object} code
+ */
+export function delApply(applyId) {
+	useNetWork();
+	const params = {
+		applyId: applyId
+	}
+  return fetch.get(DEL_APPLY, params).then(res => res);
+}

diff --git a/api/information.js b/api/information.js
index 53cb95e..70d566b 100644
--- a/api/information.js
+++ b/api/information.js
@@ -5,6 +5,7 @@
 const Submit = BASE_URL + '/visitor/apply/submit'
 const visitReason = BASE_URL + '/sys/dict/code/visitReason'
 const devicePosition = BASE_URL + '/sys/dict/code/devicePosition'
+const DEL_APPLY = BASE_URL + 'visitor/delApply'
 
 /**
  * 提交访客记录
@@ -31,4 +32,15 @@
 export function getResourceType(code) {
 	useNetWork();
   return fetch.get(devicePosition).then(res => res);
-}
\ No newline at end of file
+}
+/**
+ * 申请者删除申请
+ * @param {Object} code
+ */
+export function delApply(applyId) {
+	useNetWork();
+	const params = {
+		applyId: applyId
+	}
+  return fetch.get(DEL_APPLY, params).then(res => res);
+}
diff --git a/api/user.js b/api/user.js
index f7690f0..8ed85c8 100644
--- a/api/user.js
+++ b/api/user.js
@@ -35,13 +35,7 @@
  * 注册
  * @param {*}
  */
-export function getUserRegister(data) {
+export function getUserRegister(params) {
   useNetWork();
-  const params = {
-    phone: data.phone,
-    account: data.account,
-    name: data.name,
-    salt: data.salt,
-  };
   return fetch.post(UserRegister, params).then((res) => res);
 }

diff --git a/api/information.js b/api/information.js
index 53cb95e..70d566b 100644
--- a/api/information.js
+++ b/api/information.js
@@ -5,6 +5,7 @@
 const Submit = BASE_URL + '/visitor/apply/submit'
 const visitReason = BASE_URL + '/sys/dict/code/visitReason'
 const devicePosition = BASE_URL + '/sys/dict/code/devicePosition'
+const DEL_APPLY = BASE_URL + 'visitor/delApply'
 
 /**
  * 提交访客记录
@@ -31,4 +32,15 @@
 export function getResourceType(code) {
 	useNetWork();
   return fetch.get(devicePosition).then(res => res);
-}
\ No newline at end of file
+}
+/**
+ * 申请者删除申请
+ * @param {Object} code
+ */
+export function delApply(applyId) {
+	useNetWork();
+	const params = {
+		applyId: applyId
+	}
+  return fetch.get(DEL_APPLY, params).then(res => res);
+}
diff --git a/api/user.js b/api/user.js
index f7690f0..8ed85c8 100644
--- a/api/user.js
+++ b/api/user.js
@@ -35,13 +35,7 @@
  * 注册
  * @param {*}
  */
-export function getUserRegister(data) {
+export function getUserRegister(params) {
   useNetWork();
-  const params = {
-    phone: data.phone,
-    account: data.account,
-    name: data.name,
-    salt: data.salt,
-  };
   return fetch.post(UserRegister, params).then((res) => res);
 }
diff --git a/pages.json b/pages.json
index 4071ebc..092484a 100644
--- a/pages.json
+++ b/pages.json
@@ -1,11 +1,4 @@
 {
-	// "easycom": {
-	// 	// 下载安装的方式需要前面的"@/"，npm安装的方式无需"@/"
-	// 	// 下载安装方式
-	// 	"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
-	// 	// npm安装方式
-	// 	// "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
-	// },
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
 			"path": "pages/index/index",
@@ -39,14 +32,14 @@
 				"onReachBottomDistance": 10
 			}     
     },
-	{
+		{
 			"path" : "pages/information/information",
 			"style" :                                                                                    
 			{
 				"navigationBarTitleText": "访客信息提交",
 				"enablePullDownRefresh": false
 			}     
-	},
+		},
 		{
 			"path" : "pages/list/list",
 			"style" :                                                                                    
@@ -111,39 +104,79 @@
 		"backgroundColor": "#F8F8F8"
 	},
 	"tabBar": {
-		"custom": true,
-		"selectedColor": "#2483b3",
+		// "custom": true,
+		"color": "#7A7E83",
+		"selectedColor": "#c5000a",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
 		// "color": "#ccc",
 		"list": [
 			{
-				"pagePath": "pages/index/index"
+				"pagePath": "pages/index/index",
+				"text": "首页",
+				"iconPath": "static/tabBar/home.png",
+				"selectedIconPath": "/static/tabBar/home_selected.png"
 			},
 			{
-				"pagePath": "pages/message/message"
+				"pagePath": "pages/message/message",
+				"text": "消息",
+				"iconPath": "static/tabBar/message.png",
+				"selectedIconPath": "static/tabBar/message_selected.png"
 			},
 			{
-				"pagePath": "pages/list/list"
+				"pagePath": "pages/list/list",
+				"text": "列表",
+				"iconPath": "static/tabBar/list.png",
+				"selectedIconPath": "static/tabBar/list_selected.png"
 			},
 			{
-				"pagePath": "pages/mine/mine"
+				"pagePath": "pages/mine/mine",
+				"text": "我的",
+				"iconPath": "static/tabBar/mine.png",
+				"selectedIconPath": "static/tabBar/mine_selected.png"
 			}
 		]
 	},
 	"subPackages":[
-	//分包模块
-	{
-	"root" : "pagesA",
-	"pages" : [
-	{
-		"path" : "checkInfo/checkInfo",
-		"style" :                                                                                    
+		//分包模块
 		{
-			"navigationBarTitleText": "",
-			"enablePullDownRefresh": false
+			"root" : "pagesA",
+			"pages" : [
+				{
+					"path" : "checkInfo/checkInfo",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path" : "submitInfo/submitInfo",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "访客信息提交",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path" : "checkListInfo/checkListInfo",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "信息查看",
+						"enablePullDownRefresh": false
+					}
+				}
+			    ,{
+                    "path" : "changeListInfo/changeListInfo",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "",
+                    "enablePullDownRefresh": false
+                }
+                
+                }
+            ]
 		}
-	}
-	]
-	}
 	],
 	"uniIdRouter": {}
 }

diff --git a/api/information.js b/api/information.js
index 53cb95e..70d566b 100644
--- a/api/information.js
+++ b/api/information.js
@@ -5,6 +5,7 @@
 const Submit = BASE_URL + '/visitor/apply/submit'
 const visitReason = BASE_URL + '/sys/dict/code/visitReason'
 const devicePosition = BASE_URL + '/sys/dict/code/devicePosition'
+const DEL_APPLY = BASE_URL + 'visitor/delApply'
 
 /**
  * 提交访客记录
@@ -31,4 +32,15 @@
 export function getResourceType(code) {
 	useNetWork();
   return fetch.get(devicePosition).then(res => res);
-}
\ No newline at end of file
+}
+/**
+ * 申请者删除申请
+ * @param {Object} code
+ */
+export function delApply(applyId) {
+	useNetWork();
+	const params = {
+		applyId: applyId
+	}
+  return fetch.get(DEL_APPLY, params).then(res => res);
+}
diff --git a/api/user.js b/api/user.js
index f7690f0..8ed85c8 100644
--- a/api/user.js
+++ b/api/user.js
@@ -35,13 +35,7 @@
  * 注册
  * @param {*}
  */
-export function getUserRegister(data) {
+export function getUserRegister(params) {
   useNetWork();
-  const params = {
-    phone: data.phone,
-    account: data.account,
-    name: data.name,
-    salt: data.salt,
-  };
   return fetch.post(UserRegister, params).then((res) => res);
 }
diff --git a/pages.json b/pages.json
index 4071ebc..092484a 100644
--- a/pages.json
+++ b/pages.json
@@ -1,11 +1,4 @@
 {
-	// "easycom": {
-	// 	// 下载安装的方式需要前面的"@/"，npm安装的方式无需"@/"
-	// 	// 下载安装方式
-	// 	"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
-	// 	// npm安装方式
-	// 	// "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
-	// },
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
 			"path": "pages/index/index",
@@ -39,14 +32,14 @@
 				"onReachBottomDistance": 10
 			}     
     },
-	{
+		{
 			"path" : "pages/information/information",
 			"style" :                                                                                    
 			{
 				"navigationBarTitleText": "访客信息提交",
 				"enablePullDownRefresh": false
 			}     
-	},
+		},
 		{
 			"path" : "pages/list/list",
 			"style" :                                                                                    
@@ -111,39 +104,79 @@
 		"backgroundColor": "#F8F8F8"
 	},
 	"tabBar": {
-		"custom": true,
-		"selectedColor": "#2483b3",
+		// "custom": true,
+		"color": "#7A7E83",
+		"selectedColor": "#c5000a",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
 		// "color": "#ccc",
 		"list": [
 			{
-				"pagePath": "pages/index/index"
+				"pagePath": "pages/index/index",
+				"text": "首页",
+				"iconPath": "static/tabBar/home.png",
+				"selectedIconPath": "/static/tabBar/home_selected.png"
 			},
 			{
-				"pagePath": "pages/message/message"
+				"pagePath": "pages/message/message",
+				"text": "消息",
+				"iconPath": "static/tabBar/message.png",
+				"selectedIconPath": "static/tabBar/message_selected.png"
 			},
 			{
-				"pagePath": "pages/list/list"
+				"pagePath": "pages/list/list",
+				"text": "列表",
+				"iconPath": "static/tabBar/list.png",
+				"selectedIconPath": "static/tabBar/list_selected.png"
 			},
 			{
-				"pagePath": "pages/mine/mine"
+				"pagePath": "pages/mine/mine",
+				"text": "我的",
+				"iconPath": "static/tabBar/mine.png",
+				"selectedIconPath": "static/tabBar/mine_selected.png"
 			}
 		]
 	},
 	"subPackages":[
-	//分包模块
-	{
-	"root" : "pagesA",
-	"pages" : [
-	{
-		"path" : "checkInfo/checkInfo",
-		"style" :                                                                                    
+		//分包模块
 		{
-			"navigationBarTitleText": "",
-			"enablePullDownRefresh": false
+			"root" : "pagesA",
+			"pages" : [
+				{
+					"path" : "checkInfo/checkInfo",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path" : "submitInfo/submitInfo",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "访客信息提交",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path" : "checkListInfo/checkListInfo",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "信息查看",
+						"enablePullDownRefresh": false
+					}
+				}
+			    ,{
+                    "path" : "changeListInfo/changeListInfo",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "",
+                    "enablePullDownRefresh": false
+                }
+                
+                }
+            ]
 		}
-	}
-	]
-	}
 	],
 	"uniIdRouter": {}
 }
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7e9dc36..fdde26f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,7 +1,7 @@
 //首页
 <template>
   <view class="index">
-    <TabBar></TabBar>
+    <!-- <TabBar></TabBar> -->
 		<view class="top">
 			<image src="../../static/logo.png" style="width: 167rpx;height: 150rpx;"></image>
 			<view class="top-title">
@@ -91,30 +91,22 @@
     uni.setStorageSync("currentPagePath", this.currentPagePath);
   },
   methods: {
-    // ...mapMutations(['setNavRect'])
     async handleClick(id) {
-			// subscription();
       this.active = id;
       const sessionId = uni.getStorageSync("sessionId");
       //如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过
       if (!sessionId) {
         await getLogin();
       }
-			// if(id === 'submit') {
-				this.phone = uni.getStorageSync("registerPhone");
-				if (this.phone) {
-				  this.checkphone();
-				} else {
-					//弹获取手机号
-				  this.popShow = true;
-				}
-			// } else {
-			// 	// uni.showToast({
-			// 	// 	title: '敬请期待',
-			// 	// 	icon: 'none'
-			// 	// });
-			// }
+			this.phone = uni.getStorageSync("registerPhone");
+			if (this.phone) {
+				this.checkphone();
+			} else {
+				//弹获取手机号
+				this.popShow = true;
+			}
     },
+		
 		//通过手机号检查是否存在这个用户
     async checkphone() {
       const res = await verifyPhone(this.phone);
@@ -122,25 +114,23 @@
         wx.reLaunch({
           url: "/pages/register/register",
         });
-      } else {
+      } else { // 用户已注册
 				uni.setStorageSync("registerPhone", this.phone);
         await getUserProfile(); //获取人员信息
-				
-			if (uni.getStorageSync("userInfo")) {
-			  const userInfo = JSON.parse(uni.getStorageSync("userInfo"));
-			  this.uid = userInfo.id
-			  if (userInfo.salt === "物业人员") {
-				if(this.active === "submit") {
-					subscription();
-				}
+				if (uni.getStorageSync("userInfo")) {
+					const userInfo = JSON.parse(uni.getStorageSync("userInfo"));
+					this.uid = userInfo.id
+					if (userInfo.salt === "物业人员") {
+					if(this.active === "submit") {
+						subscription();
+					}
 			  } 
 			}
-				
-        if (this.active === "submit") {
-          wx.navigateTo({
-            url: `/pages/information/information?id=${this.active}`,
-          });
-        }else {
+			if (this.active === "submit") {
+				wx.navigateTo({
+					url: `/pages/information/information?id=${this.active}`,
+				});
+			} else {
 			// 判断是否有这个路径
 			const res = await getUserJurisdiction({uid:this.uid})
 			if(res.indexOf('/pages/check/check') !== -1) {
@@ -171,7 +161,8 @@
 	padding: 0 20rpx;
   padding-top: 40rpx;
 	background: linear-gradient(#e7c0c1 0%, #fff 100%);
-  height: 100vh;
+  height: 100%;
+	box-sizing: border-box;
 	z-index: 0;
 	.top {
 		display: flex;
@@ -223,7 +214,7 @@
   }
 	.bottom-img {
 		position: absolute;
-		bottom: 250rpx;
+		bottom: 20rpx;
 		left: 0;
 		width: 100%;
 		height: 220rpx;

diff --git a/api/information.js b/api/information.js
index 53cb95e..70d566b 100644
--- a/api/information.js
+++ b/api/information.js
@@ -5,6 +5,7 @@
 const Submit = BASE_URL + '/visitor/apply/submit'
 const visitReason = BASE_URL + '/sys/dict/code/visitReason'
 const devicePosition = BASE_URL + '/sys/dict/code/devicePosition'
+const DEL_APPLY = BASE_URL + 'visitor/delApply'
 
 /**
  * 提交访客记录
@@ -31,4 +32,15 @@
 export function getResourceType(code) {
 	useNetWork();
   return fetch.get(devicePosition).then(res => res);
-}
\ No newline at end of file
+}
+/**
+ * 申请者删除申请
+ * @param {Object} code
+ */
+export function delApply(applyId) {
+	useNetWork();
+	const params = {
+		applyId: applyId
+	}
+  return fetch.get(DEL_APPLY, params).then(res => res);
+}
diff --git a/api/user.js b/api/user.js
index f7690f0..8ed85c8 100644
--- a/api/user.js
+++ b/api/user.js
@@ -35,13 +35,7 @@
  * 注册
  * @param {*}
  */
-export function getUserRegister(data) {
+export function getUserRegister(params) {
   useNetWork();
-  const params = {
-    phone: data.phone,
-    account: data.account,
-    name: data.name,
-    salt: data.salt,
-  };
   return fetch.post(UserRegister, params).then((res) => res);
 }
diff --git a/pages.json b/pages.json
index 4071ebc..092484a 100644
--- a/pages.json
+++ b/pages.json
@@ -1,11 +1,4 @@
 {
-	// "easycom": {
-	// 	// 下载安装的方式需要前面的"@/"，npm安装的方式无需"@/"
-	// 	// 下载安装方式
-	// 	"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
-	// 	// npm安装方式
-	// 	// "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
-	// },
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
 			"path": "pages/index/index",
@@ -39,14 +32,14 @@
 				"onReachBottomDistance": 10
 			}     
     },
-	{
+		{
 			"path" : "pages/information/information",
 			"style" :                                                                                    
 			{
 				"navigationBarTitleText": "访客信息提交",
 				"enablePullDownRefresh": false
 			}     
-	},
+		},
 		{
 			"path" : "pages/list/list",
 			"style" :                                                                                    
@@ -111,39 +104,79 @@
 		"backgroundColor": "#F8F8F8"
 	},
 	"tabBar": {
-		"custom": true,
-		"selectedColor": "#2483b3",
+		// "custom": true,
+		"color": "#7A7E83",
+		"selectedColor": "#c5000a",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
 		// "color": "#ccc",
 		"list": [
 			{
-				"pagePath": "pages/index/index"
+				"pagePath": "pages/index/index",
+				"text": "首页",
+				"iconPath": "static/tabBar/home.png",
+				"selectedIconPath": "/static/tabBar/home_selected.png"
 			},
 			{
-				"pagePath": "pages/message/message"
+				"pagePath": "pages/message/message",
+				"text": "消息",
+				"iconPath": "static/tabBar/message.png",
+				"selectedIconPath": "static/tabBar/message_selected.png"
 			},
 			{
-				"pagePath": "pages/list/list"
+				"pagePath": "pages/list/list",
+				"text": "列表",
+				"iconPath": "static/tabBar/list.png",
+				"selectedIconPath": "static/tabBar/list_selected.png"
 			},
 			{
-				"pagePath": "pages/mine/mine"
+				"pagePath": "pages/mine/mine",
+				"text": "我的",
+				"iconPath": "static/tabBar/mine.png",
+				"selectedIconPath": "static/tabBar/mine_selected.png"
 			}
 		]
 	},
 	"subPackages":[
-	//分包模块
-	{
-	"root" : "pagesA",
-	"pages" : [
-	{
-		"path" : "checkInfo/checkInfo",
-		"style" :                                                                                    
+		//分包模块
 		{
-			"navigationBarTitleText": "",
-			"enablePullDownRefresh": false
+			"root" : "pagesA",
+			"pages" : [
+				{
+					"path" : "checkInfo/checkInfo",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path" : "submitInfo/submitInfo",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "访客信息提交",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path" : "checkListInfo/checkListInfo",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "信息查看",
+						"enablePullDownRefresh": false
+					}
+				}
+			    ,{
+                    "path" : "changeListInfo/changeListInfo",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "",
+                    "enablePullDownRefresh": false
+                }
+                
+                }
+            ]
 		}
-	}
-	]
-	}
 	],
 	"uniIdRouter": {}
 }
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7e9dc36..fdde26f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,7 +1,7 @@
 //首页
 <template>
   <view class="index">
-    <TabBar></TabBar>
+    <!-- <TabBar></TabBar> -->
 		<view class="top">
 			<image src="../../static/logo.png" style="width: 167rpx;height: 150rpx;"></image>
 			<view class="top-title">
@@ -91,30 +91,22 @@
     uni.setStorageSync("currentPagePath", this.currentPagePath);
   },
   methods: {
-    // ...mapMutations(['setNavRect'])
     async handleClick(id) {
-			// subscription();
       this.active = id;
       const sessionId = uni.getStorageSync("sessionId");
       //如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过
       if (!sessionId) {
         await getLogin();
       }
-			// if(id === 'submit') {
-				this.phone = uni.getStorageSync("registerPhone");
-				if (this.phone) {
-				  this.checkphone();
-				} else {
-					//弹获取手机号
-				  this.popShow = true;
-				}
-			// } else {
-			// 	// uni.showToast({
-			// 	// 	title: '敬请期待',
-			// 	// 	icon: 'none'
-			// 	// });
-			// }
+			this.phone = uni.getStorageSync("registerPhone");
+			if (this.phone) {
+				this.checkphone();
+			} else {
+				//弹获取手机号
+				this.popShow = true;
+			}
     },
+		
 		//通过手机号检查是否存在这个用户
     async checkphone() {
       const res = await verifyPhone(this.phone);
@@ -122,25 +114,23 @@
         wx.reLaunch({
           url: "/pages/register/register",
         });
-      } else {
+      } else { // 用户已注册
 				uni.setStorageSync("registerPhone", this.phone);
         await getUserProfile(); //获取人员信息
-				
-			if (uni.getStorageSync("userInfo")) {
-			  const userInfo = JSON.parse(uni.getStorageSync("userInfo"));
-			  this.uid = userInfo.id
-			  if (userInfo.salt === "物业人员") {
-				if(this.active === "submit") {
-					subscription();
-				}
+				if (uni.getStorageSync("userInfo")) {
+					const userInfo = JSON.parse(uni.getStorageSync("userInfo"));
+					this.uid = userInfo.id
+					if (userInfo.salt === "物业人员") {
+					if(this.active === "submit") {
+						subscription();
+					}
 			  } 
 			}
-				
-        if (this.active === "submit") {
-          wx.navigateTo({
-            url: `/pages/information/information?id=${this.active}`,
-          });
-        }else {
+			if (this.active === "submit") {
+				wx.navigateTo({
+					url: `/pages/information/information?id=${this.active}`,
+				});
+			} else {
 			// 判断是否有这个路径
 			const res = await getUserJurisdiction({uid:this.uid})
 			if(res.indexOf('/pages/check/check') !== -1) {
@@ -171,7 +161,8 @@
 	padding: 0 20rpx;
   padding-top: 40rpx;
 	background: linear-gradient(#e7c0c1 0%, #fff 100%);
-  height: 100vh;
+  height: 100%;
+	box-sizing: border-box;
 	z-index: 0;
 	.top {
 		display: flex;
@@ -223,7 +214,7 @@
   }
 	.bottom-img {
 		position: absolute;
-		bottom: 250rpx;
+		bottom: 20rpx;
 		left: 0;
 		width: 100%;
 		height: 220rpx;
diff --git a/pages/information/information.vue b/pages/information/information.vue
index fcf9991..ad0ec91 100644
--- a/pages/information/information.vue
+++ b/pages/information/information.vue
@@ -1,3 +1,4 @@
+<!-- 访客信息提交页面 -->
 <template>
 	<view class="information">
 		<view class="form">
@@ -34,6 +35,9 @@
 				<u-form-item label="申请者名字" borderBottom labelWidth="100">
 					<u--input v-model="callerInfo.staffName" disabled border="none" placeholder="请输入申请者姓名"></u--input>
 				</u-form-item>
+				<u-form-item label="申请者手机号" borderBottom labelWidth="100">
+					<u--input v-model="callerInfo.phone" disabled border="none" placeholder="请输入申请者姓名"></u--input>
+				</u-form-item>
 				<u-form-item label="备注" borderBottom labelWidth="100">
 					<u--input v-model="callerInfo.remarks" border="none" placeholder="请输入备注"></u--input>
 				</u-form-item>
@@ -46,15 +50,37 @@
 					信息提交成功，请等待物业管理员处理。
 				</view>
 			</view>
-			<u-picker :show="show" :columns="columns" @close="show=false" @confirm="getPurpose"></u-picker>
-			<u-picker :show="buildingShow" :columns="buildingColumns" @close="buildingShow=false"
+			<!-- 访问目的 -->
+			<u-picker :show="show" :columns="columns" @cancel="show=false" @confirm="getPurpose"></u-picker>
+			<!-- 访问楼栋 -->
+			<u-picker :show="buildingShow" :columns="buildingColumns" @cancel="buildingShow=false"
 				@confirm="getBuilding">
 			</u-picker>
-			<u-datetime-picker :show="isinTimeShow" v-model="callerInfo.inTime" mode="datetime" title="请选择开始时间"
-				:formatter="formatter"  @cancel="isinTimeShow=false" @change="change" @confirm="closeinTime">
+			<!-- 选择开始时间 -->
+			<u-datetime-picker 
+				:show="isinTimeShow" 
+				v-model="callerInfo.inTime" 
+				mode="datetime" 
+				title="请选择开始时间"
+				:formatter="formatter" 
+				:minDate="inTimeMinDate"
+				:maxDate="inTimeMaxDate"
+				@cancel="isinTimeShow=false" 
+				@change="change" 
+				@confirm="closeinTime">
 			</u-datetime-picker>
-			<u-datetime-picker :show="isTimeShow" v-model="callerInfo.outTime" mode="datetime" title="请选择结束时间"
-				:formatter="formatter"  @cancel="closeTime" @change="change" @confirm="confirmTime">
+			<!-- 选择结束时间 -->
+			<u-datetime-picker 
+				:show="isTimeShow" 
+				v-model="callerInfo.outTime" 
+				mode="datetime" 
+				title="请选择结束时间"
+				:minDate="outTimeMinDate"
+				:maxDate="outTimeMaxDate"
+				:formatter="formatter" 
+				@cancel="closeTime" 
+				@change="change" 
+				@confirm="confirmTime">
 			</u-datetime-picker>
 		</view>
 		<view style="margin-top: 42rpx;">
@@ -67,6 +93,7 @@
 <script>
 	import { getSubmit , getDictCode, getResourceType} from '@/api/information.js'
 	import { subscription } from "@/utils/common.js"
+	import { toHandlerKey } from "vue";
 	export default {
 		data() {
 			return {
@@ -76,11 +103,12 @@
 					visitorPhone: '',
 					visitReason: '',
 					visitPosition: '',
-					inTime: Number(new Date()),
+					inTime: Number(new Date()), //开始时间
 					staffCode: '',
 					staffName: '',
 					remarks: '',
-					outTime: Number(new Date())
+					phone: '', // 申请者手机号
+					outTime: Number(new Date()) //结束时间
 				},
 				rules: {
 					visitorName: [{
@@ -134,18 +162,33 @@
 				buildingShow: false,
 				isinTimeShow: false,
 				columns: [],
-				buildingColumns: []
+				buildingColumns: [],
+				//开始时间最小时间-当前时间
+				inTimeMinDate: new Date(new Date()).getTime(),
+				//开始时间最大时间（一周之内）
+				inTimeMaxDate: new Date(new Date().toLocaleDateString()).getTime()+ 24 * 60 * 60 * 1000 * 7 - 1,
+				//结束时间最小时间（当前时间）
+				outTimeMinDate: new Date(new Date()).getTime(),
+				//结束时间最大时间-默认一周之内
+				outTimeMaxDate: new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 * 7 - 1,
 			}
 		},
+		watch: {
+			//开始时间和结束时间要求是同一天
+			"callerInfo.inTime"(newValue) {
+				this.outTimeMinDate = new Date(newValue).getTime() //结束时间的最小时间是选择的开始时间
+				this.outTimeMaxDate = new Date(new Date(newValue).toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1
+			},
+		},
 		onLoad() {
 			this.callerInfo.inTime = this.shijianc(this.callerInfo.inTime)
 			this.callerInfo.outTime = this.shijianc(this.callerInfo.outTime)
 			const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
 			this.callerInfo.staffCode = userInfo.account
 			this.callerInfo.staffName = userInfo.name
+			this.callerInfo.phone = userInfo.phone
 			this.getDictMap()
 		},
-		
 		mounted() {
 			this.$refs.form1.setRules(this.rules)
 		},
@@ -254,7 +297,7 @@
 		padding: 22rpx;
 
 		.form {
-			padding: 0 32rpx 0;
+			padding: 40rpx 32rpx;
 			border-radius: 10rpx;
 			background-color: #fff;
 		}

diff --git a/api/information.js b/api/information.js
index 53cb95e..70d566b 100644
--- a/api/information.js
+++ b/api/information.js
@@ -5,6 +5,7 @@
 const Submit = BASE_URL + '/visitor/apply/submit'
 const visitReason = BASE_URL + '/sys/dict/code/visitReason'
 const devicePosition = BASE_URL + '/sys/dict/code/devicePosition'
+const DEL_APPLY = BASE_URL + 'visitor/delApply'
 
 /**
  * 提交访客记录
@@ -31,4 +32,15 @@
 export function getResourceType(code) {
 	useNetWork();
   return fetch.get(devicePosition).then(res => res);
-}
\ No newline at end of file
+}
+/**
+ * 申请者删除申请
+ * @param {Object} code
+ */
+export function delApply(applyId) {
+	useNetWork();
+	const params = {
+		applyId: applyId
+	}
+  return fetch.get(DEL_APPLY, params).then(res => res);
+}
diff --git a/api/user.js b/api/user.js
index f7690f0..8ed85c8 100644
--- a/api/user.js
+++ b/api/user.js
@@ -35,13 +35,7 @@
  * 注册
  * @param {*}
  */
-export function getUserRegister(data) {
+export function getUserRegister(params) {
   useNetWork();
-  const params = {
-    phone: data.phone,
-    account: data.account,
-    name: data.name,
-    salt: data.salt,
-  };
   return fetch.post(UserRegister, params).then((res) => res);
 }
diff --git a/pages.json b/pages.json
index 4071ebc..092484a 100644
--- a/pages.json
+++ b/pages.json
@@ -1,11 +1,4 @@
 {
-	// "easycom": {
-	// 	// 下载安装的方式需要前面的"@/"，npm安装的方式无需"@/"
-	// 	// 下载安装方式
-	// 	"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
-	// 	// npm安装方式
-	// 	// "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
-	// },
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
 			"path": "pages/index/index",
@@ -39,14 +32,14 @@
 				"onReachBottomDistance": 10
 			}     
     },
-	{
+		{
 			"path" : "pages/information/information",
 			"style" :                                                                                    
 			{
 				"navigationBarTitleText": "访客信息提交",
 				"enablePullDownRefresh": false
 			}     
-	},
+		},
 		{
 			"path" : "pages/list/list",
 			"style" :                                                                                    
@@ -111,39 +104,79 @@
 		"backgroundColor": "#F8F8F8"
 	},
 	"tabBar": {
-		"custom": true,
-		"selectedColor": "#2483b3",
+		// "custom": true,
+		"color": "#7A7E83",
+		"selectedColor": "#c5000a",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
 		// "color": "#ccc",
 		"list": [
 			{
-				"pagePath": "pages/index/index"
+				"pagePath": "pages/index/index",
+				"text": "首页",
+				"iconPath": "static/tabBar/home.png",
+				"selectedIconPath": "/static/tabBar/home_selected.png"
 			},
 			{
-				"pagePath": "pages/message/message"
+				"pagePath": "pages/message/message",
+				"text": "消息",
+				"iconPath": "static/tabBar/message.png",
+				"selectedIconPath": "static/tabBar/message_selected.png"
 			},
 			{
-				"pagePath": "pages/list/list"
+				"pagePath": "pages/list/list",
+				"text": "列表",
+				"iconPath": "static/tabBar/list.png",
+				"selectedIconPath": "static/tabBar/list_selected.png"
 			},
 			{
-				"pagePath": "pages/mine/mine"
+				"pagePath": "pages/mine/mine",
+				"text": "我的",
+				"iconPath": "static/tabBar/mine.png",
+				"selectedIconPath": "static/tabBar/mine_selected.png"
 			}
 		]
 	},
 	"subPackages":[
-	//分包模块
-	{
-	"root" : "pagesA",
-	"pages" : [
-	{
-		"path" : "checkInfo/checkInfo",
-		"style" :                                                                                    
+		//分包模块
 		{
-			"navigationBarTitleText": "",
-			"enablePullDownRefresh": false
+			"root" : "pagesA",
+			"pages" : [
+				{
+					"path" : "checkInfo/checkInfo",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path" : "submitInfo/submitInfo",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "访客信息提交",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path" : "checkListInfo/checkListInfo",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "信息查看",
+						"enablePullDownRefresh": false
+					}
+				}
+			    ,{
+                    "path" : "changeListInfo/changeListInfo",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "",
+                    "enablePullDownRefresh": false
+                }
+                
+                }
+            ]
 		}
-	}
-	]
-	}
 	],
 	"uniIdRouter": {}
 }
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7e9dc36..fdde26f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,7 +1,7 @@
 //首页
 <template>
   <view class="index">
-    <TabBar></TabBar>
+    <!-- <TabBar></TabBar> -->
 		<view class="top">
 			<image src="../../static/logo.png" style="width: 167rpx;height: 150rpx;"></image>
 			<view class="top-title">
@@ -91,30 +91,22 @@
     uni.setStorageSync("currentPagePath", this.currentPagePath);
   },
   methods: {
-    // ...mapMutations(['setNavRect'])
     async handleClick(id) {
-			// subscription();
       this.active = id;
       const sessionId = uni.getStorageSync("sessionId");
       //如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过
       if (!sessionId) {
         await getLogin();
       }
-			// if(id === 'submit') {
-				this.phone = uni.getStorageSync("registerPhone");
-				if (this.phone) {
-				  this.checkphone();
-				} else {
-					//弹获取手机号
-				  this.popShow = true;
-				}
-			// } else {
-			// 	// uni.showToast({
-			// 	// 	title: '敬请期待',
-			// 	// 	icon: 'none'
-			// 	// });
-			// }
+			this.phone = uni.getStorageSync("registerPhone");
+			if (this.phone) {
+				this.checkphone();
+			} else {
+				//弹获取手机号
+				this.popShow = true;
+			}
     },
+		
 		//通过手机号检查是否存在这个用户
     async checkphone() {
       const res = await verifyPhone(this.phone);
@@ -122,25 +114,23 @@
         wx.reLaunch({
           url: "/pages/register/register",
         });
-      } else {
+      } else { // 用户已注册
 				uni.setStorageSync("registerPhone", this.phone);
         await getUserProfile(); //获取人员信息
-				
-			if (uni.getStorageSync("userInfo")) {
-			  const userInfo = JSON.parse(uni.getStorageSync("userInfo"));
-			  this.uid = userInfo.id
-			  if (userInfo.salt === "物业人员") {
-				if(this.active === "submit") {
-					subscription();
-				}
+				if (uni.getStorageSync("userInfo")) {
+					const userInfo = JSON.parse(uni.getStorageSync("userInfo"));
+					this.uid = userInfo.id
+					if (userInfo.salt === "物业人员") {
+					if(this.active === "submit") {
+						subscription();
+					}
 			  } 
 			}
-				
-        if (this.active === "submit") {
-          wx.navigateTo({
-            url: `/pages/information/information?id=${this.active}`,
-          });
-        }else {
+			if (this.active === "submit") {
+				wx.navigateTo({
+					url: `/pages/information/information?id=${this.active}`,
+				});
+			} else {
 			// 判断是否有这个路径
 			const res = await getUserJurisdiction({uid:this.uid})
 			if(res.indexOf('/pages/check/check') !== -1) {
@@ -171,7 +161,8 @@
 	padding: 0 20rpx;
   padding-top: 40rpx;
 	background: linear-gradient(#e7c0c1 0%, #fff 100%);
-  height: 100vh;
+  height: 100%;
+	box-sizing: border-box;
 	z-index: 0;
 	.top {
 		display: flex;
@@ -223,7 +214,7 @@
   }
 	.bottom-img {
 		position: absolute;
-		bottom: 250rpx;
+		bottom: 20rpx;
 		left: 0;
 		width: 100%;
 		height: 220rpx;
diff --git a/pages/information/information.vue b/pages/information/information.vue
index fcf9991..ad0ec91 100644
--- a/pages/information/information.vue
+++ b/pages/information/information.vue
@@ -1,3 +1,4 @@
+<!-- 访客信息提交页面 -->
 <template>
 	<view class="information">
 		<view class="form">
@@ -34,6 +35,9 @@
 				<u-form-item label="申请者名字" borderBottom labelWidth="100">
 					<u--input v-model="callerInfo.staffName" disabled border="none" placeholder="请输入申请者姓名"></u--input>
 				</u-form-item>
+				<u-form-item label="申请者手机号" borderBottom labelWidth="100">
+					<u--input v-model="callerInfo.phone" disabled border="none" placeholder="请输入申请者姓名"></u--input>
+				</u-form-item>
 				<u-form-item label="备注" borderBottom labelWidth="100">
 					<u--input v-model="callerInfo.remarks" border="none" placeholder="请输入备注"></u--input>
 				</u-form-item>
@@ -46,15 +50,37 @@
 					信息提交成功，请等待物业管理员处理。
 				</view>
 			</view>
-			<u-picker :show="show" :columns="columns" @close="show=false" @confirm="getPurpose"></u-picker>
-			<u-picker :show="buildingShow" :columns="buildingColumns" @close="buildingShow=false"
+			<!-- 访问目的 -->
+			<u-picker :show="show" :columns="columns" @cancel="show=false" @confirm="getPurpose"></u-picker>
+			<!-- 访问楼栋 -->
+			<u-picker :show="buildingShow" :columns="buildingColumns" @cancel="buildingShow=false"
 				@confirm="getBuilding">
 			</u-picker>
-			<u-datetime-picker :show="isinTimeShow" v-model="callerInfo.inTime" mode="datetime" title="请选择开始时间"
-				:formatter="formatter"  @cancel="isinTimeShow=false" @change="change" @confirm="closeinTime">
+			<!-- 选择开始时间 -->
+			<u-datetime-picker 
+				:show="isinTimeShow" 
+				v-model="callerInfo.inTime" 
+				mode="datetime" 
+				title="请选择开始时间"
+				:formatter="formatter" 
+				:minDate="inTimeMinDate"
+				:maxDate="inTimeMaxDate"
+				@cancel="isinTimeShow=false" 
+				@change="change" 
+				@confirm="closeinTime">
 			</u-datetime-picker>
-			<u-datetime-picker :show="isTimeShow" v-model="callerInfo.outTime" mode="datetime" title="请选择结束时间"
-				:formatter="formatter"  @cancel="closeTime" @change="change" @confirm="confirmTime">
+			<!-- 选择结束时间 -->
+			<u-datetime-picker 
+				:show="isTimeShow" 
+				v-model="callerInfo.outTime" 
+				mode="datetime" 
+				title="请选择结束时间"
+				:minDate="outTimeMinDate"
+				:maxDate="outTimeMaxDate"
+				:formatter="formatter" 
+				@cancel="closeTime" 
+				@change="change" 
+				@confirm="confirmTime">
 			</u-datetime-picker>
 		</view>
 		<view style="margin-top: 42rpx;">
@@ -67,6 +93,7 @@
 <script>
 	import { getSubmit , getDictCode, getResourceType} from '@/api/information.js'
 	import { subscription } from "@/utils/common.js"
+	import { toHandlerKey } from "vue";
 	export default {
 		data() {
 			return {
@@ -76,11 +103,12 @@
 					visitorPhone: '',
 					visitReason: '',
 					visitPosition: '',
-					inTime: Number(new Date()),
+					inTime: Number(new Date()), //开始时间
 					staffCode: '',
 					staffName: '',
 					remarks: '',
-					outTime: Number(new Date())
+					phone: '', // 申请者手机号
+					outTime: Number(new Date()) //结束时间
 				},
 				rules: {
 					visitorName: [{
@@ -134,18 +162,33 @@
 				buildingShow: false,
 				isinTimeShow: false,
 				columns: [],
-				buildingColumns: []
+				buildingColumns: [],
+				//开始时间最小时间-当前时间
+				inTimeMinDate: new Date(new Date()).getTime(),
+				//开始时间最大时间（一周之内）
+				inTimeMaxDate: new Date(new Date().toLocaleDateString()).getTime()+ 24 * 60 * 60 * 1000 * 7 - 1,
+				//结束时间最小时间（当前时间）
+				outTimeMinDate: new Date(new Date()).getTime(),
+				//结束时间最大时间-默认一周之内
+				outTimeMaxDate: new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 * 7 - 1,
 			}
 		},
+		watch: {
+			//开始时间和结束时间要求是同一天
+			"callerInfo.inTime"(newValue) {
+				this.outTimeMinDate = new Date(newValue).getTime() //结束时间的最小时间是选择的开始时间
+				this.outTimeMaxDate = new Date(new Date(newValue).toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1
+			},
+		},
 		onLoad() {
 			this.callerInfo.inTime = this.shijianc(this.callerInfo.inTime)
 			this.callerInfo.outTime = this.shijianc(this.callerInfo.outTime)
 			const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
 			this.callerInfo.staffCode = userInfo.account
 			this.callerInfo.staffName = userInfo.name
+			this.callerInfo.phone = userInfo.phone
 			this.getDictMap()
 		},
-		
 		mounted() {
 			this.$refs.form1.setRules(this.rules)
 		},
@@ -254,7 +297,7 @@
 		padding: 22rpx;
 
 		.form {
-			padding: 0 32rpx 0;
+			padding: 40rpx 32rpx;
 			border-radius: 10rpx;
 			background-color: #fff;
 		}
diff --git a/pages/list/list.vue b/pages/list/list.vue
index e139fbd..6f84539 100644
--- a/pages/list/list.vue
+++ b/pages/list/list.vue
@@ -1,7 +1,7 @@
-//列表页
+<!-- 列表页 -->
 <template>
   <view class="list">
-    <TabBar></TabBar>
+    <!-- <TabBar></TabBar> -->
     <view class="list-top">
       <u-input
         placeholder="关键字搜索"
@@ -19,18 +19,20 @@
           statusInfo
         }}</text>
         <view class="icon">
-          <text class="checkmark-circle" @click="pass('通过')"></text>
-          <text class="close-circle" @click="pass('拒绝')"></text>
-          <text class="share-square" @click="isExportShow = true"></text>
+          <text v-if="!isManager" class="template" @click="goSubmitInfo"></text>
+          <text v-if="isManager" class="checkmark-circle" @click="pass('通过')"></text>
+          <text v-if="isManager" class="close-circle" @click="pass('拒绝')"></text>
+          <text v-if="isManager" class="share-square" @click="isExportShow = true"></text>
         </view>
       </view>
     </view>
-    <view class="list-content">
+		<view class="list-content">
       <view class="table" v-for="(item, index) in list" :key="index">
         <view class="table-checkbox">
-          <u-checkbox-group >
+					<!-- 复选框 -->
+          <u-checkbox-group>
             <u-checkbox
-			 :checked="item.value"
+			        :checked="item.value"
               @change="checkboxChange(item)"
               shape="circle"
             ></u-checkbox>
@@ -46,8 +48,9 @@
           </view>
         </view>
         <view :class="item.color"> {{ item.status }} </view>
+				<!-- 眼睛图标、查看 -->
         <view class="table-icon">
-          <view class="icon-info" @click="eyeLoock(item.applyNo)"></view>
+          <view class="icon-info" @click="eyeLoock(item.applyNo, item)"></view>
         </view>
       </view>
     </view>
@@ -56,8 +59,7 @@
       mode="bottom"
       :round="10"
       :closeOnClickOverlay="false"
-      @close="close"
-    >
+      @close="close">
       <view class="popup">
 				<view class="title">提示</view>
         <view class="content">
@@ -74,8 +76,7 @@
       mode="bottom"
       :round="10"
       :closeOnClickOverlay="false"
-      @close="close"
-    >
+      @close="close">
       <view class="popup">
 				<view class="title">提示</view>
         <view class="content"> 确定要将{{ text }}的{{ leixin }}? </view>
@@ -90,11 +91,10 @@
       :show="startTimeShow"
       mode="datetime"
       title="请选择开始时间"
-	  v-model="startTimeDefult"
+	    v-model="startTimeDefult"
       :formatter="formatter"
       @cancel="closeTime"
-      @confirm="confirmTime"
-    >
+      @confirm="confirmTime">
     </u-datetime-picker>
 		
     <u-datetime-picker
@@ -102,14 +102,13 @@
       mode="datetime"
       title="请选择结束时间"
       :formatter="formatter"
-	  v-model="endTimeDefult"
+	    v-model="endTimeDefult"
       @cancel="closeTime"
-      @confirm="confirmEndTime"
-    >
+      @confirm="confirmEndTime">
     </u-datetime-picker>
     <u-action-sheet
       :show="statusShow"
-      :actions="statusList"
+      :actions="isManager ? statusListManager : statusList"
       title="请选择状态"
       description="只能单选"
       @close="statusShow = false"
@@ -133,7 +132,7 @@
 <script>
 import TabBar from "@/components/tabBar/tabBar.vue";
 import { getList } from "@/api/list.js";
-import { debounce } from "@/common/utils.js";
+import { debounce, deepCopy } from "@/common/utils.js";
 import { getLastMonth } from "@/common/formatTime.js";
 import { solveStatus } from "@/api/message.js";
 import { verifyPhone } from "@/api/index.js";
@@ -147,17 +146,19 @@
   },
   data() {
     return {
+			checkRadio: null, //单选框选中
+			isManager: false, //是否是物业管理员
 			scrollTop: 0,
       queryList: {
         keywords: "",
         startTime: "",
         endTime: "",
         status: "",
-		offset: this.offset,
-		limit: this.limit
+				offset: this.offset,
+				limit: this.limit
       },
-	  startTimeDefult:Number(new Date()),
-	  endTimeDefult:Number(new Date()),
+			startTimeDefult:Number(new Date()),
+			endTimeDefult:Number(new Date()),
       list: [],
       isExportShow: false,
       ispassShow: false,
@@ -169,11 +170,18 @@
       endTimeShow: false,
       TimeNextShow: false,
       statusShow: false,
-      statusList: [
+      statusListManager: [
         { name: "申请已提交", id: "1" },
         { name: "申请已通过", id: "2" },
         { name: "申请已失败", id: "3" },
+				{ name: "全部", id: "0" },
       ],
+			statusList: [
+			  { name: "申请中", id: "1" },
+			  { name: "申请已通过", id: "2" },
+			  { name: "申请已失败", id: "3" },
+				{ name: "全部", id: "0" },
+			],
       time: "筛选时间",
       isTimeQ: "",
       isTimeZ: "",
@@ -208,19 +216,16 @@
     const curPage = pages[pages.length - 1];
     this.currentPagePath = curPage.route;
     uni.setStorageSync("currentPagePath", this.currentPagePath);
-
     //验证手机号
     this.phone = uni.getStorageSync("registerPhone");
     this.checkphone();
-		
-		
     this.queryList = {
       keywords: "",
       startTime: "",
       endTime: "",
       status: "",
-		offset: this.offset,
-		limit: this.limit
+			offset: this.offset,
+			limit: this.limit
     };
 		const param = {
 			offset: 1,
@@ -230,17 +235,17 @@
     const res = await getList(this.queryList);
     this.list = res.records.map((item) => {
 		item.value = false
-      if (item.visitorApplyStatus == "1") {
-        item.status = "申请已提交";
-        item.color = "blue";
-      } else if (item.visitorApplyStatus == "2") {
-        item.status = "申请已通过";
-        item.color = "green";
-      } else {
-        item.status = "申请未通过";
-        item.color = "red";
-      }
-      return item;
+		if (item.visitorApplyStatus == "1") {
+			item.status = this.isManager ? "申请已提交" : '申请中';
+			item.color = "blue";
+		} else if (item.visitorApplyStatus == "2") {
+			item.status = "申请已通过";
+			item.color = "green";
+		} else {
+			item.status = "申请未通过";
+			item.color = "red";
+		}
+			return item;
     });
   },
   //下拉刷新
@@ -269,7 +274,13 @@
   methods: {
     //选中的数据
     checkboxChange(item) {
-		item.value = !item.value
+			this.checkRadio = deepCopy(item)
+			if(!this.isManager) { //申请者
+				this.list.forEach(item => {
+					item.value = false
+				})
+			}
+			item.value = !item.value
       if (this.checkboxList.indexOf(item) == -1) {
         this.checkboxList.push(item);
       } else {
@@ -280,47 +291,41 @@
     //搜索框发生改变
     async change(e) {
 			this.offset = 1;
-      if (e.trim() === "") {
+      if (e.trim() === "") { //空
 				const param = {
 					offset: this.offset,
 					limit: this.limit
 				}
         const res = await getList(param);
-        return (this.list = res.records.map((item) => {
-          if (item.visitorApplyStatus == "1") {
-            item.status = "申请已提交";
-            item.color = "blue";
-          } else if (item.visitorApplyStatus == "2") {
-            item.status = "申请已通过";
-            item.color = "green";
-          } else {
-            item.status = "申请未通过";
-            item.color = "red";
-          }
-          return item;
-        }));
+				this.list = res.records.map((item) => {
+				  if (item.visitorApplyStatus == "1") {
+				    item.status = this.isManager ? "申请已提交" : '申请中';
+				    item.color = "blue";
+				  } else if (item.visitorApplyStatus == "2") {
+				    item.status = "申请已通过";
+				    item.color = "green";
+				  } else {
+				    item.status = "申请未通过";
+				    item.color = "red";
+				  }
+				  return item;
+				});
       }
-      debounce(this.searchList(false), 10000);
+      debounce(this.searchList(false, true), 10000);
     },
     //确定导出
     async exportClick() {
       const sessionId = uni.getStorageSync("sessionId");
       let filePath = `${wx.env.USER_DATA_PATH}/${+new Date()}.xlsx`;
       let ids = [];
-      ids =
-        this.checkboxList.length === 0
-          ? this.list.map((item) => item.id)
-          : this.checkboxList.map((item) => item.id);
+      ids = this.checkboxList.length === 0 ? this.list.map((item) => item.id) : this.checkboxList.map((item) => item.id);
       uni.request({
         url: 'https://visitor.gd.smartlog.work/visitor/exportMessage',
         responseType: "arraybuffer",
-		method:"POST",
-		data:{
-			ids
-		},
-        header: {
-          token: sessionId, //自定义请求头信息
-        },
+				method:"POST",
+				data: { ids },
+				//自定义请求头信息
+        header: {  token: sessionId },
         success: ({ data }) => {
           let fm = wx.getFileSystemManager();
           fm.writeFile({
@@ -334,12 +339,12 @@
               });
             },
           });
-        },
-      });
+        }
+      })
       this.checkboxList = [];
     },
     //根据条件搜索
-    async searchList(is) {
+    async searchList(is, isFromChange = false) {
 			if(!this.loading) {
 				this.list = [];
 			}
@@ -350,7 +355,7 @@
       const res = await getList(this.queryList);
 			if(res.records && res.records.length) {
 				this.nothingMore = false;
-				const resData = res.records.map((item) => {
+				const resData = res.records.map((item, index) => {
 				  if (item.visitorApplyStatus == "1") {
 				    item.status = "申请已提交";
 				    item.color = "blue";
@@ -363,7 +368,11 @@
 				  }
 				  return item;
 				});
-				this.list = this.list.concat(resData);
+				if(isFromChange) {
+					this.list = resData
+				} else {
+					this.list = this.list.concat(resData);
+				}
 			} else {
 				this.nothingMore = true;
 			}
@@ -373,6 +382,9 @@
 			this.offset = 1;
       this.statusInfo = e.name;
       this.queryList.status = e.id;
+			if(e.id === '0') {
+				this.queryList.status = ''
+			}
       this.searchList(false);
     },
     //打开导出提示框
@@ -382,18 +394,18 @@
       this.ispassShow = true;
     },
     async possQr() {
-	  const statusList = this.checkboxList.length === 0 ? this.list.filter((item) => item.visitorApplyStatus === '1') : this.checkboxList.filter((item) => item.visitorApplyStatus === '1')
-	  let ids = statusList.map((item) => item.id).join();
-	  if( ids === '') {
-		  this.checkboxList = [];
-		  this.ispassShow = false;
-		  this.searchList(false);
-		  return uni.showToast({
-				title: `暂无需要改动状态人员`,
-				icon: 'none',
-				duration: 2000,
-			})
-	  }
+			const statusList = this.checkboxList.length === 0 ? this.list.filter((item) => item.visitorApplyStatus === '1') : this.checkboxList.filter((item) => item.visitorApplyStatus === '1')
+			let ids = statusList.map((item) => item.id).join();
+			if( ids === '') {
+				this.checkboxList = [];
+				this.ispassShow = false;
+				this.searchList(false);
+				return uni.showToast({
+					title: `暂无需要改动状态人员`,
+					icon: 'none',
+					duration: 2000,
+				})
+			}
       let res = await solveStatus(this.leixin == "通过" ? "2" : "3", ids);
       this.searchList(false);
       this.ispassShow = false;
@@ -403,26 +415,34 @@
       this.exportClick();
       this.isExportShow = false;
     },
-    eyeLoock(messageId) {
-      wx.navigateTo({
-        url: `/pages/info/info?messageId=${messageId}`,
-      });
+    //点击查看
+		eyeLoock(messageId, item) {
+			if(this.isManager) {
+				wx.navigateTo({
+				  url: `/pages/info/info?messageId=${messageId}`,
+				});
+			} else {
+				wx.navigateTo({
+					url: '/pagesA/checkListInfo/checkListInfo?form=' + encodeURIComponent(JSON.stringify(item)),
+				})
+			}
     },
     //取消选择时间
     closeTime() {
-	  this.offset = 1;
+			this.offset = 1;
       this.startTimeShow = false;
       this.time = "筛选时间";
       this.queryList = {
-        keywords: "",
+        keywords: this.queryList.keywords,
         startTime: "",
         endTime: "",
-        status: "",
-		offset: this.offset,
-		limit: this.limit
+        status: this.queryList.status,
+				offset: this.offset,
+				limit: this.limit
       };
-	  this.startTimeShow = false;
-	  this.endTimeShow = false;
+			this.startTimeShow = false;
+			this.endTimeShow = false;
+			this.searchList(false)
     },
     //确定选择结束时间
     async confirmEndTime(e) {
@@ -482,7 +502,7 @@
       }
       return value;
     },
-
+		//验证手机号-不通过跳转注册页面
     async checkphone() {
       //有电话就去验证
       if (this.phone) {
@@ -493,7 +513,9 @@
           });
         } else {
           uni.setStorageSync("registerPhone", this.phone);
-          getUserProfile();
+          await getUserProfile(); //获取用户信息
+					const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
+					// this.isManager = userInfo.salt === '物业人员'
         }
       } else {
         //没有电话就弹出授权
@@ -510,9 +532,23 @@
 		  this.loading = true;
 		  await this.searchList(true);
 		  this.loading = false;
-		}
-  },
-};
+		},
+		//跳转申请者信息提交模板页面
+		goSubmitInfo() {
+			if(!this.checkRadio) {
+				wx.showToast({
+					title: '请选中',
+					icon: 'none'
+				});
+				return
+			}
+			wx.navigateTo({
+				url: '/pagesA/submitInfo/submitInfo?form=' + encodeURIComponent(JSON.stringify(this.checkRadio)),
+			})
+			this.checkRadio = null
+		},
+	}
+}
 </script>
 
 <style scoped lang="scss">
@@ -592,25 +628,33 @@
       margin-left: 30rpx;
       width: 210rpx;
       display: flex;
-      justify-content: space-between;
+      justify-content: flex-end;
       align-items: center;
       .close-circle {
         width: 55rpx;
         height: 55rpx;
-        background: url(@/static/listIcon/noNext.png) no-repeat;
+        background: url('@/static/listIcon/template.png') no-repeat;
         background-size: contain;
+				margin-left: 16rpx;
       }
+			.template {
+				width: 55rpx;
+				height: 55rpx;
+				background: url('@/static/listIcon/template.png') no-repeat;
+				background-size: contain;
+			}
       .checkmark-circle {
         width: 55rpx;
         height: 55rpx;
-        background: url(@/static/listIcon/next.png) no-repeat;
+        background: url('@/static/listIcon/next.png') no-repeat;
         background-size: contain;
       }
       .share-square {
         width: 55rpx;
         height: 55rpx;
-        background: url(@/static/listIcon/export.png) no-repeat;
+        background: url('@/static/listIcon/export.png') no-repeat;
         background-size: contain;
+				margin-left: 16rpx;
       }
     }
   }

diff --git a/api/information.js b/api/information.js
index 53cb95e..70d566b 100644
--- a/api/information.js
+++ b/api/information.js
@@ -5,6 +5,7 @@
 const Submit = BASE_URL + '/visitor/apply/submit'
 const visitReason = BASE_URL + '/sys/dict/code/visitReason'
 const devicePosition = BASE_URL + '/sys/dict/code/devicePosition'
+const DEL_APPLY = BASE_URL + 'visitor/delApply'
 
 /**
  * 提交访客记录
@@ -31,4 +32,15 @@
 export function getResourceType(code) {
 	useNetWork();
   return fetch.get(devicePosition).then(res => res);
-}
\ No newline at end of file
+}
+/**
+ * 申请者删除申请
+ * @param {Object} code
+ */
+export function delApply(applyId) {
+	useNetWork();
+	const params = {
+		applyId: applyId
+	}
+  return fetch.get(DEL_APPLY, params).then(res => res);
+}
diff --git a/api/user.js b/api/user.js
index f7690f0..8ed85c8 100644
--- a/api/user.js
+++ b/api/user.js
@@ -35,13 +35,7 @@
  * 注册
  * @param {*}
  */
-export function getUserRegister(data) {
+export function getUserRegister(params) {
   useNetWork();
-  const params = {
-    phone: data.phone,
-    account: data.account,
-    name: data.name,
-    salt: data.salt,
-  };
   return fetch.post(UserRegister, params).then((res) => res);
 }
diff --git a/pages.json b/pages.json
index 4071ebc..092484a 100644
--- a/pages.json
+++ b/pages.json
@@ -1,11 +1,4 @@
 {
-	// "easycom": {
-	// 	// 下载安装的方式需要前面的"@/"，npm安装的方式无需"@/"
-	// 	// 下载安装方式
-	// 	"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
-	// 	// npm安装方式
-	// 	// "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
-	// },
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
 			"path": "pages/index/index",
@@ -39,14 +32,14 @@
 				"onReachBottomDistance": 10
 			}     
     },
-	{
+		{
 			"path" : "pages/information/information",
 			"style" :                                                                                    
 			{
 				"navigationBarTitleText": "访客信息提交",
 				"enablePullDownRefresh": false
 			}     
-	},
+		},
 		{
 			"path" : "pages/list/list",
 			"style" :                                                                                    
@@ -111,39 +104,79 @@
 		"backgroundColor": "#F8F8F8"
 	},
 	"tabBar": {
-		"custom": true,
-		"selectedColor": "#2483b3",
+		// "custom": true,
+		"color": "#7A7E83",
+		"selectedColor": "#c5000a",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
 		// "color": "#ccc",
 		"list": [
 			{
-				"pagePath": "pages/index/index"
+				"pagePath": "pages/index/index",
+				"text": "首页",
+				"iconPath": "static/tabBar/home.png",
+				"selectedIconPath": "/static/tabBar/home_selected.png"
 			},
 			{
-				"pagePath": "pages/message/message"
+				"pagePath": "pages/message/message",
+				"text": "消息",
+				"iconPath": "static/tabBar/message.png",
+				"selectedIconPath": "static/tabBar/message_selected.png"
 			},
 			{
-				"pagePath": "pages/list/list"
+				"pagePath": "pages/list/list",
+				"text": "列表",
+				"iconPath": "static/tabBar/list.png",
+				"selectedIconPath": "static/tabBar/list_selected.png"
 			},
 			{
-				"pagePath": "pages/mine/mine"
+				"pagePath": "pages/mine/mine",
+				"text": "我的",
+				"iconPath": "static/tabBar/mine.png",
+				"selectedIconPath": "static/tabBar/mine_selected.png"
 			}
 		]
 	},
 	"subPackages":[
-	//分包模块
-	{
-	"root" : "pagesA",
-	"pages" : [
-	{
-		"path" : "checkInfo/checkInfo",
-		"style" :                                                                                    
+		//分包模块
 		{
-			"navigationBarTitleText": "",
-			"enablePullDownRefresh": false
+			"root" : "pagesA",
+			"pages" : [
+				{
+					"path" : "checkInfo/checkInfo",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path" : "submitInfo/submitInfo",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "访客信息提交",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path" : "checkListInfo/checkListInfo",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "信息查看",
+						"enablePullDownRefresh": false
+					}
+				}
+			    ,{
+                    "path" : "changeListInfo/changeListInfo",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "",
+                    "enablePullDownRefresh": false
+                }
+                
+                }
+            ]
 		}
-	}
-	]
-	}
 	],
 	"uniIdRouter": {}
 }
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7e9dc36..fdde26f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,7 +1,7 @@
 //首页
 <template>
   <view class="index">
-    <TabBar></TabBar>
+    <!-- <TabBar></TabBar> -->
 		<view class="top">
 			<image src="../../static/logo.png" style="width: 167rpx;height: 150rpx;"></image>
 			<view class="top-title">
@@ -91,30 +91,22 @@
     uni.setStorageSync("currentPagePath", this.currentPagePath);
   },
   methods: {
-    // ...mapMutations(['setNavRect'])
     async handleClick(id) {
-			// subscription();
       this.active = id;
       const sessionId = uni.getStorageSync("sessionId");
       //如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过
       if (!sessionId) {
         await getLogin();
       }
-			// if(id === 'submit') {
-				this.phone = uni.getStorageSync("registerPhone");
-				if (this.phone) {
-				  this.checkphone();
-				} else {
-					//弹获取手机号
-				  this.popShow = true;
-				}
-			// } else {
-			// 	// uni.showToast({
-			// 	// 	title: '敬请期待',
-			// 	// 	icon: 'none'
-			// 	// });
-			// }
+			this.phone = uni.getStorageSync("registerPhone");
+			if (this.phone) {
+				this.checkphone();
+			} else {
+				//弹获取手机号
+				this.popShow = true;
+			}
     },
+		
 		//通过手机号检查是否存在这个用户
     async checkphone() {
       const res = await verifyPhone(this.phone);
@@ -122,25 +114,23 @@
         wx.reLaunch({
           url: "/pages/register/register",
         });
-      } else {
+      } else { // 用户已注册
 				uni.setStorageSync("registerPhone", this.phone);
         await getUserProfile(); //获取人员信息
-				
-			if (uni.getStorageSync("userInfo")) {
-			  const userInfo = JSON.parse(uni.getStorageSync("userInfo"));
-			  this.uid = userInfo.id
-			  if (userInfo.salt === "物业人员") {
-				if(this.active === "submit") {
-					subscription();
-				}
+				if (uni.getStorageSync("userInfo")) {
+					const userInfo = JSON.parse(uni.getStorageSync("userInfo"));
+					this.uid = userInfo.id
+					if (userInfo.salt === "物业人员") {
+					if(this.active === "submit") {
+						subscription();
+					}
 			  } 
 			}
-				
-        if (this.active === "submit") {
-          wx.navigateTo({
-            url: `/pages/information/information?id=${this.active}`,
-          });
-        }else {
+			if (this.active === "submit") {
+				wx.navigateTo({
+					url: `/pages/information/information?id=${this.active}`,
+				});
+			} else {
 			// 判断是否有这个路径
 			const res = await getUserJurisdiction({uid:this.uid})
 			if(res.indexOf('/pages/check/check') !== -1) {
@@ -171,7 +161,8 @@
 	padding: 0 20rpx;
   padding-top: 40rpx;
 	background: linear-gradient(#e7c0c1 0%, #fff 100%);
-  height: 100vh;
+  height: 100%;
+	box-sizing: border-box;
 	z-index: 0;
 	.top {
 		display: flex;
@@ -223,7 +214,7 @@
   }
 	.bottom-img {
 		position: absolute;
-		bottom: 250rpx;
+		bottom: 20rpx;
 		left: 0;
 		width: 100%;
 		height: 220rpx;
diff --git a/pages/information/information.vue b/pages/information/information.vue
index fcf9991..ad0ec91 100644
--- a/pages/information/information.vue
+++ b/pages/information/information.vue
@@ -1,3 +1,4 @@
+<!-- 访客信息提交页面 -->
 <template>
 	<view class="information">
 		<view class="form">
@@ -34,6 +35,9 @@
 				<u-form-item label="申请者名字" borderBottom labelWidth="100">
 					<u--input v-model="callerInfo.staffName" disabled border="none" placeholder="请输入申请者姓名"></u--input>
 				</u-form-item>
+				<u-form-item label="申请者手机号" borderBottom labelWidth="100">
+					<u--input v-model="callerInfo.phone" disabled border="none" placeholder="请输入申请者姓名"></u--input>
+				</u-form-item>
 				<u-form-item label="备注" borderBottom labelWidth="100">
 					<u--input v-model="callerInfo.remarks" border="none" placeholder="请输入备注"></u--input>
 				</u-form-item>
@@ -46,15 +50,37 @@
 					信息提交成功，请等待物业管理员处理。
 				</view>
 			</view>
-			<u-picker :show="show" :columns="columns" @close="show=false" @confirm="getPurpose"></u-picker>
-			<u-picker :show="buildingShow" :columns="buildingColumns" @close="buildingShow=false"
+			<!-- 访问目的 -->
+			<u-picker :show="show" :columns="columns" @cancel="show=false" @confirm="getPurpose"></u-picker>
+			<!-- 访问楼栋 -->
+			<u-picker :show="buildingShow" :columns="buildingColumns" @cancel="buildingShow=false"
 				@confirm="getBuilding">
 			</u-picker>
-			<u-datetime-picker :show="isinTimeShow" v-model="callerInfo.inTime" mode="datetime" title="请选择开始时间"
-				:formatter="formatter"  @cancel="isinTimeShow=false" @change="change" @confirm="closeinTime">
+			<!-- 选择开始时间 -->
+			<u-datetime-picker 
+				:show="isinTimeShow" 
+				v-model="callerInfo.inTime" 
+				mode="datetime" 
+				title="请选择开始时间"
+				:formatter="formatter" 
+				:minDate="inTimeMinDate"
+				:maxDate="inTimeMaxDate"
+				@cancel="isinTimeShow=false" 
+				@change="change" 
+				@confirm="closeinTime">
 			</u-datetime-picker>
-			<u-datetime-picker :show="isTimeShow" v-model="callerInfo.outTime" mode="datetime" title="请选择结束时间"
-				:formatter="formatter"  @cancel="closeTime" @change="change" @confirm="confirmTime">
+			<!-- 选择结束时间 -->
+			<u-datetime-picker 
+				:show="isTimeShow" 
+				v-model="callerInfo.outTime" 
+				mode="datetime" 
+				title="请选择结束时间"
+				:minDate="outTimeMinDate"
+				:maxDate="outTimeMaxDate"
+				:formatter="formatter" 
+				@cancel="closeTime" 
+				@change="change" 
+				@confirm="confirmTime">
 			</u-datetime-picker>
 		</view>
 		<view style="margin-top: 42rpx;">
@@ -67,6 +93,7 @@
 <script>
 	import { getSubmit , getDictCode, getResourceType} from '@/api/information.js'
 	import { subscription } from "@/utils/common.js"
+	import { toHandlerKey } from "vue";
 	export default {
 		data() {
 			return {
@@ -76,11 +103,12 @@
 					visitorPhone: '',
 					visitReason: '',
 					visitPosition: '',
-					inTime: Number(new Date()),
+					inTime: Number(new Date()), //开始时间
 					staffCode: '',
 					staffName: '',
 					remarks: '',
-					outTime: Number(new Date())
+					phone: '', // 申请者手机号
+					outTime: Number(new Date()) //结束时间
 				},
 				rules: {
 					visitorName: [{
@@ -134,18 +162,33 @@
 				buildingShow: false,
 				isinTimeShow: false,
 				columns: [],
-				buildingColumns: []
+				buildingColumns: [],
+				//开始时间最小时间-当前时间
+				inTimeMinDate: new Date(new Date()).getTime(),
+				//开始时间最大时间（一周之内）
+				inTimeMaxDate: new Date(new Date().toLocaleDateString()).getTime()+ 24 * 60 * 60 * 1000 * 7 - 1,
+				//结束时间最小时间（当前时间）
+				outTimeMinDate: new Date(new Date()).getTime(),
+				//结束时间最大时间-默认一周之内
+				outTimeMaxDate: new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 * 7 - 1,
 			}
 		},
+		watch: {
+			//开始时间和结束时间要求是同一天
+			"callerInfo.inTime"(newValue) {
+				this.outTimeMinDate = new Date(newValue).getTime() //结束时间的最小时间是选择的开始时间
+				this.outTimeMaxDate = new Date(new Date(newValue).toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1
+			},
+		},
 		onLoad() {
 			this.callerInfo.inTime = this.shijianc(this.callerInfo.inTime)
 			this.callerInfo.outTime = this.shijianc(this.callerInfo.outTime)
 			const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
 			this.callerInfo.staffCode = userInfo.account
 			this.callerInfo.staffName = userInfo.name
+			this.callerInfo.phone = userInfo.phone
 			this.getDictMap()
 		},
-		
 		mounted() {
 			this.$refs.form1.setRules(this.rules)
 		},
@@ -254,7 +297,7 @@
 		padding: 22rpx;
 
 		.form {
-			padding: 0 32rpx 0;
+			padding: 40rpx 32rpx;
 			border-radius: 10rpx;
 			background-color: #fff;
 		}
diff --git a/pages/list/list.vue b/pages/list/list.vue
index e139fbd..6f84539 100644
--- a/pages/list/list.vue
+++ b/pages/list/list.vue
@@ -1,7 +1,7 @@
-//列表页
+<!-- 列表页 -->
 <template>
   <view class="list">
-    <TabBar></TabBar>
+    <!-- <TabBar></TabBar> -->
     <view class="list-top">
       <u-input
         placeholder="关键字搜索"
@@ -19,18 +19,20 @@
           statusInfo
         }}</text>
         <view class="icon">
-          <text class="checkmark-circle" @click="pass('通过')"></text>
-          <text class="close-circle" @click="pass('拒绝')"></text>
-          <text class="share-square" @click="isExportShow = true"></text>
+          <text v-if="!isManager" class="template" @click="goSubmitInfo"></text>
+          <text v-if="isManager" class="checkmark-circle" @click="pass('通过')"></text>
+          <text v-if="isManager" class="close-circle" @click="pass('拒绝')"></text>
+          <text v-if="isManager" class="share-square" @click="isExportShow = true"></text>
         </view>
       </view>
     </view>
-    <view class="list-content">
+		<view class="list-content">
       <view class="table" v-for="(item, index) in list" :key="index">
         <view class="table-checkbox">
-          <u-checkbox-group >
+					<!-- 复选框 -->
+          <u-checkbox-group>
             <u-checkbox
-			 :checked="item.value"
+			        :checked="item.value"
               @change="checkboxChange(item)"
               shape="circle"
             ></u-checkbox>
@@ -46,8 +48,9 @@
           </view>
         </view>
         <view :class="item.color"> {{ item.status }} </view>
+				<!-- 眼睛图标、查看 -->
         <view class="table-icon">
-          <view class="icon-info" @click="eyeLoock(item.applyNo)"></view>
+          <view class="icon-info" @click="eyeLoock(item.applyNo, item)"></view>
         </view>
       </view>
     </view>
@@ -56,8 +59,7 @@
       mode="bottom"
       :round="10"
       :closeOnClickOverlay="false"
-      @close="close"
-    >
+      @close="close">
       <view class="popup">
 				<view class="title">提示</view>
         <view class="content">
@@ -74,8 +76,7 @@
       mode="bottom"
       :round="10"
       :closeOnClickOverlay="false"
-      @close="close"
-    >
+      @close="close">
       <view class="popup">
 				<view class="title">提示</view>
         <view class="content"> 确定要将{{ text }}的{{ leixin }}? </view>
@@ -90,11 +91,10 @@
       :show="startTimeShow"
       mode="datetime"
       title="请选择开始时间"
-	  v-model="startTimeDefult"
+	    v-model="startTimeDefult"
       :formatter="formatter"
       @cancel="closeTime"
-      @confirm="confirmTime"
-    >
+      @confirm="confirmTime">
     </u-datetime-picker>
 		
     <u-datetime-picker
@@ -102,14 +102,13 @@
       mode="datetime"
       title="请选择结束时间"
       :formatter="formatter"
-	  v-model="endTimeDefult"
+	    v-model="endTimeDefult"
       @cancel="closeTime"
-      @confirm="confirmEndTime"
-    >
+      @confirm="confirmEndTime">
     </u-datetime-picker>
     <u-action-sheet
       :show="statusShow"
-      :actions="statusList"
+      :actions="isManager ? statusListManager : statusList"
       title="请选择状态"
       description="只能单选"
       @close="statusShow = false"
@@ -133,7 +132,7 @@
 <script>
 import TabBar from "@/components/tabBar/tabBar.vue";
 import { getList } from "@/api/list.js";
-import { debounce } from "@/common/utils.js";
+import { debounce, deepCopy } from "@/common/utils.js";
 import { getLastMonth } from "@/common/formatTime.js";
 import { solveStatus } from "@/api/message.js";
 import { verifyPhone } from "@/api/index.js";
@@ -147,17 +146,19 @@
   },
   data() {
     return {
+			checkRadio: null, //单选框选中
+			isManager: false, //是否是物业管理员
 			scrollTop: 0,
       queryList: {
         keywords: "",
         startTime: "",
         endTime: "",
         status: "",
-		offset: this.offset,
-		limit: this.limit
+				offset: this.offset,
+				limit: this.limit
       },
-	  startTimeDefult:Number(new Date()),
-	  endTimeDefult:Number(new Date()),
+			startTimeDefult:Number(new Date()),
+			endTimeDefult:Number(new Date()),
       list: [],
       isExportShow: false,
       ispassShow: false,
@@ -169,11 +170,18 @@
       endTimeShow: false,
       TimeNextShow: false,
       statusShow: false,
-      statusList: [
+      statusListManager: [
         { name: "申请已提交", id: "1" },
         { name: "申请已通过", id: "2" },
         { name: "申请已失败", id: "3" },
+				{ name: "全部", id: "0" },
       ],
+			statusList: [
+			  { name: "申请中", id: "1" },
+			  { name: "申请已通过", id: "2" },
+			  { name: "申请已失败", id: "3" },
+				{ name: "全部", id: "0" },
+			],
       time: "筛选时间",
       isTimeQ: "",
       isTimeZ: "",
@@ -208,19 +216,16 @@
     const curPage = pages[pages.length - 1];
     this.currentPagePath = curPage.route;
     uni.setStorageSync("currentPagePath", this.currentPagePath);
-
     //验证手机号
     this.phone = uni.getStorageSync("registerPhone");
     this.checkphone();
-		
-		
     this.queryList = {
       keywords: "",
       startTime: "",
       endTime: "",
       status: "",
-		offset: this.offset,
-		limit: this.limit
+			offset: this.offset,
+			limit: this.limit
     };
 		const param = {
 			offset: 1,
@@ -230,17 +235,17 @@
     const res = await getList(this.queryList);
     this.list = res.records.map((item) => {
 		item.value = false
-      if (item.visitorApplyStatus == "1") {
-        item.status = "申请已提交";
-        item.color = "blue";
-      } else if (item.visitorApplyStatus == "2") {
-        item.status = "申请已通过";
-        item.color = "green";
-      } else {
-        item.status = "申请未通过";
-        item.color = "red";
-      }
-      return item;
+		if (item.visitorApplyStatus == "1") {
+			item.status = this.isManager ? "申请已提交" : '申请中';
+			item.color = "blue";
+		} else if (item.visitorApplyStatus == "2") {
+			item.status = "申请已通过";
+			item.color = "green";
+		} else {
+			item.status = "申请未通过";
+			item.color = "red";
+		}
+			return item;
     });
   },
   //下拉刷新
@@ -269,7 +274,13 @@
   methods: {
     //选中的数据
     checkboxChange(item) {
-		item.value = !item.value
+			this.checkRadio = deepCopy(item)
+			if(!this.isManager) { //申请者
+				this.list.forEach(item => {
+					item.value = false
+				})
+			}
+			item.value = !item.value
       if (this.checkboxList.indexOf(item) == -1) {
         this.checkboxList.push(item);
       } else {
@@ -280,47 +291,41 @@
     //搜索框发生改变
     async change(e) {
 			this.offset = 1;
-      if (e.trim() === "") {
+      if (e.trim() === "") { //空
 				const param = {
 					offset: this.offset,
 					limit: this.limit
 				}
         const res = await getList(param);
-        return (this.list = res.records.map((item) => {
-          if (item.visitorApplyStatus == "1") {
-            item.status = "申请已提交";
-            item.color = "blue";
-          } else if (item.visitorApplyStatus == "2") {
-            item.status = "申请已通过";
-            item.color = "green";
-          } else {
-            item.status = "申请未通过";
-            item.color = "red";
-          }
-          return item;
-        }));
+				this.list = res.records.map((item) => {
+				  if (item.visitorApplyStatus == "1") {
+				    item.status = this.isManager ? "申请已提交" : '申请中';
+				    item.color = "blue";
+				  } else if (item.visitorApplyStatus == "2") {
+				    item.status = "申请已通过";
+				    item.color = "green";
+				  } else {
+				    item.status = "申请未通过";
+				    item.color = "red";
+				  }
+				  return item;
+				});
       }
-      debounce(this.searchList(false), 10000);
+      debounce(this.searchList(false, true), 10000);
     },
     //确定导出
     async exportClick() {
       const sessionId = uni.getStorageSync("sessionId");
       let filePath = `${wx.env.USER_DATA_PATH}/${+new Date()}.xlsx`;
       let ids = [];
-      ids =
-        this.checkboxList.length === 0
-          ? this.list.map((item) => item.id)
-          : this.checkboxList.map((item) => item.id);
+      ids = this.checkboxList.length === 0 ? this.list.map((item) => item.id) : this.checkboxList.map((item) => item.id);
       uni.request({
         url: 'https://visitor.gd.smartlog.work/visitor/exportMessage',
         responseType: "arraybuffer",
-		method:"POST",
-		data:{
-			ids
-		},
-        header: {
-          token: sessionId, //自定义请求头信息
-        },
+				method:"POST",
+				data: { ids },
+				//自定义请求头信息
+        header: {  token: sessionId },
         success: ({ data }) => {
           let fm = wx.getFileSystemManager();
           fm.writeFile({
@@ -334,12 +339,12 @@
               });
             },
           });
-        },
-      });
+        }
+      })
       this.checkboxList = [];
     },
     //根据条件搜索
-    async searchList(is) {
+    async searchList(is, isFromChange = false) {
 			if(!this.loading) {
 				this.list = [];
 			}
@@ -350,7 +355,7 @@
       const res = await getList(this.queryList);
 			if(res.records && res.records.length) {
 				this.nothingMore = false;
-				const resData = res.records.map((item) => {
+				const resData = res.records.map((item, index) => {
 				  if (item.visitorApplyStatus == "1") {
 				    item.status = "申请已提交";
 				    item.color = "blue";
@@ -363,7 +368,11 @@
 				  }
 				  return item;
 				});
-				this.list = this.list.concat(resData);
+				if(isFromChange) {
+					this.list = resData
+				} else {
+					this.list = this.list.concat(resData);
+				}
 			} else {
 				this.nothingMore = true;
 			}
@@ -373,6 +382,9 @@
 			this.offset = 1;
       this.statusInfo = e.name;
       this.queryList.status = e.id;
+			if(e.id === '0') {
+				this.queryList.status = ''
+			}
       this.searchList(false);
     },
     //打开导出提示框
@@ -382,18 +394,18 @@
       this.ispassShow = true;
     },
     async possQr() {
-	  const statusList = this.checkboxList.length === 0 ? this.list.filter((item) => item.visitorApplyStatus === '1') : this.checkboxList.filter((item) => item.visitorApplyStatus === '1')
-	  let ids = statusList.map((item) => item.id).join();
-	  if( ids === '') {
-		  this.checkboxList = [];
-		  this.ispassShow = false;
-		  this.searchList(false);
-		  return uni.showToast({
-				title: `暂无需要改动状态人员`,
-				icon: 'none',
-				duration: 2000,
-			})
-	  }
+			const statusList = this.checkboxList.length === 0 ? this.list.filter((item) => item.visitorApplyStatus === '1') : this.checkboxList.filter((item) => item.visitorApplyStatus === '1')
+			let ids = statusList.map((item) => item.id).join();
+			if( ids === '') {
+				this.checkboxList = [];
+				this.ispassShow = false;
+				this.searchList(false);
+				return uni.showToast({
+					title: `暂无需要改动状态人员`,
+					icon: 'none',
+					duration: 2000,
+				})
+			}
       let res = await solveStatus(this.leixin == "通过" ? "2" : "3", ids);
       this.searchList(false);
       this.ispassShow = false;
@@ -403,26 +415,34 @@
       this.exportClick();
       this.isExportShow = false;
     },
-    eyeLoock(messageId) {
-      wx.navigateTo({
-        url: `/pages/info/info?messageId=${messageId}`,
-      });
+    //点击查看
+		eyeLoock(messageId, item) {
+			if(this.isManager) {
+				wx.navigateTo({
+				  url: `/pages/info/info?messageId=${messageId}`,
+				});
+			} else {
+				wx.navigateTo({
+					url: '/pagesA/checkListInfo/checkListInfo?form=' + encodeURIComponent(JSON.stringify(item)),
+				})
+			}
     },
     //取消选择时间
     closeTime() {
-	  this.offset = 1;
+			this.offset = 1;
       this.startTimeShow = false;
       this.time = "筛选时间";
       this.queryList = {
-        keywords: "",
+        keywords: this.queryList.keywords,
         startTime: "",
         endTime: "",
-        status: "",
-		offset: this.offset,
-		limit: this.limit
+        status: this.queryList.status,
+				offset: this.offset,
+				limit: this.limit
       };
-	  this.startTimeShow = false;
-	  this.endTimeShow = false;
+			this.startTimeShow = false;
+			this.endTimeShow = false;
+			this.searchList(false)
     },
     //确定选择结束时间
     async confirmEndTime(e) {
@@ -482,7 +502,7 @@
       }
       return value;
     },
-
+		//验证手机号-不通过跳转注册页面
     async checkphone() {
       //有电话就去验证
       if (this.phone) {
@@ -493,7 +513,9 @@
           });
         } else {
           uni.setStorageSync("registerPhone", this.phone);
-          getUserProfile();
+          await getUserProfile(); //获取用户信息
+					const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
+					// this.isManager = userInfo.salt === '物业人员'
         }
       } else {
         //没有电话就弹出授权
@@ -510,9 +532,23 @@
 		  this.loading = true;
 		  await this.searchList(true);
 		  this.loading = false;
-		}
-  },
-};
+		},
+		//跳转申请者信息提交模板页面
+		goSubmitInfo() {
+			if(!this.checkRadio) {
+				wx.showToast({
+					title: '请选中',
+					icon: 'none'
+				});
+				return
+			}
+			wx.navigateTo({
+				url: '/pagesA/submitInfo/submitInfo?form=' + encodeURIComponent(JSON.stringify(this.checkRadio)),
+			})
+			this.checkRadio = null
+		},
+	}
+}
 </script>
 
 <style scoped lang="scss">
@@ -592,25 +628,33 @@
       margin-left: 30rpx;
       width: 210rpx;
       display: flex;
-      justify-content: space-between;
+      justify-content: flex-end;
       align-items: center;
       .close-circle {
         width: 55rpx;
         height: 55rpx;
-        background: url(@/static/listIcon/noNext.png) no-repeat;
+        background: url('@/static/listIcon/template.png') no-repeat;
         background-size: contain;
+				margin-left: 16rpx;
       }
+			.template {
+				width: 55rpx;
+				height: 55rpx;
+				background: url('@/static/listIcon/template.png') no-repeat;
+				background-size: contain;
+			}
       .checkmark-circle {
         width: 55rpx;
         height: 55rpx;
-        background: url(@/static/listIcon/next.png) no-repeat;
+        background: url('@/static/listIcon/next.png') no-repeat;
         background-size: contain;
       }
       .share-square {
         width: 55rpx;
         height: 55rpx;
-        background: url(@/static/listIcon/export.png) no-repeat;
+        background: url('@/static/listIcon/export.png') no-repeat;
         background-size: contain;
+				margin-left: 16rpx;
       }
     }
   }
diff --git a/pages/message/message.vue b/pages/message/message.vue
index 4fd4cb3..0372e4f 100644
--- a/pages/message/message.vue
+++ b/pages/message/message.vue
@@ -1,7 +1,19 @@
 <!-- 消息 -->
 <template>
   <view class="message">
-    <TabBar></TabBar>
+    <!-- <TabBar></TabBar> -->
+		<u-empty 
+			:show="!list.length" 
+			mode="coupon"  
+			width="300"
+			height="260"
+			text="暂无消息"
+			iconColor="#ff7b7c"
+			textColor="#333"
+			textSize="18"
+			icon="http://cdn.uviewui.com/uview/empty/coupon.png"
+			marginTop="20">
+		</u-empty>
     <view class="main" v-for="(item, index) in list" :key="index">
       <view class="date-time">{{ item.messageTime }}</view>
       <view class="card" @click="clickDetail(item.id)">
@@ -14,16 +26,9 @@
               <text class="number">{{ item.number }}</text>
             </view>
 
-            <view
-              :class="
-                item.status === '未通过'
-                  ? 'button-area'
-                  : item.status === '已通过'
-                  ? 'button-area pass'
-                  : 'button-area submit'
-              "
-              >申请{{ item.status }}</view
-            >
+            <view :class=" item.status === '未通过' ? 'button-area' : item.status === '已通过' ? 'button-area pass' : 'button-area submit'">
+							申请{{ item.status }}
+						</view>
           </view>
           <view class="ui-time">
             <text class="start">{{ item.startTime }}</text>
@@ -52,7 +57,7 @@
 
    <!-- 获取手机号popup组件 -->
    <GetPhonePopup :popShow="popShow" @closePop="closePop" @refresh="refresh"/>
-	 <LoadingList :loading="loading" :nothingMore="nothingMore" />
+	 <LoadingList :loading="loading" :nothingMore="nothingMore && list.length" />
 	 
 	 <!-- 返回顶部 -->
 	 <u-back-top 

diff --git a/api/information.js b/api/information.js
index 53cb95e..70d566b 100644
--- a/api/information.js
+++ b/api/information.js
@@ -5,6 +5,7 @@
 const Submit = BASE_URL + '/visitor/apply/submit'
 const visitReason = BASE_URL + '/sys/dict/code/visitReason'
 const devicePosition = BASE_URL + '/sys/dict/code/devicePosition'
+const DEL_APPLY = BASE_URL + 'visitor/delApply'
 
 /**
  * 提交访客记录
@@ -31,4 +32,15 @@
 export function getResourceType(code) {
 	useNetWork();
   return fetch.get(devicePosition).then(res => res);
-}
\ No newline at end of file
+}
+/**
+ * 申请者删除申请
+ * @param {Object} code
+ */
+export function delApply(applyId) {
+	useNetWork();
+	const params = {
+		applyId: applyId
+	}
+  return fetch.get(DEL_APPLY, params).then(res => res);
+}
diff --git a/api/user.js b/api/user.js
index f7690f0..8ed85c8 100644
--- a/api/user.js
+++ b/api/user.js
@@ -35,13 +35,7 @@
  * 注册
  * @param {*}
  */
-export function getUserRegister(data) {
+export function getUserRegister(params) {
   useNetWork();
-  const params = {
-    phone: data.phone,
-    account: data.account,
-    name: data.name,
-    salt: data.salt,
-  };
   return fetch.post(UserRegister, params).then((res) => res);
 }
diff --git a/pages.json b/pages.json
index 4071ebc..092484a 100644
--- a/pages.json
+++ b/pages.json
@@ -1,11 +1,4 @@
 {
-	// "easycom": {
-	// 	// 下载安装的方式需要前面的"@/"，npm安装的方式无需"@/"
-	// 	// 下载安装方式
-	// 	"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
-	// 	// npm安装方式
-	// 	// "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
-	// },
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
 			"path": "pages/index/index",
@@ -39,14 +32,14 @@
 				"onReachBottomDistance": 10
 			}     
     },
-	{
+		{
 			"path" : "pages/information/information",
 			"style" :                                                                                    
 			{
 				"navigationBarTitleText": "访客信息提交",
 				"enablePullDownRefresh": false
 			}     
-	},
+		},
 		{
 			"path" : "pages/list/list",
 			"style" :                                                                                    
@@ -111,39 +104,79 @@
 		"backgroundColor": "#F8F8F8"
 	},
 	"tabBar": {
-		"custom": true,
-		"selectedColor": "#2483b3",
+		// "custom": true,
+		"color": "#7A7E83",
+		"selectedColor": "#c5000a",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
 		// "color": "#ccc",
 		"list": [
 			{
-				"pagePath": "pages/index/index"
+				"pagePath": "pages/index/index",
+				"text": "首页",
+				"iconPath": "static/tabBar/home.png",
+				"selectedIconPath": "/static/tabBar/home_selected.png"
 			},
 			{
-				"pagePath": "pages/message/message"
+				"pagePath": "pages/message/message",
+				"text": "消息",
+				"iconPath": "static/tabBar/message.png",
+				"selectedIconPath": "static/tabBar/message_selected.png"
 			},
 			{
-				"pagePath": "pages/list/list"
+				"pagePath": "pages/list/list",
+				"text": "列表",
+				"iconPath": "static/tabBar/list.png",
+				"selectedIconPath": "static/tabBar/list_selected.png"
 			},
 			{
-				"pagePath": "pages/mine/mine"
+				"pagePath": "pages/mine/mine",
+				"text": "我的",
+				"iconPath": "static/tabBar/mine.png",
+				"selectedIconPath": "static/tabBar/mine_selected.png"
 			}
 		]
 	},
 	"subPackages":[
-	//分包模块
-	{
-	"root" : "pagesA",
-	"pages" : [
-	{
-		"path" : "checkInfo/checkInfo",
-		"style" :                                                                                    
+		//分包模块
 		{
-			"navigationBarTitleText": "",
-			"enablePullDownRefresh": false
+			"root" : "pagesA",
+			"pages" : [
+				{
+					"path" : "checkInfo/checkInfo",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path" : "submitInfo/submitInfo",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "访客信息提交",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path" : "checkListInfo/checkListInfo",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "信息查看",
+						"enablePullDownRefresh": false
+					}
+				}
+			    ,{
+                    "path" : "changeListInfo/changeListInfo",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "",
+                    "enablePullDownRefresh": false
+                }
+                
+                }
+            ]
 		}
-	}
-	]
-	}
 	],
 	"uniIdRouter": {}
 }
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7e9dc36..fdde26f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,7 +1,7 @@
 //首页
 <template>
   <view class="index">
-    <TabBar></TabBar>
+    <!-- <TabBar></TabBar> -->
 		<view class="top">
 			<image src="../../static/logo.png" style="width: 167rpx;height: 150rpx;"></image>
 			<view class="top-title">
@@ -91,30 +91,22 @@
     uni.setStorageSync("currentPagePath", this.currentPagePath);
   },
   methods: {
-    // ...mapMutations(['setNavRect'])
     async handleClick(id) {
-			// subscription();
       this.active = id;
       const sessionId = uni.getStorageSync("sessionId");
       //如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过
       if (!sessionId) {
         await getLogin();
       }
-			// if(id === 'submit') {
-				this.phone = uni.getStorageSync("registerPhone");
-				if (this.phone) {
-				  this.checkphone();
-				} else {
-					//弹获取手机号
-				  this.popShow = true;
-				}
-			// } else {
-			// 	// uni.showToast({
-			// 	// 	title: '敬请期待',
-			// 	// 	icon: 'none'
-			// 	// });
-			// }
+			this.phone = uni.getStorageSync("registerPhone");
+			if (this.phone) {
+				this.checkphone();
+			} else {
+				//弹获取手机号
+				this.popShow = true;
+			}
     },
+		
 		//通过手机号检查是否存在这个用户
     async checkphone() {
       const res = await verifyPhone(this.phone);
@@ -122,25 +114,23 @@
         wx.reLaunch({
           url: "/pages/register/register",
         });
-      } else {
+      } else { // 用户已注册
 				uni.setStorageSync("registerPhone", this.phone);
         await getUserProfile(); //获取人员信息
-				
-			if (uni.getStorageSync("userInfo")) {
-			  const userInfo = JSON.parse(uni.getStorageSync("userInfo"));
-			  this.uid = userInfo.id
-			  if (userInfo.salt === "物业人员") {
-				if(this.active === "submit") {
-					subscription();
-				}
+				if (uni.getStorageSync("userInfo")) {
+					const userInfo = JSON.parse(uni.getStorageSync("userInfo"));
+					this.uid = userInfo.id
+					if (userInfo.salt === "物业人员") {
+					if(this.active === "submit") {
+						subscription();
+					}
 			  } 
 			}
-				
-        if (this.active === "submit") {
-          wx.navigateTo({
-            url: `/pages/information/information?id=${this.active}`,
-          });
-        }else {
+			if (this.active === "submit") {
+				wx.navigateTo({
+					url: `/pages/information/information?id=${this.active}`,
+				});
+			} else {
 			// 判断是否有这个路径
 			const res = await getUserJurisdiction({uid:this.uid})
 			if(res.indexOf('/pages/check/check') !== -1) {
@@ -171,7 +161,8 @@
 	padding: 0 20rpx;
   padding-top: 40rpx;
 	background: linear-gradient(#e7c0c1 0%, #fff 100%);
-  height: 100vh;
+  height: 100%;
+	box-sizing: border-box;
 	z-index: 0;
 	.top {
 		display: flex;
@@ -223,7 +214,7 @@
   }
 	.bottom-img {
 		position: absolute;
-		bottom: 250rpx;
+		bottom: 20rpx;
 		left: 0;
 		width: 100%;
 		height: 220rpx;
diff --git a/pages/information/information.vue b/pages/information/information.vue
index fcf9991..ad0ec91 100644
--- a/pages/information/information.vue
+++ b/pages/information/information.vue
@@ -1,3 +1,4 @@
+<!-- 访客信息提交页面 -->
 <template>
 	<view class="information">
 		<view class="form">
@@ -34,6 +35,9 @@
 				<u-form-item label="申请者名字" borderBottom labelWidth="100">
 					<u--input v-model="callerInfo.staffName" disabled border="none" placeholder="请输入申请者姓名"></u--input>
 				</u-form-item>
+				<u-form-item label="申请者手机号" borderBottom labelWidth="100">
+					<u--input v-model="callerInfo.phone" disabled border="none" placeholder="请输入申请者姓名"></u--input>
+				</u-form-item>
 				<u-form-item label="备注" borderBottom labelWidth="100">
 					<u--input v-model="callerInfo.remarks" border="none" placeholder="请输入备注"></u--input>
 				</u-form-item>
@@ -46,15 +50,37 @@
 					信息提交成功，请等待物业管理员处理。
 				</view>
 			</view>
-			<u-picker :show="show" :columns="columns" @close="show=false" @confirm="getPurpose"></u-picker>
-			<u-picker :show="buildingShow" :columns="buildingColumns" @close="buildingShow=false"
+			<!-- 访问目的 -->
+			<u-picker :show="show" :columns="columns" @cancel="show=false" @confirm="getPurpose"></u-picker>
+			<!-- 访问楼栋 -->
+			<u-picker :show="buildingShow" :columns="buildingColumns" @cancel="buildingShow=false"
 				@confirm="getBuilding">
 			</u-picker>
-			<u-datetime-picker :show="isinTimeShow" v-model="callerInfo.inTime" mode="datetime" title="请选择开始时间"
-				:formatter="formatter"  @cancel="isinTimeShow=false" @change="change" @confirm="closeinTime">
+			<!-- 选择开始时间 -->
+			<u-datetime-picker 
+				:show="isinTimeShow" 
+				v-model="callerInfo.inTime" 
+				mode="datetime" 
+				title="请选择开始时间"
+				:formatter="formatter" 
+				:minDate="inTimeMinDate"
+				:maxDate="inTimeMaxDate"
+				@cancel="isinTimeShow=false" 
+				@change="change" 
+				@confirm="closeinTime">
 			</u-datetime-picker>
-			<u-datetime-picker :show="isTimeShow" v-model="callerInfo.outTime" mode="datetime" title="请选择结束时间"
-				:formatter="formatter"  @cancel="closeTime" @change="change" @confirm="confirmTime">
+			<!-- 选择结束时间 -->
+			<u-datetime-picker 
+				:show="isTimeShow" 
+				v-model="callerInfo.outTime" 
+				mode="datetime" 
+				title="请选择结束时间"
+				:minDate="outTimeMinDate"
+				:maxDate="outTimeMaxDate"
+				:formatter="formatter" 
+				@cancel="closeTime" 
+				@change="change" 
+				@confirm="confirmTime">
 			</u-datetime-picker>
 		</view>
 		<view style="margin-top: 42rpx;">
@@ -67,6 +93,7 @@
 <script>
 	import { getSubmit , getDictCode, getResourceType} from '@/api/information.js'
 	import { subscription } from "@/utils/common.js"
+	import { toHandlerKey } from "vue";
 	export default {
 		data() {
 			return {
@@ -76,11 +103,12 @@
 					visitorPhone: '',
 					visitReason: '',
 					visitPosition: '',
-					inTime: Number(new Date()),
+					inTime: Number(new Date()), //开始时间
 					staffCode: '',
 					staffName: '',
 					remarks: '',
-					outTime: Number(new Date())
+					phone: '', // 申请者手机号
+					outTime: Number(new Date()) //结束时间
 				},
 				rules: {
 					visitorName: [{
@@ -134,18 +162,33 @@
 				buildingShow: false,
 				isinTimeShow: false,
 				columns: [],
-				buildingColumns: []
+				buildingColumns: [],
+				//开始时间最小时间-当前时间
+				inTimeMinDate: new Date(new Date()).getTime(),
+				//开始时间最大时间（一周之内）
+				inTimeMaxDate: new Date(new Date().toLocaleDateString()).getTime()+ 24 * 60 * 60 * 1000 * 7 - 1,
+				//结束时间最小时间（当前时间）
+				outTimeMinDate: new Date(new Date()).getTime(),
+				//结束时间最大时间-默认一周之内
+				outTimeMaxDate: new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 * 7 - 1,
 			}
 		},
+		watch: {
+			//开始时间和结束时间要求是同一天
+			"callerInfo.inTime"(newValue) {
+				this.outTimeMinDate = new Date(newValue).getTime() //结束时间的最小时间是选择的开始时间
+				this.outTimeMaxDate = new Date(new Date(newValue).toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1
+			},
+		},
 		onLoad() {
 			this.callerInfo.inTime = this.shijianc(this.callerInfo.inTime)
 			this.callerInfo.outTime = this.shijianc(this.callerInfo.outTime)
 			const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
 			this.callerInfo.staffCode = userInfo.account
 			this.callerInfo.staffName = userInfo.name
+			this.callerInfo.phone = userInfo.phone
 			this.getDictMap()
 		},
-		
 		mounted() {
 			this.$refs.form1.setRules(this.rules)
 		},
@@ -254,7 +297,7 @@
 		padding: 22rpx;
 
 		.form {
-			padding: 0 32rpx 0;
+			padding: 40rpx 32rpx;
 			border-radius: 10rpx;
 			background-color: #fff;
 		}
diff --git a/pages/list/list.vue b/pages/list/list.vue
index e139fbd..6f84539 100644
--- a/pages/list/list.vue
+++ b/pages/list/list.vue
@@ -1,7 +1,7 @@
-//列表页
+<!-- 列表页 -->
 <template>
   <view class="list">
-    <TabBar></TabBar>
+    <!-- <TabBar></TabBar> -->
     <view class="list-top">
       <u-input
         placeholder="关键字搜索"
@@ -19,18 +19,20 @@
           statusInfo
         }}</text>
         <view class="icon">
-          <text class="checkmark-circle" @click="pass('通过')"></text>
-          <text class="close-circle" @click="pass('拒绝')"></text>
-          <text class="share-square" @click="isExportShow = true"></text>
+          <text v-if="!isManager" class="template" @click="goSubmitInfo"></text>
+          <text v-if="isManager" class="checkmark-circle" @click="pass('通过')"></text>
+          <text v-if="isManager" class="close-circle" @click="pass('拒绝')"></text>
+          <text v-if="isManager" class="share-square" @click="isExportShow = true"></text>
         </view>
       </view>
     </view>
-    <view class="list-content">
+		<view class="list-content">
       <view class="table" v-for="(item, index) in list" :key="index">
         <view class="table-checkbox">
-          <u-checkbox-group >
+					<!-- 复选框 -->
+          <u-checkbox-group>
             <u-checkbox
-			 :checked="item.value"
+			        :checked="item.value"
               @change="checkboxChange(item)"
               shape="circle"
             ></u-checkbox>
@@ -46,8 +48,9 @@
           </view>
         </view>
         <view :class="item.color"> {{ item.status }} </view>
+				<!-- 眼睛图标、查看 -->
         <view class="table-icon">
-          <view class="icon-info" @click="eyeLoock(item.applyNo)"></view>
+          <view class="icon-info" @click="eyeLoock(item.applyNo, item)"></view>
         </view>
       </view>
     </view>
@@ -56,8 +59,7 @@
       mode="bottom"
       :round="10"
       :closeOnClickOverlay="false"
-      @close="close"
-    >
+      @close="close">
       <view class="popup">
 				<view class="title">提示</view>
         <view class="content">
@@ -74,8 +76,7 @@
       mode="bottom"
       :round="10"
       :closeOnClickOverlay="false"
-      @close="close"
-    >
+      @close="close">
       <view class="popup">
 				<view class="title">提示</view>
         <view class="content"> 确定要将{{ text }}的{{ leixin }}? </view>
@@ -90,11 +91,10 @@
       :show="startTimeShow"
       mode="datetime"
       title="请选择开始时间"
-	  v-model="startTimeDefult"
+	    v-model="startTimeDefult"
       :formatter="formatter"
       @cancel="closeTime"
-      @confirm="confirmTime"
-    >
+      @confirm="confirmTime">
     </u-datetime-picker>
 		
     <u-datetime-picker
@@ -102,14 +102,13 @@
       mode="datetime"
       title="请选择结束时间"
       :formatter="formatter"
-	  v-model="endTimeDefult"
+	    v-model="endTimeDefult"
       @cancel="closeTime"
-      @confirm="confirmEndTime"
-    >
+      @confirm="confirmEndTime">
     </u-datetime-picker>
     <u-action-sheet
       :show="statusShow"
-      :actions="statusList"
+      :actions="isManager ? statusListManager : statusList"
       title="请选择状态"
       description="只能单选"
       @close="statusShow = false"
@@ -133,7 +132,7 @@
 <script>
 import TabBar from "@/components/tabBar/tabBar.vue";
 import { getList } from "@/api/list.js";
-import { debounce } from "@/common/utils.js";
+import { debounce, deepCopy } from "@/common/utils.js";
 import { getLastMonth } from "@/common/formatTime.js";
 import { solveStatus } from "@/api/message.js";
 import { verifyPhone } from "@/api/index.js";
@@ -147,17 +146,19 @@
   },
   data() {
     return {
+			checkRadio: null, //单选框选中
+			isManager: false, //是否是物业管理员
 			scrollTop: 0,
       queryList: {
         keywords: "",
         startTime: "",
         endTime: "",
         status: "",
-		offset: this.offset,
-		limit: this.limit
+				offset: this.offset,
+				limit: this.limit
       },
-	  startTimeDefult:Number(new Date()),
-	  endTimeDefult:Number(new Date()),
+			startTimeDefult:Number(new Date()),
+			endTimeDefult:Number(new Date()),
       list: [],
       isExportShow: false,
       ispassShow: false,
@@ -169,11 +170,18 @@
       endTimeShow: false,
       TimeNextShow: false,
       statusShow: false,
-      statusList: [
+      statusListManager: [
         { name: "申请已提交", id: "1" },
         { name: "申请已通过", id: "2" },
         { name: "申请已失败", id: "3" },
+				{ name: "全部", id: "0" },
       ],
+			statusList: [
+			  { name: "申请中", id: "1" },
+			  { name: "申请已通过", id: "2" },
+			  { name: "申请已失败", id: "3" },
+				{ name: "全部", id: "0" },
+			],
       time: "筛选时间",
       isTimeQ: "",
       isTimeZ: "",
@@ -208,19 +216,16 @@
     const curPage = pages[pages.length - 1];
     this.currentPagePath = curPage.route;
     uni.setStorageSync("currentPagePath", this.currentPagePath);
-
     //验证手机号
     this.phone = uni.getStorageSync("registerPhone");
     this.checkphone();
-		
-		
     this.queryList = {
       keywords: "",
       startTime: "",
       endTime: "",
       status: "",
-		offset: this.offset,
-		limit: this.limit
+			offset: this.offset,
+			limit: this.limit
     };
 		const param = {
 			offset: 1,
@@ -230,17 +235,17 @@
     const res = await getList(this.queryList);
     this.list = res.records.map((item) => {
 		item.value = false
-      if (item.visitorApplyStatus == "1") {
-        item.status = "申请已提交";
-        item.color = "blue";
-      } else if (item.visitorApplyStatus == "2") {
-        item.status = "申请已通过";
-        item.color = "green";
-      } else {
-        item.status = "申请未通过";
-        item.color = "red";
-      }
-      return item;
+		if (item.visitorApplyStatus == "1") {
+			item.status = this.isManager ? "申请已提交" : '申请中';
+			item.color = "blue";
+		} else if (item.visitorApplyStatus == "2") {
+			item.status = "申请已通过";
+			item.color = "green";
+		} else {
+			item.status = "申请未通过";
+			item.color = "red";
+		}
+			return item;
     });
   },
   //下拉刷新
@@ -269,7 +274,13 @@
   methods: {
     //选中的数据
     checkboxChange(item) {
-		item.value = !item.value
+			this.checkRadio = deepCopy(item)
+			if(!this.isManager) { //申请者
+				this.list.forEach(item => {
+					item.value = false
+				})
+			}
+			item.value = !item.value
       if (this.checkboxList.indexOf(item) == -1) {
         this.checkboxList.push(item);
       } else {
@@ -280,47 +291,41 @@
     //搜索框发生改变
     async change(e) {
 			this.offset = 1;
-      if (e.trim() === "") {
+      if (e.trim() === "") { //空
 				const param = {
 					offset: this.offset,
 					limit: this.limit
 				}
         const res = await getList(param);
-        return (this.list = res.records.map((item) => {
-          if (item.visitorApplyStatus == "1") {
-            item.status = "申请已提交";
-            item.color = "blue";
-          } else if (item.visitorApplyStatus == "2") {
-            item.status = "申请已通过";
-            item.color = "green";
-          } else {
-            item.status = "申请未通过";
-            item.color = "red";
-          }
-          return item;
-        }));
+				this.list = res.records.map((item) => {
+				  if (item.visitorApplyStatus == "1") {
+				    item.status = this.isManager ? "申请已提交" : '申请中';
+				    item.color = "blue";
+				  } else if (item.visitorApplyStatus == "2") {
+				    item.status = "申请已通过";
+				    item.color = "green";
+				  } else {
+				    item.status = "申请未通过";
+				    item.color = "red";
+				  }
+				  return item;
+				});
       }
-      debounce(this.searchList(false), 10000);
+      debounce(this.searchList(false, true), 10000);
     },
     //确定导出
     async exportClick() {
       const sessionId = uni.getStorageSync("sessionId");
       let filePath = `${wx.env.USER_DATA_PATH}/${+new Date()}.xlsx`;
       let ids = [];
-      ids =
-        this.checkboxList.length === 0
-          ? this.list.map((item) => item.id)
-          : this.checkboxList.map((item) => item.id);
+      ids = this.checkboxList.length === 0 ? this.list.map((item) => item.id) : this.checkboxList.map((item) => item.id);
       uni.request({
         url: 'https://visitor.gd.smartlog.work/visitor/exportMessage',
         responseType: "arraybuffer",
-		method:"POST",
-		data:{
-			ids
-		},
-        header: {
-          token: sessionId, //自定义请求头信息
-        },
+				method:"POST",
+				data: { ids },
+				//自定义请求头信息
+        header: {  token: sessionId },
         success: ({ data }) => {
           let fm = wx.getFileSystemManager();
           fm.writeFile({
@@ -334,12 +339,12 @@
               });
             },
           });
-        },
-      });
+        }
+      })
       this.checkboxList = [];
     },
     //根据条件搜索
-    async searchList(is) {
+    async searchList(is, isFromChange = false) {
 			if(!this.loading) {
 				this.list = [];
 			}
@@ -350,7 +355,7 @@
       const res = await getList(this.queryList);
 			if(res.records && res.records.length) {
 				this.nothingMore = false;
-				const resData = res.records.map((item) => {
+				const resData = res.records.map((item, index) => {
 				  if (item.visitorApplyStatus == "1") {
 				    item.status = "申请已提交";
 				    item.color = "blue";
@@ -363,7 +368,11 @@
 				  }
 				  return item;
 				});
-				this.list = this.list.concat(resData);
+				if(isFromChange) {
+					this.list = resData
+				} else {
+					this.list = this.list.concat(resData);
+				}
 			} else {
 				this.nothingMore = true;
 			}
@@ -373,6 +382,9 @@
 			this.offset = 1;
       this.statusInfo = e.name;
       this.queryList.status = e.id;
+			if(e.id === '0') {
+				this.queryList.status = ''
+			}
       this.searchList(false);
     },
     //打开导出提示框
@@ -382,18 +394,18 @@
       this.ispassShow = true;
     },
     async possQr() {
-	  const statusList = this.checkboxList.length === 0 ? this.list.filter((item) => item.visitorApplyStatus === '1') : this.checkboxList.filter((item) => item.visitorApplyStatus === '1')
-	  let ids = statusList.map((item) => item.id).join();
-	  if( ids === '') {
-		  this.checkboxList = [];
-		  this.ispassShow = false;
-		  this.searchList(false);
-		  return uni.showToast({
-				title: `暂无需要改动状态人员`,
-				icon: 'none',
-				duration: 2000,
-			})
-	  }
+			const statusList = this.checkboxList.length === 0 ? this.list.filter((item) => item.visitorApplyStatus === '1') : this.checkboxList.filter((item) => item.visitorApplyStatus === '1')
+			let ids = statusList.map((item) => item.id).join();
+			if( ids === '') {
+				this.checkboxList = [];
+				this.ispassShow = false;
+				this.searchList(false);
+				return uni.showToast({
+					title: `暂无需要改动状态人员`,
+					icon: 'none',
+					duration: 2000,
+				})
+			}
       let res = await solveStatus(this.leixin == "通过" ? "2" : "3", ids);
       this.searchList(false);
       this.ispassShow = false;
@@ -403,26 +415,34 @@
       this.exportClick();
       this.isExportShow = false;
     },
-    eyeLoock(messageId) {
-      wx.navigateTo({
-        url: `/pages/info/info?messageId=${messageId}`,
-      });
+    //点击查看
+		eyeLoock(messageId, item) {
+			if(this.isManager) {
+				wx.navigateTo({
+				  url: `/pages/info/info?messageId=${messageId}`,
+				});
+			} else {
+				wx.navigateTo({
+					url: '/pagesA/checkListInfo/checkListInfo?form=' + encodeURIComponent(JSON.stringify(item)),
+				})
+			}
     },
     //取消选择时间
     closeTime() {
-	  this.offset = 1;
+			this.offset = 1;
       this.startTimeShow = false;
       this.time = "筛选时间";
       this.queryList = {
-        keywords: "",
+        keywords: this.queryList.keywords,
         startTime: "",
         endTime: "",
-        status: "",
-		offset: this.offset,
-		limit: this.limit
+        status: this.queryList.status,
+				offset: this.offset,
+				limit: this.limit
       };
-	  this.startTimeShow = false;
-	  this.endTimeShow = false;
+			this.startTimeShow = false;
+			this.endTimeShow = false;
+			this.searchList(false)
     },
     //确定选择结束时间
     async confirmEndTime(e) {
@@ -482,7 +502,7 @@
       }
       return value;
     },
-
+		//验证手机号-不通过跳转注册页面
     async checkphone() {
       //有电话就去验证
       if (this.phone) {
@@ -493,7 +513,9 @@
           });
         } else {
           uni.setStorageSync("registerPhone", this.phone);
-          getUserProfile();
+          await getUserProfile(); //获取用户信息
+					const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
+					// this.isManager = userInfo.salt === '物业人员'
         }
       } else {
         //没有电话就弹出授权
@@ -510,9 +532,23 @@
 		  this.loading = true;
 		  await this.searchList(true);
 		  this.loading = false;
-		}
-  },
-};
+		},
+		//跳转申请者信息提交模板页面
+		goSubmitInfo() {
+			if(!this.checkRadio) {
+				wx.showToast({
+					title: '请选中',
+					icon: 'none'
+				});
+				return
+			}
+			wx.navigateTo({
+				url: '/pagesA/submitInfo/submitInfo?form=' + encodeURIComponent(JSON.stringify(this.checkRadio)),
+			})
+			this.checkRadio = null
+		},
+	}
+}
 </script>
 
 <style scoped lang="scss">
@@ -592,25 +628,33 @@
       margin-left: 30rpx;
       width: 210rpx;
       display: flex;
-      justify-content: space-between;
+      justify-content: flex-end;
       align-items: center;
       .close-circle {
         width: 55rpx;
         height: 55rpx;
-        background: url(@/static/listIcon/noNext.png) no-repeat;
+        background: url('@/static/listIcon/template.png') no-repeat;
         background-size: contain;
+				margin-left: 16rpx;
       }
+			.template {
+				width: 55rpx;
+				height: 55rpx;
+				background: url('@/static/listIcon/template.png') no-repeat;
+				background-size: contain;
+			}
       .checkmark-circle {
         width: 55rpx;
         height: 55rpx;
-        background: url(@/static/listIcon/next.png) no-repeat;
+        background: url('@/static/listIcon/next.png') no-repeat;
         background-size: contain;
       }
       .share-square {
         width: 55rpx;
         height: 55rpx;
-        background: url(@/static/listIcon/export.png) no-repeat;
+        background: url('@/static/listIcon/export.png') no-repeat;
         background-size: contain;
+				margin-left: 16rpx;
       }
     }
   }
diff --git a/pages/message/message.vue b/pages/message/message.vue
index 4fd4cb3..0372e4f 100644
--- a/pages/message/message.vue
+++ b/pages/message/message.vue
@@ -1,7 +1,19 @@
 <!-- 消息 -->
 <template>
   <view class="message">
-    <TabBar></TabBar>
+    <!-- <TabBar></TabBar> -->
+		<u-empty 
+			:show="!list.length" 
+			mode="coupon"  
+			width="300"
+			height="260"
+			text="暂无消息"
+			iconColor="#ff7b7c"
+			textColor="#333"
+			textSize="18"
+			icon="http://cdn.uviewui.com/uview/empty/coupon.png"
+			marginTop="20">
+		</u-empty>
     <view class="main" v-for="(item, index) in list" :key="index">
       <view class="date-time">{{ item.messageTime }}</view>
       <view class="card" @click="clickDetail(item.id)">
@@ -14,16 +26,9 @@
               <text class="number">{{ item.number }}</text>
             </view>
 
-            <view
-              :class="
-                item.status === '未通过'
-                  ? 'button-area'
-                  : item.status === '已通过'
-                  ? 'button-area pass'
-                  : 'button-area submit'
-              "
-              >申请{{ item.status }}</view
-            >
+            <view :class=" item.status === '未通过' ? 'button-area' : item.status === '已通过' ? 'button-area pass' : 'button-area submit'">
+							申请{{ item.status }}
+						</view>
           </view>
           <view class="ui-time">
             <text class="start">{{ item.startTime }}</text>
@@ -52,7 +57,7 @@
 
    <!-- 获取手机号popup组件 -->
    <GetPhonePopup :popShow="popShow" @closePop="closePop" @refresh="refresh"/>
-	 <LoadingList :loading="loading" :nothingMore="nothingMore" />
+	 <LoadingList :loading="loading" :nothingMore="nothingMore && list.length" />
 	 
 	 <!-- 返回顶部 -->
 	 <u-back-top 
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index 7309d58..289a682 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -1,7 +1,7 @@
 /** * 我的 */
 <template>
   <view class="mine">
-    <TabBar></TabBar>
+    <!-- <TabBar></TabBar> -->
 		<view class="image-area">
 			<u-avatar :src="img" size='80'></u-avatar>
 		</view>
@@ -50,8 +50,8 @@
 					value: ''
 				},
 				{
-					id: 'type',
-					name: '员工类型',
+					id: 'documentTypeName',
+					name: '证件类型',
 					value: ''
 				},
 				{
@@ -135,7 +135,7 @@
 			this.img = userInfo.avatar;
 			console.log('头像url', this.img)
 			this.id = userInfo.id;
-			//物业人员0，安保人员1，正式员工2
+			//证件类型：1工作证 、 2出入证
 			this.$set(this.list, 0,  {
 					id: 'number',
 					name: '员工号',
@@ -147,9 +147,9 @@
 					value: userInfo.name
 			});
 			this.$set(this.list, 2,  {
-					id: 'type',
-					name: '员工类型',
-					value: userInfo.salt
+					id: 'documentTypeName',
+					name: '证件类型',
+					value: userInfo.documentTypeName
 			});
 			this.$set(this.list, 3,  {
 					id: 'phone',

diff --git a/api/information.js b/api/information.js
index 53cb95e..70d566b 100644
--- a/api/information.js
+++ b/api/information.js
@@ -5,6 +5,7 @@
 const Submit = BASE_URL + '/visitor/apply/submit'
 const visitReason = BASE_URL + '/sys/dict/code/visitReason'
 const devicePosition = BASE_URL + '/sys/dict/code/devicePosition'
+const DEL_APPLY = BASE_URL + 'visitor/delApply'
 
 /**
  * 提交访客记录
@@ -31,4 +32,15 @@
 export function getResourceType(code) {
 	useNetWork();
   return fetch.get(devicePosition).then(res => res);
-}
\ No newline at end of file
+}
+/**
+ * 申请者删除申请
+ * @param {Object} code
+ */
+export function delApply(applyId) {
+	useNetWork();
+	const params = {
+		applyId: applyId
+	}
+  return fetch.get(DEL_APPLY, params).then(res => res);
+}
diff --git a/api/user.js b/api/user.js
index f7690f0..8ed85c8 100644
--- a/api/user.js
+++ b/api/user.js
@@ -35,13 +35,7 @@
  * 注册
  * @param {*}
  */
-export function getUserRegister(data) {
+export function getUserRegister(params) {
   useNetWork();
-  const params = {
-    phone: data.phone,
-    account: data.account,
-    name: data.name,
-    salt: data.salt,
-  };
   return fetch.post(UserRegister, params).then((res) => res);
 }
diff --git a/pages.json b/pages.json
index 4071ebc..092484a 100644
--- a/pages.json
+++ b/pages.json
@@ -1,11 +1,4 @@
 {
-	// "easycom": {
-	// 	// 下载安装的方式需要前面的"@/"，npm安装的方式无需"@/"
-	// 	// 下载安装方式
-	// 	"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
-	// 	// npm安装方式
-	// 	// "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
-	// },
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
 			"path": "pages/index/index",
@@ -39,14 +32,14 @@
 				"onReachBottomDistance": 10
 			}     
     },
-	{
+		{
 			"path" : "pages/information/information",
 			"style" :                                                                                    
 			{
 				"navigationBarTitleText": "访客信息提交",
 				"enablePullDownRefresh": false
 			}     
-	},
+		},
 		{
 			"path" : "pages/list/list",
 			"style" :                                                                                    
@@ -111,39 +104,79 @@
 		"backgroundColor": "#F8F8F8"
 	},
 	"tabBar": {
-		"custom": true,
-		"selectedColor": "#2483b3",
+		// "custom": true,
+		"color": "#7A7E83",
+		"selectedColor": "#c5000a",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
 		// "color": "#ccc",
 		"list": [
 			{
-				"pagePath": "pages/index/index"
+				"pagePath": "pages/index/index",
+				"text": "首页",
+				"iconPath": "static/tabBar/home.png",
+				"selectedIconPath": "/static/tabBar/home_selected.png"
 			},
 			{
-				"pagePath": "pages/message/message"
+				"pagePath": "pages/message/message",
+				"text": "消息",
+				"iconPath": "static/tabBar/message.png",
+				"selectedIconPath": "static/tabBar/message_selected.png"
 			},
 			{
-				"pagePath": "pages/list/list"
+				"pagePath": "pages/list/list",
+				"text": "列表",
+				"iconPath": "static/tabBar/list.png",
+				"selectedIconPath": "static/tabBar/list_selected.png"
 			},
 			{
-				"pagePath": "pages/mine/mine"
+				"pagePath": "pages/mine/mine",
+				"text": "我的",
+				"iconPath": "static/tabBar/mine.png",
+				"selectedIconPath": "static/tabBar/mine_selected.png"
 			}
 		]
 	},
 	"subPackages":[
-	//分包模块
-	{
-	"root" : "pagesA",
-	"pages" : [
-	{
-		"path" : "checkInfo/checkInfo",
-		"style" :                                                                                    
+		//分包模块
 		{
-			"navigationBarTitleText": "",
-			"enablePullDownRefresh": false
+			"root" : "pagesA",
+			"pages" : [
+				{
+					"path" : "checkInfo/checkInfo",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path" : "submitInfo/submitInfo",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "访客信息提交",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path" : "checkListInfo/checkListInfo",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "信息查看",
+						"enablePullDownRefresh": false
+					}
+				}
+			    ,{
+                    "path" : "changeListInfo/changeListInfo",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "",
+                    "enablePullDownRefresh": false
+                }
+                
+                }
+            ]
 		}
-	}
-	]
-	}
 	],
 	"uniIdRouter": {}
 }
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7e9dc36..fdde26f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,7 +1,7 @@
 //首页
 <template>
   <view class="index">
-    <TabBar></TabBar>
+    <!-- <TabBar></TabBar> -->
 		<view class="top">
 			<image src="../../static/logo.png" style="width: 167rpx;height: 150rpx;"></image>
 			<view class="top-title">
@@ -91,30 +91,22 @@
     uni.setStorageSync("currentPagePath", this.currentPagePath);
   },
   methods: {
-    // ...mapMutations(['setNavRect'])
     async handleClick(id) {
-			// subscription();
       this.active = id;
       const sessionId = uni.getStorageSync("sessionId");
       //如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过
       if (!sessionId) {
         await getLogin();
       }
-			// if(id === 'submit') {
-				this.phone = uni.getStorageSync("registerPhone");
-				if (this.phone) {
-				  this.checkphone();
-				} else {
-					//弹获取手机号
-				  this.popShow = true;
-				}
-			// } else {
-			// 	// uni.showToast({
-			// 	// 	title: '敬请期待',
-			// 	// 	icon: 'none'
-			// 	// });
-			// }
+			this.phone = uni.getStorageSync("registerPhone");
+			if (this.phone) {
+				this.checkphone();
+			} else {
+				//弹获取手机号
+				this.popShow = true;
+			}
     },
+		
 		//通过手机号检查是否存在这个用户
     async checkphone() {
       const res = await verifyPhone(this.phone);
@@ -122,25 +114,23 @@
         wx.reLaunch({
           url: "/pages/register/register",
         });
-      } else {
+      } else { // 用户已注册
 				uni.setStorageSync("registerPhone", this.phone);
         await getUserProfile(); //获取人员信息
-				
-			if (uni.getStorageSync("userInfo")) {
-			  const userInfo = JSON.parse(uni.getStorageSync("userInfo"));
-			  this.uid = userInfo.id
-			  if (userInfo.salt === "物业人员") {
-				if(this.active === "submit") {
-					subscription();
-				}
+				if (uni.getStorageSync("userInfo")) {
+					const userInfo = JSON.parse(uni.getStorageSync("userInfo"));
+					this.uid = userInfo.id
+					if (userInfo.salt === "物业人员") {
+					if(this.active === "submit") {
+						subscription();
+					}
 			  } 
 			}
-				
-        if (this.active === "submit") {
-          wx.navigateTo({
-            url: `/pages/information/information?id=${this.active}`,
-          });
-        }else {
+			if (this.active === "submit") {
+				wx.navigateTo({
+					url: `/pages/information/information?id=${this.active}`,
+				});
+			} else {
 			// 判断是否有这个路径
 			const res = await getUserJurisdiction({uid:this.uid})
 			if(res.indexOf('/pages/check/check') !== -1) {
@@ -171,7 +161,8 @@
 	padding: 0 20rpx;
   padding-top: 40rpx;
 	background: linear-gradient(#e7c0c1 0%, #fff 100%);
-  height: 100vh;
+  height: 100%;
+	box-sizing: border-box;
 	z-index: 0;
 	.top {
 		display: flex;
@@ -223,7 +214,7 @@
   }
 	.bottom-img {
 		position: absolute;
-		bottom: 250rpx;
+		bottom: 20rpx;
 		left: 0;
 		width: 100%;
 		height: 220rpx;
diff --git a/pages/information/information.vue b/pages/information/information.vue
index fcf9991..ad0ec91 100644
--- a/pages/information/information.vue
+++ b/pages/information/information.vue
@@ -1,3 +1,4 @@
+<!-- 访客信息提交页面 -->
 <template>
 	<view class="information">
 		<view class="form">
@@ -34,6 +35,9 @@
 				<u-form-item label="申请者名字" borderBottom labelWidth="100">
 					<u--input v-model="callerInfo.staffName" disabled border="none" placeholder="请输入申请者姓名"></u--input>
 				</u-form-item>
+				<u-form-item label="申请者手机号" borderBottom labelWidth="100">
+					<u--input v-model="callerInfo.phone" disabled border="none" placeholder="请输入申请者姓名"></u--input>
+				</u-form-item>
 				<u-form-item label="备注" borderBottom labelWidth="100">
 					<u--input v-model="callerInfo.remarks" border="none" placeholder="请输入备注"></u--input>
 				</u-form-item>
@@ -46,15 +50,37 @@
 					信息提交成功，请等待物业管理员处理。
 				</view>
 			</view>
-			<u-picker :show="show" :columns="columns" @close="show=false" @confirm="getPurpose"></u-picker>
-			<u-picker :show="buildingShow" :columns="buildingColumns" @close="buildingShow=false"
+			<!-- 访问目的 -->
+			<u-picker :show="show" :columns="columns" @cancel="show=false" @confirm="getPurpose"></u-picker>
+			<!-- 访问楼栋 -->
+			<u-picker :show="buildingShow" :columns="buildingColumns" @cancel="buildingShow=false"
 				@confirm="getBuilding">
 			</u-picker>
-			<u-datetime-picker :show="isinTimeShow" v-model="callerInfo.inTime" mode="datetime" title="请选择开始时间"
-				:formatter="formatter"  @cancel="isinTimeShow=false" @change="change" @confirm="closeinTime">
+			<!-- 选择开始时间 -->
+			<u-datetime-picker 
+				:show="isinTimeShow" 
+				v-model="callerInfo.inTime" 
+				mode="datetime" 
+				title="请选择开始时间"
+				:formatter="formatter" 
+				:minDate="inTimeMinDate"
+				:maxDate="inTimeMaxDate"
+				@cancel="isinTimeShow=false" 
+				@change="change" 
+				@confirm="closeinTime">
 			</u-datetime-picker>
-			<u-datetime-picker :show="isTimeShow" v-model="callerInfo.outTime" mode="datetime" title="请选择结束时间"
-				:formatter="formatter"  @cancel="closeTime" @change="change" @confirm="confirmTime">
+			<!-- 选择结束时间 -->
+			<u-datetime-picker 
+				:show="isTimeShow" 
+				v-model="callerInfo.outTime" 
+				mode="datetime" 
+				title="请选择结束时间"
+				:minDate="outTimeMinDate"
+				:maxDate="outTimeMaxDate"
+				:formatter="formatter" 
+				@cancel="closeTime" 
+				@change="change" 
+				@confirm="confirmTime">
 			</u-datetime-picker>
 		</view>
 		<view style="margin-top: 42rpx;">
@@ -67,6 +93,7 @@
 <script>
 	import { getSubmit , getDictCode, getResourceType} from '@/api/information.js'
 	import { subscription } from "@/utils/common.js"
+	import { toHandlerKey } from "vue";
 	export default {
 		data() {
 			return {
@@ -76,11 +103,12 @@
 					visitorPhone: '',
 					visitReason: '',
 					visitPosition: '',
-					inTime: Number(new Date()),
+					inTime: Number(new Date()), //开始时间
 					staffCode: '',
 					staffName: '',
 					remarks: '',
-					outTime: Number(new Date())
+					phone: '', // 申请者手机号
+					outTime: Number(new Date()) //结束时间
 				},
 				rules: {
 					visitorName: [{
@@ -134,18 +162,33 @@
 				buildingShow: false,
 				isinTimeShow: false,
 				columns: [],
-				buildingColumns: []
+				buildingColumns: [],
+				//开始时间最小时间-当前时间
+				inTimeMinDate: new Date(new Date()).getTime(),
+				//开始时间最大时间（一周之内）
+				inTimeMaxDate: new Date(new Date().toLocaleDateString()).getTime()+ 24 * 60 * 60 * 1000 * 7 - 1,
+				//结束时间最小时间（当前时间）
+				outTimeMinDate: new Date(new Date()).getTime(),
+				//结束时间最大时间-默认一周之内
+				outTimeMaxDate: new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 * 7 - 1,
 			}
 		},
+		watch: {
+			//开始时间和结束时间要求是同一天
+			"callerInfo.inTime"(newValue) {
+				this.outTimeMinDate = new Date(newValue).getTime() //结束时间的最小时间是选择的开始时间
+				this.outTimeMaxDate = new Date(new Date(newValue).toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1
+			},
+		},
 		onLoad() {
 			this.callerInfo.inTime = this.shijianc(this.callerInfo.inTime)
 			this.callerInfo.outTime = this.shijianc(this.callerInfo.outTime)
 			const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
 			this.callerInfo.staffCode = userInfo.account
 			this.callerInfo.staffName = userInfo.name
+			this.callerInfo.phone = userInfo.phone
 			this.getDictMap()
 		},
-		
 		mounted() {
 			this.$refs.form1.setRules(this.rules)
 		},
@@ -254,7 +297,7 @@
 		padding: 22rpx;
 
 		.form {
-			padding: 0 32rpx 0;
+			padding: 40rpx 32rpx;
 			border-radius: 10rpx;
 			background-color: #fff;
 		}
diff --git a/pages/list/list.vue b/pages/list/list.vue
index e139fbd..6f84539 100644
--- a/pages/list/list.vue
+++ b/pages/list/list.vue
@@ -1,7 +1,7 @@
-//列表页
+<!-- 列表页 -->
 <template>
   <view class="list">
-    <TabBar></TabBar>
+    <!-- <TabBar></TabBar> -->
     <view class="list-top">
       <u-input
         placeholder="关键字搜索"
@@ -19,18 +19,20 @@
           statusInfo
         }}</text>
         <view class="icon">
-          <text class="checkmark-circle" @click="pass('通过')"></text>
-          <text class="close-circle" @click="pass('拒绝')"></text>
-          <text class="share-square" @click="isExportShow = true"></text>
+          <text v-if="!isManager" class="template" @click="goSubmitInfo"></text>
+          <text v-if="isManager" class="checkmark-circle" @click="pass('通过')"></text>
+          <text v-if="isManager" class="close-circle" @click="pass('拒绝')"></text>
+          <text v-if="isManager" class="share-square" @click="isExportShow = true"></text>
         </view>
       </view>
     </view>
-    <view class="list-content">
+		<view class="list-content">
       <view class="table" v-for="(item, index) in list" :key="index">
         <view class="table-checkbox">
-          <u-checkbox-group >
+					<!-- 复选框 -->
+          <u-checkbox-group>
             <u-checkbox
-			 :checked="item.value"
+			        :checked="item.value"
               @change="checkboxChange(item)"
               shape="circle"
             ></u-checkbox>
@@ -46,8 +48,9 @@
           </view>
         </view>
         <view :class="item.color"> {{ item.status }} </view>
+				<!-- 眼睛图标、查看 -->
         <view class="table-icon">
-          <view class="icon-info" @click="eyeLoock(item.applyNo)"></view>
+          <view class="icon-info" @click="eyeLoock(item.applyNo, item)"></view>
         </view>
       </view>
     </view>
@@ -56,8 +59,7 @@
       mode="bottom"
       :round="10"
       :closeOnClickOverlay="false"
-      @close="close"
-    >
+      @close="close">
       <view class="popup">
 				<view class="title">提示</view>
         <view class="content">
@@ -74,8 +76,7 @@
       mode="bottom"
       :round="10"
       :closeOnClickOverlay="false"
-      @close="close"
-    >
+      @close="close">
       <view class="popup">
 				<view class="title">提示</view>
         <view class="content"> 确定要将{{ text }}的{{ leixin }}? </view>
@@ -90,11 +91,10 @@
       :show="startTimeShow"
       mode="datetime"
       title="请选择开始时间"
-	  v-model="startTimeDefult"
+	    v-model="startTimeDefult"
       :formatter="formatter"
       @cancel="closeTime"
-      @confirm="confirmTime"
-    >
+      @confirm="confirmTime">
     </u-datetime-picker>
 		
     <u-datetime-picker
@@ -102,14 +102,13 @@
       mode="datetime"
       title="请选择结束时间"
       :formatter="formatter"
-	  v-model="endTimeDefult"
+	    v-model="endTimeDefult"
       @cancel="closeTime"
-      @confirm="confirmEndTime"
-    >
+      @confirm="confirmEndTime">
     </u-datetime-picker>
     <u-action-sheet
       :show="statusShow"
-      :actions="statusList"
+      :actions="isManager ? statusListManager : statusList"
       title="请选择状态"
       description="只能单选"
       @close="statusShow = false"
@@ -133,7 +132,7 @@
 <script>
 import TabBar from "@/components/tabBar/tabBar.vue";
 import { getList } from "@/api/list.js";
-import { debounce } from "@/common/utils.js";
+import { debounce, deepCopy } from "@/common/utils.js";
 import { getLastMonth } from "@/common/formatTime.js";
 import { solveStatus } from "@/api/message.js";
 import { verifyPhone } from "@/api/index.js";
@@ -147,17 +146,19 @@
   },
   data() {
     return {
+			checkRadio: null, //单选框选中
+			isManager: false, //是否是物业管理员
 			scrollTop: 0,
       queryList: {
         keywords: "",
         startTime: "",
         endTime: "",
         status: "",
-		offset: this.offset,
-		limit: this.limit
+				offset: this.offset,
+				limit: this.limit
       },
-	  startTimeDefult:Number(new Date()),
-	  endTimeDefult:Number(new Date()),
+			startTimeDefult:Number(new Date()),
+			endTimeDefult:Number(new Date()),
       list: [],
       isExportShow: false,
       ispassShow: false,
@@ -169,11 +170,18 @@
       endTimeShow: false,
       TimeNextShow: false,
       statusShow: false,
-      statusList: [
+      statusListManager: [
         { name: "申请已提交", id: "1" },
         { name: "申请已通过", id: "2" },
         { name: "申请已失败", id: "3" },
+				{ name: "全部", id: "0" },
       ],
+			statusList: [
+			  { name: "申请中", id: "1" },
+			  { name: "申请已通过", id: "2" },
+			  { name: "申请已失败", id: "3" },
+				{ name: "全部", id: "0" },
+			],
       time: "筛选时间",
       isTimeQ: "",
       isTimeZ: "",
@@ -208,19 +216,16 @@
     const curPage = pages[pages.length - 1];
     this.currentPagePath = curPage.route;
     uni.setStorageSync("currentPagePath", this.currentPagePath);
-
     //验证手机号
     this.phone = uni.getStorageSync("registerPhone");
     this.checkphone();
-		
-		
     this.queryList = {
       keywords: "",
       startTime: "",
       endTime: "",
       status: "",
-		offset: this.offset,
-		limit: this.limit
+			offset: this.offset,
+			limit: this.limit
     };
 		const param = {
 			offset: 1,
@@ -230,17 +235,17 @@
     const res = await getList(this.queryList);
     this.list = res.records.map((item) => {
 		item.value = false
-      if (item.visitorApplyStatus == "1") {
-        item.status = "申请已提交";
-        item.color = "blue";
-      } else if (item.visitorApplyStatus == "2") {
-        item.status = "申请已通过";
-        item.color = "green";
-      } else {
-        item.status = "申请未通过";
-        item.color = "red";
-      }
-      return item;
+		if (item.visitorApplyStatus == "1") {
+			item.status = this.isManager ? "申请已提交" : '申请中';
+			item.color = "blue";
+		} else if (item.visitorApplyStatus == "2") {
+			item.status = "申请已通过";
+			item.color = "green";
+		} else {
+			item.status = "申请未通过";
+			item.color = "red";
+		}
+			return item;
     });
   },
   //下拉刷新
@@ -269,7 +274,13 @@
   methods: {
     //选中的数据
     checkboxChange(item) {
-		item.value = !item.value
+			this.checkRadio = deepCopy(item)
+			if(!this.isManager) { //申请者
+				this.list.forEach(item => {
+					item.value = false
+				})
+			}
+			item.value = !item.value
       if (this.checkboxList.indexOf(item) == -1) {
         this.checkboxList.push(item);
       } else {
@@ -280,47 +291,41 @@
     //搜索框发生改变
     async change(e) {
 			this.offset = 1;
-      if (e.trim() === "") {
+      if (e.trim() === "") { //空
 				const param = {
 					offset: this.offset,
 					limit: this.limit
 				}
         const res = await getList(param);
-        return (this.list = res.records.map((item) => {
-          if (item.visitorApplyStatus == "1") {
-            item.status = "申请已提交";
-            item.color = "blue";
-          } else if (item.visitorApplyStatus == "2") {
-            item.status = "申请已通过";
-            item.color = "green";
-          } else {
-            item.status = "申请未通过";
-            item.color = "red";
-          }
-          return item;
-        }));
+				this.list = res.records.map((item) => {
+				  if (item.visitorApplyStatus == "1") {
+				    item.status = this.isManager ? "申请已提交" : '申请中';
+				    item.color = "blue";
+				  } else if (item.visitorApplyStatus == "2") {
+				    item.status = "申请已通过";
+				    item.color = "green";
+				  } else {
+				    item.status = "申请未通过";
+				    item.color = "red";
+				  }
+				  return item;
+				});
       }
-      debounce(this.searchList(false), 10000);
+      debounce(this.searchList(false, true), 10000);
     },
     //确定导出
     async exportClick() {
       const sessionId = uni.getStorageSync("sessionId");
       let filePath = `${wx.env.USER_DATA_PATH}/${+new Date()}.xlsx`;
       let ids = [];
-      ids =
-        this.checkboxList.length === 0
-          ? this.list.map((item) => item.id)
-          : this.checkboxList.map((item) => item.id);
+      ids = this.checkboxList.length === 0 ? this.list.map((item) => item.id) : this.checkboxList.map((item) => item.id);
       uni.request({
         url: 'https://visitor.gd.smartlog.work/visitor/exportMessage',
         responseType: "arraybuffer",
-		method:"POST",
-		data:{
-			ids
-		},
-        header: {
-          token: sessionId, //自定义请求头信息
-        },
+				method:"POST",
+				data: { ids },
+				//自定义请求头信息
+        header: {  token: sessionId },
         success: ({ data }) => {
           let fm = wx.getFileSystemManager();
           fm.writeFile({
@@ -334,12 +339,12 @@
               });
             },
           });
-        },
-      });
+        }
+      })
       this.checkboxList = [];
     },
     //根据条件搜索
-    async searchList(is) {
+    async searchList(is, isFromChange = false) {
 			if(!this.loading) {
 				this.list = [];
 			}
@@ -350,7 +355,7 @@
       const res = await getList(this.queryList);
 			if(res.records && res.records.length) {
 				this.nothingMore = false;
-				const resData = res.records.map((item) => {
+				const resData = res.records.map((item, index) => {
 				  if (item.visitorApplyStatus == "1") {
 				    item.status = "申请已提交";
 				    item.color = "blue";
@@ -363,7 +368,11 @@
 				  }
 				  return item;
 				});
-				this.list = this.list.concat(resData);
+				if(isFromChange) {
+					this.list = resData
+				} else {
+					this.list = this.list.concat(resData);
+				}
 			} else {
 				this.nothingMore = true;
 			}
@@ -373,6 +382,9 @@
 			this.offset = 1;
       this.statusInfo = e.name;
       this.queryList.status = e.id;
+			if(e.id === '0') {
+				this.queryList.status = ''
+			}
       this.searchList(false);
     },
     //打开导出提示框
@@ -382,18 +394,18 @@
       this.ispassShow = true;
     },
     async possQr() {
-	  const statusList = this.checkboxList.length === 0 ? this.list.filter((item) => item.visitorApplyStatus === '1') : this.checkboxList.filter((item) => item.visitorApplyStatus === '1')
-	  let ids = statusList.map((item) => item.id).join();
-	  if( ids === '') {
-		  this.checkboxList = [];
-		  this.ispassShow = false;
-		  this.searchList(false);
-		  return uni.showToast({
-				title: `暂无需要改动状态人员`,
-				icon: 'none',
-				duration: 2000,
-			})
-	  }
+			const statusList = this.checkboxList.length === 0 ? this.list.filter((item) => item.visitorApplyStatus === '1') : this.checkboxList.filter((item) => item.visitorApplyStatus === '1')
+			let ids = statusList.map((item) => item.id).join();
+			if( ids === '') {
+				this.checkboxList = [];
+				this.ispassShow = false;
+				this.searchList(false);
+				return uni.showToast({
+					title: `暂无需要改动状态人员`,
+					icon: 'none',
+					duration: 2000,
+				})
+			}
       let res = await solveStatus(this.leixin == "通过" ? "2" : "3", ids);
       this.searchList(false);
       this.ispassShow = false;
@@ -403,26 +415,34 @@
       this.exportClick();
       this.isExportShow = false;
     },
-    eyeLoock(messageId) {
-      wx.navigateTo({
-        url: `/pages/info/info?messageId=${messageId}`,
-      });
+    //点击查看
+		eyeLoock(messageId, item) {
+			if(this.isManager) {
+				wx.navigateTo({
+				  url: `/pages/info/info?messageId=${messageId}`,
+				});
+			} else {
+				wx.navigateTo({
+					url: '/pagesA/checkListInfo/checkListInfo?form=' + encodeURIComponent(JSON.stringify(item)),
+				})
+			}
     },
     //取消选择时间
     closeTime() {
-	  this.offset = 1;
+			this.offset = 1;
       this.startTimeShow = false;
       this.time = "筛选时间";
       this.queryList = {
-        keywords: "",
+        keywords: this.queryList.keywords,
         startTime: "",
         endTime: "",
-        status: "",
-		offset: this.offset,
-		limit: this.limit
+        status: this.queryList.status,
+				offset: this.offset,
+				limit: this.limit
       };
-	  this.startTimeShow = false;
-	  this.endTimeShow = false;
+			this.startTimeShow = false;
+			this.endTimeShow = false;
+			this.searchList(false)
     },
     //确定选择结束时间
     async confirmEndTime(e) {
@@ -482,7 +502,7 @@
       }
       return value;
     },
-
+		//验证手机号-不通过跳转注册页面
     async checkphone() {
       //有电话就去验证
       if (this.phone) {
@@ -493,7 +513,9 @@
           });
         } else {
           uni.setStorageSync("registerPhone", this.phone);
-          getUserProfile();
+          await getUserProfile(); //获取用户信息
+					const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
+					// this.isManager = userInfo.salt === '物业人员'
         }
       } else {
         //没有电话就弹出授权
@@ -510,9 +532,23 @@
 		  this.loading = true;
 		  await this.searchList(true);
 		  this.loading = false;
-		}
-  },
-};
+		},
+		//跳转申请者信息提交模板页面
+		goSubmitInfo() {
+			if(!this.checkRadio) {
+				wx.showToast({
+					title: '请选中',
+					icon: 'none'
+				});
+				return
+			}
+			wx.navigateTo({
+				url: '/pagesA/submitInfo/submitInfo?form=' + encodeURIComponent(JSON.stringify(this.checkRadio)),
+			})
+			this.checkRadio = null
+		},
+	}
+}
 </script>
 
 <style scoped lang="scss">
@@ -592,25 +628,33 @@
       margin-left: 30rpx;
       width: 210rpx;
       display: flex;
-      justify-content: space-between;
+      justify-content: flex-end;
       align-items: center;
       .close-circle {
         width: 55rpx;
         height: 55rpx;
-        background: url(@/static/listIcon/noNext.png) no-repeat;
+        background: url('@/static/listIcon/template.png') no-repeat;
         background-size: contain;
+				margin-left: 16rpx;
       }
+			.template {
+				width: 55rpx;
+				height: 55rpx;
+				background: url('@/static/listIcon/template.png') no-repeat;
+				background-size: contain;
+			}
       .checkmark-circle {
         width: 55rpx;
         height: 55rpx;
-        background: url(@/static/listIcon/next.png) no-repeat;
+        background: url('@/static/listIcon/next.png') no-repeat;
         background-size: contain;
       }
       .share-square {
         width: 55rpx;
         height: 55rpx;
-        background: url(@/static/listIcon/export.png) no-repeat;
+        background: url('@/static/listIcon/export.png') no-repeat;
         background-size: contain;
+				margin-left: 16rpx;
       }
     }
   }
diff --git a/pages/message/message.vue b/pages/message/message.vue
index 4fd4cb3..0372e4f 100644
--- a/pages/message/message.vue
+++ b/pages/message/message.vue
@@ -1,7 +1,19 @@
 <!-- 消息 -->
 <template>
   <view class="message">
-    <TabBar></TabBar>
+    <!-- <TabBar></TabBar> -->
+		<u-empty 
+			:show="!list.length" 
+			mode="coupon"  
+			width="300"
+			height="260"
+			text="暂无消息"
+			iconColor="#ff7b7c"
+			textColor="#333"
+			textSize="18"
+			icon="http://cdn.uviewui.com/uview/empty/coupon.png"
+			marginTop="20">
+		</u-empty>
     <view class="main" v-for="(item, index) in list" :key="index">
       <view class="date-time">{{ item.messageTime }}</view>
       <view class="card" @click="clickDetail(item.id)">
@@ -14,16 +26,9 @@
               <text class="number">{{ item.number }}</text>
             </view>
 
-            <view
-              :class="
-                item.status === '未通过'
-                  ? 'button-area'
-                  : item.status === '已通过'
-                  ? 'button-area pass'
-                  : 'button-area submit'
-              "
-              >申请{{ item.status }}</view
-            >
+            <view :class=" item.status === '未通过' ? 'button-area' : item.status === '已通过' ? 'button-area pass' : 'button-area submit'">
+							申请{{ item.status }}
+						</view>
           </view>
           <view class="ui-time">
             <text class="start">{{ item.startTime }}</text>
@@ -52,7 +57,7 @@
 
    <!-- 获取手机号popup组件 -->
    <GetPhonePopup :popShow="popShow" @closePop="closePop" @refresh="refresh"/>
-	 <LoadingList :loading="loading" :nothingMore="nothingMore" />
+	 <LoadingList :loading="loading" :nothingMore="nothingMore && list.length" />
 	 
 	 <!-- 返回顶部 -->
 	 <u-back-top 
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index 7309d58..289a682 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -1,7 +1,7 @@
 /** * 我的 */
 <template>
   <view class="mine">
-    <TabBar></TabBar>
+    <!-- <TabBar></TabBar> -->
 		<view class="image-area">
 			<u-avatar :src="img" size='80'></u-avatar>
 		</view>
@@ -50,8 +50,8 @@
 					value: ''
 				},
 				{
-					id: 'type',
-					name: '员工类型',
+					id: 'documentTypeName',
+					name: '证件类型',
 					value: ''
 				},
 				{
@@ -135,7 +135,7 @@
 			this.img = userInfo.avatar;
 			console.log('头像url', this.img)
 			this.id = userInfo.id;
-			//物业人员0，安保人员1，正式员工2
+			//证件类型：1工作证 、 2出入证
 			this.$set(this.list, 0,  {
 					id: 'number',
 					name: '员工号',
@@ -147,9 +147,9 @@
 					value: userInfo.name
 			});
 			this.$set(this.list, 2,  {
-					id: 'type',
-					name: '员工类型',
-					value: userInfo.salt
+					id: 'documentTypeName',
+					name: '证件类型',
+					value: userInfo.documentTypeName
 			});
 			this.$set(this.list, 3,  {
 					id: 'phone',
diff --git a/pages/register/register.vue b/pages/register/register.vue
index 7e5f96b..ddc15f0 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -9,21 +9,21 @@
       <view class="content">
         <u--form labelPosition="left" :model="form" :rules="rules" ref="form1">
           <u-form-item
-            label="员工号码"
+            label="员工证件编号"
             prop="account"
-            labelWidth="80"
+            labelWidth="110"
             class="form-item"
           >
             <u--input
               v-model="form.account"
               border="none"
-              placeholder="请输入员工号码"
+              placeholder="请输入员工证件编号"
             ></u--input>
           </u-form-item>
           <u-form-item
             label="员工姓名"
             prop="name"
-            labelWidth="80"
+            labelWidth="110"
             class="form-item"
           >
             <u--input
@@ -33,20 +33,17 @@
             ></u--input>
           </u-form-item>
           <u-form-item
-            label="员工类型"
-            prop="type"
+            label="证件类型"
             class="form-item form-item-border"
-            labelWidth="80"
+            labelWidth="110"
           >
-            <u-button @click="typeLx">{{
-              form.type || "请选择员工类型"
-            }}</u-button>
+            <u-button @click="typeLx">{{form.documentTypeName || "请选择证件类型"}}</u-button>
           </u-form-item>
           <u-form-item
             label="手机号码"
             prop="phone"
             borderBottom
-            labelWidth="80"
+            labelWidth="110"
             class="form-item"
           >
             <u-button
@@ -60,24 +57,26 @@
           </u-form-item>
         </u--form>
         <u-button type="error" text="注 册" @click="registerGo"></u-button>
+				
+				<!-- 证件类型选择框 -->
         <u-action-sheet
           :show="show"
-          :actions="list"
-          title="请选择员工类型"
+          :actions="certificateList"
+          title="请选择证件类型"
           description="只能单选"
           @close="show = false"
-          @select="sexSelect"
+          @select="confirmSelect"
         >
         </u-action-sheet>
 				
+				<!-- 拒绝注册弹出框 -->
         <u-popup
           :show="jujueShow"
           mode="bottom"
           :round="10"
           :closeOnClickOverlay="false"
           @close="close"
-          @open="open"
-        >
+          @open="open">
           <view class="popup">
 						<view class="title">提示</view>
             <view class="content"> 拒绝将无法进行注册! </view>
@@ -94,27 +93,28 @@
           </view>
         </u-popup>
 				
+				<!-- 注册成功弹出框 -->
         <u-popup
           :show="successShow"
           mode="bottom"
           :round="10"
           :closeOnClickOverlay="false"
           @close="close"
-          @open="open"
-        >
+          @open="open">
           <view class="popup">
 						<view class="title">提示</view>
             <view class="content"> 注册成功! </view>
           </view>
         </u-popup>
+				
+				<!-- 注册失败弹出框 -->
         <u-popup
           :show="errorShow"
           mode="bottom"
           :round="10"
           :closeOnClickOverlay="false"
           @close="close"
-          @open="open"
-        >
+          @open="open">
           <view class="popup">
 						<view class="title">提示</view>
             <view class="content">
@@ -155,23 +155,27 @@
         ],
       },
       form: {
-        account: "", //员工号
+        account: "", //证件编号
         name: "", //姓名
-        type: "", //员工类型
         phone: "", //电话
-        salt: "", //员工类型id
+				documentType: '', //证件类型
+				documentTypeName: '', //证件类型名称
       },
-      tips: {
-        text: "请选择员工类型",
-        color: "#909399",
-        fontSize: 24,
-      },
-      list: [],
-      show: false,
-      // sqShow: false,
-      jujueShow: false,
-      successShow: false,
-      errorShow: false,
+			//证件类型筛选列表
+      certificateList: [
+				{
+					id: '1',
+					name: '工作证'
+				},
+				{
+					id: '0',
+					name: '出入证'
+				},
+			],
+      show: false, //控制证件类型筛选显隐
+      jujueShow: false, //控制拒绝注册弹出框显隐
+      successShow: false, //控制成功注册弹出框显隐
+      errorShow: false, 
       code: "",
     };
   },
@@ -190,18 +194,14 @@
     },
     //点击注册
     async registerGo() {
-      if (
-        this.form.account.trim() == "" ||
-        this.form.name.trim() == "" ||
-        this.form.salt.trim() == "" ||
-        this.form.phone.trim() == ""
-      ) {
+      if (this.form.account.trim() == "" ||this.form.name.trim() == "" ||this.form.documentTypeName.trim() == "" ||this.form.phone.trim() == "") {
         return uni.showToast({
           title: `请将注册数据填写完整`,
           icon: "none",
           duration: 2000,
         });
       }
+			console.log('9999',this.form)
       const res = await getUserRegister(this.form);
         // this.successShow = true;
 			uni.showToast({
@@ -245,13 +245,10 @@
 				this.jujueShow = true;
 			}
     },
-    //选中员工类型
-    sexSelect(e) {
-      setTimeout(() => {
-        this.form.type = e.name;
-        this.form.salt = e.id;
-      }, 30);
-      // this.$refs.form1.validateField('userInfo.sex')
+    //选中证件类型
+    confirmSelect(e) {
+			this.form.documentType = e.id 
+			this.form.documentTypeName = e.name
     },
   },
 };

diff --git a/api/information.js b/api/information.js
index 53cb95e..70d566b 100644
--- a/api/information.js
+++ b/api/information.js
@@ -5,6 +5,7 @@
 const Submit = BASE_URL + '/visitor/apply/submit'
 const visitReason = BASE_URL + '/sys/dict/code/visitReason'
 const devicePosition = BASE_URL + '/sys/dict/code/devicePosition'
+const DEL_APPLY = BASE_URL + 'visitor/delApply'
 
 /**
  * 提交访客记录
@@ -31,4 +32,15 @@
 export function getResourceType(code) {
 	useNetWork();
   return fetch.get(devicePosition).then(res => res);
-}
\ No newline at end of file
+}
+/**
+ * 申请者删除申请
+ * @param {Object} code
+ */
+export function delApply(applyId) {
+	useNetWork();
+	const params = {
+		applyId: applyId
+	}
+  return fetch.get(DEL_APPLY, params).then(res => res);
+}
diff --git a/api/user.js b/api/user.js
index f7690f0..8ed85c8 100644
--- a/api/user.js
+++ b/api/user.js
@@ -35,13 +35,7 @@
  * 注册
  * @param {*}
  */
-export function getUserRegister(data) {
+export function getUserRegister(params) {
   useNetWork();
-  const params = {
-    phone: data.phone,
-    account: data.account,
-    name: data.name,
-    salt: data.salt,
-  };
   return fetch.post(UserRegister, params).then((res) => res);
 }
diff --git a/pages.json b/pages.json
index 4071ebc..092484a 100644
--- a/pages.json
+++ b/pages.json
@@ -1,11 +1,4 @@
 {
-	// "easycom": {
-	// 	// 下载安装的方式需要前面的"@/"，npm安装的方式无需"@/"
-	// 	// 下载安装方式
-	// 	"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
-	// 	// npm安装方式
-	// 	// "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
-	// },
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
 			"path": "pages/index/index",
@@ -39,14 +32,14 @@
 				"onReachBottomDistance": 10
 			}     
     },
-	{
+		{
 			"path" : "pages/information/information",
 			"style" :                                                                                    
 			{
 				"navigationBarTitleText": "访客信息提交",
 				"enablePullDownRefresh": false
 			}     
-	},
+		},
 		{
 			"path" : "pages/list/list",
 			"style" :                                                                                    
@@ -111,39 +104,79 @@
 		"backgroundColor": "#F8F8F8"
 	},
 	"tabBar": {
-		"custom": true,
-		"selectedColor": "#2483b3",
+		// "custom": true,
+		"color": "#7A7E83",
+		"selectedColor": "#c5000a",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
 		// "color": "#ccc",
 		"list": [
 			{
-				"pagePath": "pages/index/index"
+				"pagePath": "pages/index/index",
+				"text": "首页",
+				"iconPath": "static/tabBar/home.png",
+				"selectedIconPath": "/static/tabBar/home_selected.png"
 			},
 			{
-				"pagePath": "pages/message/message"
+				"pagePath": "pages/message/message",
+				"text": "消息",
+				"iconPath": "static/tabBar/message.png",
+				"selectedIconPath": "static/tabBar/message_selected.png"
 			},
 			{
-				"pagePath": "pages/list/list"
+				"pagePath": "pages/list/list",
+				"text": "列表",
+				"iconPath": "static/tabBar/list.png",
+				"selectedIconPath": "static/tabBar/list_selected.png"
 			},
 			{
-				"pagePath": "pages/mine/mine"
+				"pagePath": "pages/mine/mine",
+				"text": "我的",
+				"iconPath": "static/tabBar/mine.png",
+				"selectedIconPath": "static/tabBar/mine_selected.png"
 			}
 		]
 	},
 	"subPackages":[
-	//分包模块
-	{
-	"root" : "pagesA",
-	"pages" : [
-	{
-		"path" : "checkInfo/checkInfo",
-		"style" :                                                                                    
+		//分包模块
 		{
-			"navigationBarTitleText": "",
-			"enablePullDownRefresh": false
+			"root" : "pagesA",
+			"pages" : [
+				{
+					"path" : "checkInfo/checkInfo",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path" : "submitInfo/submitInfo",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "访客信息提交",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path" : "checkListInfo/checkListInfo",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "信息查看",
+						"enablePullDownRefresh": false
+					}
+				}
+			    ,{
+                    "path" : "changeListInfo/changeListInfo",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "",
+                    "enablePullDownRefresh": false
+                }
+                
+                }
+            ]
 		}
-	}
-	]
-	}
 	],
 	"uniIdRouter": {}
 }
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7e9dc36..fdde26f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,7 +1,7 @@
 //首页
 <template>
   <view class="index">
-    <TabBar></TabBar>
+    <!-- <TabBar></TabBar> -->
 		<view class="top">
 			<image src="../../static/logo.png" style="width: 167rpx;height: 150rpx;"></image>
 			<view class="top-title">
@@ -91,30 +91,22 @@
     uni.setStorageSync("currentPagePath", this.currentPagePath);
   },
   methods: {
-    // ...mapMutations(['setNavRect'])
     async handleClick(id) {
-			// subscription();
       this.active = id;
       const sessionId = uni.getStorageSync("sessionId");
       //如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过
       if (!sessionId) {
         await getLogin();
       }
-			// if(id === 'submit') {
-				this.phone = uni.getStorageSync("registerPhone");
-				if (this.phone) {
-				  this.checkphone();
-				} else {
-					//弹获取手机号
-				  this.popShow = true;
-				}
-			// } else {
-			// 	// uni.showToast({
-			// 	// 	title: '敬请期待',
-			// 	// 	icon: 'none'
-			// 	// });
-			// }
+			this.phone = uni.getStorageSync("registerPhone");
+			if (this.phone) {
+				this.checkphone();
+			} else {
+				//弹获取手机号
+				this.popShow = true;
+			}
     },
+		
 		//通过手机号检查是否存在这个用户
     async checkphone() {
       const res = await verifyPhone(this.phone);
@@ -122,25 +114,23 @@
         wx.reLaunch({
           url: "/pages/register/register",
         });
-      } else {
+      } else { // 用户已注册
 				uni.setStorageSync("registerPhone", this.phone);
         await getUserProfile(); //获取人员信息
-				
-			if (uni.getStorageSync("userInfo")) {
-			  const userInfo = JSON.parse(uni.getStorageSync("userInfo"));
-			  this.uid = userInfo.id
-			  if (userInfo.salt === "物业人员") {
-				if(this.active === "submit") {
-					subscription();
-				}
+				if (uni.getStorageSync("userInfo")) {
+					const userInfo = JSON.parse(uni.getStorageSync("userInfo"));
+					this.uid = userInfo.id
+					if (userInfo.salt === "物业人员") {
+					if(this.active === "submit") {
+						subscription();
+					}
 			  } 
 			}
-				
-        if (this.active === "submit") {
-          wx.navigateTo({
-            url: `/pages/information/information?id=${this.active}`,
-          });
-        }else {
+			if (this.active === "submit") {
+				wx.navigateTo({
+					url: `/pages/information/information?id=${this.active}`,
+				});
+			} else {
 			// 判断是否有这个路径
 			const res = await getUserJurisdiction({uid:this.uid})
 			if(res.indexOf('/pages/check/check') !== -1) {
@@ -171,7 +161,8 @@
 	padding: 0 20rpx;
   padding-top: 40rpx;
 	background: linear-gradient(#e7c0c1 0%, #fff 100%);
-  height: 100vh;
+  height: 100%;
+	box-sizing: border-box;
 	z-index: 0;
 	.top {
 		display: flex;
@@ -223,7 +214,7 @@
   }
 	.bottom-img {
 		position: absolute;
-		bottom: 250rpx;
+		bottom: 20rpx;
 		left: 0;
 		width: 100%;
 		height: 220rpx;
diff --git a/pages/information/information.vue b/pages/information/information.vue
index fcf9991..ad0ec91 100644
--- a/pages/information/information.vue
+++ b/pages/information/information.vue
@@ -1,3 +1,4 @@
+<!-- 访客信息提交页面 -->
 <template>
 	<view class="information">
 		<view class="form">
@@ -34,6 +35,9 @@
 				<u-form-item label="申请者名字" borderBottom labelWidth="100">
 					<u--input v-model="callerInfo.staffName" disabled border="none" placeholder="请输入申请者姓名"></u--input>
 				</u-form-item>
+				<u-form-item label="申请者手机号" borderBottom labelWidth="100">
+					<u--input v-model="callerInfo.phone" disabled border="none" placeholder="请输入申请者姓名"></u--input>
+				</u-form-item>
 				<u-form-item label="备注" borderBottom labelWidth="100">
 					<u--input v-model="callerInfo.remarks" border="none" placeholder="请输入备注"></u--input>
 				</u-form-item>
@@ -46,15 +50,37 @@
 					信息提交成功，请等待物业管理员处理。
 				</view>
 			</view>
-			<u-picker :show="show" :columns="columns" @close="show=false" @confirm="getPurpose"></u-picker>
-			<u-picker :show="buildingShow" :columns="buildingColumns" @close="buildingShow=false"
+			<!-- 访问目的 -->
+			<u-picker :show="show" :columns="columns" @cancel="show=false" @confirm="getPurpose"></u-picker>
+			<!-- 访问楼栋 -->
+			<u-picker :show="buildingShow" :columns="buildingColumns" @cancel="buildingShow=false"
 				@confirm="getBuilding">
 			</u-picker>
-			<u-datetime-picker :show="isinTimeShow" v-model="callerInfo.inTime" mode="datetime" title="请选择开始时间"
-				:formatter="formatter"  @cancel="isinTimeShow=false" @change="change" @confirm="closeinTime">
+			<!-- 选择开始时间 -->
+			<u-datetime-picker 
+				:show="isinTimeShow" 
+				v-model="callerInfo.inTime" 
+				mode="datetime" 
+				title="请选择开始时间"
+				:formatter="formatter" 
+				:minDate="inTimeMinDate"
+				:maxDate="inTimeMaxDate"
+				@cancel="isinTimeShow=false" 
+				@change="change" 
+				@confirm="closeinTime">
 			</u-datetime-picker>
-			<u-datetime-picker :show="isTimeShow" v-model="callerInfo.outTime" mode="datetime" title="请选择结束时间"
-				:formatter="formatter"  @cancel="closeTime" @change="change" @confirm="confirmTime">
+			<!-- 选择结束时间 -->
+			<u-datetime-picker 
+				:show="isTimeShow" 
+				v-model="callerInfo.outTime" 
+				mode="datetime" 
+				title="请选择结束时间"
+				:minDate="outTimeMinDate"
+				:maxDate="outTimeMaxDate"
+				:formatter="formatter" 
+				@cancel="closeTime" 
+				@change="change" 
+				@confirm="confirmTime">
 			</u-datetime-picker>
 		</view>
 		<view style="margin-top: 42rpx;">
@@ -67,6 +93,7 @@
 <script>
 	import { getSubmit , getDictCode, getResourceType} from '@/api/information.js'
 	import { subscription } from "@/utils/common.js"
+	import { toHandlerKey } from "vue";
 	export default {
 		data() {
 			return {
@@ -76,11 +103,12 @@
 					visitorPhone: '',
 					visitReason: '',
 					visitPosition: '',
-					inTime: Number(new Date()),
+					inTime: Number(new Date()), //开始时间
 					staffCode: '',
 					staffName: '',
 					remarks: '',
-					outTime: Number(new Date())
+					phone: '', // 申请者手机号
+					outTime: Number(new Date()) //结束时间
 				},
 				rules: {
 					visitorName: [{
@@ -134,18 +162,33 @@
 				buildingShow: false,
 				isinTimeShow: false,
 				columns: [],
-				buildingColumns: []
+				buildingColumns: [],
+				//开始时间最小时间-当前时间
+				inTimeMinDate: new Date(new Date()).getTime(),
+				//开始时间最大时间（一周之内）
+				inTimeMaxDate: new Date(new Date().toLocaleDateString()).getTime()+ 24 * 60 * 60 * 1000 * 7 - 1,
+				//结束时间最小时间（当前时间）
+				outTimeMinDate: new Date(new Date()).getTime(),
+				//结束时间最大时间-默认一周之内
+				outTimeMaxDate: new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 * 7 - 1,
 			}
 		},
+		watch: {
+			//开始时间和结束时间要求是同一天
+			"callerInfo.inTime"(newValue) {
+				this.outTimeMinDate = new Date(newValue).getTime() //结束时间的最小时间是选择的开始时间
+				this.outTimeMaxDate = new Date(new Date(newValue).toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1
+			},
+		},
 		onLoad() {
 			this.callerInfo.inTime = this.shijianc(this.callerInfo.inTime)
 			this.callerInfo.outTime = this.shijianc(this.callerInfo.outTime)
 			const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
 			this.callerInfo.staffCode = userInfo.account
 			this.callerInfo.staffName = userInfo.name
+			this.callerInfo.phone = userInfo.phone
 			this.getDictMap()
 		},
-		
 		mounted() {
 			this.$refs.form1.setRules(this.rules)
 		},
@@ -254,7 +297,7 @@
 		padding: 22rpx;
 
 		.form {
-			padding: 0 32rpx 0;
+			padding: 40rpx 32rpx;
 			border-radius: 10rpx;
 			background-color: #fff;
 		}
diff --git a/pages/list/list.vue b/pages/list/list.vue
index e139fbd..6f84539 100644
--- a/pages/list/list.vue
+++ b/pages/list/list.vue
@@ -1,7 +1,7 @@
-//列表页
+<!-- 列表页 -->
 <template>
   <view class="list">
-    <TabBar></TabBar>
+    <!-- <TabBar></TabBar> -->
     <view class="list-top">
       <u-input
         placeholder="关键字搜索"
@@ -19,18 +19,20 @@
           statusInfo
         }}</text>
         <view class="icon">
-          <text class="checkmark-circle" @click="pass('通过')"></text>
-          <text class="close-circle" @click="pass('拒绝')"></text>
-          <text class="share-square" @click="isExportShow = true"></text>
+          <text v-if="!isManager" class="template" @click="goSubmitInfo"></text>
+          <text v-if="isManager" class="checkmark-circle" @click="pass('通过')"></text>
+          <text v-if="isManager" class="close-circle" @click="pass('拒绝')"></text>
+          <text v-if="isManager" class="share-square" @click="isExportShow = true"></text>
         </view>
       </view>
     </view>
-    <view class="list-content">
+		<view class="list-content">
       <view class="table" v-for="(item, index) in list" :key="index">
         <view class="table-checkbox">
-          <u-checkbox-group >
+					<!-- 复选框 -->
+          <u-checkbox-group>
             <u-checkbox
-			 :checked="item.value"
+			        :checked="item.value"
               @change="checkboxChange(item)"
               shape="circle"
             ></u-checkbox>
@@ -46,8 +48,9 @@
           </view>
         </view>
         <view :class="item.color"> {{ item.status }} </view>
+				<!-- 眼睛图标、查看 -->
         <view class="table-icon">
-          <view class="icon-info" @click="eyeLoock(item.applyNo)"></view>
+          <view class="icon-info" @click="eyeLoock(item.applyNo, item)"></view>
         </view>
       </view>
     </view>
@@ -56,8 +59,7 @@
       mode="bottom"
       :round="10"
       :closeOnClickOverlay="false"
-      @close="close"
-    >
+      @close="close">
       <view class="popup">
 				<view class="title">提示</view>
         <view class="content">
@@ -74,8 +76,7 @@
       mode="bottom"
       :round="10"
       :closeOnClickOverlay="false"
-      @close="close"
-    >
+      @close="close">
       <view class="popup">
 				<view class="title">提示</view>
         <view class="content"> 确定要将{{ text }}的{{ leixin }}? </view>
@@ -90,11 +91,10 @@
       :show="startTimeShow"
       mode="datetime"
       title="请选择开始时间"
-	  v-model="startTimeDefult"
+	    v-model="startTimeDefult"
       :formatter="formatter"
       @cancel="closeTime"
-      @confirm="confirmTime"
-    >
+      @confirm="confirmTime">
     </u-datetime-picker>
 		
     <u-datetime-picker
@@ -102,14 +102,13 @@
       mode="datetime"
       title="请选择结束时间"
       :formatter="formatter"
-	  v-model="endTimeDefult"
+	    v-model="endTimeDefult"
       @cancel="closeTime"
-      @confirm="confirmEndTime"
-    >
+      @confirm="confirmEndTime">
     </u-datetime-picker>
     <u-action-sheet
       :show="statusShow"
-      :actions="statusList"
+      :actions="isManager ? statusListManager : statusList"
       title="请选择状态"
       description="只能单选"
       @close="statusShow = false"
@@ -133,7 +132,7 @@
 <script>
 import TabBar from "@/components/tabBar/tabBar.vue";
 import { getList } from "@/api/list.js";
-import { debounce } from "@/common/utils.js";
+import { debounce, deepCopy } from "@/common/utils.js";
 import { getLastMonth } from "@/common/formatTime.js";
 import { solveStatus } from "@/api/message.js";
 import { verifyPhone } from "@/api/index.js";
@@ -147,17 +146,19 @@
   },
   data() {
     return {
+			checkRadio: null, //单选框选中
+			isManager: false, //是否是物业管理员
 			scrollTop: 0,
       queryList: {
         keywords: "",
         startTime: "",
         endTime: "",
         status: "",
-		offset: this.offset,
-		limit: this.limit
+				offset: this.offset,
+				limit: this.limit
       },
-	  startTimeDefult:Number(new Date()),
-	  endTimeDefult:Number(new Date()),
+			startTimeDefult:Number(new Date()),
+			endTimeDefult:Number(new Date()),
       list: [],
       isExportShow: false,
       ispassShow: false,
@@ -169,11 +170,18 @@
       endTimeShow: false,
       TimeNextShow: false,
       statusShow: false,
-      statusList: [
+      statusListManager: [
         { name: "申请已提交", id: "1" },
         { name: "申请已通过", id: "2" },
         { name: "申请已失败", id: "3" },
+				{ name: "全部", id: "0" },
       ],
+			statusList: [
+			  { name: "申请中", id: "1" },
+			  { name: "申请已通过", id: "2" },
+			  { name: "申请已失败", id: "3" },
+				{ name: "全部", id: "0" },
+			],
       time: "筛选时间",
       isTimeQ: "",
       isTimeZ: "",
@@ -208,19 +216,16 @@
     const curPage = pages[pages.length - 1];
     this.currentPagePath = curPage.route;
     uni.setStorageSync("currentPagePath", this.currentPagePath);
-
     //验证手机号
     this.phone = uni.getStorageSync("registerPhone");
     this.checkphone();
-		
-		
     this.queryList = {
       keywords: "",
       startTime: "",
       endTime: "",
       status: "",
-		offset: this.offset,
-		limit: this.limit
+			offset: this.offset,
+			limit: this.limit
     };
 		const param = {
 			offset: 1,
@@ -230,17 +235,17 @@
     const res = await getList(this.queryList);
     this.list = res.records.map((item) => {
 		item.value = false
-      if (item.visitorApplyStatus == "1") {
-        item.status = "申请已提交";
-        item.color = "blue";
-      } else if (item.visitorApplyStatus == "2") {
-        item.status = "申请已通过";
-        item.color = "green";
-      } else {
-        item.status = "申请未通过";
-        item.color = "red";
-      }
-      return item;
+		if (item.visitorApplyStatus == "1") {
+			item.status = this.isManager ? "申请已提交" : '申请中';
+			item.color = "blue";
+		} else if (item.visitorApplyStatus == "2") {
+			item.status = "申请已通过";
+			item.color = "green";
+		} else {
+			item.status = "申请未通过";
+			item.color = "red";
+		}
+			return item;
     });
   },
   //下拉刷新
@@ -269,7 +274,13 @@
   methods: {
     //选中的数据
     checkboxChange(item) {
-		item.value = !item.value
+			this.checkRadio = deepCopy(item)
+			if(!this.isManager) { //申请者
+				this.list.forEach(item => {
+					item.value = false
+				})
+			}
+			item.value = !item.value
       if (this.checkboxList.indexOf(item) == -1) {
         this.checkboxList.push(item);
       } else {
@@ -280,47 +291,41 @@
     //搜索框发生改变
     async change(e) {
 			this.offset = 1;
-      if (e.trim() === "") {
+      if (e.trim() === "") { //空
 				const param = {
 					offset: this.offset,
 					limit: this.limit
 				}
         const res = await getList(param);
-        return (this.list = res.records.map((item) => {
-          if (item.visitorApplyStatus == "1") {
-            item.status = "申请已提交";
-            item.color = "blue";
-          } else if (item.visitorApplyStatus == "2") {
-            item.status = "申请已通过";
-            item.color = "green";
-          } else {
-            item.status = "申请未通过";
-            item.color = "red";
-          }
-          return item;
-        }));
+				this.list = res.records.map((item) => {
+				  if (item.visitorApplyStatus == "1") {
+				    item.status = this.isManager ? "申请已提交" : '申请中';
+				    item.color = "blue";
+				  } else if (item.visitorApplyStatus == "2") {
+				    item.status = "申请已通过";
+				    item.color = "green";
+				  } else {
+				    item.status = "申请未通过";
+				    item.color = "red";
+				  }
+				  return item;
+				});
       }
-      debounce(this.searchList(false), 10000);
+      debounce(this.searchList(false, true), 10000);
     },
     //确定导出
     async exportClick() {
       const sessionId = uni.getStorageSync("sessionId");
       let filePath = `${wx.env.USER_DATA_PATH}/${+new Date()}.xlsx`;
       let ids = [];
-      ids =
-        this.checkboxList.length === 0
-          ? this.list.map((item) => item.id)
-          : this.checkboxList.map((item) => item.id);
+      ids = this.checkboxList.length === 0 ? this.list.map((item) => item.id) : this.checkboxList.map((item) => item.id);
       uni.request({
         url: 'https://visitor.gd.smartlog.work/visitor/exportMessage',
         responseType: "arraybuffer",
-		method:"POST",
-		data:{
-			ids
-		},
-        header: {
-          token: sessionId, //自定义请求头信息
-        },
+				method:"POST",
+				data: { ids },
+				//自定义请求头信息
+        header: {  token: sessionId },
         success: ({ data }) => {
           let fm = wx.getFileSystemManager();
           fm.writeFile({
@@ -334,12 +339,12 @@
               });
             },
           });
-        },
-      });
+        }
+      })
       this.checkboxList = [];
     },
     //根据条件搜索
-    async searchList(is) {
+    async searchList(is, isFromChange = false) {
 			if(!this.loading) {
 				this.list = [];
 			}
@@ -350,7 +355,7 @@
       const res = await getList(this.queryList);
 			if(res.records && res.records.length) {
 				this.nothingMore = false;
-				const resData = res.records.map((item) => {
+				const resData = res.records.map((item, index) => {
 				  if (item.visitorApplyStatus == "1") {
 				    item.status = "申请已提交";
 				    item.color = "blue";
@@ -363,7 +368,11 @@
 				  }
 				  return item;
 				});
-				this.list = this.list.concat(resData);
+				if(isFromChange) {
+					this.list = resData
+				} else {
+					this.list = this.list.concat(resData);
+				}
 			} else {
 				this.nothingMore = true;
 			}
@@ -373,6 +382,9 @@
 			this.offset = 1;
       this.statusInfo = e.name;
       this.queryList.status = e.id;
+			if(e.id === '0') {
+				this.queryList.status = ''
+			}
       this.searchList(false);
     },
     //打开导出提示框
@@ -382,18 +394,18 @@
       this.ispassShow = true;
     },
     async possQr() {
-	  const statusList = this.checkboxList.length === 0 ? this.list.filter((item) => item.visitorApplyStatus === '1') : this.checkboxList.filter((item) => item.visitorApplyStatus === '1')
-	  let ids = statusList.map((item) => item.id).join();
-	  if( ids === '') {
-		  this.checkboxList = [];
-		  this.ispassShow = false;
-		  this.searchList(false);
-		  return uni.showToast({
-				title: `暂无需要改动状态人员`,
-				icon: 'none',
-				duration: 2000,
-			})
-	  }
+			const statusList = this.checkboxList.length === 0 ? this.list.filter((item) => item.visitorApplyStatus === '1') : this.checkboxList.filter((item) => item.visitorApplyStatus === '1')
+			let ids = statusList.map((item) => item.id).join();
+			if( ids === '') {
+				this.checkboxList = [];
+				this.ispassShow = false;
+				this.searchList(false);
+				return uni.showToast({
+					title: `暂无需要改动状态人员`,
+					icon: 'none',
+					duration: 2000,
+				})
+			}
       let res = await solveStatus(this.leixin == "通过" ? "2" : "3", ids);
       this.searchList(false);
       this.ispassShow = false;
@@ -403,26 +415,34 @@
       this.exportClick();
       this.isExportShow = false;
     },
-    eyeLoock(messageId) {
-      wx.navigateTo({
-        url: `/pages/info/info?messageId=${messageId}`,
-      });
+    //点击查看
+		eyeLoock(messageId, item) {
+			if(this.isManager) {
+				wx.navigateTo({
+				  url: `/pages/info/info?messageId=${messageId}`,
+				});
+			} else {
+				wx.navigateTo({
+					url: '/pagesA/checkListInfo/checkListInfo?form=' + encodeURIComponent(JSON.stringify(item)),
+				})
+			}
     },
     //取消选择时间
     closeTime() {
-	  this.offset = 1;
+			this.offset = 1;
       this.startTimeShow = false;
       this.time = "筛选时间";
       this.queryList = {
-        keywords: "",
+        keywords: this.queryList.keywords,
         startTime: "",
         endTime: "",
-        status: "",
-		offset: this.offset,
-		limit: this.limit
+        status: this.queryList.status,
+				offset: this.offset,
+				limit: this.limit
       };
-	  this.startTimeShow = false;
-	  this.endTimeShow = false;
+			this.startTimeShow = false;
+			this.endTimeShow = false;
+			this.searchList(false)
     },
     //确定选择结束时间
     async confirmEndTime(e) {
@@ -482,7 +502,7 @@
       }
       return value;
     },
-
+		//验证手机号-不通过跳转注册页面
     async checkphone() {
       //有电话就去验证
       if (this.phone) {
@@ -493,7 +513,9 @@
           });
         } else {
           uni.setStorageSync("registerPhone", this.phone);
-          getUserProfile();
+          await getUserProfile(); //获取用户信息
+					const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
+					// this.isManager = userInfo.salt === '物业人员'
         }
       } else {
         //没有电话就弹出授权
@@ -510,9 +532,23 @@
 		  this.loading = true;
 		  await this.searchList(true);
 		  this.loading = false;
-		}
-  },
-};
+		},
+		//跳转申请者信息提交模板页面
+		goSubmitInfo() {
+			if(!this.checkRadio) {
+				wx.showToast({
+					title: '请选中',
+					icon: 'none'
+				});
+				return
+			}
+			wx.navigateTo({
+				url: '/pagesA/submitInfo/submitInfo?form=' + encodeURIComponent(JSON.stringify(this.checkRadio)),
+			})
+			this.checkRadio = null
+		},
+	}
+}
 </script>
 
 <style scoped lang="scss">
@@ -592,25 +628,33 @@
       margin-left: 30rpx;
       width: 210rpx;
       display: flex;
-      justify-content: space-between;
+      justify-content: flex-end;
       align-items: center;
       .close-circle {
         width: 55rpx;
         height: 55rpx;
-        background: url(@/static/listIcon/noNext.png) no-repeat;
+        background: url('@/static/listIcon/template.png') no-repeat;
         background-size: contain;
+				margin-left: 16rpx;
       }
+			.template {
+				width: 55rpx;
+				height: 55rpx;
+				background: url('@/static/listIcon/template.png') no-repeat;
+				background-size: contain;
+			}
       .checkmark-circle {
         width: 55rpx;
         height: 55rpx;
-        background: url(@/static/listIcon/next.png) no-repeat;
+        background: url('@/static/listIcon/next.png') no-repeat;
         background-size: contain;
       }
       .share-square {
         width: 55rpx;
         height: 55rpx;
-        background: url(@/static/listIcon/export.png) no-repeat;
+        background: url('@/static/listIcon/export.png') no-repeat;
         background-size: contain;
+				margin-left: 16rpx;
       }
     }
   }
diff --git a/pages/message/message.vue b/pages/message/message.vue
index 4fd4cb3..0372e4f 100644
--- a/pages/message/message.vue
+++ b/pages/message/message.vue
@@ -1,7 +1,19 @@
 <!-- 消息 -->
 <template>
   <view class="message">
-    <TabBar></TabBar>
+    <!-- <TabBar></TabBar> -->
+		<u-empty 
+			:show="!list.length" 
+			mode="coupon"  
+			width="300"
+			height="260"
+			text="暂无消息"
+			iconColor="#ff7b7c"
+			textColor="#333"
+			textSize="18"
+			icon="http://cdn.uviewui.com/uview/empty/coupon.png"
+			marginTop="20">
+		</u-empty>
     <view class="main" v-for="(item, index) in list" :key="index">
       <view class="date-time">{{ item.messageTime }}</view>
       <view class="card" @click="clickDetail(item.id)">
@@ -14,16 +26,9 @@
               <text class="number">{{ item.number }}</text>
             </view>
 
-            <view
-              :class="
-                item.status === '未通过'
-                  ? 'button-area'
-                  : item.status === '已通过'
-                  ? 'button-area pass'
-                  : 'button-area submit'
-              "
-              >申请{{ item.status }}</view
-            >
+            <view :class=" item.status === '未通过' ? 'button-area' : item.status === '已通过' ? 'button-area pass' : 'button-area submit'">
+							申请{{ item.status }}
+						</view>
           </view>
           <view class="ui-time">
             <text class="start">{{ item.startTime }}</text>
@@ -52,7 +57,7 @@
 
    <!-- 获取手机号popup组件 -->
    <GetPhonePopup :popShow="popShow" @closePop="closePop" @refresh="refresh"/>
-	 <LoadingList :loading="loading" :nothingMore="nothingMore" />
+	 <LoadingList :loading="loading" :nothingMore="nothingMore && list.length" />
 	 
 	 <!-- 返回顶部 -->
 	 <u-back-top 
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index 7309d58..289a682 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -1,7 +1,7 @@
 /** * 我的 */
 <template>
   <view class="mine">
-    <TabBar></TabBar>
+    <!-- <TabBar></TabBar> -->
 		<view class="image-area">
 			<u-avatar :src="img" size='80'></u-avatar>
 		</view>
@@ -50,8 +50,8 @@
 					value: ''
 				},
 				{
-					id: 'type',
-					name: '员工类型',
+					id: 'documentTypeName',
+					name: '证件类型',
 					value: ''
 				},
 				{
@@ -135,7 +135,7 @@
 			this.img = userInfo.avatar;
 			console.log('头像url', this.img)
 			this.id = userInfo.id;
-			//物业人员0，安保人员1，正式员工2
+			//证件类型：1工作证 、 2出入证
 			this.$set(this.list, 0,  {
 					id: 'number',
 					name: '员工号',
@@ -147,9 +147,9 @@
 					value: userInfo.name
 			});
 			this.$set(this.list, 2,  {
-					id: 'type',
-					name: '员工类型',
-					value: userInfo.salt
+					id: 'documentTypeName',
+					name: '证件类型',
+					value: userInfo.documentTypeName
 			});
 			this.$set(this.list, 3,  {
 					id: 'phone',
diff --git a/pages/register/register.vue b/pages/register/register.vue
index 7e5f96b..ddc15f0 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -9,21 +9,21 @@
       <view class="content">
         <u--form labelPosition="left" :model="form" :rules="rules" ref="form1">
           <u-form-item
-            label="员工号码"
+            label="员工证件编号"
             prop="account"
-            labelWidth="80"
+            labelWidth="110"
             class="form-item"
           >
             <u--input
               v-model="form.account"
               border="none"
-              placeholder="请输入员工号码"
+              placeholder="请输入员工证件编号"
             ></u--input>
           </u-form-item>
           <u-form-item
             label="员工姓名"
             prop="name"
-            labelWidth="80"
+            labelWidth="110"
             class="form-item"
           >
             <u--input
@@ -33,20 +33,17 @@
             ></u--input>
           </u-form-item>
           <u-form-item
-            label="员工类型"
-            prop="type"
+            label="证件类型"
             class="form-item form-item-border"
-            labelWidth="80"
+            labelWidth="110"
           >
-            <u-button @click="typeLx">{{
-              form.type || "请选择员工类型"
-            }}</u-button>
+            <u-button @click="typeLx">{{form.documentTypeName || "请选择证件类型"}}</u-button>
           </u-form-item>
           <u-form-item
             label="手机号码"
             prop="phone"
             borderBottom
-            labelWidth="80"
+            labelWidth="110"
             class="form-item"
           >
             <u-button
@@ -60,24 +57,26 @@
           </u-form-item>
         </u--form>
         <u-button type="error" text="注 册" @click="registerGo"></u-button>
+				
+				<!-- 证件类型选择框 -->
         <u-action-sheet
           :show="show"
-          :actions="list"
-          title="请选择员工类型"
+          :actions="certificateList"
+          title="请选择证件类型"
           description="只能单选"
           @close="show = false"
-          @select="sexSelect"
+          @select="confirmSelect"
         >
         </u-action-sheet>
 				
+				<!-- 拒绝注册弹出框 -->
         <u-popup
           :show="jujueShow"
           mode="bottom"
           :round="10"
           :closeOnClickOverlay="false"
           @close="close"
-          @open="open"
-        >
+          @open="open">
           <view class="popup">
 						<view class="title">提示</view>
             <view class="content"> 拒绝将无法进行注册! </view>
@@ -94,27 +93,28 @@
           </view>
         </u-popup>
 				
+				<!-- 注册成功弹出框 -->
         <u-popup
           :show="successShow"
           mode="bottom"
           :round="10"
           :closeOnClickOverlay="false"
           @close="close"
-          @open="open"
-        >
+          @open="open">
           <view class="popup">
 						<view class="title">提示</view>
             <view class="content"> 注册成功! </view>
           </view>
         </u-popup>
+				
+				<!-- 注册失败弹出框 -->
         <u-popup
           :show="errorShow"
           mode="bottom"
           :round="10"
           :closeOnClickOverlay="false"
           @close="close"
-          @open="open"
-        >
+          @open="open">
           <view class="popup">
 						<view class="title">提示</view>
             <view class="content">
@@ -155,23 +155,27 @@
         ],
       },
       form: {
-        account: "", //员工号
+        account: "", //证件编号
         name: "", //姓名
-        type: "", //员工类型
         phone: "", //电话
-        salt: "", //员工类型id
+				documentType: '', //证件类型
+				documentTypeName: '', //证件类型名称
       },
-      tips: {
-        text: "请选择员工类型",
-        color: "#909399",
-        fontSize: 24,
-      },
-      list: [],
-      show: false,
-      // sqShow: false,
-      jujueShow: false,
-      successShow: false,
-      errorShow: false,
+			//证件类型筛选列表
+      certificateList: [
+				{
+					id: '1',
+					name: '工作证'
+				},
+				{
+					id: '0',
+					name: '出入证'
+				},
+			],
+      show: false, //控制证件类型筛选显隐
+      jujueShow: false, //控制拒绝注册弹出框显隐
+      successShow: false, //控制成功注册弹出框显隐
+      errorShow: false, 
       code: "",
     };
   },
@@ -190,18 +194,14 @@
     },
     //点击注册
     async registerGo() {
-      if (
-        this.form.account.trim() == "" ||
-        this.form.name.trim() == "" ||
-        this.form.salt.trim() == "" ||
-        this.form.phone.trim() == ""
-      ) {
+      if (this.form.account.trim() == "" ||this.form.name.trim() == "" ||this.form.documentTypeName.trim() == "" ||this.form.phone.trim() == "") {
         return uni.showToast({
           title: `请将注册数据填写完整`,
           icon: "none",
           duration: 2000,
         });
       }
+			console.log('9999',this.form)
       const res = await getUserRegister(this.form);
         // this.successShow = true;
 			uni.showToast({
@@ -245,13 +245,10 @@
 				this.jujueShow = true;
 			}
     },
-    //选中员工类型
-    sexSelect(e) {
-      setTimeout(() => {
-        this.form.type = e.name;
-        this.form.salt = e.id;
-      }, 30);
-      // this.$refs.form1.validateField('userInfo.sex')
+    //选中证件类型
+    confirmSelect(e) {
+			this.form.documentType = e.id 
+			this.form.documentTypeName = e.name
     },
   },
 };
diff --git a/pagesA/changeListInfo/changeListInfo.vue b/pagesA/changeListInfo/changeListInfo.vue
new file mode 100644
index 0000000..8183fd0
--- /dev/null
+++ b/pagesA/changeListInfo/changeListInfo.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

diff --git a/api/information.js b/api/information.js
index 53cb95e..70d566b 100644
--- a/api/information.js
+++ b/api/information.js
@@ -5,6 +5,7 @@
 const Submit = BASE_URL + '/visitor/apply/submit'
 const visitReason = BASE_URL + '/sys/dict/code/visitReason'
 const devicePosition = BASE_URL + '/sys/dict/code/devicePosition'
+const DEL_APPLY = BASE_URL + 'visitor/delApply'
 
 /**
  * 提交访客记录
@@ -31,4 +32,15 @@
 export function getResourceType(code) {
 	useNetWork();
   return fetch.get(devicePosition).then(res => res);
-}
\ No newline at end of file
+}
+/**
+ * 申请者删除申请
+ * @param {Object} code
+ */
+export function delApply(applyId) {
+	useNetWork();
+	const params = {
+		applyId: applyId
+	}
+  return fetch.get(DEL_APPLY, params).then(res => res);
+}
diff --git a/api/user.js b/api/user.js
index f7690f0..8ed85c8 100644
--- a/api/user.js
+++ b/api/user.js
@@ -35,13 +35,7 @@
  * 注册
  * @param {*}
  */
-export function getUserRegister(data) {
+export function getUserRegister(params) {
   useNetWork();
-  const params = {
-    phone: data.phone,
-    account: data.account,
-    name: data.name,
-    salt: data.salt,
-  };
   return fetch.post(UserRegister, params).then((res) => res);
 }
diff --git a/pages.json b/pages.json
index 4071ebc..092484a 100644
--- a/pages.json
+++ b/pages.json
@@ -1,11 +1,4 @@
 {
-	// "easycom": {
-	// 	// 下载安装的方式需要前面的"@/"，npm安装的方式无需"@/"
-	// 	// 下载安装方式
-	// 	"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
-	// 	// npm安装方式
-	// 	// "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
-	// },
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
 			"path": "pages/index/index",
@@ -39,14 +32,14 @@
 				"onReachBottomDistance": 10
 			}     
     },
-	{
+		{
 			"path" : "pages/information/information",
 			"style" :                                                                                    
 			{
 				"navigationBarTitleText": "访客信息提交",
 				"enablePullDownRefresh": false
 			}     
-	},
+		},
 		{
 			"path" : "pages/list/list",
 			"style" :                                                                                    
@@ -111,39 +104,79 @@
 		"backgroundColor": "#F8F8F8"
 	},
 	"tabBar": {
-		"custom": true,
-		"selectedColor": "#2483b3",
+		// "custom": true,
+		"color": "#7A7E83",
+		"selectedColor": "#c5000a",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
 		// "color": "#ccc",
 		"list": [
 			{
-				"pagePath": "pages/index/index"
+				"pagePath": "pages/index/index",
+				"text": "首页",
+				"iconPath": "static/tabBar/home.png",
+				"selectedIconPath": "/static/tabBar/home_selected.png"
 			},
 			{
-				"pagePath": "pages/message/message"
+				"pagePath": "pages/message/message",
+				"text": "消息",
+				"iconPath": "static/tabBar/message.png",
+				"selectedIconPath": "static/tabBar/message_selected.png"
 			},
 			{
-				"pagePath": "pages/list/list"
+				"pagePath": "pages/list/list",
+				"text": "列表",
+				"iconPath": "static/tabBar/list.png",
+				"selectedIconPath": "static/tabBar/list_selected.png"
 			},
 			{
-				"pagePath": "pages/mine/mine"
+				"pagePath": "pages/mine/mine",
+				"text": "我的",
+				"iconPath": "static/tabBar/mine.png",
+				"selectedIconPath": "static/tabBar/mine_selected.png"
 			}
 		]
 	},
 	"subPackages":[
-	//分包模块
-	{
-	"root" : "pagesA",
-	"pages" : [
-	{
-		"path" : "checkInfo/checkInfo",
-		"style" :                                                                                    
+		//分包模块
 		{
-			"navigationBarTitleText": "",
-			"enablePullDownRefresh": false
+			"root" : "pagesA",
+			"pages" : [
+				{
+					"path" : "checkInfo/checkInfo",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path" : "submitInfo/submitInfo",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "访客信息提交",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path" : "checkListInfo/checkListInfo",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "信息查看",
+						"enablePullDownRefresh": false
+					}
+				}
+			    ,{
+                    "path" : "changeListInfo/changeListInfo",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "",
+                    "enablePullDownRefresh": false
+                }
+                
+                }
+            ]
 		}
-	}
-	]
-	}
 	],
 	"uniIdRouter": {}
 }
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7e9dc36..fdde26f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,7 +1,7 @@
 //首页
 <template>
   <view class="index">
-    <TabBar></TabBar>
+    <!-- <TabBar></TabBar> -->
 		<view class="top">
 			<image src="../../static/logo.png" style="width: 167rpx;height: 150rpx;"></image>
 			<view class="top-title">
@@ -91,30 +91,22 @@
     uni.setStorageSync("currentPagePath", this.currentPagePath);
   },
   methods: {
-    // ...mapMutations(['setNavRect'])
     async handleClick(id) {
-			// subscription();
       this.active = id;
       const sessionId = uni.getStorageSync("sessionId");
       //如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过
       if (!sessionId) {
         await getLogin();
       }
-			// if(id === 'submit') {
-				this.phone = uni.getStorageSync("registerPhone");
-				if (this.phone) {
-				  this.checkphone();
-				} else {
-					//弹获取手机号
-				  this.popShow = true;
-				}
-			// } else {
-			// 	// uni.showToast({
-			// 	// 	title: '敬请期待',
-			// 	// 	icon: 'none'
-			// 	// });
-			// }
+			this.phone = uni.getStorageSync("registerPhone");
+			if (this.phone) {
+				this.checkphone();
+			} else {
+				//弹获取手机号
+				this.popShow = true;
+			}
     },
+		
 		//通过手机号检查是否存在这个用户
     async checkphone() {
       const res = await verifyPhone(this.phone);
@@ -122,25 +114,23 @@
         wx.reLaunch({
           url: "/pages/register/register",
         });
-      } else {
+      } else { // 用户已注册
 				uni.setStorageSync("registerPhone", this.phone);
         await getUserProfile(); //获取人员信息
-				
-			if (uni.getStorageSync("userInfo")) {
-			  const userInfo = JSON.parse(uni.getStorageSync("userInfo"));
-			  this.uid = userInfo.id
-			  if (userInfo.salt === "物业人员") {
-				if(this.active === "submit") {
-					subscription();
-				}
+				if (uni.getStorageSync("userInfo")) {
+					const userInfo = JSON.parse(uni.getStorageSync("userInfo"));
+					this.uid = userInfo.id
+					if (userInfo.salt === "物业人员") {
+					if(this.active === "submit") {
+						subscription();
+					}
 			  } 
 			}
-				
-        if (this.active === "submit") {
-          wx.navigateTo({
-            url: `/pages/information/information?id=${this.active}`,
-          });
-        }else {
+			if (this.active === "submit") {
+				wx.navigateTo({
+					url: `/pages/information/information?id=${this.active}`,
+				});
+			} else {
 			// 判断是否有这个路径
 			const res = await getUserJurisdiction({uid:this.uid})
 			if(res.indexOf('/pages/check/check') !== -1) {
@@ -171,7 +161,8 @@
 	padding: 0 20rpx;
   padding-top: 40rpx;
 	background: linear-gradient(#e7c0c1 0%, #fff 100%);
-  height: 100vh;
+  height: 100%;
+	box-sizing: border-box;
 	z-index: 0;
 	.top {
 		display: flex;
@@ -223,7 +214,7 @@
   }
 	.bottom-img {
 		position: absolute;
-		bottom: 250rpx;
+		bottom: 20rpx;
 		left: 0;
 		width: 100%;
 		height: 220rpx;
diff --git a/pages/information/information.vue b/pages/information/information.vue
index fcf9991..ad0ec91 100644
--- a/pages/information/information.vue
+++ b/pages/information/information.vue
@@ -1,3 +1,4 @@
+<!-- 访客信息提交页面 -->
 <template>
 	<view class="information">
 		<view class="form">
@@ -34,6 +35,9 @@
 				<u-form-item label="申请者名字" borderBottom labelWidth="100">
 					<u--input v-model="callerInfo.staffName" disabled border="none" placeholder="请输入申请者姓名"></u--input>
 				</u-form-item>
+				<u-form-item label="申请者手机号" borderBottom labelWidth="100">
+					<u--input v-model="callerInfo.phone" disabled border="none" placeholder="请输入申请者姓名"></u--input>
+				</u-form-item>
 				<u-form-item label="备注" borderBottom labelWidth="100">
 					<u--input v-model="callerInfo.remarks" border="none" placeholder="请输入备注"></u--input>
 				</u-form-item>
@@ -46,15 +50,37 @@
 					信息提交成功，请等待物业管理员处理。
 				</view>
 			</view>
-			<u-picker :show="show" :columns="columns" @close="show=false" @confirm="getPurpose"></u-picker>
-			<u-picker :show="buildingShow" :columns="buildingColumns" @close="buildingShow=false"
+			<!-- 访问目的 -->
+			<u-picker :show="show" :columns="columns" @cancel="show=false" @confirm="getPurpose"></u-picker>
+			<!-- 访问楼栋 -->
+			<u-picker :show="buildingShow" :columns="buildingColumns" @cancel="buildingShow=false"
 				@confirm="getBuilding">
 			</u-picker>
-			<u-datetime-picker :show="isinTimeShow" v-model="callerInfo.inTime" mode="datetime" title="请选择开始时间"
-				:formatter="formatter"  @cancel="isinTimeShow=false" @change="change" @confirm="closeinTime">
+			<!-- 选择开始时间 -->
+			<u-datetime-picker 
+				:show="isinTimeShow" 
+				v-model="callerInfo.inTime" 
+				mode="datetime" 
+				title="请选择开始时间"
+				:formatter="formatter" 
+				:minDate="inTimeMinDate"
+				:maxDate="inTimeMaxDate"
+				@cancel="isinTimeShow=false" 
+				@change="change" 
+				@confirm="closeinTime">
 			</u-datetime-picker>
-			<u-datetime-picker :show="isTimeShow" v-model="callerInfo.outTime" mode="datetime" title="请选择结束时间"
-				:formatter="formatter"  @cancel="closeTime" @change="change" @confirm="confirmTime">
+			<!-- 选择结束时间 -->
+			<u-datetime-picker 
+				:show="isTimeShow" 
+				v-model="callerInfo.outTime" 
+				mode="datetime" 
+				title="请选择结束时间"
+				:minDate="outTimeMinDate"
+				:maxDate="outTimeMaxDate"
+				:formatter="formatter" 
+				@cancel="closeTime" 
+				@change="change" 
+				@confirm="confirmTime">
 			</u-datetime-picker>
 		</view>
 		<view style="margin-top: 42rpx;">
@@ -67,6 +93,7 @@
 <script>
 	import { getSubmit , getDictCode, getResourceType} from '@/api/information.js'
 	import { subscription } from "@/utils/common.js"
+	import { toHandlerKey } from "vue";
 	export default {
 		data() {
 			return {
@@ -76,11 +103,12 @@
 					visitorPhone: '',
 					visitReason: '',
 					visitPosition: '',
-					inTime: Number(new Date()),
+					inTime: Number(new Date()), //开始时间
 					staffCode: '',
 					staffName: '',
 					remarks: '',
-					outTime: Number(new Date())
+					phone: '', // 申请者手机号
+					outTime: Number(new Date()) //结束时间
 				},
 				rules: {
 					visitorName: [{
@@ -134,18 +162,33 @@
 				buildingShow: false,
 				isinTimeShow: false,
 				columns: [],
-				buildingColumns: []
+				buildingColumns: [],
+				//开始时间最小时间-当前时间
+				inTimeMinDate: new Date(new Date()).getTime(),
+				//开始时间最大时间（一周之内）
+				inTimeMaxDate: new Date(new Date().toLocaleDateString()).getTime()+ 24 * 60 * 60 * 1000 * 7 - 1,
+				//结束时间最小时间（当前时间）
+				outTimeMinDate: new Date(new Date()).getTime(),
+				//结束时间最大时间-默认一周之内
+				outTimeMaxDate: new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 * 7 - 1,
 			}
 		},
+		watch: {
+			//开始时间和结束时间要求是同一天
+			"callerInfo.inTime"(newValue) {
+				this.outTimeMinDate = new Date(newValue).getTime() //结束时间的最小时间是选择的开始时间
+				this.outTimeMaxDate = new Date(new Date(newValue).toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1
+			},
+		},
 		onLoad() {
 			this.callerInfo.inTime = this.shijianc(this.callerInfo.inTime)
 			this.callerInfo.outTime = this.shijianc(this.callerInfo.outTime)
 			const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
 			this.callerInfo.staffCode = userInfo.account
 			this.callerInfo.staffName = userInfo.name
+			this.callerInfo.phone = userInfo.phone
 			this.getDictMap()
 		},
-		
 		mounted() {
 			this.$refs.form1.setRules(this.rules)
 		},
@@ -254,7 +297,7 @@
 		padding: 22rpx;
 
 		.form {
-			padding: 0 32rpx 0;
+			padding: 40rpx 32rpx;
 			border-radius: 10rpx;
 			background-color: #fff;
 		}
diff --git a/pages/list/list.vue b/pages/list/list.vue
index e139fbd..6f84539 100644
--- a/pages/list/list.vue
+++ b/pages/list/list.vue
@@ -1,7 +1,7 @@
-//列表页
+<!-- 列表页 -->
 <template>
   <view class="list">
-    <TabBar></TabBar>
+    <!-- <TabBar></TabBar> -->
     <view class="list-top">
       <u-input
         placeholder="关键字搜索"
@@ -19,18 +19,20 @@
           statusInfo
         }}</text>
         <view class="icon">
-          <text class="checkmark-circle" @click="pass('通过')"></text>
-          <text class="close-circle" @click="pass('拒绝')"></text>
-          <text class="share-square" @click="isExportShow = true"></text>
+          <text v-if="!isManager" class="template" @click="goSubmitInfo"></text>
+          <text v-if="isManager" class="checkmark-circle" @click="pass('通过')"></text>
+          <text v-if="isManager" class="close-circle" @click="pass('拒绝')"></text>
+          <text v-if="isManager" class="share-square" @click="isExportShow = true"></text>
         </view>
       </view>
     </view>
-    <view class="list-content">
+		<view class="list-content">
       <view class="table" v-for="(item, index) in list" :key="index">
         <view class="table-checkbox">
-          <u-checkbox-group >
+					<!-- 复选框 -->
+          <u-checkbox-group>
             <u-checkbox
-			 :checked="item.value"
+			        :checked="item.value"
               @change="checkboxChange(item)"
               shape="circle"
             ></u-checkbox>
@@ -46,8 +48,9 @@
           </view>
         </view>
         <view :class="item.color"> {{ item.status }} </view>
+				<!-- 眼睛图标、查看 -->
         <view class="table-icon">
-          <view class="icon-info" @click="eyeLoock(item.applyNo)"></view>
+          <view class="icon-info" @click="eyeLoock(item.applyNo, item)"></view>
         </view>
       </view>
     </view>
@@ -56,8 +59,7 @@
       mode="bottom"
       :round="10"
       :closeOnClickOverlay="false"
-      @close="close"
-    >
+      @close="close">
       <view class="popup">
 				<view class="title">提示</view>
         <view class="content">
@@ -74,8 +76,7 @@
       mode="bottom"
       :round="10"
       :closeOnClickOverlay="false"
-      @close="close"
-    >
+      @close="close">
       <view class="popup">
 				<view class="title">提示</view>
         <view class="content"> 确定要将{{ text }}的{{ leixin }}? </view>
@@ -90,11 +91,10 @@
       :show="startTimeShow"
       mode="datetime"
       title="请选择开始时间"
-	  v-model="startTimeDefult"
+	    v-model="startTimeDefult"
       :formatter="formatter"
       @cancel="closeTime"
-      @confirm="confirmTime"
-    >
+      @confirm="confirmTime">
     </u-datetime-picker>
 		
     <u-datetime-picker
@@ -102,14 +102,13 @@
       mode="datetime"
       title="请选择结束时间"
       :formatter="formatter"
-	  v-model="endTimeDefult"
+	    v-model="endTimeDefult"
       @cancel="closeTime"
-      @confirm="confirmEndTime"
-    >
+      @confirm="confirmEndTime">
     </u-datetime-picker>
     <u-action-sheet
       :show="statusShow"
-      :actions="statusList"
+      :actions="isManager ? statusListManager : statusList"
       title="请选择状态"
       description="只能单选"
       @close="statusShow = false"
@@ -133,7 +132,7 @@
 <script>
 import TabBar from "@/components/tabBar/tabBar.vue";
 import { getList } from "@/api/list.js";
-import { debounce } from "@/common/utils.js";
+import { debounce, deepCopy } from "@/common/utils.js";
 import { getLastMonth } from "@/common/formatTime.js";
 import { solveStatus } from "@/api/message.js";
 import { verifyPhone } from "@/api/index.js";
@@ -147,17 +146,19 @@
   },
   data() {
     return {
+			checkRadio: null, //单选框选中
+			isManager: false, //是否是物业管理员
 			scrollTop: 0,
       queryList: {
         keywords: "",
         startTime: "",
         endTime: "",
         status: "",
-		offset: this.offset,
-		limit: this.limit
+				offset: this.offset,
+				limit: this.limit
       },
-	  startTimeDefult:Number(new Date()),
-	  endTimeDefult:Number(new Date()),
+			startTimeDefult:Number(new Date()),
+			endTimeDefult:Number(new Date()),
       list: [],
       isExportShow: false,
       ispassShow: false,
@@ -169,11 +170,18 @@
       endTimeShow: false,
       TimeNextShow: false,
       statusShow: false,
-      statusList: [
+      statusListManager: [
         { name: "申请已提交", id: "1" },
         { name: "申请已通过", id: "2" },
         { name: "申请已失败", id: "3" },
+				{ name: "全部", id: "0" },
       ],
+			statusList: [
+			  { name: "申请中", id: "1" },
+			  { name: "申请已通过", id: "2" },
+			  { name: "申请已失败", id: "3" },
+				{ name: "全部", id: "0" },
+			],
       time: "筛选时间",
       isTimeQ: "",
       isTimeZ: "",
@@ -208,19 +216,16 @@
     const curPage = pages[pages.length - 1];
     this.currentPagePath = curPage.route;
     uni.setStorageSync("currentPagePath", this.currentPagePath);
-
     //验证手机号
     this.phone = uni.getStorageSync("registerPhone");
     this.checkphone();
-		
-		
     this.queryList = {
       keywords: "",
       startTime: "",
       endTime: "",
       status: "",
-		offset: this.offset,
-		limit: this.limit
+			offset: this.offset,
+			limit: this.limit
     };
 		const param = {
 			offset: 1,
@@ -230,17 +235,17 @@
     const res = await getList(this.queryList);
     this.list = res.records.map((item) => {
 		item.value = false
-      if (item.visitorApplyStatus == "1") {
-        item.status = "申请已提交";
-        item.color = "blue";
-      } else if (item.visitorApplyStatus == "2") {
-        item.status = "申请已通过";
-        item.color = "green";
-      } else {
-        item.status = "申请未通过";
-        item.color = "red";
-      }
-      return item;
+		if (item.visitorApplyStatus == "1") {
+			item.status = this.isManager ? "申请已提交" : '申请中';
+			item.color = "blue";
+		} else if (item.visitorApplyStatus == "2") {
+			item.status = "申请已通过";
+			item.color = "green";
+		} else {
+			item.status = "申请未通过";
+			item.color = "red";
+		}
+			return item;
     });
   },
   //下拉刷新
@@ -269,7 +274,13 @@
   methods: {
     //选中的数据
     checkboxChange(item) {
-		item.value = !item.value
+			this.checkRadio = deepCopy(item)
+			if(!this.isManager) { //申请者
+				this.list.forEach(item => {
+					item.value = false
+				})
+			}
+			item.value = !item.value
       if (this.checkboxList.indexOf(item) == -1) {
         this.checkboxList.push(item);
       } else {
@@ -280,47 +291,41 @@
     //搜索框发生改变
     async change(e) {
 			this.offset = 1;
-      if (e.trim() === "") {
+      if (e.trim() === "") { //空
 				const param = {
 					offset: this.offset,
 					limit: this.limit
 				}
         const res = await getList(param);
-        return (this.list = res.records.map((item) => {
-          if (item.visitorApplyStatus == "1") {
-            item.status = "申请已提交";
-            item.color = "blue";
-          } else if (item.visitorApplyStatus == "2") {
-            item.status = "申请已通过";
-            item.color = "green";
-          } else {
-            item.status = "申请未通过";
-            item.color = "red";
-          }
-          return item;
-        }));
+				this.list = res.records.map((item) => {
+				  if (item.visitorApplyStatus == "1") {
+				    item.status = this.isManager ? "申请已提交" : '申请中';
+				    item.color = "blue";
+				  } else if (item.visitorApplyStatus == "2") {
+				    item.status = "申请已通过";
+				    item.color = "green";
+				  } else {
+				    item.status = "申请未通过";
+				    item.color = "red";
+				  }
+				  return item;
+				});
       }
-      debounce(this.searchList(false), 10000);
+      debounce(this.searchList(false, true), 10000);
     },
     //确定导出
     async exportClick() {
       const sessionId = uni.getStorageSync("sessionId");
       let filePath = `${wx.env.USER_DATA_PATH}/${+new Date()}.xlsx`;
       let ids = [];
-      ids =
-        this.checkboxList.length === 0
-          ? this.list.map((item) => item.id)
-          : this.checkboxList.map((item) => item.id);
+      ids = this.checkboxList.length === 0 ? this.list.map((item) => item.id) : this.checkboxList.map((item) => item.id);
       uni.request({
         url: 'https://visitor.gd.smartlog.work/visitor/exportMessage',
         responseType: "arraybuffer",
-		method:"POST",
-		data:{
-			ids
-		},
-        header: {
-          token: sessionId, //自定义请求头信息
-        },
+				method:"POST",
+				data: { ids },
+				//自定义请求头信息
+        header: {  token: sessionId },
         success: ({ data }) => {
           let fm = wx.getFileSystemManager();
           fm.writeFile({
@@ -334,12 +339,12 @@
               });
             },
           });
-        },
-      });
+        }
+      })
       this.checkboxList = [];
     },
     //根据条件搜索
-    async searchList(is) {
+    async searchList(is, isFromChange = false) {
 			if(!this.loading) {
 				this.list = [];
 			}
@@ -350,7 +355,7 @@
       const res = await getList(this.queryList);
 			if(res.records && res.records.length) {
 				this.nothingMore = false;
-				const resData = res.records.map((item) => {
+				const resData = res.records.map((item, index) => {
 				  if (item.visitorApplyStatus == "1") {
 				    item.status = "申请已提交";
 				    item.color = "blue";
@@ -363,7 +368,11 @@
 				  }
 				  return item;
 				});
-				this.list = this.list.concat(resData);
+				if(isFromChange) {
+					this.list = resData
+				} else {
+					this.list = this.list.concat(resData);
+				}
 			} else {
 				this.nothingMore = true;
 			}
@@ -373,6 +382,9 @@
 			this.offset = 1;
       this.statusInfo = e.name;
       this.queryList.status = e.id;
+			if(e.id === '0') {
+				this.queryList.status = ''
+			}
       this.searchList(false);
     },
     //打开导出提示框
@@ -382,18 +394,18 @@
       this.ispassShow = true;
     },
     async possQr() {
-	  const statusList = this.checkboxList.length === 0 ? this.list.filter((item) => item.visitorApplyStatus === '1') : this.checkboxList.filter((item) => item.visitorApplyStatus === '1')
-	  let ids = statusList.map((item) => item.id).join();
-	  if( ids === '') {
-		  this.checkboxList = [];
-		  this.ispassShow = false;
-		  this.searchList(false);
-		  return uni.showToast({
-				title: `暂无需要改动状态人员`,
-				icon: 'none',
-				duration: 2000,
-			})
-	  }
+			const statusList = this.checkboxList.length === 0 ? this.list.filter((item) => item.visitorApplyStatus === '1') : this.checkboxList.filter((item) => item.visitorApplyStatus === '1')
+			let ids = statusList.map((item) => item.id).join();
+			if( ids === '') {
+				this.checkboxList = [];
+				this.ispassShow = false;
+				this.searchList(false);
+				return uni.showToast({
+					title: `暂无需要改动状态人员`,
+					icon: 'none',
+					duration: 2000,
+				})
+			}
       let res = await solveStatus(this.leixin == "通过" ? "2" : "3", ids);
       this.searchList(false);
       this.ispassShow = false;
@@ -403,26 +415,34 @@
       this.exportClick();
       this.isExportShow = false;
     },
-    eyeLoock(messageId) {
-      wx.navigateTo({
-        url: `/pages/info/info?messageId=${messageId}`,
-      });
+    //点击查看
+		eyeLoock(messageId, item) {
+			if(this.isManager) {
+				wx.navigateTo({
+				  url: `/pages/info/info?messageId=${messageId}`,
+				});
+			} else {
+				wx.navigateTo({
+					url: '/pagesA/checkListInfo/checkListInfo?form=' + encodeURIComponent(JSON.stringify(item)),
+				})
+			}
     },
     //取消选择时间
     closeTime() {
-	  this.offset = 1;
+			this.offset = 1;
       this.startTimeShow = false;
       this.time = "筛选时间";
       this.queryList = {
-        keywords: "",
+        keywords: this.queryList.keywords,
         startTime: "",
         endTime: "",
-        status: "",
-		offset: this.offset,
-		limit: this.limit
+        status: this.queryList.status,
+				offset: this.offset,
+				limit: this.limit
       };
-	  this.startTimeShow = false;
-	  this.endTimeShow = false;
+			this.startTimeShow = false;
+			this.endTimeShow = false;
+			this.searchList(false)
     },
     //确定选择结束时间
     async confirmEndTime(e) {
@@ -482,7 +502,7 @@
       }
       return value;
     },
-
+		//验证手机号-不通过跳转注册页面
     async checkphone() {
       //有电话就去验证
       if (this.phone) {
@@ -493,7 +513,9 @@
           });
         } else {
           uni.setStorageSync("registerPhone", this.phone);
-          getUserProfile();
+          await getUserProfile(); //获取用户信息
+					const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
+					// this.isManager = userInfo.salt === '物业人员'
         }
       } else {
         //没有电话就弹出授权
@@ -510,9 +532,23 @@
 		  this.loading = true;
 		  await this.searchList(true);
 		  this.loading = false;
-		}
-  },
-};
+		},
+		//跳转申请者信息提交模板页面
+		goSubmitInfo() {
+			if(!this.checkRadio) {
+				wx.showToast({
+					title: '请选中',
+					icon: 'none'
+				});
+				return
+			}
+			wx.navigateTo({
+				url: '/pagesA/submitInfo/submitInfo?form=' + encodeURIComponent(JSON.stringify(this.checkRadio)),
+			})
+			this.checkRadio = null
+		},
+	}
+}
 </script>
 
 <style scoped lang="scss">
@@ -592,25 +628,33 @@
       margin-left: 30rpx;
       width: 210rpx;
       display: flex;
-      justify-content: space-between;
+      justify-content: flex-end;
       align-items: center;
       .close-circle {
         width: 55rpx;
         height: 55rpx;
-        background: url(@/static/listIcon/noNext.png) no-repeat;
+        background: url('@/static/listIcon/template.png') no-repeat;
         background-size: contain;
+				margin-left: 16rpx;
       }
+			.template {
+				width: 55rpx;
+				height: 55rpx;
+				background: url('@/static/listIcon/template.png') no-repeat;
+				background-size: contain;
+			}
       .checkmark-circle {
         width: 55rpx;
         height: 55rpx;
-        background: url(@/static/listIcon/next.png) no-repeat;
+        background: url('@/static/listIcon/next.png') no-repeat;
         background-size: contain;
       }
       .share-square {
         width: 55rpx;
         height: 55rpx;
-        background: url(@/static/listIcon/export.png) no-repeat;
+        background: url('@/static/listIcon/export.png') no-repeat;
         background-size: contain;
+				margin-left: 16rpx;
       }
     }
   }
diff --git a/pages/message/message.vue b/pages/message/message.vue
index 4fd4cb3..0372e4f 100644
--- a/pages/message/message.vue
+++ b/pages/message/message.vue
@@ -1,7 +1,19 @@
 <!-- 消息 -->
 <template>
   <view class="message">
-    <TabBar></TabBar>
+    <!-- <TabBar></TabBar> -->
+		<u-empty 
+			:show="!list.length" 
+			mode="coupon"  
+			width="300"
+			height="260"
+			text="暂无消息"
+			iconColor="#ff7b7c"
+			textColor="#333"
+			textSize="18"
+			icon="http://cdn.uviewui.com/uview/empty/coupon.png"
+			marginTop="20">
+		</u-empty>
     <view class="main" v-for="(item, index) in list" :key="index">
       <view class="date-time">{{ item.messageTime }}</view>
       <view class="card" @click="clickDetail(item.id)">
@@ -14,16 +26,9 @@
               <text class="number">{{ item.number }}</text>
             </view>
 
-            <view
-              :class="
-                item.status === '未通过'
-                  ? 'button-area'
-                  : item.status === '已通过'
-                  ? 'button-area pass'
-                  : 'button-area submit'
-              "
-              >申请{{ item.status }}</view
-            >
+            <view :class=" item.status === '未通过' ? 'button-area' : item.status === '已通过' ? 'button-area pass' : 'button-area submit'">
+							申请{{ item.status }}
+						</view>
           </view>
           <view class="ui-time">
             <text class="start">{{ item.startTime }}</text>
@@ -52,7 +57,7 @@
 
    <!-- 获取手机号popup组件 -->
    <GetPhonePopup :popShow="popShow" @closePop="closePop" @refresh="refresh"/>
-	 <LoadingList :loading="loading" :nothingMore="nothingMore" />
+	 <LoadingList :loading="loading" :nothingMore="nothingMore && list.length" />
 	 
 	 <!-- 返回顶部 -->
 	 <u-back-top 
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index 7309d58..289a682 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -1,7 +1,7 @@
 /** * 我的 */
 <template>
   <view class="mine">
-    <TabBar></TabBar>
+    <!-- <TabBar></TabBar> -->
 		<view class="image-area">
 			<u-avatar :src="img" size='80'></u-avatar>
 		</view>
@@ -50,8 +50,8 @@
 					value: ''
 				},
 				{
-					id: 'type',
-					name: '员工类型',
+					id: 'documentTypeName',
+					name: '证件类型',
 					value: ''
 				},
 				{
@@ -135,7 +135,7 @@
 			this.img = userInfo.avatar;
 			console.log('头像url', this.img)
 			this.id = userInfo.id;
-			//物业人员0，安保人员1，正式员工2
+			//证件类型：1工作证 、 2出入证
 			this.$set(this.list, 0,  {
 					id: 'number',
 					name: '员工号',
@@ -147,9 +147,9 @@
 					value: userInfo.name
 			});
 			this.$set(this.list, 2,  {
-					id: 'type',
-					name: '员工类型',
-					value: userInfo.salt
+					id: 'documentTypeName',
+					name: '证件类型',
+					value: userInfo.documentTypeName
 			});
 			this.$set(this.list, 3,  {
 					id: 'phone',
diff --git a/pages/register/register.vue b/pages/register/register.vue
index 7e5f96b..ddc15f0 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -9,21 +9,21 @@
       <view class="content">
         <u--form labelPosition="left" :model="form" :rules="rules" ref="form1">
           <u-form-item
-            label="员工号码"
+            label="员工证件编号"
             prop="account"
-            labelWidth="80"
+            labelWidth="110"
             class="form-item"
           >
             <u--input
               v-model="form.account"
               border="none"
-              placeholder="请输入员工号码"
+              placeholder="请输入员工证件编号"
             ></u--input>
           </u-form-item>
           <u-form-item
             label="员工姓名"
             prop="name"
-            labelWidth="80"
+            labelWidth="110"
             class="form-item"
           >
             <u--input
@@ -33,20 +33,17 @@
             ></u--input>
           </u-form-item>
           <u-form-item
-            label="员工类型"
-            prop="type"
+            label="证件类型"
             class="form-item form-item-border"
-            labelWidth="80"
+            labelWidth="110"
           >
-            <u-button @click="typeLx">{{
-              form.type || "请选择员工类型"
-            }}</u-button>
+            <u-button @click="typeLx">{{form.documentTypeName || "请选择证件类型"}}</u-button>
           </u-form-item>
           <u-form-item
             label="手机号码"
             prop="phone"
             borderBottom
-            labelWidth="80"
+            labelWidth="110"
             class="form-item"
           >
             <u-button
@@ -60,24 +57,26 @@
           </u-form-item>
         </u--form>
         <u-button type="error" text="注 册" @click="registerGo"></u-button>
+				
+				<!-- 证件类型选择框 -->
         <u-action-sheet
           :show="show"
-          :actions="list"
-          title="请选择员工类型"
+          :actions="certificateList"
+          title="请选择证件类型"
           description="只能单选"
           @close="show = false"
-          @select="sexSelect"
+          @select="confirmSelect"
         >
         </u-action-sheet>
 				
+				<!-- 拒绝注册弹出框 -->
         <u-popup
           :show="jujueShow"
           mode="bottom"
           :round="10"
           :closeOnClickOverlay="false"
           @close="close"
-          @open="open"
-        >
+          @open="open">
           <view class="popup">
 						<view class="title">提示</view>
             <view class="content"> 拒绝将无法进行注册! </view>
@@ -94,27 +93,28 @@
           </view>
         </u-popup>
 				
+				<!-- 注册成功弹出框 -->
         <u-popup
           :show="successShow"
           mode="bottom"
           :round="10"
           :closeOnClickOverlay="false"
           @close="close"
-          @open="open"
-        >
+          @open="open">
           <view class="popup">
 						<view class="title">提示</view>
             <view class="content"> 注册成功! </view>
           </view>
         </u-popup>
+				
+				<!-- 注册失败弹出框 -->
         <u-popup
           :show="errorShow"
           mode="bottom"
           :round="10"
           :closeOnClickOverlay="false"
           @close="close"
-          @open="open"
-        >
+          @open="open">
           <view class="popup">
 						<view class="title">提示</view>
             <view class="content">
@@ -155,23 +155,27 @@
         ],
       },
       form: {
-        account: "", //员工号
+        account: "", //证件编号
         name: "", //姓名
-        type: "", //员工类型
         phone: "", //电话
-        salt: "", //员工类型id
+				documentType: '', //证件类型
+				documentTypeName: '', //证件类型名称
       },
-      tips: {
-        text: "请选择员工类型",
-        color: "#909399",
-        fontSize: 24,
-      },
-      list: [],
-      show: false,
-      // sqShow: false,
-      jujueShow: false,
-      successShow: false,
-      errorShow: false,
+			//证件类型筛选列表
+      certificateList: [
+				{
+					id: '1',
+					name: '工作证'
+				},
+				{
+					id: '0',
+					name: '出入证'
+				},
+			],
+      show: false, //控制证件类型筛选显隐
+      jujueShow: false, //控制拒绝注册弹出框显隐
+      successShow: false, //控制成功注册弹出框显隐
+      errorShow: false, 
       code: "",
     };
   },
@@ -190,18 +194,14 @@
     },
     //点击注册
     async registerGo() {
-      if (
-        this.form.account.trim() == "" ||
-        this.form.name.trim() == "" ||
-        this.form.salt.trim() == "" ||
-        this.form.phone.trim() == ""
-      ) {
+      if (this.form.account.trim() == "" ||this.form.name.trim() == "" ||this.form.documentTypeName.trim() == "" ||this.form.phone.trim() == "") {
         return uni.showToast({
           title: `请将注册数据填写完整`,
           icon: "none",
           duration: 2000,
         });
       }
+			console.log('9999',this.form)
       const res = await getUserRegister(this.form);
         // this.successShow = true;
 			uni.showToast({
@@ -245,13 +245,10 @@
 				this.jujueShow = true;
 			}
     },
-    //选中员工类型
-    sexSelect(e) {
-      setTimeout(() => {
-        this.form.type = e.name;
-        this.form.salt = e.id;
-      }, 30);
-      // this.$refs.form1.validateField('userInfo.sex')
+    //选中证件类型
+    confirmSelect(e) {
+			this.form.documentType = e.id 
+			this.form.documentTypeName = e.name
     },
   },
 };
diff --git a/pagesA/changeListInfo/changeListInfo.vue b/pagesA/changeListInfo/changeListInfo.vue
new file mode 100644
index 0000000..8183fd0
--- /dev/null
+++ b/pagesA/changeListInfo/changeListInfo.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pagesA/checkListInfo/checkListInfo.vue b/pagesA/checkListInfo/checkListInfo.vue
new file mode 100644
index 0000000..0f7dff2
--- /dev/null
+++ b/pagesA/checkListInfo/checkListInfo.vue
@@ -0,0 +1,157 @@
+<!-- 点击列表的查看--信息查看页面 -->
+<template>
+	<view class="check-list-info">
+		<view class="form">
+			<u--form labelPosition="left" :model="form">
+				<u-form-item label="申请单号" prop="staffCode" borderBottom labelWidth="100">
+					{{form.applyNo}}
+				</u-form-item>
+				<u-form-item label="申请状态" borderBottom labelWidth="100" >
+					<view :class="form.status === '申请中' ? 'blue' : form.status === '申请不通过' ? 'red' : 'green'">
+						{{form.status}}
+					</view>
+				</u-form-item>
+				<u-form-item label="申请者工号" prop="staffCode" borderBottom labelWidth="100">
+					{{form.staffCode}}
+				</u-form-item>
+				<u-form-item label="申请者名字" borderBottom labelWidth="100">
+					{{form.staffName}}
+				</u-form-item>
+				<u-form-item label="申请者手机号" borderBottom labelWidth="100">
+					{{form.staffPhone}}
+				</u-form-item>
+				<u-form-item label="访客姓名" prop="visitorName" labelWidth="100" borderBottom>
+					{{form.visitorName}}
+				</u-form-item>
+				<u-form-item label="访客身份证" prop="visitorIdCard" borderBottom labelWidth="100">
+					{{form.visitorIdCard}}
+				</u-form-item>
+				<u-form-item label="访客联系方式" prop="visitorPhone" borderBottom labelWidth="100">
+					{{form.visitorPhone}}
+				</u-form-item>
+				<u-form-item label="访问目的" prop="visitReason" borderBottom labelWidth="100">
+					{{form.visitReason}}
+				</u-form-item>
+				<u-form-item label="访问楼栋" prop="visitPosition" borderBottom labelWidth="100">
+					{{form.visitPosition}}
+				</u-form-item>
+				<u-form-item label="访问时间" prop="inTime" borderBottom labelWidth="100">
+					{{form.inTime}} ~ {{form.outTime}}
+				</u-form-item>
+				<u-form-item label="备注" borderBottom labelWidth="100">
+					{{form.remarks}}
+				</u-form-item>
+			</u--form>
+		</view>
+		<view style="display: flex;justify-content: space-around;margin-top: 32px;">
+			<u-button customStyle="border: none;color: #fff;font-weight: 600;width: 200rpx;font-size:16px;" type="primary" @click="changeApply">修改申请</u-button>
+			<u-button customStyle="border: none;color: #fff;font-weight: 600;width: 200rpx;font-size:16px;" type="error" @click="deleteApply">删除申请</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { delApply } from '@/api/information.js'
+	export default {
+		data() {
+			return {
+				form: {
+					id: '', //主键
+					applyNo: '', //申请单号
+					visitorName: '',
+					visitorIdCard: '',
+					visitorPhone: '',
+					visitReason: '', //访问目的
+					visitPosition: '', //访问楼栋
+					inTime: '', //开始时间
+					outTime: '', //结束时间
+					staffCode: '',
+					staffName: '',
+					remarks: '',
+					staffPhone: '', // 申请者手机号
+					status: '', //申请状态
+				},
+			}
+		},
+		onLoad(options) {
+			const getFormData = JSON.parse(decodeURIComponent(options.form))
+			console.log(getFormData)
+			this.form.id = getFormData.id //申请单号
+			this.form.applyNo = getFormData.applyNo //申请单号
+			this.form.inTime = getFormData.inTime //开始时间
+			this.form.outTime = getFormData.outTime //结束时间
+			this.form.visitorName = getFormData.visitorName //访客姓名
+			this.form.visitorIdCard = getFormData.visitorIdCard //访客身份证
+			this.form.visitorPhone = getFormData.visitorPhone
+			this.form.visitReason = getFormData.visitReason //访问目的
+			this.form.visitPosition = getFormData.visitPosition //访问楼栋
+			this.form.staffCode = getFormData.staffCode //申请者工号
+			this.form.staffName = getFormData.staffName //申请者姓名
+			this.form.remarks = getFormData.remarks //备注
+			this.form.staffPhone = getFormData.staffPhone || '' // 申请者手机号
+			this.form.status = getFormData.status || '' // 申请者手机号
+		},
+		methods: {
+			//点击删除申请
+			async deleteApply() {
+				const res = delApply(this.form.id)
+				wx.showToast({
+					title: '删除成功',
+					icon: 'success',
+					duration: 3000
+				})
+				setTimeout(() => {
+					wx.switchTab({
+						url: '/pages/list/list'
+					})
+				}, 1000)
+			},
+			//点击修改申请
+			changeApply() {
+				
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	.check-list-info {
+		padding: 22rpx;
+	
+		.form {
+			padding: 40rpx 32rpx;
+			border-radius: 10rpx;
+			background-color: #fff;
+		}
+		.blue {
+			color: #1076e3;
+		}
+		.red {
+			color: #f02a0a;
+		}
+		.green {
+			color: #2ebf00;
+		}
+	}
+</style>
+<style lang="scss">
+	.check-list-info {
+		.u-form-item__body__right__content__slot {
+			text-align: right;
+			// color: #999;
+		}
+		.uicon-arrow-right {
+			position: absolute !important;
+			right: 10rpx;
+			bottom: 0;
+		}
+		.u-input__content__field-wrapper__field {
+			text-align: right !important;
+		}
+		.u-form-item__body__right__message {
+			text-align: right !important;
+		}
+		.u-form-item__body__left__content__label {
+			font-weight: 600;
+		}
+	}
+</style>

diff --git a/api/information.js b/api/information.js
index 53cb95e..70d566b 100644
--- a/api/information.js
+++ b/api/information.js
@@ -5,6 +5,7 @@
 const Submit = BASE_URL + '/visitor/apply/submit'
 const visitReason = BASE_URL + '/sys/dict/code/visitReason'
 const devicePosition = BASE_URL + '/sys/dict/code/devicePosition'
+const DEL_APPLY = BASE_URL + 'visitor/delApply'
 
 /**
  * 提交访客记录
@@ -31,4 +32,15 @@
 export function getResourceType(code) {
 	useNetWork();
   return fetch.get(devicePosition).then(res => res);
-}
\ No newline at end of file
+}
+/**
+ * 申请者删除申请
+ * @param {Object} code
+ */
+export function delApply(applyId) {
+	useNetWork();
+	const params = {
+		applyId: applyId
+	}
+  return fetch.get(DEL_APPLY, params).then(res => res);
+}
diff --git a/api/user.js b/api/user.js
index f7690f0..8ed85c8 100644
--- a/api/user.js
+++ b/api/user.js
@@ -35,13 +35,7 @@
  * 注册
  * @param {*}
  */
-export function getUserRegister(data) {
+export function getUserRegister(params) {
   useNetWork();
-  const params = {
-    phone: data.phone,
-    account: data.account,
-    name: data.name,
-    salt: data.salt,
-  };
   return fetch.post(UserRegister, params).then((res) => res);
 }
diff --git a/pages.json b/pages.json
index 4071ebc..092484a 100644
--- a/pages.json
+++ b/pages.json
@@ -1,11 +1,4 @@
 {
-	// "easycom": {
-	// 	// 下载安装的方式需要前面的"@/"，npm安装的方式无需"@/"
-	// 	// 下载安装方式
-	// 	"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
-	// 	// npm安装方式
-	// 	// "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
-	// },
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
 			"path": "pages/index/index",
@@ -39,14 +32,14 @@
 				"onReachBottomDistance": 10
 			}     
     },
-	{
+		{
 			"path" : "pages/information/information",
 			"style" :                                                                                    
 			{
 				"navigationBarTitleText": "访客信息提交",
 				"enablePullDownRefresh": false
 			}     
-	},
+		},
 		{
 			"path" : "pages/list/list",
 			"style" :                                                                                    
@@ -111,39 +104,79 @@
 		"backgroundColor": "#F8F8F8"
 	},
 	"tabBar": {
-		"custom": true,
-		"selectedColor": "#2483b3",
+		// "custom": true,
+		"color": "#7A7E83",
+		"selectedColor": "#c5000a",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
 		// "color": "#ccc",
 		"list": [
 			{
-				"pagePath": "pages/index/index"
+				"pagePath": "pages/index/index",
+				"text": "首页",
+				"iconPath": "static/tabBar/home.png",
+				"selectedIconPath": "/static/tabBar/home_selected.png"
 			},
 			{
-				"pagePath": "pages/message/message"
+				"pagePath": "pages/message/message",
+				"text": "消息",
+				"iconPath": "static/tabBar/message.png",
+				"selectedIconPath": "static/tabBar/message_selected.png"
 			},
 			{
-				"pagePath": "pages/list/list"
+				"pagePath": "pages/list/list",
+				"text": "列表",
+				"iconPath": "static/tabBar/list.png",
+				"selectedIconPath": "static/tabBar/list_selected.png"
 			},
 			{
-				"pagePath": "pages/mine/mine"
+				"pagePath": "pages/mine/mine",
+				"text": "我的",
+				"iconPath": "static/tabBar/mine.png",
+				"selectedIconPath": "static/tabBar/mine_selected.png"
 			}
 		]
 	},
 	"subPackages":[
-	//分包模块
-	{
-	"root" : "pagesA",
-	"pages" : [
-	{
-		"path" : "checkInfo/checkInfo",
-		"style" :                                                                                    
+		//分包模块
 		{
-			"navigationBarTitleText": "",
-			"enablePullDownRefresh": false
+			"root" : "pagesA",
+			"pages" : [
+				{
+					"path" : "checkInfo/checkInfo",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path" : "submitInfo/submitInfo",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "访客信息提交",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path" : "checkListInfo/checkListInfo",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "信息查看",
+						"enablePullDownRefresh": false
+					}
+				}
+			    ,{
+                    "path" : "changeListInfo/changeListInfo",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "",
+                    "enablePullDownRefresh": false
+                }
+                
+                }
+            ]
 		}
-	}
-	]
-	}
 	],
 	"uniIdRouter": {}
 }
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7e9dc36..fdde26f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,7 +1,7 @@
 //首页
 <template>
   <view class="index">
-    <TabBar></TabBar>
+    <!-- <TabBar></TabBar> -->
 		<view class="top">
 			<image src="../../static/logo.png" style="width: 167rpx;height: 150rpx;"></image>
 			<view class="top-title">
@@ -91,30 +91,22 @@
     uni.setStorageSync("currentPagePath", this.currentPagePath);
   },
   methods: {
-    // ...mapMutations(['setNavRect'])
     async handleClick(id) {
-			// subscription();
       this.active = id;
       const sessionId = uni.getStorageSync("sessionId");
       //如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过
       if (!sessionId) {
         await getLogin();
       }
-			// if(id === 'submit') {
-				this.phone = uni.getStorageSync("registerPhone");
-				if (this.phone) {
-				  this.checkphone();
-				} else {
-					//弹获取手机号
-				  this.popShow = true;
-				}
-			// } else {
-			// 	// uni.showToast({
-			// 	// 	title: '敬请期待',
-			// 	// 	icon: 'none'
-			// 	// });
-			// }
+			this.phone = uni.getStorageSync("registerPhone");
+			if (this.phone) {
+				this.checkphone();
+			} else {
+				//弹获取手机号
+				this.popShow = true;
+			}
     },
+		
 		//通过手机号检查是否存在这个用户
     async checkphone() {
       const res = await verifyPhone(this.phone);
@@ -122,25 +114,23 @@
         wx.reLaunch({
           url: "/pages/register/register",
         });
-      } else {
+      } else { // 用户已注册
 				uni.setStorageSync("registerPhone", this.phone);
         await getUserProfile(); //获取人员信息
-				
-			if (uni.getStorageSync("userInfo")) {
-			  const userInfo = JSON.parse(uni.getStorageSync("userInfo"));
-			  this.uid = userInfo.id
-			  if (userInfo.salt === "物业人员") {
-				if(this.active === "submit") {
-					subscription();
-				}
+				if (uni.getStorageSync("userInfo")) {
+					const userInfo = JSON.parse(uni.getStorageSync("userInfo"));
+					this.uid = userInfo.id
+					if (userInfo.salt === "物业人员") {
+					if(this.active === "submit") {
+						subscription();
+					}
 			  } 
 			}
-				
-        if (this.active === "submit") {
-          wx.navigateTo({
-            url: `/pages/information/information?id=${this.active}`,
-          });
-        }else {
+			if (this.active === "submit") {
+				wx.navigateTo({
+					url: `/pages/information/information?id=${this.active}`,
+				});
+			} else {
 			// 判断是否有这个路径
 			const res = await getUserJurisdiction({uid:this.uid})
 			if(res.indexOf('/pages/check/check') !== -1) {
@@ -171,7 +161,8 @@
 	padding: 0 20rpx;
   padding-top: 40rpx;
 	background: linear-gradient(#e7c0c1 0%, #fff 100%);
-  height: 100vh;
+  height: 100%;
+	box-sizing: border-box;
 	z-index: 0;
 	.top {
 		display: flex;
@@ -223,7 +214,7 @@
   }
 	.bottom-img {
 		position: absolute;
-		bottom: 250rpx;
+		bottom: 20rpx;
 		left: 0;
 		width: 100%;
 		height: 220rpx;
diff --git a/pages/information/information.vue b/pages/information/information.vue
index fcf9991..ad0ec91 100644
--- a/pages/information/information.vue
+++ b/pages/information/information.vue
@@ -1,3 +1,4 @@
+<!-- 访客信息提交页面 -->
 <template>
 	<view class="information">
 		<view class="form">
@@ -34,6 +35,9 @@
 				<u-form-item label="申请者名字" borderBottom labelWidth="100">
 					<u--input v-model="callerInfo.staffName" disabled border="none" placeholder="请输入申请者姓名"></u--input>
 				</u-form-item>
+				<u-form-item label="申请者手机号" borderBottom labelWidth="100">
+					<u--input v-model="callerInfo.phone" disabled border="none" placeholder="请输入申请者姓名"></u--input>
+				</u-form-item>
 				<u-form-item label="备注" borderBottom labelWidth="100">
 					<u--input v-model="callerInfo.remarks" border="none" placeholder="请输入备注"></u--input>
 				</u-form-item>
@@ -46,15 +50,37 @@
 					信息提交成功，请等待物业管理员处理。
 				</view>
 			</view>
-			<u-picker :show="show" :columns="columns" @close="show=false" @confirm="getPurpose"></u-picker>
-			<u-picker :show="buildingShow" :columns="buildingColumns" @close="buildingShow=false"
+			<!-- 访问目的 -->
+			<u-picker :show="show" :columns="columns" @cancel="show=false" @confirm="getPurpose"></u-picker>
+			<!-- 访问楼栋 -->
+			<u-picker :show="buildingShow" :columns="buildingColumns" @cancel="buildingShow=false"
 				@confirm="getBuilding">
 			</u-picker>
-			<u-datetime-picker :show="isinTimeShow" v-model="callerInfo.inTime" mode="datetime" title="请选择开始时间"
-				:formatter="formatter"  @cancel="isinTimeShow=false" @change="change" @confirm="closeinTime">
+			<!-- 选择开始时间 -->
+			<u-datetime-picker 
+				:show="isinTimeShow" 
+				v-model="callerInfo.inTime" 
+				mode="datetime" 
+				title="请选择开始时间"
+				:formatter="formatter" 
+				:minDate="inTimeMinDate"
+				:maxDate="inTimeMaxDate"
+				@cancel="isinTimeShow=false" 
+				@change="change" 
+				@confirm="closeinTime">
 			</u-datetime-picker>
-			<u-datetime-picker :show="isTimeShow" v-model="callerInfo.outTime" mode="datetime" title="请选择结束时间"
-				:formatter="formatter"  @cancel="closeTime" @change="change" @confirm="confirmTime">
+			<!-- 选择结束时间 -->
+			<u-datetime-picker 
+				:show="isTimeShow" 
+				v-model="callerInfo.outTime" 
+				mode="datetime" 
+				title="请选择结束时间"
+				:minDate="outTimeMinDate"
+				:maxDate="outTimeMaxDate"
+				:formatter="formatter" 
+				@cancel="closeTime" 
+				@change="change" 
+				@confirm="confirmTime">
 			</u-datetime-picker>
 		</view>
 		<view style="margin-top: 42rpx;">
@@ -67,6 +93,7 @@
 <script>
 	import { getSubmit , getDictCode, getResourceType} from '@/api/information.js'
 	import { subscription } from "@/utils/common.js"
+	import { toHandlerKey } from "vue";
 	export default {
 		data() {
 			return {
@@ -76,11 +103,12 @@
 					visitorPhone: '',
 					visitReason: '',
 					visitPosition: '',
-					inTime: Number(new Date()),
+					inTime: Number(new Date()), //开始时间
 					staffCode: '',
 					staffName: '',
 					remarks: '',
-					outTime: Number(new Date())
+					phone: '', // 申请者手机号
+					outTime: Number(new Date()) //结束时间
 				},
 				rules: {
 					visitorName: [{
@@ -134,18 +162,33 @@
 				buildingShow: false,
 				isinTimeShow: false,
 				columns: [],
-				buildingColumns: []
+				buildingColumns: [],
+				//开始时间最小时间-当前时间
+				inTimeMinDate: new Date(new Date()).getTime(),
+				//开始时间最大时间（一周之内）
+				inTimeMaxDate: new Date(new Date().toLocaleDateString()).getTime()+ 24 * 60 * 60 * 1000 * 7 - 1,
+				//结束时间最小时间（当前时间）
+				outTimeMinDate: new Date(new Date()).getTime(),
+				//结束时间最大时间-默认一周之内
+				outTimeMaxDate: new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 * 7 - 1,
 			}
 		},
+		watch: {
+			//开始时间和结束时间要求是同一天
+			"callerInfo.inTime"(newValue) {
+				this.outTimeMinDate = new Date(newValue).getTime() //结束时间的最小时间是选择的开始时间
+				this.outTimeMaxDate = new Date(new Date(newValue).toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1
+			},
+		},
 		onLoad() {
 			this.callerInfo.inTime = this.shijianc(this.callerInfo.inTime)
 			this.callerInfo.outTime = this.shijianc(this.callerInfo.outTime)
 			const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
 			this.callerInfo.staffCode = userInfo.account
 			this.callerInfo.staffName = userInfo.name
+			this.callerInfo.phone = userInfo.phone
 			this.getDictMap()
 		},
-		
 		mounted() {
 			this.$refs.form1.setRules(this.rules)
 		},
@@ -254,7 +297,7 @@
 		padding: 22rpx;
 
 		.form {
-			padding: 0 32rpx 0;
+			padding: 40rpx 32rpx;
 			border-radius: 10rpx;
 			background-color: #fff;
 		}
diff --git a/pages/list/list.vue b/pages/list/list.vue
index e139fbd..6f84539 100644
--- a/pages/list/list.vue
+++ b/pages/list/list.vue
@@ -1,7 +1,7 @@
-//列表页
+<!-- 列表页 -->
 <template>
   <view class="list">
-    <TabBar></TabBar>
+    <!-- <TabBar></TabBar> -->
     <view class="list-top">
       <u-input
         placeholder="关键字搜索"
@@ -19,18 +19,20 @@
           statusInfo
         }}</text>
         <view class="icon">
-          <text class="checkmark-circle" @click="pass('通过')"></text>
-          <text class="close-circle" @click="pass('拒绝')"></text>
-          <text class="share-square" @click="isExportShow = true"></text>
+          <text v-if="!isManager" class="template" @click="goSubmitInfo"></text>
+          <text v-if="isManager" class="checkmark-circle" @click="pass('通过')"></text>
+          <text v-if="isManager" class="close-circle" @click="pass('拒绝')"></text>
+          <text v-if="isManager" class="share-square" @click="isExportShow = true"></text>
         </view>
       </view>
     </view>
-    <view class="list-content">
+		<view class="list-content">
       <view class="table" v-for="(item, index) in list" :key="index">
         <view class="table-checkbox">
-          <u-checkbox-group >
+					<!-- 复选框 -->
+          <u-checkbox-group>
             <u-checkbox
-			 :checked="item.value"
+			        :checked="item.value"
               @change="checkboxChange(item)"
               shape="circle"
             ></u-checkbox>
@@ -46,8 +48,9 @@
           </view>
         </view>
         <view :class="item.color"> {{ item.status }} </view>
+				<!-- 眼睛图标、查看 -->
         <view class="table-icon">
-          <view class="icon-info" @click="eyeLoock(item.applyNo)"></view>
+          <view class="icon-info" @click="eyeLoock(item.applyNo, item)"></view>
         </view>
       </view>
     </view>
@@ -56,8 +59,7 @@
       mode="bottom"
       :round="10"
       :closeOnClickOverlay="false"
-      @close="close"
-    >
+      @close="close">
       <view class="popup">
 				<view class="title">提示</view>
         <view class="content">
@@ -74,8 +76,7 @@
       mode="bottom"
       :round="10"
       :closeOnClickOverlay="false"
-      @close="close"
-    >
+      @close="close">
       <view class="popup">
 				<view class="title">提示</view>
         <view class="content"> 确定要将{{ text }}的{{ leixin }}? </view>
@@ -90,11 +91,10 @@
       :show="startTimeShow"
       mode="datetime"
       title="请选择开始时间"
-	  v-model="startTimeDefult"
+	    v-model="startTimeDefult"
       :formatter="formatter"
       @cancel="closeTime"
-      @confirm="confirmTime"
-    >
+      @confirm="confirmTime">
     </u-datetime-picker>
 		
     <u-datetime-picker
@@ -102,14 +102,13 @@
       mode="datetime"
       title="请选择结束时间"
       :formatter="formatter"
-	  v-model="endTimeDefult"
+	    v-model="endTimeDefult"
       @cancel="closeTime"
-      @confirm="confirmEndTime"
-    >
+      @confirm="confirmEndTime">
     </u-datetime-picker>
     <u-action-sheet
       :show="statusShow"
-      :actions="statusList"
+      :actions="isManager ? statusListManager : statusList"
       title="请选择状态"
       description="只能单选"
       @close="statusShow = false"
@@ -133,7 +132,7 @@
 <script>
 import TabBar from "@/components/tabBar/tabBar.vue";
 import { getList } from "@/api/list.js";
-import { debounce } from "@/common/utils.js";
+import { debounce, deepCopy } from "@/common/utils.js";
 import { getLastMonth } from "@/common/formatTime.js";
 import { solveStatus } from "@/api/message.js";
 import { verifyPhone } from "@/api/index.js";
@@ -147,17 +146,19 @@
   },
   data() {
     return {
+			checkRadio: null, //单选框选中
+			isManager: false, //是否是物业管理员
 			scrollTop: 0,
       queryList: {
         keywords: "",
         startTime: "",
         endTime: "",
         status: "",
-		offset: this.offset,
-		limit: this.limit
+				offset: this.offset,
+				limit: this.limit
       },
-	  startTimeDefult:Number(new Date()),
-	  endTimeDefult:Number(new Date()),
+			startTimeDefult:Number(new Date()),
+			endTimeDefult:Number(new Date()),
       list: [],
       isExportShow: false,
       ispassShow: false,
@@ -169,11 +170,18 @@
       endTimeShow: false,
       TimeNextShow: false,
       statusShow: false,
-      statusList: [
+      statusListManager: [
         { name: "申请已提交", id: "1" },
         { name: "申请已通过", id: "2" },
         { name: "申请已失败", id: "3" },
+				{ name: "全部", id: "0" },
       ],
+			statusList: [
+			  { name: "申请中", id: "1" },
+			  { name: "申请已通过", id: "2" },
+			  { name: "申请已失败", id: "3" },
+				{ name: "全部", id: "0" },
+			],
       time: "筛选时间",
       isTimeQ: "",
       isTimeZ: "",
@@ -208,19 +216,16 @@
     const curPage = pages[pages.length - 1];
     this.currentPagePath = curPage.route;
     uni.setStorageSync("currentPagePath", this.currentPagePath);
-
     //验证手机号
     this.phone = uni.getStorageSync("registerPhone");
     this.checkphone();
-		
-		
     this.queryList = {
       keywords: "",
       startTime: "",
       endTime: "",
       status: "",
-		offset: this.offset,
-		limit: this.limit
+			offset: this.offset,
+			limit: this.limit
     };
 		const param = {
 			offset: 1,
@@ -230,17 +235,17 @@
     const res = await getList(this.queryList);
     this.list = res.records.map((item) => {
 		item.value = false
-      if (item.visitorApplyStatus == "1") {
-        item.status = "申请已提交";
-        item.color = "blue";
-      } else if (item.visitorApplyStatus == "2") {
-        item.status = "申请已通过";
-        item.color = "green";
-      } else {
-        item.status = "申请未通过";
-        item.color = "red";
-      }
-      return item;
+		if (item.visitorApplyStatus == "1") {
+			item.status = this.isManager ? "申请已提交" : '申请中';
+			item.color = "blue";
+		} else if (item.visitorApplyStatus == "2") {
+			item.status = "申请已通过";
+			item.color = "green";
+		} else {
+			item.status = "申请未通过";
+			item.color = "red";
+		}
+			return item;
     });
   },
   //下拉刷新
@@ -269,7 +274,13 @@
   methods: {
     //选中的数据
     checkboxChange(item) {
-		item.value = !item.value
+			this.checkRadio = deepCopy(item)
+			if(!this.isManager) { //申请者
+				this.list.forEach(item => {
+					item.value = false
+				})
+			}
+			item.value = !item.value
       if (this.checkboxList.indexOf(item) == -1) {
         this.checkboxList.push(item);
       } else {
@@ -280,47 +291,41 @@
     //搜索框发生改变
     async change(e) {
 			this.offset = 1;
-      if (e.trim() === "") {
+      if (e.trim() === "") { //空
 				const param = {
 					offset: this.offset,
 					limit: this.limit
 				}
         const res = await getList(param);
-        return (this.list = res.records.map((item) => {
-          if (item.visitorApplyStatus == "1") {
-            item.status = "申请已提交";
-            item.color = "blue";
-          } else if (item.visitorApplyStatus == "2") {
-            item.status = "申请已通过";
-            item.color = "green";
-          } else {
-            item.status = "申请未通过";
-            item.color = "red";
-          }
-          return item;
-        }));
+				this.list = res.records.map((item) => {
+				  if (item.visitorApplyStatus == "1") {
+				    item.status = this.isManager ? "申请已提交" : '申请中';
+				    item.color = "blue";
+				  } else if (item.visitorApplyStatus == "2") {
+				    item.status = "申请已通过";
+				    item.color = "green";
+				  } else {
+				    item.status = "申请未通过";
+				    item.color = "red";
+				  }
+				  return item;
+				});
       }
-      debounce(this.searchList(false), 10000);
+      debounce(this.searchList(false, true), 10000);
     },
     //确定导出
     async exportClick() {
       const sessionId = uni.getStorageSync("sessionId");
       let filePath = `${wx.env.USER_DATA_PATH}/${+new Date()}.xlsx`;
       let ids = [];
-      ids =
-        this.checkboxList.length === 0
-          ? this.list.map((item) => item.id)
-          : this.checkboxList.map((item) => item.id);
+      ids = this.checkboxList.length === 0 ? this.list.map((item) => item.id) : this.checkboxList.map((item) => item.id);
       uni.request({
         url: 'https://visitor.gd.smartlog.work/visitor/exportMessage',
         responseType: "arraybuffer",
-		method:"POST",
-		data:{
-			ids
-		},
-        header: {
-          token: sessionId, //自定义请求头信息
-        },
+				method:"POST",
+				data: { ids },
+				//自定义请求头信息
+        header: {  token: sessionId },
         success: ({ data }) => {
           let fm = wx.getFileSystemManager();
           fm.writeFile({
@@ -334,12 +339,12 @@
               });
             },
           });
-        },
-      });
+        }
+      })
       this.checkboxList = [];
     },
     //根据条件搜索
-    async searchList(is) {
+    async searchList(is, isFromChange = false) {
 			if(!this.loading) {
 				this.list = [];
 			}
@@ -350,7 +355,7 @@
       const res = await getList(this.queryList);
 			if(res.records && res.records.length) {
 				this.nothingMore = false;
-				const resData = res.records.map((item) => {
+				const resData = res.records.map((item, index) => {
 				  if (item.visitorApplyStatus == "1") {
 				    item.status = "申请已提交";
 				    item.color = "blue";
@@ -363,7 +368,11 @@
 				  }
 				  return item;
 				});
-				this.list = this.list.concat(resData);
+				if(isFromChange) {
+					this.list = resData
+				} else {
+					this.list = this.list.concat(resData);
+				}
 			} else {
 				this.nothingMore = true;
 			}
@@ -373,6 +382,9 @@
 			this.offset = 1;
       this.statusInfo = e.name;
       this.queryList.status = e.id;
+			if(e.id === '0') {
+				this.queryList.status = ''
+			}
       this.searchList(false);
     },
     //打开导出提示框
@@ -382,18 +394,18 @@
       this.ispassShow = true;
     },
     async possQr() {
-	  const statusList = this.checkboxList.length === 0 ? this.list.filter((item) => item.visitorApplyStatus === '1') : this.checkboxList.filter((item) => item.visitorApplyStatus === '1')
-	  let ids = statusList.map((item) => item.id).join();
-	  if( ids === '') {
-		  this.checkboxList = [];
-		  this.ispassShow = false;
-		  this.searchList(false);
-		  return uni.showToast({
-				title: `暂无需要改动状态人员`,
-				icon: 'none',
-				duration: 2000,
-			})
-	  }
+			const statusList = this.checkboxList.length === 0 ? this.list.filter((item) => item.visitorApplyStatus === '1') : this.checkboxList.filter((item) => item.visitorApplyStatus === '1')
+			let ids = statusList.map((item) => item.id).join();
+			if( ids === '') {
+				this.checkboxList = [];
+				this.ispassShow = false;
+				this.searchList(false);
+				return uni.showToast({
+					title: `暂无需要改动状态人员`,
+					icon: 'none',
+					duration: 2000,
+				})
+			}
       let res = await solveStatus(this.leixin == "通过" ? "2" : "3", ids);
       this.searchList(false);
       this.ispassShow = false;
@@ -403,26 +415,34 @@
       this.exportClick();
       this.isExportShow = false;
     },
-    eyeLoock(messageId) {
-      wx.navigateTo({
-        url: `/pages/info/info?messageId=${messageId}`,
-      });
+    //点击查看
+		eyeLoock(messageId, item) {
+			if(this.isManager) {
+				wx.navigateTo({
+				  url: `/pages/info/info?messageId=${messageId}`,
+				});
+			} else {
+				wx.navigateTo({
+					url: '/pagesA/checkListInfo/checkListInfo?form=' + encodeURIComponent(JSON.stringify(item)),
+				})
+			}
     },
     //取消选择时间
     closeTime() {
-	  this.offset = 1;
+			this.offset = 1;
       this.startTimeShow = false;
       this.time = "筛选时间";
       this.queryList = {
-        keywords: "",
+        keywords: this.queryList.keywords,
         startTime: "",
         endTime: "",
-        status: "",
-		offset: this.offset,
-		limit: this.limit
+        status: this.queryList.status,
+				offset: this.offset,
+				limit: this.limit
       };
-	  this.startTimeShow = false;
-	  this.endTimeShow = false;
+			this.startTimeShow = false;
+			this.endTimeShow = false;
+			this.searchList(false)
     },
     //确定选择结束时间
     async confirmEndTime(e) {
@@ -482,7 +502,7 @@
       }
       return value;
     },
-
+		//验证手机号-不通过跳转注册页面
     async checkphone() {
       //有电话就去验证
       if (this.phone) {
@@ -493,7 +513,9 @@
           });
         } else {
           uni.setStorageSync("registerPhone", this.phone);
-          getUserProfile();
+          await getUserProfile(); //获取用户信息
+					const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
+					// this.isManager = userInfo.salt === '物业人员'
         }
       } else {
         //没有电话就弹出授权
@@ -510,9 +532,23 @@
 		  this.loading = true;
 		  await this.searchList(true);
 		  this.loading = false;
-		}
-  },
-};
+		},
+		//跳转申请者信息提交模板页面
+		goSubmitInfo() {
+			if(!this.checkRadio) {
+				wx.showToast({
+					title: '请选中',
+					icon: 'none'
+				});
+				return
+			}
+			wx.navigateTo({
+				url: '/pagesA/submitInfo/submitInfo?form=' + encodeURIComponent(JSON.stringify(this.checkRadio)),
+			})
+			this.checkRadio = null
+		},
+	}
+}
 </script>
 
 <style scoped lang="scss">
@@ -592,25 +628,33 @@
       margin-left: 30rpx;
       width: 210rpx;
       display: flex;
-      justify-content: space-between;
+      justify-content: flex-end;
       align-items: center;
       .close-circle {
         width: 55rpx;
         height: 55rpx;
-        background: url(@/static/listIcon/noNext.png) no-repeat;
+        background: url('@/static/listIcon/template.png') no-repeat;
         background-size: contain;
+				margin-left: 16rpx;
       }
+			.template {
+				width: 55rpx;
+				height: 55rpx;
+				background: url('@/static/listIcon/template.png') no-repeat;
+				background-size: contain;
+			}
       .checkmark-circle {
         width: 55rpx;
         height: 55rpx;
-        background: url(@/static/listIcon/next.png) no-repeat;
+        background: url('@/static/listIcon/next.png') no-repeat;
         background-size: contain;
       }
       .share-square {
         width: 55rpx;
         height: 55rpx;
-        background: url(@/static/listIcon/export.png) no-repeat;
+        background: url('@/static/listIcon/export.png') no-repeat;
         background-size: contain;
+				margin-left: 16rpx;
       }
     }
   }
diff --git a/pages/message/message.vue b/pages/message/message.vue
index 4fd4cb3..0372e4f 100644
--- a/pages/message/message.vue
+++ b/pages/message/message.vue
@@ -1,7 +1,19 @@
 <!-- 消息 -->
 <template>
   <view class="message">
-    <TabBar></TabBar>
+    <!-- <TabBar></TabBar> -->
+		<u-empty 
+			:show="!list.length" 
+			mode="coupon"  
+			width="300"
+			height="260"
+			text="暂无消息"
+			iconColor="#ff7b7c"
+			textColor="#333"
+			textSize="18"
+			icon="http://cdn.uviewui.com/uview/empty/coupon.png"
+			marginTop="20">
+		</u-empty>
     <view class="main" v-for="(item, index) in list" :key="index">
       <view class="date-time">{{ item.messageTime }}</view>
       <view class="card" @click="clickDetail(item.id)">
@@ -14,16 +26,9 @@
               <text class="number">{{ item.number }}</text>
             </view>
 
-            <view
-              :class="
-                item.status === '未通过'
-                  ? 'button-area'
-                  : item.status === '已通过'
-                  ? 'button-area pass'
-                  : 'button-area submit'
-              "
-              >申请{{ item.status }}</view
-            >
+            <view :class=" item.status === '未通过' ? 'button-area' : item.status === '已通过' ? 'button-area pass' : 'button-area submit'">
+							申请{{ item.status }}
+						</view>
           </view>
           <view class="ui-time">
             <text class="start">{{ item.startTime }}</text>
@@ -52,7 +57,7 @@
 
    <!-- 获取手机号popup组件 -->
    <GetPhonePopup :popShow="popShow" @closePop="closePop" @refresh="refresh"/>
-	 <LoadingList :loading="loading" :nothingMore="nothingMore" />
+	 <LoadingList :loading="loading" :nothingMore="nothingMore && list.length" />
 	 
 	 <!-- 返回顶部 -->
 	 <u-back-top 
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index 7309d58..289a682 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -1,7 +1,7 @@
 /** * 我的 */
 <template>
   <view class="mine">
-    <TabBar></TabBar>
+    <!-- <TabBar></TabBar> -->
 		<view class="image-area">
 			<u-avatar :src="img" size='80'></u-avatar>
 		</view>
@@ -50,8 +50,8 @@
 					value: ''
 				},
 				{
-					id: 'type',
-					name: '员工类型',
+					id: 'documentTypeName',
+					name: '证件类型',
 					value: ''
 				},
 				{
@@ -135,7 +135,7 @@
 			this.img = userInfo.avatar;
 			console.log('头像url', this.img)
 			this.id = userInfo.id;
-			//物业人员0，安保人员1，正式员工2
+			//证件类型：1工作证 、 2出入证
 			this.$set(this.list, 0,  {
 					id: 'number',
 					name: '员工号',
@@ -147,9 +147,9 @@
 					value: userInfo.name
 			});
 			this.$set(this.list, 2,  {
-					id: 'type',
-					name: '员工类型',
-					value: userInfo.salt
+					id: 'documentTypeName',
+					name: '证件类型',
+					value: userInfo.documentTypeName
 			});
 			this.$set(this.list, 3,  {
 					id: 'phone',
diff --git a/pages/register/register.vue b/pages/register/register.vue
index 7e5f96b..ddc15f0 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -9,21 +9,21 @@
       <view class="content">
         <u--form labelPosition="left" :model="form" :rules="rules" ref="form1">
           <u-form-item
-            label="员工号码"
+            label="员工证件编号"
             prop="account"
-            labelWidth="80"
+            labelWidth="110"
             class="form-item"
           >
             <u--input
               v-model="form.account"
               border="none"
-              placeholder="请输入员工号码"
+              placeholder="请输入员工证件编号"
             ></u--input>
           </u-form-item>
           <u-form-item
             label="员工姓名"
             prop="name"
-            labelWidth="80"
+            labelWidth="110"
             class="form-item"
           >
             <u--input
@@ -33,20 +33,17 @@
             ></u--input>
           </u-form-item>
           <u-form-item
-            label="员工类型"
-            prop="type"
+            label="证件类型"
             class="form-item form-item-border"
-            labelWidth="80"
+            labelWidth="110"
           >
-            <u-button @click="typeLx">{{
-              form.type || "请选择员工类型"
-            }}</u-button>
+            <u-button @click="typeLx">{{form.documentTypeName || "请选择证件类型"}}</u-button>
           </u-form-item>
           <u-form-item
             label="手机号码"
             prop="phone"
             borderBottom
-            labelWidth="80"
+            labelWidth="110"
             class="form-item"
           >
             <u-button
@@ -60,24 +57,26 @@
           </u-form-item>
         </u--form>
         <u-button type="error" text="注 册" @click="registerGo"></u-button>
+				
+				<!-- 证件类型选择框 -->
         <u-action-sheet
           :show="show"
-          :actions="list"
-          title="请选择员工类型"
+          :actions="certificateList"
+          title="请选择证件类型"
           description="只能单选"
           @close="show = false"
-          @select="sexSelect"
+          @select="confirmSelect"
         >
         </u-action-sheet>
 				
+				<!-- 拒绝注册弹出框 -->
         <u-popup
           :show="jujueShow"
           mode="bottom"
           :round="10"
           :closeOnClickOverlay="false"
           @close="close"
-          @open="open"
-        >
+          @open="open">
           <view class="popup">
 						<view class="title">提示</view>
             <view class="content"> 拒绝将无法进行注册! </view>
@@ -94,27 +93,28 @@
           </view>
         </u-popup>
 				
+				<!-- 注册成功弹出框 -->
         <u-popup
           :show="successShow"
           mode="bottom"
           :round="10"
           :closeOnClickOverlay="false"
           @close="close"
-          @open="open"
-        >
+          @open="open">
           <view class="popup">
 						<view class="title">提示</view>
             <view class="content"> 注册成功! </view>
           </view>
         </u-popup>
+				
+				<!-- 注册失败弹出框 -->
         <u-popup
           :show="errorShow"
           mode="bottom"
           :round="10"
           :closeOnClickOverlay="false"
           @close="close"
-          @open="open"
-        >
+          @open="open">
           <view class="popup">
 						<view class="title">提示</view>
             <view class="content">
@@ -155,23 +155,27 @@
         ],
       },
       form: {
-        account: "", //员工号
+        account: "", //证件编号
         name: "", //姓名
-        type: "", //员工类型
         phone: "", //电话
-        salt: "", //员工类型id
+				documentType: '', //证件类型
+				documentTypeName: '', //证件类型名称
       },
-      tips: {
-        text: "请选择员工类型",
-        color: "#909399",
-        fontSize: 24,
-      },
-      list: [],
-      show: false,
-      // sqShow: false,
-      jujueShow: false,
-      successShow: false,
-      errorShow: false,
+			//证件类型筛选列表
+      certificateList: [
+				{
+					id: '1',
+					name: '工作证'
+				},
+				{
+					id: '0',
+					name: '出入证'
+				},
+			],
+      show: false, //控制证件类型筛选显隐
+      jujueShow: false, //控制拒绝注册弹出框显隐
+      successShow: false, //控制成功注册弹出框显隐
+      errorShow: false, 
       code: "",
     };
   },
@@ -190,18 +194,14 @@
     },
     //点击注册
     async registerGo() {
-      if (
-        this.form.account.trim() == "" ||
-        this.form.name.trim() == "" ||
-        this.form.salt.trim() == "" ||
-        this.form.phone.trim() == ""
-      ) {
+      if (this.form.account.trim() == "" ||this.form.name.trim() == "" ||this.form.documentTypeName.trim() == "" ||this.form.phone.trim() == "") {
         return uni.showToast({
           title: `请将注册数据填写完整`,
           icon: "none",
           duration: 2000,
         });
       }
+			console.log('9999',this.form)
       const res = await getUserRegister(this.form);
         // this.successShow = true;
 			uni.showToast({
@@ -245,13 +245,10 @@
 				this.jujueShow = true;
 			}
     },
-    //选中员工类型
-    sexSelect(e) {
-      setTimeout(() => {
-        this.form.type = e.name;
-        this.form.salt = e.id;
-      }, 30);
-      // this.$refs.form1.validateField('userInfo.sex')
+    //选中证件类型
+    confirmSelect(e) {
+			this.form.documentType = e.id 
+			this.form.documentTypeName = e.name
     },
   },
 };
diff --git a/pagesA/changeListInfo/changeListInfo.vue b/pagesA/changeListInfo/changeListInfo.vue
new file mode 100644
index 0000000..8183fd0
--- /dev/null
+++ b/pagesA/changeListInfo/changeListInfo.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pagesA/checkListInfo/checkListInfo.vue b/pagesA/checkListInfo/checkListInfo.vue
new file mode 100644
index 0000000..0f7dff2
--- /dev/null
+++ b/pagesA/checkListInfo/checkListInfo.vue
@@ -0,0 +1,157 @@
+<!-- 点击列表的查看--信息查看页面 -->
+<template>
+	<view class="check-list-info">
+		<view class="form">
+			<u--form labelPosition="left" :model="form">
+				<u-form-item label="申请单号" prop="staffCode" borderBottom labelWidth="100">
+					{{form.applyNo}}
+				</u-form-item>
+				<u-form-item label="申请状态" borderBottom labelWidth="100" >
+					<view :class="form.status === '申请中' ? 'blue' : form.status === '申请不通过' ? 'red' : 'green'">
+						{{form.status}}
+					</view>
+				</u-form-item>
+				<u-form-item label="申请者工号" prop="staffCode" borderBottom labelWidth="100">
+					{{form.staffCode}}
+				</u-form-item>
+				<u-form-item label="申请者名字" borderBottom labelWidth="100">
+					{{form.staffName}}
+				</u-form-item>
+				<u-form-item label="申请者手机号" borderBottom labelWidth="100">
+					{{form.staffPhone}}
+				</u-form-item>
+				<u-form-item label="访客姓名" prop="visitorName" labelWidth="100" borderBottom>
+					{{form.visitorName}}
+				</u-form-item>
+				<u-form-item label="访客身份证" prop="visitorIdCard" borderBottom labelWidth="100">
+					{{form.visitorIdCard}}
+				</u-form-item>
+				<u-form-item label="访客联系方式" prop="visitorPhone" borderBottom labelWidth="100">
+					{{form.visitorPhone}}
+				</u-form-item>
+				<u-form-item label="访问目的" prop="visitReason" borderBottom labelWidth="100">
+					{{form.visitReason}}
+				</u-form-item>
+				<u-form-item label="访问楼栋" prop="visitPosition" borderBottom labelWidth="100">
+					{{form.visitPosition}}
+				</u-form-item>
+				<u-form-item label="访问时间" prop="inTime" borderBottom labelWidth="100">
+					{{form.inTime}} ~ {{form.outTime}}
+				</u-form-item>
+				<u-form-item label="备注" borderBottom labelWidth="100">
+					{{form.remarks}}
+				</u-form-item>
+			</u--form>
+		</view>
+		<view style="display: flex;justify-content: space-around;margin-top: 32px;">
+			<u-button customStyle="border: none;color: #fff;font-weight: 600;width: 200rpx;font-size:16px;" type="primary" @click="changeApply">修改申请</u-button>
+			<u-button customStyle="border: none;color: #fff;font-weight: 600;width: 200rpx;font-size:16px;" type="error" @click="deleteApply">删除申请</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { delApply } from '@/api/information.js'
+	export default {
+		data() {
+			return {
+				form: {
+					id: '', //主键
+					applyNo: '', //申请单号
+					visitorName: '',
+					visitorIdCard: '',
+					visitorPhone: '',
+					visitReason: '', //访问目的
+					visitPosition: '', //访问楼栋
+					inTime: '', //开始时间
+					outTime: '', //结束时间
+					staffCode: '',
+					staffName: '',
+					remarks: '',
+					staffPhone: '', // 申请者手机号
+					status: '', //申请状态
+				},
+			}
+		},
+		onLoad(options) {
+			const getFormData = JSON.parse(decodeURIComponent(options.form))
+			console.log(getFormData)
+			this.form.id = getFormData.id //申请单号
+			this.form.applyNo = getFormData.applyNo //申请单号
+			this.form.inTime = getFormData.inTime //开始时间
+			this.form.outTime = getFormData.outTime //结束时间
+			this.form.visitorName = getFormData.visitorName //访客姓名
+			this.form.visitorIdCard = getFormData.visitorIdCard //访客身份证
+			this.form.visitorPhone = getFormData.visitorPhone
+			this.form.visitReason = getFormData.visitReason //访问目的
+			this.form.visitPosition = getFormData.visitPosition //访问楼栋
+			this.form.staffCode = getFormData.staffCode //申请者工号
+			this.form.staffName = getFormData.staffName //申请者姓名
+			this.form.remarks = getFormData.remarks //备注
+			this.form.staffPhone = getFormData.staffPhone || '' // 申请者手机号
+			this.form.status = getFormData.status || '' // 申请者手机号
+		},
+		methods: {
+			//点击删除申请
+			async deleteApply() {
+				const res = delApply(this.form.id)
+				wx.showToast({
+					title: '删除成功',
+					icon: 'success',
+					duration: 3000
+				})
+				setTimeout(() => {
+					wx.switchTab({
+						url: '/pages/list/list'
+					})
+				}, 1000)
+			},
+			//点击修改申请
+			changeApply() {
+				
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	.check-list-info {
+		padding: 22rpx;
+	
+		.form {
+			padding: 40rpx 32rpx;
+			border-radius: 10rpx;
+			background-color: #fff;
+		}
+		.blue {
+			color: #1076e3;
+		}
+		.red {
+			color: #f02a0a;
+		}
+		.green {
+			color: #2ebf00;
+		}
+	}
+</style>
+<style lang="scss">
+	.check-list-info {
+		.u-form-item__body__right__content__slot {
+			text-align: right;
+			// color: #999;
+		}
+		.uicon-arrow-right {
+			position: absolute !important;
+			right: 10rpx;
+			bottom: 0;
+		}
+		.u-input__content__field-wrapper__field {
+			text-align: right !important;
+		}
+		.u-form-item__body__right__message {
+			text-align: right !important;
+		}
+		.u-form-item__body__left__content__label {
+			font-weight: 600;
+		}
+	}
+</style>
diff --git a/pagesA/submitInfo/submitInfo.vue b/pagesA/submitInfo/submitInfo.vue
new file mode 100644
index 0000000..113b7d6
--- /dev/null
+++ b/pagesA/submitInfo/submitInfo.vue
@@ -0,0 +1,314 @@
+<!-- 申请者访客信息提交模板页面 -->
+<template>
+	<view class="submit-info">
+		<view class="form"> 
+			<u--form labelPosition="left" :model="form" :rules="rules" ref="formRef">
+				<u-form-item label="申请单号" prop="staffCode" borderBottom labelWidth="100">
+					<!-- <u--input v-model="form.applyNo" disabled border="none" ></u--input> -->
+					{{form.applyNo}}
+				</u-form-item>
+				<u-form-item label="申请状态" borderBottom labelWidth="100">
+					<!-- <u--input v-model="form.status" disabled border="none" ></u--input> -->
+					{{form.status}}
+				</u-form-item>
+				<u-form-item label="申请者工号" prop="staffCode" borderBottom labelWidth="100">
+					<!-- <u--input v-model="form.staffCode" disabled border="none" placeholder="请输入申请者工号"></u--input> -->
+					{{form.staffCode}}
+				</u-form-item>
+				<u-form-item label="申请者名字" borderBottom labelWidth="100">
+					<!-- <u--input v-model="form.staffName" disabled border="none" placeholder="请输入申请者姓名"></u--input> -->
+					{{form.staffName}}
+				</u-form-item>
+				<u-form-item label="申请者手机号" borderBottom labelWidth="100">
+					<!-- <u--input v-model="form.staffPhone" disabled border="none" placeholder="请输入申请者姓名"></u--input> -->
+					{{form.staffPhone}}
+				</u-form-item>
+				<u-form-item label="访客姓名" prop="visitorName" labelWidth="100" borderBottom>
+					<!-- <u--input v-model="form.visitorName" disabled border="none" placeholder="请输入访问姓名"></u--input> -->
+					{{form.visitorName}}
+				</u-form-item>
+				<u-form-item label="访客身份证" prop="visitorIdCard" borderBottom labelWidth="100">
+					<!-- <u--input v-model="form.visitorIdCard" disabled border="none" placeholder="请输入访问身份证"></u--input> -->
+					{{form.visitorIdCard}}
+				</u-form-item>
+				<u-form-item label="访客联系方式" prop="visitorPhone" borderBottom labelWidth="100">
+					<u--input v-model="form.visitorPhone" border="none" placeholder="请输入访问联系方式"></u--input>
+				</u-form-item>
+				<u-form-item label="访问目的" prop="visitReason" borderBottom labelWidth="100">
+					<u-button class="arrow-right-icon" @click="show=true">{{form.visitReason || '请选择访问目的'}}
+						<u-icon name="arrow-right"></u-icon>
+					</u-button>
+				</u-form-item>
+				<u-form-item label="访问楼栋" prop="visitPosition" borderBottom labelWidth="100">
+					<u-button class="arrow-right-icon" @click="buildingShow=true">
+						{{form.visitPosition || '请选择访问楼栋'}}
+						<u-icon name="arrow-right"></u-icon>
+					</u-button>
+				</u-form-item>
+				<u-form-item label="访问时间" prop="inTime" borderBottom labelWidth="100">
+					<u-button @click="isStartTimeShow=true">
+						<view style="font-size: 24rpx;">{{`开始时间:${form.inTime}`}}</view>
+						<view style="font-size: 24rpx;">{{`结束时间:${form.outTime}`}}</view>
+					</u-button>
+				</u-form-item>
+				
+				<u-form-item label="备注" borderBottom labelWidth="100">
+					<u--input v-model="form.remarks" border="none" placeholder="请输入备注"></u--input>
+				</u-form-item>
+			</u--form>
+		</view>
+		<u-picker :show="show" :columns="columns" @cancel="show=false" @confirm="getPurpose"></u-picker>
+		<u-picker :show="buildingShow" :columns="buildingColumns" @cancel="buildingShow=false"
+			@confirm="getBuilding">
+		</u-picker>
+		<!-- 选择开始时间 -->
+		<u-datetime-picker 
+			:show="isStartTimeShow" 
+			v-model="form.inTime" 
+			mode="datetime" 
+			title="请选择开始时间"
+			:formatter="formatter" 
+			:minDate="startTimeMinDate"
+			:maxDate="startTimeMaxDate"
+			@cancel="isStartTimeShow=false" 
+			@change="change" 
+			@confirm="closestartTime">
+		</u-datetime-picker>
+		<!-- 选择结束时间 -->
+		<u-datetime-picker 
+			:show="isEndTimeShow" 
+			v-model="form.outTime" 
+			mode="datetime" 
+			title="请选择结束时间"
+			:minDate="endTimeMinDate"
+			:maxDate="endTimeMaxDate"
+			:formatter="formatter" 
+			@cancel="closeTime" 
+			@change="change" 
+			@confirm="confirmTime">
+		</u-datetime-picker>
+		
+		<view style="display: flex;justify-content: space-around;margin-top: 32px;">
+			<u-button customStyle="border: none;background-color: #9c9d9d;color: #fff;font-weight: 600;width: 200rpx;font-size:16px;" type="info" @click="cancle">取消</u-button>
+			<u-button customStyle="border: none;background-color:#f56c6c;color: #fff;font-weight: 600;width: 200rpx;font-size:16px;" type="primary" @click="submit">提交</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { getSubmit , getDictCode, getResourceType} from '@/api/information.js'
+	export default {
+		data() {
+			return {
+				rules: {
+					//验证身份证号
+					visitorIdCard: [
+						{
+							required: true,
+							message: '请填写访问身份证',
+							trigger: ['blur', 'change'],
+						},{
+							validator: (rule, value, callback) => {
+								return uni.$u.test.idCard(value);
+							},
+							message: '身份证号不正确',
+							trigger: ['change','blur'],
+						}
+					],
+					//验证手机号
+					visitorPhone: [
+						{
+							required: true, 
+							message: '请输入手机号',
+							trigger: ['change','blur'],
+						},
+						{
+							// 自定义验证函数，见上说明
+							validator: (rule, value, callback) => {
+								// 上面有说，返回true表示校验通过，返回false表示不通过
+								// uni.$u.test.mobile()就是返回true或者false的
+								return uni.$u.test.mobile(value);
+							},
+							message: '手机号码不正确',
+							// 触发器可以同时用blur和change
+							trigger: ['change','blur'],
+						}
+					],
+				},
+				form: {
+					applyNo: '系统自动生成', //申请单号
+					visitorName: '',
+					visitorIdCard: '',
+					visitorPhone: '',
+					visitReason: '', //访问目的
+					visitPosition: '', //访问楼栋
+					inTime: Number(new Date()), //开始时间
+					outTime: Number(new Date()), //结束时间
+					staffCode: '',
+					staffName: '',
+					remarks: '',
+					staffPhone: '', // 申请者手机号
+					status: '', //申请状态
+				},
+				show: false, //访问目的筛选框显隐
+				buildingShow: false, //访问楼体筛选框显隐
+				isStartTimeShow: false, //开始时间显隐
+				isEndTimeShow: false, //结束时间显隐
+				columns: [], //访问目的筛选列表
+				buildingColumns: [], //访问楼体筛选列表
+				//开始时间最小时间-当前时间
+				startTimeMinDate: new Date(new Date()).getTime(),
+				//开始时间最大时间（一周之内）
+				startTimeMaxDate: new Date(new Date().toLocaleDateString()).getTime()+ 24 * 60 * 60 * 1000 * 7 - 1,
+				//结束时间最小时间（当前时间）
+				endTimeMinDate: new Date(new Date()).getTime(),
+				//结束时间最大时间-默认一周之内
+				endTimeMaxDate: new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 * 7 - 1,
+			}
+		},
+		mounted() {
+			this.$refs.formRef.setRules(this.rules)
+		},
+		onLoad(options) {
+			const getFormData = JSON.parse(decodeURIComponent(options.form))
+			this.form.inTime = getFormData.inTime //开始时间
+			this.form.outTime = getFormData.outTime //结束时间
+			this.form.visitorName = getFormData.visitorName //访客姓名
+			this.form.visitorIdCard = getFormData.visitorIdCard //访客身份证
+			this.form.visitorPhone = getFormData.visitorPhone
+			this.form.visitReason = getFormData.visitReason //访问目的
+			this.form.visitPosition = getFormData.visitPosition //访问楼栋
+			this.form.staffCode = getFormData.staffCode //申请者工号
+			this.form.staffName = getFormData.staffName //申请者姓名
+			this.form.remarks = getFormData.remarks //备注
+			this.form.staffPhone = getFormData.staffPhone || '' // 申请者手机号
+			this.getDictMap()
+		},
+		watch: {
+			//开始时间和结束时间要求是同一天
+			"form.inTime"(newValue) {
+				this.endTimeMinDate = new Date(newValue).getTime() //结束时间的最小时间是选择的开始时间
+				this.endTimeMaxDate = new Date(new Date(newValue).toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1
+			},
+		},
+		methods: {
+			//点击提交
+			async submit() {
+				if (this.form.visitorPhone.trim() == '' ){
+					return wx.showToast({
+						title: `请将提交信息填写完整`,
+						icon: 'none',
+						duration: 2000,
+					})
+				}
+				if(new Date(this.form.inTime).getTime() < new Date().getTime()) {
+					return wx.showToast({
+						title: '访客时间应大于当前时间',
+						icon: 'none'
+					})
+				}
+				wx.showLoading({
+					title: '提交中'
+				})
+				const res = await getSubmit(this.form)
+				wx.hideLoading()
+				wx.showToast({
+					title: `提交成功`,
+					icon: 'sucess',
+					duration: 2000,
+				})
+			},
+			//点击取消
+			cancle() {
+				wx.navigateBack()
+			},
+			//获取访问目的和楼栋字典
+			async	getDictMap() {
+			  const res = await getDictCode()
+			  this.columns[0] = res.map(item=>item.name)
+			  const ResourceList = await getResourceType()
+			  this.buildingColumns[0] = ResourceList.map(item=>item.name)
+			},
+			//选好访问目的
+			getPurpose(val) {
+				this.form.visitReason = val.value[0]
+				this.show = false
+			},
+			//选好访问楼栋
+			getBuilding(val) {
+				this.form.visitPosition = val.value[0]
+				this.buildingShow = false
+			},
+			//确定选择结束时间
+			async confirmTime(e) {
+				this.form.outTime = await this.shijianc(e.value)
+				this.isEndTimeShow = false
+			},
+			// 确定选择开始时间
+			async closestartTime(e) {
+			   this.form.inTime = await this.shijianc(e.value)
+			   this.isStartTimeShow = false
+			   this.isEndTimeShow = true
+			},
+			//取消选择时间
+			closeTime() {
+				this.isStartTimeShow = false
+				this.isEndTimeShow = false
+			},
+			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
+			},
+			//格式化时间
+			formatter(type, value) {
+				if (type === 'year') {
+					return `${value}年`
+				}
+				if (type === 'month') {
+					return `${value}月`
+				}
+				if (type === 'day') {
+					return `${value}日`
+				}
+				return value
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.submit-info {
+		padding: 22rpx;
+	
+		.form {
+			padding: 40rpx 32rpx;
+			border-radius: 10rpx;
+			background-color: #fff;
+		}
+	}
+</style>
+<style lang="scss">
+	.submit-info {
+		.u-form-item__body__right__content__slot {
+			text-align: right;
+			color: #999;
+		}
+		.uicon-arrow-right {
+			position: absolute !important;
+			right: 10rpx;
+			bottom: 0;
+		}
+		.u-input__content__field-wrapper__field {
+			text-align: right !important;
+		}
+		.u-form-item__body__right__message {
+			text-align: right !important;
+		}
+	}
+</style>

diff --git a/api/information.js b/api/information.js
index 53cb95e..70d566b 100644
--- a/api/information.js
+++ b/api/information.js
@@ -5,6 +5,7 @@
 const Submit = BASE_URL + '/visitor/apply/submit'
 const visitReason = BASE_URL + '/sys/dict/code/visitReason'
 const devicePosition = BASE_URL + '/sys/dict/code/devicePosition'
+const DEL_APPLY = BASE_URL + 'visitor/delApply'
 
 /**
  * 提交访客记录
@@ -31,4 +32,15 @@
 export function getResourceType(code) {
 	useNetWork();
   return fetch.get(devicePosition).then(res => res);
-}
\ No newline at end of file
+}
+/**
+ * 申请者删除申请
+ * @param {Object} code
+ */
+export function delApply(applyId) {
+	useNetWork();
+	const params = {
+		applyId: applyId
+	}
+  return fetch.get(DEL_APPLY, params).then(res => res);
+}
diff --git a/api/user.js b/api/user.js
index f7690f0..8ed85c8 100644
--- a/api/user.js
+++ b/api/user.js
@@ -35,13 +35,7 @@
  * 注册
  * @param {*}
  */
-export function getUserRegister(data) {
+export function getUserRegister(params) {
   useNetWork();
-  const params = {
-    phone: data.phone,
-    account: data.account,
-    name: data.name,
-    salt: data.salt,
-  };
   return fetch.post(UserRegister, params).then((res) => res);
 }
diff --git a/pages.json b/pages.json
index 4071ebc..092484a 100644
--- a/pages.json
+++ b/pages.json
@@ -1,11 +1,4 @@
 {
-	// "easycom": {
-	// 	// 下载安装的方式需要前面的"@/"，npm安装的方式无需"@/"
-	// 	// 下载安装方式
-	// 	"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
-	// 	// npm安装方式
-	// 	// "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
-	// },
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
 			"path": "pages/index/index",
@@ -39,14 +32,14 @@
 				"onReachBottomDistance": 10
 			}     
     },
-	{
+		{
 			"path" : "pages/information/information",
 			"style" :                                                                                    
 			{
 				"navigationBarTitleText": "访客信息提交",
 				"enablePullDownRefresh": false
 			}     
-	},
+		},
 		{
 			"path" : "pages/list/list",
 			"style" :                                                                                    
@@ -111,39 +104,79 @@
 		"backgroundColor": "#F8F8F8"
 	},
 	"tabBar": {
-		"custom": true,
-		"selectedColor": "#2483b3",
+		// "custom": true,
+		"color": "#7A7E83",
+		"selectedColor": "#c5000a",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
 		// "color": "#ccc",
 		"list": [
 			{
-				"pagePath": "pages/index/index"
+				"pagePath": "pages/index/index",
+				"text": "首页",
+				"iconPath": "static/tabBar/home.png",
+				"selectedIconPath": "/static/tabBar/home_selected.png"
 			},
 			{
-				"pagePath": "pages/message/message"
+				"pagePath": "pages/message/message",
+				"text": "消息",
+				"iconPath": "static/tabBar/message.png",
+				"selectedIconPath": "static/tabBar/message_selected.png"
 			},
 			{
-				"pagePath": "pages/list/list"
+				"pagePath": "pages/list/list",
+				"text": "列表",
+				"iconPath": "static/tabBar/list.png",
+				"selectedIconPath": "static/tabBar/list_selected.png"
 			},
 			{
-				"pagePath": "pages/mine/mine"
+				"pagePath": "pages/mine/mine",
+				"text": "我的",
+				"iconPath": "static/tabBar/mine.png",
+				"selectedIconPath": "static/tabBar/mine_selected.png"
 			}
 		]
 	},
 	"subPackages":[
-	//分包模块
-	{
-	"root" : "pagesA",
-	"pages" : [
-	{
-		"path" : "checkInfo/checkInfo",
-		"style" :                                                                                    
+		//分包模块
 		{
-			"navigationBarTitleText": "",
-			"enablePullDownRefresh": false
+			"root" : "pagesA",
+			"pages" : [
+				{
+					"path" : "checkInfo/checkInfo",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path" : "submitInfo/submitInfo",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "访客信息提交",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path" : "checkListInfo/checkListInfo",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "信息查看",
+						"enablePullDownRefresh": false
+					}
+				}
+			    ,{
+                    "path" : "changeListInfo/changeListInfo",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "",
+                    "enablePullDownRefresh": false
+                }
+                
+                }
+            ]
 		}
-	}
-	]
-	}
 	],
 	"uniIdRouter": {}
 }
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7e9dc36..fdde26f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,7 +1,7 @@
 //首页
 <template>
   <view class="index">
-    <TabBar></TabBar>
+    <!-- <TabBar></TabBar> -->
 		<view class="top">
 			<image src="../../static/logo.png" style="width: 167rpx;height: 150rpx;"></image>
 			<view class="top-title">
@@ -91,30 +91,22 @@
     uni.setStorageSync("currentPagePath", this.currentPagePath);
   },
   methods: {
-    // ...mapMutations(['setNavRect'])
     async handleClick(id) {
-			// subscription();
       this.active = id;
       const sessionId = uni.getStorageSync("sessionId");
       //如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过
       if (!sessionId) {
         await getLogin();
       }
-			// if(id === 'submit') {
-				this.phone = uni.getStorageSync("registerPhone");
-				if (this.phone) {
-				  this.checkphone();
-				} else {
-					//弹获取手机号
-				  this.popShow = true;
-				}
-			// } else {
-			// 	// uni.showToast({
-			// 	// 	title: '敬请期待',
-			// 	// 	icon: 'none'
-			// 	// });
-			// }
+			this.phone = uni.getStorageSync("registerPhone");
+			if (this.phone) {
+				this.checkphone();
+			} else {
+				//弹获取手机号
+				this.popShow = true;
+			}
     },
+		
 		//通过手机号检查是否存在这个用户
     async checkphone() {
       const res = await verifyPhone(this.phone);
@@ -122,25 +114,23 @@
         wx.reLaunch({
           url: "/pages/register/register",
         });
-      } else {
+      } else { // 用户已注册
 				uni.setStorageSync("registerPhone", this.phone);
         await getUserProfile(); //获取人员信息
-				
-			if (uni.getStorageSync("userInfo")) {
-			  const userInfo = JSON.parse(uni.getStorageSync("userInfo"));
-			  this.uid = userInfo.id
-			  if (userInfo.salt === "物业人员") {
-				if(this.active === "submit") {
-					subscription();
-				}
+				if (uni.getStorageSync("userInfo")) {
+					const userInfo = JSON.parse(uni.getStorageSync("userInfo"));
+					this.uid = userInfo.id
+					if (userInfo.salt === "物业人员") {
+					if(this.active === "submit") {
+						subscription();
+					}
 			  } 
 			}
-				
-        if (this.active === "submit") {
-          wx.navigateTo({
-            url: `/pages/information/information?id=${this.active}`,
-          });
-        }else {
+			if (this.active === "submit") {
+				wx.navigateTo({
+					url: `/pages/information/information?id=${this.active}`,
+				});
+			} else {
 			// 判断是否有这个路径
 			const res = await getUserJurisdiction({uid:this.uid})
 			if(res.indexOf('/pages/check/check') !== -1) {
@@ -171,7 +161,8 @@
 	padding: 0 20rpx;
   padding-top: 40rpx;
 	background: linear-gradient(#e7c0c1 0%, #fff 100%);
-  height: 100vh;
+  height: 100%;
+	box-sizing: border-box;
 	z-index: 0;
 	.top {
 		display: flex;
@@ -223,7 +214,7 @@
   }
 	.bottom-img {
 		position: absolute;
-		bottom: 250rpx;
+		bottom: 20rpx;
 		left: 0;
 		width: 100%;
 		height: 220rpx;
diff --git a/pages/information/information.vue b/pages/information/information.vue
index fcf9991..ad0ec91 100644
--- a/pages/information/information.vue
+++ b/pages/information/information.vue
@@ -1,3 +1,4 @@
+<!-- 访客信息提交页面 -->
 <template>
 	<view class="information">
 		<view class="form">
@@ -34,6 +35,9 @@
 				<u-form-item label="申请者名字" borderBottom labelWidth="100">
 					<u--input v-model="callerInfo.staffName" disabled border="none" placeholder="请输入申请者姓名"></u--input>
 				</u-form-item>
+				<u-form-item label="申请者手机号" borderBottom labelWidth="100">
+					<u--input v-model="callerInfo.phone" disabled border="none" placeholder="请输入申请者姓名"></u--input>
+				</u-form-item>
 				<u-form-item label="备注" borderBottom labelWidth="100">
 					<u--input v-model="callerInfo.remarks" border="none" placeholder="请输入备注"></u--input>
 				</u-form-item>
@@ -46,15 +50,37 @@
 					信息提交成功，请等待物业管理员处理。
 				</view>
 			</view>
-			<u-picker :show="show" :columns="columns" @close="show=false" @confirm="getPurpose"></u-picker>
-			<u-picker :show="buildingShow" :columns="buildingColumns" @close="buildingShow=false"
+			<!-- 访问目的 -->
+			<u-picker :show="show" :columns="columns" @cancel="show=false" @confirm="getPurpose"></u-picker>
+			<!-- 访问楼栋 -->
+			<u-picker :show="buildingShow" :columns="buildingColumns" @cancel="buildingShow=false"
 				@confirm="getBuilding">
 			</u-picker>
-			<u-datetime-picker :show="isinTimeShow" v-model="callerInfo.inTime" mode="datetime" title="请选择开始时间"
-				:formatter="formatter"  @cancel="isinTimeShow=false" @change="change" @confirm="closeinTime">
+			<!-- 选择开始时间 -->
+			<u-datetime-picker 
+				:show="isinTimeShow" 
+				v-model="callerInfo.inTime" 
+				mode="datetime" 
+				title="请选择开始时间"
+				:formatter="formatter" 
+				:minDate="inTimeMinDate"
+				:maxDate="inTimeMaxDate"
+				@cancel="isinTimeShow=false" 
+				@change="change" 
+				@confirm="closeinTime">
 			</u-datetime-picker>
-			<u-datetime-picker :show="isTimeShow" v-model="callerInfo.outTime" mode="datetime" title="请选择结束时间"
-				:formatter="formatter"  @cancel="closeTime" @change="change" @confirm="confirmTime">
+			<!-- 选择结束时间 -->
+			<u-datetime-picker 
+				:show="isTimeShow" 
+				v-model="callerInfo.outTime" 
+				mode="datetime" 
+				title="请选择结束时间"
+				:minDate="outTimeMinDate"
+				:maxDate="outTimeMaxDate"
+				:formatter="formatter" 
+				@cancel="closeTime" 
+				@change="change" 
+				@confirm="confirmTime">
 			</u-datetime-picker>
 		</view>
 		<view style="margin-top: 42rpx;">
@@ -67,6 +93,7 @@
 <script>
 	import { getSubmit , getDictCode, getResourceType} from '@/api/information.js'
 	import { subscription } from "@/utils/common.js"
+	import { toHandlerKey } from "vue";
 	export default {
 		data() {
 			return {
@@ -76,11 +103,12 @@
 					visitorPhone: '',
 					visitReason: '',
 					visitPosition: '',
-					inTime: Number(new Date()),
+					inTime: Number(new Date()), //开始时间
 					staffCode: '',
 					staffName: '',
 					remarks: '',
-					outTime: Number(new Date())
+					phone: '', // 申请者手机号
+					outTime: Number(new Date()) //结束时间
 				},
 				rules: {
 					visitorName: [{
@@ -134,18 +162,33 @@
 				buildingShow: false,
 				isinTimeShow: false,
 				columns: [],
-				buildingColumns: []
+				buildingColumns: [],
+				//开始时间最小时间-当前时间
+				inTimeMinDate: new Date(new Date()).getTime(),
+				//开始时间最大时间（一周之内）
+				inTimeMaxDate: new Date(new Date().toLocaleDateString()).getTime()+ 24 * 60 * 60 * 1000 * 7 - 1,
+				//结束时间最小时间（当前时间）
+				outTimeMinDate: new Date(new Date()).getTime(),
+				//结束时间最大时间-默认一周之内
+				outTimeMaxDate: new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 * 7 - 1,
 			}
 		},
+		watch: {
+			//开始时间和结束时间要求是同一天
+			"callerInfo.inTime"(newValue) {
+				this.outTimeMinDate = new Date(newValue).getTime() //结束时间的最小时间是选择的开始时间
+				this.outTimeMaxDate = new Date(new Date(newValue).toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1
+			},
+		},
 		onLoad() {
 			this.callerInfo.inTime = this.shijianc(this.callerInfo.inTime)
 			this.callerInfo.outTime = this.shijianc(this.callerInfo.outTime)
 			const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
 			this.callerInfo.staffCode = userInfo.account
 			this.callerInfo.staffName = userInfo.name
+			this.callerInfo.phone = userInfo.phone
 			this.getDictMap()
 		},
-		
 		mounted() {
 			this.$refs.form1.setRules(this.rules)
 		},
@@ -254,7 +297,7 @@
 		padding: 22rpx;
 
 		.form {
-			padding: 0 32rpx 0;
+			padding: 40rpx 32rpx;
 			border-radius: 10rpx;
 			background-color: #fff;
 		}
diff --git a/pages/list/list.vue b/pages/list/list.vue
index e139fbd..6f84539 100644
--- a/pages/list/list.vue
+++ b/pages/list/list.vue
@@ -1,7 +1,7 @@
-//列表页
+<!-- 列表页 -->
 <template>
   <view class="list">
-    <TabBar></TabBar>
+    <!-- <TabBar></TabBar> -->
     <view class="list-top">
       <u-input
         placeholder="关键字搜索"
@@ -19,18 +19,20 @@
           statusInfo
         }}</text>
         <view class="icon">
-          <text class="checkmark-circle" @click="pass('通过')"></text>
-          <text class="close-circle" @click="pass('拒绝')"></text>
-          <text class="share-square" @click="isExportShow = true"></text>
+          <text v-if="!isManager" class="template" @click="goSubmitInfo"></text>
+          <text v-if="isManager" class="checkmark-circle" @click="pass('通过')"></text>
+          <text v-if="isManager" class="close-circle" @click="pass('拒绝')"></text>
+          <text v-if="isManager" class="share-square" @click="isExportShow = true"></text>
         </view>
       </view>
     </view>
-    <view class="list-content">
+		<view class="list-content">
       <view class="table" v-for="(item, index) in list" :key="index">
         <view class="table-checkbox">
-          <u-checkbox-group >
+					<!-- 复选框 -->
+          <u-checkbox-group>
             <u-checkbox
-			 :checked="item.value"
+			        :checked="item.value"
               @change="checkboxChange(item)"
               shape="circle"
             ></u-checkbox>
@@ -46,8 +48,9 @@
           </view>
         </view>
         <view :class="item.color"> {{ item.status }} </view>
+				<!-- 眼睛图标、查看 -->
         <view class="table-icon">
-          <view class="icon-info" @click="eyeLoock(item.applyNo)"></view>
+          <view class="icon-info" @click="eyeLoock(item.applyNo, item)"></view>
         </view>
       </view>
     </view>
@@ -56,8 +59,7 @@
       mode="bottom"
       :round="10"
       :closeOnClickOverlay="false"
-      @close="close"
-    >
+      @close="close">
       <view class="popup">
 				<view class="title">提示</view>
         <view class="content">
@@ -74,8 +76,7 @@
       mode="bottom"
       :round="10"
       :closeOnClickOverlay="false"
-      @close="close"
-    >
+      @close="close">
       <view class="popup">
 				<view class="title">提示</view>
         <view class="content"> 确定要将{{ text }}的{{ leixin }}? </view>
@@ -90,11 +91,10 @@
       :show="startTimeShow"
       mode="datetime"
       title="请选择开始时间"
-	  v-model="startTimeDefult"
+	    v-model="startTimeDefult"
       :formatter="formatter"
       @cancel="closeTime"
-      @confirm="confirmTime"
-    >
+      @confirm="confirmTime">
     </u-datetime-picker>
 		
     <u-datetime-picker
@@ -102,14 +102,13 @@
       mode="datetime"
       title="请选择结束时间"
       :formatter="formatter"
-	  v-model="endTimeDefult"
+	    v-model="endTimeDefult"
       @cancel="closeTime"
-      @confirm="confirmEndTime"
-    >
+      @confirm="confirmEndTime">
     </u-datetime-picker>
     <u-action-sheet
       :show="statusShow"
-      :actions="statusList"
+      :actions="isManager ? statusListManager : statusList"
       title="请选择状态"
       description="只能单选"
       @close="statusShow = false"
@@ -133,7 +132,7 @@
 <script>
 import TabBar from "@/components/tabBar/tabBar.vue";
 import { getList } from "@/api/list.js";
-import { debounce } from "@/common/utils.js";
+import { debounce, deepCopy } from "@/common/utils.js";
 import { getLastMonth } from "@/common/formatTime.js";
 import { solveStatus } from "@/api/message.js";
 import { verifyPhone } from "@/api/index.js";
@@ -147,17 +146,19 @@
   },
   data() {
     return {
+			checkRadio: null, //单选框选中
+			isManager: false, //是否是物业管理员
 			scrollTop: 0,
       queryList: {
         keywords: "",
         startTime: "",
         endTime: "",
         status: "",
-		offset: this.offset,
-		limit: this.limit
+				offset: this.offset,
+				limit: this.limit
       },
-	  startTimeDefult:Number(new Date()),
-	  endTimeDefult:Number(new Date()),
+			startTimeDefult:Number(new Date()),
+			endTimeDefult:Number(new Date()),
       list: [],
       isExportShow: false,
       ispassShow: false,
@@ -169,11 +170,18 @@
       endTimeShow: false,
       TimeNextShow: false,
       statusShow: false,
-      statusList: [
+      statusListManager: [
         { name: "申请已提交", id: "1" },
         { name: "申请已通过", id: "2" },
         { name: "申请已失败", id: "3" },
+				{ name: "全部", id: "0" },
       ],
+			statusList: [
+			  { name: "申请中", id: "1" },
+			  { name: "申请已通过", id: "2" },
+			  { name: "申请已失败", id: "3" },
+				{ name: "全部", id: "0" },
+			],
       time: "筛选时间",
       isTimeQ: "",
       isTimeZ: "",
@@ -208,19 +216,16 @@
     const curPage = pages[pages.length - 1];
     this.currentPagePath = curPage.route;
     uni.setStorageSync("currentPagePath", this.currentPagePath);
-
     //验证手机号
     this.phone = uni.getStorageSync("registerPhone");
     this.checkphone();
-		
-		
     this.queryList = {
       keywords: "",
       startTime: "",
       endTime: "",
       status: "",
-		offset: this.offset,
-		limit: this.limit
+			offset: this.offset,
+			limit: this.limit
     };
 		const param = {
 			offset: 1,
@@ -230,17 +235,17 @@
     const res = await getList(this.queryList);
     this.list = res.records.map((item) => {
 		item.value = false
-      if (item.visitorApplyStatus == "1") {
-        item.status = "申请已提交";
-        item.color = "blue";
-      } else if (item.visitorApplyStatus == "2") {
-        item.status = "申请已通过";
-        item.color = "green";
-      } else {
-        item.status = "申请未通过";
-        item.color = "red";
-      }
-      return item;
+		if (item.visitorApplyStatus == "1") {
+			item.status = this.isManager ? "申请已提交" : '申请中';
+			item.color = "blue";
+		} else if (item.visitorApplyStatus == "2") {
+			item.status = "申请已通过";
+			item.color = "green";
+		} else {
+			item.status = "申请未通过";
+			item.color = "red";
+		}
+			return item;
     });
   },
   //下拉刷新
@@ -269,7 +274,13 @@
   methods: {
     //选中的数据
     checkboxChange(item) {
-		item.value = !item.value
+			this.checkRadio = deepCopy(item)
+			if(!this.isManager) { //申请者
+				this.list.forEach(item => {
+					item.value = false
+				})
+			}
+			item.value = !item.value
       if (this.checkboxList.indexOf(item) == -1) {
         this.checkboxList.push(item);
       } else {
@@ -280,47 +291,41 @@
     //搜索框发生改变
     async change(e) {
 			this.offset = 1;
-      if (e.trim() === "") {
+      if (e.trim() === "") { //空
 				const param = {
 					offset: this.offset,
 					limit: this.limit
 				}
         const res = await getList(param);
-        return (this.list = res.records.map((item) => {
-          if (item.visitorApplyStatus == "1") {
-            item.status = "申请已提交";
-            item.color = "blue";
-          } else if (item.visitorApplyStatus == "2") {
-            item.status = "申请已通过";
-            item.color = "green";
-          } else {
-            item.status = "申请未通过";
-            item.color = "red";
-          }
-          return item;
-        }));
+				this.list = res.records.map((item) => {
+				  if (item.visitorApplyStatus == "1") {
+				    item.status = this.isManager ? "申请已提交" : '申请中';
+				    item.color = "blue";
+				  } else if (item.visitorApplyStatus == "2") {
+				    item.status = "申请已通过";
+				    item.color = "green";
+				  } else {
+				    item.status = "申请未通过";
+				    item.color = "red";
+				  }
+				  return item;
+				});
       }
-      debounce(this.searchList(false), 10000);
+      debounce(this.searchList(false, true), 10000);
     },
     //确定导出
     async exportClick() {
       const sessionId = uni.getStorageSync("sessionId");
       let filePath = `${wx.env.USER_DATA_PATH}/${+new Date()}.xlsx`;
       let ids = [];
-      ids =
-        this.checkboxList.length === 0
-          ? this.list.map((item) => item.id)
-          : this.checkboxList.map((item) => item.id);
+      ids = this.checkboxList.length === 0 ? this.list.map((item) => item.id) : this.checkboxList.map((item) => item.id);
       uni.request({
         url: 'https://visitor.gd.smartlog.work/visitor/exportMessage',
         responseType: "arraybuffer",
-		method:"POST",
-		data:{
-			ids
-		},
-        header: {
-          token: sessionId, //自定义请求头信息
-        },
+				method:"POST",
+				data: { ids },
+				//自定义请求头信息
+        header: {  token: sessionId },
         success: ({ data }) => {
           let fm = wx.getFileSystemManager();
           fm.writeFile({
@@ -334,12 +339,12 @@
               });
             },
           });
-        },
-      });
+        }
+      })
       this.checkboxList = [];
     },
     //根据条件搜索
-    async searchList(is) {
+    async searchList(is, isFromChange = false) {
 			if(!this.loading) {
 				this.list = [];
 			}
@@ -350,7 +355,7 @@
       const res = await getList(this.queryList);
 			if(res.records && res.records.length) {
 				this.nothingMore = false;
-				const resData = res.records.map((item) => {
+				const resData = res.records.map((item, index) => {
 				  if (item.visitorApplyStatus == "1") {
 				    item.status = "申请已提交";
 				    item.color = "blue";
@@ -363,7 +368,11 @@
 				  }
 				  return item;
 				});
-				this.list = this.list.concat(resData);
+				if(isFromChange) {
+					this.list = resData
+				} else {
+					this.list = this.list.concat(resData);
+				}
 			} else {
 				this.nothingMore = true;
 			}
@@ -373,6 +382,9 @@
 			this.offset = 1;
       this.statusInfo = e.name;
       this.queryList.status = e.id;
+			if(e.id === '0') {
+				this.queryList.status = ''
+			}
       this.searchList(false);
     },
     //打开导出提示框
@@ -382,18 +394,18 @@
       this.ispassShow = true;
     },
     async possQr() {
-	  const statusList = this.checkboxList.length === 0 ? this.list.filter((item) => item.visitorApplyStatus === '1') : this.checkboxList.filter((item) => item.visitorApplyStatus === '1')
-	  let ids = statusList.map((item) => item.id).join();
-	  if( ids === '') {
-		  this.checkboxList = [];
-		  this.ispassShow = false;
-		  this.searchList(false);
-		  return uni.showToast({
-				title: `暂无需要改动状态人员`,
-				icon: 'none',
-				duration: 2000,
-			})
-	  }
+			const statusList = this.checkboxList.length === 0 ? this.list.filter((item) => item.visitorApplyStatus === '1') : this.checkboxList.filter((item) => item.visitorApplyStatus === '1')
+			let ids = statusList.map((item) => item.id).join();
+			if( ids === '') {
+				this.checkboxList = [];
+				this.ispassShow = false;
+				this.searchList(false);
+				return uni.showToast({
+					title: `暂无需要改动状态人员`,
+					icon: 'none',
+					duration: 2000,
+				})
+			}
       let res = await solveStatus(this.leixin == "通过" ? "2" : "3", ids);
       this.searchList(false);
       this.ispassShow = false;
@@ -403,26 +415,34 @@
       this.exportClick();
       this.isExportShow = false;
     },
-    eyeLoock(messageId) {
-      wx.navigateTo({
-        url: `/pages/info/info?messageId=${messageId}`,
-      });
+    //点击查看
+		eyeLoock(messageId, item) {
+			if(this.isManager) {
+				wx.navigateTo({
+				  url: `/pages/info/info?messageId=${messageId}`,
+				});
+			} else {
+				wx.navigateTo({
+					url: '/pagesA/checkListInfo/checkListInfo?form=' + encodeURIComponent(JSON.stringify(item)),
+				})
+			}
     },
     //取消选择时间
     closeTime() {
-	  this.offset = 1;
+			this.offset = 1;
       this.startTimeShow = false;
       this.time = "筛选时间";
       this.queryList = {
-        keywords: "",
+        keywords: this.queryList.keywords,
         startTime: "",
         endTime: "",
-        status: "",
-		offset: this.offset,
-		limit: this.limit
+        status: this.queryList.status,
+				offset: this.offset,
+				limit: this.limit
       };
-	  this.startTimeShow = false;
-	  this.endTimeShow = false;
+			this.startTimeShow = false;
+			this.endTimeShow = false;
+			this.searchList(false)
     },
     //确定选择结束时间
     async confirmEndTime(e) {
@@ -482,7 +502,7 @@
       }
       return value;
     },
-
+		//验证手机号-不通过跳转注册页面
     async checkphone() {
       //有电话就去验证
       if (this.phone) {
@@ -493,7 +513,9 @@
           });
         } else {
           uni.setStorageSync("registerPhone", this.phone);
-          getUserProfile();
+          await getUserProfile(); //获取用户信息
+					const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
+					// this.isManager = userInfo.salt === '物业人员'
         }
       } else {
         //没有电话就弹出授权
@@ -510,9 +532,23 @@
 		  this.loading = true;
 		  await this.searchList(true);
 		  this.loading = false;
-		}
-  },
-};
+		},
+		//跳转申请者信息提交模板页面
+		goSubmitInfo() {
+			if(!this.checkRadio) {
+				wx.showToast({
+					title: '请选中',
+					icon: 'none'
+				});
+				return
+			}
+			wx.navigateTo({
+				url: '/pagesA/submitInfo/submitInfo?form=' + encodeURIComponent(JSON.stringify(this.checkRadio)),
+			})
+			this.checkRadio = null
+		},
+	}
+}
 </script>
 
 <style scoped lang="scss">
@@ -592,25 +628,33 @@
       margin-left: 30rpx;
       width: 210rpx;
       display: flex;
-      justify-content: space-between;
+      justify-content: flex-end;
       align-items: center;
       .close-circle {
         width: 55rpx;
         height: 55rpx;
-        background: url(@/static/listIcon/noNext.png) no-repeat;
+        background: url('@/static/listIcon/template.png') no-repeat;
         background-size: contain;
+				margin-left: 16rpx;
       }
+			.template {
+				width: 55rpx;
+				height: 55rpx;
+				background: url('@/static/listIcon/template.png') no-repeat;
+				background-size: contain;
+			}
       .checkmark-circle {
         width: 55rpx;
         height: 55rpx;
-        background: url(@/static/listIcon/next.png) no-repeat;
+        background: url('@/static/listIcon/next.png') no-repeat;
         background-size: contain;
       }
       .share-square {
         width: 55rpx;
         height: 55rpx;
-        background: url(@/static/listIcon/export.png) no-repeat;
+        background: url('@/static/listIcon/export.png') no-repeat;
         background-size: contain;
+				margin-left: 16rpx;
       }
     }
   }
diff --git a/pages/message/message.vue b/pages/message/message.vue
index 4fd4cb3..0372e4f 100644
--- a/pages/message/message.vue
+++ b/pages/message/message.vue
@@ -1,7 +1,19 @@
 <!-- 消息 -->
 <template>
   <view class="message">
-    <TabBar></TabBar>
+    <!-- <TabBar></TabBar> -->
+		<u-empty 
+			:show="!list.length" 
+			mode="coupon"  
+			width="300"
+			height="260"
+			text="暂无消息"
+			iconColor="#ff7b7c"
+			textColor="#333"
+			textSize="18"
+			icon="http://cdn.uviewui.com/uview/empty/coupon.png"
+			marginTop="20">
+		</u-empty>
     <view class="main" v-for="(item, index) in list" :key="index">
       <view class="date-time">{{ item.messageTime }}</view>
       <view class="card" @click="clickDetail(item.id)">
@@ -14,16 +26,9 @@
               <text class="number">{{ item.number }}</text>
             </view>
 
-            <view
-              :class="
-                item.status === '未通过'
-                  ? 'button-area'
-                  : item.status === '已通过'
-                  ? 'button-area pass'
-                  : 'button-area submit'
-              "
-              >申请{{ item.status }}</view
-            >
+            <view :class=" item.status === '未通过' ? 'button-area' : item.status === '已通过' ? 'button-area pass' : 'button-area submit'">
+							申请{{ item.status }}
+						</view>
           </view>
           <view class="ui-time">
             <text class="start">{{ item.startTime }}</text>
@@ -52,7 +57,7 @@
 
    <!-- 获取手机号popup组件 -->
    <GetPhonePopup :popShow="popShow" @closePop="closePop" @refresh="refresh"/>
-	 <LoadingList :loading="loading" :nothingMore="nothingMore" />
+	 <LoadingList :loading="loading" :nothingMore="nothingMore && list.length" />
 	 
 	 <!-- 返回顶部 -->
 	 <u-back-top 
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index 7309d58..289a682 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -1,7 +1,7 @@
 /** * 我的 */
 <template>
   <view class="mine">
-    <TabBar></TabBar>
+    <!-- <TabBar></TabBar> -->
 		<view class="image-area">
 			<u-avatar :src="img" size='80'></u-avatar>
 		</view>
@@ -50,8 +50,8 @@
 					value: ''
 				},
 				{
-					id: 'type',
-					name: '员工类型',
+					id: 'documentTypeName',
+					name: '证件类型',
 					value: ''
 				},
 				{
@@ -135,7 +135,7 @@
 			this.img = userInfo.avatar;
 			console.log('头像url', this.img)
 			this.id = userInfo.id;
-			//物业人员0，安保人员1，正式员工2
+			//证件类型：1工作证 、 2出入证
 			this.$set(this.list, 0,  {
 					id: 'number',
 					name: '员工号',
@@ -147,9 +147,9 @@
 					value: userInfo.name
 			});
 			this.$set(this.list, 2,  {
-					id: 'type',
-					name: '员工类型',
-					value: userInfo.salt
+					id: 'documentTypeName',
+					name: '证件类型',
+					value: userInfo.documentTypeName
 			});
 			this.$set(this.list, 3,  {
 					id: 'phone',
diff --git a/pages/register/register.vue b/pages/register/register.vue
index 7e5f96b..ddc15f0 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -9,21 +9,21 @@
       <view class="content">
         <u--form labelPosition="left" :model="form" :rules="rules" ref="form1">
           <u-form-item
-            label="员工号码"
+            label="员工证件编号"
             prop="account"
-            labelWidth="80"
+            labelWidth="110"
             class="form-item"
           >
             <u--input
               v-model="form.account"
               border="none"
-              placeholder="请输入员工号码"
+              placeholder="请输入员工证件编号"
             ></u--input>
           </u-form-item>
           <u-form-item
             label="员工姓名"
             prop="name"
-            labelWidth="80"
+            labelWidth="110"
             class="form-item"
           >
             <u--input
@@ -33,20 +33,17 @@
             ></u--input>
           </u-form-item>
           <u-form-item
-            label="员工类型"
-            prop="type"
+            label="证件类型"
             class="form-item form-item-border"
-            labelWidth="80"
+            labelWidth="110"
           >
-            <u-button @click="typeLx">{{
-              form.type || "请选择员工类型"
-            }}</u-button>
+            <u-button @click="typeLx">{{form.documentTypeName || "请选择证件类型"}}</u-button>
           </u-form-item>
           <u-form-item
             label="手机号码"
             prop="phone"
             borderBottom
-            labelWidth="80"
+            labelWidth="110"
             class="form-item"
           >
             <u-button
@@ -60,24 +57,26 @@
           </u-form-item>
         </u--form>
         <u-button type="error" text="注 册" @click="registerGo"></u-button>
+				
+				<!-- 证件类型选择框 -->
         <u-action-sheet
           :show="show"
-          :actions="list"
-          title="请选择员工类型"
+          :actions="certificateList"
+          title="请选择证件类型"
           description="只能单选"
           @close="show = false"
-          @select="sexSelect"
+          @select="confirmSelect"
         >
         </u-action-sheet>
 				
+				<!-- 拒绝注册弹出框 -->
         <u-popup
           :show="jujueShow"
           mode="bottom"
           :round="10"
           :closeOnClickOverlay="false"
           @close="close"
-          @open="open"
-        >
+          @open="open">
           <view class="popup">
 						<view class="title">提示</view>
             <view class="content"> 拒绝将无法进行注册! </view>
@@ -94,27 +93,28 @@
           </view>
         </u-popup>
 				
+				<!-- 注册成功弹出框 -->
         <u-popup
           :show="successShow"
           mode="bottom"
           :round="10"
           :closeOnClickOverlay="false"
           @close="close"
-          @open="open"
-        >
+          @open="open">
           <view class="popup">
 						<view class="title">提示</view>
             <view class="content"> 注册成功! </view>
           </view>
         </u-popup>
+				
+				<!-- 注册失败弹出框 -->
         <u-popup
           :show="errorShow"
           mode="bottom"
           :round="10"
           :closeOnClickOverlay="false"
           @close="close"
-          @open="open"
-        >
+          @open="open">
           <view class="popup">
 						<view class="title">提示</view>
             <view class="content">
@@ -155,23 +155,27 @@
         ],
       },
       form: {
-        account: "", //员工号
+        account: "", //证件编号
         name: "", //姓名
-        type: "", //员工类型
         phone: "", //电话
-        salt: "", //员工类型id
+				documentType: '', //证件类型
+				documentTypeName: '', //证件类型名称
       },
-      tips: {
-        text: "请选择员工类型",
-        color: "#909399",
-        fontSize: 24,
-      },
-      list: [],
-      show: false,
-      // sqShow: false,
-      jujueShow: false,
-      successShow: false,
-      errorShow: false,
+			//证件类型筛选列表
+      certificateList: [
+				{
+					id: '1',
+					name: '工作证'
+				},
+				{
+					id: '0',
+					name: '出入证'
+				},
+			],
+      show: false, //控制证件类型筛选显隐
+      jujueShow: false, //控制拒绝注册弹出框显隐
+      successShow: false, //控制成功注册弹出框显隐
+      errorShow: false, 
       code: "",
     };
   },
@@ -190,18 +194,14 @@
     },
     //点击注册
     async registerGo() {
-      if (
-        this.form.account.trim() == "" ||
-        this.form.name.trim() == "" ||
-        this.form.salt.trim() == "" ||
-        this.form.phone.trim() == ""
-      ) {
+      if (this.form.account.trim() == "" ||this.form.name.trim() == "" ||this.form.documentTypeName.trim() == "" ||this.form.phone.trim() == "") {
         return uni.showToast({
           title: `请将注册数据填写完整`,
           icon: "none",
           duration: 2000,
         });
       }
+			console.log('9999',this.form)
       const res = await getUserRegister(this.form);
         // this.successShow = true;
 			uni.showToast({
@@ -245,13 +245,10 @@
 				this.jujueShow = true;
 			}
     },
-    //选中员工类型
-    sexSelect(e) {
-      setTimeout(() => {
-        this.form.type = e.name;
-        this.form.salt = e.id;
-      }, 30);
-      // this.$refs.form1.validateField('userInfo.sex')
+    //选中证件类型
+    confirmSelect(e) {
+			this.form.documentType = e.id 
+			this.form.documentTypeName = e.name
     },
   },
 };
diff --git a/pagesA/changeListInfo/changeListInfo.vue b/pagesA/changeListInfo/changeListInfo.vue
new file mode 100644
index 0000000..8183fd0
--- /dev/null
+++ b/pagesA/changeListInfo/changeListInfo.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pagesA/checkListInfo/checkListInfo.vue b/pagesA/checkListInfo/checkListInfo.vue
new file mode 100644
index 0000000..0f7dff2
--- /dev/null
+++ b/pagesA/checkListInfo/checkListInfo.vue
@@ -0,0 +1,157 @@
+<!-- 点击列表的查看--信息查看页面 -->
+<template>
+	<view class="check-list-info">
+		<view class="form">
+			<u--form labelPosition="left" :model="form">
+				<u-form-item label="申请单号" prop="staffCode" borderBottom labelWidth="100">
+					{{form.applyNo}}
+				</u-form-item>
+				<u-form-item label="申请状态" borderBottom labelWidth="100" >
+					<view :class="form.status === '申请中' ? 'blue' : form.status === '申请不通过' ? 'red' : 'green'">
+						{{form.status}}
+					</view>
+				</u-form-item>
+				<u-form-item label="申请者工号" prop="staffCode" borderBottom labelWidth="100">
+					{{form.staffCode}}
+				</u-form-item>
+				<u-form-item label="申请者名字" borderBottom labelWidth="100">
+					{{form.staffName}}
+				</u-form-item>
+				<u-form-item label="申请者手机号" borderBottom labelWidth="100">
+					{{form.staffPhone}}
+				</u-form-item>
+				<u-form-item label="访客姓名" prop="visitorName" labelWidth="100" borderBottom>
+					{{form.visitorName}}
+				</u-form-item>
+				<u-form-item label="访客身份证" prop="visitorIdCard" borderBottom labelWidth="100">
+					{{form.visitorIdCard}}
+				</u-form-item>
+				<u-form-item label="访客联系方式" prop="visitorPhone" borderBottom labelWidth="100">
+					{{form.visitorPhone}}
+				</u-form-item>
+				<u-form-item label="访问目的" prop="visitReason" borderBottom labelWidth="100">
+					{{form.visitReason}}
+				</u-form-item>
+				<u-form-item label="访问楼栋" prop="visitPosition" borderBottom labelWidth="100">
+					{{form.visitPosition}}
+				</u-form-item>
+				<u-form-item label="访问时间" prop="inTime" borderBottom labelWidth="100">
+					{{form.inTime}} ~ {{form.outTime}}
+				</u-form-item>
+				<u-form-item label="备注" borderBottom labelWidth="100">
+					{{form.remarks}}
+				</u-form-item>
+			</u--form>
+		</view>
+		<view style="display: flex;justify-content: space-around;margin-top: 32px;">
+			<u-button customStyle="border: none;color: #fff;font-weight: 600;width: 200rpx;font-size:16px;" type="primary" @click="changeApply">修改申请</u-button>
+			<u-button customStyle="border: none;color: #fff;font-weight: 600;width: 200rpx;font-size:16px;" type="error" @click="deleteApply">删除申请</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { delApply } from '@/api/information.js'
+	export default {
+		data() {
+			return {
+				form: {
+					id: '', //主键
+					applyNo: '', //申请单号
+					visitorName: '',
+					visitorIdCard: '',
+					visitorPhone: '',
+					visitReason: '', //访问目的
+					visitPosition: '', //访问楼栋
+					inTime: '', //开始时间
+					outTime: '', //结束时间
+					staffCode: '',
+					staffName: '',
+					remarks: '',
+					staffPhone: '', // 申请者手机号
+					status: '', //申请状态
+				},
+			}
+		},
+		onLoad(options) {
+			const getFormData = JSON.parse(decodeURIComponent(options.form))
+			console.log(getFormData)
+			this.form.id = getFormData.id //申请单号
+			this.form.applyNo = getFormData.applyNo //申请单号
+			this.form.inTime = getFormData.inTime //开始时间
+			this.form.outTime = getFormData.outTime //结束时间
+			this.form.visitorName = getFormData.visitorName //访客姓名
+			this.form.visitorIdCard = getFormData.visitorIdCard //访客身份证
+			this.form.visitorPhone = getFormData.visitorPhone
+			this.form.visitReason = getFormData.visitReason //访问目的
+			this.form.visitPosition = getFormData.visitPosition //访问楼栋
+			this.form.staffCode = getFormData.staffCode //申请者工号
+			this.form.staffName = getFormData.staffName //申请者姓名
+			this.form.remarks = getFormData.remarks //备注
+			this.form.staffPhone = getFormData.staffPhone || '' // 申请者手机号
+			this.form.status = getFormData.status || '' // 申请者手机号
+		},
+		methods: {
+			//点击删除申请
+			async deleteApply() {
+				const res = delApply(this.form.id)
+				wx.showToast({
+					title: '删除成功',
+					icon: 'success',
+					duration: 3000
+				})
+				setTimeout(() => {
+					wx.switchTab({
+						url: '/pages/list/list'
+					})
+				}, 1000)
+			},
+			//点击修改申请
+			changeApply() {
+				
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	.check-list-info {
+		padding: 22rpx;
+	
+		.form {
+			padding: 40rpx 32rpx;
+			border-radius: 10rpx;
+			background-color: #fff;
+		}
+		.blue {
+			color: #1076e3;
+		}
+		.red {
+			color: #f02a0a;
+		}
+		.green {
+			color: #2ebf00;
+		}
+	}
+</style>
+<style lang="scss">
+	.check-list-info {
+		.u-form-item__body__right__content__slot {
+			text-align: right;
+			// color: #999;
+		}
+		.uicon-arrow-right {
+			position: absolute !important;
+			right: 10rpx;
+			bottom: 0;
+		}
+		.u-input__content__field-wrapper__field {
+			text-align: right !important;
+		}
+		.u-form-item__body__right__message {
+			text-align: right !important;
+		}
+		.u-form-item__body__left__content__label {
+			font-weight: 600;
+		}
+	}
+</style>
diff --git a/pagesA/submitInfo/submitInfo.vue b/pagesA/submitInfo/submitInfo.vue
new file mode 100644
index 0000000..113b7d6
--- /dev/null
+++ b/pagesA/submitInfo/submitInfo.vue
@@ -0,0 +1,314 @@
+<!-- 申请者访客信息提交模板页面 -->
+<template>
+	<view class="submit-info">
+		<view class="form"> 
+			<u--form labelPosition="left" :model="form" :rules="rules" ref="formRef">
+				<u-form-item label="申请单号" prop="staffCode" borderBottom labelWidth="100">
+					<!-- <u--input v-model="form.applyNo" disabled border="none" ></u--input> -->
+					{{form.applyNo}}
+				</u-form-item>
+				<u-form-item label="申请状态" borderBottom labelWidth="100">
+					<!-- <u--input v-model="form.status" disabled border="none" ></u--input> -->
+					{{form.status}}
+				</u-form-item>
+				<u-form-item label="申请者工号" prop="staffCode" borderBottom labelWidth="100">
+					<!-- <u--input v-model="form.staffCode" disabled border="none" placeholder="请输入申请者工号"></u--input> -->
+					{{form.staffCode}}
+				</u-form-item>
+				<u-form-item label="申请者名字" borderBottom labelWidth="100">
+					<!-- <u--input v-model="form.staffName" disabled border="none" placeholder="请输入申请者姓名"></u--input> -->
+					{{form.staffName}}
+				</u-form-item>
+				<u-form-item label="申请者手机号" borderBottom labelWidth="100">
+					<!-- <u--input v-model="form.staffPhone" disabled border="none" placeholder="请输入申请者姓名"></u--input> -->
+					{{form.staffPhone}}
+				</u-form-item>
+				<u-form-item label="访客姓名" prop="visitorName" labelWidth="100" borderBottom>
+					<!-- <u--input v-model="form.visitorName" disabled border="none" placeholder="请输入访问姓名"></u--input> -->
+					{{form.visitorName}}
+				</u-form-item>
+				<u-form-item label="访客身份证" prop="visitorIdCard" borderBottom labelWidth="100">
+					<!-- <u--input v-model="form.visitorIdCard" disabled border="none" placeholder="请输入访问身份证"></u--input> -->
+					{{form.visitorIdCard}}
+				</u-form-item>
+				<u-form-item label="访客联系方式" prop="visitorPhone" borderBottom labelWidth="100">
+					<u--input v-model="form.visitorPhone" border="none" placeholder="请输入访问联系方式"></u--input>
+				</u-form-item>
+				<u-form-item label="访问目的" prop="visitReason" borderBottom labelWidth="100">
+					<u-button class="arrow-right-icon" @click="show=true">{{form.visitReason || '请选择访问目的'}}
+						<u-icon name="arrow-right"></u-icon>
+					</u-button>
+				</u-form-item>
+				<u-form-item label="访问楼栋" prop="visitPosition" borderBottom labelWidth="100">
+					<u-button class="arrow-right-icon" @click="buildingShow=true">
+						{{form.visitPosition || '请选择访问楼栋'}}
+						<u-icon name="arrow-right"></u-icon>
+					</u-button>
+				</u-form-item>
+				<u-form-item label="访问时间" prop="inTime" borderBottom labelWidth="100">
+					<u-button @click="isStartTimeShow=true">
+						<view style="font-size: 24rpx;">{{`开始时间:${form.inTime}`}}</view>
+						<view style="font-size: 24rpx;">{{`结束时间:${form.outTime}`}}</view>
+					</u-button>
+				</u-form-item>
+				
+				<u-form-item label="备注" borderBottom labelWidth="100">
+					<u--input v-model="form.remarks" border="none" placeholder="请输入备注"></u--input>
+				</u-form-item>
+			</u--form>
+		</view>
+		<u-picker :show="show" :columns="columns" @cancel="show=false" @confirm="getPurpose"></u-picker>
+		<u-picker :show="buildingShow" :columns="buildingColumns" @cancel="buildingShow=false"
+			@confirm="getBuilding">
+		</u-picker>
+		<!-- 选择开始时间 -->
+		<u-datetime-picker 
+			:show="isStartTimeShow" 
+			v-model="form.inTime" 
+			mode="datetime" 
+			title="请选择开始时间"
+			:formatter="formatter" 
+			:minDate="startTimeMinDate"
+			:maxDate="startTimeMaxDate"
+			@cancel="isStartTimeShow=false" 
+			@change="change" 
+			@confirm="closestartTime">
+		</u-datetime-picker>
+		<!-- 选择结束时间 -->
+		<u-datetime-picker 
+			:show="isEndTimeShow" 
+			v-model="form.outTime" 
+			mode="datetime" 
+			title="请选择结束时间"
+			:minDate="endTimeMinDate"
+			:maxDate="endTimeMaxDate"
+			:formatter="formatter" 
+			@cancel="closeTime" 
+			@change="change" 
+			@confirm="confirmTime">
+		</u-datetime-picker>
+		
+		<view style="display: flex;justify-content: space-around;margin-top: 32px;">
+			<u-button customStyle="border: none;background-color: #9c9d9d;color: #fff;font-weight: 600;width: 200rpx;font-size:16px;" type="info" @click="cancle">取消</u-button>
+			<u-button customStyle="border: none;background-color:#f56c6c;color: #fff;font-weight: 600;width: 200rpx;font-size:16px;" type="primary" @click="submit">提交</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { getSubmit , getDictCode, getResourceType} from '@/api/information.js'
+	export default {
+		data() {
+			return {
+				rules: {
+					//验证身份证号
+					visitorIdCard: [
+						{
+							required: true,
+							message: '请填写访问身份证',
+							trigger: ['blur', 'change'],
+						},{
+							validator: (rule, value, callback) => {
+								return uni.$u.test.idCard(value);
+							},
+							message: '身份证号不正确',
+							trigger: ['change','blur'],
+						}
+					],
+					//验证手机号
+					visitorPhone: [
+						{
+							required: true, 
+							message: '请输入手机号',
+							trigger: ['change','blur'],
+						},
+						{
+							// 自定义验证函数，见上说明
+							validator: (rule, value, callback) => {
+								// 上面有说，返回true表示校验通过，返回false表示不通过
+								// uni.$u.test.mobile()就是返回true或者false的
+								return uni.$u.test.mobile(value);
+							},
+							message: '手机号码不正确',
+							// 触发器可以同时用blur和change
+							trigger: ['change','blur'],
+						}
+					],
+				},
+				form: {
+					applyNo: '系统自动生成', //申请单号
+					visitorName: '',
+					visitorIdCard: '',
+					visitorPhone: '',
+					visitReason: '', //访问目的
+					visitPosition: '', //访问楼栋
+					inTime: Number(new Date()), //开始时间
+					outTime: Number(new Date()), //结束时间
+					staffCode: '',
+					staffName: '',
+					remarks: '',
+					staffPhone: '', // 申请者手机号
+					status: '', //申请状态
+				},
+				show: false, //访问目的筛选框显隐
+				buildingShow: false, //访问楼体筛选框显隐
+				isStartTimeShow: false, //开始时间显隐
+				isEndTimeShow: false, //结束时间显隐
+				columns: [], //访问目的筛选列表
+				buildingColumns: [], //访问楼体筛选列表
+				//开始时间最小时间-当前时间
+				startTimeMinDate: new Date(new Date()).getTime(),
+				//开始时间最大时间（一周之内）
+				startTimeMaxDate: new Date(new Date().toLocaleDateString()).getTime()+ 24 * 60 * 60 * 1000 * 7 - 1,
+				//结束时间最小时间（当前时间）
+				endTimeMinDate: new Date(new Date()).getTime(),
+				//结束时间最大时间-默认一周之内
+				endTimeMaxDate: new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 * 7 - 1,
+			}
+		},
+		mounted() {
+			this.$refs.formRef.setRules(this.rules)
+		},
+		onLoad(options) {
+			const getFormData = JSON.parse(decodeURIComponent(options.form))
+			this.form.inTime = getFormData.inTime //开始时间
+			this.form.outTime = getFormData.outTime //结束时间
+			this.form.visitorName = getFormData.visitorName //访客姓名
+			this.form.visitorIdCard = getFormData.visitorIdCard //访客身份证
+			this.form.visitorPhone = getFormData.visitorPhone
+			this.form.visitReason = getFormData.visitReason //访问目的
+			this.form.visitPosition = getFormData.visitPosition //访问楼栋
+			this.form.staffCode = getFormData.staffCode //申请者工号
+			this.form.staffName = getFormData.staffName //申请者姓名
+			this.form.remarks = getFormData.remarks //备注
+			this.form.staffPhone = getFormData.staffPhone || '' // 申请者手机号
+			this.getDictMap()
+		},
+		watch: {
+			//开始时间和结束时间要求是同一天
+			"form.inTime"(newValue) {
+				this.endTimeMinDate = new Date(newValue).getTime() //结束时间的最小时间是选择的开始时间
+				this.endTimeMaxDate = new Date(new Date(newValue).toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1
+			},
+		},
+		methods: {
+			//点击提交
+			async submit() {
+				if (this.form.visitorPhone.trim() == '' ){
+					return wx.showToast({
+						title: `请将提交信息填写完整`,
+						icon: 'none',
+						duration: 2000,
+					})
+				}
+				if(new Date(this.form.inTime).getTime() < new Date().getTime()) {
+					return wx.showToast({
+						title: '访客时间应大于当前时间',
+						icon: 'none'
+					})
+				}
+				wx.showLoading({
+					title: '提交中'
+				})
+				const res = await getSubmit(this.form)
+				wx.hideLoading()
+				wx.showToast({
+					title: `提交成功`,
+					icon: 'sucess',
+					duration: 2000,
+				})
+			},
+			//点击取消
+			cancle() {
+				wx.navigateBack()
+			},
+			//获取访问目的和楼栋字典
+			async	getDictMap() {
+			  const res = await getDictCode()
+			  this.columns[0] = res.map(item=>item.name)
+			  const ResourceList = await getResourceType()
+			  this.buildingColumns[0] = ResourceList.map(item=>item.name)
+			},
+			//选好访问目的
+			getPurpose(val) {
+				this.form.visitReason = val.value[0]
+				this.show = false
+			},
+			//选好访问楼栋
+			getBuilding(val) {
+				this.form.visitPosition = val.value[0]
+				this.buildingShow = false
+			},
+			//确定选择结束时间
+			async confirmTime(e) {
+				this.form.outTime = await this.shijianc(e.value)
+				this.isEndTimeShow = false
+			},
+			// 确定选择开始时间
+			async closestartTime(e) {
+			   this.form.inTime = await this.shijianc(e.value)
+			   this.isStartTimeShow = false
+			   this.isEndTimeShow = true
+			},
+			//取消选择时间
+			closeTime() {
+				this.isStartTimeShow = false
+				this.isEndTimeShow = false
+			},
+			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
+			},
+			//格式化时间
+			formatter(type, value) {
+				if (type === 'year') {
+					return `${value}年`
+				}
+				if (type === 'month') {
+					return `${value}月`
+				}
+				if (type === 'day') {
+					return `${value}日`
+				}
+				return value
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.submit-info {
+		padding: 22rpx;
+	
+		.form {
+			padding: 40rpx 32rpx;
+			border-radius: 10rpx;
+			background-color: #fff;
+		}
+	}
+</style>
+<style lang="scss">
+	.submit-info {
+		.u-form-item__body__right__content__slot {
+			text-align: right;
+			color: #999;
+		}
+		.uicon-arrow-right {
+			position: absolute !important;
+			right: 10rpx;
+			bottom: 0;
+		}
+		.u-input__content__field-wrapper__field {
+			text-align: right !important;
+		}
+		.u-form-item__body__right__message {
+			text-align: right !important;
+		}
+	}
+</style>
diff --git a/static/listIcon/template.png b/static/listIcon/template.png
new file mode 100644
index 0000000..0935c25
--- /dev/null
+++ b/static/listIcon/template.png
Binary files differ