diff --git a/pages.json b/pages.json
index 14515a4..cf80b1e 100644
--- a/pages.json
+++ b/pages.json
@@ -94,6 +94,22 @@
 					}
 				}
 			}
+		},
+		{
+			"path": "pages/pages_zhentou/myPage/address",
+			"style": {
+				"navigationBarTitleText": "收货地址",
+				"app-plus": {
+					"titleNView": {
+						// "buttons": [{
+						// 	"text": "\ue534",
+						// 	"fontSrc": "/static/uni.ttf",
+						// 	"fontSize": "22px",
+						// 	"color": "#FFFFFF"
+						// }]
+					}
+				}
+			}
 		}
     ],
 	"subPackages": [{
diff --git a/pages/pages_zhentou/homePage/homePage.vue b/pages/pages_zhentou/homePage/homePage.vue
index df4bedc..a3ea70c 100644
--- a/pages/pages_zhentou/homePage/homePage.vue
+++ b/pages/pages_zhentou/homePage/homePage.vue
@@ -6,8 +6,8 @@
 		</view>
 		<view class="bottom_box">
 			<button class="btn" @click="addForm">填写报名单（其他渠道已购买）</button>
-			<button class="btn" v-if="!hasUserInfo && canIUseGetUserProfile" @click="getUserProfile">定制</button>
-			<button v-else-if="!hasPhone" class="btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">定制</button>
+			<button class="btn" v-if="!hasUserInfo &&canIUseGetUserProfile" @click="getUserProfile">定制</button>
+			<button v-else-if="!hasPhone" class="btn" @getphonenumber="getphonenumber">定制</button>
 			<button v-else class="btn" @click="clickCustom">定制</button>
 		</view>
 	</view>
@@ -43,7 +43,6 @@
 			// 点击定制
 			clickCustom() {
 				console.log('点击定制');
-				// this.doSave();
 			},
 			// 填写表单
 			addForm() {
@@ -131,7 +130,8 @@
 
 	.bottom_box {
 		width: 100%;
-		height: 280rpx;
+		height: 290rpx;
+		border-radius: 30rpx 30rpx 0rpx 0rpx;
 		background: #fff;
 		position: fixed;
 		bottom: 0rpx;
@@ -142,17 +142,32 @@
 
 
 		.btn {
-			width: 85%;
-			height: 80rpx;
-			background-color: rgb(245, 19, 19);
+			width: 690rpx;
+			height: 90rpx;
+			background: #D73232;
+			border-radius: 20rpx 20rpx 20rpx 20rpx;
 			color: #fff;
 			display: flex;
 			align-items: center;
 			justify-content: center;
 
 			&:first-child {
-				background-color: rgb(164, 173, 179);
+				background: #E9B332;
 				margin-bottom: 40rpx;
+				display: flex;
+				flex-direction: column;
+				
+				.form_txt{
+					height: 50rpx;
+					font-size: 28rpx;
+					display: flex;
+					align-items: center;
+				}
+				.form_txt1{
+					height: 30rpx;
+					display: flex;
+					align-items: center;
+				}
 			}
 		}
 	}
diff --git a/pages/pages_zhentou/myPage/address.vue b/pages/pages_zhentou/myPage/address.vue
new file mode 100644
index 0000000..f114370
--- /dev/null
+++ b/pages/pages_zhentou/myPage/address.vue
@@ -0,0 +1,66 @@
+<template>
+	<view class="add_box">
+		<view class="address_box" v-for="item in addressData" :key="item.name">
+			<view class="address_item">
+				<view class="top">
+					<span>{{item.name}}</span>
+					<span>{{item.phone}}</span>
+					<span v-if="item.status == 0">默认</span>
+					<span>{{item.label}}</span>
+				</view>
+				<view class="bottom">
+					<view class="left_bot">
+						{{item.address}}
+					</view>
+					<view class="right_bot">
+						
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				addressData:[
+					{name:'张晓明',phone:'132****1021',status:0,label:'家',address:'山东省青岛市市南区香港中路7号甲亚麦国际中心7层2097户东户'},
+					{name:'张三',phone:'131****0021',status:1,label:'家',address:'山东省青岛市市南区香港中路7号甲亚麦国际中心7层2017户西户'},
+					{name:'李四',phone:'132****3201',status:1,label:'家',address:'山东省青岛市市南区香港中路7号甲亚麦国际中心'},
+					{name:'王五',phone:'132****0015',status:1,label:'家',address:'山东省青岛市市南区香港中路7号甲亚麦国际中心7层'},
+				]
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.add_box{
+		width: 100%;
+		background: #fff;
+		.address_box{
+			width: 95%;
+			margin: 0 auto;
+			margin-top: 40rpx;
+			
+			.address_item{
+				width: 100%;
+				height: 200rpx;
+				border-bottom: 2rpx solid #ccc;
+				
+				.bottom{
+					width: 100%;
+					.left_bot{
+						width: 90%;
+					}
+				}
+			}
+		}
+	}
+
+</style>
diff --git a/pages/pages_zhentou/myPage/myPage.vue b/pages/pages_zhentou/myPage/myPage.vue
index 4c859fe..70d91e3 100644
--- a/pages/pages_zhentou/myPage/myPage.vue
+++ b/pages/pages_zhentou/myPage/myPage.vue
@@ -1,6 +1,11 @@
 <template>
 	<view>
-		我的
+		<view class="person_box">
+			个人信息
+		</view>
+		<view class="address_box" @click="returnAddress">
+			收货地址管理
+		</view>
 	</view>
 </template>
 
@@ -12,11 +17,23 @@
 			}
 		},
 		methods: {
-			
+			returnAddress(){
+				uni.navigateTo({
+					url:"/pages/pages_zhentou/myPage/address"
+				})
+			},
 		}
 	}
 </script>
 
-<style>
-
+<style lang="scss" scoped>
+.address_box{
+	width: 95%;
+	height: 100rpx;
+	background: #fff;
+	margin: 0 auto;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
 </style>
diff --git a/pages/pages_zhentou/order/order.vue b/pages/pages_zhentou/order/order.vue
index 2b8cbe1..c5cded4 100644
--- a/pages/pages_zhentou/order/order.vue
+++ b/pages/pages_zhentou/order/order.vue
@@ -1,6 +1,25 @@
 <template>
-	<view>
-		订单页面
+	<view class="order_box">
+		<view class="order_title">
+			<p @click="handleTab(1)" class="tit" :class="active == 1 ? 'actived' : ''">全部</p>
+			<p @click="handleTab(2)" class="tit" :class="active == 2 ? 'actived' : ''">待付款</p>
+			<p @click="handleTab(3)" class="tit" :class="active == 3 ? 'actived' : ''">待发货</p>
+			<p @click="handleTab(4)" class="tit" :class="active == 4 ? 'actived' : ''">待收货</p>
+			<p @click="handleTab(5)" class="tit" :class="active == 5 ? 'actived' : ''">已完成</p>
+		</view>
+		<view class="order_content">
+			<view class="order_item">
+				<view class="top_title">
+					<p class="title">壹人壹枕</p>
+					<p class="status_txt">待收货</p>
+				</view>
+				<view class="top_content">
+					<view class="left_cont">
+						<image class="img_box" src="../../../static/image/zhentou_bag.png" mode=""></image>
+					</view>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -8,15 +27,80 @@
 	export default {
 		data() {
 			return {
-				
+				active:1,
 			}
 		},
 		methods: {
-			
+			handleTab(val){
+				this.active = val
+			}
 		}
 	}
 </script>
 
-<style>
-
+<style lang="scss" scoped>
+.order_box{
+	.order_title{
+		width: 100%;
+		height: 100rpx;
+		background: #fff;
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+		.tit{
+			padding-bottom: 10rpx;
+			font-size: 26rpx;
+			color: #333;
+			
+			&.actived{
+				border-bottom: 5rpx solid #D73232;
+				color: #D73232;
+			}
+		}
+	}
+	.order_content{
+		width: 100%;
+		height: auto;
+		overflow-y: auto;
+		
+		.order_item{
+			width: 690rpx;
+			background: #FFFFFF;
+			border-radius: 30rpx;
+			margin:0 auto;
+			margin-top: 30rpx;
+			
+			.top_title{
+				padding: 30rpx 31rpx 25rpx;
+				display: flex;
+				justify-content: space-between;
+				
+				.title{
+					font-size: 28rpx;
+				}
+				.status_txt{
+					font-size: 24rpx;
+				}
+			}
+			
+			.top_content{
+				width: 630rpx;
+				height: 160rpx;
+				background: #F8F8F8;
+				border-radius: 20rpx;
+				margin: 0 auto;
+				
+				.left_cont{
+					width: 160rpx;
+					height: 160rpx;
+					
+					.img_box{
+						width: 100%;
+						height: 100%;
+					}
+				}
+			}
+		}
+	}
+}
 </style>
diff --git a/static/image/zhentou_bag.png b/static/image/zhentou_bag.png
new file mode 100644
index 0000000..a826efa
Binary files /dev/null and b/static/image/zhentou_bag.png differ