diff --git a/jero-web/src/assets/home.png b/jero-web/src/assets/home.png
new file mode 100644
index 00000000..fce9a27c
Binary files /dev/null and b/jero-web/src/assets/home.png differ
diff --git a/jero-web/src/assets/home1366.png b/jero-web/src/assets/home1366.png
deleted file mode 100644
index 6442bc23..00000000
Binary files a/jero-web/src/assets/home1366.png and /dev/null differ
diff --git a/jero-web/src/assets/home1920.png b/jero-web/src/assets/home1920.png
deleted file mode 100644
index 862069ef..00000000
Binary files a/jero-web/src/assets/home1920.png and /dev/null differ
diff --git a/jero-web/src/assets/home3840.png b/jero-web/src/assets/home3840.png
deleted file mode 100644
index 2f9a7bc0..00000000
Binary files a/jero-web/src/assets/home3840.png and /dev/null differ
diff --git a/jero-web/src/assets/logo.png b/jero-web/src/assets/logo.png
index 1c356e3a..4c98ab5b 100644
Binary files a/jero-web/src/assets/logo.png and b/jero-web/src/assets/logo.png differ
diff --git a/jero-web/src/assets/logoNew.png b/jero-web/src/assets/logoNew.png
deleted file mode 100644
index 1836992b..00000000
Binary files a/jero-web/src/assets/logoNew.png and /dev/null differ
diff --git a/jero-web/src/components/layouts/UserLayout.vue b/jero-web/src/components/layouts/UserLayout.vue
index ec615116..f6c31473 100644
--- a/jero-web/src/components/layouts/UserLayout.vue
+++ b/jero-web/src/components/layouts/UserLayout.vue
@@ -3,12 +3,15 @@
-

-
- 合众未来
- HEZHONGWEILAI
-
+
+
+ 合众未来
+ HEZHONGWEILAI
+
+
+
+
@@ -33,69 +36,135 @@
document.body.classList.remove('userLayout')
},
}
- var comO,logo,logoImg
- window.onresize = function(){
- comO = document.getElementsByClassName("company")[0]
- logo = document.getElementsByClassName("logo")[0]
- logoImg = document.getElementsByClassName("logo-img")[0]
- console.log(logo.width)
- comO.style.left = (logoImg.width + 10) + 'px'
- comO.style.height = logoImg.height + 'px'
- logo.style.height = logoImg.height + 'px'
+ /*
+ * winWidth: 窗口可视宽度
+ * company: 公司名字盒子
+ * logo:logo图片
+ * cCompany: 中文公司名
+ * pCompany: 拼音公司名
+ * */
+ let winWidth,company,logo,cCompany,pCompany
+
+ window.onload = ()=>{
+ adaptation()
+ }
+ window.onresize = ()=>{
+ throttling(adaptation(),1000)
+ }
+ // 节流
+ let throttling = (fn, wait) => {
+ let timer;
+ let context, args;
+
+ let run = () => {
+ timer=setTimeout(()=>{
+ fn.apply(context,args);
+ clearTimeout(timer);
+ timer=null;
+ },wait);
+ }
+
+ return function () {
+ context=this;
+ args=arguments;
+ if(!timer){
+ console.log("throttle, set");
+ run();
+ }else{
+ console.log("throttle, ignore");
+ }
+ }
+
+ }
+ function adaptation(){
+ winWidth = window.innerWidth
+ logo = document.getElementById("logo")
+ company = document.getElementById("company")
+ cCompany = document.getElementById("c-company")
+ pCompany = document.getElementById("p-company")
+ cCompany.style.fontSize = (winWidth / 95) + 'px' // 公司中文适配
+ pCompany.style.fontSize = (winWidth / 120) + 'px' // 公司拼音适配
+ logo.style.maxWidth = (winWidth * 0.05) +'px' // logo宽度
+ company.style.left = (winWidth * 0.05 + 5) + 'px' // 公司名字距logo的左偏移
+ company.style.height = logo.height + 'px'
}
\ No newline at end of file
diff --git a/jero-web/src/views/user/Login.vue b/jero-web/src/views/user/Login.vue
index 1eedf707..79842eab 100644
--- a/jero-web/src/views/user/Login.vue
+++ b/jero-web/src/views/user/Login.vue
@@ -62,8 +62,8 @@
自动登录
-
-
+
+
忘记密码
@@ -289,50 +289,53 @@
.ant-row{
margin-bottom: 4%;
}
- .user-layout-login{
- width: 24%;
- height: 56%;
- padding: 3% 0 3% 0;
- min-width: 400px;
- min-height: 460px;
- background: #fff;
- -webkit-border-radius: 20px;
- -moz-border-radius: 20px;
- border-radius: 20px;
- position: absolute;
- right: 8%;
- top: 50%;
- -webkit-transform: translateY(-50%);
- -moz-transform: translateY(-50%);
- -ms-transform: translateY(-50%);
- -o-transform: translateY(-50%);
- transform: translateY(-50%);
- .user-box{
- width: 100%;
- height: 100%;
- overflow: hidden;
- display: flex;
- justify-content: space-between;
- flex-direction: column;
- .title{
- display: block;
- color: #1891FF;
- font-size: 28px;
- font-weight: 500;
- margin: 0 0 5% 0;
- text-align: center;
- }
- .login-btn{
- margin-bottom: 0;
- font-size: 10px;
+ .main{
+ .user-layout-login{
+ width: 24%;
+ height: 56%;
+ padding: 3% 0 3% 0;
+ min-width: 332px;
+ min-height: 460px;
+ background: #fff;
+ -webkit-border-radius: 20px;
+ -moz-border-radius: 20px;
+ border-radius: 20px;
+ position: absolute;
+ right: 8%;
+ top: 50%;
+ -webkit-transform: translateY(-50%);
+ -moz-transform: translateY(-50%);
+ -ms-transform: translateY(-50%);
+ -o-transform: translateY(-50%);
+ transform: translateY(-50%);
+ .user-box{
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+ display: flex;
+ justify-content: space-between;
+ flex-direction: column;
+ .title{
+ display: block;
+ color: #1891FF;
+ font-size: 28px;
+ font-weight: 500;
+ margin: 0 0 5% 0;
+ text-align: center;
+ }
+ .login-btn{
+ margin-bottom: 0;
+ font-size: 10px;
+ }
}
}
}
+
@media all and (max-width:600px){ // 分辨率<=600px
.user-layout-login{
- top: 50%;
- left: 50%;
- transform: translate(-50%,-50%);
+ top: 50% !important;
+ left: 50% !important;
+ transform: translate(-50%,-50%) !important;
}
}