From 3f1ea0a8e4bb02bf7544df8660b15cfa69d6b84a Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期五, 15 三月 2024 18:54:04 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master

---
 app.json |   47 ++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/app.json b/app.json
index 464fcdc..d440e7c 100644
--- a/app.json
+++ b/app.json
@@ -1,9 +1,19 @@
 {
   "pages": [
     "pages/home/home",
-    "pages/bookServices/index",
+    "pages/resourceDetails/myAudio/index",
+    "pages/resourceDetails/myVideo/index",
+    "pages/resourceDetails/document/index",
+    "pages/retrievalPage/index",
+    "pages/cart/paymentPage/index",
+    "pages/cart/index",
+    "pages/aboutUs/index",
+    "pages/bookServices/assort/index",
+    "pages/bookServices/detail/index",
+    "pages/bookServices/list/index",
     "pages/bookExhibitionList/index",
     "pages/bookExhibitionDetails/index",
+    "pages/bibliographyList/index",
     "pages/usercenter/index",
     "pages/usercenter/person-info/index",
     "pages/usercenter/address/list/index",
@@ -13,7 +23,6 @@
     "pages/goods/category/index",
     "pages/goods/search/index",
     "pages/goods/result/index",
-    "pages/cart/index",
     "pages/order/order-confirm/index",
     "pages/order/receipt/index",
     "pages/order/pay-result/index",
@@ -33,17 +42,23 @@
     "pages/order/invoice/index",
     "pages/usercenter/name-edit/index",
     "pages/teacherCertification/index",
+    "pages/sampleBookList/index",
+    "pages/sampleBookList/applicationForm/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/personalCenter/activateProduct/index",
+    "pages/testLogin/index",
+    "pages/bookServices/examination/examination",
+    "pages/bookServices/webpage/index"
   ],
   "tabBar": {
     "custom": true,
@@ -54,36 +69,46 @@
     "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": "鍥句功鏈嶅姟"
+        "pagePath": "pages/bookServices/assort/index",
+        "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/personalCenter/index",
-        "text": "鎴戠殑"
+        "text": "鎴戠殑",
+        "iconPath": "/static/images/home/my@2x.png",
+        "selectedIconPatn": "/static/images/home/my-click@2x.png"
       }
     ]
   },
   "requiredPrivateInfos": [
     "chooseAddress"
   ],
-  "lazyCodeLoading": "requiredComponents",
   "usingComponents": {},
   "window": {
     "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#fff",
     "navigationBarTitleText": "浜笀E璇�",
-    "navigationBarTextStyle": "black"
+    "navigationBarTextStyle": "black",
+    " navigationStyle": "custom"
   },
   "sitemapLocation": "sitemap.json",
   "permission": {

--
Gitblit v1.9.1