From f966fd7fbc8e40bc24477d4619581e319db4f863 Mon Sep 17 00:00:00 2001 From: jscyl13849007907 <13849007907@163.com> Date: Wed, 22 Jan 2025 10:09:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 4 ++- src/components/FirstJob/detail.vue | 37 +++++++++++----------- src/components/FirstJob/joblist.vue | 2 +- src/components/FirstJob/recordBill.vue | 17 +++++----- src/components/main/index.vue | 2 +- .../userinfo/usercenter/components/mybill.vue | 34 ++++++++++---------- src/views/main.vue | 6 ++-- src/views/merchantBack.vue | 2 +- src/views/userinfo.vue | 2 +- 9 files changed, 56 insertions(+), 50 deletions(-) diff --git a/src/App.vue b/src/App.vue index 635766a..26099b5 100644 --- a/src/App.vue +++ b/src/App.vue @@ -68,5 +68,7 @@ body { overflow: revert !important; background-color: #f0f0f0 !important; } - +.ant-select-dropdown-menu{ + max-height: 338px !important; +} diff --git a/src/components/FirstJob/detail.vue b/src/components/FirstJob/detail.vue index 61d683b..8c2565f 100644 --- a/src/components/FirstJob/detail.vue +++ b/src/components/FirstJob/detail.vue @@ -21,7 +21,7 @@
-
代理佣金
+
代理佣金
@@ -86,7 +86,7 @@
-   |   +   |  
{{ jobDetail.minMonthlyPay / 100 }}-{{ jobDetail.maxMonthlyPay / 100 }}
-
+
代理佣金
@@ -1326,7 +1326,7 @@ export default { } .jobinfo { margin-top: 12px; - font-size: 16px; + font-size: 14px; font-weight: 400; text-align: left; color: #999; @@ -1362,7 +1362,7 @@ export default { } .jobpricemonth { // margin-top: 16px; - font-size: 16px; + font-size: 14px; font-weight: 400; text-align: left; color: #666; @@ -1371,7 +1371,7 @@ export default { } .jobpricehour { // margin-top: 16px; - font-size: 16px; + font-size: 14px; font-weight: normal; text-align: left; color: #ff4400; @@ -1435,13 +1435,13 @@ export default { } } .sub-bottombox { - font-size: 16px; + font-size: 14px; .bottombox1 { width: 116px; height: 32px; line-height: 30px; - font-size: 16px; + font-size: 14px; // border: 1px solid rgba(77, 87, 94, 0.3); border-radius: 4px; border: 1px solid #1890ff; @@ -1504,7 +1504,7 @@ export default { line-height: 30px; div { // font-weight: normal; - font-size: 16px; + font-size: 14px; span:first-of-type { font-size: 20px; @@ -1526,7 +1526,7 @@ export default { color: #ff4400; font-size: 18px; span:last-child { - font-size: 16px; + font-size: 14px; } } } @@ -1567,6 +1567,7 @@ export default { span { margin-bottom: -1px; height: 30px; + line-height: 27px; padding: 1px 12px 0 12px; margin-right: 6px; background-color: #fafafa; @@ -1574,7 +1575,7 @@ export default { border-bottom: none; cursor: pointer; border-radius: 4px 4px 0 0; - font-size: 16px; + font-size: 14px; color: #333; } .active { @@ -1593,7 +1594,7 @@ export default { div:last-child { width: 640px; padding: 12px 16px; - font-size: 16px; + font-size: 14px; border: 1px solid #ededed; color: #333; } @@ -1676,7 +1677,7 @@ export default { width: 600px; > div { > div:first-child { - font-size: 16px; + font-size: 14px; color: #333; font-weight: 600; } @@ -1687,7 +1688,7 @@ export default { display: flex; width: 640px; flex-direction: column; - font-size: 16px; + font-size: 14px; border-radius: 6px; border: 1px solid #ededed; > li { @@ -1817,7 +1818,7 @@ export default { } } p:last-of-type { - font-size: 16px; + font-size: 14px; text-align: left; color: #788085; line-height: 22px; @@ -1871,7 +1872,7 @@ export default { font-weight: normal; background-color: #fff; padding: 8px 0; - font-size: 16px; + font-size: 14px; color: #666; letter-spacing: 1px; // padding: 8px 0px; @@ -1882,7 +1883,7 @@ export default { white-space: break-spaces; text-align: left; // padding-left: 8px; - font-size: 16px; + font-size: 14px; color: #333; } .boubleLevel > .ant-descriptions-view > table > tbody > .ant-descriptions-row:last-child > .ant-descriptions-item-content { @@ -1917,7 +1918,7 @@ export default { font-size: 40px; } > p { - font-size: 16px; + font-size: 14px; text-align: center; color: #1890ff; } diff --git a/src/components/FirstJob/joblist.vue b/src/components/FirstJob/joblist.vue index aeb429a..4d45778 100644 --- a/src/components/FirstJob/joblist.vue +++ b/src/components/FirstJob/joblist.vue @@ -822,7 +822,7 @@ - ｜Copyright © 2015-2023 Bocai. All Rights Reserved.｜ + ｜Copyright © 2015-2025 Bocai. All Rights Reserved.｜ 豫ICP备2023001993号-25A
diff --git a/src/components/FirstJob/recordBill.vue b/src/components/FirstJob/recordBill.vue index fbc34de..60c66a7 100644 --- a/src/components/FirstJob/recordBill.vue +++ b/src/components/FirstJob/recordBill.vue @@ -24,8 +24,8 @@
- - + +
{{ storeName || "-" }} @@ -100,7 +100,7 @@ - + @@ -172,7 +172,7 @@ - + @@ -183,7 +183,7 @@ {{ apply.id }} --> - +
{{ form.policy }}
  • - 待审核 - {{ billNumber.num10 }} + 待审核{{ billNumber.num10 }} +
  • - 待接待 - {{ billNumber.num20 }} + 待接待{{ billNumber.num20 }} +
  • - 待面试 - {{ billNumber.num25 }} + 待面试{{ billNumber.num25 }} +
  • - 待入职 - {{ billNumber.num30 }} + 待入职{{ billNumber.num30 }} +
  • - 在职中 - {{ billNumber.num40 }} + 在职中{{ billNumber.num40 }} +
  • - 已完成 - {{ billNumber.num999 }} + 已完成{{ billNumber.num999 }} +
    • - ｜Copyright © 2015-2023 Bocai. All Rights Reserved.｜ + ｜Copyright © 2015-2025 Bocai. All Rights Reserved.｜ 豫ICP备2023001993号-25A
    @@ -639,6 +639,8 @@ export default { that.pagrTitle = 'boundtel' }else if(that.$route.name == 'recordbill'){ that.pagrTitle = 'recordbill' + }else if(that.$route.name == 'login'){ + that.pagrTitle = 'login' }else{ that.pagrTitle = '' } diff --git a/src/views/merchantBack.vue b/src/views/merchantBack.vue index eac314a..4c59257 100644 --- a/src/views/merchantBack.vue +++ b/src/views/merchantBack.vue @@ -98,7 +98,7 @@ Powered by ｜Copyright © 2015-2023 Bocai. All Rights Reserved.｜ + ｜Copyright © 2015-2025 Bocai. All Rights Reserved.｜ 豫ICP备2023001993号 diff --git a/src/views/userinfo.vue b/src/views/userinfo.vue index 2dc42eb..0965132 100644 --- a/src/views/userinfo.vue +++ b/src/views/userinfo.vue @@ -149,7 +149,7 @@ Powered by ｜Copyright © 2015-2023 Bocai. All Rights Reserved.｜ + ｜Copyright © 2015-2025 Bocai. All Rights Reserved.｜ 豫ICP备2023001993号
    From eb740db87c90b4e6d1060f862c5408fa482bd981 Mon Sep 17 00:00:00 2001 From: jscyl13849007907 <13849007907@163.com> Date: Wed, 22 Jan 2025 10:20:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/FirstJob/joblist.vue | 79 ++++++++++++++++++++++++++----------- 1 file changed, 55 insertions(+), 24 deletions(-) diff --git a/src/components/FirstJob/joblist.vue b/src/components/FirstJob/joblist.vue index 4d45778..f738406 100644 --- a/src/components/FirstJob/joblist.vue +++ b/src/components/FirstJob/joblist.vue @@ -884,6 +884,7 @@
    = scrollHeight - 100 && !this.isFetching && !this.isStop) { // 100 是一个阈值，可以根据需要调整 - this.isFetching = true; - setTimeout(() => { - this.speed = 1; - this.loadMoreData(); - }, 300); - } - }, - loadMoreData() { - this.formvalue.pageNum += 1; // 增加页码 - if (this.signType != 0) { - this.getJobList({isScroll:1}).then(() => { - this.isFetching = false; - }); - } else { - this.getJobList({isScroll:1}).then(() => { - this.isFetching = false; - }); - } - }, + const scrollTop = document.documentElement.scrollTop || document.body.scrollTop; + const windowHeight = document.documentElement.clientHeight; + const scrollHeight = document.documentElement.scrollHeight; + + const threshold = windowHeight * 0.4; + + if (scrollTop + windowHeight >= scrollHeight - 100 && !this.isFetching && !this.isStop) { // 100 是一个阈值，可以根据需要调整 + this.isFetching = true; + setTimeout(() => { + this.speed = 1; + this.loadMoreData(); + }, 300); + } + if (scrollTop >= threshold) { + this.$refs.backToTop.style.opacity = 1; + this.$refs.backToTop.style.pointerEvents = 'auto'; + } else { + this.$refs.backToTop.style.opacity = 0; + this.$refs.backToTop.style.pointerEvents = 'none'; + } + }, + loadMoreData() { + this.formvalue.pageNum += 1; // 增加页码 + if (this.signType != 0) { + this.getJobList({isScroll:1}).then(() => { + this.isFetching = false; + }); + } else { + this.getJobList({isScroll:1}).then(() => { + this.isFetching = false; + }); + } + }, removePageInfo() { sessionStorage.removeItem("PAGE_TYPE"); }, @@ -3760,4 +3770,25 @@ p { .stoggle{ transform: rotate(90deg); } + .top-obj { + width: 40px; + height: 40px; + background-color: #fff; + border-radius: 50%; + position: fixed; + bottom: 100px; + right: calc(50vw - 470px); + cursor: pointer; + transition: opacity 0.3s ease; + opacity: 0; + pointer-events: none; + } + + .top-obj:hover { + background-color: #1890ffdd; + } + + .top-obj:active { + background-color: #1890ffdd; + }