From cd98c69ff835643f518337ee9ab532885c647efb Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期五, 15 三月 2024 18:48:39 +0800
Subject: [PATCH] 合并代码
---
app.json | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/app.json b/app.json
index ededab2..d440e7c 100644
--- a/app.json
+++ b/app.json
@@ -1,13 +1,9 @@
{
"pages": [
-<<<<<<< HEAD
"pages/home/home",
- "pages/resourceDetails/index",
-=======
"pages/resourceDetails/myAudio/index",
"pages/resourceDetails/myVideo/index",
"pages/resourceDetails/document/index",
->>>>>>> master
"pages/retrievalPage/index",
"pages/cart/paymentPage/index",
"pages/cart/index",
@@ -61,7 +57,8 @@
"pages/personalCenter/downloads/index",
"pages/personalCenter/activateProduct/index",
"pages/testLogin/index",
- "pages/bookServices/examination/examination"
+ "pages/bookServices/examination/examination",
+ "pages/bookServices/webpage/index"
],
"tabBar": {
"custom": true,
--
Gitblit v1.9.1