From 6df96b3e7a7da1985ee875e84711e9f15c5fbff0 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 24 十二月 2024 18:25:02 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
app.json | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/app.json b/app.json
index d1fbd39..fb99c71 100644
--- a/app.json
+++ b/app.json
@@ -28,7 +28,8 @@
"pages/specialDiscussion/webView/index",
"pages/index/bookDetail",
"pages/index/resourceCover",
- "pages/test/testCover"
+ "pages/test/testCover",
+ "pages/scanResult/index"
],
"subPackages": [
{
@@ -77,7 +78,21 @@
"pages/bookServices/webpage/index",
"pages/components/webView/index",
"pages/bookServices/detail/buyResource/index",
- "pages/bookServices/detail/components/learnTask/index"
+ "pages/bookServices/detail/components/learnTask/index",
+ "pages/bookServices/linkPage/index",
+ "pages/psychologyAnswer/psychologyAnswer"
+ ]
+ },
+ {
+ "root": "packageCourse",
+ "name": "packageCourse",
+ "pages": [
+ "pages/course/index",
+ "pages/course/detail/index",
+ "pages/teachClass/index",
+ "components/baseClass/index",
+ "pages/studentClass/index",
+ "pages/teachClass/detail/index"
]
}
],
@@ -90,33 +105,23 @@
"list": [
{
"pagePath": "pages/home/home",
- "text": "棣栭〉",
- "iconPath": "/static/images/home/Home@2x.png",
- "selectedIconPatn": "/static/images/home/Home-click@2x.png"
+ "text": "棣栭〉"
},
{
"pagePath": "pages/bookServices/assort/index",
- "text": "鍥句功鏈嶅姟",
- "iconPath": "/static/images/home/service@2x.png",
- "selectedIconPatn": "/static/images/home/service-click@2x.png"
+ "text": "鍥句功鏈嶅姟"
},
{
"pagePath": "pages/study/index",
- "text": "瀛︿範",
- "iconPath": "/static/images/home/learn@2x.png",
- "selectedIconPatn": "/static/images/home/learn-click@2x.png"
+ "text": "瀛︿範"
},
{
"pagePath": "pages/cart/index",
- "text": "璐墿杞�",
- "iconPath": "/static/images/home/cart@2x.png",
- "selectedIconPatn": "/static/images/home/cart-click@2x.png"
+ "text": "璐墿杞�"
},
{
"pagePath": "pages/personalCenter/index",
- "text": "鎴戠殑",
- "iconPath": "/static/images/home/my@2x.png",
- "selectedIconPatn": "/static/images/home/my-click@2x.png"
+ "text": "鎴戠殑"
}
]
},
--
Gitblit v1.9.1