diff --git a/api/index.js b/api/index.js
index 246ee23..f832a2c 100644
--- a/api/index.js
+++ b/api/index.js
@@ -2,12 +2,21 @@
 import BASE_URL from './base.js';
 import useNetWork from '@/common/useNetWork.js';
 
-const GET_USER_INFO = BASE_URL + '/user/userLogin';
 
-export function getUserInfo(phone) {
+const VERIFY_PHONE = BASE_URL + '/user/userLogin';
+const GET_USER_INFO = BASE_URL + '/user/getUserInfo';
+
+//验证手机号是否为员工
+export function verifyPhone(phone) {
 	useNetWork();
   const params = {
     phoneCode: phone,
   };
-  return fetch.post(GET_USER_INFO, params).then(res => res);
+  return fetch.post(VERIFY_PHONE, params).then(res => res);
+}
+
+//获取用户信息
+export function getUserInfo(phone) {
+	useNetWork();
+  return fetch.post(GET_USER_INFO).then(res => res);
 }
\ No newline at end of file

diff --git a/api/index.js b/api/index.js
index 246ee23..f832a2c 100644
--- a/api/index.js
+++ b/api/index.js
@@ -2,12 +2,21 @@
 import BASE_URL from './base.js';
 import useNetWork from '@/common/useNetWork.js';
 
-const GET_USER_INFO = BASE_URL + '/user/userLogin';
 
-export function getUserInfo(phone) {
+const VERIFY_PHONE = BASE_URL + '/user/userLogin';
+const GET_USER_INFO = BASE_URL + '/user/getUserInfo';
+
+//验证手机号是否为员工
+export function verifyPhone(phone) {
 	useNetWork();
   const params = {
     phoneCode: phone,
   };
-  return fetch.post(GET_USER_INFO, params).then(res => res);
+  return fetch.post(VERIFY_PHONE, params).then(res => res);
+}
+
+//获取用户信息
+export function getUserInfo(phone) {
+	useNetWork();
+  return fetch.post(GET_USER_INFO).then(res => res);
 }
\ No newline at end of file
diff --git a/api/message.js b/api/message.js
new file mode 100644
index 0000000..d233cf0
--- /dev/null
+++ b/api/message.js
@@ -0,0 +1,25 @@
+
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base.js';
+import useNetWork from '@/common/useNetWork.js';
+
+
+const GET_MESSAGE_LIST = BASE_URL + '/visitor/getMessageList';
+const GET_MESSAGE_INFO = BASE_URL + '/visitor/getMessageInfo';
+
+//消息列表
+export function getMessageList(phone) {
+	useNetWork();
+  return fetch.post(GET_MESSAGE_LIST).then(res => res);
+}
+
+//消息详情
+export function getMessageInfo(id) {
+	useNetWork();
+	const params = {
+		messageId: id
+	}
+  return fetch.post(GET_MESSAGE_INFO).then(res => res);
+}
+
+//管理员处理

diff --git a/api/index.js b/api/index.js
index 246ee23..f832a2c 100644
--- a/api/index.js
+++ b/api/index.js
@@ -2,12 +2,21 @@
 import BASE_URL from './base.js';
 import useNetWork from '@/common/useNetWork.js';
 
-const GET_USER_INFO = BASE_URL + '/user/userLogin';
 
-export function getUserInfo(phone) {
+const VERIFY_PHONE = BASE_URL + '/user/userLogin';
+const GET_USER_INFO = BASE_URL + '/user/getUserInfo';
+
+//验证手机号是否为员工
+export function verifyPhone(phone) {
 	useNetWork();
   const params = {
     phoneCode: phone,
   };
-  return fetch.post(GET_USER_INFO, params).then(res => res);
+  return fetch.post(VERIFY_PHONE, params).then(res => res);
+}
+
+//获取用户信息
+export function getUserInfo(phone) {
+	useNetWork();
+  return fetch.post(GET_USER_INFO).then(res => res);
 }
\ No newline at end of file
diff --git a/api/message.js b/api/message.js
new file mode 100644
index 0000000..d233cf0
--- /dev/null
+++ b/api/message.js
@@ -0,0 +1,25 @@
+
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base.js';
+import useNetWork from '@/common/useNetWork.js';
+
+
+const GET_MESSAGE_LIST = BASE_URL + '/visitor/getMessageList';
+const GET_MESSAGE_INFO = BASE_URL + '/visitor/getMessageInfo';
+
+//消息列表
+export function getMessageList(phone) {
+	useNetWork();
+  return fetch.post(GET_MESSAGE_LIST).then(res => res);
+}
+
+//消息详情
+export function getMessageInfo(id) {
+	useNetWork();
+	const params = {
+		messageId: id
+	}
+  return fetch.post(GET_MESSAGE_INFO).then(res => res);
+}
+
+//管理员处理
diff --git a/common/fetch.js b/common/fetch.js
index 1efb372..b9d05fa 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -36,8 +36,8 @@
 							resolve('用户未注册');
 						} else {
               uni.showToast({
-                title: "系统异常，请稍后再试！",
-                // title: `${data.data.message}`,
+                // title: "系统异常，请稍后再试！",
+                title: `${data.data.message}`,
                 icon: "none",
                 duration: 2000,
               });

diff --git a/api/index.js b/api/index.js
index 246ee23..f832a2c 100644
--- a/api/index.js
+++ b/api/index.js
@@ -2,12 +2,21 @@
 import BASE_URL from './base.js';
 import useNetWork from '@/common/useNetWork.js';
 
-const GET_USER_INFO = BASE_URL + '/user/userLogin';
 
-export function getUserInfo(phone) {
+const VERIFY_PHONE = BASE_URL + '/user/userLogin';
+const GET_USER_INFO = BASE_URL + '/user/getUserInfo';
+
+//验证手机号是否为员工
+export function verifyPhone(phone) {
 	useNetWork();
   const params = {
     phoneCode: phone,
   };
-  return fetch.post(GET_USER_INFO, params).then(res => res);
+  return fetch.post(VERIFY_PHONE, params).then(res => res);
+}
+
+//获取用户信息
+export function getUserInfo(phone) {
+	useNetWork();
+  return fetch.post(GET_USER_INFO).then(res => res);
 }
\ No newline at end of file
diff --git a/api/message.js b/api/message.js
new file mode 100644
index 0000000..d233cf0
--- /dev/null
+++ b/api/message.js
@@ -0,0 +1,25 @@
+
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base.js';
+import useNetWork from '@/common/useNetWork.js';
+
+
+const GET_MESSAGE_LIST = BASE_URL + '/visitor/getMessageList';
+const GET_MESSAGE_INFO = BASE_URL + '/visitor/getMessageInfo';
+
+//消息列表
+export function getMessageList(phone) {
+	useNetWork();
+  return fetch.post(GET_MESSAGE_LIST).then(res => res);
+}
+
+//消息详情
+export function getMessageInfo(id) {
+	useNetWork();
+	const params = {
+		messageId: id
+	}
+  return fetch.post(GET_MESSAGE_INFO).then(res => res);
+}
+
+//管理员处理
diff --git a/common/fetch.js b/common/fetch.js
index 1efb372..b9d05fa 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -36,8 +36,8 @@
 							resolve('用户未注册');
 						} else {
               uni.showToast({
-                title: "系统异常，请稍后再试！",
-                // title: `${data.data.message}`,
+                // title: "系统异常，请稍后再试！",
+                title: `${data.data.message}`,
                 icon: "none",
                 duration: 2000,
               });
diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue
index 9dadf09..dd5b803 100644
--- a/pages/checkMessageDetail/checkMessageDetail.vue
+++ b/pages/checkMessageDetail/checkMessageDetail.vue
@@ -23,7 +23,7 @@
 			class="content" 
 			v-for="item in list" 
 			:key="item.id" 
-			v-if="status === '已提交' && isManager ? true : item.id === 'phone' || item.id === 'name' ? false : true">
+			v-if="status === '已提交' && isManager ? true : item.id === 'staffPhone' || item.id === 'staffName' ? false : true">
 				<view class="title">{{item.name}}</view>
 				<view class="value">{{item.value}}</view>
 		</view>
@@ -54,30 +54,32 @@
 </template>
 
 <script>
+	import { getMessageInfo } from '@/api/message.js';
+	import { getLocationParams } from '@/common/utils.js';
 	export default {
 		data() {
 			return {
-				isManager: false,
+				isManager: true,
 				show: false, //控制模态框显隐
 				content: '', //模态框显示内容
 				list: [
 					{
-						id: 'odd',
+						id: 'applyNo',
 						name: '申请单号',
 						value: '1111111111'
 					},
 					{
-						id: 'number',
+						id: 'staffCode',
 						name: '申请者工号',
 						value: '1111111111'
 					},
 					{
-						id: 'name',
+						id: 'staffName',
 						name: '申请者姓名',
 						value: '张三'
 					},
 					{
-						id: 'phone',
+						id: 'staffPhone',
 						name: '申请者手机号',
 						value: '12345678912'
 					},
@@ -87,7 +89,7 @@
 						value: '12345678912'
 					},
 					{
-						id: 'visitorKey',
+						id: 'visitorIdCard',
 						name: '访客身份证',
 						value: '123456789126415897'
 					},
@@ -97,12 +99,12 @@
 						value: '123456789126415897'
 					},
 					{
-						id: 'aim',
+						id: 'visitReason',
 						name: '访问目的',
 						value: '商务会议'
 					},
 					{
-						id: 'area',
+						id: 'visitPosition',
 						name: '访问区域',
 						value: '一期主楼'
 					},
@@ -112,7 +114,7 @@
 						value: '2022-12-12 05:45:12 ~ 2022-16-78 15:45:36'
 					},
 					{
-						id: 'remark',
+						id: 'remarks',
 						name: '备注',
 						value: '1212'
 					},
@@ -123,6 +125,9 @@
 				place: '一期主楼'
 			}
 		},
+		mounted() {
+			const id = getLocationParams('id');
+		},
 		methods: {
 			handleClick(value, text) {
 				let index = this.list.findIndex(item => item.id === 'odd');
@@ -147,6 +152,24 @@
 				wx.reLaunch({
 					url: '/pages/message/message'
 				})
+			},
+			//获取消息详情
+			async fetchMessageInfo(id) {
+				const res = await getMessageInfo(id);
+				this.status = res.visitorApplyStatus === "1" ? '已提交' :  res.visitorApplyStatus === "2" ? 
+				'已通过' : '不通过';
+				this.name = res.visitorName;
+				this.time = res.inTime + ' ~ ' + res.outTime;
+				this.place = res.visitPosition;
+				this.list.forEach(item => {
+					for(let key in res) {
+						if(item.id === key) {
+							item.value = res[key];
+						} else if(item.id === 'time') {
+							item.value = res.inTime + ' ~ ' + res.outTime;
+						}
+					}
+				})
 			}
 		}
 	}

diff --git a/api/index.js b/api/index.js
index 246ee23..f832a2c 100644
--- a/api/index.js
+++ b/api/index.js
@@ -2,12 +2,21 @@
 import BASE_URL from './base.js';
 import useNetWork from '@/common/useNetWork.js';
 
-const GET_USER_INFO = BASE_URL + '/user/userLogin';
 
-export function getUserInfo(phone) {
+const VERIFY_PHONE = BASE_URL + '/user/userLogin';
+const GET_USER_INFO = BASE_URL + '/user/getUserInfo';
+
+//验证手机号是否为员工
+export function verifyPhone(phone) {
 	useNetWork();
   const params = {
     phoneCode: phone,
   };
-  return fetch.post(GET_USER_INFO, params).then(res => res);
+  return fetch.post(VERIFY_PHONE, params).then(res => res);
+}
+
+//获取用户信息
+export function getUserInfo(phone) {
+	useNetWork();
+  return fetch.post(GET_USER_INFO).then(res => res);
 }
\ No newline at end of file
diff --git a/api/message.js b/api/message.js
new file mode 100644
index 0000000..d233cf0
--- /dev/null
+++ b/api/message.js
@@ -0,0 +1,25 @@
+
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base.js';
+import useNetWork from '@/common/useNetWork.js';
+
+
+const GET_MESSAGE_LIST = BASE_URL + '/visitor/getMessageList';
+const GET_MESSAGE_INFO = BASE_URL + '/visitor/getMessageInfo';
+
+//消息列表
+export function getMessageList(phone) {
+	useNetWork();
+  return fetch.post(GET_MESSAGE_LIST).then(res => res);
+}
+
+//消息详情
+export function getMessageInfo(id) {
+	useNetWork();
+	const params = {
+		messageId: id
+	}
+  return fetch.post(GET_MESSAGE_INFO).then(res => res);
+}
+
+//管理员处理
diff --git a/common/fetch.js b/common/fetch.js
index 1efb372..b9d05fa 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -36,8 +36,8 @@
 							resolve('用户未注册');
 						} else {
               uni.showToast({
-                title: "系统异常，请稍后再试！",
-                // title: `${data.data.message}`,
+                // title: "系统异常，请稍后再试！",
+                title: `${data.data.message}`,
                 icon: "none",
                 duration: 2000,
               });
diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue
index 9dadf09..dd5b803 100644
--- a/pages/checkMessageDetail/checkMessageDetail.vue
+++ b/pages/checkMessageDetail/checkMessageDetail.vue
@@ -23,7 +23,7 @@
 			class="content" 
 			v-for="item in list" 
 			:key="item.id" 
-			v-if="status === '已提交' && isManager ? true : item.id === 'phone' || item.id === 'name' ? false : true">
+			v-if="status === '已提交' && isManager ? true : item.id === 'staffPhone' || item.id === 'staffName' ? false : true">
 				<view class="title">{{item.name}}</view>
 				<view class="value">{{item.value}}</view>
 		</view>
@@ -54,30 +54,32 @@
 </template>
 
 <script>
+	import { getMessageInfo } from '@/api/message.js';
+	import { getLocationParams } from '@/common/utils.js';
 	export default {
 		data() {
 			return {
-				isManager: false,
+				isManager: true,
 				show: false, //控制模态框显隐
 				content: '', //模态框显示内容
 				list: [
 					{
-						id: 'odd',
+						id: 'applyNo',
 						name: '申请单号',
 						value: '1111111111'
 					},
 					{
-						id: 'number',
+						id: 'staffCode',
 						name: '申请者工号',
 						value: '1111111111'
 					},
 					{
-						id: 'name',
+						id: 'staffName',
 						name: '申请者姓名',
 						value: '张三'
 					},
 					{
-						id: 'phone',
+						id: 'staffPhone',
 						name: '申请者手机号',
 						value: '12345678912'
 					},
@@ -87,7 +89,7 @@
 						value: '12345678912'
 					},
 					{
-						id: 'visitorKey',
+						id: 'visitorIdCard',
 						name: '访客身份证',
 						value: '123456789126415897'
 					},
@@ -97,12 +99,12 @@
 						value: '123456789126415897'
 					},
 					{
-						id: 'aim',
+						id: 'visitReason',
 						name: '访问目的',
 						value: '商务会议'
 					},
 					{
-						id: 'area',
+						id: 'visitPosition',
 						name: '访问区域',
 						value: '一期主楼'
 					},
@@ -112,7 +114,7 @@
 						value: '2022-12-12 05:45:12 ~ 2022-16-78 15:45:36'
 					},
 					{
-						id: 'remark',
+						id: 'remarks',
 						name: '备注',
 						value: '1212'
 					},
@@ -123,6 +125,9 @@
 				place: '一期主楼'
 			}
 		},
+		mounted() {
+			const id = getLocationParams('id');
+		},
 		methods: {
 			handleClick(value, text) {
 				let index = this.list.findIndex(item => item.id === 'odd');
@@ -147,6 +152,24 @@
 				wx.reLaunch({
 					url: '/pages/message/message'
 				})
+			},
+			//获取消息详情
+			async fetchMessageInfo(id) {
+				const res = await getMessageInfo(id);
+				this.status = res.visitorApplyStatus === "1" ? '已提交' :  res.visitorApplyStatus === "2" ? 
+				'已通过' : '不通过';
+				this.name = res.visitorName;
+				this.time = res.inTime + ' ~ ' + res.outTime;
+				this.place = res.visitPosition;
+				this.list.forEach(item => {
+					for(let key in res) {
+						if(item.id === key) {
+							item.value = res[key];
+						} else if(item.id === 'time') {
+							item.value = res.inTime + ' ~ ' + res.outTime;
+						}
+					}
+				})
 			}
 		}
 	}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c2e5e0a..fee7823 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -15,7 +15,7 @@
 	import { mapMutations } from 'vuex';
 	import TabBar from '@/components/tabBar/tabBar.vue';
 	import { getLogin } from '@/utils/auth.js';
-	import { getUserInfo } from '@/api/index.js';
+	import { verifyPhone } from '@/api/index.js';
 	export default {
 		components: {
 			TabBar,
@@ -54,8 +54,8 @@
 			async handleClick(id) {
 				//如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过
 				
-				let phone = '18342910967';   //先将手机号写死
-				const res = await getUserInfo(phone);
+				let phone = '12345678912';   //先将手机号写死
+				const res = await verifyPhone(phone);
 				if(res === '用户未注册') {
 					wx.reLaunch({
 						url: '/pages/register/register'

diff --git a/api/index.js b/api/index.js
index 246ee23..f832a2c 100644
--- a/api/index.js
+++ b/api/index.js
@@ -2,12 +2,21 @@
 import BASE_URL from './base.js';
 import useNetWork from '@/common/useNetWork.js';
 
-const GET_USER_INFO = BASE_URL + '/user/userLogin';
 
-export function getUserInfo(phone) {
+const VERIFY_PHONE = BASE_URL + '/user/userLogin';
+const GET_USER_INFO = BASE_URL + '/user/getUserInfo';
+
+//验证手机号是否为员工
+export function verifyPhone(phone) {
 	useNetWork();
   const params = {
     phoneCode: phone,
   };
-  return fetch.post(GET_USER_INFO, params).then(res => res);
+  return fetch.post(VERIFY_PHONE, params).then(res => res);
+}
+
+//获取用户信息
+export function getUserInfo(phone) {
+	useNetWork();
+  return fetch.post(GET_USER_INFO).then(res => res);
 }
\ No newline at end of file
diff --git a/api/message.js b/api/message.js
new file mode 100644
index 0000000..d233cf0
--- /dev/null
+++ b/api/message.js
@@ -0,0 +1,25 @@
+
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base.js';
+import useNetWork from '@/common/useNetWork.js';
+
+
+const GET_MESSAGE_LIST = BASE_URL + '/visitor/getMessageList';
+const GET_MESSAGE_INFO = BASE_URL + '/visitor/getMessageInfo';
+
+//消息列表
+export function getMessageList(phone) {
+	useNetWork();
+  return fetch.post(GET_MESSAGE_LIST).then(res => res);
+}
+
+//消息详情
+export function getMessageInfo(id) {
+	useNetWork();
+	const params = {
+		messageId: id
+	}
+  return fetch.post(GET_MESSAGE_INFO).then(res => res);
+}
+
+//管理员处理
diff --git a/common/fetch.js b/common/fetch.js
index 1efb372..b9d05fa 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -36,8 +36,8 @@
 							resolve('用户未注册');
 						} else {
               uni.showToast({
-                title: "系统异常，请稍后再试！",
-                // title: `${data.data.message}`,
+                // title: "系统异常，请稍后再试！",
+                title: `${data.data.message}`,
                 icon: "none",
                 duration: 2000,
               });
diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue
index 9dadf09..dd5b803 100644
--- a/pages/checkMessageDetail/checkMessageDetail.vue
+++ b/pages/checkMessageDetail/checkMessageDetail.vue
@@ -23,7 +23,7 @@
 			class="content" 
 			v-for="item in list" 
 			:key="item.id" 
-			v-if="status === '已提交' && isManager ? true : item.id === 'phone' || item.id === 'name' ? false : true">
+			v-if="status === '已提交' && isManager ? true : item.id === 'staffPhone' || item.id === 'staffName' ? false : true">
 				<view class="title">{{item.name}}</view>
 				<view class="value">{{item.value}}</view>
 		</view>
@@ -54,30 +54,32 @@
 </template>
 
 <script>
+	import { getMessageInfo } from '@/api/message.js';
+	import { getLocationParams } from '@/common/utils.js';
 	export default {
 		data() {
 			return {
-				isManager: false,
+				isManager: true,
 				show: false, //控制模态框显隐
 				content: '', //模态框显示内容
 				list: [
 					{
-						id: 'odd',
+						id: 'applyNo',
 						name: '申请单号',
 						value: '1111111111'
 					},
 					{
-						id: 'number',
+						id: 'staffCode',
 						name: '申请者工号',
 						value: '1111111111'
 					},
 					{
-						id: 'name',
+						id: 'staffName',
 						name: '申请者姓名',
 						value: '张三'
 					},
 					{
-						id: 'phone',
+						id: 'staffPhone',
 						name: '申请者手机号',
 						value: '12345678912'
 					},
@@ -87,7 +89,7 @@
 						value: '12345678912'
 					},
 					{
-						id: 'visitorKey',
+						id: 'visitorIdCard',
 						name: '访客身份证',
 						value: '123456789126415897'
 					},
@@ -97,12 +99,12 @@
 						value: '123456789126415897'
 					},
 					{
-						id: 'aim',
+						id: 'visitReason',
 						name: '访问目的',
 						value: '商务会议'
 					},
 					{
-						id: 'area',
+						id: 'visitPosition',
 						name: '访问区域',
 						value: '一期主楼'
 					},
@@ -112,7 +114,7 @@
 						value: '2022-12-12 05:45:12 ~ 2022-16-78 15:45:36'
 					},
 					{
-						id: 'remark',
+						id: 'remarks',
 						name: '备注',
 						value: '1212'
 					},
@@ -123,6 +125,9 @@
 				place: '一期主楼'
 			}
 		},
+		mounted() {
+			const id = getLocationParams('id');
+		},
 		methods: {
 			handleClick(value, text) {
 				let index = this.list.findIndex(item => item.id === 'odd');
@@ -147,6 +152,24 @@
 				wx.reLaunch({
 					url: '/pages/message/message'
 				})
+			},
+			//获取消息详情
+			async fetchMessageInfo(id) {
+				const res = await getMessageInfo(id);
+				this.status = res.visitorApplyStatus === "1" ? '已提交' :  res.visitorApplyStatus === "2" ? 
+				'已通过' : '不通过';
+				this.name = res.visitorName;
+				this.time = res.inTime + ' ~ ' + res.outTime;
+				this.place = res.visitPosition;
+				this.list.forEach(item => {
+					for(let key in res) {
+						if(item.id === key) {
+							item.value = res[key];
+						} else if(item.id === 'time') {
+							item.value = res.inTime + ' ~ ' + res.outTime;
+						}
+					}
+				})
 			}
 		}
 	}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c2e5e0a..fee7823 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -15,7 +15,7 @@
 	import { mapMutations } from 'vuex';
 	import TabBar from '@/components/tabBar/tabBar.vue';
 	import { getLogin } from '@/utils/auth.js';
-	import { getUserInfo } from '@/api/index.js';
+	import { verifyPhone } from '@/api/index.js';
 	export default {
 		components: {
 			TabBar,
@@ -54,8 +54,8 @@
 			async handleClick(id) {
 				//如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过
 				
-				let phone = '18342910967';   //先将手机号写死
-				const res = await getUserInfo(phone);
+				let phone = '12345678912';   //先将手机号写死
+				const res = await verifyPhone(phone);
 				if(res === '用户未注册') {
 					wx.reLaunch({
 						url: '/pages/register/register'
diff --git a/pages/message/message.vue b/pages/message/message.vue
index e83bda2..4fc0052 100644
--- a/pages/message/message.vue
+++ b/pages/message/message.vue
@@ -46,6 +46,7 @@
 <script>
 	import TabBar from '@/components/tabBar/tabBar.vue';
 	import { js_date_time } from '../../common/formatTime.js';
+	import { getMessageList } from '@/api/message.js';
 	export default {
 		components: {
 			TabBar,
@@ -85,16 +86,24 @@
 			}
 		},
 		onShow() {
+			//获取页面栈
 			let pages = getCurrentPages();
 			const curPage = pages[pages.length - 1];
 			this.currentPagePath = curPage.route;
 			uni.setStorageSync('currentPagePath', this.currentPagePath);
+			this.fetchMessageList();
 		},
 		methods: {
 			clickDetail() {
 				wx.navigateTo({
 					url: '/pages/checkMessageDetail/checkMessageDetail'
 				})
+			},
+			//获取消息列表
+			fetchMessageList() {
+				const res = getMessageList(res => {
+					console.log('00000000', res);
+				})
 			}
 		}
 	}

diff --git a/api/index.js b/api/index.js
index 246ee23..f832a2c 100644
--- a/api/index.js
+++ b/api/index.js
@@ -2,12 +2,21 @@
 import BASE_URL from './base.js';
 import useNetWork from '@/common/useNetWork.js';
 
-const GET_USER_INFO = BASE_URL + '/user/userLogin';
 
-export function getUserInfo(phone) {
+const VERIFY_PHONE = BASE_URL + '/user/userLogin';
+const GET_USER_INFO = BASE_URL + '/user/getUserInfo';
+
+//验证手机号是否为员工
+export function verifyPhone(phone) {
 	useNetWork();
   const params = {
     phoneCode: phone,
   };
-  return fetch.post(GET_USER_INFO, params).then(res => res);
+  return fetch.post(VERIFY_PHONE, params).then(res => res);
+}
+
+//获取用户信息
+export function getUserInfo(phone) {
+	useNetWork();
+  return fetch.post(GET_USER_INFO).then(res => res);
 }
\ No newline at end of file
diff --git a/api/message.js b/api/message.js
new file mode 100644
index 0000000..d233cf0
--- /dev/null
+++ b/api/message.js
@@ -0,0 +1,25 @@
+
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base.js';
+import useNetWork from '@/common/useNetWork.js';
+
+
+const GET_MESSAGE_LIST = BASE_URL + '/visitor/getMessageList';
+const GET_MESSAGE_INFO = BASE_URL + '/visitor/getMessageInfo';
+
+//消息列表
+export function getMessageList(phone) {
+	useNetWork();
+  return fetch.post(GET_MESSAGE_LIST).then(res => res);
+}
+
+//消息详情
+export function getMessageInfo(id) {
+	useNetWork();
+	const params = {
+		messageId: id
+	}
+  return fetch.post(GET_MESSAGE_INFO).then(res => res);
+}
+
+//管理员处理
diff --git a/common/fetch.js b/common/fetch.js
index 1efb372..b9d05fa 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -36,8 +36,8 @@
 							resolve('用户未注册');
 						} else {
               uni.showToast({
-                title: "系统异常，请稍后再试！",
-                // title: `${data.data.message}`,
+                // title: "系统异常，请稍后再试！",
+                title: `${data.data.message}`,
                 icon: "none",
                 duration: 2000,
               });
diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue
index 9dadf09..dd5b803 100644
--- a/pages/checkMessageDetail/checkMessageDetail.vue
+++ b/pages/checkMessageDetail/checkMessageDetail.vue
@@ -23,7 +23,7 @@
 			class="content" 
 			v-for="item in list" 
 			:key="item.id" 
-			v-if="status === '已提交' && isManager ? true : item.id === 'phone' || item.id === 'name' ? false : true">
+			v-if="status === '已提交' && isManager ? true : item.id === 'staffPhone' || item.id === 'staffName' ? false : true">
 				<view class="title">{{item.name}}</view>
 				<view class="value">{{item.value}}</view>
 		</view>
@@ -54,30 +54,32 @@
 </template>
 
 <script>
+	import { getMessageInfo } from '@/api/message.js';
+	import { getLocationParams } from '@/common/utils.js';
 	export default {
 		data() {
 			return {
-				isManager: false,
+				isManager: true,
 				show: false, //控制模态框显隐
 				content: '', //模态框显示内容
 				list: [
 					{
-						id: 'odd',
+						id: 'applyNo',
 						name: '申请单号',
 						value: '1111111111'
 					},
 					{
-						id: 'number',
+						id: 'staffCode',
 						name: '申请者工号',
 						value: '1111111111'
 					},
 					{
-						id: 'name',
+						id: 'staffName',
 						name: '申请者姓名',
 						value: '张三'
 					},
 					{
-						id: 'phone',
+						id: 'staffPhone',
 						name: '申请者手机号',
 						value: '12345678912'
 					},
@@ -87,7 +89,7 @@
 						value: '12345678912'
 					},
 					{
-						id: 'visitorKey',
+						id: 'visitorIdCard',
 						name: '访客身份证',
 						value: '123456789126415897'
 					},
@@ -97,12 +99,12 @@
 						value: '123456789126415897'
 					},
 					{
-						id: 'aim',
+						id: 'visitReason',
 						name: '访问目的',
 						value: '商务会议'
 					},
 					{
-						id: 'area',
+						id: 'visitPosition',
 						name: '访问区域',
 						value: '一期主楼'
 					},
@@ -112,7 +114,7 @@
 						value: '2022-12-12 05:45:12 ~ 2022-16-78 15:45:36'
 					},
 					{
-						id: 'remark',
+						id: 'remarks',
 						name: '备注',
 						value: '1212'
 					},
@@ -123,6 +125,9 @@
 				place: '一期主楼'
 			}
 		},
+		mounted() {
+			const id = getLocationParams('id');
+		},
 		methods: {
 			handleClick(value, text) {
 				let index = this.list.findIndex(item => item.id === 'odd');
@@ -147,6 +152,24 @@
 				wx.reLaunch({
 					url: '/pages/message/message'
 				})
+			},
+			//获取消息详情
+			async fetchMessageInfo(id) {
+				const res = await getMessageInfo(id);
+				this.status = res.visitorApplyStatus === "1" ? '已提交' :  res.visitorApplyStatus === "2" ? 
+				'已通过' : '不通过';
+				this.name = res.visitorName;
+				this.time = res.inTime + ' ~ ' + res.outTime;
+				this.place = res.visitPosition;
+				this.list.forEach(item => {
+					for(let key in res) {
+						if(item.id === key) {
+							item.value = res[key];
+						} else if(item.id === 'time') {
+							item.value = res.inTime + ' ~ ' + res.outTime;
+						}
+					}
+				})
 			}
 		}
 	}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c2e5e0a..fee7823 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -15,7 +15,7 @@
 	import { mapMutations } from 'vuex';
 	import TabBar from '@/components/tabBar/tabBar.vue';
 	import { getLogin } from '@/utils/auth.js';
-	import { getUserInfo } from '@/api/index.js';
+	import { verifyPhone } from '@/api/index.js';
 	export default {
 		components: {
 			TabBar,
@@ -54,8 +54,8 @@
 			async handleClick(id) {
 				//如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过
 				
-				let phone = '18342910967';   //先将手机号写死
-				const res = await getUserInfo(phone);
+				let phone = '12345678912';   //先将手机号写死
+				const res = await verifyPhone(phone);
 				if(res === '用户未注册') {
 					wx.reLaunch({
 						url: '/pages/register/register'
diff --git a/pages/message/message.vue b/pages/message/message.vue
index e83bda2..4fc0052 100644
--- a/pages/message/message.vue
+++ b/pages/message/message.vue
@@ -46,6 +46,7 @@
 <script>
 	import TabBar from '@/components/tabBar/tabBar.vue';
 	import { js_date_time } from '../../common/formatTime.js';
+	import { getMessageList } from '@/api/message.js';
 	export default {
 		components: {
 			TabBar,
@@ -85,16 +86,24 @@
 			}
 		},
 		onShow() {
+			//获取页面栈
 			let pages = getCurrentPages();
 			const curPage = pages[pages.length - 1];
 			this.currentPagePath = curPage.route;
 			uni.setStorageSync('currentPagePath', this.currentPagePath);
+			this.fetchMessageList();
 		},
 		methods: {
 			clickDetail() {
 				wx.navigateTo({
 					url: '/pages/checkMessageDetail/checkMessageDetail'
 				})
+			},
+			//获取消息列表
+			fetchMessageList() {
+				const res = getMessageList(res => {
+					console.log('00000000', res);
+				})
 			}
 		}
 	}
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index 9bf3b36..6bd3afe 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -28,6 +28,7 @@
   data() {
     return {
       img: '', //头像
+			id: '', //用户id
 			list: [
 				{
 					id: 'number',
@@ -52,9 +53,14 @@
 			]
     }
   },
-	onLoad() {
-		// this.img = 'wxfile://tmp_ef02bac4f6814fd602e24627ad9face0.jpg';
-		// console.log(this.img);
+	mounted() {
+		const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
+		this.img = userInfo.avatar;
+		this.id = userInfo.id;
+		this.list[0].value = userInfo.account;
+		this.list[1].value = userInfo.name;
+		this.list[2].value = userInfo.SALT;  //物业人员0，安保人员1，正式员工2
+		this.list[3].value = userInfo.phone;
 	},
   onShow() {
     let pages = getCurrentPages()
@@ -65,9 +71,7 @@
   methods: {
     onChooseAvatar(e) {
 			this.img = e.detail.avatarUrl;
-			//此处应该得到uid
-			// updateImg(this.img, uid);
-			//在此，调一个接口把头像信息存上
+			updateImg(this.img, this.id);
 		}
   },
 }

diff --git a/api/index.js b/api/index.js
index 246ee23..f832a2c 100644
--- a/api/index.js
+++ b/api/index.js
@@ -2,12 +2,21 @@
 import BASE_URL from './base.js';
 import useNetWork from '@/common/useNetWork.js';
 
-const GET_USER_INFO = BASE_URL + '/user/userLogin';
 
-export function getUserInfo(phone) {
+const VERIFY_PHONE = BASE_URL + '/user/userLogin';
+const GET_USER_INFO = BASE_URL + '/user/getUserInfo';
+
+//验证手机号是否为员工
+export function verifyPhone(phone) {
 	useNetWork();
   const params = {
     phoneCode: phone,
   };
-  return fetch.post(GET_USER_INFO, params).then(res => res);
+  return fetch.post(VERIFY_PHONE, params).then(res => res);
+}
+
+//获取用户信息
+export function getUserInfo(phone) {
+	useNetWork();
+  return fetch.post(GET_USER_INFO).then(res => res);
 }
\ No newline at end of file
diff --git a/api/message.js b/api/message.js
new file mode 100644
index 0000000..d233cf0
--- /dev/null
+++ b/api/message.js
@@ -0,0 +1,25 @@
+
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base.js';
+import useNetWork from '@/common/useNetWork.js';
+
+
+const GET_MESSAGE_LIST = BASE_URL + '/visitor/getMessageList';
+const GET_MESSAGE_INFO = BASE_URL + '/visitor/getMessageInfo';
+
+//消息列表
+export function getMessageList(phone) {
+	useNetWork();
+  return fetch.post(GET_MESSAGE_LIST).then(res => res);
+}
+
+//消息详情
+export function getMessageInfo(id) {
+	useNetWork();
+	const params = {
+		messageId: id
+	}
+  return fetch.post(GET_MESSAGE_INFO).then(res => res);
+}
+
+//管理员处理
diff --git a/common/fetch.js b/common/fetch.js
index 1efb372..b9d05fa 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -36,8 +36,8 @@
 							resolve('用户未注册');
 						} else {
               uni.showToast({
-                title: "系统异常，请稍后再试！",
-                // title: `${data.data.message}`,
+                // title: "系统异常，请稍后再试！",
+                title: `${data.data.message}`,
                 icon: "none",
                 duration: 2000,
               });
diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue
index 9dadf09..dd5b803 100644
--- a/pages/checkMessageDetail/checkMessageDetail.vue
+++ b/pages/checkMessageDetail/checkMessageDetail.vue
@@ -23,7 +23,7 @@
 			class="content" 
 			v-for="item in list" 
 			:key="item.id" 
-			v-if="status === '已提交' && isManager ? true : item.id === 'phone' || item.id === 'name' ? false : true">
+			v-if="status === '已提交' && isManager ? true : item.id === 'staffPhone' || item.id === 'staffName' ? false : true">
 				<view class="title">{{item.name}}</view>
 				<view class="value">{{item.value}}</view>
 		</view>
@@ -54,30 +54,32 @@
 </template>
 
 <script>
+	import { getMessageInfo } from '@/api/message.js';
+	import { getLocationParams } from '@/common/utils.js';
 	export default {
 		data() {
 			return {
-				isManager: false,
+				isManager: true,
 				show: false, //控制模态框显隐
 				content: '', //模态框显示内容
 				list: [
 					{
-						id: 'odd',
+						id: 'applyNo',
 						name: '申请单号',
 						value: '1111111111'
 					},
 					{
-						id: 'number',
+						id: 'staffCode',
 						name: '申请者工号',
 						value: '1111111111'
 					},
 					{
-						id: 'name',
+						id: 'staffName',
 						name: '申请者姓名',
 						value: '张三'
 					},
 					{
-						id: 'phone',
+						id: 'staffPhone',
 						name: '申请者手机号',
 						value: '12345678912'
 					},
@@ -87,7 +89,7 @@
 						value: '12345678912'
 					},
 					{
-						id: 'visitorKey',
+						id: 'visitorIdCard',
 						name: '访客身份证',
 						value: '123456789126415897'
 					},
@@ -97,12 +99,12 @@
 						value: '123456789126415897'
 					},
 					{
-						id: 'aim',
+						id: 'visitReason',
 						name: '访问目的',
 						value: '商务会议'
 					},
 					{
-						id: 'area',
+						id: 'visitPosition',
 						name: '访问区域',
 						value: '一期主楼'
 					},
@@ -112,7 +114,7 @@
 						value: '2022-12-12 05:45:12 ~ 2022-16-78 15:45:36'
 					},
 					{
-						id: 'remark',
+						id: 'remarks',
 						name: '备注',
 						value: '1212'
 					},
@@ -123,6 +125,9 @@
 				place: '一期主楼'
 			}
 		},
+		mounted() {
+			const id = getLocationParams('id');
+		},
 		methods: {
 			handleClick(value, text) {
 				let index = this.list.findIndex(item => item.id === 'odd');
@@ -147,6 +152,24 @@
 				wx.reLaunch({
 					url: '/pages/message/message'
 				})
+			},
+			//获取消息详情
+			async fetchMessageInfo(id) {
+				const res = await getMessageInfo(id);
+				this.status = res.visitorApplyStatus === "1" ? '已提交' :  res.visitorApplyStatus === "2" ? 
+				'已通过' : '不通过';
+				this.name = res.visitorName;
+				this.time = res.inTime + ' ~ ' + res.outTime;
+				this.place = res.visitPosition;
+				this.list.forEach(item => {
+					for(let key in res) {
+						if(item.id === key) {
+							item.value = res[key];
+						} else if(item.id === 'time') {
+							item.value = res.inTime + ' ~ ' + res.outTime;
+						}
+					}
+				})
 			}
 		}
 	}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c2e5e0a..fee7823 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -15,7 +15,7 @@
 	import { mapMutations } from 'vuex';
 	import TabBar from '@/components/tabBar/tabBar.vue';
 	import { getLogin } from '@/utils/auth.js';
-	import { getUserInfo } from '@/api/index.js';
+	import { verifyPhone } from '@/api/index.js';
 	export default {
 		components: {
 			TabBar,
@@ -54,8 +54,8 @@
 			async handleClick(id) {
 				//如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过
 				
-				let phone = '18342910967';   //先将手机号写死
-				const res = await getUserInfo(phone);
+				let phone = '12345678912';   //先将手机号写死
+				const res = await verifyPhone(phone);
 				if(res === '用户未注册') {
 					wx.reLaunch({
 						url: '/pages/register/register'
diff --git a/pages/message/message.vue b/pages/message/message.vue
index e83bda2..4fc0052 100644
--- a/pages/message/message.vue
+++ b/pages/message/message.vue
@@ -46,6 +46,7 @@
 <script>
 	import TabBar from '@/components/tabBar/tabBar.vue';
 	import { js_date_time } from '../../common/formatTime.js';
+	import { getMessageList } from '@/api/message.js';
 	export default {
 		components: {
 			TabBar,
@@ -85,16 +86,24 @@
 			}
 		},
 		onShow() {
+			//获取页面栈
 			let pages = getCurrentPages();
 			const curPage = pages[pages.length - 1];
 			this.currentPagePath = curPage.route;
 			uni.setStorageSync('currentPagePath', this.currentPagePath);
+			this.fetchMessageList();
 		},
 		methods: {
 			clickDetail() {
 				wx.navigateTo({
 					url: '/pages/checkMessageDetail/checkMessageDetail'
 				})
+			},
+			//获取消息列表
+			fetchMessageList() {
+				const res = getMessageList(res => {
+					console.log('00000000', res);
+				})
 			}
 		}
 	}
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index 9bf3b36..6bd3afe 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -28,6 +28,7 @@
   data() {
     return {
       img: '', //头像
+			id: '', //用户id
 			list: [
 				{
 					id: 'number',
@@ -52,9 +53,14 @@
 			]
     }
   },
-	onLoad() {
-		// this.img = 'wxfile://tmp_ef02bac4f6814fd602e24627ad9face0.jpg';
-		// console.log(this.img);
+	mounted() {
+		const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
+		this.img = userInfo.avatar;
+		this.id = userInfo.id;
+		this.list[0].value = userInfo.account;
+		this.list[1].value = userInfo.name;
+		this.list[2].value = userInfo.SALT;  //物业人员0，安保人员1，正式员工2
+		this.list[3].value = userInfo.phone;
 	},
   onShow() {
     let pages = getCurrentPages()
@@ -65,9 +71,7 @@
   methods: {
     onChooseAvatar(e) {
 			this.img = e.detail.avatarUrl;
-			//此处应该得到uid
-			// updateImg(this.img, uid);
-			//在此，调一个接口把头像信息存上
+			updateImg(this.img, this.id);
 		}
   },
 }
diff --git a/pages/register/register.vue b/pages/register/register.vue
index 35f0c52..ae459f3 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -193,7 +193,7 @@
   },
   async created() {
     let res = await getUserType();
-    this.list = res.data;
+    this.list = res;
   },
   methods: {
     //注册失败确认
@@ -219,16 +219,16 @@
         });
       }
       const res = await getUserRegister(this.form);
-      if (res.data.code === 200) {
+      // if (res.data.code === 200) {
         this.successShow = true;
         setTimeout(() => {
           wx.switchTab({
             url: `/pages/index/index`,
           });
         }, 1000);
-      } else {
-        this.errorShow = true;
-      }
+      // } else {
+      //   this.errorShow = true;
+      // }
     },
     //允许获取
     permit() {

diff --git a/api/index.js b/api/index.js
index 246ee23..f832a2c 100644
--- a/api/index.js
+++ b/api/index.js
@@ -2,12 +2,21 @@
 import BASE_URL from './base.js';
 import useNetWork from '@/common/useNetWork.js';
 
-const GET_USER_INFO = BASE_URL + '/user/userLogin';
 
-export function getUserInfo(phone) {
+const VERIFY_PHONE = BASE_URL + '/user/userLogin';
+const GET_USER_INFO = BASE_URL + '/user/getUserInfo';
+
+//验证手机号是否为员工
+export function verifyPhone(phone) {
 	useNetWork();
   const params = {
     phoneCode: phone,
   };
-  return fetch.post(GET_USER_INFO, params).then(res => res);
+  return fetch.post(VERIFY_PHONE, params).then(res => res);
+}
+
+//获取用户信息
+export function getUserInfo(phone) {
+	useNetWork();
+  return fetch.post(GET_USER_INFO).then(res => res);
 }
\ No newline at end of file
diff --git a/api/message.js b/api/message.js
new file mode 100644
index 0000000..d233cf0
--- /dev/null
+++ b/api/message.js
@@ -0,0 +1,25 @@
+
+import fetch from '@/common/fetch.js';
+import BASE_URL from './base.js';
+import useNetWork from '@/common/useNetWork.js';
+
+
+const GET_MESSAGE_LIST = BASE_URL + '/visitor/getMessageList';
+const GET_MESSAGE_INFO = BASE_URL + '/visitor/getMessageInfo';
+
+//消息列表
+export function getMessageList(phone) {
+	useNetWork();
+  return fetch.post(GET_MESSAGE_LIST).then(res => res);
+}
+
+//消息详情
+export function getMessageInfo(id) {
+	useNetWork();
+	const params = {
+		messageId: id
+	}
+  return fetch.post(GET_MESSAGE_INFO).then(res => res);
+}
+
+//管理员处理
diff --git a/common/fetch.js b/common/fetch.js
index 1efb372..b9d05fa 100644
--- a/common/fetch.js
+++ b/common/fetch.js
@@ -36,8 +36,8 @@
 							resolve('用户未注册');
 						} else {
               uni.showToast({
-                title: "系统异常，请稍后再试！",
-                // title: `${data.data.message}`,
+                // title: "系统异常，请稍后再试！",
+                title: `${data.data.message}`,
                 icon: "none",
                 duration: 2000,
               });
diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue
index 9dadf09..dd5b803 100644
--- a/pages/checkMessageDetail/checkMessageDetail.vue
+++ b/pages/checkMessageDetail/checkMessageDetail.vue
@@ -23,7 +23,7 @@
 			class="content" 
 			v-for="item in list" 
 			:key="item.id" 
-			v-if="status === '已提交' && isManager ? true : item.id === 'phone' || item.id === 'name' ? false : true">
+			v-if="status === '已提交' && isManager ? true : item.id === 'staffPhone' || item.id === 'staffName' ? false : true">
 				<view class="title">{{item.name}}</view>
 				<view class="value">{{item.value}}</view>
 		</view>
@@ -54,30 +54,32 @@
 </template>
 
 <script>
+	import { getMessageInfo } from '@/api/message.js';
+	import { getLocationParams } from '@/common/utils.js';
 	export default {
 		data() {
 			return {
-				isManager: false,
+				isManager: true,
 				show: false, //控制模态框显隐
 				content: '', //模态框显示内容
 				list: [
 					{
-						id: 'odd',
+						id: 'applyNo',
 						name: '申请单号',
 						value: '1111111111'
 					},
 					{
-						id: 'number',
+						id: 'staffCode',
 						name: '申请者工号',
 						value: '1111111111'
 					},
 					{
-						id: 'name',
+						id: 'staffName',
 						name: '申请者姓名',
 						value: '张三'
 					},
 					{
-						id: 'phone',
+						id: 'staffPhone',
 						name: '申请者手机号',
 						value: '12345678912'
 					},
@@ -87,7 +89,7 @@
 						value: '12345678912'
 					},
 					{
-						id: 'visitorKey',
+						id: 'visitorIdCard',
 						name: '访客身份证',
 						value: '123456789126415897'
 					},
@@ -97,12 +99,12 @@
 						value: '123456789126415897'
 					},
 					{
-						id: 'aim',
+						id: 'visitReason',
 						name: '访问目的',
 						value: '商务会议'
 					},
 					{
-						id: 'area',
+						id: 'visitPosition',
 						name: '访问区域',
 						value: '一期主楼'
 					},
@@ -112,7 +114,7 @@
 						value: '2022-12-12 05:45:12 ~ 2022-16-78 15:45:36'
 					},
 					{
-						id: 'remark',
+						id: 'remarks',
 						name: '备注',
 						value: '1212'
 					},
@@ -123,6 +125,9 @@
 				place: '一期主楼'
 			}
 		},
+		mounted() {
+			const id = getLocationParams('id');
+		},
 		methods: {
 			handleClick(value, text) {
 				let index = this.list.findIndex(item => item.id === 'odd');
@@ -147,6 +152,24 @@
 				wx.reLaunch({
 					url: '/pages/message/message'
 				})
+			},
+			//获取消息详情
+			async fetchMessageInfo(id) {
+				const res = await getMessageInfo(id);
+				this.status = res.visitorApplyStatus === "1" ? '已提交' :  res.visitorApplyStatus === "2" ? 
+				'已通过' : '不通过';
+				this.name = res.visitorName;
+				this.time = res.inTime + ' ~ ' + res.outTime;
+				this.place = res.visitPosition;
+				this.list.forEach(item => {
+					for(let key in res) {
+						if(item.id === key) {
+							item.value = res[key];
+						} else if(item.id === 'time') {
+							item.value = res.inTime + ' ~ ' + res.outTime;
+						}
+					}
+				})
 			}
 		}
 	}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c2e5e0a..fee7823 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -15,7 +15,7 @@
 	import { mapMutations } from 'vuex';
 	import TabBar from '@/components/tabBar/tabBar.vue';
 	import { getLogin } from '@/utils/auth.js';
-	import { getUserInfo } from '@/api/index.js';
+	import { verifyPhone } from '@/api/index.js';
 	export default {
 		components: {
 			TabBar,
@@ -54,8 +54,8 @@
 			async handleClick(id) {
 				//如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过
 				
-				let phone = '18342910967';   //先将手机号写死
-				const res = await getUserInfo(phone);
+				let phone = '12345678912';   //先将手机号写死
+				const res = await verifyPhone(phone);
 				if(res === '用户未注册') {
 					wx.reLaunch({
 						url: '/pages/register/register'
diff --git a/pages/message/message.vue b/pages/message/message.vue
index e83bda2..4fc0052 100644
--- a/pages/message/message.vue
+++ b/pages/message/message.vue
@@ -46,6 +46,7 @@
 <script>
 	import TabBar from '@/components/tabBar/tabBar.vue';
 	import { js_date_time } from '../../common/formatTime.js';
+	import { getMessageList } from '@/api/message.js';
 	export default {
 		components: {
 			TabBar,
@@ -85,16 +86,24 @@
 			}
 		},
 		onShow() {
+			//获取页面栈
 			let pages = getCurrentPages();
 			const curPage = pages[pages.length - 1];
 			this.currentPagePath = curPage.route;
 			uni.setStorageSync('currentPagePath', this.currentPagePath);
+			this.fetchMessageList();
 		},
 		methods: {
 			clickDetail() {
 				wx.navigateTo({
 					url: '/pages/checkMessageDetail/checkMessageDetail'
 				})
+			},
+			//获取消息列表
+			fetchMessageList() {
+				const res = getMessageList(res => {
+					console.log('00000000', res);
+				})
 			}
 		}
 	}
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index 9bf3b36..6bd3afe 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -28,6 +28,7 @@
   data() {
     return {
       img: '', //头像
+			id: '', //用户id
 			list: [
 				{
 					id: 'number',
@@ -52,9 +53,14 @@
 			]
     }
   },
-	onLoad() {
-		// this.img = 'wxfile://tmp_ef02bac4f6814fd602e24627ad9face0.jpg';
-		// console.log(this.img);
+	mounted() {
+		const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
+		this.img = userInfo.avatar;
+		this.id = userInfo.id;
+		this.list[0].value = userInfo.account;
+		this.list[1].value = userInfo.name;
+		this.list[2].value = userInfo.SALT;  //物业人员0，安保人员1，正式员工2
+		this.list[3].value = userInfo.phone;
 	},
   onShow() {
     let pages = getCurrentPages()
@@ -65,9 +71,7 @@
   methods: {
     onChooseAvatar(e) {
 			this.img = e.detail.avatarUrl;
-			//此处应该得到uid
-			// updateImg(this.img, uid);
-			//在此，调一个接口把头像信息存上
+			updateImg(this.img, this.id);
 		}
   },
 }
diff --git a/pages/register/register.vue b/pages/register/register.vue
index 35f0c52..ae459f3 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -193,7 +193,7 @@
   },
   async created() {
     let res = await getUserType();
-    this.list = res.data;
+    this.list = res;
   },
   methods: {
     //注册失败确认
@@ -219,16 +219,16 @@
         });
       }
       const res = await getUserRegister(this.form);
-      if (res.data.code === 200) {
+      // if (res.data.code === 200) {
         this.successShow = true;
         setTimeout(() => {
           wx.switchTab({
             url: `/pages/index/index`,
           });
         }, 1000);
-      } else {
-        this.errorShow = true;
-      }
+      // } else {
+      //   this.errorShow = true;
+      // }
     },
     //允许获取
     permit() {
diff --git a/utils/auth.js b/utils/auth.js
index baeb1ff..a8b839a 100644
--- a/utils/auth.js
+++ b/utils/auth.js
@@ -1,5 +1,6 @@
 import store from '@/store/index.js';
 import {login} from '@/api/user.js';
+import { getUserInfo } from "@/api/index.js";
 //获取用户信息
 // export function getUserProfile(onAuthSuccess) {
 // 	uni.getUserProfile({
@@ -20,6 +21,10 @@
 				console.log('登录参数', data, uni.getStorageSync('sessionId'))
 				login(data.code).then(res => {
 					uni.setStorageSync('sessionId', res);
+					//获取用户信息
+					getUserInfo().then(resporse => {
+						uni.setStorageSync('userInfo', JSON.stringify(resporse));
+					})
 					uni.showToast({
 					  title: `登录成功`,
 					  icon: "none",