From 7547e867bb3bd9522af6f4fde447e1dd79aae61e Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Mon, 4 Nov 2019 16:42:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E7=BA=A7=E5=8F=98=E5=9B=9B=E7=BA=A7?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/PromoteController.class.php    |   2 +-
 .../PromoteCoinController.class.php           |   7 +-
 .../Home/Controller/QueryController.class.php |   2 +-
 .../View/default/Public/promote_base.html     |  14 +-
 .../Home/View/default/Query/users.html        | 121 ------------------
 5 files changed, 13 insertions(+), 133 deletions(-)
 delete mode 100644 Application/Home/View/default/Query/users.html

diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php
index c17d531f2..654a0b42d 100644
--- a/Application/Admin/Controller/PromoteController.class.php
+++ b/Application/Admin/Controller/PromoteController.class.php
@@ -97,7 +97,7 @@ unset($_REQUEST['parent_id']);
         parent::order_lists(self::model_name,$p,$map);
     }
 
-    private function siteApplyList($request,$p){
+    private function siteApplyList($p){
         if(isset($_REQUEST['promote_id'])){
             $map['promote_id']=$_REQUEST['promote_id'];
             unset($_REQUEST['promote_id']);
diff --git a/Application/Home/Controller/PromoteCoinController.class.php b/Application/Home/Controller/PromoteCoinController.class.php
index 953193a23..e81487c71 100644
--- a/Application/Home/Controller/PromoteCoinController.class.php
+++ b/Application/Home/Controller/PromoteCoinController.class.php
@@ -756,9 +756,10 @@ class PromoteCoinController extends BaseController
     {
         $account = I('account', '');
         $mobile = I('mobile', '');
-        $id = session('promote_auth.pid');
-        $promoteIds = D('Promote')->field('id')->where('parent_id=' . $id . ' or grand_id=' . $id)->select();
-        $promoteIds = array_merge(array_column($promoteIds, 'id'), [$id]);
+        $promote = $this->getLoginPromote();
+        $map = ['chain' => ['like', $promote['chain'] . $promote['id'] . '/%']];
+        $promoteIds = D('Promote')->field('id')->where($map)->getField('id', true);
+        $promoteIds[] = $id;
         $rows = D('UserPlay')->field(['id', 'user_id'])->where(['promote_id' => ['in', $promoteIds]])->select();
 
         $map = [];
diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index 33c30beb4..3d851aa28 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@@ -1974,7 +1974,7 @@ class QueryController extends BaseController
         $parent = null;
         if ($parentId > 0) {
             $parent = M('promote', 'tab_')->where(['id' => $parentId])->find();
-            $currentDisplay = $promoteService->getLevelName($promote['level']) . '推广';
+            $currentDisplay = $promoteService->getLevelName($parent['level']) . '推广';
             $prevParentId = $parent['parent_id'] == $loginPromote['parent_id'] ? 0 : $parent['parent_id'];
         } else {
             $parent = $loginPromote;
diff --git a/Application/Home/View/default/Public/promote_base.html b/Application/Home/View/default/Public/promote_base.html
index 2cf7b0393..d24f4cc5d 100644
--- a/Application/Home/View/default/Public/promote_base.html
+++ b/Application/Home/View/default/Public/promote_base.html
@@ -69,15 +69,15 @@
 			</div>
 
 			<?php endif;?>
-			<!-- <div class="subNav jssubNav"><i class="prev_icon icon_caiwu"></i><span>财务管理</span><i class="arrow_icon"></i></div> -->
-			<!-- <div class="navContent jsnavContent"> -->
+			<div class="subNav jssubNav"><i class="prev_icon icon_caiwu"></i><span>财务管理</span><i class="arrow_icon"></i></div>
+			<div class="navContent jsnavContent">
 
-			<!-- <a href="{:U('Query/my_earning')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq my_earning '>active</if> ">我的结算</a> -->
+			<a href="{:U('Query/my_earning')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq my_earning '>active</if> ">我的结算</a>
 
-			<!-- <lt name="Think.const.PRO_GRADE" value="3"> -->
-			<!-- <a href="{:U('Query/son_earning')}" class="<if condition='CONTROLLER_NAME eq Query and (ACTION_NAME eq son_earning or ACTION_NAME eq son_list)'>active</if> ">子渠道结算</a> -->
-			<!-- </lt> -->
-			<!-- </div> -->
+			<lt name="Think.const.PRO_GRADE" value="3">
+			<a href="{:U('Query/son_earning')}" class="<if condition='CONTROLLER_NAME eq Query and (ACTION_NAME eq son_earning or ACTION_NAME eq son_list)'>active</if> ">子渠道结算</a>
+			</lt>
+			</div>
 			<div class="subNav jssubNav"><i class="prev_icon icon_fenbao"></i><span>游戏管理</span><i class="arrow_icon"></i></div>
 			<div class="navContent jsnavContent">
 				<!--							<a href="{:U('Apply/app_index')}" class="<if condition='CONTROLLER_NAME eq Apply and ACTION_NAME eq app_index '>active</if> ">APP列表</a>-->
diff --git a/Application/Home/View/default/Query/users.html b/Application/Home/View/default/Query/users.html
deleted file mode 100644
index 301e1a8a0..000000000
--- a/Application/Home/View/default/Query/users.html
+++ /dev/null
@@ -1,121 +0,0 @@
-<extend name="Public/promote_base"/>
-<block name="css">
-  <link href="__CSS__/20180207/account.css" rel="stylesheet" >
-</block>
-<block name="body">
-  <div class="page-list normal_list promote-mychlid-list">
-    <div class="trunk-title">
-      <div class="location">
-        <div class="location-container">当前位置：<span>数据中心></span><span>注册明细</span></div>
-      </div>
-      <img src="__IMG__/20180207/icon_normal_game.png">
-      <span class="title_main">注册明细</span>
-    </div>
-    <div class="trunk-content article">
-        <div class="trunk-search clearfix">
-          <form action="{:U('Promote/mychlid',array('row'=>I('get.row')))}" method="post" enctype="multipart/form-data">
-            <div class="form-group fr">
-              <input type="submit" class="submit normal_space" value="查询">
-            </div>
-            <div class="form-group fr normal_space">
-              <input type="text" name="account" class="txt normal_txt" placeholder="请输入玩家帐号" value="{:I('account')}">
-            </div>
-            <div class="form-group fr normal_space">
-              <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}">{$promote.account}</option>
-                </volist>
-              </select>
-            </div>
-            <if condition="$grand_id eq 0">
-            <div class="form-group fr normal_space">
-              <select name="promote_id" class="reselect select_gallery" style="width: 220px;" >
-                <option value="0">请选择推广员</option>
-                <volist name="promotes" id="promote">
-                <option ba-id="{$promote.id}" value="{$promote.id}">{$promote.account}</option>
-                </volist>
-              </select>
-            </div>
-            </if>
-            <if condition="$parent_id eq 0">
-            <div class="form-group fr normal_space">
-              <select name="headman_promote_id" class="reselect select_gallery" style="width: 220px;" >
-                <option value="0">请选择组长</option>
-                <volist name="groupPromotes" id="promote">
-                <option ba-id="{$promote.id}" value="{$promote.id}">{$promote.account}</option>
-                </volist>
-              </select>
-            </div>
-            </if>
-            <div class="form-group normal_space fr">
-              <label>注册时间：</label>
-              <input type="text" id="search-play-time" class="txt" name="register_time" placeholder="注册时间" value="{:I('register_time')}" >
-            </div>
-          </form>
-        </div>
-        <div class="trunk-list list_normal">
-          <table class="table normal_table">
-              <tr class="odd">
-                <th>玩家帐号</th>
-                <th>推广账号</th>
-                <th>设备IMIE/IDFA</th>
-                <th>设备类型</th>
-                <th>注册时间</th>
-                <th>注册IP</th>
-                <th>最近登录时间</th>
-                <th>最近登陆IP</th>
-                <th>操作</th>
-              </tr>
-              <empty name="records">
-              <tr><td colspan="8" style="text-align: center;height: 45vh;"><img src="__IMG__/20180207/icon_wushujv2.png"/><p style="line-height: 40px;color: #A5A5A5;">暂无数据</p></td></tr>
-              <else />
-              <volist name="records" id="record" mod="2">
-                <tr data-id="{$record.id}" class="<eq name='mod' value='1'>odd</eq>">
-                  <td>{$record.account}</td>
-                  <td>{$record.promote_account}</td>
-                  <td>{$record.device_number}</td>
-                  <td></td>
-                  <td>{$record.register_time|date='Y-m-d H:i:s',###}</td>
-                  <td>{$record.register_ip}</td>
-                  <td>{$record.login_time|date='Y-m-d H:i:s',###}</td>
-                  <td>{$record.login_ip}</td>
-                  <td><a href="{:U('Query/userRoles', ['id' => $record['id']])}">查看角色</a></td>
-                </tr>
-              </volist>
-              </empty>
-          </table>
-          
-        </div>
-        <div class="pagenation clearfix">
-          <a class="sch-btn" href="{:U('Export/child',array(
-              'p'=>I('p'),
-              'account'=>I('account'),'xlsname'=>'管理中心_'.get_pro_grade_name(PRO_GRADE,1),'row'=>I('request.row')
-              ))}" >导出</a>
-          {$_page}
-        </div>
-    </div>
-    <div class="page-explain promote-mychlid-explain">
-      <div class="trunk-content article border_normal">
-        <!-- <table class="desccontent">
-          <tr><td class="title" style="width: 100px;display: inline-block;">二级渠道说明：</td><td class="det">推广员默认为一级渠道，一级渠道可通过推广员后台新增二级渠道；二级渠道由一级渠道管理开启权限，并由一级渠道给二级渠道结算，结算可到财务管理操作。</td></tr>           
-      </table>-->
-      </div>
-    </div>
-  </div>
-</block>
-<block name="script">
-<link rel="stylesheet" href="__STATIC__/flatpickr/flatpickr.min.css">
-<script src="__STATIC__/flatpickr/flatpickr.min.js"></script>
-<script src="__STATIC__/flatpickr/l10n/zh.js"></script>
-<script type="text/javascript" src="__JS__/20170831/select2.min.js"></script>
-<script type="text/javascript">
-$(function(){
-  $('#search-play-time').flatpickr({
-    mode: 'range',
-    locale: 'zh',
-  })
-  $('.select_gallery').select2();
-})
-</script>
-</block>
\ No newline at end of file