Merge refs/remotes/origin/master into refs/heads/master

litian

2024-03-15 3f1ea0a8e4bb02bf7544df8660b15cfa69d6b84a

 app.json

@@ -1,7 +1,9 @@
{
  "pages": [
    "pages/home/home",
    "pages/resourceDetails/index",
    "pages/resourceDetails/myAudio/index",
    "pages/resourceDetails/myVideo/index",
    "pages/resourceDetails/document/index",
    "pages/retrievalPage/index",
    "pages/cart/paymentPage/index",
    "pages/cart/index",
@@ -54,7 +56,9 @@
    "pages/personalCenter/sampleBooks/index",
    "pages/personalCenter/downloads/index",
    "pages/personalCenter/activateProduct/index",
    "pages/testLogin/index"
    "pages/testLogin/index",
    "pages/bookServices/examination/examination",
    "pages/bookServices/webpage/index"
  ],
  "tabBar": {
    "custom": true,