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

# Conflicts:
#	pages.json
master
Gary 1 month ago
commit 21fbf54cfd

@ -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": {},

Loading…
Cancel
Save