From c8f7014fb2584a4268809ff16110930070eb25a0 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Wed, 16 Oct 2019 11:38:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E->=E6=B8=B8=E6=88=8F=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86->=E5=88=86=E6=88=90=E6=AF=94=E4=BE=8B|=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/View/default/GameDivide/index.html    | 4 +++-
 Application/Home/View/default/Public/promote_base.html | 7 ++++++-
 Application/Home/View/default/Query/view_role.html     | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Application/Home/View/default/GameDivide/index.html b/Application/Home/View/default/GameDivide/index.html
index 718080fed..03ff2e4ba 100644
--- a/Application/Home/View/default/GameDivide/index.html
+++ b/Application/Home/View/default/GameDivide/index.html
@@ -201,7 +201,9 @@
               <input id="server_type" name="server_type">
             </div>
 
-            <div class="form-group normal_space fl"><input type="submit" class="submit" id='submit' url="{:U('index','model'=>$model['name'],false)}" value="查询">
+            <div class="form-group normal_space fl">
+              <input type="submit" class="submit" id='submit' url="{:U('index','model='.$model['name'],false)}"
+                     value="查询">
             </div>
 <!--          </form>-->
         </div>
diff --git a/Application/Home/View/default/Public/promote_base.html b/Application/Home/View/default/Public/promote_base.html
index fb5093735..9c9380ebf 100644
--- a/Application/Home/View/default/Public/promote_base.html
+++ b/Application/Home/View/default/Public/promote_base.html
@@ -71,7 +71,12 @@
 			<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>-->
-				<a href="{:U('Apply/index')}" class="<if condition='CONTROLLER_NAME eq Apply and (ACTION_NAME eq index or ACTION_NAME eq my_game or ACTION_NAME eq my_game_ch or ACTION_NAME eq child_game ) '>active</if> ">专服管理</a>
+				<a href="{:U('Apply/gameSpecialList')}" class="<if condition='CONTROLLER_NAME eq Apply and (ACTION_NAME eq gameSpecialList or ACTION_NAME eq specialMyGameList ) '>active</if> ">专服管理</a>
+				<a href="{:U('Apply/gameList')}" class="<if condition='CONTROLLER_NAME eq Apply and (ACTION_NAME eq gameList or ACTION_NAME eq myGameList ) '>active</if> ">混服管理</a>
+				<if condition="getParentPromoteId(PID) eq 0">
+					<a href="{:U('GameDivide/index')}" class="<if condition='CONTROLLER_NAME eq GameDivide and (ACTION_NAME eq index ) '>active</if> ">分成比例</a>
+					<a href="{:U('Promote/setChildGamePermission')}" class="<if condition='CONTROLLER_NAME eq Promote and (ACTION_NAME eq setChildGamePermission ) '>active</if> ">设置</a>
+				</if>
 				<a href="{:U('Apply/feature')}" class="<if condition='CONTROLLER_NAME eq Apply and (ACTION_NAME eq feature or ACTION_NAME eq my_game or ACTION_NAME eq my_game_ch or ACTION_NAME eq child_game ) '>active</if> ">资料专区</a>
 			</div>
 
diff --git a/Application/Home/View/default/Query/view_role.html b/Application/Home/View/default/Query/view_role.html
index b696aec37..17e93e732 100644
--- a/Application/Home/View/default/Query/view_role.html
+++ b/Application/Home/View/default/Query/view_role.html
@@ -96,7 +96,7 @@
                 <tr class="num2">
                   <td>{$vo.user_account}</td>
                   <td>{$vo.game_name}</td>
-                  <td>Phone</td>
+                  <td>--</td>
                   <td>{:getSDKTypeName($vo['sdk_version'])}</td>
                   <td>{$vo.play_time|date='Y-m-d H:i:s',###}</td>
                   <td>{$vo.server_name}</td>