From 0b8dfcdc899dfa9bf1f000dee1ed609ea515334b Mon Sep 17 00:00:00 2001 From: zhengchanglong Date: Sun, 17 Nov 2019 17:03:01 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E6=97=B6=E6=97=B6=E5=AE=9E=E6=97=B6=E6=B3=A8=E5=86=8C=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Event/UserEvent.class.php | 123 +++++++++++--------- 1 file changed, 69 insertions(+), 54 deletions(-) diff --git a/Application/Admin/Event/UserEvent.class.php b/Application/Admin/Event/UserEvent.class.php index 5c039f262..e9c7c06de 100644 --- a/Application/Admin/Event/UserEvent.class.php +++ b/Application/Admin/Event/UserEvent.class.php @@ -3,10 +3,10 @@ namespace Admin\Event; use Think\Controller; /** * 后台事件控制器 - * @author 王贺 + * @author 王贺 */ class UserEvent extends BaseEvent { - + public function lists($model=null,$p=1,$extends_map=array()){ parent::custom_list($model,$p,$extends_map); } @@ -31,7 +31,7 @@ class UserEvent extends BaseEvent { } } - if(isset($_REQUEST['row'])) {$row = $_REQUEST['row'];}else{$row = 10;} + if(isset($_REQUEST['row'])) {$row = $_REQUEST['row'];}else{$row = 10;} //读取模型数据列表 $name = $model['m_name']; @@ -56,22 +56,22 @@ class UserEvent extends BaseEvent { ->group('tab_user.id') ->where($map) ->select(); - $count=count($count); - //分页 - - $page = set_pagination($count,$row); - if($page) {$this->assign('_page', $page);} - + $count=count($count); + //分页 + + $page = set_pagination($count,$row); + if($page) {$this->assign('_page', $page);} + $this->assign('model', $model); $this->assign('list_data', $data); $this->assign('count', $count); $this->meta_title = $model['title'].'列表'; - + $this->display($model['template_list']); } - public function user_join_($model = null, $p = 0){ + public function user_join_($model = null, $p = 0){ $model || $this->error('模型名标识必须！'); $page = intval($p); $page = $page ? $page : 1; //默认显示第一页数据 @@ -80,8 +80,8 @@ class UserEvent extends BaseEvent { // 关键字搜索 - if(isset($_REQUEST['row'])) {$row = $_REQUEST['row'];}else{$row = 10;} - + if(isset($_REQUEST['row'])) {$row = $_REQUEST['row'];}else{$row = 10;} + // $row = 1; //读取模型数据列表 $name = $model['m_name']; @@ -114,27 +114,27 @@ class UserEvent extends BaseEvent { /* 数据分页 */ /* 执行查询 */ ->count(); - if($model['ranking']==1){ + if($model['ranking']==1){ $i=($page-1)*$row; foreach ($data as $key => $value) { - $ss[++$i]=$value; + $ss[++$i]=$value; } - $this->assign('list_data', $ss); - }else{ - $this->assign('list_data', $data); - } - //分页 - - $page = set_pagination($count,$row); - if($page) {$this->assign('_page', $page);} - + $this->assign('list_data', $ss); + }else{ + $this->assign('list_data', $data); + } + //分页 + + $page = set_pagination($count,$row); + if($page) {$this->assign('_page', $page);} + $this->assign('model', $model); $this->meta_title = $model['title'].'列表'; $this->display($model['template_list']); } - public function user_join_v1($model = null, $p = 0){ + public function user_join_v1($model = null, $p = 0){ $model || $this->error('模型名标识必须！'); $page = intval($p); $page = $page ? $page : 1; //默认显示第一页数据 @@ -156,8 +156,8 @@ class UserEvent extends BaseEvent { } } - - if(isset($_REQUEST['row'])) {$row = $_REQUEST['row'];}else{$row = 10;} + + if(isset($_REQUEST['row'])) {$row = $_REQUEST['row'];}else{$row = 50;} //读取模型数据列表 $name = $model['m_name']; @@ -175,12 +175,27 @@ class UserEvent extends BaseEvent { ->page($page, $row) /* 执行查询 */ ->select(); - $count=count($data); - //分页 - - $page = set_pagination($count,$row); - if($page) {$this->assign('_page', $page);} - + + $count = M($name,"tab_") + ->field($model['fields']) + ->join($model['join']) + ->join($model['joins']) + ->join($model['joinss']) + // 查询条件 + ->where($model['map']) + /* 默认通过id逆序排列 */ + ->order($model['order']) + ->group($model['group']) + /* 数据分页 */ + /* 执行查询 */ + ->count(); + + //$count=count($data); + //分页 + + $page = set_pagination($count,$row); + if($page) {$this->assign('_page', $page);} + if($_REQUEST['data_order']!=''){ $data_order=reset(explode(',',$_REQUEST['data_order'])); $data_order_type=end(explode(',',$_REQUEST['data_order'])); @@ -188,10 +203,10 @@ class UserEvent extends BaseEvent { $this->assign('userarpu_order_type',$data_order_type); } $data=my_sort($data,$data_order_type,(int)$data_order); - $size=$row;//每页显示的记录数 - $pnum = ceil(count($data) / $size); //总页数，ceil()函数用于求大于数字的最小整数 + //$size=$row;//每页显示的记录数 + //$pnum = ceil(count($data) / $size); //总页数，ceil()函数用于求大于数字的最小整数 //用array_slice(array,offset,length) 函数在数组中根据条件取出一段值;array(数组),offset(元素的开始位置),length(组的长度) - $data = array_slice($data, ($arraypage-1)*$size, $size); + //$data = array_slice($data, ($arraypage-1)*$size, $size); $this->assign('model', $model); $this->assign('list_data', $data); $this->meta_title = $model['title'].'列表'; @@ -220,8 +235,8 @@ class UserEvent extends BaseEvent { } } - - if(isset($_REQUEST['row'])) {$row = $_REQUEST['row'];}else{$row = 10;} + + if(isset($_REQUEST['row'])) {$row = $_REQUEST['row'];}else{$row = 10;} //读取模型数据列表 $name = $model['m_name']; @@ -239,12 +254,12 @@ class UserEvent extends BaseEvent { ->page($page, $row) /* 执行查询 */ ->select(); - $count=count($data); - //分页 - - $page = set_pagination($count,$row); - if($page) {$this->assign('_page', $page);} - + $count=count($data); + //分页 + + $page = set_pagination($count,$row); + if($page) {$this->assign('_page', $page);} + if($_REQUEST['data_order']!=''){ $data_order=reset(explode(',',$_REQUEST['data_order'])); $data_order_type=end(explode(',',$_REQUEST['data_order'])); @@ -266,19 +281,19 @@ class UserEvent extends BaseEvent { /** - *获取用户实体 - *@param int $id - *@return array - *@author 小纯洁 - */ + *获取用户实体 + *@param int $id + *@return array + *@author 小纯洁 + */ public function user_entity($id=0){ - $user = M("user","tab_"); - $map['id'] = $id; - $data = $user->where($map)->find(); + $user = M("user","tab_"); + $map['id'] = $id; + $data = $user->where($map)->find(); if(is_numeric($data['head_img'])){ $data['head_img'] = get_cover($data['head_img'],'path'); } - return $data; + return $data; } - + } From 00858df9fbdc5712e33da86c379519b5ffe9f438 Mon Sep 17 00:00:00 2001 From: zhengchanglong Date: Mon, 18 Nov 2019 16:41:43 +0800 Subject: [PATCH 2/6] =?UTF-8?q?PC=E5=AE=98=E7=BD=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/default/Article/article/detail1.html | 148 +++++++++--------- .../Media/View/default/Public/base.html | 2 +- Public/Media/css/heard.css | 1 + Public/Media/css/supervise.css | 5 +- 4 files changed, 78 insertions(+), 78 deletions(-) diff --git a/Application/Media/View/default/Article/article/detail1.html b/Application/Media/View/default/Article/article/detail1.html index f1a0c5caf..f51533fd8 100644 --- a/Application/Media/View/default/Article/article/detail1.html +++ b/Application/Media/View/default/Article/article/detail1.html @@ -63,13 +63,12 @@
- -
+
-
  • 监护工程概述
    • +
  • 监护工程概述
  • 申请服务流程
  • 监护工程概述
  • 健康提示
    • @@ -253,83 +252,82 @@
    抵制不良网页游戏，拒绝盗版游戏。注意自我保护，谨防受骗上当。适度游戏益脑，沉迷游戏伤身。合理安排时间，享受健康生活。适龄提示：适合12周岁以上使用。
    - - - + + + - - + + \ No newline at end of file diff --git a/Application/Media/View/default/Public/base.html b/Application/Media/View/default/Public/base.html index 92ea68b11..aa74b0327 100644 --- a/Application/Media/View/default/Public/base.html +++ b/Application/Media/View/default/Public/base.html @@ -90,7 +90,7 @@ - + diff --git a/Public/Media/css/heard.css b/Public/Media/css/heard.css index 74f6e5aab..1a2df43ae 100644 --- a/Public/Media/css/heard.css +++ b/Public/Media/css/heard.css @@ -19,6 +19,7 @@ } .heard_tabbar ul{ display: flex; + align-items: center; font-size: 0.24rem; color: #5B5B5B; margin-top: 0.54rem; diff --git a/Public/Media/css/supervise.css b/Public/Media/css/supervise.css index 8655ec593..0b5c91ade 100644 --- a/Public/Media/css/supervise.css +++ b/Public/Media/css/supervise.css @@ -2,6 +2,7 @@ width: 100%; height: 8rem; position: relative; + z-index: -1; } .service_swiper>img:first-child{ width: 100%; @@ -9,7 +10,7 @@ position: relative; z-index: -1; } -.service_swiper>a{ +.back_to_index{ position: absolute; width: 1.20rem; height: 0.4rem; @@ -18,7 +19,7 @@ font-size: 0.2rem; cursor: pointer; } -.service_swiper> a img{ +.back_to_index img{ width: 100%; height: 100%; } From 392c42f356bc5cd556b678b7661e4b31030a151b Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Mon, 18 Nov 2019 16:42:57 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=8E=A9=E5=AE=B6=E5=85=85=E5=80=BC=E7=8E=A9=E5=AE=B6=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/QueryController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 78039b451..e81dd059c 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1856,7 +1856,7 @@ class QueryController extends BaseController $records = []; foreach ($roles as $role) { $records[] = [ - 'user_account' => $role['user_account'], + 'user_account' => encryption($role['user_account']), 'game_name' => $role['game_name'], 'role_name' => $role['role_name'], 'role_id' => $role['role_id'], From 232760c351040a67dc36ef40dc1d83d8448b7a41 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 18 Nov 2019 17:01:21 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86->=E6=AF=8F=E6=97=A5?= =?UTF-8?q?=E6=A6=82=E5=86=B5|=E6=95=B0=E6=8D=AE=E6=B1=87=E6=80=BB--sql?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Base/Repository/SpendRepository.class.php | 8 ++++---- Application/Base/Repository/UserRepository.class.php | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Application/Base/Repository/SpendRepository.class.php b/Application/Base/Repository/SpendRepository.class.php index fa0260cd5..79668d255 100644 --- a/Application/Base/Repository/SpendRepository.class.php +++ b/Application/Base/Repository/SpendRepository.class.php @@ -34,14 +34,14 @@ class SpendRepository $gameIds = $params['game_ids'] ?? []; $conditions = []; - $conditions['pay_status'] = 1; $conditions['promote_id'] = ['in', $ids]; - $conditions['pay_time'] = ['between', [$beginTime, $endTime]]; $conditions['game_id'] = ['in', $gameIds]; - $conditions['pay_way'] = $isBan ? ['neq', '-10'] : ['neq', '-1']; if (!empty($params['server_id'])) { $conditions['server_id'] = $params['server_id']; } + $conditions['pay_way'] = $isBan ? ['neq', '-10'] : ['neq', '-1']; + $conditions['pay_status'] = 1; + $conditions['pay_time'] = ['between', [$beginTime, $endTime]]; return $conditions; } @@ -56,7 +56,6 @@ class SpendRepository $conditions = []; $conditions['pay_status'] = 1; $conditions['promote_id'] = ['in', $ids]; - $conditions['pay_time'] = ['between', [$beginTime, $endTime]]; $conditions['game_id'] = ['in', $gameIds]; if (!empty($params['server_id'])) { $conditions['server_id'] = $params['server_id']; @@ -64,6 +63,7 @@ class SpendRepository if (isset($params['pay_way'])) { $conditions['pay_way'] = $params['pay_way']; } + $conditions['pay_time'] = ['between', [$beginTime, $endTime]]; return $conditions; } diff --git a/Application/Base/Repository/UserRepository.class.php b/Application/Base/Repository/UserRepository.class.php index 87422ee91..b1efad03b 100644 --- a/Application/Base/Repository/UserRepository.class.php +++ b/Application/Base/Repository/UserRepository.class.php @@ -65,13 +65,13 @@ class UserRepository $conditions = []; $conditions['promote_id'] = ['in', $ids]; - $conditions[$params['time_column']] = ['between', [$beginTime, $endTime]]; if (!empty($gameIds)) { $conditions['game_id'] = ['in', $gameIds]; if (!empty($params['server_id'])) { $conditions['server_id'] = $params['server_id']; } } + $conditions[$params['time_column']] = ['between', [$beginTime, $endTime]]; return $conditions; } @@ -107,11 +107,11 @@ class UserRepository $conditions = []; $conditions['promote_id'] = ['in', $ids]; - $conditions[$params['time_column']] = ['between', [$beginTime, $endTime]]; $conditions['game_id'] = ['in', $gameIds]; if ($serverId > 0) { $conditions['server_id'] = $serverId; } + $conditions[$params['time_column']] = ['between', [$beginTime, $endTime]]; return $conditions; } From 936424a4826f9e6a133779047d5094173fea43f0 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 18 Nov 2019 18:01:02 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86->=E6=AF=8F=E6=97=A5?= =?UTF-8?q?=E6=A6=82=E5=86=B5|=E6=95=B0=E6=8D=AE=E6=B1=87=E6=80=BB--sql?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/QueryController.class.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 8a70ddc65..04b1f7acb 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1316,10 +1316,7 @@ class QueryController extends BaseController $allData['spend_voucher'] = 0; if (!empty($data)) { if (intval($endTime - $begTime) / (24 * 3600) <= 31) { - $gameIds = []; - foreach ($data as $list) { - $gameIds[] = $list['game_id']; - } + $gameIds = array_column($data, 'game_id'); $params['game_ids'] = $gameIds; $userRepository = new UserRepository(); From 1e2635cff28e174ecb247d83298bc4e9020aeedf Mon Sep 17 00:00:00 2001 From: zhengchanglong Date: Mon, 18 Nov 2019 18:05:20 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=AE=98=E7=BD=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Public/Mobile/js/home.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Public/Mobile/js/home.js b/Public/Mobile/js/home.js index a879052e2..9c8a6ef15 100644 --- a/Public/Mobile/js/home.js +++ b/Public/Mobile/js/home.js @@ -1,16 +1,17 @@ $(function(){ - + var img = $(".swiper-container .swiper-slide").length; var swiper = new Swiper('.swiper-container', { loop: true, pagination: { el: '.swiper-pagination', clickable: true, }, - autoplay: { + /*autoplay: { delay: 3000, stopOnLastSlide: false, disableOnInteraction: false, - }, + },*/ + autoplay: img > 1, }); }); \ No newline at end of file