diff --git a/app.json b/app.json index e8ca96b..e310b33 100644 --- a/app.json +++ b/app.json @@ -128,11 +128,23 @@ "selectedColor": "#1890ff", "list": [ { - "iconPath": "./assets/images/ysd.png", + "iconPath": "./assets/images/home.png", "selectedIconPath": "./assets/images/home1.png", "pagePath": "pages/firstBill/index", "text": "首页" }, + { + "iconPath": "./assets/images/xx.png", + "selectedIconPath": "./assets/images/xx1_lao.png", + "pagePath": "pages/myBill/index", + "text": "工单" + }, + { + "iconPath": "./assets/images/xx.png", + "selectedIconPath": "./assets/images/xx1_lao.png", + "pagePath": "pages/message/index", + "text": "消息" + }, { "iconPath": "./assets/images/wd.png", "selectedIconPath": "./assets/images/wd1.png", diff --git a/assets/images/apply.png b/assets/images/apply.png new file mode 100644 index 0000000..9cb5781 Binary files /dev/null and b/assets/images/apply.png differ diff --git a/assets/images/apply1.png b/assets/images/apply1.png new file mode 100644 index 0000000..2358b2b Binary files /dev/null and b/assets/images/apply1.png differ diff --git a/assets/images/xx.png b/assets/images/xx.png index 6434199..9e9f387 100644 Binary files a/assets/images/xx.png and b/assets/images/xx.png differ diff --git a/assets/images/xx1_lao.png b/assets/images/xx1_lao.png new file mode 100644 index 0000000..d42bcbd Binary files /dev/null and b/assets/images/xx1_lao.png differ diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js index 0bbb4d2..1093027 100644 --- a/custom-tab-bar/index.js +++ b/custom-tab-bar/index.js @@ -1,97 +1,114 @@ const app = getApp(); Component({ - data: { - isShow: false, - toTop: false, - selected: 0, - color: "#444", - 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", - 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", - pagePath: "/pages/newEnroll/enroll/index", - // text: "消息", - index: 1, - }, - { - 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", - pagePath: "/pages/mine/index", - text: "我的", - index: 2, - }, - ], - }, - lifetimes: { - show: function () { - // 页面被展示 - console.log("tabbar show"); - }, - attached: function () { - // 在组件实例进入页面节点树时执行 - console.log("tabbar attached"); - }, - detached: function () { - // 在组件实例被从页面节点树移除时执行 - }, - }, - methods: { - switchTab(e) { - const data = e.currentTarget.dataset; - const url = data.path; - wx.vibrateShort({ - type: "heavy", - success: function (e) { - console.log(e); - }, - }); + data: { + isShow: false, + toTop: false, + selected: 0, + color: "#444", + 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", + 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", + // pagePath: "/pages/newEnroll/enroll/index", + // text: "消息", + // index: 1, + // }, + { + "iconPath": "../assets/images/apply.png", + "selectedIconPath": "../assets/images/apply1.png", + "pagePath": "/pages/myBill/index", + "text": "工单", + index: 1, + }, + { + "iconPath": "../assets/images/xx.png", + "selectedIconPath": "../assets/images/xx1_lao.png", + "pagePath": "/pages/message/index", + "text": "消息", + index: 2, + }, + + + { + 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", + pagePath: "/pages/mine/index", + text: "我的", + index: 3, + }, + ], + }, + lifetimes: { + show: function () { + // 页面被展示 + console.log("tabbar show"); + }, + attached: function () { + // 在组件实例进入页面节点树时执行 + console.log("tabbar attached"); + }, + detached: function () { + // 在组件实例被从页面节点树移除时执行 + }, + }, + methods: { + switchTab (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){ + 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; - } - } else { - if (data.index == 1) { - if (app.globalData.loginUserInfo.agencyStatus != 1) { - wx.navigateTo({ - url: "/pages/tobeAgency/index", - }); - } else { - wx.navigateTo({ - url, - }); - // wx.redirectTo({}); - } - return; - } - } - // this.setData({ - // selected: data.index, - // }); - wx.switchTab({ url }); - }, - touchMove(){ + // if (!app.globalData.isLogin) { + // if (data.index == 1) { + // 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; + // } + // } + // this.setData({ + // selected: data.index, + // }); + wx.switchTab({ url }); + }, + touchMove () { return false } - }, + }, }); diff --git a/custom-tab-bar/index.wxml b/custom-tab-bar/index.wxml index 4e8d395..148a28f 100644 --- a/custom-tab-bar/index.wxml +++ b/custom-tab-bar/index.wxml @@ -1,12 +1,12 @@ - + + - + {{item.text}} diff --git a/pages/billDetail/enroll/index.wxss b/pages/billDetail/enroll/index.wxss index 660651e..48f5051 100644 --- a/pages/billDetail/enroll/index.wxss +++ b/pages/billDetail/enroll/index.wxss @@ -88,8 +88,8 @@ button[disabled]:not([type]) { } .topViewN { height: 66px; - background: #fff4f1; - border: 1px solid #ff8255; + background-color: #cee7ff; + border: 1px solid #1890ff; border-radius: 6px; display: flex; padding: 0 16px; diff --git a/pages/collect/index.wxss b/pages/collect/index.wxss index 3fe2161..8cc38f7 100644 --- a/pages/collect/index.wxss +++ b/pages/collect/index.wxss @@ -833,8 +833,8 @@ button.collect icon::before { .filterTag .specialTag > view { height: 24px; line-height: 24px; - background-color: #ffefe9; - border: 0.5px solid #ff8255; + background-color: #cee7ff; + border: 0.5px solid #1890ff; border-radius: 999px; margin-right: 8px; font-size: 12px; diff --git a/pages/collect/index1.wxss b/pages/collect/index1.wxss index 2421cc2..f21b7b0 100644 --- a/pages/collect/index1.wxss +++ b/pages/collect/index1.wxss @@ -833,8 +833,8 @@ button.collect icon::before { .filterTag .specialTag > view { height: 24px; line-height: 24px; - background-color: #ffefe9; - border: 0.5px solid #ff8255; + background-color: #cee7ff; + border: 0.5px solid #1890ff; border-radius: 999px; margin-right: 8px; font-size: 12px; diff --git a/pages/detail/index.js b/pages/detail/index.js index ee4acfa..f7860a2 100644 --- a/pages/detail/index.js +++ b/pages/detail/index.js @@ -1000,7 +1000,7 @@ Page({ that.data.jobDetail = result that.showSexAge(); - result.record["jobDesp1"] = `\n${result.record.jobName}\n\n一、薪资明细\n${result.record.salaryDetail}\n\n二、招聘要求\n${(that.data.showSexAgeText + result.record.workContent) || '-'}\n\n三、其他说明\n${ result.record.otherDesp}\n\n四、注意事项\n${result.record.notes}` + result.record["jobDesp1"] = `\n${result.record.jobName}\n\n一、薪资明细\n${result.record.salaryDetail}\n\n二、招聘要求\n${(that.data.showSexAgeText + '\n' + result.record.workContent) || '-'}\n\n三、其他说明\n${ result.record.otherDesp}\n\n四、注意事项\n${result.record.notes}` that.setData({ jobDetail: result, isMaskShow: !(result.record.recruitment == "1"), diff --git a/pages/detail/index.wxml b/pages/detail/index.wxml index 9b9ceef..4a502f7 100644 --- a/pages/detail/index.wxml +++ b/pages/detail/index.wxml @@ -434,7 +434,7 @@ - 加伯才客服微信 + 加客户经理微信 @@ -482,7 +482,7 @@ 申请加入伯才 - 请联系伯才客服 + 请联系客户经理 diff --git a/pages/filterPage/index.wxss b/pages/filterPage/index.wxss index a7df8ff..a172651 100644 --- a/pages/filterPage/index.wxss +++ b/pages/filterPage/index.wxss @@ -33,10 +33,10 @@ border: 1px solid transparent; } .sub .content > span.active { - background-color: #ffeee9; + background-color: #cee7ff; color: #1890ff; border-color: #1890ff; -} +}#cbe4fd .sub .content > span:not(:nth-child(3n)) { margin-right: 2%; } diff --git a/pages/firstBill/filtercss.wxss b/pages/firstBill/filtercss.wxss index 495b855..4717f8b 100644 --- a/pages/firstBill/filtercss.wxss +++ b/pages/firstBill/filtercss.wxss @@ -36,7 +36,7 @@ border: 1px solid transparent; } .sub .content > span.active { - background-color: #ffeee9; + background-color: #cee7ff; color: #1890ff; border-color: #1890ff; } diff --git a/pages/firstBill/index.js b/pages/firstBill/index.js index bf49524..d2030e1 100644 --- a/pages/firstBill/index.js +++ b/pages/firstBill/index.js @@ -1254,7 +1254,7 @@ Page({ that.getJobList(); that.getBannerList(); that.getchannelList(); - that.searchAnimate(); + // that.searchAnimate(); }, onReady () { @@ -4732,6 +4732,11 @@ Page({ onUnload () { console.log("destory"); }, + toEnroll () { + wx.navigateTo({ + url: "/pages/newEnroll/enroll/index", + }); + }, goList () { wx.navigateTo({ url: "/pages/filterPage/index", diff --git a/pages/firstBill/index.json b/pages/firstBill/index.json index f4ef5e1..5adde71 100644 --- a/pages/firstBill/index.json +++ b/pages/firstBill/index.json @@ -5,8 +5,7 @@ "bottom-drawer": "../../components/bottom-drawer/index", "job-sub": "../../components/job-sub/index" }, - "navigationStyle": "custom", - "navigationBarTitleText": "首页", + "navigationBarTitleText": "伯才供应链", "navigationBarBackgroundColor": "#1890ff", "navigationBarTextStyle": "white", "backgroundColor": "#f5f5f5" diff --git a/pages/firstBill/index.wxml b/pages/firstBill/index.wxml index 75d67d5..749629d 100644 --- a/pages/firstBill/index.wxml +++ b/pages/firstBill/index.wxml @@ -1,32 +1,12 @@ - + - - 搜索 - - - + --> + - + -