From cd98c69ff835643f518337ee9ab532885c647efb Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期五, 15 三月 2024 18:48:39 +0800
Subject: [PATCH] 合并代码
---
custom-tab-bar/data.js | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/custom-tab-bar/data.js b/custom-tab-bar/data.js
index 15a8a50..e13c724 100644
--- a/custom-tab-bar/data.js
+++ b/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
},
];
--
Gitblit v1.9.1