diff --git a/assets/iconfont/iconfont.wxss b/assets/iconfont/iconfont.wxss
index cab1aed..36f8c08 100644
--- a/assets/iconfont/iconfont.wxss
+++ b/assets/iconfont/iconfont.wxss
@@ -1,8 +1,8 @@
@font-face {
- font-family: 'iconfont'; /* Project id 2708790 */
- src: url('//at.alicdn.com/t/c/font_2708790_qvphqofg7ek.woff2?t=1741660802324') format('woff2'),
- url('//at.alicdn.com/t/c/font_2708790_qvphqofg7ek.woff?t=1741660802324') format('woff'),
- url('//at.alicdn.com/t/c/font_2708790_qvphqofg7ek.ttf?t=1741660802324') format('truetype');
+ font-family: "iconfont"; /* Project id 2708790 */
+ src: url('//at.alicdn.com/t/c/font_2708790_7twwjw4z4wo.woff2?t=1743143857638') format('woff2'),
+ url('//at.alicdn.com/t/c/font_2708790_7twwjw4z4wo.woff?t=1743143857638') format('woff'),
+ url('//at.alicdn.com/t/c/font_2708790_7twwjw4z4wo.ttf?t=1743143857638') format('truetype');
}
.iconfont {
@@ -769,6 +769,18 @@
content: "\e859";
}
+.icon-chuangjianren-trans:before {
+ content: "\100c6";
+}
+
+.icon-guanliyuan-trans:before {
+ content: "\100c7";
+}
+
+.icon-chengyuan-trans:before {
+ content: "\100c8";
+}
+
.icon-biyan1:before {
content: "\e713";
}
@@ -1520,4 +1532,3 @@
.icon-xiayiye1:before {
content: "\e695";
}
-
diff --git a/assets/images/tabbar/home.png b/assets/images/tabbar/home.png
index 2cb55c9..5a189c1 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 0123ac9..e972cdb 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 84553cb..af16512 100644
Binary files a/assets/images/tabbar/message.png and b/assets/images/tabbar/message.png differ
diff --git a/assets/images/tabbar/message_active.png b/assets/images/tabbar/message_active.png
index a663a0a..5167bd6 100644
Binary files a/assets/images/tabbar/message_active.png and b/assets/images/tabbar/message_active.png differ
diff --git a/assets/images/tabbar/order.png b/assets/images/tabbar/order.png
index ace33e6..fa597d6 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 a8343e1..e954758 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/unit.png b/assets/images/tabbar/unit.png
index 137b8b0..5c3992f 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 23af494..8d472fe 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 2102c5b..59b77c4 100644
Binary files a/assets/images/tabbar/user.png and b/assets/images/tabbar/user.png differ
diff --git a/assets/images/tabbar/user_active.png b/assets/images/tabbar/user_active.png
index 0e9566a..67c0d7d 100644
Binary files a/assets/images/tabbar/user_active.png and b/assets/images/tabbar/user_active.png differ
diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js
index 8a7f3fb..baf6315 100644
--- a/custom-tab-bar/index.js
+++ b/custom-tab-bar/index.js
@@ -1,59 +1,104 @@
const app = getApp();
Component({
data: {
- isShow: false,
+ isShow: true,
toTop: false,
selected: 0,
- color: "#666",
- selectedColor: "#1890ff",
+ color: "#888",
+ selectedColor: "#3578f6",
+ appId: app.globalData.appId,
list: [
{
- iconPath: "../assets/images/tabbar/home_active.svg",
- selectedIconPath: "../assets/images/tabbar/home.svg",
- pagePath: "/pages/firstBill/index",
- text: "首页",
- index: 0,
+ "iconPath": "icon-home",
+ // "selectedIconPath": "/static/image/tabbar/home.svg",
+ "pagePath": "/pages/firstBill/index",
+ "text": "首页",
+ "index": 0
},
{
- "iconPath": "../assets/images/tabbar/order_active.svg",
- "selectedIconPath": "../assets/images/tabbar/order.svg",
- "pagePath": "/pages/myBill/index",
- "text": "工单",
- index: 1,
+ iconPath: "icon-order_active",
+ text: '工单',
+ "index": 3,
+ pagePath: "/pages/myBill/index",
},
+ // {
+
+ // "iconPath": "/static/image/tabbar/chat.svg",
+ // "selectedIconPath": "/static/image/tabbar/chat.svg",
+ // "pagePath": "/pages/ai/index",
+ // "text": "AI",
+ // "index": 2
+ // },
{
- "iconPath": "../assets/images/tabbar/message_active.svg",
- "selectedIconPath": "../assets/images/tabbar/message.svg",
+ "iconPath": "icon-message",
+ // "iconPath": "/static/image/tabbar/message_active.svg",
+ // "selectedIconPath": "/static/image/tabbar/message.svg",
"pagePath": "/pages/message/index",
"text": "消息",
- index: 2,
+ "index": 1
},
{
- iconPath: "../assets/images/tabbar/unit_active.svg",
- selectedIconPath: "../assets/images/tabbar/unit.svg",
- pagePath: "/pages/workBench/index",
- text: "工作台",
- index: 3,
+ "iconPath": "icon-appstore",
+ // "iconPath": "/static/image/tabbar/message_active.svg",
+ // "selectedIconPath": "/static/image/tabbar/message.svg",
+ "pagePath": "/pages/workBench/index",
+ "text": "工作台",
+ "index": 4
},
-
{
- iconPath: "../assets/images/tabbar/user_active.svg",
- selectedIconPath: "../assets/images/tabbar/user.svg",
- pagePath: "/pages/mine/index",
- text: "我的",
- index: 4,
- },
- ],
+ "iconPath": "icon-user",
+ // "iconPath": "/static/image/tabbar/user_active.svg",
+ // "selectedIconPath": "/static/image/tabbar/user.svg",
+ "pagePath": "/pages/mine/index",
+ "text": "我的",
+ "index": 2
+ }
+ ]
},
lifetimes: {
show: function () {
// 页面被展示
console.log("tabbar show");
+ console.log('this.data.appid', this.data.appId);
+ if (this.data.appId == 'wxb0c590fd696b79be') {
+ console.log('');
+ // this.data.list = [
+ // {
+ // "iconPath": "/static/image/nav_home_normal.png",
+ // "selectedIconPath": "/static/image/nav_home_selected_lao.png",
+ // "pagePath": "/pages/home/index",
+ // "text": "首页",
+ // "index": 0
+ // },
+ // // {
+ // // "iconPath": "/static/image/chat.png",
+ // // "selectedIconPath": "/static/image/chat.png",
+ // // "pagePath": "/pages/ai/index",
+ // // "text": "AI",
+ // // "index": 2
+ // // },
+ // {
+ // "iconPath": "/static/image/xx.png",
+ // "selectedIconPath": "/static/image/xx1_lao.png",
+ // "pagePath": "/pages/message/index",
+ // "text": "消息",
+ // "index":1
+ // },
+ // {
+ // "iconPath": "/static/image/nav_my_normal.png",
+ // "selectedIconPath": "/static/image/nav_my_selected_lao.png",
+ // "pagePath": "/pages/person/index",
+ // "text": "我的",
+ // "index": 2
+ // }
+ // ]
+ }
},
attached: function () {
// 在组件实例进入页面节点树时执行
console.log("tabbar attached");
+
},
detached: function () {
// 在组件实例被从页面节点树移除时执行
@@ -61,51 +106,30 @@ Component({
},
methods: {
switchTab (e) {
- console.log('e',e)
const data = e.currentTarget.dataset;
const url = data.path;
- wx.vibrateShort({
- type: "heavy",
- success: function (e) {
- console.log(e);
- },
- });
-
- if (data.index == 0 && this.data.selected == 0) {
- if (this.data.toTop) {
- app.globalData.toTop = 1;
-
- } else {
- app.globalData.refresh = 1
- }
- }
- // if (!app.globalData.isLogin) {
- // if (data.index == 1) {
- // wx.navigateTo({
- // url: "/pages/login/index",
- // });
- // return;
- // }
+ // if (!wx.getStorageSync("apply-userinfo")) {
+ // if (data.index == 2) {
+ // wx.navigateTo({
+ // url: "/pages/login/index",
+ // });
+ // return;
+ // }
// }
// else {
- // if (data.index == 1) {
- // if (app.globalData.loginUserInfo.agencyStatus != 1) {
- // wx.navigateTo({
- // url: "/pages/tobeAgency/index",
- // });
- // } else {
- // wx.navigateTo({
- // url,
- // });
- // // wx.redirectTo({});
- // }
- // return;
- // }
+ // if (data.index == 2) {
+ // wx.navigateTo({
+ // url: "/pages/message/child/chat",
+ // });
+ // return;
+ // }
// }
// this.setData({
- // selected: data.index,
- // });
+ // selected: data.index
+ // })
+ // this.data.selected = data.index
+ console.log('--', url)
wx.switchTab({ url });
},
touchMove () {
diff --git a/custom-tab-bar/index.wxml b/custom-tab-bar/index.wxml
index 54446ee..272d773 100644
--- a/custom-tab-bar/index.wxml
+++ b/custom-tab-bar/index.wxml
@@ -1,13 +1,16 @@
-
-
-
-
-
- {{item.text}}
-
+
+
+
+
+
+
+
+ {{item.text}}
+
diff --git a/custom-tab-bar/index.wxss b/custom-tab-bar/index.wxss
index aff331d..e56b23b 100644
--- a/custom-tab-bar/index.wxss
+++ b/custom-tab-bar/index.wxss
@@ -1,3 +1,42 @@
+@font-face {
+ font-family: "iconfont"; /* Project id 4374774 */
+ src: url('//at.alicdn.com/t/c/font_4374774_ou401o3p3r.woff2?t=1743137313813') format('woff2'),
+ url('//at.alicdn.com/t/c/font_4374774_ou401o3p3r.woff?t=1743137313813') format('woff'),
+ url('//at.alicdn.com/t/c/font_4374774_ou401o3p3r.ttf?t=1743137313813') format('truetype');
+}
+.iconfont {
+ font-family: "iconfont" !important;
+ font-size: 16px;
+ font-style: normal;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+.icon-order_active:before {
+ content: "\e617";
+}
+
+.icon-appstore:before {
+ content: "\e792";
+}
+
+.icon-gongdanguanli:before {
+ content: "\e909";
+}
+
+.icon-home:before {
+ content: "\e7e1";
+}
+
+.icon-message:before {
+ content: "\e78a";
+}
+.icon-shop:before {
+ content: "\e7e5";
+}
+
+.icon-user:before {
+ content: "\e7ae";
+}
.tab-bar {
position: fixed;
bottom: 0;
@@ -9,7 +48,10 @@
display: flex;
justify-content: space-between;
box-shadow: 4px 4px 10px rgba(0, 0, 0, 0.6);
- padding-bottom: env(safe-area-inset-bottom);
+ /* padding-bottom: env(safe-area-inset-bottom); */
+ padding-bottom: constant(safe-area-inset-bottom); /*兼容 IOS<11.2*/
+ padding-bottom: env(safe-area-inset-bottom); /*兼容 IOS>11.2*/
+ /* min-height: 72px; */
}
.tab-bar-border {
@@ -23,7 +65,7 @@
}
.tab-bar-item {
/* width: 60px; */
- flex: 1;
+ flex: 1;
height: 80px;
}
@@ -39,26 +81,13 @@
.tabImg {
width: 26px;
height: 26px;
+ font-size: 24px;
position: absolute;
- top: 7px;
-}
-
-.tab-bar-item:nth-child(2) .tabImg{
- width: 24px;
- height: 24px;
-}
-.tab-bar-item:nth-child(3) .tabImg{
- width: 28px;
- height: 28px;
+ top: 6px;
+ fill: red;
}
-.tab-bar-item:nth-child(6) .tabImg{
- width: 22px;
- height: 22px;
-}
-
-
.tabText {
- margin-top: 36px;
+ margin-top: 34px;
}
.tab-bar-item view {
font-size: 10px;
@@ -68,8 +97,8 @@
top: -15px;
width: 70px;
height: 70px;
- left: 50%;
- transform: translateX(-50%);
+ left: 50%;
+ transform: translateX(-50%);
padding-top: 10px;
border-radius: 50%;
box-sizing: border-box;
@@ -78,8 +107,11 @@
background-color: #fff;
}
.middle image {
- width: 80%;
- height: 80%;
+ width: 36px;
+ height: 36px;
+}
+.middle .tabImg {
+ top: 13px;
}
.biggerSize2 {
position: relative;
diff --git a/pages/message/index.js b/pages/message/index.js
index cbebb31..f3d7d27 100644
--- a/pages/message/index.js
+++ b/pages/message/index.js
@@ -119,7 +119,7 @@ Page({
if (typeof this.getTabBar === "function" && this.getTabBar()) {
this.getTabBar().setData({
isShow: true,
- selected: 2,
+ selected: 1,
});
}
setTimeout(() => {
diff --git a/pages/mine/index.js b/pages/mine/index.js
index d52aaee..8fd0158 100644
--- a/pages/mine/index.js
+++ b/pages/mine/index.js
@@ -179,7 +179,7 @@ Page({
if (typeof this.getTabBar === "function" && this.getTabBar()) {
this.getTabBar().setData({
- selected: 4,
+ selected: 2,
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/wodeBill/index.wxml b/pages/wodeBill/index.wxml
index 43637a8..3a80176 100644
--- a/pages/wodeBill/index.wxml
+++ b/pages/wodeBill/index.wxml
@@ -66,7 +66,7 @@
{{item.showTime}}
-
+
暂无更多数据
diff --git a/pages/wodeBillDetail/index.wxml b/pages/wodeBillDetail/index.wxml
index 10a9deb..1e0550b 100644
--- a/pages/wodeBillDetail/index.wxml
+++ b/pages/wodeBillDetail/index.wxml
@@ -106,7 +106,7 @@
{{item.statusStr || '-'}}
-
+
@@ -138,7 +138,7 @@
{{item.statusStr || '-'}}
-
+
diff --git a/pages/wodeBillDetail/index1.wxml b/pages/wodeBillDetail/index1.wxml
index 9277631..df06f1f 100644
--- a/pages/wodeBillDetail/index1.wxml
+++ b/pages/wodeBillDetail/index1.wxml
@@ -89,7 +89,7 @@
{{(item.salary || '-') + '元'}}
{{item.status == 10 ? '待确认' : '已确认'}}
-
+
暂无更多数据
@@ -114,7 +114,7 @@
{{(item.salary || '-') + '元'}}
{{item.status == 10 ? '待确认' : '已确认'}}
-
+
diff --git a/pages/workBench/index.js b/pages/workBench/index.js
index c4ba5e8..cdc42c9 100644
--- a/pages/workBench/index.js
+++ b/pages/workBench/index.js
@@ -34,7 +34,7 @@ Page({
if (typeof this.getTabBar === "function" && this.getTabBar()) {
this.getTabBar().setData({
isShow: true,
- selected: 3,
+ selected: 4,
});
}