From 9e9cff0ba37a29f9b57bcddc57c0e39a92d29b7f Mon Sep 17 00:00:00 2001 From: chenzhi <“chenzhi063@qq.com> Date: Thu, 28 Nov 2019 16:58:33 +0800 Subject: [PATCH 01/27] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=87=E5=88=86?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Data/update.sql | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Data/update.sql b/Data/update.sql index 9fe8233fb..924ff99c5 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -595,4 +595,17 @@ CHANGE COLUMN `create_promote_id` `creator_id` int(11) NOT NULL DEFAULT 0 COMMEN ALTER TABLE `sys_shift_task` ADD COLUMN `creator_type` tinyint(1) NOT NULL DEFAULT 0 COMMENT '创建者类型 0 后台管理员 1 推广员' AFTER `creator_id`; ALTER TABLE `tab_mend` -ADD COLUMN `op_type` tinyint(0) NOT NULL DEFAULT 0 COMMENT '0 管理员 1 推广员' AFTER `op_account`; \ No newline at end of file +ADD COLUMN `op_type` tinyint(0) NOT NULL DEFAULT 0 COMMENT '0 管理员 1 推广员' AFTER `op_account`; + +--补链新增切分时间 chenzhi +UPDATE `sys_model` SET `list_grid` = 'id:编号 +user_account:账号 +user_nickname:昵称 +promote_id:推广员编号 +promote_account:推广员账号 +promote_id_to:修改后编号 +promote_account_to:修改后账号 +remark:备注 +create_time:时间 +op_account:操作人账号 +order_time:切分时间' WHERE `id` = 29; \ No newline at end of file From 81e56063c7bfbe524ec119e3d7e8b280bf8f00a9 Mon Sep 17 00:00:00 2001 From: chenzhi <“chenzhi063@qq.com> Date: Thu, 28 Nov 2019 17:11:21 +0800 Subject: [PATCH 02/27] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E8=A1=A5=E9=93=BE=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/MendController.class.php | 4 ++-- Application/Admin/View/Mend/shiftInfo.html | 22 +++++++++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/Application/Admin/Controller/MendController.class.php b/Application/Admin/Controller/MendController.class.php index 16625e9d8..b4a22e062 100644 --- a/Application/Admin/Controller/MendController.class.php +++ b/Application/Admin/Controller/MendController.class.php @@ -132,9 +132,9 @@ class MendController extends ThinkController { $id = I('id'); $status = M('ShiftTask')->where(['id' => $id,'status' => 0])->save(['status' => 2]); if ($status) { - $this->success('取消补链成功', U('lists'), 2); + $this->ajaxReturn(array("status"=>1,"url"=> U('lists'))); } else { - $this->error("取消失败,或补链已生效",U('lists')); + $this->ajaxReturn(array("status"=>0,"url"=> U('lists'))); } } } diff --git a/Application/Admin/View/Mend/shiftInfo.html b/Application/Admin/View/Mend/shiftInfo.html index 768d1bd5c..050614e98 100644 --- a/Application/Admin/View/Mend/shiftInfo.html +++ b/Application/Admin/View/Mend/shiftInfo.html @@ -130,6 +130,7 @@ + - + + + + + + + + + {$game['relation_game_name']} - - - - - + @@ -30,47 +30,286 @@ -
-
- - - - - - - + +
+
+
+ +
+
{$game['relation_game_name']}
+
{$game['features']}
+
+ +
免费安装
+ +
免费安装
+ + +
+
+
+
+
+
+ {$game['game_score']} +
+ + + + + +
+
+
14.48K个评分
+
+
+ #{$game['recommend_level']} +
网络游戏
+
+
+ 16+ +
年龄
+
+
+
+
    + +
  • + +
  • +
    +
+
+
+
简介
+
{$game['features']}
+
+
+
查看更多
+
+
+
+
评分及评论
+
+
+ {$game['game_score']} + 满分5分 +
+
+
+
+ + + + + +
+
+
+
+
+
+
+ + + + +
+
+
+
+
+
+
+ + + +
+
+
+
+
+
+
+ + +
+
+
+
+
+
+
+ +
+
+
+
+
+
14.48K个评分
+
+
+
+
+
新功能
+
更新说明:
+
1、优化用户体验
+
+
+
信息
+
+ 大小 +
{$game['game_size']}MB
+
+
+ 类别 +
游戏
+
+
+ 语言 +
英语,简体中文
+
+
+ 年龄分级 +
限16岁以上
+
+
+ 价格 +
免费
+
+
隐私政策
+
+
+
+
+
闽ICP备19000000号-0
+
闽网文{2019}1554-099号
+
+
抵制不良游戏,拒绝盗版游戏。注意自我保护,谨防受骗上当。
+
适度游戏益脑,沉迷游戏伤身。合理安排时间,享受健康生活。
- - - - - \ No newline at end of file From 8fd70a94e7f82106b6334a8506ee513bb35c022b Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Fri, 29 Nov 2019 11:47:13 +0800 Subject: [PATCH 11/27] =?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 --- Application/Home/View/default/Home/landingPage.html | 1 + 1 file changed, 1 insertion(+) diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index 78b2e994e..34372a598 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -9,6 +9,7 @@ + From 1bd90da91417b97bd7a3d18cdbcac771e7575dcb Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Fri, 29 Nov 2019 12:12:35 +0800 Subject: [PATCH 12/27] =?UTF-8?q?=E3=80=90=E7=BB=9F=E8=AE=A1=E3=80=91-?= =?UTF-8?q?=E3=80=90=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90=E3=80=91-?= =?UTF-8?q?=E3=80=90ARPU=E5=88=86=E6=9E=90=E3=80=91=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/StatController.class.php | 56 +++++++++++++++---- 1 file changed, 44 insertions(+), 12 deletions(-) diff --git a/Application/Admin/Controller/StatController.class.php b/Application/Admin/Controller/StatController.class.php index a9c341bec..325a530f8 100644 --- a/Application/Admin/Controller/StatController.class.php +++ b/Application/Admin/Controller/StatController.class.php @@ -604,7 +604,11 @@ class StatController extends ThinkController ->where($map) ->group('user_id') ->find(); - $data[$key]['keep_num'] = round($num['num']/$data[$key]['register_num'],4)*100; + if (!empty($data[$key]['register_num'])) { + $data[$key]['keep_num'] = round($num['num']/$data[$key]['register_num'],4)*100; + } else { + $data[$key]['keep_num'] = 0; + } //充值 $map = $map_list; empty($game_name ) || $map['game_name'] = array('like','%'.$game_name.'%'); @@ -638,12 +642,24 @@ class StatController extends ThinkController $data[$key]['new_pop'] = $query[0]['num']; //付费率 - $data[$key]['spend_rate'] = round($data[$key]['spend_people']/$data[$key]['act_user'],4)*100; + if (!empty($data[$key]['act_user'])) { + $data[$key]['spend_rate'] = round($data[$key]['spend_people']/$data[$key]['act_user'],4)*100; + } else { + $data[$key]['spend_rate'] = 0; + } //ARPU - $data[$key]['ARPU'] = round($data[$key]['spend']/$data[$key]['act_user'],2); - //ARPPU - $data[$key]['ARPPU'] = round($data[$key]['spend']/$data[$key]['spend_people'],2); + if (!empty($data[$key]['act_user'])) { + $data[$key]['ARPU'] = round($data[$key]['spend']/$data[$key]['act_user'],2); + } else { + $data[$key]['ARPU'] = 0; + } + //ARPPU + if (!empty($data[$key]['spend_people'])) { + $data[$key]['ARPPU'] = round($data[$key]['spend']/$data[$key]['spend_people'],2); + } else { + $data[$key]['ARPPU'] = 0; + } //累计付费玩家 $map = $map_list; empty($hasbindcoins) || $map['pay_way'] = $hasbindcoins['pay_way']; @@ -1144,7 +1160,11 @@ class StatController extends ThinkController ->join("right join tab_user_login_record as ur on ur.user_id = tab_user.id and FROM_UNIXTIME(ur.login_time,'%Y-%m-%d') = '{$login_time}'") ->where($mapl) ->find(); - $data[$key]['keep_num'] = round($num['num']/$data[$key]['register_num'],4)*100; + if (!empty($data[$key]['register_num'])) { + $data[$key]['keep_num'] = round($num['num']/$data[$key]['register_num'],4)*100; + } else { + $data[$key]['keep_num'] = 0; + } //充值 $mapl = $map_list; empty($game_name ) || $mapl['game_name'] = array('like','%'.$game_name.'%'); @@ -1157,15 +1177,26 @@ class StatController extends ThinkController //付费玩家数 $data[$key]['spend_people'] = $spend['people']; //付费率 - $data[$key]['spend_rate'] = round($data[$key]['spend_people']/$data[$key]['act_user'],4)*100; + if (!empty($data[$key]['act_user'])) { + $data[$key]['spend_rate'] = round($data[$key]['spend_people']/$data[$key]['act_user'],4)*100; + } else { + $data[$key]['spend_rate'] = 0; + } //ARPU - $data[$key]['ARPU'] = round($data[$key]['spend']/$data[$key]['act_user'],2); + if (!empty($data[$key]['act_user'])) { + $data[$key]['ARPU'] = round($data[$key]['spend']/$data[$key]['act_user'],2); + } else { + $data[$key]['ARPU'] = 0; + } //ARPPU - $data[$key]['ARPPU'] = round($data[$key]['spend']/$data[$key]['spend_people'],2); - if($data[$key]['register_num']==0&&$data[$key]['act_user']==0&&$data[$key]['keep_num']==0&&$data[$key]['spend']==0&&$data[$key]['spend_people']==0){ - unset($data[$key]); + if (!empty($data[$key]['spend_people'])) { + $data[$key]['ARPPU'] = round($data[$key]['spend']/$data[$key]['spend_people'],2); + } else { + $data[$key]['ARPPU'] = 0; } - +// if($data[$key]['register_num']==0&&$data[$key]['act_user']==0&&$data[$key]['keep_num']==0&&$data[$key]['spend']==0&&$data[$key]['spend_people']==0){ +// unset($data[$key]); +// } } $count=count($data); if($count > $row){ @@ -1180,6 +1211,7 @@ class StatController extends ThinkController $this->assign('list_data',$data); $this->display(); } + function game_analysis(){ if($_REQUEST['time-start']!=''&&$_REQUEST['time-end']!=''){ $start=$_REQUEST['time-start']; From b61587868bcd13232b4c5da0dcdb0a72ac5d3211 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Fri, 29 Nov 2019 12:22:21 +0800 Subject: [PATCH 13/27] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=B9=BF=E5=91=8A?= =?UTF-8?q?=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/FileController.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Application/Admin/Controller/FileController.class.php b/Application/Admin/Controller/FileController.class.php index 44f7c7a50..0e1304463 100644 --- a/Application/Admin/Controller/FileController.class.php +++ b/Application/Admin/Controller/FileController.class.php @@ -209,9 +209,9 @@ class FileController extends AdminController ); //TODO:上传到远程服务器 // 添加水印 - if ($_REQUEST['flag']) { - $this->addWatermarkOnPic($info['download']); - } +// if ($_REQUEST['flag']) { +// $this->addWatermarkOnPic($info['download']); +// } /* 记录图片信息 */ if ($info) { From 56d3718c14b6b67d802b237029e2d3ebace37ba6 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 29 Nov 2019 14:15:42 +0800 Subject: [PATCH 14/27] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/MemberController.class.php | 9 +++- .../Admin/View/Member/login_record.html | 42 +++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index afde5599c..8f064b6a8 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -788,13 +788,20 @@ class MemberController extends ThinkController $map['server_name'] = $_REQUEST['server_name']; unset($_REQUEST['server_name']); } + if (isset($_REQUEST['promote_id'])) { + $map['promote_id'] = $_REQUEST['promote_id']; + unset($_REQUEST['promote_id']); + } // $map['type'] = 1; // $map['login_time'] = ['exp', 'login_time<>0']; $extend = array(); $extend['map'] = $map; - + $count = M('UserLoginRecord','tab_')->field('user_id')->where($extend['map'])->group('user_id')->select(false); + $sql = "select count(user_id) as count from ({$count})t"; + $count = M('UserLoginRecord','tab_')->query($sql); $this->m_title = '登录记录'; + $this->assign('user_count',$count[0]['count']); $this->assign('commonset', M('Kuaijieicon')->where(['url' => 'Member/login_record', 'status' => 1])->find()); parent::lists("UserLoginRecord", $p, $extend['map']); diff --git a/Application/Admin/View/Member/login_record.html b/Application/Admin/View/Member/login_record.html index 93fd046e7..8de70f9e1 100644 --- a/Application/Admin/View/Member/login_record.html +++ b/Application/Admin/View/Member/login_record.html @@ -90,6 +90,21 @@
+
+ + - +
+
+ +
@@ -139,6 +154,10 @@ + + 合计 +   登录玩家:{$user_count}人 + @@ -178,6 +197,7 @@ highlight_subnav("{:U('Member/login_record')}"); $(function () { + Think.setValue('{$key}', "{$vo}"); $(".select_gallery").select2(); @@ -276,6 +296,28 @@ $("#game_type").change(); }); $("#game_name").change(); + + var promote_id = "{:I('promote_id')}"; + $("#promote_level").change(function(){ + $.ajax({ + url:"{:U('Ajax/getPromotersByLevel')}", + type:"get", + data:{level:$("#promote_level option:selected").val()}, + dataType:'json', + success:function(response){ + str = ''; + data = response.data; + for (var i in data){ + str += "" + } + $("#promote_id").empty(); + $("#promote_id").append(str); + $("#promote_id").select2(); + } + }) + }); + $("#promote_level").change(); + }) From 324e880056bf592b3e5a4bbe5a4a19719f57cafb Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Fri, 29 Nov 2019 15:03:56 +0800 Subject: [PATCH 15/27] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->?= =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=AE=A1=E7=90=86--=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=A4=8D=E5=88=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/View/default/Apply/my_game.html | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/Application/Home/View/default/Apply/my_game.html b/Application/Home/View/default/Apply/my_game.html index 33dff8572..993edaaef 100644 --- a/Application/Home/View/default/Apply/my_game.html +++ b/Application/Home/View/default/Apply/my_game.html @@ -11,6 +11,14 @@ .btn-role-border { border-left: 0; } + .clipboard-btn { + width: 60px; + height: 28px; + border: 0; + border-radius: 3px; + color: #fff; + background-color: #3A97FF; + } @@ -260,13 +268,13 @@
-
- 复制成功,ctrl+v粘贴即可 + 复制成功,ctrl+v粘贴即可 +
@@ -887,12 +895,22 @@ }); }); - new ClipboardJS('#clipboard-btn', { + var clipboard = new ClipboardJS('#clipboard-btn', { text: function(trigger) { return trigger.getAttribute('data-text'); } }) + clipboard.on('success', function (e) { + $('#copy_msg').text('复制成功,ctrl+v粘贴即可'); + $('#clipboard-btn').hide(); + }); + + clipboard.on('error', function (e) { + $('#copy_msg').text('自动复制失败,请点击复制按钮'); + $('#clipboard-btn').show(); + }); + $('#submit').click(function () { var url = $(this).attr('url'); var query = $('.jssearch').find('input').serialize(); From 43c1f7832a3af4231cd04a2e5c1ca47b62d011c8 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Fri, 29 Nov 2019 16:42:33 +0800 Subject: [PATCH 16/27] =?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/Controller/HomeController.class.php | 1 + .../Home/View/default/Home/landingPage.html | 33 ++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/Application/Home/Controller/HomeController.class.php b/Application/Home/Controller/HomeController.class.php index 97d6a27b6..b6666d374 100644 --- a/Application/Home/Controller/HomeController.class.php +++ b/Application/Home/Controller/HomeController.class.php @@ -227,6 +227,7 @@ class HomeController extends Controller $this->assign('apply', $apply); $this->assign('game', $game); $this->assign('promoteId', $promoteId); + $this->assign('cur_url', "http://" . $_SERVER['HTTP_HOST'] . __SELF__); $this->display('landingPage'); } diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index 34372a598..fbb757adf 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -198,7 +198,7 @@
• 至尊下载:永不闪退、不丢数据稳定有保障
• 同一设备安装一次可在一年内无限次下载重装
¥10至尊下载
-
普通下载
+
@@ -261,6 +261,37 @@ From 5d178571cc1aa0e314cd54edc1a9304f12fd8107 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 29 Nov 2019 17:20:22 +0800 Subject: [PATCH 19/27] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=98=E7=BD=91?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Mobile/View/User/recharge.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Mobile/View/User/recharge.html b/Application/Mobile/View/User/recharge.html index 7681102d5..8ec31e0d6 100644 --- a/Application/Mobile/View/User/recharge.html +++ b/Application/Mobile/View/User/recharge.html @@ -26,7 +26,7 @@
-
+
From ffadabf078fcdef7fdb9c4ca309b963229d4ee7a Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Fri, 29 Nov 2019 17:22:05 +0800 Subject: [PATCH 20/27] =?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/Controller/HomeController.class.php | 3 ++- .../Home/View/default/Home/landingPage.html | 14 +++++++++++--- .../Mobile/Controller/UserController.class.php | 3 +-- Application/Mobile/View/User/login.html | 2 +- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Application/Home/Controller/HomeController.class.php b/Application/Home/Controller/HomeController.class.php index b6666d374..cc9ea7007 100644 --- a/Application/Home/Controller/HomeController.class.php +++ b/Application/Home/Controller/HomeController.class.php @@ -227,7 +227,8 @@ class HomeController extends Controller $this->assign('apply', $apply); $this->assign('game', $game); $this->assign('promoteId', $promoteId); - $this->assign('cur_url', "http://" . $_SERVER['HTTP_HOST'] . __SELF__); + $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/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index fbb757adf..e11ad0e7f 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -257,13 +257,20 @@
点我去信任
+ + From e834c37cb305519407e3e2d2ac7c9e23c7203bb9 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Fri, 29 Nov 2019 17:23:05 +0800 Subject: [PATCH 21/27] =?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 --- Application/Home/View/default/Home/landingPage.html | 3 --- 1 file changed, 3 deletions(-) diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index e11ad0e7f..a5432bb6f 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -265,9 +265,6 @@ From 57ca1269d68cda3e842cdab128c4207659ff6ec7 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 29 Nov 2019 17:26:57 +0800 Subject: [PATCH 23/27] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=AF=BC=E5=87=BA?= =?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/Admin/Controller/ExportController.class.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 16de07418..80f10074a 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -3481,6 +3481,10 @@ if ($key == 'model'){ $map['user_account'] = array('like', '%' . trim($_REQUEST['account']) . '%'); } + if (isset($_REQUEST['promote_id'])) { + $map['promote_id'] = $_REQUEST['promote_id']; + } + // $map['login_time'] = array('neq', 0); $page = intval($_REQUEST['p']); From 98249f462ae20dd2ae4a7f2d7771926c69a61a73 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 29 Nov 2019 17:52:20 +0800 Subject: [PATCH 24/27] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=98=E7=BD=91?= =?UTF-8?q?=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/UserController.class.php | 8 ++--- Application/Mobile/View/User/login.html | 32 ++++++++++++++++--- Application/Mobile/View/User/userset.html | 29 +---------------- .../Sdk/View/default/Spend/pay_success.html | 5 ++- 4 files changed, 35 insertions(+), 39 deletions(-) diff --git a/Application/Mobile/Controller/UserController.class.php b/Application/Mobile/Controller/UserController.class.php index fe9d28fdd..334fef288 100644 --- a/Application/Mobile/Controller/UserController.class.php +++ b/Application/Mobile/Controller/UserController.class.php @@ -1007,10 +1007,10 @@ class UserController extends BaseController if (!$invidcard) { $this->ajaxReturn(array('status' => -1, 'info' => '身份证号码填写不正确', 'url' => U('User/userauth'))); } - $cardd = M('User', 'tab_')->where(array('idcard' => $_POST['idcard']))->find(); - if ($cardd) { - $this->ajaxReturn(array('status' => -1, 'info' => '身份证号码已被使用', 'url' => U('User/userauth'))); - } + // $cardd = M('User', 'tab_')->where(array('idcard' => $_POST['idcard']))->find(); + // if ($cardd) { + // $this->ajaxReturn(array('status' => -1, 'info' => '身份证号码已被使用', 'url' => U('User/userauth'))); + // } } if (C('tool_age.status') == 0) { diff --git a/Application/Mobile/View/User/login.html b/Application/Mobile/View/User/login.html index 26a9b2d4c..7ba63d50c 100644 --- a/Application/Mobile/View/User/login.html +++ b/Application/Mobile/View/User/login.html @@ -42,15 +42,39 @@
+ +
From 5413551650cda6efe976b11ef1da03351b982ec4 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 29 Nov 2019 18:01:29 +0800 Subject: [PATCH 26/27] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=98=E7=BD=91?= =?UTF-8?q?=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sdk/Controller/SpendController.class.php | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/Application/Sdk/Controller/SpendController.class.php b/Application/Sdk/Controller/SpendController.class.php index 0f6515951..3ab04ae10 100644 --- a/Application/Sdk/Controller/SpendController.class.php +++ b/Application/Sdk/Controller/SpendController.class.php @@ -81,32 +81,32 @@ class SpendController extends Controller { } public function pay_success() { - // $orderno = $_GET ['orderno'] == "" ? $_GET ['out_trade_no'] : $_GET ['orderno']; - // if (! empty ( $_GET ['jinzhue'] )) { - // sleep ( 3 ); - // $orderno = $_GET ['jinzhue']; - // } - // $pay_where = substr ( $orderno, 0, 2 ); - // $Scheme = file_get_contents ( "./Application/Sdk/Scheme/" . $_GET ['game_id'] . ".txt" ); - // $map ['pay_order_number'] = $orderno; - // switch ($pay_where) { - // case 'SP' : - // $result = M ( 'Spend', 'tab_' )->field ( "pay_status" )->where ( $map )->find (); - // break; - // case 'PF' : - // $result = M ( 'deposit', 'tab_' )->field ( 'pay_status' )->where ( $map )->find (); - // break; + $orderno = $_GET ['orderno'] == "" ? $_GET ['out_trade_no'] : $_GET ['orderno']; + if (! empty ( $_GET ['jinzhue'] )) { + sleep ( 3 ); + $orderno = $_GET ['jinzhue']; + } + $pay_where = substr ( $orderno, 0, 2 ); + $Scheme = file_get_contents ( "./Application/Sdk/Scheme/" . $_GET ['game_id'] . ".txt" ); + $map ['pay_order_number'] = $orderno; + switch ($pay_where) { + case 'SP' : + $result = M ( 'Spend', 'tab_' )->field ( "pay_status" )->where ( $map )->find (); + break; + case 'PF' : + $result = M ( 'deposit', 'tab_' )->field ( 'pay_status' )->where ( $map )->find (); + break; - // case 'TB' : - // $result = M ( 'balance', 'tab_' )->field ( 'pay_status' )->where ( $map )->find (); - // break; + case 'TB' : + $result = M ( 'balance', 'tab_' )->field ( 'pay_status' )->where ( $map )->find (); + break; - // case 'BR' : - // $result = M ( 'bind_recharge', 'tab_' )->field ( 'pay_status' )->where ( $map )->find (); - // break; - // } - // $this->assign ( 'Scheme', $Scheme ); - // $this->assign ( 'paystatus', $result ['pay_status'] ); + case 'BR' : + $result = M ( 'bind_recharge', 'tab_' )->field ( 'pay_status' )->where ( $map )->find (); + break; + } + $this->assign ( 'Scheme', $Scheme ); + $this->assign ( 'paystatus', $result ['pay_status'] ); $this->display (); } public function pay_success2() { From d838b6fc224a3fdd22e999ee120ad7d181d4a936 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Fri, 29 Nov 2019 18:18:14 +0800 Subject: [PATCH 27/27] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=AE=98=E7=BD=91-?= =?UTF-8?q?=E5=8F=91=E9=80=81=E9=AA=8C=E8=AF=81=E7=A0=81=E5=AD=97=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Public/Mobile/css/remove.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Public/Mobile/css/remove.css b/Public/Mobile/css/remove.css index 08e5de8c5..127d48c3d 100644 --- a/Public/Mobile/css/remove.css +++ b/Public/Mobile/css/remove.css @@ -37,7 +37,7 @@ height:0.6rem; background:rgba(33,177,235,1); border-radius:0.3rem; - font-size:0.15rem; + font-size:0.28rem; font-family:PingFang SC; font-weight:400; color:rgba(255,255,255,1);