From b5ed51bed19003fbd6afd07677ce47eeb848351e Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Fri, 11 Oct 2019 17:15:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0->=E4=B8=8B=E7=BA=A7?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B8=B8=E6=88=8Fbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/ApplyController.class.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Application/Home/Controller/ApplyController.class.php b/Application/Home/Controller/ApplyController.class.php index 065cbd863..85b6c74f5 100644 --- a/Application/Home/Controller/ApplyController.class.php +++ b/Application/Home/Controller/ApplyController.class.php @@ -1578,6 +1578,13 @@ class ApplyController extends BaseController $save['ratio'] = $gameData['ratio']; $save['money'] = $gameData['money']; + $gameSource = M('Game_source', 'tab_')->field('id,source_version')->where(['game_id' => $gameId])->find(); + if (!file_exists(get_game_source_file_url($gameId)) || null == $gameSource) { + $save['enable_status'] = -1; + } else { + $save['enable_status'] = 2; + } + $res = M('Apply', 'tab_')->add($save); if (!$res) { From efccda637bc54bf97b8065ede2928b71d386a94b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9C=E2=80=98?= <“chenzhi063@qq.com> Date: Fri, 11 Oct 2019 17:18:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TestResourceController.class.php | 53 +++ .../View/default/Public/promote_base.html | 1 + .../Home/View/default/TestResource/lists.html | 376 ++++++++++++++++++ 3 files changed, 430 insertions(+) create mode 100644 Application/Home/View/default/TestResource/lists.html diff --git a/Application/Home/Controller/TestResourceController.class.php b/Application/Home/Controller/TestResourceController.class.php index 92a956356..545d915b7 100644 --- a/Application/Home/Controller/TestResourceController.class.php +++ b/Application/Home/Controller/TestResourceController.class.php @@ -412,6 +412,59 @@ class TestResourceController extends BaseController M('test_resource','tab_')->commit(); //提交事物 $this->ajaxReturn(['status'=>1,'msg'=>'申请成功']); } + public function lists( $p = 1){ + $page = intval($p); + $page = $page ? $page : 1; //默认显示第一页数据 + $row=10; + if(isset($_REQUEST['row'])) {$row = $_REQUEST['row'];}else{$row = 10;} + + if(!empty(I('type'))||I('type')==='0'){ + $map['apply_status']=I('type'); + } + + if(!empty(I('role_name'))){ + $map['role_name']=['like','%'.I('role_name').'%']; + } + if(!empty(I('server_name'))){ + $map['server_name']=I('server_name'); + } + if(!empty(I('game_name'))){ + $map['game_name']=I('game_name'); + } + if(!empty(I('user_account'))){ + $map['user_account']=['like','%'.I('user_account').'%']; + } + if(!empty($_REQUEST['start'])&&empty($_REQUEST['end'])){ + $map['create_time'] = array('GT',strtotime($_REQUEST['start'])); + unset($_REQUEST['start']); + } + if(empty($_REQUEST['start'])&&!empty($_REQUEST['end'])){ + $map['create_time'] = array('LT',strtotime($_REQUEST['end'])+24*60*60-1); + unset($_REQUEST['end']); + } + if(!empty($_REQUEST['start'])&&!empty($_REQUEST['end'])){ + $map['create_time'] = array('BETWEEN',array(strtotime($_REQUEST['start']),strtotime($_REQUEST['end'])+24*60*60-1)); + unset($_REQUEST['start']);unset($_REQUEST['end']); + } + + $map['promote_id']=session("promote_auth.pid"); + $data=M('test_resource','tab_')->where($map)->order('id desc')->page($page,$row)->select(); + $count=M('test_resource','tab_')->field('id')->where($map)->select(); + $count = count($count); + + $parameter = I("get."); + $parameter['p']=I('get.p',1); + $parameter['row']=I('get.row'); + + + $page = set_pagination($count,$row,$parameter); + if($page) {$this->assign('_page', $page);} + + $this->meta_title = '测试资源申请记录'; + $this->assign('data',$data); + $this->assign('count',$count); + $this->display(); + } } \ No newline at end of file diff --git a/Application/Home/View/default/Public/promote_base.html b/Application/Home/View/default/Public/promote_base.html index 8b4ce202b..ab12ba271 100644 --- a/Application/Home/View/default/Public/promote_base.html +++ b/Application/Home/View/default/Public/promote_base.html @@ -82,6 +82,7 @@
测试资源
测试资源申请 + 测试资源申请记录
diff --git a/Application/Home/View/default/TestResource/lists.html b/Application/Home/View/default/TestResource/lists.html new file mode 100644 index 000000000..da72f100b --- /dev/null +++ b/Application/Home/View/default/TestResource/lists.html @@ -0,0 +1,376 @@ + + + + + + + + + + + + + +
+ +
+
+
当前位置：测试资源>测试资源申请记录
+
+ + 测试资源申请记录 + 说明:测试资源申请记录 +
+ + +
+
+ +
+ class="current" >全部 + class="current" >待审核 + class="current" >审核通过 + class="current" >审核未通过 +
+ +


+
+ +
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+ +
+ +
+ + +
+ + + +
+ +
+ +
+ + + +
+
+
+ + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
游戏名称区服测试账号手机号角色名申请数量实际发放备注审核状态审核意见申请人申请时间审核时间

暂无数据

{$s.game_name}{$s.server_name}{$s.user_account}{$s.phone}{$s.role_name}{$s.apply_resource}{$s.verify_resource}{$s.apply_remark} + 审核未通过 + 审核通过 + 待审核 + + {$s.verify_remark}{$s.promote_account}{:date('Y-m-d H:i:s',$s['create_time'])}{:empty($s['verify_time'])?'':date('Y-m-d H:i:s',$s['verify_time'])}
+ +
{$_page}
+
+
+
+
+ + + + + + + + + + + \ No newline at end of file