Merge branch 'bugfix-wyf' into 'master'

移除优设标题字体 登录页文字改为切图

See merge request tian-group/skyeye-admin-fe!56

src/App.vue

@@ -63,8 +63,4 @@
   #nprogress .bar {
     background: var(--el-color-primary);
   }
-  @font-face {
-    font-family: 'YouSheBiaoTiHei';
-    src: url('@/assets/font/YouSheBiaoTiHei-2.ttf');
-  }
 </style>

src/views/login/newLogin2.vue

@@ -7,12 +7,13 @@
       <div class="account-wrap-login">
         <div class="login-pic">
           <div>
-            <img src="~@/assets/images/login/login-pic.png" />
+            <img src="~@/assets/images/login/login-pic.png" alt="" />
           </div>
         </div>
         <div class="login-form">
           <div class="login-form-container">
-            <div class="account-top"> 欢迎您进入<br />安全管控开放平台 </div>
+            <!-- <div class="account-top"> 欢迎您进入<br />安全管控开放平台 </div> -->
+            <img src="~@/assets/images/login/login-Yubei-admin.png" alt="" />
             <LoginForm v-if="tab === 'login'" ref="LoginFormRef" @go-register="changeGoRegister" />
             <RegisterForm v-else ref="RegisterFormRef" @back-login="changeBackLogin" />
           </div>
@@ -60,9 +61,9 @@
     }
 
     &-wrap-logo {
-      width: 1271px;
+      width: 1280px;
       margin-top: 30px;
-      @media (max-width: 1271px) {
+      @media (max-width: 1280px) {
         width: 100%;
       }
       img {
@@ -72,7 +73,7 @@
       }
     }
     &-wrap-login {
-      width: 1271px;
+      width: 1280px;
       height: 554px;
       background: #fff;
       // border-radius: 10px;
@@ -83,15 +84,16 @@
       padding: 30px 95px 33px 95px;
       .login-pic {
         display: flex;
-        // align-items: center;
-        // flex-direction: column;
-        // justify-content: center;
+
+        @media (max-width: 1020px) {
+          display: none;
+        }
         img {
           max-width: 100%;
         }
       }
 
-      @media (max-width: 1271px) {
+      @media (max-width: 1280px) {
         width: 100%;
         padding: 30px 0px 33px 0px;
         justify-content: center;
@@ -99,65 +101,22 @@
 
       .login-form {
         width: 350px;
-        display: flex;
-        flex-direction: column;
-        &-container {
-          margin: auto;
-          width: 100%;
-        }
-        &-title {
-          padding-bottom: 15px;
-          text-align: center;
-        }
-      }
-      @media (max-width: 1010px) {
-        .login-pic {
-          display: none;
-        }
-
-        .login-form {
+        padding-top: 20px;
+        @media (max-width: 1020px) {
           width: min(100%, 350px);
           margin: auto;
         }
-      }
-
-      .account-top {
-        text-align: center;
-        font-size: 46px;
-        font-family: YouSheBiaoTiHei;
-        color: #1890ff;
-        line-height: 60px;
-        margin-bottom: 60px;
-
-        @media (max-width: 400px) {
-          font-size: 40px;
-        }
 
-        &-logo {
-          text-align: center;
-          margin-bottom: 10px;
+        &-container {
           display: flex;
-          align-items: center;
-          justify-content: center;
+          flex-direction: column;
           img {
-            width: 45px;
-          }
-          .project-title {
-            background: linear-gradient(92.06deg, #33c2ff -17.9%, #1e6fff 43.39%, #1e6fff 99.4%);
-            -webkit-background-clip: text;
-            -webkit-text-fill-color: transparent;
-            font-size: 24px;
-            line-height: 1.25;
-            font-weight: 500;
-            margin-left: 10px;
+            padding: 10px;
+            @media (max-width: 400px) {
+              padding: 25px;
+            }
           }
         }
-
-        &-desc {
-          font-size: 14px;
-          color: #808695;
-          margin-bottom: 20px;
-        }
       }
     }