From 7ebd4cebbdec2173fba7345285c0ed6d62043995 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期四, 29 二月 2024 19:27:33 +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 b45be73..15a8a50 100644
--- a/custom-tab-bar/data.js
+++ b/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
},
];
--
Gitblit v1.9.1