提交 c5128ca7 编写于 作者: L linju

23

上级 c21bb907
...@@ -186,7 +186,6 @@ ...@@ -186,7 +186,6 @@
"navigationBarBackgroundColor": "#FFFFFF", "navigationBarBackgroundColor": "#FFFFFF",
"backgroundColor": "#F8F8F8" "backgroundColor": "#F8F8F8"
}, },
<<<<<<< HEAD
// "condition": { // "condition": {
// "list": [ // "list": [
// { // {
...@@ -201,22 +200,6 @@ ...@@ -201,22 +200,6 @@
// ], // ],
// "current":1 // "current":1
// }, // },
=======
"condition": {
"list": [
{
"path": "uni_modules/uni-login-page/pages/index/index"
},
{
"path": "pages/test/test"
},
{
"path":"pages/ucenter/settings/settings"
}
],
"current":2
},
>>>>>>> 82ef1c53dc0aebef37985e23752a43c7aab5b82e
"tabBar": { "tabBar": {
"color": "#7A7E83", "color": "#7A7E83",
"selectedColor": "#007AFF", "selectedColor": "#007AFF",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册