no message

3 years ago · 859f87d819
parent fec170d10d
commit 859f87d819
2 changed files with 2 additions and 5 deletions
--- 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
            })
        }
    },
--- a/pages/index/index.js
+++ b/pages/index/index.js
@ -49,11 +49,7 @@ Page({
   
  },
  onLoad: function (options) {
-<<<<<<< HEAD
-    // app.editTabbar()
-=======
    
->>>>>>> 90cc6f967d3e535c5197774cd22f4d1620038aae
  },

 })