diff --git a/pages/index/index.vue b/pages/index/index.vue
index e23557c..a3eff57 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -66,6 +66,7 @@
 				this.active = id;
 				const sessionId = uni.getStorageSync('sessionId');
 				//如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过
+<<<<<<< HEAD
 				if(!sessionId) {
 					await getLogin();
 				}
@@ -81,6 +82,11 @@
 			},
 			async checkphone() {
 				const res = await verifyPhone(this.phone);
+=======
+				
+				let phone = '17571066031';   //先将手机号写死
+				const res = await verifyPhone(phone);
+>>>>>>> d04a458a482011d1e94c80b91fb2d8f80bbd02e2
 				if(res === '用户未注册') {
 					wx.reLaunch({
 						url: '/pages/register/register'

diff --git a/pages/index/index.vue b/pages/index/index.vue
index e23557c..a3eff57 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -66,6 +66,7 @@
 				this.active = id;
 				const sessionId = uni.getStorageSync('sessionId');
 				//如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过
+<<<<<<< HEAD
 				if(!sessionId) {
 					await getLogin();
 				}
@@ -81,6 +82,11 @@
 			},
 			async checkphone() {
 				const res = await verifyPhone(this.phone);
+=======
+				
+				let phone = '17571066031';   //先将手机号写死
+				const res = await verifyPhone(phone);
+>>>>>>> d04a458a482011d1e94c80b91fb2d8f80bbd02e2
 				if(res === '用户未注册') {
 					wx.reLaunch({
 						url: '/pages/register/register'
diff --git a/pages/info/info.vue b/pages/info/info.vue
index c5c9234..84f745f 100644
--- a/pages/info/info.vue
+++ b/pages/info/info.vue
@@ -82,11 +82,11 @@
 		},
 		onShow(){
 			if(this.info.status == '1'){
-					 this.status = '申请通过'
-					 this.color = 'green'
+					 this.status = '申请已提交'
+					 this.color = 'blue'
 			}else if(this.info.status == '2'){
-					  this.status = '申请中'
-					  this.color = 'blue'
+					  this.status = '申请已通过'
+					  this.color = 'green'
 			}else {
 					  this.status = '申请未通过'
 					  this.color = 'red'

diff --git a/pages/index/index.vue b/pages/index/index.vue
index e23557c..a3eff57 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -66,6 +66,7 @@
 				this.active = id;
 				const sessionId = uni.getStorageSync('sessionId');
 				//如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过
+<<<<<<< HEAD
 				if(!sessionId) {
 					await getLogin();
 				}
@@ -81,6 +82,11 @@
 			},
 			async checkphone() {
 				const res = await verifyPhone(this.phone);
+=======
+				
+				let phone = '17571066031';   //先将手机号写死
+				const res = await verifyPhone(phone);
+>>>>>>> d04a458a482011d1e94c80b91fb2d8f80bbd02e2
 				if(res === '用户未注册') {
 					wx.reLaunch({
 						url: '/pages/register/register'
diff --git a/pages/info/info.vue b/pages/info/info.vue
index c5c9234..84f745f 100644
--- a/pages/info/info.vue
+++ b/pages/info/info.vue
@@ -82,11 +82,11 @@
 		},
 		onShow(){
 			if(this.info.status == '1'){
-					 this.status = '申请通过'
-					 this.color = 'green'
+					 this.status = '申请已提交'
+					 this.color = 'blue'
 			}else if(this.info.status == '2'){
-					  this.status = '申请中'
-					  this.color = 'blue'
+					  this.status = '申请已通过'
+					  this.color = 'green'
 			}else {
 					  this.status = '申请未通过'
 					  this.color = 'red'
diff --git a/pages/list/list.vue b/pages/list/list.vue
index a6f9635..aea44c5 100644
--- a/pages/list/list.vue
+++ b/pages/list/list.vue
@@ -2,49 +2,52 @@
 <template>
   <view class="list">
     <TabBar></TabBar>
-    <u-input
-      placeholder="关键字搜索"
-      prefixIcon="search"
-	  v-model="queryList.keywords"
-	  @change="change"
-      prefixIconStyle="font-size: 22px;color: #909399"
-    ></u-input>
-    <view class="tab-th">
-      <text style="margin-left: 44rpx; margin-top: 8rpx;color: #918a8a;width: 140rpx;" @click="startTimeShow = true">{{time}} </text>
-      <u-icon name="clock" color="#918a8a" size="12"></u-icon>
-      <text style="margin-left: 18rpx; margin-top: 8rpx;color: #918a8a;width: 140rpx;"@click="statusShow=true">{{statusInfo}}</text>
-      <view class="icon">
-        <u-icon name="checkmark-circle" color="#34a705" size="36" @click="pass('通过')"></u-icon>
-        <u-icon
-          name="close-circle"
-          color="#9b1203"
-          size="36"
-		  @click="pass('拒绝')"
-          style="margin-left: 104rpx"
-        ></u-icon>
-        <u-icon
-          name="share-square"
-          color="#072ddc"
-          size="36"
-          style="margin-left: 34rpx"
-		  @click="isExportShow = true"
-        ></u-icon>
-      </view>
-    </view>
-    <view class="table" v-for="(item,index) in list" :key="index">
-      <view class="table-checkbox">
-        <u-checkbox-group v-model="item.value" >
-        	<u-checkbox @change="checkboxChange(item)"  shape="circle"></u-checkbox>
-        </u-checkbox-group>
-      </view>
-      <view class="table-time"> {{item.inTime}} </view>
-      <view class="table-number">{{item.remarks}} </view>
-      <view class="table-name"> {{item.visitorName}} </view>
-      <view class="table-status" :class="item.color"> {{item.status }} </view>
-      <view class="table-icon">
-        <u-icon name="eye" color="#000" size="18" @click="eyeLoock(item.applyNo)"></u-icon>
-      </view>
-    </view>
+    	<view class="list-top">
+    		<u-input
+    		  placeholder="关键字搜索"
+    		  prefixIcon="search"
+    		  v-model="queryList.keywords"
+    		  @change="change"
+    		  prefixIconStyle="font-size: 22px;color: #909399"
+    		></u-input>
+    		<view class="tab-th">
+    		  <text class="dressingTime" @click="startTimeShow = true">{{time}}</text>
+    		  <text class="dressingStatusInfo" @click="statusShow=true">{{statusInfo}}</text>
+    		  <view class="icon">
+    		    <text class="checkmark-circle"  @click="pass('通过')"></text>
+    		    <text
+    		      class="close-circle"
+    			  @click="pass('拒绝')"
+    		    ></text>
+				<text
+				      class="share-square"
+					  @click="isExportShow = true"
+				    ></text>
+				</view>
+				</view>
+				</view>
+        <view class="list-content">
+        	<view class="table" v-for="(item,index) in list" :key="index">
+        	  <view class="table-checkbox">
+        	    <u-checkbox-group v-model="item.value" >
+        	    	<u-checkbox @change="checkboxChange(item)"  shape="circle"></u-checkbox>
+        	    </u-checkbox-group>
+        	  </view>
+        	  <view class="table-item">
+        		  <view class="table-item-top">
+        		  	<view class="table-name"> {{item.visitorName}} </view>
+        		  	<view class="table-number">{{item.staffCode}} </view>
+        		  </view>
+        	  	 <view class="table-item-buttom">
+        	  	 	<view class="table-time"> {{item.inTime}} </view>
+        	  	 </view>
+        	  </view>
+        	  <view  :class="item.color"> {{item.status }} </view>
+        	  <view class="table-icon">
+        	    <view class="icon-info" @click="eyeLoock(item.applyNo)"></view>
+        	  </view>
+        	</view>
+        </view>
 	<u-popup :show="isExportShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" >
 		<view class="popup">
 			<view class="popup-title">
@@ -122,7 +125,7 @@
 	  endTimeShow:false,
 	  TimeNextShow:false,
 	  statusShow:false,
-	  statusList:[{name:'已通过',id:1},{name:'未通过',id:2}],
+	  statusList:[{name:'申请已提交',id:'1'},{name:'申请已通过',id:'2'},{name:'申请已失败',id:'3'}],
 	  time:'筛选时间',
 	  isTimeQ:'',
 	  isTimeZ:'',
@@ -143,11 +146,11 @@
 	const res = await getList({})
 	this.list = res.map(item=>{
 	  if(item.visitorApplyStatus == '1'){ 
-		 item.status = '申请通过'
-		 item.color = 'green'
+		 item.status = '申请已提交'
+		 item.color = 'blue'
 	  }else if(item.visitorApplyStatus == '2'){
-		  item.status = '申请中'
-		  item.color = 'blue'
+		  item.status = '申请已通过'
+		  item.color = 'green'
 	  }else {
 		  item.status = '申请未通过'
 		  item.color = 'red'
@@ -203,11 +206,11 @@
 		}else{
 	  this.list = res.map(item=>{
       if(item.visitorApplyStatus == '1'){ 
-		 item.status = '申请通过'
-		 item.color = 'green'
+		 item.status = '申请已提交'
+		 item.color = 'blue'
 	  }else if(item.visitorApplyStatus == '2'){
-		  item.status = '申请中'
-		  item.color = 'blue'
+		  item.status = '申请已通过'
+		  item.color = 'green'
 	  }else {
 		  item.status = '申请未通过'
 		  item.color = 'red'
@@ -242,6 +245,13 @@
 	  //取消选择时间
 	  closeTime() {
 	  	this.startTimeShow = false
+		this.time = '筛选时间'
+		this.queryList = {
+				 keywords:'' ,
+				 startTime:'',
+				 endTime:'',
+				 status:'' 
+		}
 	  },
 	  //确定选择结束时间
 	 async confirmEndTime(e){
@@ -294,14 +304,65 @@
 <style scoped lang="scss">
 .list {
   box-sizing: border-box;
-  padding: 30rpx;
+  padding-bottom: 120rpx;
+  .list-top{
+  border-radius: 20rpx;	  
+  padding: 0 20rpx 5rpx ;
+  background-color: #fff;
+  }
+  .list-content{
+	border-radius: 20rpx;
+	margin-top: 20rpx;
+	padding: 0 20rpx;
+	background-color: #fff;  
+  }
   .tab-th {
     margin-top: 16rpx;
 	margin-bottom: 10rpx;
     display: flex;
+	.dressingTime{
+		width: 260rpx;
+		height: 72rpx;
+		background-color: #F0F0F0;
+		text-align: center;
+		line-height: 72rpx;
+		color: #837d7d;
+		border-radius: 72rpx;
+	}
+	.dressingStatusInfo{
+		margin-left: 30rpx;
+		width: 260rpx;
+		height: 72rpx;
+		background-color: #F0F0F0;
+		text-align: center;
+		line-height: 72rpx;
+		color: #837d7d;
+		border-radius: 72rpx;
+	}
     .icon {
-      margin-left: 100rpx;
+      margin-left: 30rpx;
+	  width: 210rpx;
       display: flex;
+	  justify-content: space-between;
+	  align-items: center;
+	  .close-circle{
+		  width: 55rpx;
+		  height: 55rpx;
+		  background: url(@/static/未通过.png) no-repeat;
+		  background-size: contain;
+	  }
+	  .checkmark-circle{
+		 width: 55rpx;
+		 height: 55rpx;
+		 background: url(@/static/通过.png) no-repeat;
+		 background-size: contain; 
+	  }
+	  .share-square{
+		  width: 55rpx;
+		  height: 55rpx;
+		  background: url(@/static/导出.png) no-repeat;
+		  background-size: contain; 
+	  }
     }
   }
   .table {
@@ -309,54 +370,57 @@
     display: flex;
     align-items: center;
     font-size: 28rpx;
-    border: 0.5rpx #000 solid;
     .table-checkbox {
       width: 30rpx;
       height: 100rpx;
-      border-right: 0.5rpx #000 solid;
 	  padding: 50rpx 5rpx 3rpx 3rpx;
     }
-    .table-time {
-      width: 200rpx;
-      height: 110rpx;
-      padding-top: 40rpx;
-      text-align: center;
-      border-right: 0.5rpx #000 solid;
-    }
-    .table-number {
-      width: 160rpx;
-      height: 150rpx;
-      line-height: 150rpx;
-      text-align: center;
-      border-right: 0.5rpx #000 solid;
-    }
-    .table-name {
-      width: 140rpx;
-      height: 150rpx;
-      line-height: 150rpx;
-      text-align: center;
-      border-right: 0.5rpx #000 solid;
-    }
-	.table-status{
-		width: 140rpx;
-		font-size: 24rpx;
-		text-align: center;
-		line-height: 150rpx;
-		border-right: 0.5rpx #000 solid;
+	.table-item{
+		width: 360rpx;
+		margin-left: 20rpx;
+		margin-right: 40rpx;
+		.table-item-top{
+		 display: flex;
+		 justify-content: space-between;
+		 .table-name {
+		   font-size: 34rpx;
+		   font-weight: 500;
+		 }
+		 .table-number {
+		   font-size: 26rpx;
+		   color: #ccc;
+		 }
+		}
+		
+		.table-time {
+		  margin-top: 10rpx;
+		  font-size: 26rpx;
+		  color: #ccc;
+		}
+		
+		
 	}
+    
     .table-icon {
       display: flex;
       justify-content: center;
+	  align-items: center;
+	  margin-left: 25rpx;
 	  padding-right: 10rpx;
       height: 150rpx;
 	  width: 50rpx;
-      border-right: 0.5rpx #000 solid;
+	  .icon-info{
+		  width: 55rpx;
+		  height: 55rpx;
+		  background: url(@/static/查看详情.png) no-repeat;
+		  background-size: 55rpx 55rpx;
+	  }
     }
   }
 }
-/deep/.u-icon--right {
-  margin-left: 8rpx !important;
-}
+		/deep/.u-input--radius{
+			background-color: #F0F0F0 !important;
+		}
          .popup {
 			width: 700rpx;
 			height: 450rpx;
@@ -394,12 +458,30 @@
 			}
 		}
 		.green{
-			color: #04ef0e;
+			width: 240rpx;
+			height: 48rpx;
+			background-color: #00AA88;
+			text-align: center;
+			line-height: 48rpx;
+			border-radius: 48rpx;
+			color: #fff;
 		}
 		.blue{
-			color: #04a4ef;
+			width: 240rpx;
+			height: 48rpx;
+			background-color: #85C2FF;
+			text-align: center;
+			line-height: 48rpx;
+			border-radius: 48rpx;
+			color: #fff;
 		}
 		.red{
-			color: #ff0019;
+			width: 240rpx;
+			height: 48rpx;
+			background-color: #FA5A5A;
+			text-align: center;
+			line-height: 48rpx;
+			border-radius: 48rpx;
+			color: #fff;
 		}
 </style>

diff --git a/pages/index/index.vue b/pages/index/index.vue
index e23557c..a3eff57 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -66,6 +66,7 @@
 				this.active = id;
 				const sessionId = uni.getStorageSync('sessionId');
 				//如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过
+<<<<<<< HEAD
 				if(!sessionId) {
 					await getLogin();
 				}
@@ -81,6 +82,11 @@
 			},
 			async checkphone() {
 				const res = await verifyPhone(this.phone);
+=======
+				
+				let phone = '17571066031';   //先将手机号写死
+				const res = await verifyPhone(phone);
+>>>>>>> d04a458a482011d1e94c80b91fb2d8f80bbd02e2
 				if(res === '用户未注册') {
 					wx.reLaunch({
 						url: '/pages/register/register'
diff --git a/pages/info/info.vue b/pages/info/info.vue
index c5c9234..84f745f 100644
--- a/pages/info/info.vue
+++ b/pages/info/info.vue
@@ -82,11 +82,11 @@
 		},
 		onShow(){
 			if(this.info.status == '1'){
-					 this.status = '申请通过'
-					 this.color = 'green'
+					 this.status = '申请已提交'
+					 this.color = 'blue'
 			}else if(this.info.status == '2'){
-					  this.status = '申请中'
-					  this.color = 'blue'
+					  this.status = '申请已通过'
+					  this.color = 'green'
 			}else {
 					  this.status = '申请未通过'
 					  this.color = 'red'
diff --git a/pages/list/list.vue b/pages/list/list.vue
index a6f9635..aea44c5 100644
--- a/pages/list/list.vue
+++ b/pages/list/list.vue
@@ -2,49 +2,52 @@
 <template>
   <view class="list">
     <TabBar></TabBar>
-    <u-input
-      placeholder="关键字搜索"
-      prefixIcon="search"
-	  v-model="queryList.keywords"
-	  @change="change"
-      prefixIconStyle="font-size: 22px;color: #909399"
-    ></u-input>
-    <view class="tab-th">
-      <text style="margin-left: 44rpx; margin-top: 8rpx;color: #918a8a;width: 140rpx;" @click="startTimeShow = true">{{time}} </text>
-      <u-icon name="clock" color="#918a8a" size="12"></u-icon>
-      <text style="margin-left: 18rpx; margin-top: 8rpx;color: #918a8a;width: 140rpx;"@click="statusShow=true">{{statusInfo}}</text>
-      <view class="icon">
-        <u-icon name="checkmark-circle" color="#34a705" size="36" @click="pass('通过')"></u-icon>
-        <u-icon
-          name="close-circle"
-          color="#9b1203"
-          size="36"
-		  @click="pass('拒绝')"
-          style="margin-left: 104rpx"
-        ></u-icon>
-        <u-icon
-          name="share-square"
-          color="#072ddc"
-          size="36"
-          style="margin-left: 34rpx"
-		  @click="isExportShow = true"
-        ></u-icon>
-      </view>
-    </view>
-    <view class="table" v-for="(item,index) in list" :key="index">
-      <view class="table-checkbox">
-        <u-checkbox-group v-model="item.value" >
-        	<u-checkbox @change="checkboxChange(item)"  shape="circle"></u-checkbox>
-        </u-checkbox-group>
-      </view>
-      <view class="table-time"> {{item.inTime}} </view>
-      <view class="table-number">{{item.remarks}} </view>
-      <view class="table-name"> {{item.visitorName}} </view>
-      <view class="table-status" :class="item.color"> {{item.status }} </view>
-      <view class="table-icon">
-        <u-icon name="eye" color="#000" size="18" @click="eyeLoock(item.applyNo)"></u-icon>
-      </view>
-    </view>
+    	<view class="list-top">
+    		<u-input
+    		  placeholder="关键字搜索"
+    		  prefixIcon="search"
+    		  v-model="queryList.keywords"
+    		  @change="change"
+    		  prefixIconStyle="font-size: 22px;color: #909399"
+    		></u-input>
+    		<view class="tab-th">
+    		  <text class="dressingTime" @click="startTimeShow = true">{{time}}</text>
+    		  <text class="dressingStatusInfo" @click="statusShow=true">{{statusInfo}}</text>
+    		  <view class="icon">
+    		    <text class="checkmark-circle"  @click="pass('通过')"></text>
+    		    <text
+    		      class="close-circle"
+    			  @click="pass('拒绝')"
+    		    ></text>
+				<text
+				      class="share-square"
+					  @click="isExportShow = true"
+				    ></text>
+				</view>
+				</view>
+				</view>
+        <view class="list-content">
+        	<view class="table" v-for="(item,index) in list" :key="index">
+        	  <view class="table-checkbox">
+        	    <u-checkbox-group v-model="item.value" >
+        	    	<u-checkbox @change="checkboxChange(item)"  shape="circle"></u-checkbox>
+        	    </u-checkbox-group>
+        	  </view>
+        	  <view class="table-item">
+        		  <view class="table-item-top">
+        		  	<view class="table-name"> {{item.visitorName}} </view>
+        		  	<view class="table-number">{{item.staffCode}} </view>
+        		  </view>
+        	  	 <view class="table-item-buttom">
+        	  	 	<view class="table-time"> {{item.inTime}} </view>
+        	  	 </view>
+        	  </view>
+        	  <view  :class="item.color"> {{item.status }} </view>
+        	  <view class="table-icon">
+        	    <view class="icon-info" @click="eyeLoock(item.applyNo)"></view>
+        	  </view>
+        	</view>
+        </view>
 	<u-popup :show="isExportShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" >
 		<view class="popup">
 			<view class="popup-title">
@@ -122,7 +125,7 @@
 	  endTimeShow:false,
 	  TimeNextShow:false,
 	  statusShow:false,
-	  statusList:[{name:'已通过',id:1},{name:'未通过',id:2}],
+	  statusList:[{name:'申请已提交',id:'1'},{name:'申请已通过',id:'2'},{name:'申请已失败',id:'3'}],
 	  time:'筛选时间',
 	  isTimeQ:'',
 	  isTimeZ:'',
@@ -143,11 +146,11 @@
 	const res = await getList({})
 	this.list = res.map(item=>{
 	  if(item.visitorApplyStatus == '1'){ 
-		 item.status = '申请通过'
-		 item.color = 'green'
+		 item.status = '申请已提交'
+		 item.color = 'blue'
 	  }else if(item.visitorApplyStatus == '2'){
-		  item.status = '申请中'
-		  item.color = 'blue'
+		  item.status = '申请已通过'
+		  item.color = 'green'
 	  }else {
 		  item.status = '申请未通过'
 		  item.color = 'red'
@@ -203,11 +206,11 @@
 		}else{
 	  this.list = res.map(item=>{
       if(item.visitorApplyStatus == '1'){ 
-		 item.status = '申请通过'
-		 item.color = 'green'
+		 item.status = '申请已提交'
+		 item.color = 'blue'
 	  }else if(item.visitorApplyStatus == '2'){
-		  item.status = '申请中'
-		  item.color = 'blue'
+		  item.status = '申请已通过'
+		  item.color = 'green'
 	  }else {
 		  item.status = '申请未通过'
 		  item.color = 'red'
@@ -242,6 +245,13 @@
 	  //取消选择时间
 	  closeTime() {
 	  	this.startTimeShow = false
+		this.time = '筛选时间'
+		this.queryList = {
+				 keywords:'' ,
+				 startTime:'',
+				 endTime:'',
+				 status:'' 
+		}
 	  },
 	  //确定选择结束时间
 	 async confirmEndTime(e){
@@ -294,14 +304,65 @@
 <style scoped lang="scss">
 .list {
   box-sizing: border-box;
-  padding: 30rpx;
+  padding-bottom: 120rpx;
+  .list-top{
+  border-radius: 20rpx;	  
+  padding: 0 20rpx 5rpx ;
+  background-color: #fff;
+  }
+  .list-content{
+	border-radius: 20rpx;
+	margin-top: 20rpx;
+	padding: 0 20rpx;
+	background-color: #fff;  
+  }
   .tab-th {
     margin-top: 16rpx;
 	margin-bottom: 10rpx;
     display: flex;
+	.dressingTime{
+		width: 260rpx;
+		height: 72rpx;
+		background-color: #F0F0F0;
+		text-align: center;
+		line-height: 72rpx;
+		color: #837d7d;
+		border-radius: 72rpx;
+	}
+	.dressingStatusInfo{
+		margin-left: 30rpx;
+		width: 260rpx;
+		height: 72rpx;
+		background-color: #F0F0F0;
+		text-align: center;
+		line-height: 72rpx;
+		color: #837d7d;
+		border-radius: 72rpx;
+	}
     .icon {
-      margin-left: 100rpx;
+      margin-left: 30rpx;
+	  width: 210rpx;
       display: flex;
+	  justify-content: space-between;
+	  align-items: center;
+	  .close-circle{
+		  width: 55rpx;
+		  height: 55rpx;
+		  background: url(@/static/未通过.png) no-repeat;
+		  background-size: contain;
+	  }
+	  .checkmark-circle{
+		 width: 55rpx;
+		 height: 55rpx;
+		 background: url(@/static/通过.png) no-repeat;
+		 background-size: contain; 
+	  }
+	  .share-square{
+		  width: 55rpx;
+		  height: 55rpx;
+		  background: url(@/static/导出.png) no-repeat;
+		  background-size: contain; 
+	  }
     }
   }
   .table {
@@ -309,54 +370,57 @@
     display: flex;
     align-items: center;
     font-size: 28rpx;
-    border: 0.5rpx #000 solid;
     .table-checkbox {
       width: 30rpx;
       height: 100rpx;
-      border-right: 0.5rpx #000 solid;
 	  padding: 50rpx 5rpx 3rpx 3rpx;
     }
-    .table-time {
-      width: 200rpx;
-      height: 110rpx;
-      padding-top: 40rpx;
-      text-align: center;
-      border-right: 0.5rpx #000 solid;
-    }
-    .table-number {
-      width: 160rpx;
-      height: 150rpx;
-      line-height: 150rpx;
-      text-align: center;
-      border-right: 0.5rpx #000 solid;
-    }
-    .table-name {
-      width: 140rpx;
-      height: 150rpx;
-      line-height: 150rpx;
-      text-align: center;
-      border-right: 0.5rpx #000 solid;
-    }
-	.table-status{
-		width: 140rpx;
-		font-size: 24rpx;
-		text-align: center;
-		line-height: 150rpx;
-		border-right: 0.5rpx #000 solid;
+	.table-item{
+		width: 360rpx;
+		margin-left: 20rpx;
+		margin-right: 40rpx;
+		.table-item-top{
+		 display: flex;
+		 justify-content: space-between;
+		 .table-name {
+		   font-size: 34rpx;
+		   font-weight: 500;
+		 }
+		 .table-number {
+		   font-size: 26rpx;
+		   color: #ccc;
+		 }
+		}
+		
+		.table-time {
+		  margin-top: 10rpx;
+		  font-size: 26rpx;
+		  color: #ccc;
+		}
+		
+		
 	}
+    
     .table-icon {
       display: flex;
       justify-content: center;
+	  align-items: center;
+	  margin-left: 25rpx;
 	  padding-right: 10rpx;
       height: 150rpx;
 	  width: 50rpx;
-      border-right: 0.5rpx #000 solid;
+	  .icon-info{
+		  width: 55rpx;
+		  height: 55rpx;
+		  background: url(@/static/查看详情.png) no-repeat;
+		  background-size: 55rpx 55rpx;
+	  }
     }
   }
 }
-/deep/.u-icon--right {
-  margin-left: 8rpx !important;
-}
+		/deep/.u-input--radius{
+			background-color: #F0F0F0 !important;
+		}
          .popup {
 			width: 700rpx;
 			height: 450rpx;
@@ -394,12 +458,30 @@
 			}
 		}
 		.green{
-			color: #04ef0e;
+			width: 240rpx;
+			height: 48rpx;
+			background-color: #00AA88;
+			text-align: center;
+			line-height: 48rpx;
+			border-radius: 48rpx;
+			color: #fff;
 		}
 		.blue{
-			color: #04a4ef;
+			width: 240rpx;
+			height: 48rpx;
+			background-color: #85C2FF;
+			text-align: center;
+			line-height: 48rpx;
+			border-radius: 48rpx;
+			color: #fff;
 		}
 		.red{
-			color: #ff0019;
+			width: 240rpx;
+			height: 48rpx;
+			background-color: #FA5A5A;
+			text-align: center;
+			line-height: 48rpx;
+			border-radius: 48rpx;
+			color: #fff;
 		}
 </style>
diff --git "a/static/\345\257\274\345\207\272.png" "b/static/\345\257\274\345\207\272.png"
new file mode 100644
index 0000000..e267308
--- /dev/null
+++ "b/static/\345\257\274\345\207\272.png"
Binary files differ

diff --git a/pages/index/index.vue b/pages/index/index.vue
index e23557c..a3eff57 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -66,6 +66,7 @@
 				this.active = id;
 				const sessionId = uni.getStorageSync('sessionId');
 				//如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过
+<<<<<<< HEAD
 				if(!sessionId) {
 					await getLogin();
 				}
@@ -81,6 +82,11 @@
 			},
 			async checkphone() {
 				const res = await verifyPhone(this.phone);
+=======
+				
+				let phone = '17571066031';   //先将手机号写死
+				const res = await verifyPhone(phone);
+>>>>>>> d04a458a482011d1e94c80b91fb2d8f80bbd02e2
 				if(res === '用户未注册') {
 					wx.reLaunch({
 						url: '/pages/register/register'
diff --git a/pages/info/info.vue b/pages/info/info.vue
index c5c9234..84f745f 100644
--- a/pages/info/info.vue
+++ b/pages/info/info.vue
@@ -82,11 +82,11 @@
 		},
 		onShow(){
 			if(this.info.status == '1'){
-					 this.status = '申请通过'
-					 this.color = 'green'
+					 this.status = '申请已提交'
+					 this.color = 'blue'
 			}else if(this.info.status == '2'){
-					  this.status = '申请中'
-					  this.color = 'blue'
+					  this.status = '申请已通过'
+					  this.color = 'green'
 			}else {
 					  this.status = '申请未通过'
 					  this.color = 'red'
diff --git a/pages/list/list.vue b/pages/list/list.vue
index a6f9635..aea44c5 100644
--- a/pages/list/list.vue
+++ b/pages/list/list.vue
@@ -2,49 +2,52 @@
 <template>
   <view class="list">
     <TabBar></TabBar>
-    <u-input
-      placeholder="关键字搜索"
-      prefixIcon="search"
-	  v-model="queryList.keywords"
-	  @change="change"
-      prefixIconStyle="font-size: 22px;color: #909399"
-    ></u-input>
-    <view class="tab-th">
-      <text style="margin-left: 44rpx; margin-top: 8rpx;color: #918a8a;width: 140rpx;" @click="startTimeShow = true">{{time}} </text>
-      <u-icon name="clock" color="#918a8a" size="12"></u-icon>
-      <text style="margin-left: 18rpx; margin-top: 8rpx;color: #918a8a;width: 140rpx;"@click="statusShow=true">{{statusInfo}}</text>
-      <view class="icon">
-        <u-icon name="checkmark-circle" color="#34a705" size="36" @click="pass('通过')"></u-icon>
-        <u-icon
-          name="close-circle"
-          color="#9b1203"
-          size="36"
-		  @click="pass('拒绝')"
-          style="margin-left: 104rpx"
-        ></u-icon>
-        <u-icon
-          name="share-square"
-          color="#072ddc"
-          size="36"
-          style="margin-left: 34rpx"
-		  @click="isExportShow = true"
-        ></u-icon>
-      </view>
-    </view>
-    <view class="table" v-for="(item,index) in list" :key="index">
-      <view class="table-checkbox">
-        <u-checkbox-group v-model="item.value" >
-        	<u-checkbox @change="checkboxChange(item)"  shape="circle"></u-checkbox>
-        </u-checkbox-group>
-      </view>
-      <view class="table-time"> {{item.inTime}} </view>
-      <view class="table-number">{{item.remarks}} </view>
-      <view class="table-name"> {{item.visitorName}} </view>
-      <view class="table-status" :class="item.color"> {{item.status }} </view>
-      <view class="table-icon">
-        <u-icon name="eye" color="#000" size="18" @click="eyeLoock(item.applyNo)"></u-icon>
-      </view>
-    </view>
+    	<view class="list-top">
+    		<u-input
+    		  placeholder="关键字搜索"
+    		  prefixIcon="search"
+    		  v-model="queryList.keywords"
+    		  @change="change"
+    		  prefixIconStyle="font-size: 22px;color: #909399"
+    		></u-input>
+    		<view class="tab-th">
+    		  <text class="dressingTime" @click="startTimeShow = true">{{time}}</text>
+    		  <text class="dressingStatusInfo" @click="statusShow=true">{{statusInfo}}</text>
+    		  <view class="icon">
+    		    <text class="checkmark-circle"  @click="pass('通过')"></text>
+    		    <text
+    		      class="close-circle"
+    			  @click="pass('拒绝')"
+    		    ></text>
+				<text
+				      class="share-square"
+					  @click="isExportShow = true"
+				    ></text>
+				</view>
+				</view>
+				</view>
+        <view class="list-content">
+        	<view class="table" v-for="(item,index) in list" :key="index">
+        	  <view class="table-checkbox">
+        	    <u-checkbox-group v-model="item.value" >
+        	    	<u-checkbox @change="checkboxChange(item)"  shape="circle"></u-checkbox>
+        	    </u-checkbox-group>
+        	  </view>
+        	  <view class="table-item">
+        		  <view class="table-item-top">
+        		  	<view class="table-name"> {{item.visitorName}} </view>
+        		  	<view class="table-number">{{item.staffCode}} </view>
+        		  </view>
+        	  	 <view class="table-item-buttom">
+        	  	 	<view class="table-time"> {{item.inTime}} </view>
+        	  	 </view>
+        	  </view>
+        	  <view  :class="item.color"> {{item.status }} </view>
+        	  <view class="table-icon">
+        	    <view class="icon-info" @click="eyeLoock(item.applyNo)"></view>
+        	  </view>
+        	</view>
+        </view>
 	<u-popup :show="isExportShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" >
 		<view class="popup">
 			<view class="popup-title">
@@ -122,7 +125,7 @@
 	  endTimeShow:false,
 	  TimeNextShow:false,
 	  statusShow:false,
-	  statusList:[{name:'已通过',id:1},{name:'未通过',id:2}],
+	  statusList:[{name:'申请已提交',id:'1'},{name:'申请已通过',id:'2'},{name:'申请已失败',id:'3'}],
 	  time:'筛选时间',
 	  isTimeQ:'',
 	  isTimeZ:'',
@@ -143,11 +146,11 @@
 	const res = await getList({})
 	this.list = res.map(item=>{
 	  if(item.visitorApplyStatus == '1'){ 
-		 item.status = '申请通过'
-		 item.color = 'green'
+		 item.status = '申请已提交'
+		 item.color = 'blue'
 	  }else if(item.visitorApplyStatus == '2'){
-		  item.status = '申请中'
-		  item.color = 'blue'
+		  item.status = '申请已通过'
+		  item.color = 'green'
 	  }else {
 		  item.status = '申请未通过'
 		  item.color = 'red'
@@ -203,11 +206,11 @@
 		}else{
 	  this.list = res.map(item=>{
       if(item.visitorApplyStatus == '1'){ 
-		 item.status = '申请通过'
-		 item.color = 'green'
+		 item.status = '申请已提交'
+		 item.color = 'blue'
 	  }else if(item.visitorApplyStatus == '2'){
-		  item.status = '申请中'
-		  item.color = 'blue'
+		  item.status = '申请已通过'
+		  item.color = 'green'
 	  }else {
 		  item.status = '申请未通过'
 		  item.color = 'red'
@@ -242,6 +245,13 @@
 	  //取消选择时间
 	  closeTime() {
 	  	this.startTimeShow = false
+		this.time = '筛选时间'
+		this.queryList = {
+				 keywords:'' ,
+				 startTime:'',
+				 endTime:'',
+				 status:'' 
+		}
 	  },
 	  //确定选择结束时间
 	 async confirmEndTime(e){
@@ -294,14 +304,65 @@
 <style scoped lang="scss">
 .list {
   box-sizing: border-box;
-  padding: 30rpx;
+  padding-bottom: 120rpx;
+  .list-top{
+  border-radius: 20rpx;	  
+  padding: 0 20rpx 5rpx ;
+  background-color: #fff;
+  }
+  .list-content{
+	border-radius: 20rpx;
+	margin-top: 20rpx;
+	padding: 0 20rpx;
+	background-color: #fff;  
+  }
   .tab-th {
     margin-top: 16rpx;
 	margin-bottom: 10rpx;
     display: flex;
+	.dressingTime{
+		width: 260rpx;
+		height: 72rpx;
+		background-color: #F0F0F0;
+		text-align: center;
+		line-height: 72rpx;
+		color: #837d7d;
+		border-radius: 72rpx;
+	}
+	.dressingStatusInfo{
+		margin-left: 30rpx;
+		width: 260rpx;
+		height: 72rpx;
+		background-color: #F0F0F0;
+		text-align: center;
+		line-height: 72rpx;
+		color: #837d7d;
+		border-radius: 72rpx;
+	}
     .icon {
-      margin-left: 100rpx;
+      margin-left: 30rpx;
+	  width: 210rpx;
       display: flex;
+	  justify-content: space-between;
+	  align-items: center;
+	  .close-circle{
+		  width: 55rpx;
+		  height: 55rpx;
+		  background: url(@/static/未通过.png) no-repeat;
+		  background-size: contain;
+	  }
+	  .checkmark-circle{
+		 width: 55rpx;
+		 height: 55rpx;
+		 background: url(@/static/通过.png) no-repeat;
+		 background-size: contain; 
+	  }
+	  .share-square{
+		  width: 55rpx;
+		  height: 55rpx;
+		  background: url(@/static/导出.png) no-repeat;
+		  background-size: contain; 
+	  }
     }
   }
   .table {
@@ -309,54 +370,57 @@
     display: flex;
     align-items: center;
     font-size: 28rpx;
-    border: 0.5rpx #000 solid;
     .table-checkbox {
       width: 30rpx;
       height: 100rpx;
-      border-right: 0.5rpx #000 solid;
 	  padding: 50rpx 5rpx 3rpx 3rpx;
     }
-    .table-time {
-      width: 200rpx;
-      height: 110rpx;
-      padding-top: 40rpx;
-      text-align: center;
-      border-right: 0.5rpx #000 solid;
-    }
-    .table-number {
-      width: 160rpx;
-      height: 150rpx;
-      line-height: 150rpx;
-      text-align: center;
-      border-right: 0.5rpx #000 solid;
-    }
-    .table-name {
-      width: 140rpx;
-      height: 150rpx;
-      line-height: 150rpx;
-      text-align: center;
-      border-right: 0.5rpx #000 solid;
-    }
-	.table-status{
-		width: 140rpx;
-		font-size: 24rpx;
-		text-align: center;
-		line-height: 150rpx;
-		border-right: 0.5rpx #000 solid;
+	.table-item{
+		width: 360rpx;
+		margin-left: 20rpx;
+		margin-right: 40rpx;
+		.table-item-top{
+		 display: flex;
+		 justify-content: space-between;
+		 .table-name {
+		   font-size: 34rpx;
+		   font-weight: 500;
+		 }
+		 .table-number {
+		   font-size: 26rpx;
+		   color: #ccc;
+		 }
+		}
+		
+		.table-time {
+		  margin-top: 10rpx;
+		  font-size: 26rpx;
+		  color: #ccc;
+		}
+		
+		
 	}
+    
     .table-icon {
       display: flex;
       justify-content: center;
+	  align-items: center;
+	  margin-left: 25rpx;
 	  padding-right: 10rpx;
       height: 150rpx;
 	  width: 50rpx;
-      border-right: 0.5rpx #000 solid;
+	  .icon-info{
+		  width: 55rpx;
+		  height: 55rpx;
+		  background: url(@/static/查看详情.png) no-repeat;
+		  background-size: 55rpx 55rpx;
+	  }
     }
   }
 }
-/deep/.u-icon--right {
-  margin-left: 8rpx !important;
-}
+		/deep/.u-input--radius{
+			background-color: #F0F0F0 !important;
+		}
          .popup {
 			width: 700rpx;
 			height: 450rpx;
@@ -394,12 +458,30 @@
 			}
 		}
 		.green{
-			color: #04ef0e;
+			width: 240rpx;
+			height: 48rpx;
+			background-color: #00AA88;
+			text-align: center;
+			line-height: 48rpx;
+			border-radius: 48rpx;
+			color: #fff;
 		}
 		.blue{
-			color: #04a4ef;
+			width: 240rpx;
+			height: 48rpx;
+			background-color: #85C2FF;
+			text-align: center;
+			line-height: 48rpx;
+			border-radius: 48rpx;
+			color: #fff;
 		}
 		.red{
-			color: #ff0019;
+			width: 240rpx;
+			height: 48rpx;
+			background-color: #FA5A5A;
+			text-align: center;
+			line-height: 48rpx;
+			border-radius: 48rpx;
+			color: #fff;
 		}
 </style>
diff --git "a/static/\345\257\274\345\207\272.png" "b/static/\345\257\274\345\207\272.png"
new file mode 100644
index 0000000..e267308
--- /dev/null
+++ "b/static/\345\257\274\345\207\272.png"
Binary files differ
diff --git "a/static/\346\234\252\351\200\232\350\277\207.png" "b/static/\346\234\252\351\200\232\350\277\207.png"
new file mode 100644
index 0000000..562b1b0
--- /dev/null
+++ "b/static/\346\234\252\351\200\232\350\277\207.png"
Binary files differ

diff --git a/pages/index/index.vue b/pages/index/index.vue
index e23557c..a3eff57 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -66,6 +66,7 @@
 				this.active = id;
 				const sessionId = uni.getStorageSync('sessionId');
 				//如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过
+<<<<<<< HEAD
 				if(!sessionId) {
 					await getLogin();
 				}
@@ -81,6 +82,11 @@
 			},
 			async checkphone() {
 				const res = await verifyPhone(this.phone);
+=======
+				
+				let phone = '17571066031';   //先将手机号写死
+				const res = await verifyPhone(phone);
+>>>>>>> d04a458a482011d1e94c80b91fb2d8f80bbd02e2
 				if(res === '用户未注册') {
 					wx.reLaunch({
 						url: '/pages/register/register'
diff --git a/pages/info/info.vue b/pages/info/info.vue
index c5c9234..84f745f 100644
--- a/pages/info/info.vue
+++ b/pages/info/info.vue
@@ -82,11 +82,11 @@
 		},
 		onShow(){
 			if(this.info.status == '1'){
-					 this.status = '申请通过'
-					 this.color = 'green'
+					 this.status = '申请已提交'
+					 this.color = 'blue'
 			}else if(this.info.status == '2'){
-					  this.status = '申请中'
-					  this.color = 'blue'
+					  this.status = '申请已通过'
+					  this.color = 'green'
 			}else {
 					  this.status = '申请未通过'
 					  this.color = 'red'
diff --git a/pages/list/list.vue b/pages/list/list.vue
index a6f9635..aea44c5 100644
--- a/pages/list/list.vue
+++ b/pages/list/list.vue
@@ -2,49 +2,52 @@
 <template>
   <view class="list">
     <TabBar></TabBar>
-    <u-input
-      placeholder="关键字搜索"
-      prefixIcon="search"
-	  v-model="queryList.keywords"
-	  @change="change"
-      prefixIconStyle="font-size: 22px;color: #909399"
-    ></u-input>
-    <view class="tab-th">
-      <text style="margin-left: 44rpx; margin-top: 8rpx;color: #918a8a;width: 140rpx;" @click="startTimeShow = true">{{time}} </text>
-      <u-icon name="clock" color="#918a8a" size="12"></u-icon>
-      <text style="margin-left: 18rpx; margin-top: 8rpx;color: #918a8a;width: 140rpx;"@click="statusShow=true">{{statusInfo}}</text>
-      <view class="icon">
-        <u-icon name="checkmark-circle" color="#34a705" size="36" @click="pass('通过')"></u-icon>
-        <u-icon
-          name="close-circle"
-          color="#9b1203"
-          size="36"
-		  @click="pass('拒绝')"
-          style="margin-left: 104rpx"
-        ></u-icon>
-        <u-icon
-          name="share-square"
-          color="#072ddc"
-          size="36"
-          style="margin-left: 34rpx"
-		  @click="isExportShow = true"
-        ></u-icon>
-      </view>
-    </view>
-    <view class="table" v-for="(item,index) in list" :key="index">
-      <view class="table-checkbox">
-        <u-checkbox-group v-model="item.value" >
-        	<u-checkbox @change="checkboxChange(item)"  shape="circle"></u-checkbox>
-        </u-checkbox-group>
-      </view>
-      <view class="table-time"> {{item.inTime}} </view>
-      <view class="table-number">{{item.remarks}} </view>
-      <view class="table-name"> {{item.visitorName}} </view>
-      <view class="table-status" :class="item.color"> {{item.status }} </view>
-      <view class="table-icon">
-        <u-icon name="eye" color="#000" size="18" @click="eyeLoock(item.applyNo)"></u-icon>
-      </view>
-    </view>
+    	<view class="list-top">
+    		<u-input
+    		  placeholder="关键字搜索"
+    		  prefixIcon="search"
+    		  v-model="queryList.keywords"
+    		  @change="change"
+    		  prefixIconStyle="font-size: 22px;color: #909399"
+    		></u-input>
+    		<view class="tab-th">
+    		  <text class="dressingTime" @click="startTimeShow = true">{{time}}</text>
+    		  <text class="dressingStatusInfo" @click="statusShow=true">{{statusInfo}}</text>
+    		  <view class="icon">
+    		    <text class="checkmark-circle"  @click="pass('通过')"></text>
+    		    <text
+    		      class="close-circle"
+    			  @click="pass('拒绝')"
+    		    ></text>
+				<text
+				      class="share-square"
+					  @click="isExportShow = true"
+				    ></text>
+				</view>
+				</view>
+				</view>
+        <view class="list-content">
+        	<view class="table" v-for="(item,index) in list" :key="index">
+        	  <view class="table-checkbox">
+        	    <u-checkbox-group v-model="item.value" >
+        	    	<u-checkbox @change="checkboxChange(item)"  shape="circle"></u-checkbox>
+        	    </u-checkbox-group>
+        	  </view>
+        	  <view class="table-item">
+        		  <view class="table-item-top">
+        		  	<view class="table-name"> {{item.visitorName}} </view>
+        		  	<view class="table-number">{{item.staffCode}} </view>
+        		  </view>
+        	  	 <view class="table-item-buttom">
+        	  	 	<view class="table-time"> {{item.inTime}} </view>
+        	  	 </view>
+        	  </view>
+        	  <view  :class="item.color"> {{item.status }} </view>
+        	  <view class="table-icon">
+        	    <view class="icon-info" @click="eyeLoock(item.applyNo)"></view>
+        	  </view>
+        	</view>
+        </view>
 	<u-popup :show="isExportShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" >
 		<view class="popup">
 			<view class="popup-title">
@@ -122,7 +125,7 @@
 	  endTimeShow:false,
 	  TimeNextShow:false,
 	  statusShow:false,
-	  statusList:[{name:'已通过',id:1},{name:'未通过',id:2}],
+	  statusList:[{name:'申请已提交',id:'1'},{name:'申请已通过',id:'2'},{name:'申请已失败',id:'3'}],
 	  time:'筛选时间',
 	  isTimeQ:'',
 	  isTimeZ:'',
@@ -143,11 +146,11 @@
 	const res = await getList({})
 	this.list = res.map(item=>{
 	  if(item.visitorApplyStatus == '1'){ 
-		 item.status = '申请通过'
-		 item.color = 'green'
+		 item.status = '申请已提交'
+		 item.color = 'blue'
 	  }else if(item.visitorApplyStatus == '2'){
-		  item.status = '申请中'
-		  item.color = 'blue'
+		  item.status = '申请已通过'
+		  item.color = 'green'
 	  }else {
 		  item.status = '申请未通过'
 		  item.color = 'red'
@@ -203,11 +206,11 @@
 		}else{
 	  this.list = res.map(item=>{
       if(item.visitorApplyStatus == '1'){ 
-		 item.status = '申请通过'
-		 item.color = 'green'
+		 item.status = '申请已提交'
+		 item.color = 'blue'
 	  }else if(item.visitorApplyStatus == '2'){
-		  item.status = '申请中'
-		  item.color = 'blue'
+		  item.status = '申请已通过'
+		  item.color = 'green'
 	  }else {
 		  item.status = '申请未通过'
 		  item.color = 'red'
@@ -242,6 +245,13 @@
 	  //取消选择时间
 	  closeTime() {
 	  	this.startTimeShow = false
+		this.time = '筛选时间'
+		this.queryList = {
+				 keywords:'' ,
+				 startTime:'',
+				 endTime:'',
+				 status:'' 
+		}
 	  },
 	  //确定选择结束时间
 	 async confirmEndTime(e){
@@ -294,14 +304,65 @@
 <style scoped lang="scss">
 .list {
   box-sizing: border-box;
-  padding: 30rpx;
+  padding-bottom: 120rpx;
+  .list-top{
+  border-radius: 20rpx;	  
+  padding: 0 20rpx 5rpx ;
+  background-color: #fff;
+  }
+  .list-content{
+	border-radius: 20rpx;
+	margin-top: 20rpx;
+	padding: 0 20rpx;
+	background-color: #fff;  
+  }
   .tab-th {
     margin-top: 16rpx;
 	margin-bottom: 10rpx;
     display: flex;
+	.dressingTime{
+		width: 260rpx;
+		height: 72rpx;
+		background-color: #F0F0F0;
+		text-align: center;
+		line-height: 72rpx;
+		color: #837d7d;
+		border-radius: 72rpx;
+	}
+	.dressingStatusInfo{
+		margin-left: 30rpx;
+		width: 260rpx;
+		height: 72rpx;
+		background-color: #F0F0F0;
+		text-align: center;
+		line-height: 72rpx;
+		color: #837d7d;
+		border-radius: 72rpx;
+	}
     .icon {
-      margin-left: 100rpx;
+      margin-left: 30rpx;
+	  width: 210rpx;
       display: flex;
+	  justify-content: space-between;
+	  align-items: center;
+	  .close-circle{
+		  width: 55rpx;
+		  height: 55rpx;
+		  background: url(@/static/未通过.png) no-repeat;
+		  background-size: contain;
+	  }
+	  .checkmark-circle{
+		 width: 55rpx;
+		 height: 55rpx;
+		 background: url(@/static/通过.png) no-repeat;
+		 background-size: contain; 
+	  }
+	  .share-square{
+		  width: 55rpx;
+		  height: 55rpx;
+		  background: url(@/static/导出.png) no-repeat;
+		  background-size: contain; 
+	  }
     }
   }
   .table {
@@ -309,54 +370,57 @@
     display: flex;
     align-items: center;
     font-size: 28rpx;
-    border: 0.5rpx #000 solid;
     .table-checkbox {
       width: 30rpx;
       height: 100rpx;
-      border-right: 0.5rpx #000 solid;
 	  padding: 50rpx 5rpx 3rpx 3rpx;
     }
-    .table-time {
-      width: 200rpx;
-      height: 110rpx;
-      padding-top: 40rpx;
-      text-align: center;
-      border-right: 0.5rpx #000 solid;
-    }
-    .table-number {
-      width: 160rpx;
-      height: 150rpx;
-      line-height: 150rpx;
-      text-align: center;
-      border-right: 0.5rpx #000 solid;
-    }
-    .table-name {
-      width: 140rpx;
-      height: 150rpx;
-      line-height: 150rpx;
-      text-align: center;
-      border-right: 0.5rpx #000 solid;
-    }
-	.table-status{
-		width: 140rpx;
-		font-size: 24rpx;
-		text-align: center;
-		line-height: 150rpx;
-		border-right: 0.5rpx #000 solid;
+	.table-item{
+		width: 360rpx;
+		margin-left: 20rpx;
+		margin-right: 40rpx;
+		.table-item-top{
+		 display: flex;
+		 justify-content: space-between;
+		 .table-name {
+		   font-size: 34rpx;
+		   font-weight: 500;
+		 }
+		 .table-number {
+		   font-size: 26rpx;
+		   color: #ccc;
+		 }
+		}
+		
+		.table-time {
+		  margin-top: 10rpx;
+		  font-size: 26rpx;
+		  color: #ccc;
+		}
+		
+		
 	}
+    
     .table-icon {
       display: flex;
       justify-content: center;
+	  align-items: center;
+	  margin-left: 25rpx;
 	  padding-right: 10rpx;
       height: 150rpx;
 	  width: 50rpx;
-      border-right: 0.5rpx #000 solid;
+	  .icon-info{
+		  width: 55rpx;
+		  height: 55rpx;
+		  background: url(@/static/查看详情.png) no-repeat;
+		  background-size: 55rpx 55rpx;
+	  }
     }
   }
 }
-/deep/.u-icon--right {
-  margin-left: 8rpx !important;
-}
+		/deep/.u-input--radius{
+			background-color: #F0F0F0 !important;
+		}
          .popup {
 			width: 700rpx;
 			height: 450rpx;
@@ -394,12 +458,30 @@
 			}
 		}
 		.green{
-			color: #04ef0e;
+			width: 240rpx;
+			height: 48rpx;
+			background-color: #00AA88;
+			text-align: center;
+			line-height: 48rpx;
+			border-radius: 48rpx;
+			color: #fff;
 		}
 		.blue{
-			color: #04a4ef;
+			width: 240rpx;
+			height: 48rpx;
+			background-color: #85C2FF;
+			text-align: center;
+			line-height: 48rpx;
+			border-radius: 48rpx;
+			color: #fff;
 		}
 		.red{
-			color: #ff0019;
+			width: 240rpx;
+			height: 48rpx;
+			background-color: #FA5A5A;
+			text-align: center;
+			line-height: 48rpx;
+			border-radius: 48rpx;
+			color: #fff;
 		}
 </style>
diff --git "a/static/\345\257\274\345\207\272.png" "b/static/\345\257\274\345\207\272.png"
new file mode 100644
index 0000000..e267308
--- /dev/null
+++ "b/static/\345\257\274\345\207\272.png"
Binary files differ
diff --git "a/static/\346\234\252\351\200\232\350\277\207.png" "b/static/\346\234\252\351\200\232\350\277\207.png"
new file mode 100644
index 0000000..562b1b0
--- /dev/null
+++ "b/static/\346\234\252\351\200\232\350\277\207.png"
Binary files differ
diff --git "a/static/\346\237\245\347\234\213\350\257\246\346\203\205.png" "b/static/\346\237\245\347\234\213\350\257\246\346\203\205.png"
new file mode 100644
index 0000000..b8ec55e
--- /dev/null
+++ "b/static/\346\237\245\347\234\213\350\257\246\346\203\205.png"
Binary files differ

diff --git a/pages/index/index.vue b/pages/index/index.vue
index e23557c..a3eff57 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -66,6 +66,7 @@
 				this.active = id;
 				const sessionId = uni.getStorageSync('sessionId');
 				//如果this.phone为空，先弹出获取手机号，得到手机号之后验证此人是都注册过
+<<<<<<< HEAD
 				if(!sessionId) {
 					await getLogin();
 				}
@@ -81,6 +82,11 @@
 			},
 			async checkphone() {
 				const res = await verifyPhone(this.phone);
+=======
+				
+				let phone = '17571066031';   //先将手机号写死
+				const res = await verifyPhone(phone);
+>>>>>>> d04a458a482011d1e94c80b91fb2d8f80bbd02e2
 				if(res === '用户未注册') {
 					wx.reLaunch({
 						url: '/pages/register/register'
diff --git a/pages/info/info.vue b/pages/info/info.vue
index c5c9234..84f745f 100644
--- a/pages/info/info.vue
+++ b/pages/info/info.vue
@@ -82,11 +82,11 @@
 		},
 		onShow(){
 			if(this.info.status == '1'){
-					 this.status = '申请通过'
-					 this.color = 'green'
+					 this.status = '申请已提交'
+					 this.color = 'blue'
 			}else if(this.info.status == '2'){
-					  this.status = '申请中'
-					  this.color = 'blue'
+					  this.status = '申请已通过'
+					  this.color = 'green'
 			}else {
 					  this.status = '申请未通过'
 					  this.color = 'red'
diff --git a/pages/list/list.vue b/pages/list/list.vue
index a6f9635..aea44c5 100644
--- a/pages/list/list.vue
+++ b/pages/list/list.vue
@@ -2,49 +2,52 @@
 <template>
   <view class="list">
     <TabBar></TabBar>
-    <u-input
-      placeholder="关键字搜索"
-      prefixIcon="search"
-	  v-model="queryList.keywords"
-	  @change="change"
-      prefixIconStyle="font-size: 22px;color: #909399"
-    ></u-input>
-    <view class="tab-th">
-      <text style="margin-left: 44rpx; margin-top: 8rpx;color: #918a8a;width: 140rpx;" @click="startTimeShow = true">{{time}} </text>
-      <u-icon name="clock" color="#918a8a" size="12"></u-icon>
-      <text style="margin-left: 18rpx; margin-top: 8rpx;color: #918a8a;width: 140rpx;"@click="statusShow=true">{{statusInfo}}</text>
-      <view class="icon">
-        <u-icon name="checkmark-circle" color="#34a705" size="36" @click="pass('通过')"></u-icon>
-        <u-icon
-          name="close-circle"
-          color="#9b1203"
-          size="36"
-		  @click="pass('拒绝')"
-          style="margin-left: 104rpx"
-        ></u-icon>
-        <u-icon
-          name="share-square"
-          color="#072ddc"
-          size="36"
-          style="margin-left: 34rpx"
-		  @click="isExportShow = true"
-        ></u-icon>
-      </view>
-    </view>
-    <view class="table" v-for="(item,index) in list" :key="index">
-      <view class="table-checkbox">
-        <u-checkbox-group v-model="item.value" >
-        	<u-checkbox @change="checkboxChange(item)"  shape="circle"></u-checkbox>
-        </u-checkbox-group>
-      </view>
-      <view class="table-time"> {{item.inTime}} </view>
-      <view class="table-number">{{item.remarks}} </view>
-      <view class="table-name"> {{item.visitorName}} </view>
-      <view class="table-status" :class="item.color"> {{item.status }} </view>
-      <view class="table-icon">
-        <u-icon name="eye" color="#000" size="18" @click="eyeLoock(item.applyNo)"></u-icon>
-      </view>
-    </view>
+    	<view class="list-top">
+    		<u-input
+    		  placeholder="关键字搜索"
+    		  prefixIcon="search"
+    		  v-model="queryList.keywords"
+    		  @change="change"
+    		  prefixIconStyle="font-size: 22px;color: #909399"
+    		></u-input>
+    		<view class="tab-th">
+    		  <text class="dressingTime" @click="startTimeShow = true">{{time}}</text>
+    		  <text class="dressingStatusInfo" @click="statusShow=true">{{statusInfo}}</text>
+    		  <view class="icon">
+    		    <text class="checkmark-circle"  @click="pass('通过')"></text>
+    		    <text
+    		      class="close-circle"
+    			  @click="pass('拒绝')"
+    		    ></text>
+				<text
+				      class="share-square"
+					  @click="isExportShow = true"
+				    ></text>
+				</view>
+				</view>
+				</view>
+        <view class="list-content">
+        	<view class="table" v-for="(item,index) in list" :key="index">
+        	  <view class="table-checkbox">
+        	    <u-checkbox-group v-model="item.value" >
+        	    	<u-checkbox @change="checkboxChange(item)"  shape="circle"></u-checkbox>
+        	    </u-checkbox-group>
+        	  </view>
+        	  <view class="table-item">
+        		  <view class="table-item-top">
+        		  	<view class="table-name"> {{item.visitorName}} </view>
+        		  	<view class="table-number">{{item.staffCode}} </view>
+        		  </view>
+        	  	 <view class="table-item-buttom">
+        	  	 	<view class="table-time"> {{item.inTime}} </view>
+        	  	 </view>
+        	  </view>
+        	  <view  :class="item.color"> {{item.status }} </view>
+        	  <view class="table-icon">
+        	    <view class="icon-info" @click="eyeLoock(item.applyNo)"></view>
+        	  </view>
+        	</view>
+        </view>
 	<u-popup :show="isExportShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" >
 		<view class="popup">
 			<view class="popup-title">
@@ -122,7 +125,7 @@
 	  endTimeShow:false,
 	  TimeNextShow:false,
 	  statusShow:false,
-	  statusList:[{name:'已通过',id:1},{name:'未通过',id:2}],
+	  statusList:[{name:'申请已提交',id:'1'},{name:'申请已通过',id:'2'},{name:'申请已失败',id:'3'}],
 	  time:'筛选时间',
 	  isTimeQ:'',
 	  isTimeZ:'',
@@ -143,11 +146,11 @@
 	const res = await getList({})
 	this.list = res.map(item=>{
 	  if(item.visitorApplyStatus == '1'){ 
-		 item.status = '申请通过'
-		 item.color = 'green'
+		 item.status = '申请已提交'
+		 item.color = 'blue'
 	  }else if(item.visitorApplyStatus == '2'){
-		  item.status = '申请中'
-		  item.color = 'blue'
+		  item.status = '申请已通过'
+		  item.color = 'green'
 	  }else {
 		  item.status = '申请未通过'
 		  item.color = 'red'
@@ -203,11 +206,11 @@
 		}else{
 	  this.list = res.map(item=>{
       if(item.visitorApplyStatus == '1'){ 
-		 item.status = '申请通过'
-		 item.color = 'green'
+		 item.status = '申请已提交'
+		 item.color = 'blue'
 	  }else if(item.visitorApplyStatus == '2'){
-		  item.status = '申请中'
-		  item.color = 'blue'
+		  item.status = '申请已通过'
+		  item.color = 'green'
 	  }else {
 		  item.status = '申请未通过'
 		  item.color = 'red'
@@ -242,6 +245,13 @@
 	  //取消选择时间
 	  closeTime() {
 	  	this.startTimeShow = false
+		this.time = '筛选时间'
+		this.queryList = {
+				 keywords:'' ,
+				 startTime:'',
+				 endTime:'',
+				 status:'' 
+		}
 	  },
 	  //确定选择结束时间
 	 async confirmEndTime(e){
@@ -294,14 +304,65 @@
 <style scoped lang="scss">
 .list {
   box-sizing: border-box;
-  padding: 30rpx;
+  padding-bottom: 120rpx;
+  .list-top{
+  border-radius: 20rpx;	  
+  padding: 0 20rpx 5rpx ;
+  background-color: #fff;
+  }
+  .list-content{
+	border-radius: 20rpx;
+	margin-top: 20rpx;
+	padding: 0 20rpx;
+	background-color: #fff;  
+  }
   .tab-th {
     margin-top: 16rpx;
 	margin-bottom: 10rpx;
     display: flex;
+	.dressingTime{
+		width: 260rpx;
+		height: 72rpx;
+		background-color: #F0F0F0;
+		text-align: center;
+		line-height: 72rpx;
+		color: #837d7d;
+		border-radius: 72rpx;
+	}
+	.dressingStatusInfo{
+		margin-left: 30rpx;
+		width: 260rpx;
+		height: 72rpx;
+		background-color: #F0F0F0;
+		text-align: center;
+		line-height: 72rpx;
+		color: #837d7d;
+		border-radius: 72rpx;
+	}
     .icon {
-      margin-left: 100rpx;
+      margin-left: 30rpx;
+	  width: 210rpx;
       display: flex;
+	  justify-content: space-between;
+	  align-items: center;
+	  .close-circle{
+		  width: 55rpx;
+		  height: 55rpx;
+		  background: url(@/static/未通过.png) no-repeat;
+		  background-size: contain;
+	  }
+	  .checkmark-circle{
+		 width: 55rpx;
+		 height: 55rpx;
+		 background: url(@/static/通过.png) no-repeat;
+		 background-size: contain; 
+	  }
+	  .share-square{
+		  width: 55rpx;
+		  height: 55rpx;
+		  background: url(@/static/导出.png) no-repeat;
+		  background-size: contain; 
+	  }
     }
   }
   .table {
@@ -309,54 +370,57 @@
     display: flex;
     align-items: center;
     font-size: 28rpx;
-    border: 0.5rpx #000 solid;
     .table-checkbox {
       width: 30rpx;
       height: 100rpx;
-      border-right: 0.5rpx #000 solid;
 	  padding: 50rpx 5rpx 3rpx 3rpx;
     }
-    .table-time {
-      width: 200rpx;
-      height: 110rpx;
-      padding-top: 40rpx;
-      text-align: center;
-      border-right: 0.5rpx #000 solid;
-    }
-    .table-number {
-      width: 160rpx;
-      height: 150rpx;
-      line-height: 150rpx;
-      text-align: center;
-      border-right: 0.5rpx #000 solid;
-    }
-    .table-name {
-      width: 140rpx;
-      height: 150rpx;
-      line-height: 150rpx;
-      text-align: center;
-      border-right: 0.5rpx #000 solid;
-    }
-	.table-status{
-		width: 140rpx;
-		font-size: 24rpx;
-		text-align: center;
-		line-height: 150rpx;
-		border-right: 0.5rpx #000 solid;
+	.table-item{
+		width: 360rpx;
+		margin-left: 20rpx;
+		margin-right: 40rpx;
+		.table-item-top{
+		 display: flex;
+		 justify-content: space-between;
+		 .table-name {
+		   font-size: 34rpx;
+		   font-weight: 500;
+		 }
+		 .table-number {
+		   font-size: 26rpx;
+		   color: #ccc;
+		 }
+		}
+		
+		.table-time {
+		  margin-top: 10rpx;
+		  font-size: 26rpx;
+		  color: #ccc;
+		}
+		
+		
 	}
+    
     .table-icon {
       display: flex;
       justify-content: center;
+	  align-items: center;
+	  margin-left: 25rpx;
 	  padding-right: 10rpx;
       height: 150rpx;
 	  width: 50rpx;
-      border-right: 0.5rpx #000 solid;
+	  .icon-info{
+		  width: 55rpx;
+		  height: 55rpx;
+		  background: url(@/static/查看详情.png) no-repeat;
+		  background-size: 55rpx 55rpx;
+	  }
     }
   }
 }
-/deep/.u-icon--right {
-  margin-left: 8rpx !important;
-}
+		/deep/.u-input--radius{
+			background-color: #F0F0F0 !important;
+		}
          .popup {
 			width: 700rpx;
 			height: 450rpx;
@@ -394,12 +458,30 @@
 			}
 		}
 		.green{
-			color: #04ef0e;
+			width: 240rpx;
+			height: 48rpx;
+			background-color: #00AA88;
+			text-align: center;
+			line-height: 48rpx;
+			border-radius: 48rpx;
+			color: #fff;
 		}
 		.blue{
-			color: #04a4ef;
+			width: 240rpx;
+			height: 48rpx;
+			background-color: #85C2FF;
+			text-align: center;
+			line-height: 48rpx;
+			border-radius: 48rpx;
+			color: #fff;
 		}
 		.red{
-			color: #ff0019;
+			width: 240rpx;
+			height: 48rpx;
+			background-color: #FA5A5A;
+			text-align: center;
+			line-height: 48rpx;
+			border-radius: 48rpx;
+			color: #fff;
 		}
 </style>
diff --git "a/static/\345\257\274\345\207\272.png" "b/static/\345\257\274\345\207\272.png"
new file mode 100644
index 0000000..e267308
--- /dev/null
+++ "b/static/\345\257\274\345\207\272.png"
Binary files differ
diff --git "a/static/\346\234\252\351\200\232\350\277\207.png" "b/static/\346\234\252\351\200\232\350\277\207.png"
new file mode 100644
index 0000000..562b1b0
--- /dev/null
+++ "b/static/\346\234\252\351\200\232\350\277\207.png"
Binary files differ
diff --git "a/static/\346\237\245\347\234\213\350\257\246\346\203\205.png" "b/static/\346\237\245\347\234\213\350\257\246\346\203\205.png"
new file mode 100644
index 0000000..b8ec55e
--- /dev/null
+++ "b/static/\346\237\245\347\234\213\350\257\246\346\203\205.png"
Binary files differ
diff --git "a/static/\351\200\232\350\277\207.png" "b/static/\351\200\232\350\277\207.png"
new file mode 100644
index 0000000..af19910
--- /dev/null
+++ "b/static/\351\200\232\350\277\207.png"
Binary files differ