Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx

pageD/notice/notice.vue

@@ -2,6 +2,7 @@
 	<view id="viewes" :style="{height : height  + 'px'}">
 		<!-- 公告咨询 -->
 		<notice :list="list"></notice>
+		<u-loadmore :status="loadStatus" bg-color="#ECECEC" margin-top="20" v-if="loadStatus=='nomore'" />
 	</view>
 </template>
 
@@ -11,6 +12,7 @@
 		data() {
 			return {
 				list: [],
+				loadStatus: 'loadmore'
 			};
 		},
 		onLoad() {
@@ -29,6 +31,8 @@
 				this.$u.api.informationList({}).then((res) => {
 					if (res.errCode == 0) {
 						this.list = res.data;
+						// 目前没有分页,只无数据提示用
+						if(!this.list.length) this.loadStatus = 'nomore';
 					}
 				})
 			}