diff --git a/app.json b/app.json index 6667d8e..2ac1cbf 100644 --- a/app.json +++ b/app.json @@ -145,15 +145,15 @@ "text": "消息" }, { - "iconPath": "./assets/images/xx.png", - "selectedIconPath": "./assets/images/xx1_lao.png", + "iconPath": "./assets/images/tabbar/order.png", + "selectedIconPath": "./assets/images/tabbar/order_active.png", "pagePath": "pages/myBill/index", "text": "工单" }, { - "iconPath": "./assets/images/wd.png", - "selectedIconPath": "./assets/images/wd1.png", + "iconPath": "./assets/images/tabbar/user.png", + "selectedIconPath": "./assets/images/tabbar/user_active.png", "pagePath": "pages/mine/index", "text": "我的" } diff --git a/assets/images/tabbar/home.png b/assets/images/tabbar/home.png index de2ede7..2cb55c9 100644 Binary files a/assets/images/tabbar/home.png and b/assets/images/tabbar/home.png differ diff --git a/assets/images/tabbar/home_active.png b/assets/images/tabbar/home_active.png index 305067f..0123ac9 100644 Binary files a/assets/images/tabbar/home_active.png and b/assets/images/tabbar/home_active.png differ diff --git a/assets/images/tabbar/message.png b/assets/images/tabbar/message.png index 762a7b5..84553cb 100644 Binary files a/assets/images/tabbar/message.png and b/assets/images/tabbar/message.png differ diff --git a/assets/images/tabbar/order.png b/assets/images/tabbar/order.png index 7832ba7..ace33e6 100644 Binary files a/assets/images/tabbar/order.png and b/assets/images/tabbar/order.png differ diff --git a/assets/images/tabbar/order_active.png b/assets/images/tabbar/order_active.png index 9332eb7..a8343e1 100644 Binary files a/assets/images/tabbar/order_active.png and b/assets/images/tabbar/order_active.png differ diff --git a/assets/images/tabbar/page_camera.png b/assets/images/tabbar/page_camera.png deleted file mode 100644 index 17c4f50..0000000 Binary files a/assets/images/tabbar/page_camera.png and /dev/null differ diff --git a/assets/images/tabbar/page_order.png b/assets/images/tabbar/page_order.png deleted file mode 100644 index 62a6457..0000000 Binary files a/assets/images/tabbar/page_order.png and /dev/null differ diff --git a/assets/images/tabbar/unit.png b/assets/images/tabbar/unit.png index 3173f09..137b8b0 100644 Binary files a/assets/images/tabbar/unit.png and b/assets/images/tabbar/unit.png differ diff --git a/assets/images/tabbar/unit_active.png b/assets/images/tabbar/unit_active.png index 3dc9a4e..23af494 100644 Binary files a/assets/images/tabbar/unit_active.png and b/assets/images/tabbar/unit_active.png differ diff --git a/assets/images/tabbar/user.png b/assets/images/tabbar/user.png index 962a867..2102c5b 100644 Binary files a/assets/images/tabbar/user.png and b/assets/images/tabbar/user.png differ diff --git a/pages/detail/index.wxml b/pages/detail/index.wxml index 2ecedbe..ab52b62 100644 --- a/pages/detail/index.wxml +++ b/pages/detail/index.wxml @@ -17,13 +17,19 @@ --> - - - - 代理佣金 - + + + + 代理佣金 + - + {{fuWuFei || '--'}} *** diff --git a/pages/detail/index.wxss b/pages/detail/index.wxss index adf5947..834ce87 100644 --- a/pages/detail/index.wxss +++ b/pages/detail/index.wxss @@ -595,3 +595,7 @@ button.collectBtn { right: 5px; bottom: 182px; } + +.h67{ + height: 67px; +} diff --git a/pages/firstBill/index.js b/pages/firstBill/index.js index 06a47c7..088b69f 100644 --- a/pages/firstBill/index.js +++ b/pages/firstBill/index.js @@ -4618,8 +4618,7 @@ Page({ // }); } else if (event.detail.scrollTop <= 200 && this.getTabBar().data.toTop) { // console.log(!this.getTabBar().data.toTop); - this.getTabBar().data.list[0].selectedIconPath = - "../assets/images/tabbar/home_active.png"; + this.getTabBar().data.list[0].selectedIconPath = "../assets/images/tabbar/home.svg"; this.getTabBar().data.list[0].text = "首页"; this.getTabBar().setData({ toTop: false, diff --git a/pages/firstBill/index.wxml b/pages/firstBill/index.wxml index db7b4cc..96b390b 100644 --- a/pages/firstBill/index.wxml +++ b/pages/firstBill/index.wxml @@ -20,7 +20,7 @@ --> - + @@ -515,7 +515,7 @@ - {{'近48小时更新' + jobNum + '条信息'}} + {{'最近更新' + jobNum + '条信息'}}