Merge remote-tracking branch 'origin/3.0.1' into 3.0.1

rk

2 天以前 609a1931953b2298016bd2b0d6b410666b5ad7b9

 bicycle/pages.json

@@ -155,12 +155,6 @@
         }
      },
      {
         "path": "pages/operation/operation",
         "style": {
            "navigationBarTitleText": "运营中心"
         }
      },
      {
         "path": "pages/order/order",
         "style": {
            "navigationBarTitleText": "订单管理"
@@ -177,8 +171,27 @@
         "style": {
            "navigationBarTitleText": "经营概况"
         }
      },
      {
         "path": "pages/explanation/explanation",
         "style": {
            "navigationBarTitleText": "抖音兑换说明"
         }
      }
    ],
   "subPackages": [
      {
         "root": "pagesA",
         "pages": [
            {
               "path": "pages/operation/operation",
               "style": {
                  "navigationBarTitleText": "运营中心"
               }
            }
         ]
      }
   ],
   "globalStyle": {
      "navigationBarTextStyle": "black",
      "navigationBarTitleText": "uni-app",