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

Application/Home/Controller/DownloadController.class.php

@@ -3115,6 +3115,8 @@ class DownloadController extends BaseController {
         '充值次数',
         '昨日充值',
         '未登录天数',
+        '玩家游戏累计登陆天数',
+        '注册时间',
         '最后登录时间',
         '推广员账号',
              
@@ -3172,8 +3174,14 @@ class DownloadController extends BaseController {
         //$spendMap['_string'] = 'uc.game_id = tab_user_play_info.game_id and uc.server_id = tab_user_play_info.server_id and uc.role_id = tab_user_play_info.role_id';
        
         $fieldUC = "sum(uc.recharge_cost) recharge_cost,sum(uc.recharge_count) recharge_count,sum(if(uc.create_time = {$nowTime},uc.recharge_cost,0)) as recharge_cost_today";
-        $fieldUI = "ui.user_account,ui.game_name,ui.role_name,ui.role_level,ui.server_name,ui.play_time,ui.play_ip,ui.promote_account,ui.sdk_version";
-        $field = $fieldUC . ',' . $fieldUI;
+        $fieldUI = "ui.user_account,ui.game_name,ui.role_name,ui.role_level,ui.server_name,ui.play_time,ui.play_ip,ui.promote_account,ui.sdk_version,ui.create_time";
+        $loginRecordMap['lr.create_time'] = $map['uc.create_time'];
+        $loginRecordMap['_string'] = 'lr.user_id = uc.user_id and lr.game_id = uc.game_id';
+        $fieldLR = M('login_daily_record', 'tab_')->alias('lr')
+            ->field("count(*) as count")
+            ->where($loginRecordMap)
+            ->buildSql();
+        $field = $fieldUC . ',' . $fieldUI . ',' . $fieldLR . ' as user_game_login_count';
         $subQuery = M('user_play_data_count', 'tab_')->alias('uc')
         ->field($field)
         ->join('left join tab_user_play_info as ui on ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id')
@@ -3227,6 +3235,8 @@ class DownloadController extends BaseController {
                 $csvData['recharge_count'] = empty($value['recharge_count']) ? 0 : $value['recharge_count'];
                 $csvData['recharge_cost_today'] = empty($value['recharge_cost_today']) ? 0 : $value['recharge_cost_today'];
                 $csvData['unlogin_day'] = empty($value['play_time']) ? '--' : intval((strtotime(date('Y-m-d 00:00:00')) - strtotime(date('Y-m-d 00:00:00', $value['play_time']))) / (24 * 3600));
+                $csvData['user_game_login_count'] = empty($value['user_game_login_count']) ? 0 : $value['user_game_login_count'];
+                $csvData['create_time'] = empty($value['create_time']) ? '--' : date('Y-m-d H:i:s', $value['create_time']);
                 $csvData['play_time'] = empty($value['play_time']) ? '--' :date('Y-m-d H:i:s',$value['play_time']);
                 $csvData['promote_account'] = empty($value['promote_account']) ? '--' :$value['promote_account'];
                 
@@ -3248,6 +3258,8 @@ class DownloadController extends BaseController {
         $allData['recharge_count'] = $total['recharge_count'];
         $allData['recharge_cost_today'] = $total['recharge_cost_today'];
         $allData['unlogin_day'] = '--';
+        $allData['user_game_login_count'] = '--';
+        $allData['create_time'] = '--';
         $allData['play_time'] = '--';
         $allData['promote_account'] = '--';
         mb_convert_variables('GBK', 'UTF-8', $allData);

Application/Home/View/default/Home/landingPage2.html

@@ -24,8 +24,7 @@
     top: 23.28%;
   }
   .home-video video {
-    margin-left: 0.45%;
-    width: 84.75%;
+    width: 84.7222222%;
     border-radius: 4.5%;
   }
   @media(min-width:580px){
@@ -55,7 +54,7 @@
       <?php if ($k == 1) :?>
       <?php if (!empty($game['flooring_page_video'])):?>
       <div class="home-video">
-        <video id="shakeVideo" src="{$game['flooring_page_video']}" controls muted webkit-playsinline="true" playsinline="true"></video>
+        <video id="shakeVideo" src="{$game['flooring_page_video']}" autoplay controls muted webkit-playsinline="true" playsinline="true"></video>
       </div>
       <?php endif;?>
       <?php endif ;?>

Application/Home/View/default/Query/userRecharges.html

@@ -204,6 +204,8 @@
                   <td>--</td>
                   <td>--</td>
                   <td>--</td>
+                  <td>--</td>
+                  <td>--</td>
                 </tr>
               </empty>
           </table>

Application/Media/View/default/Article/article/detail1.html

@@ -70,7 +70,7 @@
 			<div class="list">
 				<li class="selected">监护工程概述</li>
 				<li class="" >申请服务流程</li>
-				<li class="" >家长监护申请引导</li>
+				<li class="" >监护申请引导</li>
 				<li class="" >健康提示</li>
 				<li class="" >纠纷处理</li>
 			</div>
@@ -121,7 +121,7 @@
 				</div>
 				<div style="display:none;">
 					<div class="content_box">
-						<div class="headline">家长监护申请引导</div>
+						<div class="headline">监护申请引导</div>
 						<div>
 							<p>“网络游戏未成年人家长监护工程”是一项由聚侠网根据国家有关规定而发起的一个项目，旨在加强家长对未成年人参与网络游戏的监护，引导未成年人健康、绿色参与网络游戏，和谐家庭关系的社会性公益行动。它提供了一种切实可行的方法，一种家长实施监控的管道，使家长纠正部分未成年子女沉迷游戏的行为成为可能。该项社会公益行动充分反映了中国网络游戏行业高度的社会责任感，对未成年玩家合法权益的关注及对用实际行动营造和谐社会的愿望。</p>
 							<p>具体实施细则如下：</p>

Public/Media/css/supervise.css

@@ -39,7 +39,7 @@
     margin-left: 0.12rem;
 }
 .service_left .list li{
-    width: 1.2rem;
+    /*width: 1.2rem;*/
     height: 0.5rem;
     font-size: 0.16rem;
     color: #292929;
@@ -49,6 +49,7 @@
     text-align: center;
     line-height: 0.5rem;
     margin-right: 0.05rem;
+    padding: 0 0.05rem;
 }
 .service_left .list li.selected{
     background-color: #00A3E1;