测试资源申请页面检索数据修正,检索都统一改为模糊查询,文章详情页隐藏首页,添加返回按钮

master
zyx 5 years ago
parent 608d24b732
commit 3c1b1673f2

@ -31,10 +31,10 @@ class TestResourceController extends BaseController
$map['tab_test_resource.role_name']=['like','%'.I('role_name').'%'];
}
if(!empty(I('user_account'))){
$map['tab_test_resource.user_account']=I('user_account');
$map['tab_test_resource.user_account']=['like','%'.I('user_account').'%'];
}
if(!empty(I('promote_name'))){
$map['tab_test_resource.promote_account']=I('promote_name');
$map['tab_test_resource.promote_account']=['like','%'.I('promote_name').'%'];
}
$map['user.promote_id']=session("promote_auth.pid");
@ -282,6 +282,9 @@ class TestResourceController extends BaseController
$map['create_time'] = array('BETWEEN',array(strtotime($_REQUEST['start']),strtotime($_REQUEST['end'])+24*60*60-1));
unset($_REQUEST['start']);unset($_REQUEST['end']);
}
$map['test.promote_id'] = get_pid();
//
$res = D("test_resource")->getResourceCout($map,$page,$row);
// dump($res);

@ -47,7 +47,7 @@ class TestResourceModel extends Model{
if(empty($res)){
return $res;
}
$rescount = $this
$rescount = $this->table("tab_test_resource as test")
->where($map)
->group("user_id,game_id,server_id")
->buildSql();

@ -1,11 +1,20 @@
<extend name="Public/bases" />
<block name="css">
<link href="__CSS__/20170913/news.css" rel="stylesheet"> <style> .trunk-article .article-title {padding-left:0;line-height:1.4;font-weight:bold;padding:1rem 0;} .trunk-article .article-voice {right:0;} .trunk-article .article-content img {max-width:100%;} </style>
<link href="__CSS__/20170913/news.css" rel="stylesheet"> <style>
.trunk-article .article-title {padding-left:0;line-height:1.4;font-weight:bold;padding:1rem 0;}
.trunk-article .article-voice {right:0;}
.trunk-article .article-content img {max-width:100%;}
.header .nav { display: none }
</style>
</block>
<block name="body">
<div class="banner">
<div class="inner"></div>
</div>
<div style="position: relative;bottom: 100px;left:180px;width:100px;height:35px;text-align: center;background: #2bd8ed;border-radius: 5px">
<a style="line-height: 35px;font-size: 18px;font-weight: 600;color: #ffffff" href="{:U('Promote/msg_list')}">返回</a>
</div>
<div class="page-detail article-detail-detail">
<div class="inner clearfix">
<div class="wrap">

@ -171,4 +171,7 @@ alter table `tab_giftbag` modify COLUMN `giftbag_version` tinyint(2) COMMENT '
-- 2019-10-17 zyx
-- ----------------------------
ALTER TABLE `tab_test_resource`
MODIFY COLUMN `user_account` varchar(50) BINARY CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户帐号' AFTER `user_id`;
MODIFY COLUMN `user_account` varchar(50) BINARY CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户帐号' AFTER `user_id`;
ALTER TABLE `tab_test_resource`
MODIFY COLUMN `role_name` varchar(50) BINARY CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '角色名' AFTER `phone`,
MODIFY COLUMN `promote_account` varchar(30) BINARY CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '所属推广员账号' AFTER `promote_id`;
Loading…
Cancel
Save