Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

frontend/saas-portal-web/src/css/main.css

@@ -78,6 +78,11 @@ main > section {
 .bg-blue {
     background-color: #0aa6bd;
 }
+.logo-img {
+    width: 123px;
+    height: 53px;
+    margin-top: -6px;
+}
 /* 遮罩 */
 .zhezhao {
     display: none;
@@ -241,10 +246,11 @@ main > section {
 .login {
     margin-top: 12px;
     color: white;
+    font-size: 14px;
 }
 .login img {
-    width: 27px;
-    height: 26px;
+    width: 25px;
+    height: 24px;
 }
 .login > span:hover{
     cursor:pointer;

frontend/saas-portal-web/src/index.html

@@ -70,8 +70,8 @@
 					<!-- logo -->
 					<h1 class="navbar-brand">
 						<a href="#body">
-							<img src="./img/assets/logo.png" alt="">
-							<span>企云服</span>
+							<img class="logo-img" src="./img/assets/dalogo-白@3x.png" alt="">
+							<!-- <img src="./img/assets/logo.png" alt=""><span>企云服</span> -->
 						</a>
 					</h1>
 					<!-- /logo -->
@@ -87,11 +87,8 @@
                         <li><a href="#footer"><span>联系我们</span></a></li>
 						</li>
 						<li class="login">
-							<span class="btn1">
-								<img src="./img/assets/导航-登录.png" alt="">
-								登录 | 
-							</span>
-							<span class="register"><img src="./img/assets/导航-注册.png" alt="">注册</span>
+							<span class="btn1"><img src="./img/assets/导航-登录@3x.png" alt="">登录  &nbsp;</span>
+							<span class="register"><img src="./img/assets/导航-注册@3x.png" alt="">注册</span>
 						</li>
                     </ul>
                 </nav>