Merge remote-tracking branch 'fitjourney前端代码仓库/master'

# Conflicts: # pages.json
1 month ago · 21fbf54cfd
parent a0c65e8c57 4e05459fe3
commit 21fbf54cfd
1 changed files with 12 additions and 0 deletions
--- a/pages.json
+++ b/pages.json
@ -29,6 +29,18 @@
      "style": {
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/login/account_login/account_login",
      "style": {
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/login/register/register",
      "style": {
        "navigationStyle": "custom"
      }
    }
  ],
  "uniIdRouter": {},