Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Application/Mobile/View/Ssg/login.html

@@ -417,7 +417,12 @@ var PhoneObj = {
     //弹框确认
     function hideAndLogin(){
         $("#alert_box").hide();
-        window.location.href = "mobile.php?s=/Ssg/index.html"
+        var gameId = $("#game_id").val();
+        if (gameId) {
+            window.location.href = "/mobile.php?s=/Ssg/pay/game_id/"+gameId+".html"
+        } else {
+            window.location.href = "mobile.php?s=/Ssg/index.html"
+        }
     }
     //获取手机验证码
     $("#getPhoneCode").on("click",function(){

Public/Home/css/index2.css

@@ -11,9 +11,10 @@
     align-items: center;
     justify-content: space-between;
 }
-.heard>img{
+.heard>div>img{
     width: 2.5rem;
     height: 2.5rem;
+    border-radius: 0.3rem;
 }
 .heard>.right{
     margin-left: 0.3rem;
@@ -70,11 +71,21 @@
 .evaluate .start{
     display: flex;
     align-items: center;
-    margin-left: 0.32rem;
+    margin-left: 0.22rem;
 }
-.evaluate .start>img{
-    width: 0.3rem;
+.evaluate .start .iconImg{
+    display: inline-block;
+    vertical-align: middle;
+    width: 1.95rem;
     height: 0.3rem;
+    background: url("../images/game_score1.png")no-repeat left center;
+    background-size: auto 100%;
+}
+.evaluate .start .iconImg>div{
+    display: block;
+    height: 100%;
+    background: url("../images/game_score2.png")no-repeat left center;
+    background-size: auto 100%;
 }
 .evaluate-box{
     display: flex;
@@ -443,4 +454,5 @@
 }
 .swiper-container-horizontal>.swiper-pagination-bullets{
     bottom: -9px !important;
-}
+}
+