From 0b15e9edd5cb11f3d0629b3b3a038385da3658e1 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Sun, 17 Nov 2019 16:17:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=90=8E=E5=8F=B0=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=B8=AD=E5=BF=83=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/View/default/Public/promote_base.html | 6 +++---
 Data/update.sql                                        | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Application/Home/View/default/Public/promote_base.html b/Application/Home/View/default/Public/promote_base.html
index 5ecdbc8ef..ae38f50f1 100644
--- a/Application/Home/View/default/Public/promote_base.html
+++ b/Application/Home/View/default/Public/promote_base.html
@@ -41,13 +41,13 @@
 			<div class="navContent jsnavContent">
 <!--				<a href="{:U('Promote/base_info')}" class="<if condition='CONTROLLER_NAME eq Promote and ACTION_NAME eq base_info '>active</if> ">账户信息</a>-->
 				<?php if (in_array($loginer['level'], [1])):?>
-				<a href="{:U('Promote/children', ['promote_type' => 0])}" class="<if condition='CONTROLLER_NAME eq Promote and (ACTION_NAME eq children or ACTION_NAME eq addPromote or ACTION_NAME eq edit_chlid) '>active</if> ">部门长管理</a>
+				<a href="{:U('Promote/children', ['promote_type' => 0])}" class="<if condition='$_GET["promote_type"]==0 and CONTROLLER_NAME eq Promote and (ACTION_NAME eq children or ACTION_NAME eq addPromote or ACTION_NAME eq edit_chlid) '>active</if> ">部门长管理</a>
 				<?php endif;?>
 				<?php if (in_array($loginer['level'], [1, 2])):?>
-				<a href="{:U('Promote/children', ['promote_type' => 1])}" class="<if condition='CONTROLLER_NAME eq Promote and (ACTION_NAME eq children or ACTION_NAME eq addPromote or ACTION_NAME eq edit_chlid) '>active</if> ">组长管理</a>
+				<a href="{:U('Promote/children', ['promote_type' => 1])}" class="<if condition='$_GET["promote_type"]==1 and CONTROLLER_NAME eq Promote and (ACTION_NAME eq children or ACTION_NAME eq addPromote or ACTION_NAME eq edit_chlid) '>active</if> ">组长管理</a>
 				<?php endif;?>
 				<?php if (in_array($loginer['level'], [1, 2, 3])):?>
-				<a href="{:U('Promote/children', ['promote_type' => 2])}" class="<if condition='CONTROLLER_NAME eq Promote and (ACTION_NAME eq children or ACTION_NAME eq addPromote or ACTION_NAME eq edit_chlid) '>active</if> ">推广员管理</a>
+				<a href="{:U('Promote/children', ['promote_type' => 2])}" class="<if condition='$_GET["promote_type"]==2 and CONTROLLER_NAME eq Promote and (ACTION_NAME eq children or ACTION_NAME eq addPromote or ACTION_NAME eq edit_chlid) '>active</if> ">推广员管理</a>
 				<?php endif;?>
 			</div>
 			<?php endif;?>
diff --git a/Data/update.sql b/Data/update.sql
index ba767c440..5313e103a 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -395,3 +395,8 @@ CREATE TABLE `tab_promote_coin_transfer_log` (
 
 ALTER TABLE `tab_downloadlog`
 	CHANGE COLUMN `conditions` `conditions` VARCHAR(20480) NULL DEFAULT '[]' COMMENT '下载筛选条件' AFTER `content`;
+
+-- 2019-11-17 zhengyongxing
+UPDATE `platform_new`.`tab_quick_menu` SET `url` = '/index.php?s=/Home/PromoteCoin/transferLogs.html' WHERE `id` = 15
+UPDATE `platform_new`.`tab_quick_menu` SET `url` = 'index.php?s=/Home/Promote/children/promote_type/1.html' WHERE `id` = 2
+UPDATE `platform_new`.`tab_quick_menu` SET `url` = '/index.php?s=/Home/Promote/children/promote_type/2.html' WHERE `id` = 3