From 8bea436dee349f489e04daa07f781156cfb39489 Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Mon, 14 Oct 2019 18:32:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/Controller/QueryController.class.php  | 5 +++++
 Application/Home/View/default/Public/promote_base.html | 2 +-
 Application/Home/View/default/Query/arpu.html          | 8 ++++----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index 59a8a44dd..b8779c9dd 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@@ -665,6 +665,9 @@ class QueryController extends BaseController
             'grand_id' => $promote['id'],
         ];
         $ids = M('promote', 'tab_')->where($map)->getField('id', true);
+        
+        $subPromotes = M('promote', 'tab_')->field(['id', 'account', 'real_name'])->where(['parent_id' => $promote['id']])->select();
+        $games = $this->getGamesByPromote($promote);
 
         $params = [];
         if ($gameId > 0) {
@@ -718,6 +721,8 @@ class QueryController extends BaseController
         } else {
             $timeout = 1;
         }
+        $this->assign('games', $games);
+        $this->assign('subPromotes', $subPromotes);
         $this->assign('timeout', $timeout);
         $this->assign('records', $records);
         $this->display();
diff --git a/Application/Home/View/default/Public/promote_base.html b/Application/Home/View/default/Public/promote_base.html
index 93dc6e8e3..c96dc462d 100644
--- a/Application/Home/View/default/Public/promote_base.html
+++ b/Application/Home/View/default/Public/promote_base.html
@@ -53,7 +53,7 @@
 							<a href="{:U('Query/summary')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq summary '>active</if> ">数据汇总</a>
 							<a href="{:U('Query/recharge')}" class="<if condition='CONTROLLER_NAME eq Query and (ACTION_NAME eq recharge or ACTION_NAME eq viewSpendDetailed) '>active</if> ">充值明细</a>
 							<a href="{:U('Query/register')}" class="<if condition='CONTROLLER_NAME eq Query and (ACTION_NAME eq register or ACTION_NAME eq viewRole) '>active</if> ">注册明细</a>
-							<a href="{:U('Query/arpu_analysis')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq arpu_analysis '>active</if> ">ARPU统计</a>
+							<a href="{:U('Query/arpu')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq arpu '>active</if> ">ARPU统计</a>
 							<!-- <a href="{:U('Query/retention_analysis')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq retention_analysis '>active</if> ">留存统计</a> -->
 							<a href="{:U('Query/userRoles')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq userRoles '>active</if> ">角色查询</a>
 							<a href="{:U('Query/userRecharges')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq userRecharges '>active</if> ">充值玩家</a>
diff --git a/Application/Home/View/default/Query/arpu.html b/Application/Home/View/default/Query/arpu.html
index 0c7d62e0a..a19fb5268 100644
--- a/Application/Home/View/default/Query/arpu.html
+++ b/Application/Home/View/default/Query/arpu.html
@@ -117,7 +117,7 @@
                 </select>
               </div>
               <div class="form-group normal_space">
-                <select id="server-select" name="server_id" class="reselect select_gallery" style="width: 220px;" >
+                <select id="server-select" name="server_id" class="reselect select_gallery" style="width: 220px;" data-server="{:I('server_id', 0)}">
                   <option value="0">请选择区服</option>
                 </select>
               </div>
@@ -137,7 +137,7 @@
               </div>
               <if condition="$parent_id eq 0">
               <div class="form-group normal_space">
-                <select name="promote_id" class="reselect select_gallery" style="width: 220px;" >
+                <select id="group-select" name="promote_id" class="reselect select_gallery" style="width: 220px;" >
                   <option value="0">请选择组长</option>
                   <volist name="subPromotes" id="promote">
                   <option ba-id="{$promote.id}" value="{$promote.id}" <if condition="I('promote_id') == $promote['id']">selected</if>>{$promote.account}</option>
@@ -145,9 +145,9 @@
                 </select>
               </div>
               </if>
-              <if condition="$parent_id gt 0 and $grand_id eq 0">
+              <if condition="$grand_id eq 0">
               <div class="form-group normal_space">
-                <select name="promote_id" class="reselect select_gallery" style="width: 220px;" >
+                <select id="promote-select" name="promote_id" class="reselect select_gallery" style="width: 220px;" data-promote="{:I('promote_id', 0)}">
                   <option value="0">请选择推广员</option>
                   <volist name="subPromotes" id="promote">
                   <option ba-id="{$promote.id}" value="{$promote.id}" <if condition="I('promote_id') == $promote['id']">selected</if>>{$promote.account}</option>