diff --git a/api/owner/ownerApi.js b/api/owner/ownerApi.js
index 8eca3e3..c709ef7 100644
--- a/api/owner/ownerApi.js
+++ b/api/owner/ownerApi.js
@@ -55,3 +55,26 @@ export function getCurOwner() {
 			}
 		});
 }
+
+
+export function getUserAddress(_data){
+	return new Promise((resolve, reject) => {
+		let moreRooms = [];
+		request({
+			url: url.queryUserAddress,
+			method: "GET",
+			data: _data, //动态数据
+			success: function(res) {
+				let _data = res.data;
+				if (_data.code == 0) {
+					resolve(_data);
+					return ;
+				}
+				reject(_data.msg);
+			},
+			fail: function(e) {
+				reject(e);
+			}
+		});
+	})
+}
diff --git a/constant/url.js b/constant/url.js
index 6bbd066..5b9dfe8 100644
--- a/constant/url.js
+++ b/constant/url.js
@@ -96,6 +96,7 @@ export default {
 	queryProduct: baseUrl +'app/product/queryProduct',
 	saveStoreCart: baseUrl +'app/storeOrder/saveStoreCart',
 	queryStoreCart: baseUrl +'app/storeOrder/queryStoreCart',
+	queryUserAddress: baseUrl + 'app/userAddress/queryUserAddress',
 	
 	NEED_NOT_LOGIN_PAGE: [
 		'/pages/login/login',
diff --git a/pages/addressList/addressList.vue b/pages/addressList/addressList.vue
index 6487af0..d610daf 100644
--- a/pages/addressList/addressList.vue
+++ b/pages/addressList/addressList.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="page_box">
+	<view class="page_box flex flex-direction justify-between">
 		<view class="head_box"></view>
 		<view class="content_box">
 			<view class="address-list" v-for="address in addressList" :key="address.id" @tap="useAddress(address)">
@@ -12,134 +12,160 @@
 				<button class="cu-btn set-btn" @tap.stop="jump('/pages/user/address/edit', { id: address.id })">编辑</button>
 			</view>
 		</view>
-		<view class="foot_box x-ac">
-			<button class="cu-btn add-btn" @tap="jump('/pages/user/address/edit', { id: 0, from: from })">添加新的收货地址</button>
+		<view class="foot_box flex justify-around">
+			<button class="cu-btn add-btn" @tap="jump('/pages/user/address/edit', { id: 0, from: from })">添加收货地址</button>
 		</view>
 	</view>
 </template>
 
 <script>
-export default {
-	components: {},
-	data() {
-		return {
-			addressList: [],
-			from: '',
-			platform: uni.getStorageSync('platform')
-		};
-	},
-	computed: {},
-	onLoad() {
-	},
-	onShow() {
-		this.init();
-	},
-	methods: {
-		init() {
-			return Promise.all([this.getAddressList()]);
+	import {
+		getCurOwner,
+		getUserAddress
+	} from '../../api/owner/ownerApi.js';
+	export default {
+		components: {},
+		data() {
+			return {
+				addressList: [],
+				from: '',
+				platform: uni.getStorageSync('platform')
+			};
 		},
-		useAddress(address) {
-			let pages = getCurrentPages();
-
-			// #ifdef MP-WEIXIN || APP-PLUS
-			let currPage = pages[pages.length - 1].$vm;
-			let prevPage = pages[pages.length - 2].$vm; //上一个页面
-			// #endif
-
-			// #ifdef H5
-			let currPage = pages[pages.length - 1];
-			let prevPage = pages[pages.length - 2]; //上一个页面
-			// #endif
-			prevPage.address = address;
-
-			uni.navigateBack({
-				delta: 1
-			});
+		computed: {},
+		onLoad() {},
+		onShow() {
+			this.init();
 		},
-		// 路由跳转
-		jump(path, parmas) {
-			this.$Router.push({
-				path: path,
-				query: parmas
-			});
-		},
-		getAddressList() {
-			this.$api('address.list').then(res => {
-				if (res.code === 1) {
-					this.addressList = res.data;
-				}
-			});
+		methods: {
+			init() {
+				return Promise.all([this.getAddressList()]);
+			},
+			useAddress(address) {
+				let pages = getCurrentPages();
+
+				// #ifdef MP-WEIXIN || APP-PLUS
+				let currPage = pages[pages.length - 1].$vm;
+				let prevPage = pages[pages.length - 2].$vm; //上一个页面
+				// #endif
+
+				// #ifdef H5
+				let currPage = pages[pages.length - 1];
+				let prevPage = pages[pages.length - 2]; //上一个页面
+				// #endif
+				prevPage.address = address;
+
+				uni.navigateBack({
+					delta: 1
+				});
+			},
+			// 路由跳转
+			jump(path, parmas) {
+				this.$Router.push({
+					path: path,
+					query: parmas
+				});
+			},
+			getAddressList() {
+				let that = this;
+				getCurOwner()
+					.then((ownerInfo) => {
+						let param = {
+							page: 1,
+							row: 30,
+							userId: ownerInfo.userId
+						}
+						return getUserAddress(param);
+					}).then((data) => {
+						that.addressList = data.data;
+					});
+
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-.address-list {
-	padding: 40rpx;
-	position: relative;
-	background: #fff;
-	margin-bottom: 20rpx;
-
-	.name,
-	.phone {
-		font-size: 30rpx;
-		font-weight: 600;
+	.page_box {
+		height: 100%;
 	}
 
-	.phone {
-		margin: 0 20rpx;
-	}
-
-	.tag {
-		background: rgba(233, 191, 113, 0.2);
-		border-radius: 6rpx;
-		padding: 0 16rpx;
-		line-height: 38rpx;
-		color: #a8700d;
-		font-size: 22rpx;
-	}
-
-	.detail {
-		margin-top: 25rpx;
-		width: 543rpx;
-		font-size: 26rpx;
-		font-family: PingFang SC;
-		font-weight: 400;
-		color: rgba(153, 153, 153, 1);
-		line-height: 40rpx;
-	}
-
-	.set-btn {
-		background: none;
-		position: absolute;
-		font-size: 26rpx;
-		color: #a8700d;
-		top: 40rpx;
-		right: 20rpx;
-	}
-}
-
-.foot_box {
-	padding: 20rpx;
-	.sync-wxaddress {
+	.content_box {
+		height: 100%;
+		-webkit-box-flex: 1;
+		-webkit-flex: 1;
 		flex: 1;
-		height: 80rpx;
-		background: rgba(255, 255, 255, 1);
-		border-radius: 40rpx;
-		.cuIcon-weixin {
-			color: #1ea907;
-			margin-right: 10rpx;
-			font-size: 40rpx;
+		overflow-y: auto;
+	}
+
+	.address-list {
+		padding: 40rpx;
+		position: relative;
+		background: #fff;
+		margin-bottom: 20rpx;
+
+		.name,
+		.phone {
+			font-size: 30rpx;
+			font-weight: 600;
+		}
+
+		.phone {
+			margin: 0 20rpx;
+		}
+
+		.tag {
+			background: rgba(233, 191, 113, 0.2);
+			border-radius: 6rpx;
+			padding: 0 16rpx;
+			line-height: 38rpx;
+			color: #a8700d;
+			font-size: 22rpx;
+		}
+
+		.detail {
+			margin-top: 25rpx;
+			width: 543rpx;
+			font-size: 26rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: rgba(153, 153, 153, 1);
+			line-height: 40rpx;
+		}
+
+		.set-btn {
+			background: none;
+			position: absolute;
+			font-size: 26rpx;
+			color: #a8700d;
+			top: 40rpx;
+			right: 20rpx;
 		}
 	}
-	.add-btn {
-		height: 80rpx;
-		flex: 1;
-		background: linear-gradient(90deg, rgba(233, 180, 97, 1), rgba(238, 204, 137, 1));
-		border: 1rpx solid rgba(238, 238, 238, 1);
-		border-radius: 40rpx;
-		color: rgba(#fff, 0.9);
+
+	.foot_box {
+		padding: 20rpx;
+
+		.sync-wxaddress {
+			flex: 1;
+			height: 80rpx;
+			background: rgba(255, 255, 255, 1);
+			border-radius: 40rpx;
+
+			.cuIcon-weixin {
+				color: #1ea907;
+				margin-right: 10rpx;
+				font-size: 40rpx;
+			}
+		}
+
+		.add-btn {
+			height: 80rpx;
+			flex: 1;
+			background: linear-gradient(90deg, rgba(233, 180, 97, 1), rgba(238, 204, 137, 1));
+			border: 1rpx solid rgba(238, 238, 238, 1);
+			border-radius: 40rpx;
+			color: rgba(#fff, 0.9);
+		}
 	}
-}
 </style>