From f852424c204bd8dbc6cf2cd3fd92e76af10305c6 Mon Sep 17 00:00:00 2001 From: JyuHsin <729757837@qq.com> Date: Fri, 13 Jun 2025 09:20:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TheRapyRecuperationEnrollServiceImpl.java | 4 +- .../therapyRecuperation/baseManagement.html | 37 ++-- .../mobile/therapyRecuperation/index.html | 44 ++-- .../mobile/therapyRecuperation/lineInfo.html | 197 +++++++----------- .../therapyRecuperation/myRecuperation.html | 8 + 5 files changed, 117 insertions(+), 173 deletions(-) diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/impl/TheRapyRecuperationEnrollServiceImpl.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/impl/TheRapyRecuperationEnrollServiceImpl.java index e1a9fc1..e9ca965 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/impl/TheRapyRecuperationEnrollServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/impl/TheRapyRecuperationEnrollServiceImpl.java @@ -228,7 +228,7 @@ public class TheRapyRecuperationEnrollServiceImpl extends ViServiceImpl 0) { + if(lineUnionSelect.getMaxGroupSize() != null && lineUnionSelect.getMaxGroupSize() > 0) { Map validSignCountMap = validSignCount(enrollInfo, config, lineUnionSelect.getMaxGroupSize(), StrUtil.isBlank(enrollInfo.getId()) ? "add" : "edit"); if (validSignCountMap.containsKey(false)) { return validSignCountMap; diff --git a/src/main/resources/views/mobile/therapyRecuperation/baseManagement.html b/src/main/resources/views/mobile/therapyRecuperation/baseManagement.html index 316ea1a..8fb128a 100644 --- a/src/main/resources/views/mobile/therapyRecuperation/baseManagement.html +++ b/src/main/resources/views/mobile/therapyRecuperation/baseManagement.html @@ -293,9 +293,10 @@ layout("/mobile/platform.html"){ 上下滑动翻页，单击查看，再单击返回 -
-
- +
+
+
+
@@ -313,6 +314,8 @@ layout("/mobile/platform.html"){ {{ enrollId ? '修改报名' : '我要报名' }} + 报名未开始 + 报名结束 @@ -915,19 +918,22 @@ layout("/mobile/platform.html"){ } }, readPDFPicture(pdf) { - const that = this if(pdf != null) { pdf.on("complete", function () { - const imgDoc = document.querySelectorAll('img') - let array = [] + const elements = document.querySelectorAll('[class*="canvasImg"]') let classArray = [] - imgDoc.forEach(o => { - if(o.getAttribute('class') !== 'top_icon') { - classArray.push(o.getAttribute('class')) - array.push(o.getAttribute('src')) - } + elements.forEach(element => { + classArray.push(element.getAttribute('src')) }) - document.addEventListener('click', (event) => that.handleClick(event, classArray, array)) + elements.forEach((element,index) => { + element.addEventListener('click', function() { + vant.ImagePreview({ + images: classArray, + startPosition: index, + closeable: true, + }) + }); + }); }) } }, @@ -956,19 +962,12 @@ layout("/mobile/platform.html"){ }) }catch (e) { this.isPdf = true - //document.addEventListener('click', (event) => this.handleClick(event)) } this.$nextTick(() => { this.readPDFPicture(pdfh5) }) }, - mounted() { - //window.addEventListener('scroll', this.scrollToTop) - }, - destroyed() { - - }, }) diff --git a/src/main/resources/views/mobile/therapyRecuperation/index.html b/src/main/resources/views/mobile/therapyRecuperation/index.html index 80fd31a..d596a6a 100644 --- a/src/main/resources/views/mobile/therapyRecuperation/index.html +++ b/src/main/resources/views/mobile/therapyRecuperation/index.html @@ -36,6 +36,10 @@ layout("/mobile/platform.html"){ overflow-y: auto; } + .pdfjs .backTop { + bottom: 30px; + } +
@@ -123,40 +127,22 @@ layout("/mobile/platform.html"){ }) }catch (e) { this.isPdf = true - document.addEventListener('click', function (event) { - // 打印被点击的元素标签名和 class - if (event.target.tagName === 'IMG' && !['van-image__img', 'top_icon'].includes(event.target.className)) { - vant.ImagePreview({ - images: [event.target.src], - closeable: true, - }) - } - }) } - this.$nextTick(() => { pdfh5.on("complete", function () { - const imgDoc = document.querySelectorAll('img') - let array = [] + const elements = document.querySelectorAll('[class*="canvasImg"]') let classArray = [] - imgDoc.forEach(o => { - if(!['van-image__img', 'top_icon'].includes(o.getAttribute('class'))) { - classArray.push(o.getAttribute('class')) - array.push(o.getAttribute('src')) - } + elements.forEach(element => { + classArray.push(element.getAttribute('src')) }) - document.addEventListener('click', function (event) { - // 打印被点击的元素标签名和 class - if (event.target.tagName === 'IMG' && !['van-image__img', 'top_icon'].includes(event.target.className)) { - const index = classArray.indexOf(event.target.className) - if(index !== -1) { - vant.ImagePreview({ - images: array, - startPosition: index, - closeable: true, - }) - } - } + elements.forEach((element,index) => { + element.addEventListener('click', function() { + vant.ImagePreview({ + images: classArray, + startPosition: index, + closeable: true, + }) + }) }) }) }) diff --git a/src/main/resources/views/mobile/therapyRecuperation/lineInfo.html b/src/main/resources/views/mobile/therapyRecuperation/lineInfo.html index dbc6c5c..37488ba 100644 --- a/src/main/resources/views/mobile/therapyRecuperation/lineInfo.html +++ b/src/main/resources/views/mobile/therapyRecuperation/lineInfo.html @@ -6,7 +6,6 @@ layout("/mobile/platform.html"){ #app { font-family: 微软雅黑,serif; } - .container img { background-size: contain; width: 100%; @@ -14,50 +13,43 @@ layout("/mobile/platform.html"){ margin: 5px auto; display: block; } - .header { padding: 10px 20px 0; } - .content { line-height: 26px; - padding: 0px 10px 56px 10px; + padding: 0 10px 56px 10px; } - .pdf_div { - padding-bottom: 70px; - height: calc(100vh - 46px - 60px - 151px - 160px); + height: calc(100vh - 350px); + position: relative; + } + .pdfjs { overflow-y: auto; } - /*.backTop { - display: none !important; - }*/ - + .pdfjs .backTop { + bottom: 30px; + } .title { font-weight: bold; font-size: 19px; color: #505050; margin-bottom: 10px; } - .van-divider { border-color: grey; margin: 0; } - .van-skeleton { padding: 20px; } - .van-skeleton__content { height: 600px; padding-top: 60px; } - .van-skeleton__row, .van-skeleton__title { height: 30px; } - .footer { background-color: white; position: fixed; @@ -69,39 +61,32 @@ layout("/mobile/platform.html"){ align-items: center; left: 0; } - .footer .van-button { height: 34px; border-radius: 6px; width: 90% !important; } - .family_join { background-color: #ff976a; color: white; } - .join { background-color: #0e78c5; color: white; } - .joinPopup { width: 100%; height: 100%; background-color: #f6f7f9; } - .join_content { padding: 20px; height: calc(100% - 26px - 60px); overflow-y: auto; } - .join_submit { width: 90% !important; } - .van-doc-card { background-color: #fff; border-radius: 6px; @@ -109,7 +94,6 @@ layout("/mobile/platform.html"){ line-height: 20px; position: relative; } - .van-card-header { padding: 14px 20px; border-bottom: 1px solid #ebeef5; @@ -117,11 +101,9 @@ layout("/mobile/platform.html"){ color: #0e78c5; font-weight: bold; } - .van-card-body { - padding: 0px 10px 0px 10px + padding: 0 10px 0 10px } - .van-doc-card > div:first-child { border: 2px #0e78c5 solid; width: 26px; @@ -130,56 +112,44 @@ layout("/mobile/platform.html"){ top: 0; left: 20px; } - .van-cell { padding: 8px 5px; } - .van-tabs__wrap { margin: 6px; } - .van-tabs__nav--card { border: none; } - .van-tabs__nav--card .van-tab.van-tab--active { border-radius: 6px; } - .van-tabs__nav--card .van-tab { border-right: 0 !important; } - .top_icon { position: fixed; bottom: 80px; right: 20px; } - .van-field__control { text-overflow: ellipsis; } - .list-card { width: auto; } - .companionList_empty_text { text-align: center; - padding: 10px 0px; + padding: 10px 0; font-size: 14px; color: grey; } - .header div span { color: grey; } - .header :last-child { font-size: 14px; } - .van-empty { position: relative; transform: none; @@ -188,7 +158,6 @@ layout("/mobile/platform.html"){ background-color: transparent; height: calc(100vh - 46px - 153px - 60px); } - .submitButton { background-color: white !important; width: 100%; @@ -198,25 +167,17 @@ layout("/mobile/platform.html"){ align-items: center;*/ text-align: center; } - .submitButton .van-button { height: 34px; border-radius: 6px; width: 90% !important; } - .van-image-preview img { background-color: white; } - .van-tag { color: white !important; } - - .viewerContainer { - overflow: unset !important; - } - .sign_div { background-color: white; margin-bottom: 16px; @@ -251,67 +212,61 @@ layout("/mobile/platform.html"){