冲突

pages/search/search.vue

@@ -329,12 +329,7 @@
 
 <style lang="scss" scoped>
 	
-	.navbar{
-		height:100%
-	}
-	.search{
-		height:100%
-	}
+	
 	/deep/.u-content[data-v-1a326067] {
 		flex: 0.95;
 		color: #bdbdbd;