xuhaolan 3 سال پیش
والد
کامیت
9b3b0f438c
1فایلهای تغییر یافته به همراه7 افزوده شده و 10 حذف شده
  1. 7 10
      pages.json

+ 7 - 10
pages.json

@@ -1,17 +1,14 @@
 {
 	"easycom": {
-			"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
-		},
-	"pages": [
-		{
+		"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
+	},
+	"pages": [{
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTextStyle": "black",
 				"navigationBarBackgroundColor": "#FFFFFF",
 				// "navigationStyle": "custom",
-				"navigationBarTitleText":"恒星币"
-<<<<<<< HEAD
-=======
+				"navigationBarTitleText": "恒星币"
 			}
 		},
 		{
@@ -20,11 +17,11 @@
 				"navigationBarTextStyle": "black",
 				"navigationBarBackgroundColor": "#FFFFFF",
 				// "navigationStyle": "custom",
-				"navigationBarTitleText":"恒星币"
->>>>>>> b38ef8383b6c90e02e27fa83a9f1005de590c615
+				"navigationBarTitleText": "恒星币"
 			}
 		}
-    ],
+
+	],
 
 	"globalStyle": {
 		"navigationBarTextStyle": "black",