Merge branch 'master' of http://git.2weisou.com/Acher/newEdition

pages/center/records/index.vue

@@ -322,7 +322,7 @@
 			this.screen.validInvalid = options.validInvalid
 			if (options.staTime) {
 				this.staTime = options.staTime;
-				this.endtime = options.endtime +' 23:59:59';;
+				this.endtime = options.endtime +' 23:59:59';
 			}
 		},
 		onShow() {

pages/index/consumer/index.vue

@@ -434,8 +434,8 @@
 			console.log(this.userInfo.showPhoneStatus)
 			if (this.isnorefresh == 'refresh') {
 				this.buildingID = uni.getStorageSync('buildingID').id;
-				this.nextPage = 1;
-				this.recordList = []
+				// this.nextPage = 1;
+				// this.recordList = []
 				this.getFreeList()
 				this.getfindKeywordsList()
 				this.getFromSource();