diff --git a/api/message.js b/api/message.js
index 9980e0d..007f48c 100644
--- a/api/message.js
+++ b/api/message.js
@@ -20,11 +20,11 @@
 	const params = {
 		messageId: id
 	}
-  return fetch.post(GET_MESSAGE_INFO).then(res => res);
+  return fetch.get(GET_MESSAGE_INFO, params).then(res => res);
 }
 
 //管理员处理申请
-export function solveStatus(userId, status) {
+export function solveStatus(status, userId) {
 	useNetWork();
 	const params = {
 		id: userId,

diff --git a/api/message.js b/api/message.js
index 9980e0d..007f48c 100644
--- a/api/message.js
+++ b/api/message.js
@@ -20,11 +20,11 @@
 	const params = {
 		messageId: id
 	}
-  return fetch.post(GET_MESSAGE_INFO).then(res => res);
+  return fetch.get(GET_MESSAGE_INFO, params).then(res => res);
 }
 
 //管理员处理申请
-export function solveStatus(userId, status) {
+export function solveStatus(status, userId) {
 	useNetWork();
 	const params = {
 		id: userId,
diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue
index fc69c1e..4d4ead6 100644
--- a/pages/checkMessageDetail/checkMessageDetail.vue
+++ b/pages/checkMessageDetail/checkMessageDetail.vue
@@ -29,7 +29,7 @@
 		</view>
 		
 		<!-- 管理员button -->
-		<view class="button-area-manager" v-if="isManager">
+		<view class="button-area-manager" v-if="isManager && status === '已提交'">
 			<view class="pass">
 				<view class="icon"></view>
 				<view class="text" @click="handleClick(item, '已通过')">申请通过</view>
@@ -67,57 +67,57 @@
 					{
 						id: 'applyNo',
 						name: '申请单号',
-						value: '1111111111'
+						value: ''
 					},
 					{
 						id: 'staffCode',
 						name: '申请者工号',
-						value: '1111111111'
+						value: ''
 					},
 					{
 						id: 'staffName',
 						name: '申请者姓名',
-						value: '张三'
+						value: ''
 					},
 					{
 						id: 'staffPhone',
 						name: '申请者手机号',
-						value: '12345678912'
+						value: ''
 					},
 					{
 						id: 'visitorName',
 						name: '访客姓名',
-						value: '12345678912'
+						value: ''
 					},
 					{
 						id: 'visitorIdCard',
 						name: '访客身份证',
-						value: '123456789126415897'
+						value: ''
 					},
 					{
 						id: 'visitorPhone',
 						name: '访客联系方式',
-						value: '123456789126415897'
+						value: ''
 					},
 					{
 						id: 'visitReason',
 						name: '访问目的',
-						value: '商务会议'
+						value: ''
 					},
 					{
 						id: 'visitPosition',
 						name: '访问区域',
-						value: '一期主楼'
+						value: ''
 					},
 					{
 						id: 'time',
 						name: '访问时间',
-						value: '2022-12-12 05:45:12 ~ 2022-16-78 15:45:36'
+						value: ''
 					},
 					{
 						id: 'remarks',
 						name: '备注',
-						value: '1212'
+						value: ''
 					},
 				],
 				status: '已提交',
@@ -129,13 +129,16 @@
 		},
 		mounted() {
 			const id = getLocationParams('id');
-			const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
+			if(uni.getStorageSync('userInfo')) {
+				const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
+			}
 			this.userId = userInfo.id;
 			if(userInfo.salt === '物业人员') {
 				this.isManager = true;
 			} else {
 				this.isManager = false;
 			}
+			this.fetchMessageInfo(id);
 		},
 		methods: {
 			handleClick(value, text) {
@@ -144,7 +147,7 @@
 				} else {
 					this.willchange = '3';
 				}
-				let index = this.list.findIndex(item => item.id === 'odd');
+				let index = this.list.findIndex(item => item.id === 'applyNo');
 				if(index !== -1) {
 					let number = this.list[index].value;
 					this.content = `单号${number}访客访客申请${text}`;
@@ -188,7 +191,7 @@
 			},
 			//管理员处理是否通过申请
 			async solveStatusData() {
-				const res = await solveStatus(this.willchange, this.userId);
+				await solveStatus(this.willchange, this.userId);
 			}
 		}
 	}

diff --git a/api/message.js b/api/message.js
index 9980e0d..007f48c 100644
--- a/api/message.js
+++ b/api/message.js
@@ -20,11 +20,11 @@
 	const params = {
 		messageId: id
 	}
-  return fetch.post(GET_MESSAGE_INFO).then(res => res);
+  return fetch.get(GET_MESSAGE_INFO, params).then(res => res);
 }
 
 //管理员处理申请
-export function solveStatus(userId, status) {
+export function solveStatus(status, userId) {
 	useNetWork();
 	const params = {
 		id: userId,
diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue
index fc69c1e..4d4ead6 100644
--- a/pages/checkMessageDetail/checkMessageDetail.vue
+++ b/pages/checkMessageDetail/checkMessageDetail.vue
@@ -29,7 +29,7 @@
 		</view>
 		
 		<!-- 管理员button -->
-		<view class="button-area-manager" v-if="isManager">
+		<view class="button-area-manager" v-if="isManager && status === '已提交'">
 			<view class="pass">
 				<view class="icon"></view>
 				<view class="text" @click="handleClick(item, '已通过')">申请通过</view>
@@ -67,57 +67,57 @@
 					{
 						id: 'applyNo',
 						name: '申请单号',
-						value: '1111111111'
+						value: ''
 					},
 					{
 						id: 'staffCode',
 						name: '申请者工号',
-						value: '1111111111'
+						value: ''
 					},
 					{
 						id: 'staffName',
 						name: '申请者姓名',
-						value: '张三'
+						value: ''
 					},
 					{
 						id: 'staffPhone',
 						name: '申请者手机号',
-						value: '12345678912'
+						value: ''
 					},
 					{
 						id: 'visitorName',
 						name: '访客姓名',
-						value: '12345678912'
+						value: ''
 					},
 					{
 						id: 'visitorIdCard',
 						name: '访客身份证',
-						value: '123456789126415897'
+						value: ''
 					},
 					{
 						id: 'visitorPhone',
 						name: '访客联系方式',
-						value: '123456789126415897'
+						value: ''
 					},
 					{
 						id: 'visitReason',
 						name: '访问目的',
-						value: '商务会议'
+						value: ''
 					},
 					{
 						id: 'visitPosition',
 						name: '访问区域',
-						value: '一期主楼'
+						value: ''
 					},
 					{
 						id: 'time',
 						name: '访问时间',
-						value: '2022-12-12 05:45:12 ~ 2022-16-78 15:45:36'
+						value: ''
 					},
 					{
 						id: 'remarks',
 						name: '备注',
-						value: '1212'
+						value: ''
 					},
 				],
 				status: '已提交',
@@ -129,13 +129,16 @@
 		},
 		mounted() {
 			const id = getLocationParams('id');
-			const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
+			if(uni.getStorageSync('userInfo')) {
+				const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
+			}
 			this.userId = userInfo.id;
 			if(userInfo.salt === '物业人员') {
 				this.isManager = true;
 			} else {
 				this.isManager = false;
 			}
+			this.fetchMessageInfo(id);
 		},
 		methods: {
 			handleClick(value, text) {
@@ -144,7 +147,7 @@
 				} else {
 					this.willchange = '3';
 				}
-				let index = this.list.findIndex(item => item.id === 'odd');
+				let index = this.list.findIndex(item => item.id === 'applyNo');
 				if(index !== -1) {
 					let number = this.list[index].value;
 					this.content = `单号${number}访客访客申请${text}`;
@@ -188,7 +191,7 @@
 			},
 			//管理员处理是否通过申请
 			async solveStatusData() {
-				const res = await solveStatus(this.willchange, this.userId);
+				await solveStatus(this.willchange, this.userId);
 			}
 		}
 	}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index ed2f629..adc4d34 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,92 +1,138 @@
 //首页
 <template>
-	<view class="index">
-		<TabBar></TabBar>
-		<view 
-			v-for="item in menu" 
-			:key="item.id" 
-			class="menu-item" 
-			@click="handleClick(item.id)"
-		>{{item.name}}</view>
-	</view>
+  <view class="index">
+    <TabBar></TabBar>
+    <view
+      v-for="item in menu"
+      :key="item.id"
+      class="menu-item"
+      @click="handleClick(item.id)"
+      >{{ item.name }}</view
+    >
+
+    <u-popup
+      customStyle="poppo"
+      :show="show"
+      :round="10"
+      mode="center"
+      @close="show = false"
+    >
+      <u--input
+        v-model="inputValue"
+        placeholder="填写手机号码"
+        border="surround"
+      ></u--input>
+      <button @click="confirmPhone">确认</button>
+    </u-popup>
+  </view>
 </template>
 
 <script>
-	import { mapMutations } from 'vuex';
-	import TabBar from '@/components/tabBar/tabBar.vue';
-	import { getLogin } from '@/utils/auth.js';
-	import { verifyPhone } from '@/api/index.js';
-	export default {
-		components: {
-			TabBar,
-		},
-		data() {
-			return {
-				currentPagePath: '',
-				menu: [
-					{
-						id: 'submit',
-						name: '访客信息提交'
-					},
-					{
-						id: 'check',
-						name: '物联设备状态查看'
-					},
-				],
-				phone: '',
-			}
-		},
-		onLoad() {
-			// console.log('88888888');
-			// console.log(this.$route);
-			// console.log('88888888');
-			// this.currentPagePath = this.$route.meta.pagePath;
-			getLogin();
-		},
-		onShow() {
-			let pages = getCurrentPages();
-			const curPage = pages[pages.length - 1];
-			this.currentPagePath = curPage.route;
-			uni.setStorageSync('currentPagePath', this.currentPagePath);
-		},
-		methods: {
-			// ...mapMutations(['setNavRect'])
-			async handleClick(id) {
-				//如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过
-				
-				let phone = '17571066031';   //先将手机号写死
-				const res = await verifyPhone(phone);
-				if(res === '用户未注册') {
-					wx.reLaunch({
-						url: '/pages/register/register'
-					});
-				} else {
-					if(id=="submit"){
-						wx.navigateTo({
-							url: `/pages/information/information?id=${id}`,
-							  
-						});
-					}
-				}
-			}
-		}
-	}
+import { mapMutations } from "vuex";
+import TabBar from "@/components/tabBar/tabBar.vue";
+import { getLogin, getUserProfile } from "@/utils/auth.js";
+import { verifyPhone } from "@/api/index.js";
+import { getLocationParams } from "@/common/utils.js";
+export default {
+  components: {
+    TabBar,
+  },
+  data() {
+    return {
+      currentPagePath: "",
+      menu: [
+        {
+          id: "submit",
+          name: "访客信息提交",
+        },
+        {
+          id: "check",
+          name: "物联设备状态查看",
+        },
+      ],
+      phone: "",
+      show: false,
+      active: "", //点击的是哪个按钮
+      inputValue: "",
+    };
+  },
+  mounted() {
+    // console.log('88888888');
+    // console.log(this.$route);
+    // console.log('88888888');
+    // this.currentPagePath = this.$route.meta.pagePath;
+    this.phone = uni.getStorageSync("registerPhone");
+    getLogin();
+  },
+  onShow() {
+    let pages = getCurrentPages();
+    const curPage = pages[pages.length - 1];
+    this.currentPagePath = curPage.route;
+    uni.setStorageSync("currentPagePath", this.currentPagePath);
+  },
+  methods: {
+    // ...mapMutations(['setNavRect'])
+    async handleClick(id) {
+      this.active = id;
+      const sessionId = uni.getStorageSync("sessionId");
+      //如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过
+      if (!sessionId) {
+        await getLogin();
+      }
+      if (this.phone) {
+        this.checkphone();
+      } else {
+        //如果没有电话就弹出填写电话的框
+        this.show = true;
+      }
+    },
+    confirmPhone() {
+      this.phone = this.inputValue;
+      this.checkphone();
+    },
+    async checkphone() {
+      const res = await verifyPhone(this.phone);
+      if (res === "用户未注册") {
+        wx.reLaunch({
+          url: "/pages/register/register",
+        });
+      } else {
+        getUserProfile();
+        if (this.active === "submit") {
+          wx.navigateTo({
+            url: `/pages/information/information?id=${this.active}`,
+          });
+        }
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.index {
-		padding-top: 40rpx;
-		display: flex;
-		justify-content: space-around;
-		.menu-item {
-			width: 320rpx;
-			height: 320rpx;
-			text-align: center;
-			line-height: 320rpx;
-			border-radius: 10rpx;
-			color: #000;
-			background-color: #eee;
-			border: 1px solid gray;
-		}
-	}
+.index {
+  padding-top: 40rpx;
+  display: flex;
+  justify-content: space-around;
+  .menu-item {
+    width: 320rpx;
+    height: 320rpx;
+    text-align: center;
+    line-height: 320rpx;
+    border-radius: 10rpx;
+    color: #000;
+    background-color: #eee;
+    border: 1px solid gray;
+  }
+}
+.poppo {
+  padding: 30rpx;
+}
+</style>
+<style lang="scss">
+.index {
+  .u-popup__content {
+    padding: 20rpx 40rpx;
+  }
+}
 </style>

diff --git a/api/message.js b/api/message.js
index 9980e0d..007f48c 100644
--- a/api/message.js
+++ b/api/message.js
@@ -20,11 +20,11 @@
 	const params = {
 		messageId: id
 	}
-  return fetch.post(GET_MESSAGE_INFO).then(res => res);
+  return fetch.get(GET_MESSAGE_INFO, params).then(res => res);
 }
 
 //管理员处理申请
-export function solveStatus(userId, status) {
+export function solveStatus(status, userId) {
 	useNetWork();
 	const params = {
 		id: userId,
diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue
index fc69c1e..4d4ead6 100644
--- a/pages/checkMessageDetail/checkMessageDetail.vue
+++ b/pages/checkMessageDetail/checkMessageDetail.vue
@@ -29,7 +29,7 @@
 		</view>
 		
 		<!-- 管理员button -->
-		<view class="button-area-manager" v-if="isManager">
+		<view class="button-area-manager" v-if="isManager && status === '已提交'">
 			<view class="pass">
 				<view class="icon"></view>
 				<view class="text" @click="handleClick(item, '已通过')">申请通过</view>
@@ -67,57 +67,57 @@
 					{
 						id: 'applyNo',
 						name: '申请单号',
-						value: '1111111111'
+						value: ''
 					},
 					{
 						id: 'staffCode',
 						name: '申请者工号',
-						value: '1111111111'
+						value: ''
 					},
 					{
 						id: 'staffName',
 						name: '申请者姓名',
-						value: '张三'
+						value: ''
 					},
 					{
 						id: 'staffPhone',
 						name: '申请者手机号',
-						value: '12345678912'
+						value: ''
 					},
 					{
 						id: 'visitorName',
 						name: '访客姓名',
-						value: '12345678912'
+						value: ''
 					},
 					{
 						id: 'visitorIdCard',
 						name: '访客身份证',
-						value: '123456789126415897'
+						value: ''
 					},
 					{
 						id: 'visitorPhone',
 						name: '访客联系方式',
-						value: '123456789126415897'
+						value: ''
 					},
 					{
 						id: 'visitReason',
 						name: '访问目的',
-						value: '商务会议'
+						value: ''
 					},
 					{
 						id: 'visitPosition',
 						name: '访问区域',
-						value: '一期主楼'
+						value: ''
 					},
 					{
 						id: 'time',
 						name: '访问时间',
-						value: '2022-12-12 05:45:12 ~ 2022-16-78 15:45:36'
+						value: ''
 					},
 					{
 						id: 'remarks',
 						name: '备注',
-						value: '1212'
+						value: ''
 					},
 				],
 				status: '已提交',
@@ -129,13 +129,16 @@
 		},
 		mounted() {
 			const id = getLocationParams('id');
-			const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
+			if(uni.getStorageSync('userInfo')) {
+				const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
+			}
 			this.userId = userInfo.id;
 			if(userInfo.salt === '物业人员') {
 				this.isManager = true;
 			} else {
 				this.isManager = false;
 			}
+			this.fetchMessageInfo(id);
 		},
 		methods: {
 			handleClick(value, text) {
@@ -144,7 +147,7 @@
 				} else {
 					this.willchange = '3';
 				}
-				let index = this.list.findIndex(item => item.id === 'odd');
+				let index = this.list.findIndex(item => item.id === 'applyNo');
 				if(index !== -1) {
 					let number = this.list[index].value;
 					this.content = `单号${number}访客访客申请${text}`;
@@ -188,7 +191,7 @@
 			},
 			//管理员处理是否通过申请
 			async solveStatusData() {
-				const res = await solveStatus(this.willchange, this.userId);
+				await solveStatus(this.willchange, this.userId);
 			}
 		}
 	}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index ed2f629..adc4d34 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,92 +1,138 @@
 //首页
 <template>
-	<view class="index">
-		<TabBar></TabBar>
-		<view 
-			v-for="item in menu" 
-			:key="item.id" 
-			class="menu-item" 
-			@click="handleClick(item.id)"
-		>{{item.name}}</view>
-	</view>
+  <view class="index">
+    <TabBar></TabBar>
+    <view
+      v-for="item in menu"
+      :key="item.id"
+      class="menu-item"
+      @click="handleClick(item.id)"
+      >{{ item.name }}</view
+    >
+
+    <u-popup
+      customStyle="poppo"
+      :show="show"
+      :round="10"
+      mode="center"
+      @close="show = false"
+    >
+      <u--input
+        v-model="inputValue"
+        placeholder="填写手机号码"
+        border="surround"
+      ></u--input>
+      <button @click="confirmPhone">确认</button>
+    </u-popup>
+  </view>
 </template>
 
 <script>
-	import { mapMutations } from 'vuex';
-	import TabBar from '@/components/tabBar/tabBar.vue';
-	import { getLogin } from '@/utils/auth.js';
-	import { verifyPhone } from '@/api/index.js';
-	export default {
-		components: {
-			TabBar,
-		},
-		data() {
-			return {
-				currentPagePath: '',
-				menu: [
-					{
-						id: 'submit',
-						name: '访客信息提交'
-					},
-					{
-						id: 'check',
-						name: '物联设备状态查看'
-					},
-				],
-				phone: '',
-			}
-		},
-		onLoad() {
-			// console.log('88888888');
-			// console.log(this.$route);
-			// console.log('88888888');
-			// this.currentPagePath = this.$route.meta.pagePath;
-			getLogin();
-		},
-		onShow() {
-			let pages = getCurrentPages();
-			const curPage = pages[pages.length - 1];
-			this.currentPagePath = curPage.route;
-			uni.setStorageSync('currentPagePath', this.currentPagePath);
-		},
-		methods: {
-			// ...mapMutations(['setNavRect'])
-			async handleClick(id) {
-				//如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过
-				
-				let phone = '17571066031';   //先将手机号写死
-				const res = await verifyPhone(phone);
-				if(res === '用户未注册') {
-					wx.reLaunch({
-						url: '/pages/register/register'
-					});
-				} else {
-					if(id=="submit"){
-						wx.navigateTo({
-							url: `/pages/information/information?id=${id}`,
-							  
-						});
-					}
-				}
-			}
-		}
-	}
+import { mapMutations } from "vuex";
+import TabBar from "@/components/tabBar/tabBar.vue";
+import { getLogin, getUserProfile } from "@/utils/auth.js";
+import { verifyPhone } from "@/api/index.js";
+import { getLocationParams } from "@/common/utils.js";
+export default {
+  components: {
+    TabBar,
+  },
+  data() {
+    return {
+      currentPagePath: "",
+      menu: [
+        {
+          id: "submit",
+          name: "访客信息提交",
+        },
+        {
+          id: "check",
+          name: "物联设备状态查看",
+        },
+      ],
+      phone: "",
+      show: false,
+      active: "", //点击的是哪个按钮
+      inputValue: "",
+    };
+  },
+  mounted() {
+    // console.log('88888888');
+    // console.log(this.$route);
+    // console.log('88888888');
+    // this.currentPagePath = this.$route.meta.pagePath;
+    this.phone = uni.getStorageSync("registerPhone");
+    getLogin();
+  },
+  onShow() {
+    let pages = getCurrentPages();
+    const curPage = pages[pages.length - 1];
+    this.currentPagePath = curPage.route;
+    uni.setStorageSync("currentPagePath", this.currentPagePath);
+  },
+  methods: {
+    // ...mapMutations(['setNavRect'])
+    async handleClick(id) {
+      this.active = id;
+      const sessionId = uni.getStorageSync("sessionId");
+      //如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过
+      if (!sessionId) {
+        await getLogin();
+      }
+      if (this.phone) {
+        this.checkphone();
+      } else {
+        //如果没有电话就弹出填写电话的框
+        this.show = true;
+      }
+    },
+    confirmPhone() {
+      this.phone = this.inputValue;
+      this.checkphone();
+    },
+    async checkphone() {
+      const res = await verifyPhone(this.phone);
+      if (res === "用户未注册") {
+        wx.reLaunch({
+          url: "/pages/register/register",
+        });
+      } else {
+        getUserProfile();
+        if (this.active === "submit") {
+          wx.navigateTo({
+            url: `/pages/information/information?id=${this.active}`,
+          });
+        }
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.index {
-		padding-top: 40rpx;
-		display: flex;
-		justify-content: space-around;
-		.menu-item {
-			width: 320rpx;
-			height: 320rpx;
-			text-align: center;
-			line-height: 320rpx;
-			border-radius: 10rpx;
-			color: #000;
-			background-color: #eee;
-			border: 1px solid gray;
-		}
-	}
+.index {
+  padding-top: 40rpx;
+  display: flex;
+  justify-content: space-around;
+  .menu-item {
+    width: 320rpx;
+    height: 320rpx;
+    text-align: center;
+    line-height: 320rpx;
+    border-radius: 10rpx;
+    color: #000;
+    background-color: #eee;
+    border: 1px solid gray;
+  }
+}
+.poppo {
+  padding: 30rpx;
+}
+</style>
+<style lang="scss">
+.index {
+  .u-popup__content {
+    padding: 20rpx 40rpx;
+  }
+}
 </style>
diff --git a/pages/message/message.vue b/pages/message/message.vue
index 245e964..91853c8 100644
--- a/pages/message/message.vue
+++ b/pages/message/message.vue
@@ -4,7 +4,7 @@
 		<TabBar></TabBar>
 		<view class="main" v-for="(item, index) in list" :key="index">
 			<view class="date-time">{{item.date}}</view>
-			<view class="card" @click="clickDetail">
+			<view class="card" @click="clickDetail(item.id)">
 				<view class="title">
 					<!-- <text v-show="isManager">收到新的访客申请</text>
 					<text v-show="!isManager" class="text">您的访客信息{{item.status}}</text> -->
@@ -14,12 +14,13 @@
 							<text class="number">{{item.number}}</text>
 						</view>
 						
-						<view v-show="!isManager" :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>
 						<text class="text"> 至 </text>
 						<text class="end">{{item.endTime}}</text>
+						<!-- <text class="end">{{item.timeData}}</text> -->
 					</view>
 				</view>
 				<!-- <view class="content">
@@ -47,6 +48,7 @@
 	import TabBar from '@/components/tabBar/tabBar.vue';
 	import { js_date_time } from '../../common/formatTime.js';
 	import { getMessageList } from '@/api/message.js';
+	import { dateToString } from '@/common/utils.js';
 	export default {
 		components: {
 			TabBar,
@@ -54,35 +56,7 @@
 		data() {
 			return {
 				isManager: false,
-				list: [
-					{
-						//0未通过，1已通过，2已提交
-						status: '未通过',
-						number: '1111',
-						name: '张三',
-						startTime: '2022-12-03',
-						endTime: '2022-01-69',
-						date: '星期一 上午9:00'
-					},
-					{
-						//0未通过，1已通过，2已提交
-						status: '已通过',
-						number: '1111',
-						name: '张三',
-						startTime: '2022-12-03',
-						endTime: '2022-01-69',
-						date: '星期一 上午9:00'
-					},
-					{
-						//0未通过，1已通过，2已提交
-						status: '已提交',
-						number: '1111',
-						name: '张三',
-						startTime: '2022-12-03',
-						endTime: '2022-01-69',
-						date: '星期一 上午9:00'
-					},
-				]
+				list: []
 			}
 		},
 		onShow() {
@@ -94,7 +68,9 @@
 			this.fetchMessageList();
 		},
 		mounted() {
-			const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
+			if(uni.getStorageSync('userInfo')) {
+				const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
+			}
 			if(userInfo.salt === '物业人员') {
 				this.isManager = true;
 			} else {
@@ -102,15 +78,24 @@
 			}
 		},
 		methods: {
-			clickDetail() {
+			clickDetail(id) {
 				wx.navigateTo({
-					url: '/pages/checkMessageDetail/checkMessageDetail'
+					url: `/pages/checkMessageDetail/checkMessageDetail?id=${id}`
 				})
 			},
 			//获取消息列表
-			fetchMessageList() {
-				const res = getMessageList(res => {
-					console.log('00000000', res);
+			async fetchMessageList() {
+				const res = await getMessageList();
+				this.list = res.map(item => {
+					return {
+						id: item.message_id,
+						name: item.visitor_name,
+						number: item.staff_code,
+						timeData: item.apply_time,
+						startTime: dateToString(new Date (item.apply_time.slice(0, item.apply_time.indexOf('-'))), 'yyyy-MM-dd'),
+						endTime: dateToString(new Date (item.apply_time.slice(item.apply_time.indexOf('-') + 1)), 'yyyy-MM-dd'),
+						status: item.visitor_apply_status === '1' ? '已提交' : item.visitor_apply_status === '2' ? '已通过' : '未通过',
+					}
 				})
 			}
 		}

diff --git a/api/message.js b/api/message.js
index 9980e0d..007f48c 100644
--- a/api/message.js
+++ b/api/message.js
@@ -20,11 +20,11 @@
 	const params = {
 		messageId: id
 	}
-  return fetch.post(GET_MESSAGE_INFO).then(res => res);
+  return fetch.get(GET_MESSAGE_INFO, params).then(res => res);
 }
 
 //管理员处理申请
-export function solveStatus(userId, status) {
+export function solveStatus(status, userId) {
 	useNetWork();
 	const params = {
 		id: userId,
diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue
index fc69c1e..4d4ead6 100644
--- a/pages/checkMessageDetail/checkMessageDetail.vue
+++ b/pages/checkMessageDetail/checkMessageDetail.vue
@@ -29,7 +29,7 @@
 		</view>
 		
 		<!-- 管理员button -->
-		<view class="button-area-manager" v-if="isManager">
+		<view class="button-area-manager" v-if="isManager && status === '已提交'">
 			<view class="pass">
 				<view class="icon"></view>
 				<view class="text" @click="handleClick(item, '已通过')">申请通过</view>
@@ -67,57 +67,57 @@
 					{
 						id: 'applyNo',
 						name: '申请单号',
-						value: '1111111111'
+						value: ''
 					},
 					{
 						id: 'staffCode',
 						name: '申请者工号',
-						value: '1111111111'
+						value: ''
 					},
 					{
 						id: 'staffName',
 						name: '申请者姓名',
-						value: '张三'
+						value: ''
 					},
 					{
 						id: 'staffPhone',
 						name: '申请者手机号',
-						value: '12345678912'
+						value: ''
 					},
 					{
 						id: 'visitorName',
 						name: '访客姓名',
-						value: '12345678912'
+						value: ''
 					},
 					{
 						id: 'visitorIdCard',
 						name: '访客身份证',
-						value: '123456789126415897'
+						value: ''
 					},
 					{
 						id: 'visitorPhone',
 						name: '访客联系方式',
-						value: '123456789126415897'
+						value: ''
 					},
 					{
 						id: 'visitReason',
 						name: '访问目的',
-						value: '商务会议'
+						value: ''
 					},
 					{
 						id: 'visitPosition',
 						name: '访问区域',
-						value: '一期主楼'
+						value: ''
 					},
 					{
 						id: 'time',
 						name: '访问时间',
-						value: '2022-12-12 05:45:12 ~ 2022-16-78 15:45:36'
+						value: ''
 					},
 					{
 						id: 'remarks',
 						name: '备注',
-						value: '1212'
+						value: ''
 					},
 				],
 				status: '已提交',
@@ -129,13 +129,16 @@
 		},
 		mounted() {
 			const id = getLocationParams('id');
-			const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
+			if(uni.getStorageSync('userInfo')) {
+				const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
+			}
 			this.userId = userInfo.id;
 			if(userInfo.salt === '物业人员') {
 				this.isManager = true;
 			} else {
 				this.isManager = false;
 			}
+			this.fetchMessageInfo(id);
 		},
 		methods: {
 			handleClick(value, text) {
@@ -144,7 +147,7 @@
 				} else {
 					this.willchange = '3';
 				}
-				let index = this.list.findIndex(item => item.id === 'odd');
+				let index = this.list.findIndex(item => item.id === 'applyNo');
 				if(index !== -1) {
 					let number = this.list[index].value;
 					this.content = `单号${number}访客访客申请${text}`;
@@ -188,7 +191,7 @@
 			},
 			//管理员处理是否通过申请
 			async solveStatusData() {
-				const res = await solveStatus(this.willchange, this.userId);
+				await solveStatus(this.willchange, this.userId);
 			}
 		}
 	}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index ed2f629..adc4d34 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,92 +1,138 @@
 //首页
 <template>
-	<view class="index">
-		<TabBar></TabBar>
-		<view 
-			v-for="item in menu" 
-			:key="item.id" 
-			class="menu-item" 
-			@click="handleClick(item.id)"
-		>{{item.name}}</view>
-	</view>
+  <view class="index">
+    <TabBar></TabBar>
+    <view
+      v-for="item in menu"
+      :key="item.id"
+      class="menu-item"
+      @click="handleClick(item.id)"
+      >{{ item.name }}</view
+    >
+
+    <u-popup
+      customStyle="poppo"
+      :show="show"
+      :round="10"
+      mode="center"
+      @close="show = false"
+    >
+      <u--input
+        v-model="inputValue"
+        placeholder="填写手机号码"
+        border="surround"
+      ></u--input>
+      <button @click="confirmPhone">确认</button>
+    </u-popup>
+  </view>
 </template>
 
 <script>
-	import { mapMutations } from 'vuex';
-	import TabBar from '@/components/tabBar/tabBar.vue';
-	import { getLogin } from '@/utils/auth.js';
-	import { verifyPhone } from '@/api/index.js';
-	export default {
-		components: {
-			TabBar,
-		},
-		data() {
-			return {
-				currentPagePath: '',
-				menu: [
-					{
-						id: 'submit',
-						name: '访客信息提交'
-					},
-					{
-						id: 'check',
-						name: '物联设备状态查看'
-					},
-				],
-				phone: '',
-			}
-		},
-		onLoad() {
-			// console.log('88888888');
-			// console.log(this.$route);
-			// console.log('88888888');
-			// this.currentPagePath = this.$route.meta.pagePath;
-			getLogin();
-		},
-		onShow() {
-			let pages = getCurrentPages();
-			const curPage = pages[pages.length - 1];
-			this.currentPagePath = curPage.route;
-			uni.setStorageSync('currentPagePath', this.currentPagePath);
-		},
-		methods: {
-			// ...mapMutations(['setNavRect'])
-			async handleClick(id) {
-				//如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过
-				
-				let phone = '17571066031';   //先将手机号写死
-				const res = await verifyPhone(phone);
-				if(res === '用户未注册') {
-					wx.reLaunch({
-						url: '/pages/register/register'
-					});
-				} else {
-					if(id=="submit"){
-						wx.navigateTo({
-							url: `/pages/information/information?id=${id}`,
-							  
-						});
-					}
-				}
-			}
-		}
-	}
+import { mapMutations } from "vuex";
+import TabBar from "@/components/tabBar/tabBar.vue";
+import { getLogin, getUserProfile } from "@/utils/auth.js";
+import { verifyPhone } from "@/api/index.js";
+import { getLocationParams } from "@/common/utils.js";
+export default {
+  components: {
+    TabBar,
+  },
+  data() {
+    return {
+      currentPagePath: "",
+      menu: [
+        {
+          id: "submit",
+          name: "访客信息提交",
+        },
+        {
+          id: "check",
+          name: "物联设备状态查看",
+        },
+      ],
+      phone: "",
+      show: false,
+      active: "", //点击的是哪个按钮
+      inputValue: "",
+    };
+  },
+  mounted() {
+    // console.log('88888888');
+    // console.log(this.$route);
+    // console.log('88888888');
+    // this.currentPagePath = this.$route.meta.pagePath;
+    this.phone = uni.getStorageSync("registerPhone");
+    getLogin();
+  },
+  onShow() {
+    let pages = getCurrentPages();
+    const curPage = pages[pages.length - 1];
+    this.currentPagePath = curPage.route;
+    uni.setStorageSync("currentPagePath", this.currentPagePath);
+  },
+  methods: {
+    // ...mapMutations(['setNavRect'])
+    async handleClick(id) {
+      this.active = id;
+      const sessionId = uni.getStorageSync("sessionId");
+      //如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过
+      if (!sessionId) {
+        await getLogin();
+      }
+      if (this.phone) {
+        this.checkphone();
+      } else {
+        //如果没有电话就弹出填写电话的框
+        this.show = true;
+      }
+    },
+    confirmPhone() {
+      this.phone = this.inputValue;
+      this.checkphone();
+    },
+    async checkphone() {
+      const res = await verifyPhone(this.phone);
+      if (res === "用户未注册") {
+        wx.reLaunch({
+          url: "/pages/register/register",
+        });
+      } else {
+        getUserProfile();
+        if (this.active === "submit") {
+          wx.navigateTo({
+            url: `/pages/information/information?id=${this.active}`,
+          });
+        }
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.index {
-		padding-top: 40rpx;
-		display: flex;
-		justify-content: space-around;
-		.menu-item {
-			width: 320rpx;
-			height: 320rpx;
-			text-align: center;
-			line-height: 320rpx;
-			border-radius: 10rpx;
-			color: #000;
-			background-color: #eee;
-			border: 1px solid gray;
-		}
-	}
+.index {
+  padding-top: 40rpx;
+  display: flex;
+  justify-content: space-around;
+  .menu-item {
+    width: 320rpx;
+    height: 320rpx;
+    text-align: center;
+    line-height: 320rpx;
+    border-radius: 10rpx;
+    color: #000;
+    background-color: #eee;
+    border: 1px solid gray;
+  }
+}
+.poppo {
+  padding: 30rpx;
+}
+</style>
+<style lang="scss">
+.index {
+  .u-popup__content {
+    padding: 20rpx 40rpx;
+  }
+}
 </style>
diff --git a/pages/message/message.vue b/pages/message/message.vue
index 245e964..91853c8 100644
--- a/pages/message/message.vue
+++ b/pages/message/message.vue
@@ -4,7 +4,7 @@
 		<TabBar></TabBar>
 		<view class="main" v-for="(item, index) in list" :key="index">
 			<view class="date-time">{{item.date}}</view>
-			<view class="card" @click="clickDetail">
+			<view class="card" @click="clickDetail(item.id)">
 				<view class="title">
 					<!-- <text v-show="isManager">收到新的访客申请</text>
 					<text v-show="!isManager" class="text">您的访客信息{{item.status}}</text> -->
@@ -14,12 +14,13 @@
 							<text class="number">{{item.number}}</text>
 						</view>
 						
-						<view v-show="!isManager" :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>
 						<text class="text"> 至 </text>
 						<text class="end">{{item.endTime}}</text>
+						<!-- <text class="end">{{item.timeData}}</text> -->
 					</view>
 				</view>
 				<!-- <view class="content">
@@ -47,6 +48,7 @@
 	import TabBar from '@/components/tabBar/tabBar.vue';
 	import { js_date_time } from '../../common/formatTime.js';
 	import { getMessageList } from '@/api/message.js';
+	import { dateToString } from '@/common/utils.js';
 	export default {
 		components: {
 			TabBar,
@@ -54,35 +56,7 @@
 		data() {
 			return {
 				isManager: false,
-				list: [
-					{
-						//0未通过，1已通过，2已提交
-						status: '未通过',
-						number: '1111',
-						name: '张三',
-						startTime: '2022-12-03',
-						endTime: '2022-01-69',
-						date: '星期一 上午9:00'
-					},
-					{
-						//0未通过，1已通过，2已提交
-						status: '已通过',
-						number: '1111',
-						name: '张三',
-						startTime: '2022-12-03',
-						endTime: '2022-01-69',
-						date: '星期一 上午9:00'
-					},
-					{
-						//0未通过，1已通过，2已提交
-						status: '已提交',
-						number: '1111',
-						name: '张三',
-						startTime: '2022-12-03',
-						endTime: '2022-01-69',
-						date: '星期一 上午9:00'
-					},
-				]
+				list: []
 			}
 		},
 		onShow() {
@@ -94,7 +68,9 @@
 			this.fetchMessageList();
 		},
 		mounted() {
-			const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
+			if(uni.getStorageSync('userInfo')) {
+				const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
+			}
 			if(userInfo.salt === '物业人员') {
 				this.isManager = true;
 			} else {
@@ -102,15 +78,24 @@
 			}
 		},
 		methods: {
-			clickDetail() {
+			clickDetail(id) {
 				wx.navigateTo({
-					url: '/pages/checkMessageDetail/checkMessageDetail'
+					url: `/pages/checkMessageDetail/checkMessageDetail?id=${id}`
 				})
 			},
 			//获取消息列表
-			fetchMessageList() {
-				const res = getMessageList(res => {
-					console.log('00000000', res);
+			async fetchMessageList() {
+				const res = await getMessageList();
+				this.list = res.map(item => {
+					return {
+						id: item.message_id,
+						name: item.visitor_name,
+						number: item.staff_code,
+						timeData: item.apply_time,
+						startTime: dateToString(new Date (item.apply_time.slice(0, item.apply_time.indexOf('-'))), 'yyyy-MM-dd'),
+						endTime: dateToString(new Date (item.apply_time.slice(item.apply_time.indexOf('-') + 1)), 'yyyy-MM-dd'),
+						status: item.visitor_apply_status === '1' ? '已提交' : item.visitor_apply_status === '2' ? '已通过' : '未通过',
+					}
 				})
 			}
 		}
diff --git a/pages/register/register.vue b/pages/register/register.vue
index ac99e06..6346a9c 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -151,6 +151,8 @@
 
 <script>
 import { getUserType, getUserRegister } from "@/api/user.js";
+import { getLogin } from '@/utils/auth.js';
+import { verifyPhone } from '@/api/index.js';
 export default {
   data() {
     return {
@@ -221,11 +223,15 @@
       const res = await getUserRegister(this.form);
       // if (res.data.code === 200) {
         this.successShow = true;
+				uni.setStorageSync('registerPhone', this.form.phone);
         setTimeout(() => {
           wx.switchTab({
             url: `/pages/index/index`,
           });
         }, 1000);
+				// await getLogin();
+				// await verifyPhone(this.form.phone);
+				
       // } else {
       //   this.errorShow = true;
       // }

diff --git a/api/message.js b/api/message.js
index 9980e0d..007f48c 100644
--- a/api/message.js
+++ b/api/message.js
@@ -20,11 +20,11 @@
 	const params = {
 		messageId: id
 	}
-  return fetch.post(GET_MESSAGE_INFO).then(res => res);
+  return fetch.get(GET_MESSAGE_INFO, params).then(res => res);
 }
 
 //管理员处理申请
-export function solveStatus(userId, status) {
+export function solveStatus(status, userId) {
 	useNetWork();
 	const params = {
 		id: userId,
diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue
index fc69c1e..4d4ead6 100644
--- a/pages/checkMessageDetail/checkMessageDetail.vue
+++ b/pages/checkMessageDetail/checkMessageDetail.vue
@@ -29,7 +29,7 @@
 		</view>
 		
 		<!-- 管理员button -->
-		<view class="button-area-manager" v-if="isManager">
+		<view class="button-area-manager" v-if="isManager && status === '已提交'">
 			<view class="pass">
 				<view class="icon"></view>
 				<view class="text" @click="handleClick(item, '已通过')">申请通过</view>
@@ -67,57 +67,57 @@
 					{
 						id: 'applyNo',
 						name: '申请单号',
-						value: '1111111111'
+						value: ''
 					},
 					{
 						id: 'staffCode',
 						name: '申请者工号',
-						value: '1111111111'
+						value: ''
 					},
 					{
 						id: 'staffName',
 						name: '申请者姓名',
-						value: '张三'
+						value: ''
 					},
 					{
 						id: 'staffPhone',
 						name: '申请者手机号',
-						value: '12345678912'
+						value: ''
 					},
 					{
 						id: 'visitorName',
 						name: '访客姓名',
-						value: '12345678912'
+						value: ''
 					},
 					{
 						id: 'visitorIdCard',
 						name: '访客身份证',
-						value: '123456789126415897'
+						value: ''
 					},
 					{
 						id: 'visitorPhone',
 						name: '访客联系方式',
-						value: '123456789126415897'
+						value: ''
 					},
 					{
 						id: 'visitReason',
 						name: '访问目的',
-						value: '商务会议'
+						value: ''
 					},
 					{
 						id: 'visitPosition',
 						name: '访问区域',
-						value: '一期主楼'
+						value: ''
 					},
 					{
 						id: 'time',
 						name: '访问时间',
-						value: '2022-12-12 05:45:12 ~ 2022-16-78 15:45:36'
+						value: ''
 					},
 					{
 						id: 'remarks',
 						name: '备注',
-						value: '1212'
+						value: ''
 					},
 				],
 				status: '已提交',
@@ -129,13 +129,16 @@
 		},
 		mounted() {
 			const id = getLocationParams('id');
-			const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
+			if(uni.getStorageSync('userInfo')) {
+				const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
+			}
 			this.userId = userInfo.id;
 			if(userInfo.salt === '物业人员') {
 				this.isManager = true;
 			} else {
 				this.isManager = false;
 			}
+			this.fetchMessageInfo(id);
 		},
 		methods: {
 			handleClick(value, text) {
@@ -144,7 +147,7 @@
 				} else {
 					this.willchange = '3';
 				}
-				let index = this.list.findIndex(item => item.id === 'odd');
+				let index = this.list.findIndex(item => item.id === 'applyNo');
 				if(index !== -1) {
 					let number = this.list[index].value;
 					this.content = `单号${number}访客访客申请${text}`;
@@ -188,7 +191,7 @@
 			},
 			//管理员处理是否通过申请
 			async solveStatusData() {
-				const res = await solveStatus(this.willchange, this.userId);
+				await solveStatus(this.willchange, this.userId);
 			}
 		}
 	}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index ed2f629..adc4d34 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,92 +1,138 @@
 //首页
 <template>
-	<view class="index">
-		<TabBar></TabBar>
-		<view 
-			v-for="item in menu" 
-			:key="item.id" 
-			class="menu-item" 
-			@click="handleClick(item.id)"
-		>{{item.name}}</view>
-	</view>
+  <view class="index">
+    <TabBar></TabBar>
+    <view
+      v-for="item in menu"
+      :key="item.id"
+      class="menu-item"
+      @click="handleClick(item.id)"
+      >{{ item.name }}</view
+    >
+
+    <u-popup
+      customStyle="poppo"
+      :show="show"
+      :round="10"
+      mode="center"
+      @close="show = false"
+    >
+      <u--input
+        v-model="inputValue"
+        placeholder="填写手机号码"
+        border="surround"
+      ></u--input>
+      <button @click="confirmPhone">确认</button>
+    </u-popup>
+  </view>
 </template>
 
 <script>
-	import { mapMutations } from 'vuex';
-	import TabBar from '@/components/tabBar/tabBar.vue';
-	import { getLogin } from '@/utils/auth.js';
-	import { verifyPhone } from '@/api/index.js';
-	export default {
-		components: {
-			TabBar,
-		},
-		data() {
-			return {
-				currentPagePath: '',
-				menu: [
-					{
-						id: 'submit',
-						name: '访客信息提交'
-					},
-					{
-						id: 'check',
-						name: '物联设备状态查看'
-					},
-				],
-				phone: '',
-			}
-		},
-		onLoad() {
-			// console.log('88888888');
-			// console.log(this.$route);
-			// console.log('88888888');
-			// this.currentPagePath = this.$route.meta.pagePath;
-			getLogin();
-		},
-		onShow() {
-			let pages = getCurrentPages();
-			const curPage = pages[pages.length - 1];
-			this.currentPagePath = curPage.route;
-			uni.setStorageSync('currentPagePath', this.currentPagePath);
-		},
-		methods: {
-			// ...mapMutations(['setNavRect'])
-			async handleClick(id) {
-				//如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过
-				
-				let phone = '17571066031';   //先将手机号写死
-				const res = await verifyPhone(phone);
-				if(res === '用户未注册') {
-					wx.reLaunch({
-						url: '/pages/register/register'
-					});
-				} else {
-					if(id=="submit"){
-						wx.navigateTo({
-							url: `/pages/information/information?id=${id}`,
-							  
-						});
-					}
-				}
-			}
-		}
-	}
+import { mapMutations } from "vuex";
+import TabBar from "@/components/tabBar/tabBar.vue";
+import { getLogin, getUserProfile } from "@/utils/auth.js";
+import { verifyPhone } from "@/api/index.js";
+import { getLocationParams } from "@/common/utils.js";
+export default {
+  components: {
+    TabBar,
+  },
+  data() {
+    return {
+      currentPagePath: "",
+      menu: [
+        {
+          id: "submit",
+          name: "访客信息提交",
+        },
+        {
+          id: "check",
+          name: "物联设备状态查看",
+        },
+      ],
+      phone: "",
+      show: false,
+      active: "", //点击的是哪个按钮
+      inputValue: "",
+    };
+  },
+  mounted() {
+    // console.log('88888888');
+    // console.log(this.$route);
+    // console.log('88888888');
+    // this.currentPagePath = this.$route.meta.pagePath;
+    this.phone = uni.getStorageSync("registerPhone");
+    getLogin();
+  },
+  onShow() {
+    let pages = getCurrentPages();
+    const curPage = pages[pages.length - 1];
+    this.currentPagePath = curPage.route;
+    uni.setStorageSync("currentPagePath", this.currentPagePath);
+  },
+  methods: {
+    // ...mapMutations(['setNavRect'])
+    async handleClick(id) {
+      this.active = id;
+      const sessionId = uni.getStorageSync("sessionId");
+      //如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过
+      if (!sessionId) {
+        await getLogin();
+      }
+      if (this.phone) {
+        this.checkphone();
+      } else {
+        //如果没有电话就弹出填写电话的框
+        this.show = true;
+      }
+    },
+    confirmPhone() {
+      this.phone = this.inputValue;
+      this.checkphone();
+    },
+    async checkphone() {
+      const res = await verifyPhone(this.phone);
+      if (res === "用户未注册") {
+        wx.reLaunch({
+          url: "/pages/register/register",
+        });
+      } else {
+        getUserProfile();
+        if (this.active === "submit") {
+          wx.navigateTo({
+            url: `/pages/information/information?id=${this.active}`,
+          });
+        }
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.index {
-		padding-top: 40rpx;
-		display: flex;
-		justify-content: space-around;
-		.menu-item {
-			width: 320rpx;
-			height: 320rpx;
-			text-align: center;
-			line-height: 320rpx;
-			border-radius: 10rpx;
-			color: #000;
-			background-color: #eee;
-			border: 1px solid gray;
-		}
-	}
+.index {
+  padding-top: 40rpx;
+  display: flex;
+  justify-content: space-around;
+  .menu-item {
+    width: 320rpx;
+    height: 320rpx;
+    text-align: center;
+    line-height: 320rpx;
+    border-radius: 10rpx;
+    color: #000;
+    background-color: #eee;
+    border: 1px solid gray;
+  }
+}
+.poppo {
+  padding: 30rpx;
+}
+</style>
+<style lang="scss">
+.index {
+  .u-popup__content {
+    padding: 20rpx 40rpx;
+  }
+}
 </style>
diff --git a/pages/message/message.vue b/pages/message/message.vue
index 245e964..91853c8 100644
--- a/pages/message/message.vue
+++ b/pages/message/message.vue
@@ -4,7 +4,7 @@
 		<TabBar></TabBar>
 		<view class="main" v-for="(item, index) in list" :key="index">
 			<view class="date-time">{{item.date}}</view>
-			<view class="card" @click="clickDetail">
+			<view class="card" @click="clickDetail(item.id)">
 				<view class="title">
 					<!-- <text v-show="isManager">收到新的访客申请</text>
 					<text v-show="!isManager" class="text">您的访客信息{{item.status}}</text> -->
@@ -14,12 +14,13 @@
 							<text class="number">{{item.number}}</text>
 						</view>
 						
-						<view v-show="!isManager" :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>
 						<text class="text"> 至 </text>
 						<text class="end">{{item.endTime}}</text>
+						<!-- <text class="end">{{item.timeData}}</text> -->
 					</view>
 				</view>
 				<!-- <view class="content">
@@ -47,6 +48,7 @@
 	import TabBar from '@/components/tabBar/tabBar.vue';
 	import { js_date_time } from '../../common/formatTime.js';
 	import { getMessageList } from '@/api/message.js';
+	import { dateToString } from '@/common/utils.js';
 	export default {
 		components: {
 			TabBar,
@@ -54,35 +56,7 @@
 		data() {
 			return {
 				isManager: false,
-				list: [
-					{
-						//0未通过，1已通过，2已提交
-						status: '未通过',
-						number: '1111',
-						name: '张三',
-						startTime: '2022-12-03',
-						endTime: '2022-01-69',
-						date: '星期一 上午9:00'
-					},
-					{
-						//0未通过，1已通过，2已提交
-						status: '已通过',
-						number: '1111',
-						name: '张三',
-						startTime: '2022-12-03',
-						endTime: '2022-01-69',
-						date: '星期一 上午9:00'
-					},
-					{
-						//0未通过，1已通过，2已提交
-						status: '已提交',
-						number: '1111',
-						name: '张三',
-						startTime: '2022-12-03',
-						endTime: '2022-01-69',
-						date: '星期一 上午9:00'
-					},
-				]
+				list: []
 			}
 		},
 		onShow() {
@@ -94,7 +68,9 @@
 			this.fetchMessageList();
 		},
 		mounted() {
-			const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
+			if(uni.getStorageSync('userInfo')) {
+				const userInfo = JSON.parse(uni.getStorageSync('userInfo'));
+			}
 			if(userInfo.salt === '物业人员') {
 				this.isManager = true;
 			} else {
@@ -102,15 +78,24 @@
 			}
 		},
 		methods: {
-			clickDetail() {
+			clickDetail(id) {
 				wx.navigateTo({
-					url: '/pages/checkMessageDetail/checkMessageDetail'
+					url: `/pages/checkMessageDetail/checkMessageDetail?id=${id}`
 				})
 			},
 			//获取消息列表
-			fetchMessageList() {
-				const res = getMessageList(res => {
-					console.log('00000000', res);
+			async fetchMessageList() {
+				const res = await getMessageList();
+				this.list = res.map(item => {
+					return {
+						id: item.message_id,
+						name: item.visitor_name,
+						number: item.staff_code,
+						timeData: item.apply_time,
+						startTime: dateToString(new Date (item.apply_time.slice(0, item.apply_time.indexOf('-'))), 'yyyy-MM-dd'),
+						endTime: dateToString(new Date (item.apply_time.slice(item.apply_time.indexOf('-') + 1)), 'yyyy-MM-dd'),
+						status: item.visitor_apply_status === '1' ? '已提交' : item.visitor_apply_status === '2' ? '已通过' : '未通过',
+					}
 				})
 			}
 		}
diff --git a/pages/register/register.vue b/pages/register/register.vue
index ac99e06..6346a9c 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -151,6 +151,8 @@
 
 <script>
 import { getUserType, getUserRegister } from "@/api/user.js";
+import { getLogin } from '@/utils/auth.js';
+import { verifyPhone } from '@/api/index.js';
 export default {
   data() {
     return {
@@ -221,11 +223,15 @@
       const res = await getUserRegister(this.form);
       // if (res.data.code === 200) {
         this.successShow = true;
+				uni.setStorageSync('registerPhone', this.form.phone);
         setTimeout(() => {
           wx.switchTab({
             url: `/pages/index/index`,
           });
         }, 1000);
+				// await getLogin();
+				// await verifyPhone(this.form.phone);
+				
       // } else {
       //   this.errorShow = true;
       // }
diff --git a/utils/auth.js b/utils/auth.js
index a8b839a..a795598 100644
--- a/utils/auth.js
+++ b/utils/auth.js
@@ -2,16 +2,11 @@
 import {login} from '@/api/user.js';
 import { getUserInfo } from "@/api/index.js";
 //获取用户信息
-// export function getUserProfile(onAuthSuccess) {
-// 	uni.getUserProfile({
-// 	  provider: 'weixin',
-// 	  desc: '用于完善用户信息',
-// 	  success: (res) => {
-// 	    const { nickName, avatarUrl } = res.userInfo;
-// 			onAuthSuccess(nickName, avatarUrl);
-// 	  },
-// 	});
-// }
+export function getUserProfile() {
+	getUserInfo().then(resporse => {
+		uni.setStorageSync('userInfo', JSON.stringify(resporse));
+	})
+}
 
 export function getLogin() {
 	return new Promise((resolve, reject) => {
@@ -21,10 +16,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));
-					})
+					// //获取用户信息
+					// getUserInfo().then(resporse => {
+					// 	uni.setStorageSync('userInfo', JSON.stringify(resporse));
+					// })
 					uni.showToast({
 					  title: `登录成功`,
 					  icon: "none",
@@ -43,4 +38,4 @@
 			},
 		});
 	})
-}
\ No newline at end of file
+}