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

Application/Home/Controller/QueryController.class.php

@@ -1719,7 +1719,7 @@ class QueryController extends BaseController
         $sortName = trim(I('sort_name', ''));
         $sort = intval(I('sort', 1));
         $sortNameData = ['recharge_cost', 'recharge_count', 'recharge_cost_today', 'unlogin_day'];
-        $nowTime = date('Y-m-d');
+        $nowTime = date('Y-m-d', time() - 3600 * 24);
         $initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime)));
         $initBegTime = empty(I('begtime')) ? $initBegTime : I('begtime');
         $initEndTime = $nowTime;
@@ -1842,6 +1842,7 @@ class QueryController extends BaseController
         $this->assign('initBegTime', $initBegTime);
         $this->assign('initEndTime', $initEndTime);
         $this->assign('sort', $sort);
+        $this->assign('setdate', $nowTime);
         $this->display('userRecharges');
     }
 

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

@@ -31,6 +31,7 @@
       </div>
       <img src="__IMG__/20180207/icon_normal_game.png">
       <span class="title_main">玩家充值</span>
+      <span class="details">说明：充值数据不包含当日</span>
     </div>
     <div class="trunk-content article">
         <div class="trunk-search clearfix jssearch">