From 4c1471f6bb14d478fe285f1fc33d2ddd207624da Mon Sep 17 00:00:00 2001
From: sunke <18850253506@163.com>
Date: Thu, 12 Dec 2019 20:41:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E4=B8=BA=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Home/Controller/DownloadController.class.php       |  1 +
 .../Home/Controller/PlayersController.class.php        | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php
index fbb3391bc..1007d2fbd 100644
--- a/Application/Home/Controller/DownloadController.class.php
+++ b/Application/Home/Controller/DownloadController.class.php
@@ -3361,6 +3361,7 @@ class DownloadController extends BaseController {
                  // $value1['user_account'] = substr_replace($value1['user_account'],'************',3,12);
                  $value1['user_account'] = $this->encryption($value1['user_account']);
                  $value1['pay_order_number'] = $this->encryption($value1['pay_order_number']);
+                 $value1['pay_time'] = ($value1['pay_status'] == 1) ? date('Y-m-d H:i:s', $value1['pay_time']) : '--';
                  $value1['pay_status'] = isset(self::$payStatus[$value1['pay_status']]) ? self::$payStatus[$value1['pay_status']] : "未知状态";
                  $value1['sdk_version'] = getSDKTypeName($value1['sdk_version']);
                  switch ($value1['level']) {
diff --git a/Application/Home/Controller/PlayersController.class.php b/Application/Home/Controller/PlayersController.class.php
index 2f4829fb0..02e19575d 100644
--- a/Application/Home/Controller/PlayersController.class.php
+++ b/Application/Home/Controller/PlayersController.class.php
@@ -98,13 +98,13 @@ class PlayersController extends BaseController {
         $parameter['level_promote_2'] = $levelPromote[0];
         $parameter['level_promote_3'] = $levelPromote[1];
         $parameter['level_promote_4'] = $levelPromote[2];
-        $serverData = $this->getServer($relationGameId, $sdkVersion);
+        $serverData = $this->getServer(I('relation_game_id'), I('sdk_version'));
         $page = set_pagination($count, $row, $parameter);
         if ($page) {
             $this->assign('_page', $page);
         }
         $this->assign('listData',$rs);
-        $this->assign('serverData', $serverData);
+        $this->assign('serverData', $serverData['data']);
         $this->assign('initBegTime', I('begtime'));
         $this->assign('initEndTime', I('endtime'));
        $this->display();
@@ -171,4 +171,10 @@ class PlayersController extends BaseController {
 
         return $result;
     }
+    public function getServerAjax()
+    {
+        $serverData = $this->getServer(I('relation_game_id'), I('sdk_version'));
+
+        $this->ajaxReturn($serverData);
+    }
 }
\ No newline at end of file