From 1daa00227f03bc3a370dc1311b7166df17368929 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 20 三月 2024 16:15:46 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master

---
 app.json |   92 ++++++++++++++++++++++-----------------------
 1 files changed, 45 insertions(+), 47 deletions(-)

diff --git a/app.json b/app.json
index 570463c..c3c65c8 100644
--- a/app.json
+++ b/app.json
@@ -1,61 +1,59 @@
 {
   "pages": [
-    "pages/resourceDetails/myAudio/index",
-    "pages/resourceDetails/myVideo/index",
-    "pages/resourceDetails/document/index",
+    "pages/student/index",
+    "pages/home/home",
     "pages/retrievalPage/index",
     "pages/cart/paymentPage/index",
     "pages/cart/index",
-    "pages/home/home",
-    "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",
-    "pages/usercenter/address/edit/index",
-    "pages/goods/list/index",
-    "pages/goods/details/index",
-    "pages/goods/category/index",
-    "pages/goods/search/index",
-    "pages/goods/result/index",
-    "pages/order/order-confirm/index",
-    "pages/order/receipt/index",
-    "pages/order/pay-result/index",
-    "pages/order/order-list/index",
-    "pages/order/order-detail/index",
-    "pages/goods/comments/index",
-    "pages/order/apply-service/index",
-    "pages/order/after-service-list/index",
-    "pages/order/after-service-detail/index",
-    "pages/goods/comments/create/index",
-    "pages/coupon/coupon-list/index",
-    "pages/coupon/coupon-detail/index",
-    "pages/coupon/coupon-activity-goods/index",
-    "pages/promotion-detail/index",
-    "pages/order/fill-tracking-no/index",
-    "pages/order/delivery-detail/index",
-    "pages/order/invoice/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",
-    "pages/bookServices/examination/examination"
+    "pages/bookServices/assort/index"
+  ],
+  "subPackages": [
+    {
+      "root": "packageDomain",
+      "name": "packageDomain",
+      "pages": [
+        "pages/resourceDetails/myAudio/index",
+        "pages/resourceDetails/myVideo/index",
+        "pages/resourceDetails/document/index",
+        "pages/sampleBookList/index",
+        "pages/sampleBookList/applicationForm/index",
+        "pages/teacherCertification/index"
+      ]
+    },
+    {
+      "root": "packagePersonal",
+      "name": "packagePersonal",
+      "pages": [
+        "pages/myOrder/index",
+        "pages/myCollection/index",
+        "pages/myMassage/index",
+        "pages/myMassage/massageDetail/index",
+        "pages/downloads/index",
+        "pages/activateProduct/index",
+        "pages/sampleBooks/index",
+        "pages/personalCenter/publishBooks/index",
+        "pages/feedBack/index",
+        "pages/aboutUs/index",
+        "pages/userSetting/index"
+      ]
+    },
+    {
+      "root": "packageBookService",
+      "name": "packageBookService",
+      "pages": [
+        "pages/bookServices/list/index",
+        "pages/bookServices/detail/index",
+        "pages/bookServices/examination/examination",
+        "pages/bookServices/webpage/index"
+      ]
+    }
   ],
   "tabBar": {
     "custom": true,
@@ -77,7 +75,7 @@
         "selectedIconPatn": "/static/images/home/service-click@2x.png"
       },
       {
-        "pagePath": "pages/goods/category/index",
+        "pagePath": "pages/student/index",
         "text": "瀛︿範",
         "iconPath": "/static/images/home/learn@2x.png",
         "selectedIconPatn": "/static/images/home/learn-click@2x.png"

--
Gitblit v1.9.1