From 48614da52d895fe0ff704038cc5066e91719d8d2 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Tue, 17 Dec 2019 21:18:42 +0800 Subject: [PATCH 1/7] =?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--=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PromoteGameRatioController.class.php | 4 +- .../View/PromoteGameRatio/applyRatio.html | 76 ++++++------------- .../Home/Controller/QueryController.class.php | 2 +- 3 files changed, 29 insertions(+), 53 deletions(-) diff --git a/Application/Admin/Controller/PromoteGameRatioController.class.php b/Application/Admin/Controller/PromoteGameRatioController.class.php index 37f290871..e1653bac4 100644 --- a/Application/Admin/Controller/PromoteGameRatioController.class.php +++ b/Application/Admin/Controller/PromoteGameRatioController.class.php @@ -126,7 +126,9 @@ class PromoteGameRatioController extends ThinkController $params = I('get.'); $id = $params['id'] ?? 0; $id = intval($id); + $metaTitle = '游戏分成比例申请'; if ($id) { + $metaTitle .= '--修改'; $field = 'promote_id, game_id, ratio, begin_time, end_time, remark'; $map['id'] = $id; $promoteGameRatio = D(self::MODEL_NAME)->field($field)->where($map)->find(); @@ -138,7 +140,7 @@ class PromoteGameRatioController extends ThinkController $this->assign('gameList', getAllGameList()); $this->assign('promoteList', getPromoteByLevel(1)); - $this->meta_title = '游戏分成比例申请'; + $this->meta_title = $metaTitle; $this->display(); } } diff --git a/Application/Admin/View/PromoteGameRatio/applyRatio.html b/Application/Admin/View/PromoteGameRatio/applyRatio.html index 776077526..3fcd39081 100644 --- a/Application/Admin/View/PromoteGameRatio/applyRatio.html +++ b/Application/Admin/View/PromoteGameRatio/applyRatio.html @@ -24,15 +24,17 @@ - 通过推广员后台注册申请或者管理后台创建的账号 + 一级渠道推广员账号 @@ -40,60 +42,32 @@ - 密码长度必须大于6位 + 会长推广平台已申请的游戏 - 账号状态： + 原分成比例： - - - - - 锁定状态下，推广员账号则无法登录 + + - 真实姓名： - - - - - - 手机号： - - - - - 邮箱： - - - - - - 商务专员 - - - 设置该推广员所属的商务专员组 + 现分成比例： + + + 当前需要修改成的分成比例 - diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 76728d4cf..33df55fa0 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1885,7 +1885,7 @@ class QueryController extends BaseController if (empty($list['user_account']) ) { $list['user_account'] = M('user', 'tab_')->where("id = {$list['user_id']}")->getField('account'); } - $list['user_account'] = empty($list['user_account']) ? '--' : encryption($list['user_account']); + $list['user_account'] = empty($list['user_account']) ? '--' : $list['user_account']; $list['game_name'] = empty($list['game_name']) ? '--' : $list['game_name']; $list['sdk_version'] = empty($list['sdk_version']) ? '--' : getSDKTypeName($list['sdk_version']); $list['server_name'] = empty($list['server_name']) ? '--' : $list['server_name']; From ec2bbab76fd1120b3384a5312e66612cc784b7ba Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Tue, 17 Dec 2019 21:55:32 +0800 Subject: [PATCH 2/7] sever --- Application/Home/Controller/PlayersController.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Home/Controller/PlayersController.class.php b/Application/Home/Controller/PlayersController.class.php index 2162efa41..53af22fda 100644 --- a/Application/Home/Controller/PlayersController.class.php +++ b/Application/Home/Controller/PlayersController.class.php @@ -77,9 +77,9 @@ class PlayersController extends BaseController { $rs[$key]['extend'] = encryption($v['extend']); $rs[$key]['create_time'] = date('Y-m-d H:i:s',$v['create_time']); $promoteInfo = M('promote','tab_')->field("account")->where(['id' => intval($v['promote_id'])])->find(); - $serverId = $v['server_id']; + $serverId1 = $v['server_id']; $gameId = $v['game_id']; - $serverInfo = M('server','tab_')->field('server_name')->where(['server_num'=>$serverId,'game_id'=>$gameId])->find(); + $serverInfo = M('server','tab_')->field('server_name')->where(['server_num'=>$serverId1,'game_id'=>$gameId])->find(); $rs[$key]['server_name'] = $serverInfo['server_name']; $rs[$key]['promote_id']= $promoteInfo['account']; } From e5067479d775ff04dcb12570e7511b70b0429f64 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Tue, 17 Dec 2019 22:11:03 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=AE=98=E7=BD=91=E5=85=85=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Public/Media/js/recharge.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Public/Media/js/recharge.js b/Public/Media/js/recharge.js index 20448a92e..5efb55706 100644 --- a/Public/Media/js/recharge.js +++ b/Public/Media/js/recharge.js @@ -43,7 +43,7 @@ $(function() { var apitype = $("#apitype").val(); if (apitype == 'weixin') { var loading = new Cute.ui.dialog().loading('加载中...',{mask:true}); - Cute.api.post("/media.php/Recharge/beginPay",that.serialize(), function(json){ + Cute.api.post("/media.php?s=Recharge/beginPay",that.serialize(), function(json){ loading.close(); if(json.status > 0){ From c07ba38dbfdaee9002e3d15fde4f54a3479fa512 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Tue, 17 Dec 2019 22:11:25 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=AE=98=E7=BD=91=E5=85=85=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Public/Media/js/recharge.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Public/Media/js/recharge.js b/Public/Media/js/recharge.js index 5efb55706..0437178f6 100644 --- a/Public/Media/js/recharge.js +++ b/Public/Media/js/recharge.js @@ -43,7 +43,7 @@ $(function() { var apitype = $("#apitype").val(); if (apitype == 'weixin') { var loading = new Cute.ui.dialog().loading('加载中...',{mask:true}); - Cute.api.post("/media.php?s=Recharge/beginPay",that.serialize(), function(json){ + Cute.api.post("/media.php?s=/Recharge/beginPay",that.serialize(), function(json){ loading.close(); if(json.status > 0){ From 95f286fd3efbe9d5ff4ad0866a49b31ef255b9c0 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Tue, 17 Dec 2019 22:14:07 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=AE=98=E7=BD=91=E5=9C=B0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Mobile/View/Index/business.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Mobile/View/Index/business.html b/Application/Mobile/View/Index/business.html index 949beb895..5eb2574b4 100644 --- a/Application/Mobile/View/Index/business.html +++ b/Application/Mobile/View/Index/business.html @@ -9,7 +9,7 @@ - +
From 6c46cd711ffd42704e0f1e90cc84d6a2434c412f Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Wed, 18 Dec 2019 10:59:22 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0>?= =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=91=98=E7=AE=A1=E7=90=86>=E5=85=AC?= =?UTF-8?q?=E4=BC=9A=E5=88=86=E6=88=90=E7=AE=A1=E7=90=86--=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/PromoteGameRatio/applyRatio.html | 40 ++++++++++++++++++- .../Admin/View/PromoteGameRatio/lists.html | 2 +- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/Application/Admin/View/PromoteGameRatio/applyRatio.html b/Application/Admin/View/PromoteGameRatio/applyRatio.html index 3fcd39081..fe674744d 100644 --- a/Application/Admin/View/PromoteGameRatio/applyRatio.html +++ b/Application/Admin/View/PromoteGameRatio/applyRatio.html @@ -5,6 +5,15 @@ +

{$meta_title}

@@ -65,10 +74,28 @@ 现分成比例： - + 当前需要修改成的分成比例 + + 开始时间： + +
+ + - + +
+ 结束时间不填则默认永久。 + + + + 备注： + + + + +
@@ -98,7 +125,11 @@ - + + if(C('COLOR_STYLE')=='blue_color') echo ''; + + +