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 | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/custom-tab-bar/data.js b/custom-tab-bar/data.js
index 5bd6ab5..b45be73 100644
--- a/custom-tab-bar/data.js
+++ b/custom-tab-bar/data.js
@@ -27,7 +27,10 @@
{
text: '涓汉涓績',
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