|
|
@ -46,15 +46,6 @@ |
|
|
|
"pagePath": "pages/login/login", |
|
|
|
"pagePath": "pages/login/login", |
|
|
|
"iconPath": "static/logo.png", |
|
|
|
"iconPath": "static/logo.png", |
|
|
|
"selectedIconPath": "static/logo.png", |
|
|
|
"selectedIconPath": "static/logo.png", |
|
|
|
<<<<<<< .mine |
|
|
|
|
|
|
|
"text": "登录" |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
======= |
|
|
|
|
|
|
|
"text": "艺术家" |
|
|
|
"text": "艺术家" |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
@ -62,7 +53,6 @@ |
|
|
|
"iconPath": "static/logo.png", |
|
|
|
"iconPath": "static/logo.png", |
|
|
|
"selectedIconPath": "static/logo.png", |
|
|
|
"selectedIconPath": "static/logo.png", |
|
|
|
"text": "我的" |
|
|
|
"text": "我的" |
|
|
|
>>>>>>> .theirs |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
] |
|
|
|
] |
|
|
|
}, |
|
|
|
}, |
|
|
|