diff --git a/components/customTabbar.vue b/components/customTabbar.vue index 8a8672c..ba461c5 100644 --- a/components/customTabbar.vue +++ b/components/customTabbar.vue @@ -98,22 +98,31 @@ export default { text: "首页", iconSize: 48, }, - { - iconPath: "icon-fadanhao-31 g_c_9", - selectedIconPath: "icon-fadanhao-31 g_c_main", - pagePath: "/pages/home/order", - text: "发单号", - iconSize: 48, - }, + // { + // iconPath: "icon-fadanhao-31 g_c_9", + // selectedIconPath: "icon-fadanhao-31 g_c_main", + // pagePath: "/pages/home/order", + // text: "发单号", + // iconSize: 48, + // }, { iconPath: "icon-message g_c_9", selectedIconPath: "icon-message g_c_main", pagePath: "/pages/message/index", text: "消息", - iconSize: 78, + iconSize: 48, iconType: "custom", count: 0, }, + // 图标大小需要到u-icon中修改 + { + iconPath: "icon-kuaisubaoming g_c_main", + selectedIconPath: "icon-kuaisubaoming g_c_main", + pagePath: "/pages/addJob/index", + iconSize: 78, + iconType: "custom", + iconPadding: "2px", + }, { iconPath: "icon-order_active g_c_9", selectedIconPath: "icon-order_active g_c_main", @@ -141,6 +150,12 @@ export default { let that = this; console.log(index); this.isShow = false; + if (index === 2) { + uni.navigateTo({ + url: "/root/home/quickApplication", + }); + return false; + } return true; }, uploadPage() { diff --git a/pages/home/index.vue b/pages/home/index.vue index 172d2a5..66757e7 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -107,9 +107,9 @@ -
+ diff --git a/pages/person/index.vue b/pages/person/index.vue index d57e363..285c4cc 100644 --- a/pages/person/index.vue +++ b/pages/person/index.vue @@ -54,7 +54,7 @@ - + 在招 {{ item.recruitmentJobNum ? item.recruitmentJobNum : "0" }} diff --git a/root/detail/userShare.vue b/root/detail/userShare.vue index d4d46da..94003dd 100644 --- a/root/detail/userShare.vue +++ b/root/detail/userShare.vue @@ -18,7 +18,7 @@ - + +
+
@@ -150,6 +153,12 @@ export default { onReady() { this.G.setNavStyle(); }, + mounted() { + let systemInfo = uni.getSystemInfoSync(); + let height = systemInfo.platform == "ios" ? 44 : 48; + + this.stickyHeight = systemInfo.statusBarHeight + height; + }, // onShareAppMessage(){ // return this.G.shareFun(); // }, @@ -157,6 +166,7 @@ export default { return { numSlot: [], showPage: false, + stickyHeight: 0, // sticky距离顶部高度 fromShare: false, btnLoading: false, background: { @@ -247,11 +257,11 @@ export default { }; }, onPageScroll(e) { - if (e.scrollTop > 120) { - this.navColor = `rgb(255,255,255,${e.scrollTop / 200})`; - } else { - this.navColor = `rgb(255,255,255,0)`; - } + // if (e.scrollTop > 120) { + // this.navColor = `rgb(255,255,255,${e.scrollTop / 200})`; + // } else { + // this.navColor = `rgb(255,255,255,0)`; + // } }, onLoad(options) { let that = this; @@ -336,6 +346,13 @@ export default { } }, methods: { + scroll(e) { + if (e.detail.scrollTop > 120) { + this.navColor = `rgb(255,255,255,${e.detail.scrollTop / 200})`; + } else { + this.navColor = `rgb(255,255,255,0)`; + } + }, // 触摸开始事件 onTouchStart(e) { if (this.isTouching) { @@ -433,6 +450,11 @@ export default { }); } }, + searchJob() { + this.query.list = []; + this.query.page = 1; + this.getDefault(); + }, /** * 获取登录人的团队信息 */ @@ -599,6 +621,7 @@ export default { pageNum: that.query.page, pageSize: that.query.size, agencyId: that.info.id, + keys: that.keyword, }; console.log("that.tabInfo.active", that.tabInfo.active); if (that.tabInfo.active == 1) { @@ -840,4 +863,10 @@ export default { .scroll-area { height: 100vh; } +.sticky { + position: sticky; + // top: 95px; + left: 0; + z-index: 100; +} diff --git a/static/css/base.scss b/static/css/base.scss index 932d35b..d51d4e8 100644 --- a/static/css/base.scss +++ b/static/css/base.scss @@ -528,6 +528,9 @@ $max-font-size: 28; font-size: 12px; zoom: 0.95; } +.g_fs_36 { + font-size: 36px; +} // 尺寸 $min-size: 0; $max-size: 200; diff --git a/static/css/iconfont.css b/static/css/iconfont.css index d6489c0..963c73f 100644 --- a/static/css/iconfont.css +++ b/static/css/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 4374774 */ - src: url('//at.alicdn.com/t/c/font_4374774_y7g55uwl0s.woff2?t=1756693701292') format('woff2'), - url('//at.alicdn.com/t/c/font_4374774_y7g55uwl0s.woff?t=1756693701292') format('woff'), - url('//at.alicdn.com/t/c/font_4374774_y7g55uwl0s.ttf?t=1756693701292') format('truetype'); + src: url('//at.alicdn.com/t/c/font_4374774_2935rh1xxue.woff2?t=1763019619317') format('woff2'), + url('//at.alicdn.com/t/c/font_4374774_2935rh1xxue.woff?t=1763019619317') format('woff'), + url('//at.alicdn.com/t/c/font_4374774_2935rh1xxue.ttf?t=1763019619317') format('truetype'); } .iconfont { @@ -13,6 +13,62 @@ -moz-osx-font-smoothing: grayscale; } +.icon-kuaisubaoming:before { + content: "\e67f"; +} + +.icon-filedone:before { + content: "\e7b4"; +} + +.icon-file-exception:before { + content: "\e7b5"; +} + +.icon-filesync:before { + content: "\e7b6"; +} + +.icon-filesearch:before { + content: "\e7b9"; +} + +.icon-fileprotect:before { + content: "\e7bb"; +} + +.icon-file-text:before { + content: "\e7bc"; +} + +.icon-audit:before { + content: "\e7bf"; +} + +.icon-antdesign:before { + content: "\e879"; +} + +.icon-shujudaping:before { + content: "\e616"; +} + +.icon-shujudaping1:before { + content: "\e644"; +} + +.icon-shujutongji:before { + content: "\e62f"; +} + +.icon-chengyuanjituanduiguanli:before { + content: "\e6c5"; +} + +.icon-wokanguodemingpian:before { + content: "\e6d2"; +} + .icon-detail:before { content: "\e793"; } diff --git a/uni_modules/vk-uview-ui/components/u-icon/u-icon.vue b/uni_modules/vk-uview-ui/components/u-icon/u-icon.vue index f79050d..820b618 100644 --- a/uni_modules/vk-uview-ui/components/u-icon/u-icon.vue +++ b/uni_modules/vk-uview-ui/components/u-icon/u-icon.vue @@ -66,6 +66,7 @@ export default { imgradius: { default: "0", }, + // 图标类型(后加) imgType: { default: "", }, @@ -291,9 +292,9 @@ export default { @import "../../iconfont.css"; @font-face { font-family: "iconfont"; /* Project id 4374774 */ - src: url('//at.alicdn.com/t/c/font_4374774_pm01bomgppe.woff2?t=1755661995542') format('woff2'), - url('//at.alicdn.com/t/c/font_4374774_pm01bomgppe.woff?t=1755661995542') format('woff'), - url('//at.alicdn.com/t/c/font_4374774_pm01bomgppe.ttf?t=1755661995542') format('truetype'); + src: url('//at.alicdn.com/t/c/font_4374774_2935rh1xxue.woff2?t=1763019619317') format('woff2'), + url('//at.alicdn.com/t/c/font_4374774_2935rh1xxue.woff?t=1763019619317') format('woff'), + url('//at.alicdn.com/t/c/font_4374774_2935rh1xxue.ttf?t=1763019619317') format('truetype'); } .iconfont { @@ -303,25 +304,9 @@ export default { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } -// 首页 -.icon-home:before { - content: "\e7e1"; -} -// 工单 -.icon-order_active:before { - content: "\e617"; -} -// 消息 -.icon-message:before { - content: "\e78a"; -} -// 我的 -.icon-user:before { - content: "\e7ae"; -} -// 发单号 -.icon-fadanhao-32:before { - content: "\e67d"; +.icon-kuaisubaoming:before { + font-size: 36px; + content: "\e67f"; } .u-icon { display: inline-flex; diff --git a/uni_modules/vk-uview-ui/components/u-skeleton/u-skeleton.vue b/uni_modules/vk-uview-ui/components/u-skeleton/u-skeleton.vue index c8cb19e..de89831 100644 --- a/uni_modules/vk-uview-ui/components/u-skeleton/u-skeleton.vue +++ b/uni_modules/vk-uview-ui/components/u-skeleton/u-skeleton.vue @@ -6,7 +6,7 @@ position: 'absolute', left: left + 'px', top: top + 'px', - zIndex: 9998, + zIndex: 99, overflow: 'hidden' }" @touchmove.stop.prevent>