Merge remote-tracking branch 'origin/test' into test

# Conflicts:
#	e/member/login/indexloginstatus.php

e/member/login/indexloginstatus.php

@@ -16,6 +16,7 @@ if($iscas){
 <?php if (!$iscas) { ?>
     $(function(){
         $(".books").attr("href", "/e/member/login");
+        $("#loginGits").attr("style", "display:block;");
     });
 <?php }else { ?>
     var zhugeCheckRunHandler = false;
@@ -30,4 +31,4 @@ if($iscas){
     }
     }
     zhugeCheckRun();
-<?php } ?>
+<?php } ?>
\ No newline at end of file

skin/default/css/style.css

@@ -184,7 +184,7 @@
     display: inline-block;
     width: 50px;
     height: 50px;
-    background-image: url(../images/icon_quick_link.png);
+    background-image: url(../images/icon_quick_link.png?20180408);
     background-size: cover;
 }
 .quick-link .link-item li a span {
@@ -1008,6 +1008,19 @@
     border-right: 14px solid transparent;
 }
 
+/*登录有礼提示*/
+.newer-tip {
+    position: fixed;
+    display: inline-block;
+    right: 15px;
+    top: 60%;
+    z-index: 6;
+}
+.newer-tip img {
+    width: 60px;
+    vertical-align: top;
+}
+
 /*适配电脑端*/
 @media screen and (min-width: 900px){
     html {