Merge branch 'main' of http://123.207.203.228:3000/hejiale/flyx

# Conflicts: # pages/shouye/index.vue
2024-07-26 11:11:02 +08:00 · 2024-07-26 11:11:02 +08:00 · b7f2917e37
commit b7f2917e37
parent b94f3f5f42 479d46f0c1
1 changed files with 4 additions and 6 deletions
--- a/pages/shouye/index.vue
+++ b/pages/shouye/index.vue
@ -187,10 +187,6 @@
 						id: 1,
 						title: '一番赏'
 					},
-					{
-						id: 6,
-						title: '全局赏'
-					},
 					{
 						id: 9,
 						title: '枫岚赏'
@ -199,11 +195,13 @@
 						id: 12,
 						title: '连击赏'
 					},
+					{
+						id: 6,
+						title: '全局赏'
+					},
 					{
 						id: 8,
 						title: '领主赏'
-					},
-
 					// {
 					// 	id: 3,
 					// 	title: '擂台赏'