diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js
index 296a652..93329d3 100644
--- a/custom-tab-bar/index.js
+++ b/custom-tab-bar/index.js
@@ -40,11 +40,12 @@ Component({
         switchTab(e) {
             const data = e.currentTarget.dataset;
             const url = data.path
+            console.log(url)
             this.setData({
                 selected: data.index
             })
             wx.switchTab({
-                url
+                url: "/" + url
             })
         }
     },
diff --git a/pages/index/index.js b/pages/index/index.js
index a7fe262..6540b4d 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -49,11 +49,7 @@ Page({
    
   },
   onLoad: function (options) {
-<<<<<<< HEAD
-    // app.editTabbar()
-=======
     
->>>>>>> 90cc6f967d3e535c5197774cd22f4d1620038aae
   },
 
 })