From cb5d3647320c83af6479f1d987edcaae7f6ef27c Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Fri, 21 Jun 2024 11:45:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8C=89=E9=92=AE=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InitiateAfterSalesService.vue | 34 +++++++++++++--- .../ParticularsOfCompletion.vue | 38 ++++++++++++++---- .../ParticularsOfCompletionBySales.vue | 34 +++++++++++++--- .../afterSalesDetails/afterSalesDetails.vue | 35 +++++++++++------ .../pages/checkAndAccept/checkAndAccept.vue | 39 +++++++++++++++---- pagesHome/pages/siginIn/siginIn.vue | 32 +++++++++++++-- .../pages/changePassword/changePassword.vue | 2 +- 7 files changed, 174 insertions(+), 40 deletions(-) diff --git a/pagesHome/pages/InitiateAfterSalesService/InitiateAfterSalesService.vue b/pagesHome/pages/InitiateAfterSalesService/InitiateAfterSalesService.vue index ba17af9..47eba3e 100644 --- a/pagesHome/pages/InitiateAfterSalesService/InitiateAfterSalesService.vue +++ b/pagesHome/pages/InitiateAfterSalesService/InitiateAfterSalesService.vue @@ -110,7 +110,7 @@ - + 确 认 @@ -268,7 +268,7 @@ // basicContainer.value.startPullDownRefresh() const _height = await utils.getViewDistanceFormTop('.scvmabx') - details.scrollheight = Number(_height.replace('px', '')) - 50 + 'px' + details.scrollheight = Number(_height.replace('px', '')) - 100 + 'px' }) const scandata = () => { } @@ -560,10 +560,14 @@ // 底部 .footer { - height: 50px; + box-sizing: border-box; + height: 100px; + padding-top: 30upx; + display: flex; + justify-content: space-between; .button { - height: 70%; + height: 80upx; display: flex; align-items: center; justify-content: center; @@ -573,11 +577,31 @@ border-radius: 80upx; margin: 0 10upx; padding: 0 10upx; - font-size: 0.75rem; + font-size: 0.9rem; + font-weight: bold; &.subColor { + // border-color: var(--subjectColor); + // color: var(--subjectColor); background-color: var(--subjectColor); color: #fff; + border: none; + } + + &.primaryColor { + // border-color: var(--primaryColor); + // color: var(--primaryColor); + background-color: var(--primaryColor); + color: #fff; + border: none; + } + + &.errColor { + // border-color: var(--errColor); + // color: var(--errColor); + background-color: var(--errColor); + color: #fff; + border: none; } } } diff --git a/pagesHome/pages/ParticularsOfCompletion/ParticularsOfCompletion.vue b/pagesHome/pages/ParticularsOfCompletion/ParticularsOfCompletion.vue index 17772c2..b971266 100644 --- a/pagesHome/pages/ParticularsOfCompletion/ParticularsOfCompletion.vue +++ b/pagesHome/pages/ParticularsOfCompletion/ParticularsOfCompletion.vue @@ -102,7 +102,7 @@ - + @@ -274,7 +274,7 @@ // basicContainer.value.startPullDownRefresh() const _height = await utils.getViewDistanceFormTop('.scvmabx') - details.scrollheight = Number(_height.replace('px', '')) - 50 + 'px' + details.scrollheight = Number(_height.replace('px', '')) - 100 + 'px' if (utils.getObjType(imgPullDownRefList.value) !== 'array') return for (let i = 0; i < imgPullDownRefList.value.length; i++) { @@ -577,10 +577,14 @@ // 底部 .footer { - height: 50px; + box-sizing: border-box; + height: 100px; + padding-top: 30upx; + display: flex; + justify-content: space-between; .button { - height: 70%; + height: 80upx; display: flex; align-items: center; justify-content: center; @@ -590,11 +594,31 @@ border-radius: 80upx; margin: 0 10upx; padding: 0 10upx; - // font-size: 0.75rem; + font-size: 0.9rem; + font-weight: bold; &.subColor { - border-color: var(--subjectColor); - color: var(--subjectColor); + // border-color: var(--subjectColor); + // color: var(--subjectColor); + background-color: var(--subjectColor); + color: #fff; + border: none; + } + + &.primaryColor { + // border-color: var(--primaryColor); + // color: var(--primaryColor); + background-color: var(--primaryColor); + color: #fff; + border: none; + } + + &.errColor { + // border-color: var(--errColor); + // color: var(--errColor); + background-color: var(--errColor); + color: #fff; + border: none; } } } diff --git a/pagesHome/pages/ParticularsOfCompletionBySales/ParticularsOfCompletionBySales.vue b/pagesHome/pages/ParticularsOfCompletionBySales/ParticularsOfCompletionBySales.vue index 9e8fc19..5542633 100644 --- a/pagesHome/pages/ParticularsOfCompletionBySales/ParticularsOfCompletionBySales.vue +++ b/pagesHome/pages/ParticularsOfCompletionBySales/ParticularsOfCompletionBySales.vue @@ -48,7 +48,7 @@ - + 确 认 @@ -139,7 +139,7 @@ // basicContainer.value.startPullDownRefresh() const _height = await utils.getViewDistanceFormTop('.scvmabx') - details.scrollheight = Number(_height.replace('px', '')) - 50 + 'px' + details.scrollheight = Number(_height.replace('px', '')) - 100 + 'px' }) onLoad((e) => { @@ -355,10 +355,14 @@ // 底部 .footer { - height: 50px; + box-sizing: border-box; + height: 100px; + padding-top: 30upx; + display: flex; + justify-content: space-between; .button { - height: 70%; + height: 80upx; display: flex; align-items: center; justify-content: center; @@ -368,11 +372,31 @@ border-radius: 80upx; margin: 0 10upx; padding: 0 10upx; - // font-size: 0.75rem; + font-size: 0.9rem; + font-weight: bold; &.subColor { + // border-color: var(--subjectColor); + // color: var(--subjectColor); background-color: var(--subjectColor); color: #fff; + border: none; + } + + &.primaryColor { + // border-color: var(--primaryColor); + // color: var(--primaryColor); + background-color: var(--primaryColor); + color: #fff; + border: none; + } + + &.errColor { + // border-color: var(--errColor); + // color: var(--errColor); + background-color: var(--errColor); + color: #fff; + border: none; } } } diff --git a/pagesHome/pages/afterSalesDetails/afterSalesDetails.vue b/pagesHome/pages/afterSalesDetails/afterSalesDetails.vue index 69a5ed4..5a1fe50 100644 --- a/pagesHome/pages/afterSalesDetails/afterSalesDetails.vue +++ b/pagesHome/pages/afterSalesDetails/afterSalesDetails.vue @@ -73,7 +73,7 @@ - + 签 到 @@ -407,7 +407,7 @@ const _height = await utils.getViewDistanceFormTop('.scvmabx') - details.scrollheight = Number(_height.replace('px', '')) - 50 + 'px' + details.scrollheight = Number(_height.replace('px', '')) - 100 + 'px' }) /** 扫描执行回调 */ @@ -623,10 +623,14 @@ // 底部 .footer { - height: 50px; + box-sizing: border-box; + height: 100px; + padding-top: 30upx; + display: flex; + justify-content: space-between; .button { - height: 70%; + height: 80upx; display: flex; align-items: center; justify-content: center; @@ -636,22 +640,31 @@ border-radius: 80upx; margin: 0 10upx; padding: 0 10upx; - font-size: 0.8rem; + font-size: 0.9rem; font-weight: bold; &.subColor { - border-color: var(--subjectColor); - color: var(--subjectColor); + // border-color: var(--subjectColor); + // color: var(--subjectColor); + background-color: var(--subjectColor); + color: #fff; + border: none; } &.primaryColor { - border-color: var(--primaryColor); - color: var(--primaryColor); + // border-color: var(--primaryColor); + // color: var(--primaryColor); + background-color: var(--primaryColor); + color: #fff; + border: none; } &.errColor { - border-color: var(--errColor); - color: var(--errColor); + // border-color: var(--errColor); + // color: var(--errColor); + background-color: var(--errColor); + color: #fff; + border: none; } } } diff --git a/pagesHome/pages/checkAndAccept/checkAndAccept.vue b/pagesHome/pages/checkAndAccept/checkAndAccept.vue index c6f94e6..f03b0e2 100644 --- a/pagesHome/pages/checkAndAccept/checkAndAccept.vue +++ b/pagesHome/pages/checkAndAccept/checkAndAccept.vue @@ -85,7 +85,7 @@ --> - + 驳 回 通 过 @@ -250,7 +250,7 @@ // basicContainer.value.startPullDownRefresh() const _height = await utils.getViewDistanceFormTop('.scvmabx') - details.scrollheight = Number(_height.replace('px', '')) - 50 + 'px' + details.scrollheight = Number(_height.replace('px', '')) - 100 + 'px' }) const scandata = () => { } @@ -490,10 +490,14 @@ // 底部 .footer { - height: 50px; + box-sizing: border-box; + height: 100px; + padding-top: 30upx; + display: flex; + justify-content: space-between; .button { - height: 70%; + height: 80upx; display: flex; align-items: center; justify-content: center; @@ -503,15 +507,36 @@ border-radius: 80upx; margin: 0 10upx; padding: 0 10upx; - // font-size: 0.75rem; + font-size: 0.9rem; + font-weight: bold; &.subColor { - border-color: var(--subjectColor); - color: var(--subjectColor); + // border-color: var(--subjectColor); + // color: var(--subjectColor); + background-color: var(--subjectColor); + color: #fff; + border: none; + } + + &.primaryColor { + // border-color: var(--primaryColor); + // color: var(--primaryColor); + background-color: var(--primaryColor); + color: #fff; + border: none; + } + + &.errColor { + // border-color: var(--errColor); + // color: var(--errColor); + background-color: var(--errColor); + color: #fff; + border: none; } } } + .row { background-color: #fff; } diff --git a/pagesHome/pages/siginIn/siginIn.vue b/pagesHome/pages/siginIn/siginIn.vue index 0db84ab..48d831e 100644 --- a/pagesHome/pages/siginIn/siginIn.vue +++ b/pagesHome/pages/siginIn/siginIn.vue @@ -138,7 +138,7 @@ // basicContainer.value.startPullDownRefresh() const _height = await utils.getViewDistanceFormTop('.scvmabx') - details.scrollheight = Number(_height.replace('px', '')) - 50 + 'px' + details.scrollheight = Number(_height.replace('px', '')) - 100 + 'px' }) onLoad((e) => { @@ -351,10 +351,14 @@ // 底部 .footer { - height: 50px; + box-sizing: border-box; + height: 100px; + padding-top: 30upx; + display: flex; + justify-content: space-between; .button { - height: 70%; + height: 80upx; display: flex; align-items: center; justify-content: center; @@ -364,11 +368,31 @@ border-radius: 80upx; margin: 0 10upx; padding: 0 10upx; - font-size: 0.75rem; + font-size: 0.9rem; + font-weight: bold; &.subColor { + // border-color: var(--subjectColor); + // color: var(--subjectColor); background-color: var(--subjectColor); color: #fff; + border: none; + } + + &.primaryColor { + // border-color: var(--primaryColor); + // color: var(--primaryColor); + background-color: var(--primaryColor); + color: #fff; + border: none; + } + + &.errColor { + // border-color: var(--errColor); + // color: var(--errColor); + background-color: var(--errColor); + color: #fff; + border: none; } } } diff --git a/pagesUser/pages/changePassword/changePassword.vue b/pagesUser/pages/changePassword/changePassword.vue index 3967da8..f74febf 100644 --- a/pagesUser/pages/changePassword/changePassword.vue +++ b/pagesUser/pages/changePassword/changePassword.vue @@ -207,7 +207,7 @@ justify-content: space-between; flex-direction: column; background: #fff; - padding: 100upx 40upx 20upx; + padding: 100upx 40upx 60upx; box-sizing: border-box; // 修改行