From 60bae3bf527b15fc5aefd555d7c76916b012b823 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期四, 29 二月 2024 18:45:02 +0800
Subject: [PATCH] 冲突解决
---
app.json | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/app.json b/app.json
index 7bd9cf8..6a6b402 100644
--- a/app.json
+++ b/app.json
@@ -2,6 +2,8 @@
"pages": [
"pages/home/home",
"pages/bookServices/index",
+ "pages/bookExhibitionList/index",
+ "pages/bookExhibitionDetails/index",
"pages/usercenter/index",
"pages/usercenter/person-info/index",
"pages/usercenter/address/list/index",
@@ -29,7 +31,21 @@
"pages/order/fill-tracking-no/index",
"pages/order/delivery-detail/index",
"pages/order/invoice/index",
- "pages/usercenter/name-edit/index"
+ "pages/usercenter/name-edit/index",
+ "pages/teacherCertification/index",
+ "pages/personalCenter/index",
+ "pages/personalCenter/myOrder/index",
+ "pages/personalCenter/myCollection/index",
+ "pages/personalCenter/myMassage/index",
+ "pages/personalCenter/myMassage/massageDetail/index",
+ "pages/personalCenter/feedBack/index",
+ "pages/personalCenter/feedBackSubmit/index",
+ "pages/personalCenter/certificate/index",
+ "pages/personalCenter/publishBooks/index",
+ "pages/personalCenter/sampleBooks/index",
+ "pages/personalCenter/downloads/index",
+ "pages/personalCenter/activateProduct/index",
+ "pages/testLogin/index"
],
"tabBar": {
"custom": true,
@@ -40,23 +56,33 @@
"list": [
{
"pagePath": "pages/home/home",
- "text": "棣栭〉"
+ "text": "棣栭〉",
+ "iconPath": "/static/images/home/Home@2x.png",
+ "selectedIconPatn": "/static/images/home/Home-click@2x.png"
},
{
"pagePath": "pages/bookServices/index",
- "text": "鍥句功鏈嶅姟"
+ "text": "鍥句功鏈嶅姟",
+ "iconPath": "/static/images/home/service@2x.png",
+ "selectedIconPatn": "/static/images/home/service-click@2x.png"
},
{
"pagePath": "pages/goods/category/index",
- "text": "鍒嗙被"
+ "text": "瀛︿範",
+ "iconPath": "/static/images/home/learn@2x.png",
+ "selectedIconPatn": "/static/images/home/learn-click@2x.png"
},
{
"pagePath": "pages/cart/index",
- "text": "璐墿杞�"
+ "text": "璐墿杞�",
+ "iconPath": "/static/images/home/cart@2x.png",
+ "selectedIconPatn": "/static/images/home/cart-click@2x.png"
},
{
- "pagePath": "pages/usercenter/index",
- "text": "鎴戠殑"
+ "pagePath": "pages/personalCenter/index",
+ "text": "鎴戠殑",
+ "iconPath": "/static/images/home/my@2x.png",
+ "selectedIconPatn": "/static/images/home/my-click@2x.png"
}
]
},
--
Gitblit v1.9.1