From d123f7b7796d3115e693ee51f9c12c6e525f091c Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Fri, 28 Aug 2020 16:57:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/TestOrderController.class.php     |  5 ++---
 Application/Admin/View/Finance/gameStatistics.html     | 10 +++++++++-
 Application/Admin/View/TestOrder/lists.html            |  6 ++++++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Controller/TestOrderController.class.php b/Application/Admin/Controller/TestOrderController.class.php
index 6fd00d6fb..6ac73b078 100644
--- a/Application/Admin/Controller/TestOrderController.class.php
+++ b/Application/Admin/Controller/TestOrderController.class.php
@@ -14,10 +14,9 @@ class TestOrderController extends ThinkController
         $page = $page ? $page : 1; //默认显示第一页数据
         $arraypage = $page;
         $platformType = I('platform_type', 0);
-        $startedAt = I('timestart', '');
-        $endedAt = I('timeend', '');
+        $startedAt = I('timestart', '') == '' ? I('start', '') : I('timestart', '');
+        $endedAt = I('timeend', '') == '' ? I('end', '') : I('timeend', '');
         $gameId = I('game_id', 0);
-
         if (isset($_REQUEST['row'])) {
             $row = $_REQUEST['row'];
         } else {
diff --git a/Application/Admin/View/Finance/gameStatistics.html b/Application/Admin/View/Finance/gameStatistics.html
index f943c8e6c..52697204c 100644
--- a/Application/Admin/View/Finance/gameStatistics.html
+++ b/Application/Admin/View/Finance/gameStatistics.html
@@ -233,7 +233,15 @@
                 'game_name'=>$data['game_name'],
                 'partner_id'=>$_REQUEST['partner_id']
               ])}">{$data.agg_amount}</a></td>
-              <td ><span style="color:red;"><if condition="$data.test_amount neq ''">{$data.test_amount}<else/>0</if></span></td>
+              <td ><span style="color:red;">
+                <a href="{:U('TestOrder/lists', [
+                'timestart'=>$_GET['timestart'],
+                'timeend'=>$_GET['timeend'],
+                'sdk_type'=>$_GET['sdk_type'],
+                'game_id'=>$data['game_id'],
+                'platform_type'=>2,
+              ])}">{$data.test_amount}</a></span>
+              </td>
               <td ><span style="color:red;"><if condition="$data.agg_failed_amount neq ''">{$data.agg_failed_amount}<else/>0</if></span></td>
               <td >
                 <a href="{:U('Finance/gameStatisticsDetail',array(
diff --git a/Application/Admin/View/TestOrder/lists.html b/Application/Admin/View/TestOrder/lists.html
index ac84d8731..dbc396b7b 100644
--- a/Application/Admin/View/TestOrder/lists.html
+++ b/Application/Admin/View/TestOrder/lists.html
@@ -25,6 +25,12 @@
       height:26px;line-height:26px;font-size:12px;
     }
     .select2-results__option[aria-selected] {font-size:12px;}
+    tr td:nth-child(4) {
+      max-width: 200px;
+      word-wrap: break-word;
+      line-height: 1.5;
+      padding: 5px;
+    }
   </style>