From 1f4adcbc3c44fd9fcabcd8bbb7bc0edd0eed063d Mon Sep 17 00:00:00 2001 From: "452061493@qq.com" <452061493@qq.com> Date: Mon, 17 Jun 2024 17:11:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8Fbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/goods-card/index.vue | 8 +- src/views/Home.vue | 68 +++++++++------- src/views/HomeWx.vue | 69 +++++++++------- src/views/My.vue | 18 ++--- src/views/Shop.vue | 16 ++-- src/views/administrative/appointment.vue | 14 ++-- src/views/administrative/appointmentEdit.vue | 8 +- src/views/administrative/appointmentList.vue | 24 +++--- src/views/administrative/userFilter.vue | 46 +++++++---- src/views/common/analyse.vue | 2 +- src/views/common/setting.vue | 20 ++--- src/views/enforce/assistUserFilter.vue | 48 ++++++++---- src/views/enforce/earlyWarning.vue | 22 +++--- src/views/enforce/enforceNotice.vue | 24 +++--- src/views/enforce/enforcementPlan.vue | 24 +++--- src/views/enforce/enforcementPlanAdd.vue | 35 +++++---- src/views/enforce/enterpriseBaseInfo.vue | 46 +++++------ src/views/enforce/enterpriseScanPreview.vue | 10 +-- src/views/enforce/enterpriseWarningInfo.vue | 36 ++++----- src/views/enforce/historyCheck.vue | 24 +++--- src/views/enforce/noScan.vue | 38 +++++---- src/views/enforce/scanPageTest.vue | 2 +- src/views/enforce/scanQrCode.vue | 18 ++--- src/views/enforce/sign.vue | 52 ++++++------- src/views/enforce/userFilter.vue | 44 +++++++---- src/views/enforce/zqyjjdmFilter.vue | 2 +- src/views/enforceHome.vue | 78 ++++++++++--------- src/views/enterprise/caseFilter.vue | 2 +- src/views/enterprise/companyFilter.vue | 4 +- src/views/enterprise/complaint.vue | 20 +++-- src/views/enterprise/complaintList.vue | 36 ++++----- src/views/enterprise/complaintNoScan.vue | 24 +++--- .../enterprise/enterpriseInspectionDetail.vue | 8 +- .../enterprise/enterpriseInspectionList.vue | 22 +++--- src/views/enterprise/qrCode.vue | 20 +++-- src/views/enterprise/qrCodeHistory.vue | 24 +++--- src/views/enterprise/register.vue | 26 ++++++- src/views/enterprise/registrationDetail.vue | 63 ++++++++------- src/views/enterprise/registrationEdit.vue | 50 ++++++------ src/views/enterprise/registrationList.vue | 24 +++--- .../enterprise/registrationSelectList.vue | 32 ++++---- src/views/login.vue | 14 ++-- 42 files changed, 651 insertions(+), 514 deletions(-) diff --git a/src/components/goods-card/index.vue b/src/components/goods-card/index.vue index cc3685e..e7e131a 100644 --- a/src/components/goods-card/index.vue +++ b/src/components/goods-card/index.vue @@ -58,10 +58,10 @@ diff --git a/src/views/HomeWx.vue b/src/views/HomeWx.vue index c29cd1a..a801ff8 100644 --- a/src/views/HomeWx.vue +++ b/src/views/HomeWx.vue @@ -239,9 +239,9 @@ overflow-y: auto; .carousel_box { - height: 150px; + height: 4rem; width: 100%; - padding-bottom: 10px; + padding-bottom: 0.27rem; } @@ -253,7 +253,7 @@ bottom: 1%; .boutique_body { - padding: 0px 0px 10px 0px; + padding: 0 0 0.27rem 0; display: flex; justify-content: center; } @@ -262,9 +262,9 @@ position: relative; margin: 2% 0; width: 90%; - height: 3.66667rem; + height: 3.67rem; text-align: right; - border-radius: 10px; + border-radius: 0.27rem; .box-qr-code-text { position: absolute; @@ -278,14 +278,14 @@ .box-qr-code::before { content: ""; position: absolute; - top: -5px; - left: -5px; + top: -0.14rem; + left: -0.14rem; z-index: 0; - width: calc(100% + 4px); - height: calc(100% + 4px); + width: calc(100% + 0.13rem); + height: calc(100% + 0.13rem); background-color: #fff; - border: 5px solid rgba(255,255,255,0.5); - border-radius: 10px; + border: 0.14rem solid rgba(255,255,255,0.5); + border-radius: 0.27rem; } .box-qr-code::after { @@ -296,7 +296,7 @@ z-index: 1; width: 100%; height: 100%; - border-radius: 10px; + border-radius: 0.26667rem; background: #fff url("../assets/images/item_code.jpg") no-repeat left; background-size: auto 100%; border: 1px solid #8db4ff; @@ -306,9 +306,9 @@ position: relative; margin-right: 2%; width: 50%; - height: 3.66667rem; + height: 3.67rem; text-align: right; - border-radius: 10px; + border-radius: 0.27rem; .box-info-text { position: absolute; @@ -322,14 +322,14 @@ .box-info::before { content: ""; position: absolute; - top: -5px; - left: -5px; + top: -0.14rem; + left: -0.14rem; z-index: 0; - width: calc(100% + 4px); - height: calc(100% + 4px); + width: calc(100% + 0.13rem); + height: calc(100% + 0.13rem); background-color: #fff; - border: 5px solid rgba(255,255,255,0.5); - border-radius: 10px; + border: 0.14rem solid rgba(255,255,255,0.5); + border-radius: 0.27rem; } .box-info::after { @@ -340,7 +340,7 @@ z-index: 1; width: 100%; height: 100%; - border-radius: 10px; + border-radius: 0.27rem; background: #fff url("../assets/images/item_checkc.jpg") no-repeat left; background-size: auto 100%; border: 1px solid #8db4ff; @@ -350,9 +350,9 @@ position: relative; margin-left: 3%; width: 35%; - height: 3.66667rem; + height: 3.67rem; text-align: right; - border-radius: 10px; + border-radius: 0.27rem; .box-complaint-text { position: absolute; @@ -367,14 +367,14 @@ .box-complaint::before { content: ""; position: absolute; - top: -5px; - left: -5px; + top: -0.14rem; + left: -0.14rem; z-index: 0; - width: calc(100% + 4px); - height: calc(100% + 4px); + width: calc(100% + 0.13rem); + height: calc(100% + 0.13rem); background-color: #fff; - border: 5px solid rgba(255,255,255,0.5); - border-radius: 10px; + border: 0.14rem solid rgba(255,255,255,0.5); + border-radius: 0.27rem; } .box-complaint::after { @@ -385,7 +385,7 @@ z-index: 1; width: 100%; height: 100%; - border-radius: 10px; + border-radius: 0.27rem; background: #fff url("../assets/images/item_complain.jpg") no-repeat left; background-size: auto 100%; border: 1px solid #8db4ff; @@ -408,10 +408,19 @@ background: url("../assets/images/logo.png") no-repeat; background-size: 100% auto; } + @media screen and (max-width: 380px) { .home .warp_body { background: #c6e6ff url("../assets/images/bg_c.jpg") no-repeat top; background-size: 100% auto; } } + + @media screen and (min-width: 540px) { + .home .warp_body { + background: #c6e6ff url("../assets/images/bg_c.jpg") no-repeat top; + background-size: 100% auto; + } + } + diff --git a/src/views/My.vue b/src/views/My.vue index 362d807..4bf058b 100644 --- a/src/views/My.vue +++ b/src/views/My.vue @@ -29,7 +29,7 @@ -
+
{ flex-direction: column; height: 100%; overflow: hidden; - background-color: #f4f4f4; + background-color: #ebf3fb; .user-info-box { position: relative; - margin: 10px; - padding: 10px 20px 10px 10px; + margin: 0.27rem; + padding: 0.27rem 0.54rem 0.27rem 0.27rem; background: #fff; - border-radius: 6px; - font-size: 14px; + border-radius: 0.14rem; + font-size: 0.38rem; color: #aaa; .right-box { display: flex; flex-direction: column; height: 100%; .name-text { - margin: auto auto auto 10px; + margin: auto auto auto 0.27rem; } .sign-text { - margin: auto auto auto 10px; + margin: auto auto auto 0.27rem; } } .mgt-icon { position: absolute; - right: 10px; + right: 0.27rem; } } } diff --git a/src/views/Shop.vue b/src/views/Shop.vue index 6ca1319..9f35942 100644 --- a/src/views/Shop.vue +++ b/src/views/Shop.vue @@ -13,7 +13,7 @@
- @@ -245,7 +245,7 @@ onDeactivated(() => { background-color: #f4f4f4; .header_body { - height: 50px; + height: 1.33rem; } .shop-center { @@ -256,8 +256,8 @@ onDeactivated(() => { .goods_box { display: flex; background-color: #fff; - margin: 10px; - border-radius: 10px; + margin: 0.27rem; + border-radius: 0.27rem; .swipe_cell { width: 100%; @@ -269,7 +269,7 @@ onDeactivated(() => { .card_body { background-color: #fff; - border-radius: 10px; + border-radius: 0.27rem; flex: 1; } } @@ -277,11 +277,11 @@ onDeactivated(() => { } .shop_footer_body { - //height: 101px; + //height: 2.67rem; position: relative; .footer-one-btn { - height: 50px; - bottom: 51px; + height: 1.33rem; + bottom: 1.34rem; } } } diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue index 51ac05e..edeb44e 100644 --- a/src/views/administrative/appointment.vue +++ b/src/views/administrative/appointment.vue @@ -452,17 +452,17 @@ flex-direction: column; height: 100%; overflow: hidden; - background-color: #f4f4f4; + background-color: #ebf3fb; } .warp_body { - margin: 0; + margin: 0 3%; padding-bottom: 3rem; - width: 100%; + width: 94%; height: 100%; /*background-image: linear-gradient(to bottom, #ebf3fb, #fff);*/ overflow-y: auto; - margin-top: 1%; + margin-top: 0.15rem; } /* vant4的 Toast 和 Popup 样式冲突,会导致 Toast 变成白底 */ @@ -488,8 +488,12 @@ font-size: 0.4rem; border-radius: 1rem; background: #1367fe; - border: 0.02667rem solid #1367fe; + border: 1px solid #1367fe; text-align: center; } + /deep/ .van-action-bar { + box-shadow: 0 0 0.27rem #e5e5e5; + } + diff --git a/src/views/administrative/appointmentEdit.vue b/src/views/administrative/appointmentEdit.vue index 1aa5758..1167b8b 100644 --- a/src/views/administrative/appointmentEdit.vue +++ b/src/views/administrative/appointmentEdit.vue @@ -426,7 +426,7 @@ flex-direction: column; height: 100%; overflow: hidden; - background-color: #f4f4f4; + background-color: #ebf3fb; } /* vant4的 Toast 和 Popup 样式冲突,会导致 Toast 变成白底 */ .van-popup.van-toast{ @@ -450,8 +450,12 @@ font-size: 0.4rem; border-radius: 1rem; background: #1367fe; - border: 0.02667rem solid #1367fe; + border: 1px solid #1367fe; text-align: center; } + /deep/ .van-action-bar { + box-shadow: 0 0 0.27rem #e5e5e5; + } + diff --git a/src/views/administrative/appointmentList.vue b/src/views/administrative/appointmentList.vue index 94c1774..85df5fd 100644 --- a/src/views/administrative/appointmentList.vue +++ b/src/views/administrative/appointmentList.vue @@ -357,10 +357,10 @@ display: flex; flex-direction: column; overflow: hidden; - background-color: #f4f4f4; + background-color: #ebf3fb; .header_body { - height: 50px; + height: 1.33rem; } .shop-center { @@ -371,8 +371,8 @@ .goods_box { display: flex; background-color: #fff; - margin: 10px; - border-radius: 10px; + margin: 0.27rem; + border-radius: 0.27rem; .swipe_cell { width: 100%; @@ -381,12 +381,12 @@ .card_box { display: flex; width: 100%; - padding: 10px 0px; + padding: 0.27rem 0; flex-direction: column; .card_body { background-color: #fff; - border-radius: 10px; + border-radius: 0.27rem; flex: 1; } @@ -426,8 +426,8 @@ height: 0.7rem; display: flex; flex-direction: row; - padding-left: 10px; - margin-top: 10px; + padding-left: 0.27rem; + margin-top: 0.27rem; align-items: end; .search-button { @@ -450,13 +450,13 @@ height: 0.65rem; display: flex; flex-direction: row; - padding-left: 10px; - margin-top: 10px; + padding-left: 0.27rem; + margin-top: 0.27rem; align-items: end; position: relative; .date-select { - font-size: 20px; + font-size: 0.52rem; margin-left: 2%; i { transform: rotate(90deg); @@ -509,7 +509,7 @@ width: 10%; height: 0.9rem; background: #1367fe; - border: 0.02667rem solid #1367fe; + border: 1px solid #1367fe; border-radius: 0 0.15rem 0.15rem 0; color: #fff; text-align: center; diff --git a/src/views/administrative/userFilter.vue b/src/views/administrative/userFilter.vue index 397537b..b9b4d38 100644 --- a/src/views/administrative/userFilter.vue +++ b/src/views/administrative/userFilter.vue @@ -8,13 +8,10 @@
姓名:{{ item.userName }}
@@ -94,7 +91,7 @@ export default { height: 1rem; border-bottom: 1px solid #f3f4f5; text-align: center; - font-size: 0.42rem; + font-size: 0.45rem; font-weight: 600; } @@ -138,21 +135,40 @@ export default { } .subsearch { - width: 100%; + display: flex; + align-items: center; + justify-content: space-between; + margin: 3%; + width: 94%; height: 1.25rem; + font-size: 0.38rem; +} + +.subsearch .ibtn-reset { + margin: 0 0.5rem 0 -1rem; + width: 1rem; + color: #afabab; + font-size: 0.5rem; +} + +.subsearch .btn-search { + margin: 0 0 0 -0.5rem; + width: 20%; + height: 1rem; + border-radius: 0 0.15rem 0.15rem 0; } .searchbox { - margin: 2% 3%; - padding: 0.15rem 0.3rem 0.1rem 1.15rem; - width: 94%; - height: 1.0rem; + margin: 2% 0; + padding: 0.1rem 1.2rem 0.1rem 0.9rem; + width: 100%; + height: 1rem; background: #f6f7fe url(../../assets/images/icon_sou.png) no-repeat; - background-position: left 0.5rem center; + background-position: left 0.25rem center; background-size: auto 50%; box-sizing: border-box; - border: 1px solid rgba(0,0,0,.05); - border-radius: 0.5rem; + border: 1px solid rgba(0, 0, 0, .1); + border-radius: 0.15rem 0 0 0.15rem; color: #999999; outline: none; } diff --git a/src/views/common/analyse.vue b/src/views/common/analyse.vue index f25d708..c7259a4 100644 --- a/src/views/common/analyse.vue +++ b/src/views/common/analyse.vue @@ -466,7 +466,7 @@ .warp_body { background-image: linear-gradient(to bottom, #ebf3fb, transparent); - margin-top: 1%; + margin-top: 0.15rem; } .countbox, .analybox { diff --git a/src/views/common/setting.vue b/src/views/common/setting.vue index ff27912..974fe3b 100644 --- a/src/views/common/setting.vue +++ b/src/views/common/setting.vue @@ -53,31 +53,31 @@ onMounted(() => {}); flex-direction: column; height: 100%; overflow: hidden; - background-color: #f4f4f4; + background-color: #ebf3fb; .warp_body { .user_info__box { position: relative; - margin: 10px; - padding: 10px; + margin: 0.27rem; + padding: 0.27rem; background: #fff; - border-radius: 6px; - font-size: 14px; + border-radius: 0.14rem; + font-size: 0.38rem; color: #aaa; .right_box { display: flex; flex-direction: column; height: 100%; .name_text { - margin: auto auto auto 10px; + margin: auto auto auto 0.27rem; } .sign_text { - margin: auto auto auto 10px; + margin: auto auto auto 0.27rem; } } .addr_cell { - border-top: 1px solid #eee; - margin-top: 10px; - padding-bottom: 0px; + border-top: 0.01rem solid #eee; + margin-top: 0.27rem; + padding-bottom: 0; } } } diff --git a/src/views/enforce/assistUserFilter.vue b/src/views/enforce/assistUserFilter.vue index eb7ed27..f5c4ac8 100644 --- a/src/views/enforce/assistUserFilter.vue +++ b/src/views/enforce/assistUserFilter.vue @@ -8,13 +8,10 @@