修改

b4b8bdb9 · zhengke · 12d39d93 · b4b8bdb9
Commit b4b8bdb9 authored May 31, 2021 by zhengke
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 7 deletions

list.vue pages/hotel/list.vue +1 -7

No files found.
--- a/pages/hotel/list.vue
+++ b/pages/hotel/list.vue
@@ -176,15 +176,9 @@
 			hotelGood
 		},
 		created() {
-<<<<<<< HEAD
 			// uni.navigateTo({
-			// 	url:"/pages/hotel/order"
+			// 	url:"/pages/hotel/detail"
 			// })
-=======
-			uni.navigateTo({
-				url:"/pages/hotel/detail"
-			})
->>>>>>> 153178ce5999e3c5784f132830307ff5bf206c55
 			uni.setNavigationBarTitle({
 				title: "酒店",
 			});