diff --git a/src/assets/style/style.css b/src/assets/style/style.css index 6da9114c..fd19779d 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -892,7 +892,7 @@ i { border-radius: 1rem; } .cut_pricture_modal .ant-modal-body { - height: 65rem; + height: calc(100rem*0.614); padding: 8rem 5rem !important; overflow-y: hidden; } diff --git a/src/assets/style/style.less b/src/assets/style/style.less index cd494c9a..cfee8873 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -975,7 +975,7 @@ i{ border-radius: 1rem; } .ant-modal-body{ - height: 65rem; + height: calc(100rem*.614); padding: 8rem 5rem !important; overflow-y: hidden; } diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index d86322e6..b7311733 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -977,7 +977,7 @@ export default defineComponent({ .ant-modal-body{ padding: 4rem 5rem 0rem!important; // height: calc(65vh - 6.4rem); - height: 65rem; + height: calc(100rem*.614); display: flex; overflow-y: hidden; flex-direction: column; diff --git a/src/component/Detail/DesignPrintOperation.vue b/src/component/Detail/DesignPrintOperation.vue index 528211af..4df7b8b0 100644 --- a/src/component/Detail/DesignPrintOperation.vue +++ b/src/component/Detail/DesignPrintOperation.vue @@ -756,7 +756,7 @@ export default defineComponent({ .ant-modal-body{ padding: 4rem 5rem 0rem!important; // height: calc(65vh - 6.4rem); - height: 65rem; + height: calc(100rem*.614); display: flex; overflow-y: hidden; flex-direction: column; diff --git a/src/component/Detail/DesignPrintOperationMobile.vue b/src/component/Detail/DesignPrintOperationMobile.vue index b1a84b3a..423e20c8 100644 --- a/src/component/Detail/DesignPrintOperationMobile.vue +++ b/src/component/Detail/DesignPrintOperationMobile.vue @@ -758,7 +758,7 @@ export default defineComponent({ .ant-modal-body{ padding: 4rem 5rem 0rem!important; // height: calc(65vh - 6.4rem); - height: 65rem; + height: calc(100rem*.614); display: flex; overflow-y: hidden; flex-direction: column; diff --git a/src/component/Detail/setDesignItem.vue b/src/component/Detail/setDesignItem.vue index c564c68f..e271ed47 100644 --- a/src/component/Detail/setDesignItem.vue +++ b/src/component/Detail/setDesignItem.vue @@ -472,7 +472,7 @@ export default defineComponent({ .ant-modal-body{ padding: 4rem 5rem 0rem!important; // height: calc(65vh - 6.4rem); - height: 65rem; + height: calc(100rem*.614); display: flex; overflow-y: hidden; flex-direction: column; diff --git a/src/component/Detail/setDesignItemMobile.vue b/src/component/Detail/setDesignItemMobile.vue index 51192bbb..b8c6aedb 100644 --- a/src/component/Detail/setDesignItemMobile.vue +++ b/src/component/Detail/setDesignItemMobile.vue @@ -442,7 +442,7 @@ export default defineComponent({ .ant-modal-body{ padding: 4rem 5rem 0rem!important; // height: calc(65vh - 6.4rem); - height: 65rem; + height: calc(100rem*.614); display: flex; overflow-y: hidden; flex-direction: column; diff --git a/src/component/HomePage/affiche.vue b/src/component/HomePage/affiche.vue index df2f97ea..157562e8 100644 --- a/src/component/HomePage/affiche.vue +++ b/src/component/HomePage/affiche.vue @@ -103,7 +103,7 @@ export default defineComponent({ .ant-modal-body { padding: 0; // height: calc(65vh - 6.4rem); - height: 65rem; + height: calc(100rem*.614); // background-color: #181818; display: flex; flex-direction: column; diff --git a/src/component/HomePage/collectionModal.vue b/src/component/HomePage/collectionModal.vue index a6d27eec..4f769e3f 100644 --- a/src/component/HomePage/collectionModal.vue +++ b/src/component/HomePage/collectionModal.vue @@ -440,7 +440,7 @@ export default defineComponent({ .ant-modal-body{ padding: 8rem 5rem !important; // height: calc(65vh - 6.4rem); - height: 65rem; + height: calc(100rem*.614); } //进度完成字体颜色 diff --git a/src/component/HomePage/layout.vue b/src/component/HomePage/layout.vue index 3b1067ff..1e2c5b94 100644 --- a/src/component/HomePage/layout.vue +++ b/src/component/HomePage/layout.vue @@ -653,7 +653,7 @@ export default defineComponent({ .ant-modal-body { padding: 0; // height: calc(65vh - 6.4rem); - height: 65rem; + height: calc(100rem*.614); } .ant-modal-content{ border-radius: 1rem; diff --git a/src/component/HomePage/layoutMobile.vue b/src/component/HomePage/layoutMobile.vue index 0a18e780..5d227aea 100644 --- a/src/component/HomePage/layoutMobile.vue +++ b/src/component/HomePage/layoutMobile.vue @@ -707,7 +707,7 @@ export default defineComponent({ .ant-modal-body { padding: 0; // height: calc(65vh - 6.4rem); - height: 65rem; + height: calc(100rem*.614); } .ant-modal-content{ border-radius: 1rem; diff --git a/src/component/HomePage/scaleImage.vue b/src/component/HomePage/scaleImage.vue index fa103cc1..14bfd282 100644 --- a/src/component/HomePage/scaleImage.vue +++ b/src/component/HomePage/scaleImage.vue @@ -151,7 +151,7 @@ export default defineComponent({ .ant-modal-body { padding: 0; // height: calc(65vh - 6.4rem); - height: 65rem; + height: calc(100rem*.614); // background-color: #181818; display: flex; flex-direction: column; diff --git a/src/component/LibraryPage/setLabel.vue b/src/component/LibraryPage/setLabel.vue index 710a24f2..d9549452 100644 --- a/src/component/LibraryPage/setLabel.vue +++ b/src/component/LibraryPage/setLabel.vue @@ -356,7 +356,7 @@ export default defineComponent({ flex-direction: column; // height: 300px; min-height: 50rem; - max-height: 65rem; + max-height: calc(100rem*.614); overflow-y: auto; // border-radius: ; position: relative; diff --git a/src/tool/flexible.js b/src/tool/flexible.js index 2e03ea27..d7d3708b 100644 --- a/src/tool/flexible.js +++ b/src/tool/flexible.js @@ -1,6 +1,6 @@ let flexible = (designWidth, maxWidth,minWidth) =>{ var doc = document, win = window, docEl = doc.documentElement, remStyle = document.createElement("style"), tid; - designWidth = designWidth || 1440; + designWidth = designWidth || 1600; maxWidth = maxWidth || 2000; minWidth = minWidth || 1024; function refreshRem() { diff --git a/src/views/LoginPage.vue b/src/views/LoginPage.vue index b29041a3..3c1b8775 100644 --- a/src/views/LoginPage.vue +++ b/src/views/LoginPage.vue @@ -608,7 +608,7 @@ export default defineComponent({ .login_type_item { text-align: center; - font-size: 3.6rem; + font-size: 3rem; font-weight: bold; color: #D7D7D7; cursor: pointer; @@ -621,7 +621,7 @@ export default defineComponent({ } } .login_form_title { - font-size: 1.6rem; + font-size: 1rem; // color: #666666; font-weight: 900; color: #000; @@ -631,7 +631,7 @@ export default defineComponent({ label{ display: flex; span{ - font-size: 1.6rem; + font-size: 1rem; margin-left: 10px; font-weight: normal; } @@ -660,7 +660,7 @@ export default defineComponent({ .password_show_icon{ position: absolute; - font-size: 2.4rem; + font-size: 1.8rem; right: 2rem; top:1.7rem; cursor: pointer; @@ -669,13 +669,13 @@ export default defineComponent({ .login_form_input { width: 100%; - height: 5rem; + height: 4rem; margin-top: 1rem; border: 0.1rem solid #DFDFDF; border-radius: 2.5rem; padding-left: 2.1rem; line-height: 5rem; - font-size: 1.4rem; + font-size: 1rem; box-sizing: border-box; outline: none; @@ -700,7 +700,7 @@ export default defineComponent({ justify-content: space-between; .email_last_step_content { margin-left: 1rem; - font-size: 2.2rem; + font-size: 1.6rem; font-weight: bold; color: #030303; } @@ -712,7 +712,7 @@ export default defineComponent({ } .fi-br-arrow-left { - font-size: 2.5rem; + font-size: 1.9rem; font-weight: bold; color: #030303; transform: translateY(1rem); @@ -723,12 +723,12 @@ export default defineComponent({ } .login_submit_button { - height: 5rem; + height: 4rem; background: #000; border-radius: 2.5rem; - line-height: 5rem; + line-height: 4rem; text-align: center; - font-size: 1.8rem; + font-size: 1.2rem; font-weight: 500; color: #ffffff; cursor: pointer; @@ -737,7 +737,7 @@ export default defineComponent({ } } .login_text { - font-size: 1.6rem; + font-size: 1rem; margin-top: 4rem; color: #151515; display: flex; @@ -766,14 +766,14 @@ export default defineComponent({ } .fi-br-arrow-left { - font-size: 3.8rem; + font-size: 3.2rem; font-weight: bold; color: #030303; transform: translateY(1rem); display: inline-block; } .forget_password_content_title { - font-size: 3.2rem; + font-size: 2.6rem; font-weight: bold; color: #030303; margin-left: 2rem; @@ -783,7 +783,7 @@ export default defineComponent({ margin-top: 3.5rem; .forget_passored_form_title { - font-size: 2.4rem; + font-size: 1.8rem; font-weight: bold; color: #030303; display: flex; @@ -799,7 +799,7 @@ export default defineComponent({ border-radius: 2.5rem; padding-left: 2.1rem; line-height: 5rem; - font-size: 1.4rem; + font-size: 1rem; box-sizing: border-box; outline: none; @@ -810,7 +810,7 @@ export default defineComponent({ } .forget_verif_code_des { - font-size: 2.4rem; + font-size: 1.8rem; font-weight: bold; color: #030303; margin-top: 3.5rem; @@ -822,7 +822,7 @@ export default defineComponent({ border-radius: 2.5rem; line-height: 5rem; text-align: center; - font-size: 1.8rem; + font-size: 1.2rem; font-weight: 500; color: #ffffff; cursor: pointer; @@ -845,7 +845,7 @@ export default defineComponent({ align-items: center; .login_footer_item_text{ - font-size: 1.3rem; + font-size: 1rem; color: #151515; } @@ -880,7 +880,7 @@ export default defineComponent({ } .tip_content { - font-size: 1.3rem; + font-size: 1rem; font-weight: bold; color: #343579; cursor: pointer; @@ -894,13 +894,13 @@ export default defineComponent({ margin-bottom: 2rem; .sent_email_content { - font-size: 1.8rem; + font-size: 1.2rem; font-weight: bold; color: #a5b0c2; } .email_tip_content{ - font-size: 1.4rem; + font-size: 1.2rem; color: #030303; } }