测试资源bug修正

Application/Admin/View/TestResource/protectLogList.html

@@ -42,9 +42,9 @@
     <div class="fr">
       <a <if condition="(I('type') eq 1) or (I('type') eq '') "> class="tabchose" </if>  href="{:U('protectLogList',array('type'=>1))}">日志管理</a>
     </div>
-    <h3 class="page_title">测试资源申请</h3>
+    <h3 class="page_title">防护日志</h3>
     <if condition="(I('type',1) eq 1) ">
-      <p class="description_text">说明：此功能是测试资源申请的功能</p>
+      <p class="description_text">说明：此功能是防护日志的功能</p>
       <else/>
       <p class="description_text">说明：此功是查看并管理混服申请的功能</p>
     </if>

Application/Admin/View/TestResource/supportNumberList.html

@@ -35,9 +35,9 @@
     <div class="fr">
       <a <if condition="(I('type') eq 1) or (I('type') eq '') "> class="tabchose" </if>  href="{:U('supportNumberList',array('type'=>1))}">扶持号管理</a>
     </div>
-    <h3 class="page_title">测试资源申请</h3>
+    <h3 class="page_title">扶持号管理</h3>
     <if condition="(I('type',1) eq 1) ">
-      <p class="description_text">说明：此功能是测试资源申请的功能</p>
+      <p class="description_text">说明：此功能是扶持号管理<的功能</p>
       <else/>
       <p class="description_text">说明：此功是查看并管理混服申请的功能</p>
     </if>

Application/Home/Controller/TestResourceController.class.php

@@ -37,7 +37,7 @@ class TestResourceController extends BaseController
           $map['tab_test_resource.promote_id']=I('promote_id');
       }
 
-      $map['user.promote_id']=session("promote_auth.pid");
+      $map['tab_test_resource.promote_id']=session("promote_auth.pid");
       $data = M('test_resource','tab_')
           ->field('tab_test_resource.id,tab_test_resource.user_id,tab_test_resource.game_name,tab_test_resource.server_name,tab_test_resource.user_account,tab_test_resource.promote_account,tab_test_resource.role_name,tab_test_resource.create_time,device_number,lock_status as check_status')
           ->join('left join tab_user as user on tab_test_resource.user_id = user.id')
@@ -186,6 +186,7 @@ class TestResourceController extends BaseController
         if(!empty(I('types'))){
             $map['type']=I('types');
         }
+//        $map['promote_id']=I('promote_id');
 
         $field = 'id,game_name,server_name,user_account,nickname,promote_account,detail';
         $order = 'id DESC';