河海添加logo

src/components/common/Header.vue

@@ -1,10 +1,11 @@
 <template>
-    <div class="header flex-between">
+    <div class="header">
         <div v-if="this.$route.path=='/personalcenter'"
          class="goBack" v-preventReClick @click="back"><i class="el-icon-arrow-left"></i>返回</div>
-        <div v-else class="logo">
-            <img v-if="!$config.isHh" src="../../assets/img/logo.png">
-        </div>
+        <template v-else>
+            <img class="logo hh" v-if="$config.isHh" src="../../assets/img/logo-hh.png" />
+            <img class="logo" v-else src="../../assets/img/logo.png">
+        </template>
         <div class="header-right">
             <div class="header-user-con">
                 <div class="user" @click="toPersonalCenter">
@@ -68,6 +69,9 @@ export default {
 }
 .header {
     position: relative;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
     box-sizing: border-box;
     width: 100%;
     height: 60px;
@@ -75,21 +79,17 @@ export default {
     color: #333;
 }
 .header .logo {
-    float: left;
     width: 150px;
     margin-left: 20px;
+    &.hh{
+        width: 500px;
     }
-.header .logo img{
-    width: 100%;
-    height: 100%;
 }
 .header-right {
-    float: right;
     padding-right: 50px;
 }
 .header-user-con {
     display: flex;
-    height: 70px;
     align-items: center;
 
     .user{

src/components/page/Login.vue

@@ -11,7 +11,12 @@
 
         <div class="bg">
             <div class="left">
-                <div class="text" v-if="!$config.isHh">
+                <div class="text" v-if="$config.isHh">
+                    <p>欢迎使用</p>
+                    <p style="margin-bottom: 15px">商学院金融工程</p>
+                    <p>与大数据实验平台</p>
+                </div>
+                <div class="text" v-else>
                     <p>欢迎使用</p>
                     <p>Occupation Lab</p>
                 </div>
@@ -19,6 +24,9 @@
             <div class="right"></div>
         </div>
 
+        <div class="right-form">
+            <img v-if="$config.isHh" class="logo" src="../../assets/img/logo-hh1.png" />
+
             <div class="form">
                 <div class="back" v-show="isReg" @click="toReg(false)">
                     <i class="el-icon-back"></i>
@@ -69,6 +77,7 @@
                 </div>
                 <register v-else :isReg.sync="isReg" @updateInfo="updateInfo"></register>
             </div>
+        </div>
 
         <!-- 选择角色 -->
         <el-dialog title="选择角色" :visible.sync="roleDialog" width="24%" center :close-on-click-modal="false">
@@ -473,7 +482,7 @@ export default {
                     font-size: 46px;
                     font-weight: bold;
                     p:first-child{
-                        margin-bottom: 10px;
+                        margin-bottom: 20px;
                     }
                 }
             }
@@ -485,18 +494,24 @@ export default {
         }
         
 
-        /deep/.form{
+        /deep/.right-form{
             position: absolute;
-            top: 50%;
+            top: 47%;
             right: 12%;
             transform: translateY(-50%);
             width: 28%;
+            
+            .logo{
+                width: 100%;
+                margin-bottom: 40px;
+            }
+            .form{
                 padding: 50px 20px 20px;
                 background-color: #fff;
                 border-radius: 16px;
                 box-sizing: border-box;
                 box-shadow: 0 1px 20px rgba(146,120,255,0.3);
-            
+            }
             .back{
                 position: absolute;
                 top: 20px;