From 389ef7e967dd95b1c8a6cca4eb66ac93b065dea3 Mon Sep 17 00:00:00 2001
From: sunke <18850253506@163.com>
Date: Thu, 5 Mar 2020 19:44:06 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/ExportController.class.php | 3 ++-
 Application/Admin/View/Member/user_info.html            | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index 6e8567c9e..b641c30cf 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -2426,7 +2426,7 @@ class ExportController extends Controller
                     }
     
     
-                    $orderData = M('test_order', 'tab_')->where($map)->page($page,$row)->order('add_time desc')->select();
+                    $orderData = M('test_order', 'tab_')->where($map)->order('add_time desc')->select();
                     $sum_order_amount = M('test_order', 'tab_')->where($map)->field('sum(order_amount) as sum_order_amount,count(1) as count')->find();
                     $sum_pay_amount = M('test_order', 'tab_')->where($map)->field('sum(pay_amount) as sum_order_amount')->find();
                     $xlsData = [];
@@ -7625,6 +7625,7 @@ class ExportController extends Controller
 
         $xlsData = D("spend")->gameStatistics($map);
         foreach ($xlsData as $key => $value) {
+            $xlsData[$key]['game_name'] = substr($value["game_name"],0,strrpos($value["game_name"],'('));
             $xlsData[$key]['all_cash_count'] = $value['cash_count'] + $value['balance_coin_count'] + $value['inside_cash_count'];
             if ($value['sdk_version'] == 1) {
                 $xlsData[$key]['sdk_version'] = '安卓';
diff --git a/Application/Admin/View/Member/user_info.html b/Application/Admin/View/Member/user_info.html
index 4d78b4460..3929848e2 100644
--- a/Application/Admin/View/Member/user_info.html
+++ b/Application/Admin/View/Member/user_info.html
@@ -349,17 +349,17 @@
                                 当前用户累计充值：{$now_count} &#12288;&#12288;
                                 历史累计充值:{$history_count}&#12288;&#12288;
                                 用户数:{$user_count}&#12288;&#12288;
-                                去充用户数:{$device_count}
+                                去重用户数:{$device_count}
                             </td>
                             <td colspan="8" style="font-style: 12px;color: #a9a9a9;text-align: center;">
                                 当前用户累计充值:&#12288;当前属于该推广员的用户的充值累计（不含用户换绑前记录）&#12288;&#12288;/&#12288;&#12288;
                                 历史累计充值:&#12288;历史中属于该推广员的用户的充值累计（含用户换绑前记录）&#12288;&#12288;
-                                去充用户数:{$device_count}
+                                去重用户数:{$device_count}
                             </td>
                             <else />
                             <td colspan="99">
                                 当前用户累计充值：{$now_count}&#12288;&#12288;用户数:{$user_count}&#12288;&#12288;
-                                去充用户数:{$device_count}
+                                去重用户数:{$device_count}
                             </td>
 
                         </if>