diff --git a/app.json b/app.json index 6da0c21..226f691 100644 --- a/app.json +++ b/app.json @@ -127,20 +127,20 @@ "selectedColor": "#1890ff", "list": [ { - "iconPath": "./assets/images/home.png", - "selectedIconPath": "./assets/images/home1.png", + "iconPath": "./assets/images/tabbar/home.png", + "selectedIconPath": "./assets/images/tabbar/home_active.png", "pagePath": "pages/firstBill/index", "text": "首页" }, { - "iconPath": "./assets/images/home.png", - "selectedIconPath": "./assets/images/home1.png", + "iconPath": "./assets/images/tabbar/unit.png", + "selectedIconPath": "./assets/images/tabbar/unit_active.png", "pagePath": "pages/workBench/index", "text": "工具" }, { - "iconPath": "./assets/images/xx.png", - "selectedIconPath": "./assets/images/xx1_lao.png", + "iconPath": "./assets/images/tabbar/message.png", + "selectedIconPath": "./assets/images/tabbar/message_active.png", "pagePath": "pages/message/index", "text": "消息" }, diff --git a/assets/images/tabbar/home.png b/assets/images/tabbar/home.png new file mode 100644 index 0000000..de2ede7 Binary files /dev/null and b/assets/images/tabbar/home.png differ diff --git a/assets/images/tabbar/home.svg b/assets/images/tabbar/home.svg new file mode 100644 index 0000000..82a0daf --- /dev/null +++ b/assets/images/tabbar/home.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/images/tabbar/home_active.png b/assets/images/tabbar/home_active.png new file mode 100644 index 0000000..305067f Binary files /dev/null and b/assets/images/tabbar/home_active.png differ diff --git a/assets/images/tabbar/home_active.svg b/assets/images/tabbar/home_active.svg new file mode 100644 index 0000000..8bd0ce8 --- /dev/null +++ b/assets/images/tabbar/home_active.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/images/tabbar/message.png b/assets/images/tabbar/message.png new file mode 100644 index 0000000..762a7b5 Binary files /dev/null and b/assets/images/tabbar/message.png differ diff --git a/assets/images/tabbar/message.svg b/assets/images/tabbar/message.svg new file mode 100644 index 0000000..4a6ff12 --- /dev/null +++ b/assets/images/tabbar/message.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/images/tabbar/message_active.png b/assets/images/tabbar/message_active.png new file mode 100644 index 0000000..a663a0a Binary files /dev/null and b/assets/images/tabbar/message_active.png differ diff --git a/assets/images/tabbar/message_active.svg b/assets/images/tabbar/message_active.svg new file mode 100644 index 0000000..0007af9 --- /dev/null +++ b/assets/images/tabbar/message_active.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/images/tabbar/order.png b/assets/images/tabbar/order.png new file mode 100644 index 0000000..7832ba7 Binary files /dev/null and b/assets/images/tabbar/order.png differ diff --git a/assets/images/tabbar/order.svg b/assets/images/tabbar/order.svg new file mode 100644 index 0000000..0803e60 --- /dev/null +++ b/assets/images/tabbar/order.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/images/tabbar/order_active.png b/assets/images/tabbar/order_active.png new file mode 100644 index 0000000..9332eb7 Binary files /dev/null and b/assets/images/tabbar/order_active.png differ diff --git a/assets/images/tabbar/order_active.svg b/assets/images/tabbar/order_active.svg new file mode 100644 index 0000000..787cb78 --- /dev/null +++ b/assets/images/tabbar/order_active.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/images/tabbar/unit.png b/assets/images/tabbar/unit.png new file mode 100644 index 0000000..3173f09 Binary files /dev/null and b/assets/images/tabbar/unit.png differ diff --git a/assets/images/tabbar/unit.svg b/assets/images/tabbar/unit.svg new file mode 100644 index 0000000..e4777aa --- /dev/null +++ b/assets/images/tabbar/unit.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/images/tabbar/unit_active.png b/assets/images/tabbar/unit_active.png new file mode 100644 index 0000000..3dc9a4e Binary files /dev/null and b/assets/images/tabbar/unit_active.png differ diff --git a/assets/images/tabbar/unit_active.svg b/assets/images/tabbar/unit_active.svg new file mode 100644 index 0000000..61876ab --- /dev/null +++ b/assets/images/tabbar/unit_active.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/images/tabbar/user.png b/assets/images/tabbar/user.png new file mode 100644 index 0000000..962a867 Binary files /dev/null and b/assets/images/tabbar/user.png differ diff --git a/assets/images/tabbar/user.svg b/assets/images/tabbar/user.svg new file mode 100644 index 0000000..df75977 --- /dev/null +++ b/assets/images/tabbar/user.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/images/tabbar/user_active.png b/assets/images/tabbar/user_active.png new file mode 100644 index 0000000..0e9566a Binary files /dev/null and b/assets/images/tabbar/user_active.png differ diff --git a/assets/images/tabbar/user_active.svg b/assets/images/tabbar/user_active.svg new file mode 100644 index 0000000..75b7f44 --- /dev/null +++ b/assets/images/tabbar/user_active.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js index 3466bde..12c1368 100644 --- a/custom-tab-bar/index.js +++ b/custom-tab-bar/index.js @@ -4,41 +4,41 @@ Component({ isShow: false, toTop: false, selected: 0, - color: "#444", + color: "#666", selectedColor: "#1890ff", list: [ { - iconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/IOS/home.png", - selectedIconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/IOS/home1.png", + iconPath: "../assets/images/tabbar/home_active.svg", + selectedIconPath: "../assets/images/tabbar/home.svg", pagePath: "/pages/firstBill/index", text: "首页", index: 0, }, { - iconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/IOS/ksbm.svg", - selectedIconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/IOS/ksbm.svg", + iconPath: "../assets/images/tabbar/unit_active.svg", + selectedIconPath: "../assets/images/tabbar/unit.svg", pagePath: "/pages/workBench/index", text: "工具", index: 1, }, { - "iconPath": "../assets/images/xx.png", - "selectedIconPath": "../assets/images/xx1_lao.png", + "iconPath": "../assets/images/tabbar/message_active.svg", + "selectedIconPath": "../assets/images/tabbar/message.svg", "pagePath": "/pages/message/index", "text": "消息", - index: 3, + index: 2, }, { - "iconPath": "../assets/images/apply.png", - "selectedIconPath": "../assets/images/apply1.png", + "iconPath": "../assets/images/tabbar/order_active.svg", + "selectedIconPath": "../assets/images/tabbar/order.svg", "pagePath": "/pages/myBill/index", "text": "工单", - index: 2, + index: 3, }, { - iconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/IOS/wd.png", - selectedIconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/IOS/wd1.png", + iconPath: "../assets/images/tabbar/user_active.svg", + selectedIconPath: "../assets/images/tabbar/user.svg", pagePath: "/pages/mine/index", text: "我的", index: 4, @@ -60,6 +60,7 @@ Component({ }, methods: { switchTab (e) { + console.log('e',e) const data = e.currentTarget.dataset; const url = data.path; wx.vibrateShort({ diff --git a/pages/mine/index.js b/pages/mine/index.js index 01099a2..364e447 100644 --- a/pages/mine/index.js +++ b/pages/mine/index.js @@ -90,7 +90,7 @@ Page({ if (typeof this.getTabBar === "function" && this.getTabBar()) { this.getTabBar().setData({ - selected: 3, + selected: 4, isShow: true }); } diff --git a/pages/myBill/index.js b/pages/myBill/index.js index 3e4c71c..d099e29 100644 --- a/pages/myBill/index.js +++ b/pages/myBill/index.js @@ -130,7 +130,7 @@ Page({ if (typeof this.getTabBar === "function" && this.getTabBar()) { this.getTabBar().setData({ isShow: true, - selected: 1, + selected: 3, }); } if (wx.getStorageSync('MYBILL_PAGE_CHANGE') || that.data.inputVal != "搜索姓名/手机号") { diff --git a/pages/workBench/index.js b/pages/workBench/index.js index 6e53dad..0cfced8 100644 --- a/pages/workBench/index.js +++ b/pages/workBench/index.js @@ -27,6 +27,12 @@ Page({ onLoad () { console.log(this.setData); this.wxLogin(); + if (typeof this.getTabBar === "function" && this.getTabBar()) { + this.getTabBar().setData({ + isShow: true, + selected: 1, + }); + } }, onUnload () { wx.removeStorage({ diff --git a/pages/workBench/index.wxml b/pages/workBench/index.wxml index 42f8e02..5c2821b 100644 --- a/pages/workBench/index.wxml +++ b/pages/workBench/index.wxml @@ -1,4 +1,4 @@ - + 工作台