custom-tab-bar/data.js
@@ -28,9 +28,12 @@ text: '个人中心', url: 'pages/personalCenter/index', <<<<<<< HEAD <<<<<<< HEAD icon: '/static/images/home/my@2x.png', activeIcon: '/static/images/home/my-click@2x.png' ======= >>>>>>> master ======= >>>>>>> master }, ];
