diff --git a/src/pages/mine/address/index.vue b/src/pages/mine/address/index.vue
index 208769bf4c72302ad5400abbb9b94bdf3a08c09a..aed908cde67ed2c8579a0a5ed4edcb51c460d90d 100644
--- a/src/pages/mine/address/index.vue
+++ b/src/pages/mine/address/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="address-wrap">
 		<w-navbar title="收货地址"></w-navbar>
-		<view class="item">
+		<view class="item" v-if="hasAdderss">
 			<view class="top">
 				<view class="name">{{ settled.id_card_name || settled.nickname || settled.name || '--' }}</view>
 				<view class="phone">{{ settled.mobile }}</view>
@@ -41,6 +41,9 @@ export default {
 		settled() {
 			return this.vuex_settled && this.vuex_settled.record || null
 		},
+		hasAdderss() {
+			return this.settled && this.settled.address && this.settled.id_card_name
+		},
 	},
 	onLoad(e) {
 		if(!this.vuex_token) {
diff --git a/src/pages/mine/warehouse/index.vue b/src/pages/mine/warehouse/index.vue
index a65438001314a80ecfbf7511fa57bda66c932afa..36a53fe7d1da8cc1bbd3550419a1aa1c293c754e 100644
--- a/src/pages/mine/warehouse/index.vue
+++ b/src/pages/mine/warehouse/index.vue
@@ -32,7 +32,7 @@
 						<view class="width-80 center">{{ item.outAmount }}</view>
 						<view class="width-140 create-time">{{ (item.updateTime || item.createTime) | datefmt('YYYY.MM.DD HH:mm:ss')}}</view>
 					</view>
-					<u-loadmore class="load-more" :status="status" @loadmore="loadRecord" />
+					<u-loadmore margin-top="20" :status="status" @loadmore="loadRecord" />
 				</view>
 			</view>
 		</view>
@@ -99,7 +99,7 @@
 						self.status = "nomore"
 					}
 				} else {
-					
+					self.status = "nomore"
 				}
 			},
 		}
@@ -180,7 +180,4 @@
 .break {
 	word-break:break-all;
 }
-.load-more {
-	margin-top: 20rpx;
-}
 </style>