From 4f1bebc3afdd04488f18364c5d025e54210f5348 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Mon, 7 Dec 2020 11:10:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B8=B8=E6=88=8F=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/View/Finance/gameStatistics.html    | 29 ++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/View/Finance/gameStatistics.html b/Application/Admin/View/Finance/gameStatistics.html
index c65db4ee3..8be9c3d0b 100644
--- a/Application/Admin/View/Finance/gameStatistics.html
+++ b/Application/Admin/View/Finance/gameStatistics.html
@@ -68,13 +68,34 @@
     .layui-layer{
       overflow: scroll;
     }
+    .main-place .question_content:before{
+        right: 20px;
+        left: auto;
+    }
   </style>
 
 
   <div class="cf main-place top_nav_list navtab_list">
-
     <h3 class="page_title">{$_REQUEST['count_date']}游戏统计</h3>
-    <p class="description_text">说明：仅统计通知成功,结算给上游的是支付成功通知成功，就算给公会的是支付成功</p>
+    <p class="description_text">说明：游戏相关支付统计,结算给上游的是支付成功通知成功的订单，结算给公会的是支付成功的订单</p>
+    <div class="question" style="float: right;margin-right: 20px;">
+      <i class="question_mark">?</i>
+      <ul class="question_content" style="right: -20px;left: auto;">
+          <li class="question_title">数据相关说明</li>
+          <li class="question_list">
+              <span class="">上游结算:</span>
+              <span class="">游戏内充值合计 + 聚合万盟数据 + 聚合其他渠道数据</span>
+          </li>
+          <li class="question_list">
+              <span class="">下游结算:</span>
+              <span class="">游戏内充值合计 + 联运通知失败合计 + 聚合万盟数据	+ 聚合万盟通知失败 - 下游不结算订单</span>
+          </li>
+          <li class="question_list">
+              <span class="">下游不结算订单:</span>
+              <span class="">未在此处体现，指:推广公司不推广某款游戏后，产生的该游戏的流水</span>
+          </li>
+      </ul>
+    </div>
   </div>
 
   <div class="cf top_nav_list">
@@ -178,7 +199,7 @@
           <th ><div class="tooltip"><span style="color: red">联运通知失败合计</span><span class="tooltiptext"><span style="margin-left: -10px">联运所有通知失败的合计金额</span></span></div></th>
           <th ><div class="tooltip">聚合万盟数据<span class="tooltiptext"><span style="margin-left: -10px">聚合平台万盟渠道支付成功且通知成功的金额</span></span></div></th>
           <th ><div class="tooltip"><span style="color: red">聚合万盟通知失败</span><span class="tooltiptext"><span style="margin-left: -10px">聚合平台万盟渠道通知失败的订单合计金额</span></span></div></th>
-          <th ><div class="tooltip">聚合平台测试订单<span class="tooltiptext"><span style="margin-left: -10px">聚合平台测试订单</span></span></div></th>
+          <th ><div class="tooltip"><span style="color: red">聚合平台测试订单</span><span class="tooltiptext"><span style="margin-left: -10px">聚合平台测试订单</span></span></div></th>
           <th ><div class="tooltip">聚合其他渠道数据<span class="tooltiptext"><span style="margin-left: -10px">聚合平台其他渠道（不含万盟）支付成功通知成功订单合计</span></span></div></th>
           <th ><div class="tooltip"><span style="color: red">聚合其他渠道通知失败订单</span><span class="tooltiptext"><span style="margin-left: -10px">聚合平台其他渠道（不含万盟）<br>通知失败的订单合计金额</span></span></div></th>
           <th >操作</th>
@@ -243,7 +264,7 @@
                 'sdk_type'=>$_GET['sdk_type'],
                 'game_id'=>$data['game_id'],
                 'platform_type'=>2,
-              ])}">{$data.test_amount}</a></span>
+              ])}" style="color:red;">{$data.test_amount}</a></span>
               </td>
               <td ><a href="{:U('Finance/aggDetail', [
                 'timestart'=>$_GET['timestart'],