Merge branch 'dev-cz' into dev

Application/Mobile/Controller/SsgController.class.php

@@ -228,21 +228,9 @@ class SsgController extends BaseController {
             redirect(U("ssg/login"));
             //$this->error("请登入", U('ssg/login'));
         }
-        $map['a.user_id']= $user['user_id'];
-        $map['a.sdk_version'] = 2;
-        $game_list = M("user_play a","tab_")->field("b.*,b.id as game_id,od.pay_status")->join("inner join tab_game b on a.game_id=b.id left join tab_game_supersign od on od.user_id=a.user_id and od.game_id=b.id and od.pay_status=1")->where($map)->select();
-        if (!$game_list) {
-        	$game_list = M("game", "tab_")->field("*, id as game_id")->where(array(
-        		"sdk_version" => 2,
-        		"game_status" => 1,
-        	))->select();
-        	foreach ($game_list as &$v) {
-        		$v['pay_status'] = 0;
-        	}
-        }
+       
         $appqq = M("config", "sys_")->field('value')->where("name='APP_QQ'")->find()['value'];
         $this->assign("app_qq", $appqq);
-        $this->assign("data_list",$game_list);
         $this->display();
     }
     public function getGamaList()

Application/Mobile/View/Ssg/login.html

@@ -143,7 +143,7 @@
                      <!--登陆-->
                     <div class="loginbox">
                         <div class="title">
-                            <img class="back" src="__IMG__/ssg/login/back.png">
+                            <img class="back" src="__IMG__/ssg/login/back.png" >
                             <div>登陆</div>
                             <div class="titleright"></div>
                         </div>
@@ -294,7 +294,7 @@
     })
     $(".back").on("click",function(){
 
-        window.history.go(-1);
+        window.location.href='{:U("home")}';
     })
     $(".chatqq").on("click",function(){
         window.location.href = 'mqqwpa://im/chat?chat_type=wpa&uin={$app_qq}&version=1&src_type=web&web_src=oicqzone.com';

Application/Sdk/View/default/Ipa365/install_show.html

@@ -118,7 +118,7 @@ p,input{
         </div>
     <div class="page-container ">
         <div class="vip-download">
-            <div class="game-info" style="padding: .3rem;width: 6.9rem;height: 3.4rem;font-size: .28rem;">
+            <div class="game-info" style="padding: .3rem;width: 6.9rem;height: 3.4rem;font-size: .28rem;margin: auto;">
                 <img src="__IMG__/ssg/detail/download-bg.png">
                 <div class="game-icon" style="top:.5rem;"><img src="{$game['icon']|get_cover='path'}"></div>
                 <div class="game-title">{$game['game_name']}-超级签</div>