From 60bae3bf527b15fc5aefd555d7c76916b012b823 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期四, 29 二月 2024 18:45:02 +0800
Subject: [PATCH] 冲突解决
---
custom-tab-bar/data.js | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/custom-tab-bar/data.js b/custom-tab-bar/data.js
index d3c5032..b45be73 100644
--- a/custom-tab-bar/data.js
+++ b/custom-tab-bar/data.js
@@ -1,27 +1,36 @@
export default [
{
- icon: 'home',
text: '棣栭〉',
url: 'pages/home/home',
+ icon: '/static/images/home/Home@2x.png',
+ activeIcon: '/static/images/home/Home-click@2x.png'
},
{
- icon: 'sort',
text: '鍥句功鏈嶅姟',
- url: 'pages/bookServices/index'
+ url: 'pages/bookServices/index',
+ icon: '/static/images/home/service@2x.png',
+ activeIcon: '/static/images/home/service-click@2x.png'
},
+
{
- icon: 'sort',
- text: '鍒嗙被',
+ text: '瀛︿範',
url: 'pages/goods/category/index',
+ icon: '/static/images/home/learn@2x.png',
+ activeIcon: '/static/images/home/learn-click@2x.png'
},
{
- icon: 'cart',
text: '璐墿杞�',
url: 'pages/cart/index',
+ icon: '/static/images/home/cart@2x.png',
+ activeIcon: '/static/images/home/cart-click@2x.png'
},
{
- icon: 'person',
text: '涓汉涓績',
- url: 'pages/usercenter/index',
+ url: 'pages/personalCenter/index',
+<<<<<<< HEAD
+ icon: '/static/images/home/my@2x.png',
+ activeIcon: '/static/images/home/my-click@2x.png'
+=======
+>>>>>>> master
},
];
--
Gitblit v1.9.1