|
|
|
@ -24,27 +24,24 @@
|
|
|
|
"navigationStyle": "custom"
|
|
|
|
"navigationStyle": "custom"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
|
|
|
{
|
|
|
|
{
|
|
|
|
"path": "pages/login/account_login/account_login",
|
|
|
|
"path": "pages/transition/page5/page5",
|
|
|
|
"style": {
|
|
|
|
"style": {
|
|
|
|
"navigationStyle": "custom"
|
|
|
|
"navigationStyle": "custom"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
{
|
|
|
|
"path": "pages/login/register/register",
|
|
|
|
"path": "pages/login/account_login/account_login",
|
|
|
|
"style": {
|
|
|
|
"style": {
|
|
|
|
"navigationStyle": "custom"
|
|
|
|
"navigationStyle": "custom"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
=======
|
|
|
|
|
|
|
|
{
|
|
|
|
{
|
|
|
|
"path": "pages/transition/page5/page5",
|
|
|
|
"path": "pages/login/register/register",
|
|
|
|
"style": {
|
|
|
|
"style": {
|
|
|
|
"navigationStyle": "custom"
|
|
|
|
"navigationStyle": "custom"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
>>>>>>> 0732be076c754b7bef85e899635ba6fdff55aa31
|
|
|
|
|
|
|
|
],
|
|
|
|
],
|
|
|
|
"uniIdRouter": {},
|
|
|
|
"uniIdRouter": {},
|
|
|
|
"tabBar": null
|
|
|
|
"tabBar": null
|
|
|
|
|
