From 98a0ea36315eed54f96f2e3baa169f3aac6c0afb Mon Sep 17 00:00:00 2001
From: zyx <as123498@qq.com>
Date: Sat, 12 Oct 2019 11:13:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E8=8F=9C=E5=8D=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/Controller/TestResourceController.class.php | 2 +-
 Application/Home/View/default/Public/promote_base.html       | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Application/Home/Controller/TestResourceController.class.php b/Application/Home/Controller/TestResourceController.class.php
index d65d95fba..d9727af5f 100644
--- a/Application/Home/Controller/TestResourceController.class.php
+++ b/Application/Home/Controller/TestResourceController.class.php
@@ -153,7 +153,7 @@ class TestResourceController extends BaseController
         $page = intval($p);
         $page = $page ? $page : 1; //默认显示第一页数据
         $row=10;
-        if(isset($_REQUEST['row'])) {$row = $_REQUEST['row'];}else{$row = 1;}
+        if(isset($_REQUEST['row'])) {$row = $_REQUEST['row'];}else{$row = 10;}
 
         $map = [];
         if(!empty(I('server_name'))){
diff --git a/Application/Home/View/default/Public/promote_base.html b/Application/Home/View/default/Public/promote_base.html
index c152c03ae..cb91b69e0 100644
--- a/Application/Home/View/default/Public/promote_base.html
+++ b/Application/Home/View/default/Public/promote_base.html
@@ -83,6 +83,8 @@
 						<div class="navContent jsnavContent">
 							<a href="{:U('TestResource/index')}" class="<if condition='CONTROLLER_NAME eq TestResource and (ACTION_NAME eq index or ACTION_NAME eq add or ACTION_NAME eq apply ) '>active</if> ">测试资源申请</a>
 							<a href="{:U('TestResource/lists')}" class="<if condition='CONTROLLER_NAME eq TestResource and ACTION_NAME eq lists '>active</if> ">测试资源申请记录</a>
+							<a href="{:U('TestResource/supportNumberList')}" class="<if condition='CONTROLLER_NAME eq TestResource and (ACTION_NAME eq supportNumberList or ACTION_NAME eq freezeSupport or ACTION_NAME eq unfreezeSupport or ACTION_NAME eq rechangePassward ) '>active</if> ">扶持号管理</a>
+							<a href="{:U('TestResource/protectLogList')}" class="<if condition='CONTROLLER_NAME eq TestResource and ACTION_NAME eq protectLogList '>active</if> ">日志管理</a>
 						</div>
 						</eq>
 						<eq name="parent_id" value="0">