From 42cc31916c043f681c271efeb73394260e7d77aa Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 05 三月 2024 18:53:11 +0800
Subject: [PATCH] 合并

---
 custom-tab-bar/data.js |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/custom-tab-bar/data.js b/custom-tab-bar/data.js
index b45be73..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,10 +27,7 @@
   {
     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