diff --git a/src/tool/flexible.js b/src/tool/flexible.js index d7d3708b..3b4fd3a4 100644 --- a/src/tool/flexible.js +++ b/src/tool/flexible.js @@ -1,7 +1,8 @@ let flexible = (designWidth, maxWidth,minWidth) =>{ var doc = document, win = window, docEl = doc.documentElement, remStyle = document.createElement("style"), tid; + designWidth = designWidth || 1600; - maxWidth = maxWidth || 2000; + maxWidth = maxWidth || 2560; minWidth = minWidth || 1024; function refreshRem() { var width = docEl.getBoundingClientRect().width; diff --git a/src/views/LoginPage.vue b/src/views/LoginPage.vue index 3c1b8775..42314922 100644 --- a/src/views/LoginPage.vue +++ b/src/views/LoginPage.vue @@ -561,7 +561,7 @@ export default defineComponent({ left: 50%; transform: translate(-50%,-50%); // width: 60rem; - width: 120rem; + width: 125rem; background: #FFFFFF; // box-shadow: -0.3rem 2rem 5.9rem 0px rgba(200,200,200,0.3); border-radius: 1rem; @@ -608,12 +608,12 @@ export default defineComponent({ .login_type_item { text-align: center; - font-size: 3rem; + font-size: calc(3.6*.8rem); font-weight: bold; color: #D7D7D7; cursor: pointer; - height: 4rem; - line-height: 4rem; + height: 3rem; + line-height: 3rem; &.login_active { color: #030303; @@ -621,7 +621,7 @@ export default defineComponent({ } } .login_form_title { - font-size: 1rem; + font-size: calc(1.6*.8rem); // color: #666666; font-weight: 900; color: #000; @@ -631,7 +631,7 @@ export default defineComponent({ label{ display: flex; span{ - font-size: 1rem; + font-size: calc(1.6*.8rem); margin-left: 10px; font-weight: normal; } @@ -660,7 +660,7 @@ export default defineComponent({ .password_show_icon{ position: absolute; - font-size: 1.8rem; + font-size: calc(2.4*.8rem); right: 2rem; top:1.7rem; cursor: pointer; @@ -674,8 +674,8 @@ export default defineComponent({ border: 0.1rem solid #DFDFDF; border-radius: 2.5rem; padding-left: 2.1rem; - line-height: 5rem; - font-size: 1rem; + line-height: 4rem; + font-size: calc(1.4*.8rem); 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: 1.6rem; + font-size: calc(2.2*.8rem); font-weight: bold; color: #030303; } @@ -712,7 +712,7 @@ export default defineComponent({ } .fi-br-arrow-left { - font-size: 1.9rem; + font-size: calc(2.5*.8rem); font-weight: bold; color: #030303; transform: translateY(1rem); @@ -728,7 +728,7 @@ export default defineComponent({ border-radius: 2.5rem; line-height: 4rem; text-align: center; - font-size: 1.2rem; + font-size: calc(1.8*.8rem); font-weight: 500; color: #ffffff; cursor: pointer; @@ -737,7 +737,7 @@ export default defineComponent({ } } .login_text { - font-size: 1rem; + font-size: calc(1.6*.8rem); margin-top: 4rem; color: #151515; display: flex; @@ -766,14 +766,14 @@ export default defineComponent({ } .fi-br-arrow-left { - font-size: 3.2rem; + font-size: calc(3.8*.8rem); font-weight: bold; color: #030303; transform: translateY(1rem); display: inline-block; } .forget_password_content_title { - font-size: 2.6rem; + font-size: calc(3.2*.8rem); 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: 1.8rem; + font-size: calc(2.4*.8rem); font-weight: bold; color: #030303; display: flex; @@ -793,13 +793,13 @@ export default defineComponent({ .forget_passored_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: 1rem; + line-height: 4rem; + font-size: calc(1.4*.8rem); box-sizing: border-box; outline: none; @@ -810,19 +810,19 @@ export default defineComponent({ } .forget_verif_code_des { - font-size: 1.8rem; + font-size: calc(2.4*.8rem); font-weight: bold; color: #030303; margin-top: 3.5rem; } .forget_submit_button { - height: 5rem; + height: 4rem; background: #000; border-radius: 2.5rem; - line-height: 5rem; + line-height: 4rem; text-align: center; - font-size: 1.2rem; + font-size: calc(1.8*.8rem); font-weight: 500; color: #ffffff; cursor: pointer; @@ -845,7 +845,7 @@ export default defineComponent({ align-items: center; .login_footer_item_text{ - font-size: 1rem; + font-size: calc(1.3*.8rem); color: #151515; } @@ -865,11 +865,11 @@ export default defineComponent({ .marign_top20 { - margin-top: 2rem; + margin-top: 1rem; } .marign_top22 { - margin-top: 2.2rem; + margin-top: 1.2rem; } .marign_top30 { @@ -880,7 +880,7 @@ export default defineComponent({ } .tip_content { - font-size: 1rem; + font-size: calc(1.3*.8rem); font-weight: bold; color: #343579; cursor: pointer; @@ -894,13 +894,13 @@ export default defineComponent({ margin-bottom: 2rem; .sent_email_content { - font-size: 1.2rem; + font-size: calc(1.8*.8rem); font-weight: bold; color: #a5b0c2; } .email_tip_content{ - font-size: 1.2rem; + font-size: calc(1.4*.8rem); color: #030303; } }