Merge branch 'master' into h5

3 months ago · ee8b5dbaba
parent 95f0b722fb 771f737618
commit ee8b5dbaba
2 changed files with 524 additions and 507 deletions
--- a/pages/news1/MerchantSettlement.vue
+++ b/pages/news1/MerchantSettlement.vue
--- a/pages/search/index.vue
+++ b/pages/search/index.vue
@ -95,7 +95,8 @@
 			if (uni.getStorageSync('searchList')) {
 				this.searchList = uni.getStorageSync('searchList')
 				this.searchList = Array.from(new Set(this.searchList));
-				this.searchList=this.searchList.length>0?this.searchList.slice(0,6):[]
+				// this.searchList=this.searchList.length>0?this.searchList.slice(0,6):[],
+				this.searchList=this.searchList.length>0?this.searchList:[]
 			}

 		},