From 8f1d59aa3978fe03880b29f77b5cc65e02b7056c Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Tue, 26 Nov 2019 20:19:23 +0800 Subject: [PATCH 001/171] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=B8=81=E5=85=85?= =?UTF-8?q?=E5=80=BCbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/TimingController.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Application/Admin/Controller/TimingController.class.php b/Application/Admin/Controller/TimingController.class.php index 5cd2b799a..b2055cc0b 100644 --- a/Application/Admin/Controller/TimingController.class.php +++ b/Application/Admin/Controller/TimingController.class.php @@ -114,6 +114,7 @@ class TimingController extends AdminController { } + public function caculateTodayDevice() { $start = strtotime(date("Ymd",time())); From fd15fde141b6b15087d8b87fceeacfa727c13c61 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 28 Nov 2019 16:34:22 +0800 Subject: [PATCH 002/171] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/ExportController.class.php | 87 ++++++++++++++----- 1 file changed, 67 insertions(+), 20 deletions(-) diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index dc9e97c15..ccb976640 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -3423,14 +3423,23 @@ if ($key == 'model'){ $xlsName = $_REQUEST['xlsname']; - $xlsCell = array( - array('user_account','玩家账号'), - array('game_name','游戏名称'), - array('server_name','游戏区服'), - array('user_nickname','角色名'), - array('login_time','登录时间'), - array('login_ip','最后登录ip'), - ); +// $xlsCell = array( +// array('user_account','玩家账号'), +// array('game_name','游戏名称'), +// array('server_name','游戏区服'), +// array('user_nickname','角色名'), +// array('login_time','登录时间'), +// array('login_ip','最后登录ip'), +// ); + + $xlsCell = array( + '玩家账号', + '游戏名称', + '游戏区服', + '角色名', + '登录时间', + '最后登录ip', + ); @@ -3463,7 +3472,7 @@ if ($key == 'model'){ $map['user_account'] = array('like', '%' . trim($_REQUEST['account']) . '%'); } - $map['login_time'] = array('neq', 0); +// $map['login_time'] = array('neq', 0); $page = intval($_REQUEST['p']); @@ -3471,26 +3480,64 @@ if ($key == 'model'){ $row = $_REQUEST['row']?$_REQUEST['row']:10; - $data = M('UserLoginRecord','tab_') - ->where($map)->order('id desc')->select(); - $xlsData = []; + //查询数量 + $accessNum = M('UserLoginRecord','tab_') + ->where($map)->order('id desc')->count(); - foreach($data as $k => $v) { + if ($accessNum > 1000000) { + echo "数据量过大，大于100万";die(); + } - $v['login_time'] = date('Y-m-d H:i:s',$v['login_time']); - $v['server_name'] = empty($v['server_name'])?'空':$v['server_name']; + $csvFileName = $xlsName.'.csv'; + //设置好告诉浏览器要下载excel文件的headers + header('Content-Description: File Transfer'); + header('Content-Type: application/vnd.ms-excel'); + header('Content-Disposition: attachment; filename="'. $csvFileName .'"'); + header('Expires: 0'); + header('Cache-Control: must-revalidate'); + header('Pragma: public'); + $fp = fopen('php://output', 'a');//打开output流 + mb_convert_variables('GBK', 'UTF-8', $xlsCell); + fputcsv($fp, $xlsCell);//将数据格式化为CSV格式并写入到output流中 + + $perSize = 50000;//每次查询的条数 + $pages = ceil($accessNum / $perSize); + for($i = 1; $i <= $pages; $i++) { + + $data = M('UserLoginRecord','tab_') + ->field("user_account,game_name,server_name,user_nickname,login_time,login_ip") + ->where($map) + ->limit(($i-1)*$perSize ,$perSize) + ->order('id desc') + ->select(); - $gamename=trim(get_game_name($v['game_id'],'id')); + foreach($data as $k => $v) { - $v['game_name'] = empty($gamename)?($v['type']==2?'APP登录':'平台登录'):$gamename; + $v['login_time'] = date('Y-m-d H:i:s',$v['login_time']); + $v['server_name'] = empty($v['server_name'])?'空':$v['server_name']; - $xlsData[] = $v; +// $gamename=trim(get_game_name($v['game_id'],'id')); - } +// $v['game_name'] = empty($gamename)?($v['type']==2?'APP登录':'平台登录'):$gamename; + $xlsData[] = $v; - $this->exportExcel($xlsName, $xlsCell, $xlsData); + mb_convert_variables('GBK', 'UTF-8', $v); + fputcsv($fp, $v); + } + + unset($xlsData);//释放变量的内存 + //刷新输出缓冲到浏览器 + ob_flush(); + flush();//必须同时使用 ob_flush() 和flush() 函数来刷新输出缓冲。 + } +// $xlsData = []; + + exit(); + + +// $this->exportExcel($xlsName, $xlsCell, $xlsData); } From d07f6177757b0181257d52a74e824b25f2e68579 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 2 Dec 2019 11:36:55 +0800 Subject: [PATCH 003/171] =?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-=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2|=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=85=85=E5=80=BC=E7=BB=9F=E8=AE=A1|=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E7=BB=93=E7=AE=97=E6=98=8E=E7=BB=86--?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=88=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/FinanceController.class.php | 6 +++++ .../Home/Controller/QueryController.class.php | 17 ++++++++++++++ .../View/default/Finance/settlementDtl.html | 22 +++++++++++++++++-- .../Home/View/default/Query/recharge.html | 19 +++++++++++++--- .../View/default/Query/userRecharges.html | 14 ++++++++++++ 5 files changed, 73 insertions(+), 5 deletions(-) diff --git a/Application/Home/Controller/FinanceController.class.php b/Application/Home/Controller/FinanceController.class.php index f8b4e8ceb..b9d6d174f 100644 --- a/Application/Home/Controller/FinanceController.class.php +++ b/Application/Home/Controller/FinanceController.class.php @@ -182,6 +182,7 @@ class FinanceController extends BaseController $parameter['endtime'] = $initEndTime; $data = []; + $total = []; $count = 0; if (intval($endTime - $begTime) / (24 * 3600) <= 31) { $withdrawIds = []; @@ -222,6 +223,10 @@ class FinanceController extends BaseController ->page($page, $row) ->select(); $count = $model->where($map)->count(); + $total = $model->field('sum(pay_amount) as pay_amount,pay_way,sum(if(selle_ratio >= 0,selle_ratio * pay_amount,0)) as income') + ->where($map) + ->find(); + $total['income'] = bcdiv($total['income'], 100, 2); //提现状态 if (empty($withdrawIds)) { @@ -264,6 +269,7 @@ class FinanceController extends BaseController $this->assign('listData', $data); $this->assign('count', $count); + $this->assign('total', $total); $this->assign('initBegTime', $initBegTime); $this->assign('initEndTime', $initEndTime); $this->assign('_page', $page); diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 908a5c82e..f7e04a452 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -91,6 +91,7 @@ class QueryController extends BaseController $data = []; $count = 0; + $income = '0.00'; if (intval($endTime - $begTime) / (24 * 3600) <= 31) { $data = M('Spend', 'tab_') ->field('tab_spend.*,tab_promote.account as pro_account,tab_promote.real_name as pro_real_name,tab_promote.chain as chain') @@ -105,6 +106,14 @@ class QueryController extends BaseController ->join('tab_game on tab_spend.game_id = tab_game.id') ->where($map) ->count(); + + $income = M('Spend', 'tab_') + ->field('sum(tab_spend.pay_amount) as income') + ->join('tab_game on tab_spend.game_id = tab_game.id') + ->join('left join tab_promote on tab_spend.promote_id = tab_promote.id') + ->where($map) + ->order('tab_spend.id desc') + ->find()['income']; } if (!empty($data)) { foreach ($data as &$list) { @@ -177,6 +186,7 @@ class QueryController extends BaseController } $this->assign('listData', $data); $this->assign('count', $count); + $this->assign('income', $income); $this->assign('initBegTime', $initBegTime); $this->assign('initEndTime', $initEndTime); $this->assign('setdate', date("Y-m-d")); @@ -1736,6 +1746,7 @@ class QueryController extends BaseController $records = []; $pagination = ''; $count = 0; + $total = []; if (intval($endTime - $begTime) / (24 * 3600) <= 31) { $map['chain'] = ['like', $queryPromote['chain'] . $queryPromote['id'] . '/%']; $ids = M('promote', 'tab_')->where($map)->getField('id', true); @@ -1824,6 +1835,11 @@ class QueryController extends BaseController $query = M()->alias('record') ->table($subQuery) ->order($orderBy); + $total = M('user_play_data_count', 'tab_')->alias('uc') + ->field($fieldUC) + ->join('tab_user_play_info as ui on ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id') + ->where($map) + ->find(); list($records, $pagination, $count) = $this->paginate($query); @@ -1839,6 +1855,7 @@ class QueryController extends BaseController $this->assign('records', $records); $this->assign('pagination', $pagination); $this->assign('count', $count); + $this->assign('total', $total); $this->assign('initBegTime', $initBegTime); $this->assign('initEndTime', $initEndTime); $this->assign('sort', $sort); diff --git a/Application/Home/View/default/Finance/settlementDtl.html b/Application/Home/View/default/Finance/settlementDtl.html index aefcaf46a..d438f9fca 100644 --- a/Application/Home/View/default/Finance/settlementDtl.html +++ b/Application/Home/View/default/Finance/settlementDtl.html @@ -164,11 +164,11 @@ {$vo.promote_account} {$vo.pay_amount} - 0 + 0.00 {$vo.pay_amount} {$vo.pay_amount} - 0 + 0.00 {$vo.selle_ratio}%|{$vo.selle_ratio}% {$vo.income} @@ -176,6 +176,24 @@ {$vo.selle_status} + + 合计} + -- + -- + -- + {$total.pay_amount} + + 0.00 + {$total.pay_amount} + + {$total.pay_amount} + 0.00 + + -- + {$total.income} + -- + -- + diff --git a/Application/Home/View/default/Query/recharge.html b/Application/Home/View/default/Query/recharge.html index d7a658ae1..b59d47b23 100644 --- a/Application/Home/View/default/Query/recharge.html +++ b/Application/Home/View/default/Query/recharge.html @@ -196,9 +196,9 @@ {$vo.game_name} {$vo.server_name} {$vo.game_player_name} - {$vo.p_p_pro_account}({$vo.p_p_pro_real_name}) - {$vo.p_pro_account}({$vo.p_pro_real_name}) - {$vo.pro_account}({$vo.pro_real_name}) + {$vo.p_p_pro_account}({$vo.p_p_pro_real_name}) + {$vo.p_pro_account}({$vo.p_pro_real_name}) + {$vo.pro_account}({$vo.pro_real_name}) {$vo.pay_time|date='Y-m-d H:i:s',###} @@ -206,6 +206,19 @@ + + 合计 + -- + -- + {$income} + -- + -- + -- + -- + -- + -- + -- + diff --git a/Application/Home/View/default/Query/userRecharges.html b/Application/Home/View/default/Query/userRecharges.html index 98b80d789..67a7f0889 100644 --- a/Application/Home/View/default/Query/userRecharges.html +++ b/Application/Home/View/default/Query/userRecharges.html @@ -167,6 +167,20 @@ {$record.promote_account} + + 合计 + -- + -- + -- + -- + -- + {$total.recharge_cost} + {$total.recharge_count} + {$total.recharge_cost_today} + -- + -- + -- + From ae8daa1c45d8fa61a585c6c438c968039b7e3a7b Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 2 Dec 2019 11:41:25 +0800 Subject: [PATCH 004/171] =?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-=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2|=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=85=85=E5=80=BC=E7=BB=9F=E8=AE=A1|=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E7=BB=93=E7=AE=97=E6=98=8E=E7=BB=86--?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=88=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Finance/settlementDtl.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Home/View/default/Finance/settlementDtl.html b/Application/Home/View/default/Finance/settlementDtl.html index d438f9fca..70b0f92af 100644 --- a/Application/Home/View/default/Finance/settlementDtl.html +++ b/Application/Home/View/default/Finance/settlementDtl.html @@ -177,7 +177,7 @@ - 合计} + 合计 -- -- -- From ab524feffb0ac39a9170e018b2daf46454fe8946 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 2 Dec 2019 11:42:20 +0800 Subject: [PATCH 005/171] =?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-=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2|=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=85=85=E5=80=BC=E7=BB=9F=E8=AE=A1|=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E7=BB=93=E7=AE=97=E6=98=8E=E7=BB=86--?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=88=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/default/Finance/settlementDtl.html | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Application/Home/View/default/Finance/settlementDtl.html b/Application/Home/View/default/Finance/settlementDtl.html index aefcaf46a..a62bdff29 100644 --- a/Application/Home/View/default/Finance/settlementDtl.html +++ b/Application/Home/View/default/Finance/settlementDtl.html @@ -176,6 +176,24 @@ {$vo.selle_status} + + 合计 + -- + -- + -- + {$total.pay_amount} + + 0.00 + {$total.pay_amount} + + {$total.pay_amount} + 0.00 + + -- + {$total.income} + -- + -- + From 80115e9c380a8513598f7405122516d6276a9861 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 2 Dec 2019 11:43:15 +0800 Subject: [PATCH 006/171] =?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-=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2|=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=85=85=E5=80=BC=E7=BB=9F=E8=AE=A1|=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E7=BB=93=E7=AE=97=E6=98=8E=E7=BB=86--?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=88=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/View/default/Query/userRecharges.html | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Application/Home/View/default/Query/userRecharges.html b/Application/Home/View/default/Query/userRecharges.html index 98b80d789..67a7f0889 100644 --- a/Application/Home/View/default/Query/userRecharges.html +++ b/Application/Home/View/default/Query/userRecharges.html @@ -167,6 +167,20 @@ {$record.promote_account} + + 合计 + -- + -- + -- + -- + -- + {$total.recharge_cost} + {$total.recharge_count} + {$total.recharge_cost_today} + -- + -- + -- + From d600886e918c2b80ea8d7cd7179f931e2af4d190 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 2 Dec 2019 11:43:51 +0800 Subject: [PATCH 007/171] =?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-=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2|=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=85=85=E5=80=BC=E7=BB=9F=E8=AE=A1|=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E7=BB=93=E7=AE=97=E6=98=8E=E7=BB=86--?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=88=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Query/recharge.html | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Application/Home/View/default/Query/recharge.html b/Application/Home/View/default/Query/recharge.html index d7a658ae1..69a1df648 100644 --- a/Application/Home/View/default/Query/recharge.html +++ b/Application/Home/View/default/Query/recharge.html @@ -206,6 +206,19 @@ + + 合计 + -- + -- + {$income} + -- + -- + -- + -- + -- + -- + -- + From ca5da52a4d455e885a4552291fc78738c0eeb9d0 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 2 Dec 2019 11:44:38 +0800 Subject: [PATCH 008/171] =?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-=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2|=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=85=85=E5=80=BC=E7=BB=9F=E8=AE=A1|=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E7=BB=93=E7=AE=97=E6=98=8E=E7=BB=86--?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=88=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/FinanceController.class.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Application/Home/Controller/FinanceController.class.php b/Application/Home/Controller/FinanceController.class.php index f8b4e8ceb..b9d6d174f 100644 --- a/Application/Home/Controller/FinanceController.class.php +++ b/Application/Home/Controller/FinanceController.class.php @@ -182,6 +182,7 @@ class FinanceController extends BaseController $parameter['endtime'] = $initEndTime; $data = []; + $total = []; $count = 0; if (intval($endTime - $begTime) / (24 * 3600) <= 31) { $withdrawIds = []; @@ -222,6 +223,10 @@ class FinanceController extends BaseController ->page($page, $row) ->select(); $count = $model->where($map)->count(); + $total = $model->field('sum(pay_amount) as pay_amount,pay_way,sum(if(selle_ratio >= 0,selle_ratio * pay_amount,0)) as income') + ->where($map) + ->find(); + $total['income'] = bcdiv($total['income'], 100, 2); //提现状态 if (empty($withdrawIds)) { @@ -264,6 +269,7 @@ class FinanceController extends BaseController $this->assign('listData', $data); $this->assign('count', $count); + $this->assign('total', $total); $this->assign('initBegTime', $initBegTime); $this->assign('initEndTime', $initEndTime); $this->assign('_page', $page); From c5a5bc5c696bec9a1c1c14e0a94ef94282bc18e6 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 2 Dec 2019 11:45:59 +0800 Subject: [PATCH 009/171] =?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-=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2|=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=85=85=E5=80=BC=E7=BB=9F=E8=AE=A1|=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E7=BB=93=E7=AE=97=E6=98=8E=E7=BB=86--?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=88=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/QueryController.class.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 908a5c82e..849df3f73 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -91,6 +91,7 @@ class QueryController extends BaseController $data = []; $count = 0; + $income = '0.00'; if (intval($endTime - $begTime) / (24 * 3600) <= 31) { $data = M('Spend', 'tab_') ->field('tab_spend.*,tab_promote.account as pro_account,tab_promote.real_name as pro_real_name,tab_promote.chain as chain') @@ -105,6 +106,14 @@ class QueryController extends BaseController ->join('tab_game on tab_spend.game_id = tab_game.id') ->where($map) ->count(); + + $income = M('Spend', 'tab_') + ->field('sum(tab_spend.pay_amount) as income') + ->join('tab_game on tab_spend.game_id = tab_game.id') + ->join('left join tab_promote on tab_spend.promote_id = tab_promote.id') + ->where($map) + ->order('tab_spend.id desc') + ->find()['income']; } if (!empty($data)) { foreach ($data as &$list) { @@ -177,6 +186,7 @@ class QueryController extends BaseController } $this->assign('listData', $data); $this->assign('count', $count); + $this->assign('income', $income); $this->assign('initBegTime', $initBegTime); $this->assign('initEndTime', $initEndTime); $this->assign('setdate', date("Y-m-d")); From 1a2bc7b4c5f689e39533e3325c892161a9cfc887 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 2 Dec 2019 11:47:35 +0800 Subject: [PATCH 010/171] =?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-=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2|=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=85=85=E5=80=BC=E7=BB=9F=E8=AE=A1|=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E7=BB=93=E7=AE=97=E6=98=8E=E7=BB=86--?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=88=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/QueryController.class.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 849df3f73..f7e04a452 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1746,6 +1746,7 @@ class QueryController extends BaseController $records = []; $pagination = ''; $count = 0; + $total = []; if (intval($endTime - $begTime) / (24 * 3600) <= 31) { $map['chain'] = ['like', $queryPromote['chain'] . $queryPromote['id'] . '/%']; $ids = M('promote', 'tab_')->where($map)->getField('id', true); @@ -1834,6 +1835,11 @@ class QueryController extends BaseController $query = M()->alias('record') ->table($subQuery) ->order($orderBy); + $total = M('user_play_data_count', 'tab_')->alias('uc') + ->field($fieldUC) + ->join('tab_user_play_info as ui on ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id') + ->where($map) + ->find(); list($records, $pagination, $count) = $this->paginate($query); @@ -1849,6 +1855,7 @@ class QueryController extends BaseController $this->assign('records', $records); $this->assign('pagination', $pagination); $this->assign('count', $count); + $this->assign('total', $total); $this->assign('initBegTime', $initBegTime); $this->assign('initEndTime', $initEndTime); $this->assign('sort', $sort); From 81a968947b8a3579c482ba4a4d29bd1f5fd3c354 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Mon, 2 Dec 2019 12:36:09 +0800 Subject: [PATCH 011/171] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Base/Service/PromoteService.class.php | 50 +++++++++++++++++++ .../Home/Controller/HomeController.class.php | 7 ++- .../Controller/PackageController.class.php | 5 +- 3 files changed, 58 insertions(+), 4 deletions(-) diff --git a/Application/Base/Service/PromoteService.class.php b/Application/Base/Service/PromoteService.class.php index a8d5e1e7c..79fa51a05 100644 --- a/Application/Base/Service/PromoteService.class.php +++ b/Application/Base/Service/PromoteService.class.php @@ -958,4 +958,54 @@ class PromoteService { return M('promote', 'tab_')->add($data); } + + public function getLandingPageIdentifier($url) + { + $code = $this->getUrlParam($url, 'code'); + if ($code === null) { + $pid = $this->getUrlParam($url, 'gid'); + $gid = $this->getUrlParam($url, 'pid'); + if ($gid === null || $gid === null) { + return null; + } else { + return $gid . '-' . $pid; + } + } + return $code; + } + + public function getDownloadIdentifier($url) + { + $code = $this->getUrlParam($url, 'code'); + if ($code === null) { + $pid = $this->getUrlParam($url, 'game_id'); + $gid = $this->getUrlParam($url, 'promote_id'); + if ($gid === null || $gid === null) { + return null; + } else { + return $gid . '-' . $pid; + } + } + return $code; + } + + private function getUrlParam($url, $name) + { + $items = parse_url($url); + $queryString = ltrim($items['query'], 's='); + $queryString = ltrim($queryString, '/'); + $queryString = rtrim($queryString, '.html'); + $rows = explode('/', $queryString); + $codeIndex = null; + foreach ($rows as $key => $value) { + if ($key >= 3 && $value == $name) { + $codeIndex = $key; + break; + } + } + if ($codeIndex !== null) { + return $rows[$codeIndex + 1] ?? null; + } + return null; + } } \ No newline at end of file diff --git a/Application/Home/Controller/HomeController.class.php b/Application/Home/Controller/HomeController.class.php index 9254e4332..5a0a198ad 100644 --- a/Application/Home/Controller/HomeController.class.php +++ b/Application/Home/Controller/HomeController.class.php @@ -142,8 +142,9 @@ class HomeController extends Controller $this->error('访问错误'); } - $blackList = M('device_bans', 'tab_')->where(['type' => 3])->getField('tag', true); - if (in_array($code, $blackList) || in_array('gid/' . $gameId . '/pid/' . $promoteId, $blackList)) { + $identifier = $code != '' ? $code : 'gid/' . $gameId . '/pid/' . $promoteId; + $isBlack = M('device_bans', 'tab_')->where(['type' => 3, 'tag' => ['like', '%' . $identifier . '%']])->limit(1)->getField('id'); + if ($isBlack) { $this->error('该链接已被禁'); } @@ -228,6 +229,8 @@ class HomeController extends Controller $this->assign('apply', $apply); $this->assign('game', $game); $this->assign('promoteId', $promoteId); + $cur_url = base64_encode(base64_encode("http://" . $_SERVER['HTTP_HOST'] . __SELF__)); + $this->assign('cur_url', $cur_url); $this->display('landingPage'); } diff --git a/Application/Home/Controller/PackageController.class.php b/Application/Home/Controller/PackageController.class.php index 580cc849d..830606409 100644 --- a/Application/Home/Controller/PackageController.class.php +++ b/Application/Home/Controller/PackageController.class.php @@ -35,8 +35,9 @@ class PackageController extends Controller $this->redirect("package/downloadError", ['message' => '访问错误']); } - $blackList = M('device_bans', 'tab_')->where(['type' => 4])->getField('tag', true); - if (in_array($code, $blackList) || in_array('game_id/' . $gameId . '/promote_id/' . $promoteId, $blackList)) { + $identifier = $code != '' ? $code : 'game_id/' . $gameId . '/promote_id/' . $promoteId; + $isBlack = M('device_bans', 'tab_')->where(['type' => 4, 'tag' => ['like', '%' . $identifier . '%']])->limit(1)->getField('id'); + if ($isBlack) { $this->redirect("package/downloadError", ['message' => '该链接已被禁']); } if ($code != '') { From 2ac622807341d064ad1a25026aa07d784dbdbcba Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Mon, 2 Dec 2019 13:43:47 +0800 Subject: [PATCH 012/171] =?UTF-8?q?pc=E5=AE=98=E7=BD=91=20=E5=AE=98?= =?UTF-8?q?=E7=BD=91=E3=80=91----=E3=80=90=E8=B4=A6=E6=88=B7=E5=85=85?= =?UTF-8?q?=E5=80=BC=E3=80=91=E7=82=B9=E5=87=BB=E5=AE=B6=E9=95=BF=E7=9B=91?= =?UTF-8?q?=E6=8A=A4/=E5=AE=A2=E6=9C=8D=E5=B8=AE=E5=8A=A9=EF=BC=8C?= =?UTF-8?q?=E6=97=A0=E5=8F=8D=E9=A6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Home/landingPage.html | 4 ++-- Public/Home/css/index2.css | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index e71bd2348..3f79d60d1 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -336,7 +336,7 @@ $(".gray-btn").click(function(){ event.stopPropagation(); $(".second").show(); - swiperGet(); + // swiperGet(); document.body.style.overflow = 'hidden'; $(".window").hide(); }) @@ -347,7 +347,7 @@ $(".doubt").click(function(){ $(".second").show(); document.body.style.overflow = 'hidden'; - swiperGet(); + // swiperGet(); }) }); diff --git a/Public/Home/css/index2.css b/Public/Home/css/index2.css index 23c821134..7f79dc3d5 100644 --- a/Public/Home/css/index2.css +++ b/Public/Home/css/index2.css @@ -109,7 +109,7 @@ } .slide-item{ width: 4.4rem; - /* height: 6.22rem; */ + height: 6.22rem; margin-right: 30px; list-style: none; } From 245e07fc3fcae5015332ca4b8cd9484ccef6c818 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Mon, 2 Dec 2019 13:57:15 +0800 Subject: [PATCH 013/171] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E8=84=9A=E6=9C=ACbug=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/StatController.class.php | 2 +- Application/Admin/Controller/TimingController.class.php | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/StatController.class.php b/Application/Admin/Controller/StatController.class.php index 3f3ee2da9..e6a7d1252 100644 --- a/Application/Admin/Controller/StatController.class.php +++ b/Application/Admin/Controller/StatController.class.php @@ -1375,7 +1375,7 @@ class StatController extends ThinkController $model = M('device_statistics','tab_'); if ($type == 0) { - $return = $model->sum('new_device'); + $return = $model->where(array('time'=>array('neq',0)))->sum('new_device'); // $return = $device->all_device(); } else if($type == 1) { $return = $model->where(['time'=>array('between',[$todaystart,$todaystart+86399])])->sum('new_device'); diff --git a/Application/Admin/Controller/TimingController.class.php b/Application/Admin/Controller/TimingController.class.php index 5cd2b799a..2a089ff0e 100644 --- a/Application/Admin/Controller/TimingController.class.php +++ b/Application/Admin/Controller/TimingController.class.php @@ -141,9 +141,15 @@ class TimingController extends AdminController { //当日新增设备 $newSql = M('device_record','tab_')->field('min(create_time) as create_time,model,unique_code,id')->where(['version'=>1])->group('unique_code')->select(false); $data['new_device'] = M('device_record','tab_')->table('(' . $newSql . ') as a')->where(['create_time'=>array('between',[$startTime,$startTime+86399])])->order('create_time')->count(); + $data['time'] = $startTime; echo $data['new_device'].' '; + $duration = $this->duration(['create_time'=>array('between',[$startTime-86400*7,$startTime-1])]); + $newSqls = M('device_record','tab_')->field('min(create_time) as create_time,model,unique_code,id')->group('unique_code')->select(false); + $data['duration7'] = ($duration/M('device_record','tab_')->table('(' . $newSqls . ') as a')->where(['create_time'=>array('between',[$startTime-86400*7,$startTime-1])])->order('create_time')->count())/7; + $data['version'] = 1; + $getStatistics = M('device_statistics','tab_')->where(['time'=>$startTime,'version'=>1])->find(); echo "\n"; if (!$getStatistics) { @@ -151,13 +157,14 @@ class TimingController extends AdminController { } else { M('device_statistics','tab_')->where(['time'=>$startTime,'version'=>1])->save($data); } - + $data['duration7'] = 0; echo date("Y-m-d",$startTime).' 苹果 '; //当日新增设备 $newSql = M('device_record','tab_')->field('min(create_time) as create_time,model,unique_code,id')->where(['version'=>2])->group('unique_code')->select(false); $data['new_device'] = M('device_record','tab_')->table('(' . $newSql . ') as a')->where(['create_time'=>array('between',[$startTime,$startTime+86399])])->order('create_time')->count(); echo $data['new_device'].' '; + $data['version'] = 2; $getStatistics = M('device_statistics','tab_')->where(['time'=>$startTime,'version'=>2])->find(); echo "\n"; From d0341414f667562fc6bfb97292d9ff19322ab062 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Mon, 2 Dec 2019 14:06:30 +0800 Subject: [PATCH 014/171] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5css=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Public/Home/css/index2.css | 1 + 1 file changed, 1 insertion(+) diff --git a/Public/Home/css/index2.css b/Public/Home/css/index2.css index 7f79dc3d5..53dd35232 100644 --- a/Public/Home/css/index2.css +++ b/Public/Home/css/index2.css @@ -116,6 +116,7 @@ .slide-item >img{ width: 100%; height: 100%; + pointer-events: none; } /*隐藏掉滚动条*/ .slide-box::-webkit-scrollbar { From 0f8e3946c15f76c3302b86113d5097cb034aa505 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Mon, 2 Dec 2019 14:09:52 +0800 Subject: [PATCH 015/171] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5css?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Public/Home/css/index2.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Public/Home/css/index2.css b/Public/Home/css/index2.css index 53dd35232..7f6dcc55a 100644 --- a/Public/Home/css/index2.css +++ b/Public/Home/css/index2.css @@ -109,13 +109,13 @@ } .slide-item{ width: 4.4rem; - height: 6.22rem; + /*height: 6.22rem;*/ margin-right: 30px; list-style: none; } .slide-item >img{ width: 100%; - height: 100%; + height: 6.22rem; pointer-events: none; } /*隐藏掉滚动条*/ From b4e14251ce8f57549f69ec0993ea682fead66cd9 Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Mon, 2 Dec 2019 14:14:43 +0800 Subject: [PATCH 016/171] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=88=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/DownloadController.class.php | 71 ++++++++++++++++++- 1 file changed, 69 insertions(+), 2 deletions(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index d9104acdd..7988cdcd0 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -2501,7 +2501,12 @@ class DownloadController extends BaseController { $data = $model->field('pay_order_number,game_name,user_account,promote_account,pay_amount,pay_way,if(selle_ratio >= 0,selle_ratio,0) as selle_ratio,pay_time,selle_status,pay_status,withdraw_id') ->where($map) ->order('id desc') - ->select(); + ->select(); + $total = []; + $total = $model->field('sum(pay_amount) as pay_amount,pay_way,sum(if(selle_ratio >= 0,selle_ratio * pay_amount,0)) as income') + ->where($map) + ->find(); + $total['income'] = bcdiv($total['income'], 100, 2); //提现状态 $withdrawIds = []; foreach ($data as $key => $value) { @@ -2548,6 +2553,24 @@ class DownloadController extends BaseController { } } + $allData['pay_order_number'] = '合计'; + $allData['game_name'] = '--'; + $allData['user_account'] = '--'; + $allData['promote_account'] = '--'; + $allData['pay_amount'] = $total['pay_amount']; + if($total['pay_way'] == -1) { + $allData['pay_amount_zhi'] = '0.00'; + $allData['pay_amount_nei'] = $total['pay_amount']; + }else { + $allData['pay_amount_zhi'] = $total['pay_amount']; + $allData['pay_amount_nei'] = '0.00'; + } + $allData['selle_ratio'] = '--'; + $allData['selle_ratio'] = '--'; + $allData['income'] = $total['income']; + $allData['pay_time'] = '--'; + $allData['selle_status'] = '--'; + $data[] = $allData; $xlsData = $data; $this->exportExcel($xlsName, $xlsCell, $xlsData,$id); @@ -2895,6 +2918,12 @@ class DownloadController extends BaseController { $roles = M()->alias('record') ->table($subQuery) ->select(); + $total = []; + $total = M('user_play_data_count', 'tab_')->alias('uc') + ->field($fieldUC) + ->join('tab_user_play_info as ui on ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id') + ->where($map) + ->find(); foreach ($roles as $role) { $records[] = [ 'user_account' => encryption($role['user_account']), @@ -2915,7 +2944,22 @@ class DownloadController extends BaseController { 'unlogin_day' => intval((strtotime(date('Y-m-d 00:00:00')) - strtotime(date('Y-m-d 00:00:00', $role['play_time']))) / (24 * 3600)) ]; } - + $allData['user_account'] = '合计'; + $allData['game_name'] = '--'; + $allData['role_name'] = '--'; + $allData['role_id'] = '--'; + $allData['role_level'] = '--'; + $allData['server_id'] = '--'; + $allData['server_name'] = '--'; + $allData['recharge_cost'] = $total['recharge_cost']; + $allData['recharge_count'] = $total['recharge_count']; + $allData['recharge_cost_today'] = $total['recharge_cost_today']; + $allData['play_time'] = '--'; + $allData['play_ip'] = '--'; + $allData['promote_id'] = '--'; + $allData['promote_account'] = '--'; + $allData['sdk_version'] = '--'; + $allData['unlogin_day'] = '--'; $xlsData = []; foreach ($records as $key1 => $value1) { $value1['user_account'] = $this->encryption($value1['user_account']); @@ -2927,6 +2971,7 @@ class DownloadController extends BaseController { } $xlsData[] = $value1; } + $xlsData[] = $allData; $this->exportExcel($xlsName, $xlsCell, $xlsData,$id); } @@ -3027,6 +3072,28 @@ class DownloadController extends BaseController { ob_flush(); flush(); } + $income = '0.00'; + $income = M('Spend', 'tab_') + ->field('sum(tab_spend.pay_amount) as income') + ->join('tab_game on tab_spend.game_id = tab_game.id') + ->join('left join tab_promote on tab_spend.promote_id = tab_promote.id') + ->where($map) + ->order('tab_spend.id desc') + ->find()['income']; + $csvData1["user_account"] = "合计"; + $csvData1["order_number"] = "--"; + $csvData1["pay_amount"] = $income; + $csvData1["pay_way"] = "--"; + $csvData1["game_name"] = "--"; + $csvData1["server_name"] = "--"; + $csvData1["game_player_name"] = "--"; + $csvData1["p_p_proinfo"] = "--"; + $csvData1["p_proinfo"] = "--"; + $csvData1["proinfo"] = "--"; + $csvData1["pay_time"] = "--"; + mb_convert_variables('GBK', 'UTF-8', $csvData1); + fputcsv($fp, $csvData1); + $xlsData[] = $csvData1; fclose($fp); $this->backSuccessExport($id); } From 174f90bff427bf6c9d92404288ceca9828b6e8af Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 2 Dec 2019 14:15:45 +0800 Subject: [PATCH 017/171] =?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-=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2|=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=85=85=E5=80=BC=E7=BB=9F=E8=AE=A1|=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E7=BB=93=E7=AE=97=E6=98=8E=E7=BB=86--?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=88=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/FinanceController.class.php | 5 ++++- Application/Home/View/default/Finance/settlementDtl.html | 9 ++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Application/Home/Controller/FinanceController.class.php b/Application/Home/Controller/FinanceController.class.php index b9d6d174f..c0c245b2e 100644 --- a/Application/Home/Controller/FinanceController.class.php +++ b/Application/Home/Controller/FinanceController.class.php @@ -223,9 +223,12 @@ class FinanceController extends BaseController ->page($page, $row) ->select(); $count = $model->where($map)->count(); - $total = $model->field('sum(pay_amount) as pay_amount,pay_way,sum(if(selle_ratio >= 0,selle_ratio * pay_amount,0)) as income') + $total = $model->field('sum(pay_amount) as pay_amount,sum(if(pay_way > -1,pay_amount,0)) as direct_pay_amount,sum(if(pay_way = -1,pay_amount,0)) as inner_pay_amount,sum(if(selle_ratio >= 0,selle_ratio * pay_amount,0)) as income') ->where($map) ->find(); + $total['direct_pay_amount'] = empty($total['direct_pay_amount']) ? '0.00' : $total['direct_pay_amount']; + $total['inner_pay_amount'] = empty($total['inner_pay_amount']) ? '0.00' : $total['inner_pay_amount']; + $total['income'] = empty($total['income']) ? 0 : $total['income']; $total['income'] = bcdiv($total['income'], 100, 2); //提现状态 diff --git a/Application/Home/View/default/Finance/settlementDtl.html b/Application/Home/View/default/Finance/settlementDtl.html index a62bdff29..bb44b46ef 100644 --- a/Application/Home/View/default/Finance/settlementDtl.html +++ b/Application/Home/View/default/Finance/settlementDtl.html @@ -182,13 +182,8 @@ -- -- {$total.pay_amount} - - 0.00 - {$total.pay_amount} - - {$total.pay_amount} - 0.00 - + {$total.direct_pay_amount} + {$total.inner_pay_amount} -- {$total.income} -- From c9f28cba9b0ae9866837d8eb42691f4666003be3 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 2 Dec 2019 14:17:03 +0800 Subject: [PATCH 018/171] =?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-=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2|=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=85=85=E5=80=BC=E7=BB=9F=E8=AE=A1|=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E7=BB=93=E7=AE=97=E6=98=8E=E7=BB=86--?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=88=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/FinanceController.class.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Application/Home/Controller/FinanceController.class.php b/Application/Home/Controller/FinanceController.class.php index b9d6d174f..c0c245b2e 100644 --- a/Application/Home/Controller/FinanceController.class.php +++ b/Application/Home/Controller/FinanceController.class.php @@ -223,9 +223,12 @@ class FinanceController extends BaseController ->page($page, $row) ->select(); $count = $model->where($map)->count(); - $total = $model->field('sum(pay_amount) as pay_amount,pay_way,sum(if(selle_ratio >= 0,selle_ratio * pay_amount,0)) as income') + $total = $model->field('sum(pay_amount) as pay_amount,sum(if(pay_way > -1,pay_amount,0)) as direct_pay_amount,sum(if(pay_way = -1,pay_amount,0)) as inner_pay_amount,sum(if(selle_ratio >= 0,selle_ratio * pay_amount,0)) as income') ->where($map) ->find(); + $total['direct_pay_amount'] = empty($total['direct_pay_amount']) ? '0.00' : $total['direct_pay_amount']; + $total['inner_pay_amount'] = empty($total['inner_pay_amount']) ? '0.00' : $total['inner_pay_amount']; + $total['income'] = empty($total['income']) ? 0 : $total['income']; $total['income'] = bcdiv($total['income'], 100, 2); //提现状态 From f596288f319012f929a0160ece349a9dcf8a9a58 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 2 Dec 2019 14:19:06 +0800 Subject: [PATCH 019/171] =?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->=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E7=BB=93=E7=AE=97=E6=98=8E=E7=BB=86--?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Finance/settlementDtl.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Home/View/default/Finance/settlementDtl.html b/Application/Home/View/default/Finance/settlementDtl.html index bb44b46ef..f8aecb696 100644 --- a/Application/Home/View/default/Finance/settlementDtl.html +++ b/Application/Home/View/default/Finance/settlementDtl.html @@ -164,11 +164,11 @@ {$vo.promote_account} {$vo.pay_amount} - 0 + 0.00 {$vo.pay_amount} {$vo.pay_amount} - 0 + 0.00 {$vo.selle_ratio}%|{$vo.selle_ratio}% {$vo.income} From b3ac26ba80e7c52a6d49bc498a47ec79c13eabdb Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Mon, 2 Dec 2019 14:20:57 +0800 Subject: [PATCH 020/171] =?UTF-8?q?=E5=90=88=E8=AE=A1=E5=8C=BA=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/DownloadController.class.php | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 7988cdcd0..eb1a918fc 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -2503,9 +2503,12 @@ class DownloadController extends BaseController { ->order('id desc') ->select(); $total = []; - $total = $model->field('sum(pay_amount) as pay_amount,pay_way,sum(if(selle_ratio >= 0,selle_ratio * pay_amount,0)) as income') - ->where($map) - ->find(); + $total = $model->field('sum(pay_amount) as pay_amount,sum(if(pay_way > -1,pay_amount,0)) as direct_pay_amount,sum(if(pay_way = -1,pay_amount,0)) as inner_pay_amount,sum(if(selle_ratio >= 0,selle_ratio * pay_amount,0)) as income') + ->where($map) + ->find(); + $total['direct_pay_amount'] = empty($total['direct_pay_amount']) ? '0.00' : $total['direct_pay_amount']; + $total['inner_pay_amount'] = empty($total['inner_pay_amount']) ? '0.00' : $total['inner_pay_amount']; + $total['income'] = empty($total['income']) ? 0 : $total['income']; $total['income'] = bcdiv($total['income'], 100, 2); //提现状态 $withdrawIds = []; @@ -2558,13 +2561,8 @@ class DownloadController extends BaseController { $allData['user_account'] = '--'; $allData['promote_account'] = '--'; $allData['pay_amount'] = $total['pay_amount']; - if($total['pay_way'] == -1) { - $allData['pay_amount_zhi'] = '0.00'; - $allData['pay_amount_nei'] = $total['pay_amount']; - }else { - $allData['pay_amount_zhi'] = $total['pay_amount']; - $allData['pay_amount_nei'] = '0.00'; - } + $allData['pay_amount_zhi'] = $total['direct_pay_amount']; + $allData['pay_amount_nei'] = $total['inner_pay_amount']; $allData['selle_ratio'] = '--'; $allData['selle_ratio'] = '--'; $allData['income'] = $total['income']; From 16d91ec2eed55b8c8355b0cd0f049e02aa9cf632 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Mon, 2 Dec 2019 15:01:18 +0800 Subject: [PATCH 021/171] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E8=AF=84=E5=88=86=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/GameController.class.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Application/Admin/Controller/GameController.class.php b/Application/Admin/Controller/GameController.class.php index 86d530a69..8401d8d1d 100644 --- a/Application/Admin/Controller/GameController.class.php +++ b/Application/Admin/Controller/GameController.class.php @@ -290,6 +290,10 @@ class GameController extends ThinkController public function edit($id = null) { if (IS_POST) { + if ($_POST['game_score'] <0 || $_POST['game_score'] > 5) { + $this->error('游戏评分只能为0-5之间的数字！'); + exit; + } /*if($_POST['apply_status']==0&&$_POST['game_status']==1){ $this->error('游戏未审核不允许显示');//游戏添加完成 }*/ From 1af46a74ee9f63aa1fb3a9eb34c0da99e9eef9b6 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 2 Dec 2019 15:04:45 +0800 Subject: [PATCH 022/171] =?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=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86->=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2--?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/AutoController.class.php | 16 ++++++++++++++++ .../Home/Controller/QueryController.class.php | 12 ++++++------ .../Home/View/default/Query/recharge.html | 6 +++--- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/Application/Admin/Controller/AutoController.class.php b/Application/Admin/Controller/AutoController.class.php index a3a75f42a..a7c908c24 100644 --- a/Application/Admin/Controller/AutoController.class.php +++ b/Application/Admin/Controller/AutoController.class.php @@ -955,4 +955,20 @@ public function auto_rrdae(){ } } } + + //用户推广员数据刷新 + public function updateUserPromoteAccount() + { + $map['promote_id'] = ['gt', 0]; + $map['_string'] = "promote_account = '' or promote_account = '自然注册' or promote_account = '官方渠道'"; + $userData = M('user', 'tab_')->field('id,promote_id')->where($map)->select(); + $userPlayData = M('user_play', 'tab_')->field('id,promote_id')->where($map)->select(); + $userPlayInfoData = M('user_play_info', 'tab_')->field('id,promote_id')->where($map)->select(); + + + foreach ($userData as $list) { + $promoteAccount = M('promote', 'tab_')->where(array('id' => $list['promote_id']))->getField('account'); + $res = M()->query("update `tab_user` set promote_account = '{$promoteAccount}' where id = {$list['id']}"); + } + } } diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index f7e04a452..4b3a27fdc 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -32,7 +32,7 @@ class QueryController extends BaseController $serverId = trim(I('server_id', '')); $gamePlayerName = trim(I('game_player_name', '')); $userAccount = trim(I('user_account', '')); - $orderNumber = trim(I('order_number', '')); + $payOrderNumber = trim(I('pay_order_number', '')); $nowTime = date('Y-m-d'); $initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime))); $initBegTime = empty(I('begtime')) ? $initBegTime : I('begtime'); @@ -71,8 +71,8 @@ class QueryController extends BaseController if (!empty($userAccount)) { $map['tab_spend.user_account'] = $userAccount; } - if (!empty($orderNumber)) { - $map['tab_spend.order_number'] = $orderNumber; + if (!empty($payOrderNumber)) { + $map['tab_spend.pay_order_number'] = $payOrderNumber; } if (isset($_REQUEST['pay_way']) && $_REQUEST['pay_way'] !== '') { $payWay = intval(I('pay_way')); @@ -146,7 +146,7 @@ class QueryController extends BaseController $list['user_account'] = substr($list['user_account'], 0, 2) . '******' . substr($list['user_account'], 8); //订单隐藏算法 - $orderLen = strlen($list['order_number']); + $orderLen = strlen($list['pay_order_number']); $strLen = 4; $hideChar = ''; @@ -158,7 +158,7 @@ class QueryController extends BaseController $hideChar .= '*'; } - $list['order_number'] = substr($list['order_number'], 0, $strLen) . $hideChar . substr($list['order_number'], $orderLen - $strLen); + $list['pay_order_number'] = substr($list['pay_order_number'], 0, $strLen) . $hideChar . substr($list['pay_order_number'], $orderLen - $strLen); } } @@ -172,7 +172,7 @@ class QueryController extends BaseController $parameter['server_id'] = $serverId; $parameter['game_player_name'] = $gamePlayerName; $parameter['user_account'] = $userAccount; - $parameter['order_number'] = $orderNumber; + $parameter['pay_order_number'] = $payOrderNumber; $parameter['own_id'] = $ownId; $parameter['level_promote_2'] = $levelPromote[0]; $parameter['level_promote_3'] = $levelPromote[1]; diff --git a/Application/Home/View/default/Query/recharge.html b/Application/Home/View/default/Query/recharge.html index 69a1df648..ddf783b13 100644 --- a/Application/Home/View/default/Query/recharge.html +++ b/Application/Home/View/default/Query/recharge.html @@ -127,8 +127,8 @@
- +
@@ -190,7 +190,7 @@ {$vo.user_account} - {$vo.order_number} + {$vo.pay_order_number} {:get_pay_way($vo['pay_way'])} {$vo.pay_amount} {$vo.game_name} From 5d981f76c606896796dd49f529ffa3892259295f Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Mon, 2 Dec 2019 15:17:08 +0800 Subject: [PATCH 023/171] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=B7=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/DownloadController.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index eb1a918fc..58ade9ff1 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -1196,7 +1196,7 @@ class DownloadController extends BaseController { empty(I('server_id')) || $map['tab_spend.server_id'] = I('server_id'); empty(I('game_player_name')) || $map['tab_spend.game_player_name'] = ['like', '%' . I('game_player_name') . '%']; empty(I('user_account')) || $map['tab_spend.user_account'] = ['like', '%' . I('user_account') . '%']; - empty(I('order_number')) || $map['tab_spend.order_number'] = I('order_number'); + empty(I('pay_order_number')) || $map['tab_spend.pay_order_number'] = I('pay_order_number'); $map['tab_spend.pay_status'] = 1; $map['tab_spend.is_check'] = ['neq', 2]; @@ -3030,7 +3030,7 @@ class DownloadController extends BaseController { $value1['proinfo'] = $value1['pro_account'].'('.$value1['pro_real_name'].')'; // $value1['user_account'] = substr_replace($value1['user_account'],'************',3,12); $value1['user_account'] = $this->encryption($value1['user_account']); - $value1['order_number'] = $this->encryption($value1['order_number']); + $value1['pay_order_number'] = $this->encryption($value1['pay_order_number']); if(!empty($value1['chain'])) { $chain = trim($value1['chain'],'/'); $chainArr = explode('/', $chain); @@ -3052,7 +3052,7 @@ class DownloadController extends BaseController { } $csvData["user_account"] = $value1["user_account"]; - $csvData["order_number"] = $value1["order_number"]; + $csvData["pay_order_number"] = $value1["pay_order_number"]; $csvData["pay_amount"] = $value1["pay_amount"]; $csvData["pay_way"] = $value1["pay_way"]; $csvData["game_name"] = $value1["game_name"]; @@ -3079,7 +3079,7 @@ class DownloadController extends BaseController { ->order('tab_spend.id desc') ->find()['income']; $csvData1["user_account"] = "合计"; - $csvData1["order_number"] = "--"; + $csvData1["pay_order_number"] = "--"; $csvData1["pay_amount"] = $income; $csvData1["pay_way"] = "--"; $csvData1["game_name"] = "--"; From a06537a9daa7bef2c348e42fca05e6d4dd0d22ff Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Mon, 2 Dec 2019 15:18:14 +0800 Subject: [PATCH 024/171] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=AE=98=E7=BD=91css?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Public/Mobile/css/common.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Public/Mobile/css/common.css b/Public/Mobile/css/common.css index 0af4f8f35..42343feb6 100644 --- a/Public/Mobile/css/common.css +++ b/Public/Mobile/css/common.css @@ -9,7 +9,7 @@ html { color:#333; overflow-x:hidden; margin: 0 auto; - max-width: 640px; + /*max-width: 640px;*/ } img { /*height: 100%;*/ @@ -39,7 +39,7 @@ body { -webkit-highlight: none; overflow:auto; -webkit-tap-highlight-color: rgba(0,0,0,0); - max-width:640px; + /*max-width:640px;*/ margin:0 auto; } .clearfix { From 086a364f41f41143424fd547b995abe7192fcba9 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Mon, 2 Dec 2019 15:20:08 +0800 Subject: [PATCH 025/171] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=AE=98=E7=BD=91?= =?UTF-8?q?=E5=AE=9E=E5=90=8D=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Mobile/Controller/UserController.class.php | 4 ++-- Application/Mobile/View/User/userauth.html | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Application/Mobile/Controller/UserController.class.php b/Application/Mobile/Controller/UserController.class.php index 48373ab45..3f1d7cc38 100644 --- a/Application/Mobile/Controller/UserController.class.php +++ b/Application/Mobile/Controller/UserController.class.php @@ -1016,8 +1016,8 @@ class UserController extends BaseController // $this->ajaxReturn(array('status' => -1, 'info' => '身份证号码已被使用', 'url' => U('User/userauth'))); // } } - - if (C('tool_age.status') == 0) { + $status = M("Tool","tab_")->field("status")->where("name = 'tool_age'")->find()['status']; + if ($status == 0) { $this->ajaxReturn(array('status' => 0, 'info' => '实名认证暂未开启！', 'url' => U('User/userauth'))); } else { $re = age_verify($_REQUEST['real_name'], $_REQUEST['idcard']); diff --git a/Application/Mobile/View/User/userauth.html b/Application/Mobile/View/User/userauth.html index 1fa5ef00f..186832a67 100644 --- a/Application/Mobile/View/User/userauth.html +++ b/Application/Mobile/View/User/userauth.html @@ -59,15 +59,24 @@ +
+ + + {$game['relation_game_name']} + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + +
+
+ + + + + \ No newline at end of file From c637a8bfe01e701835131e0f3191613f20c216fc Mon Sep 17 00:00:00 2001 From: liaojinling <360197197@qq.com> Date: Tue, 3 Dec 2019 10:33:15 +0800 Subject: [PATCH 083/171] =?UTF-8?q?=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Base/Service/GameSourceService.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Base/Service/GameSourceService.class.php b/Application/Base/Service/GameSourceService.class.php index 4b29cf111..dcfe7edf7 100644 --- a/Application/Base/Service/GameSourceService.class.php +++ b/Application/Base/Service/GameSourceService.class.php @@ -9,7 +9,7 @@ use GuzzleHttp\Client; class GameSourceService { - const IS_FIXED_IOS13 = true; + const IS_FIXED_IOS13 = false; const DEBUG = true; public function __construct() From 20d8fb55992636666f8f5ba54792a0f2890a82c9 Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Tue, 3 Dec 2019 11:16:06 +0800 Subject: [PATCH 084/171] =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/Controller/DownloadController.class.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index a1b3d970a..a45607e66 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -1246,7 +1246,8 @@ class DownloadController extends BaseController { $initEndTime = empty(I('endtime')) ? $initEndTime : I('endtime'); $begTime = strtotime($initBegTime); $endTime = strtotime($initEndTime); - if(!empty(I('endtime'))) { $endTime = $endTime + 24 *3600; } + $endTime += 3600 * 24; + $map1['chain'] = ['like','%'.'/'.PID.'/'.'%']; $rs = M('promote','tab_')->where($map1)->field('id,account,nickname')->select(); $childPromoteIds = ''; @@ -2964,11 +2965,7 @@ class DownloadController extends BaseController { $field = $fieldUC . ',' . $fieldUI; $subQuery = M('user_play_data_count', 'tab_')->alias('uc') ->field($field) -<<<<<<< HEAD ->join('left join tab_user_play_info as ui on ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id') -======= - ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id') ->>>>>>> hotfix/changepack ->where($map) ->group('uc.role_id,uc.server_id,uc.game_id') ->buildSql(); @@ -2978,11 +2975,7 @@ class DownloadController extends BaseController { $total = []; $total = M('user_play_data_count', 'tab_')->alias('uc') ->field($fieldUC) -<<<<<<< HEAD ->join('left join tab_user_play_info as ui on ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id') -======= - ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id') ->>>>>>> hotfix/changepack ->where($map) ->find(); foreach ($roles as $role) { From ee2247d24b92ca873e1c69b147d834490d283b5f Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Tue, 3 Dec 2019 11:38:37 +0800 Subject: [PATCH 085/171] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/View/default/Home/landingPage.html | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index 066990dc5..ea2721885 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -44,7 +44,9 @@
- +
+ +
{$game['relation_game_name']}
{$game['features']}
@@ -62,13 +64,14 @@
{$game['game_score']} -
- - - - - -
+ + +
+
+
+
+
+
14.48K个评分
From ff713b9ea339afe773943699385113d76a11d960 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Tue, 3 Dec 2019 11:40:06 +0800 Subject: [PATCH 086/171] =?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->=E5=85=85=E5=80=BC?= =?UTF-8?q?=E7=8E=A9=E5=AE=B6->=E5=AF=BC=E5=87=BA--=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/DownloadController.class.php | 191 ++++++++++-------- 1 file changed, 107 insertions(+), 84 deletions(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index a45607e66..1711a1f6d 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -1135,8 +1135,8 @@ class DownloadController extends BaseController { public function recharge_data_export() { $beginTime = strtotime(I('begtime') . ' 00:00:00'); $endtime = strtotime(I('endtime') . ' 23:59:59'); - if (($endtime - $beginTime) > 7 * 24 * 3600) { - $this->error('时间范围不能超过7天'); + if (($endtime - $beginTime) > 31 * 24 * 3600) { + $this->error('时间范围不能超过31天'); } $map1['chain'] = ['like','%'.'/'.PID.'/'.'%']; $rs = M('promote','tab_')->where($map1)->field('id,account,nickname')->select(); @@ -3068,88 +3068,111 @@ class DownloadController extends BaseController { $perSize = 5000;//每次查询的条数 $pages = ceil($accessNum / $perSize); - for($i = 1; $i <= $pages; $i++) { - $model = M('spend','tab_'); - $data = $model - ->field('tab_spend.*,tab_promote.account as pro_account,tab_promote.real_name as pro_real_name,tab_promote.chain as chain') - ->join('tab_game on tab_spend.game_id = tab_game.id') - ->join('left join tab_promote on tab_spend.promote_id = tab_promote.id') - ->where($map) - ->limit(($i-1)*$perSize ,$perSize) - ->order('tab_spend.id desc') - ->select(); - foreach ($data as $key1 => $value1) { - $value1['pay_way'] = $this->payWay[$value1['pay_way']]; - $value1['pay_time'] = date('Y-m-d H:i:s',$value1['pay_time']); - $value1['p_p_proinfo'] = $value1['pro_account'].'('.$value1['pro_real_name'].')'; - $value1['p_proinfo'] = $value1['pro_account'].'('.$value1['pro_real_name'].')'; - $value1['proinfo'] = $value1['pro_account'].'('.$value1['pro_real_name'].')'; - // $value1['user_account'] = substr_replace($value1['user_account'],'************',3,12); - $value1['user_account'] = $this->encryption($value1['user_account']); - $value1['pay_order_number'] = $this->encryption($value1['pay_order_number']); - if(!empty($value1['chain'])) { - $chain = trim($value1['chain'],'/'); - $chainArr = explode('/', $chain); - if(!empty($chainArr[1])) { - $thisPromoteData1 = D('Promote') - ->field('account,real_name') - ->where(array('id' => $chainArr[1])) - ->find(); - $value1['p_p_proinfo'] = $thisPromoteData1['account'].'('.$thisPromoteData1['real_name'].')'; //部门长 - } - if(!empty($chainArr[2])) { - $thisPromoteData2 = D('Promote') - ->field('account,real_name') - ->where(array('id' => $chainArr[2])) - ->find(); - $value1['p_proinfo'] = $thisPromoteData2['account'].'('.$thisPromoteData2['real_name'].')'; //组长 - } - - - } - $csvData["user_account"] = $value1["user_account"]; - $csvData["pay_order_number"] = $value1["pay_order_number"]; - $csvData["pay_amount"] = $value1["pay_amount"]; - $csvData["pay_way"] = $value1["pay_way"]; - $csvData["game_name"] = $value1["game_name"]; - $csvData["server_name"] = $value1["server_name"]; - $csvData["game_player_name"] = $value1["game_player_name"]; - $csvData["p_p_proinfo"] = $value1["p_p_proinfo"]; - $csvData["p_proinfo"] = $value1["p_proinfo"]; - $csvData["proinfo"] = $value1["proinfo"]; - $csvData["pay_time"] = $value1["pay_time"]; - mb_convert_variables('GBK', 'UTF-8', $csvData); - fputcsv($fp, $csvData); - $xlsData[] = $csvData; - } - unset($xlsData); - ob_flush(); - flush(); - } - $income = '0.00'; - $income = M('Spend', 'tab_') - ->field('sum(tab_spend.pay_amount) as income') - ->join('tab_game on tab_spend.game_id = tab_game.id') - ->join('left join tab_promote on tab_spend.promote_id = tab_promote.id') - ->where($map) - ->order('tab_spend.id desc') - ->find()['income']; - $csvData1["user_account"] = "合计"; - $csvData1["pay_order_number"] = "--"; - $csvData1["pay_amount"] = $income; - $csvData1["pay_way"] = "--"; - $csvData1["game_name"] = "--"; - $csvData1["server_name"] = "--"; - $csvData1["game_player_name"] = "--"; - $csvData1["p_p_proinfo"] = "--"; - $csvData1["p_proinfo"] = "--"; - $csvData1["proinfo"] = "--"; - $csvData1["pay_time"] = "--"; - mb_convert_variables('GBK', 'UTF-8', $csvData1); - fputcsv($fp, $csvData1); - $xlsData[] = $csvData1; - fclose($fp); - $this->backSuccessExport($id); + $promoteIdData = []; + $promoteData = []; + for($i = 1; $i <= $pages; $i++) { + $model = M('spend','tab_'); + $data = $model + ->field('tab_spend.*,tab_promote.account as pro_account,tab_promote.real_name as pro_real_name,tab_promote.chain as chain,tab_promote.level,tab_promote.parent_id') + ->join('tab_game on tab_spend.game_id = tab_game.id') + ->join('left join tab_promote on tab_spend.promote_id = tab_promote.id') + ->where($map) + ->limit(($i-1)*$perSize ,$perSize) + ->order('tab_spend.id desc') + ->select(); + foreach ($data as $list) { + switch ($list['level']) { + case 3: + $promoteIdData[] = $list['parent_id']; + break; + case 4: + $promoteIdData[] = $list['parent_id']; + $chain = trim($list['chain'], '/'); + $chainArr = explode('/', $chain); + $promoteIdData[] = $chainArr[1]; + break; + } + } + if (!empty($promoteIdData)) { + $promoteIdData = array_unique($promoteIdData); + $promoteData = M('promote', 'tab_')->where(array('id' => ['in',$promoteIdData]))->getField('id,account,real_name'); + } + foreach ($data as $key1 => $value1) { + $value1['pay_way'] = $this->payWay[$value1['pay_way']]; + $value1['pay_time'] = date('Y-m-d H:i:s',$value1['pay_time']); + $value1['p_p_proinfo'] = $value1['pro_account'].'('.$value1['pro_real_name'].')'; + $value1['p_proinfo'] = $value1['pro_account'].'('.$value1['pro_real_name'].')'; + $value1['proinfo'] = $value1['pro_account'].'('.$value1['pro_real_name'].')'; + // $value1['user_account'] = substr_replace($value1['user_account'],'************',3,12); + $value1['user_account'] = $this->encryption($value1['user_account']); + $value1['pay_order_number'] = $this->encryption($value1['pay_order_number']); + switch ($value1['level']) { + case 3: + $value1['p_p_pro_account'] = $promoteData[$value1['parent_id']]['account']; + $value1['p_p_pro_real_name'] = $promoteData[$value1['parent_id']]['real_name']; + $value1['p_pro_account'] = $value1['pro_account']; + $value1['p_pro_real_name'] = $value1['pro_real_name']; + break; + case 4: + $promoteIdData[] = $value1['parent_id']; + $chain = trim($value1['chain'], '/'); + $chainArr = explode('/', $chain); + $value1['p_p_pro_account'] = $promoteData[$chainArr[1]]['account']; + $value1['p_p_pro_real_name'] = $promoteData[$chainArr[1]]['real_name']; + $value1['p_pro_account'] = $promoteData[$value1['parent_id']]['account']; + $value1['p_pro_real_name'] = $promoteData[$value1['parent_id']]['real_name']; + break; + } + $value1['p_p_proinfo'] = $value1['p_p_pro_account'].'('.$value1['p_p_pro_real_name'].')'; //部门长 + $value1['p_proinfo'] = $value1['p_pro_account'].'('.$value1['p_pro_real_name'].')'; //组长 + unset($value1['p_p_pro_account']); + unset($value1['p_p_pro_real_name']); + unset($value1['p_pro_account']); + unset($value1['p_pro_real_name']); + + $csvData["user_account"] = $value1["user_account"]; + $csvData["pay_order_number"] = $value1["pay_order_number"]; + $csvData["pay_amount"] = $value1["pay_amount"]; + $csvData["pay_way"] = $value1["pay_way"]; + $csvData["game_name"] = $value1["game_name"]; + $csvData["server_name"] = $value1["server_name"]; + $csvData["game_player_name"] = $value1["game_player_name"]; + $csvData["p_p_proinfo"] = $value1["p_p_proinfo"]; + $csvData["p_proinfo"] = $value1["p_proinfo"]; + $csvData["proinfo"] = $value1["proinfo"]; + $csvData["pay_time"] = $value1["pay_time"]; + mb_convert_variables('GBK', 'UTF-8', $csvData); + fputcsv($fp, $csvData); + $xlsData[] = $csvData; + } + unset($xlsData); + ob_flush(); + flush(); + } + $income = '0.00'; + $income = M('Spend', 'tab_') + ->field('sum(tab_spend.pay_amount) as income') + ->join('tab_game on tab_spend.game_id = tab_game.id') + ->join('left join tab_promote on tab_spend.promote_id = tab_promote.id') + ->where($map) + ->order('tab_spend.id desc') + ->find()['income']; + $csvData1["user_account"] = "合计"; + $csvData1["pay_order_number"] = "--"; + $csvData1["pay_amount"] = $income; + $csvData1["pay_way"] = "--"; + $csvData1["game_name"] = "--"; + $csvData1["server_name"] = "--"; + $csvData1["game_player_name"] = "--"; + $csvData1["p_p_proinfo"] = "--"; + $csvData1["p_proinfo"] = "--"; + $csvData1["proinfo"] = "--"; + $csvData1["pay_time"] = "--"; + mb_convert_variables('GBK', 'UTF-8', $csvData1); + fputcsv($fp, $csvData1); + $xlsData[] = $csvData1; + fclose($fp); + $this->backSuccessExport($id); } public function backSuccessExport($id) { //导出成功后 From 2bd7d4d74aecd313676409033c3feac9e3b50e18 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 3 Dec 2019 11:40:51 +0800 Subject: [PATCH 087/171] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=98=E7=BD=91?= =?UTF-8?q?=E9=80=80=E5=87=BA=E7=99=BB=E9=99=86=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Mobile/View/User/userset.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Mobile/View/User/userset.html b/Application/Mobile/View/User/userset.html index 653e3ec66..c5794e7de 100644 --- a/Application/Mobile/View/User/userset.html +++ b/Application/Mobile/View/User/userset.html @@ -127,8 +127,8 @@
-
- 退出登录 +
+ 退出登录
From eb9b94f18f4df2c54e9bba8aa23d0487d5327848 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Tue, 3 Dec 2019 11:50:59 +0800 Subject: [PATCH 088/171] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AD=BE=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Mobile/View/Ssg/login.html | 7 ++++++- Public/Home/css/index2.css | 22 +++++++++++++++++----- Public/Home/images/game_score1.png | Bin 0 -> 1408 bytes Public/Home/images/game_score2.png | Bin 0 -> 1390 bytes 4 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 Public/Home/images/game_score1.png create mode 100644 Public/Home/images/game_score2.png diff --git a/Application/Mobile/View/Ssg/login.html b/Application/Mobile/View/Ssg/login.html index e1b539433..645cc3b28 100644 --- a/Application/Mobile/View/Ssg/login.html +++ b/Application/Mobile/View/Ssg/login.html @@ -417,7 +417,12 @@ var PhoneObj = { //弹框确认 function hideAndLogin(){ $("#alert_box").hide(); - window.location.href = "mobile.php?s=/Ssg/index.html" + var gameId = $("#game_id").val(); + if (gameId) { + window.location.href = "/mobile.php?s=/Ssg/pay/game_id/"+gameId+".html" + } else { + window.location.href = "mobile.php?s=/Ssg/index.html" + } } //获取手机验证码 $("#getPhoneCode").on("click",function(){ diff --git a/Public/Home/css/index2.css b/Public/Home/css/index2.css index 7f6dcc55a..4a9e755dc 100644 --- a/Public/Home/css/index2.css +++ b/Public/Home/css/index2.css @@ -11,9 +11,10 @@ align-items: center; justify-content: space-between; } -.heard>img{ +.heard>div>img{ width: 2.5rem; height: 2.5rem; + border-radius: 0.3rem; } .heard>.right{ margin-left: 0.3rem; @@ -70,11 +71,21 @@ .evaluate .start{ display: flex; align-items: center; - margin-left: 0.32rem; + margin-left: 0.22rem; } -.evaluate .start>img{ - width: 0.3rem; +.evaluate .start .iconImg{ + display: inline-block; + vertical-align: middle; + width: 1.95rem; height: 0.3rem; + background: url("../images/game_score1.png")no-repeat left center; + background-size: auto 100%; +} +.evaluate .start .iconImg>div{ + display: block; + height: 100%; + background: url("../images/game_score2.png")no-repeat left center; + background-size: auto 100%; } .evaluate-box{ display: flex; @@ -443,4 +454,5 @@ } .swiper-container-horizontal>.swiper-pagination-bullets{ bottom: -9px !important; -} \ No newline at end of file +} + diff --git a/Public/Home/images/game_score1.png b/Public/Home/images/game_score1.png new file mode 100644 index 0000000000000000000000000000000000000000..83cfd5f453a0f9c1a9309b961d3fafa69bfc8776 GIT binary patch literal 1408 zcmV-`1%LX9P)BYoVElZO$abAqhKV!YATAOuElk>guNvd6!q;F<>lk?>+InN1C ze&^xMd%pKe2o*k3snnHP>wA?_hh5kGy~5KML~cFFuvQxn ziNrDhZxK-!fR93<(2n~0`Y{>4g;7~gGOpFgsnYP?2%wjUA^_r!4X6A3S)(^F` zw49M)oL`moB;#4FoW$WxCX;s&(Z|fZVj3AUo6vSeqtW9sjPt9qo@6|$l@pyfaiR`D zFc=JaTI-^{YakF<;(6XyB6<$M<u5z#m^e`WSSxUL&3v?CS2o%JL`=2uP^^r*~i zdf?TL<7{JQvxmV9Bg88brgb2qv*rdam&@&IZEgMK{|+#$Cs}~~$f;;Bhlhu2CnhF3 zJq*AV51dMd z_u#>U&YCrAHZk+NM0E9B$O^sg*2c!hBScho5HZ(#l{#)c$;kPIQ_1k2I(4chlgYe7 zL}s#fnE=~4BH9}W1YT`uXjqVqI@XimDgf{cr*b{-b)M&aN<_ELT5%W!aGHo#GxJq5 zaGD{-ajo^{=H}+#WSA>crBW&DNr22RoQj6mEV~R14Xp=o0KoDBFVhMP6VV>6^(GyO3UJ#|=3;m9HPfbnD`>R&1IzQKWlH=Bsgc9I4 zP8Wr@@UJSHl~O|hzN=(fW+ppY>vm?o8Ni`vH2Q}OdwG@hB%|mzPJaXB6;!Pc@ITi8 O0000)N|2j^oZj)z6{;^L>WyouHDF~E%T0z zjcts@VlM$01@M+qYTwkGbusZ69UkTZriEMx$|msZ^Sl z;ai_5qe;fK8##&1>o|^bU3VvdDl=aR;4Fa03x&dm09b~wvr$HqjAyrU5}P-fOkUF4 z+q)mY7=S2%KLNZV%FX-A92;z=3C&PEwcGM?SaiIU0W<$Zm9 zk@@-gAQFkJn7dk*)!S$^_A+ydh+<33`v(yff*?4ol$u`&rRRCHVZ#Q?^Sr;~@%XIc zIE~ei>-?-0;dSYdW>4647hXX!NY)-7(+)oNSK45LYgKg^u|ea!3j z;o#ulR%U({z+C|PW%yQ%I>*c(G4tfWz`$1*+d?*)WIGU6PRpweI*qti*K&zyHvrv? z5LYCc<+C%)e3+RJl}e?bI?%u{nq(dh9j6tIsUJl>Jv|RF^EiMT0rUv?>1x9dL{ucA zqn)04Fq#BA&`bftvUe>{RmX99T-UvWnGXQCS%B^oGe12&J^fj&R$CCnw;f_M$&iJG z)2b;!Hk-Wx!2443dY-qlQmLGlA-=dMqe;ds44hh;cXV{r8X6k97r?7Tbj4c8i0F)N zWW-{z<7<_}*7~eg*Nr9_xv+3*Y2Jy6iFgnM&jZ*?M12BmdQj&85xuZpgE~f&U>5*{ zh0|*0y(S2PcL5CRL7XMnbhqp@GwZ6vWsC1OJ98(MQoHi`{EQ59dr=b;6GoE&Sy(u= zGB1sfk8dZU!$h>H$xC<9eq`o~{_&-4+xG!T0vKBCzUe_7W`3kpDxK&+iEQ~c8BGG? z>e6Od_HISpGBofhBEVkXUtbG8sHp^+cIWYyG zQY;pA8qu+3G|5ngiBqdO@1{s3@(wfK381d)w!ZHdXJ%%;tJP|H80Y*N85yyMhljT) zrE)~H1Hb@)j{!VdC=~QBEjqSRsg%(qpcy7kE16eMnr#Dcq&a1F$oKs>DwWEaR_xO0 z^wpMSJwZf!^<%5iXgpXdmA(|PmWCKjGE$-9bb)!BkDUZF>oVCZuInBCVpF w+}t*$)J;mM+T`Tq?=tMGM;T2riecmQ4^|svFSM}VE&u=k07*qoM6N<$f;~T}8~^|S literal 0 HcmV?d00001 From 4ee415ac7724fb63521c183ea4771c7a3846196a Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Tue, 3 Dec 2019 13:53:04 +0800 Subject: [PATCH 089/171] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/DownloadController.class.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 1711a1f6d..2315964a0 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -1625,9 +1625,6 @@ class DownloadController extends BaseController { if (!empty($own_id)) { if (!empty($map['_string'])) { unset($map['_string']); - unset($userPlayInfoWhere['_string']); - unset($userGameLoginWhere['_string']); - unset($spendWhere['_string']); } $map['tab_apply.promote_id'] = $queryPromote['id'];//本账号 From 22179ddfd69b34824a339b247d51c1a332f74d21 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Tue, 3 Dec 2019 14:13:39 +0800 Subject: [PATCH 090/171] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Mobile/Controller/SsgController.class.php | 1 + Public/Home/css/index2.css | 4 ++-- Public/Home/images/game_score1.png | Bin 1408 -> 1516 bytes Public/Home/images/game_score2.png | Bin 1390 -> 2723 bytes 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Application/Mobile/Controller/SsgController.class.php b/Application/Mobile/Controller/SsgController.class.php index 86cec8911..40f5d9edf 100644 --- a/Application/Mobile/Controller/SsgController.class.php +++ b/Application/Mobile/Controller/SsgController.class.php @@ -249,6 +249,7 @@ class SsgController extends BaseController { $this->ajaxReturn($msg,'JSON'); exit(); } + //真正注册代码 public function doRegister($account,$password,$phone,$promote_id,$register_way,$register_type, $game_id = 0) { diff --git a/Public/Home/css/index2.css b/Public/Home/css/index2.css index 4a9e755dc..368d41240 100644 --- a/Public/Home/css/index2.css +++ b/Public/Home/css/index2.css @@ -76,7 +76,7 @@ .evaluate .start .iconImg{ display: inline-block; vertical-align: middle; - width: 1.95rem; + width: 1.84rem; height: 0.3rem; background: url("../images/game_score1.png")no-repeat left center; background-size: auto 100%; @@ -126,7 +126,7 @@ } .slide-item >img{ width: 100%; - height: 6.22rem; + height: 7.82rem; pointer-events: none; } /*隐藏掉滚动条*/ diff --git a/Public/Home/images/game_score1.png b/Public/Home/images/game_score1.png index 83cfd5f453a0f9c1a9309b961d3fafa69bfc8776..f7540a185ca66b761628d1c77e94707bf581ca7e 100644 GIT binary patch literal 1516 zcmV% zd2duz7{-4y(@vp|g9=Kt z8Z|+*7*|>a;?kA^6%nV@F(-LWyqSCN%-n6}ls?JL%suOK&ikI_eb2eMv9U2CU@347 zFaS&fUjlzeDIi4*0hg(`?||_|$^l2@l88fxFQh&Sz>UDQz(L^ax~a3p#lXF);jcC+ zfeRdPL@tRqL{Y>%FbLcO+y-0(yaoIS{Oe1d9dhD*9q^E9`3d+0I1f}82?q-o
} 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 literal 1390 zcmV-!1(EuRP))N|2j^oZj)z6{;^L>WyouHDF~E%T0z zjcts@VlM$01@M+qYTwkGbusZ69UkTZriEMx$|msZ^Sl z;ai_5qe;fK8##&1>o|^bU3VvdDl=aR;4Fa03x&dm09b~wvr$HqjAyrU5}P-fOkUF4 z+q)mY7=S2%KLNZV%FX-A92;z=3C&PEwcGM?SaiIU0W<$Zm9 zk@@-gAQFkJn7dk*)!S$^_A+ydh+<33`v(yff*?4ol$u`&rRRCHVZ#Q?^Sr;~@%XIc zIE~ei>-?-0;dSYdW>4647hXX!NY)-7(+)oNSK45LYgKg^u|ea!3j z;o#ulR%U({z+C|PW%yQ%I>*c(G4tfWz`$1*+d?*)WIGU6PRpweI*qti*K&zyHvrv? z5LYCc<+C%)e3+RJl}e?bI?%u{nq(dh9j6tIsUJl>Jv|RF^EiMT0rUv?>1x9dL{ucA zqn)04Fq#BA&`bftvUe>{RmX99T-UvWnGXQCS%B^oGe12&J^fj&R$CCnw;f_M$&iJG z)2b;!Hk-Wx!2443dY-qlQmLGlA-=dMqe;ds44hh;cXV{r8X6k97r?7Tbj4c8i0F)N zWW-{z<7<_}*7~eg*Nr9_xv+3*Y2Jy6iFgnM&jZ*?M12BmdQj&85xuZpgE~f&U>5*{ zh0|*0y(S2PcL5CRL7XMnbhqp@GwZ6vWsC1OJ98(MQoHi`{EQ59dr=b;6GoE&Sy(u= zGB1sfk8dZU!$h>H$xC<9eq`o~{_&-4+xG!T0vKBCzUe_7W`3kpDxK&+iEQ~c8BGG? z>e6Od_HISpGBofhBEVkXUtbG8sHp^+cIWYyG zQY;pA8qu+3G|5ngiBqdO@1{s3@(wfK381d)w!ZHdXJ%%;tJP|H80Y*N85yyMhljT) zrE)~H1Hb@)j{!VdC=~QBEjqSRsg%(qpcy7kE16eMnr#Dcq&a1F$oKs>DwWEaR_xO0 z^wpMSJwZf!^<%5iXgpXdmA(|PmWCKjGE$-9bb)!BkDUZF>oVCZuInBCVpF w+}t*$)J;mM+T`Tq?=tMGM;T2riecmQ4^|svFSM}VE&u=k07*qoM6N<$f;~T}8~^|S From 9ec18a3af90b0dbb787b8fa470dd14b5a8b8f8f3 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 3 Dec 2019 14:18:54 +0800 Subject: [PATCH 091/171] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E9=99=86?= =?UTF-8?q?=E9=A1=B5=E6=97=A0=E6=B3=95=E4=B8=8A=E6=BB=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Mobile/View/User/login.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Mobile/View/User/login.html b/Application/Mobile/View/User/login.html index a01e69225..df549d456 100644 --- a/Application/Mobile/View/User/login.html +++ b/Application/Mobile/View/User/login.html @@ -13,7 +13,7 @@ -
+