Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev

# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php

src/frontend/web/css/main.css

@@ -851,7 +851,7 @@ a,a:hover,a:link {
         padding-right: 15px;
     }
     .yun-login-btn {
-        padding-right: 15px;
+        margin-right: 15px;
     }
 }