Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev

Application/Home/Controller/QueryController.class.php

@@ -1873,9 +1873,10 @@ class QueryController extends BaseController
             list($records, $pagination, $count) = $this->paginate($query);
 
             $total = M('spend', 'tab_')->alias('s')
-                ->field($fieldS)
+                ->field("$fieldS, $fieldToday as recharge_cost_today")
                 ->where($map)
                 ->find();
+            $total['recharge_cost_today'] = empty($total['recharge_cost_today']) ? '0.00' : $total['recharge_cost_today'];
 
             if (!empty($records)) {
                 foreach ($records as &$list) {
@@ -1888,7 +1889,7 @@ class QueryController extends BaseController
                     $list['login_time'] = empty($list['login_time']) ? '--' : date('Y-m-d H:i:s', $list['login_time']);
                     $list['register_time'] = empty($list['register_time']) ? '--' : date('Y-m-d H:i:s', $list['register_time']);
                     $list['promote_account'] = empty($list['promote_account']) ? '--' : $list['promote_account'];
-                    $list['recharge_cost_today'] = empty($list['recharge_cost_today']) ? '0.00' : $list['promote_account'];
+                    $list['recharge_cost_today'] = empty($list['recharge_cost_today']) ? '0.00' : $list['recharge_cost_today'];
                 }
             }
         }

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

@@ -159,8 +159,8 @@
                     <i class="iconfont iconsort"></i>
                   </if>
                 </th>
-                <th class="sort" sort-name="create_time" class="title-cursor-pointer" title="玩家账号注册的时间">注册时间
-                  <if condition="'create_time' == I('sort_name', '')">
+                <th class="sort" sort-name="register_time" class="title-cursor-pointer" title="玩家账号注册的时间">注册时间
+                  <if condition="'register_time' == I('sort_name', '')">
                     <if condition="1 == $sort">
                       <i class="iconfont iconsort-down"></i>
                       <else/>