合并代码

闫增涛

2024-03-15 cd98c69ff835643f518337ee9ab532885c647efb

 app.json

@@ -1,13 +1,9 @@
{
  "pages": [
<<<<<<< HEAD
    "pages/home/home",
    "pages/resourceDetails/index",
=======
    "pages/resourceDetails/myAudio/index",
    "pages/resourceDetails/myVideo/index",
    "pages/resourceDetails/document/index",
>>>>>>> master
    "pages/retrievalPage/index",
    "pages/cart/paymentPage/index",
    "pages/cart/index",
@@ -61,7 +57,8 @@
    "pages/personalCenter/downloads/index",
    "pages/personalCenter/activateProduct/index",
    "pages/testLogin/index",
    "pages/bookServices/examination/examination"
    "pages/bookServices/examination/examination",
    "pages/bookServices/webpage/index"
  ],
  "tabBar": {
    "custom": true,