From 4f99cd6e3610546df3ac86b6ba1aec15f98d6a02 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 12 三月 2024 14:47:59 +0800
Subject: [PATCH] chore: hebing
---
app.json | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/app.json b/app.json
index ededab2..a8b722e 100644
--- a/app.json
+++ b/app.json
@@ -1,13 +1,13 @@
{
"pages": [
-<<<<<<< HEAD
"pages/home/home",
"pages/resourceDetails/index",
-=======
"pages/resourceDetails/myAudio/index",
"pages/resourceDetails/myVideo/index",
"pages/resourceDetails/document/index",
->>>>>>> master
+ "pages/resourceDetails/myAudio/index",
+ "pages/resourceDetails/myVideo/index",
+ "pages/resourceDetails/document/index",
"pages/retrievalPage/index",
"pages/cart/paymentPage/index",
"pages/cart/index",
@@ -102,9 +102,7 @@
}
]
},
- "requiredPrivateInfos": [
- "chooseAddress"
- ],
+ "requiredPrivateInfos": ["chooseAddress"],
"usingComponents": {},
"window": {
"backgroundTextStyle": "light",
@@ -119,4 +117,4 @@
"desc": "浣犵殑浣嶇疆淇℃伅灏嗙敤浜庡皬绋嬪簭浣嶇疆鎺ュ彛鐨勬晥鏋滃睍绀�"
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1