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

Application/Home/Controller/DownloadController.class.php

@@ -1625,9 +1625,6 @@ class DownloadController extends BaseController {
         if (!empty($own_id)) {
             if (!empty($map['_string'])) {
                 unset($map['_string']);
-                unset($userPlayInfoWhere['_string']);
-                unset($userGameLoginWhere['_string']);
-                unset($spendWhere['_string']);
             }
 
             $map['tab_apply.promote_id'] = $queryPromote['id'];//本账号

Application/Mobile/Controller/SsgController.class.php

@@ -249,6 +249,7 @@ class SsgController extends BaseController {
         $this->ajaxReturn($msg,'JSON');
         exit();
     }
+
     //真正注册代码
     public function doRegister($account,$password,$phone,$promote_id,$register_way,$register_type, $game_id = 0)
     {

Public/Home/css/index2.css

@@ -76,7 +76,7 @@
 .evaluate .start .iconImg{
     display: inline-block;
     vertical-align: middle;
-    width: 1.95rem;
+    width: 1.84rem;
     height: 0.3rem;
     background: url("../images/game_score1.png")no-repeat left center;
     background-size: auto 100%;
@@ -126,7 +126,7 @@
 }
 .slide-item >img{
     width: 100%;
-    height: 6.22rem;
+    height: 7.82rem;
     pointer-events: none;
 }
 /*隐藏掉滚动条*/