custom-tab-bar/data.js
@@ -7,7 +7,7 @@ }, { text: '图书服务', url: 'pages/bookServices/index', url: 'pages/bookServices/assort/index', icon: '/static/images/home/service@2x.png', activeIcon: '/static/images/home/service-click@2x.png' }, @@ -27,13 +27,7 @@ { text: '个人中心', url: 'pages/personalCenter/index', <<<<<<< HEAD <<<<<<< HEAD icon: '/static/images/home/my@2x.png', activeIcon: '/static/images/home/my-click@2x.png' ======= >>>>>>> master ======= >>>>>>> master }, ];
