From f5dd537074646e47c0d0f0f133f2bfcd39a7a885 Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Sat, 9 Nov 2019 15:44:04 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=9B=BE=E6=A0=87=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Public/Home/js/20170831/common.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Public/Home/js/20170831/common.js b/Public/Home/js/20170831/common.js index 6cbdf3c1e..e737460f8 100644 --- a/Public/Home/js/20170831/common.js +++ b/Public/Home/js/20170831/common.js @@ -186,10 +186,10 @@ $(function(){ window.updateAlert = function (text,status,c) { switch(status){ case 1: - layer.msg(text, {icon: 2}); + layer.msg(text, {icon: 1}); break; default: - layer.msg(text, {icon: 1}); + layer.msg(text, {icon: 2}); break; } } From 438594827cba773a1fd812368fb4878469e407ca Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Sat, 9 Nov 2019 16:04:30 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=B5=84=E8=B4=A8=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E9=BB=98=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Data/update.sql | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Data/update.sql b/Data/update.sql index 15b22eb0d..731351d51 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -368,4 +368,6 @@ ALTER TABLE `sys_shift_task` ADD COLUMN `remark` varchar(255) NOT NULL DEFAULT ' ALTER TABLE `tab_withdraw` ADD COLUMN `transfer_proof` int(11) NOT NULL DEFAULT 0 COMMENT '汇款证明' AFTER `settlement_end_time`; -- 2019-11-08 cxj -ALTER TABLE `sys_document_download` MODIFY COLUMN `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '文档ID' FIRST; \ No newline at end of file +ALTER TABLE `sys_document_download` MODIFY COLUMN `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '文档ID' FIRST; +ALTER TABLE `tab_promote` + CHANGE COLUMN `ver_status` `ver_status` TINYINT(2) NULL DEFAULT '3' COMMENT '资质认证审核状态(1是审核成功，2审核失败，3未审核)' AFTER `child_game_permission`; \ No newline at end of file From 84448998ddacdf527373d104bdbf4bc56d07ec00 Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Sat, 9 Nov 2019 16:19:06 +0800 Subject: [PATCH 3/5] tubiao --- Public/Home/js/20170831/common.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Public/Home/js/20170831/common.js b/Public/Home/js/20170831/common.js index e737460f8..06440ccfb 100644 --- a/Public/Home/js/20170831/common.js +++ b/Public/Home/js/20170831/common.js @@ -78,9 +78,9 @@ $(function(){ $.get(target).success(function(data){ if (data.status==1) { if (data.url) { - updateAlert(data.info + ' 页面即将自动跳转~','alert-success'); + updateAlert(data.info + ' 页面即将自动跳转~',1,'alert-success'); }else{ - updateAlert(data.info,'alert-success'); + updateAlert(data.info,1,'alert-success'); } setTimeout(function(){ if (data.url) { From c4d35c26d4056222e90832a05ae74454f2a498a3 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Sat, 9 Nov 2019 16:27:35 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Base/Service/PromoteService.class.php | 2 +- Application/Home/Controller/PromoteController.class.php | 2 +- Application/Home/View/default/Promote/addPromote.html | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Application/Base/Service/PromoteService.class.php b/Application/Base/Service/PromoteService.class.php index ae08feb7e..25032493e 100644 --- a/Application/Base/Service/PromoteService.class.php +++ b/Application/Base/Service/PromoteService.class.php @@ -923,7 +923,7 @@ class PromoteService { { $data = [ 'account' => $params['account'], - 'password' => $this->password($params['password']), + 'password' => $this->password($params['password'], UC_AUTH_KEY), 'nickname' => $params['nickname'] ?? $params['account'], 'second_pwd' => $params['second_pwd'] ?? null, 'real_name' => $params['real_name'], diff --git a/Application/Home/Controller/PromoteController.class.php b/Application/Home/Controller/PromoteController.class.php index a1863df5a..f5df36fba 100644 --- a/Application/Home/Controller/PromoteController.class.php +++ b/Application/Home/Controller/PromoteController.class.php @@ -917,7 +917,7 @@ class PromoteController extends BaseController if (IS_POST) { $params = I('post.'); $loginPromote = $this->getLoginPromote(); - + if ($params['promote_type'] == 0 && $loginPromote['level'] > 1) { $this->ajaxReturn(['status' => 0, 'msg' => '无权限']); } diff --git a/Application/Home/View/default/Promote/addPromote.html b/Application/Home/View/default/Promote/addPromote.html index cf3f5aeba..f7efe5517 100644 --- a/Application/Home/View/default/Promote/addPromote.html +++ b/Application/Home/View/default/Promote/addPromote.html @@ -15,6 +15,7 @@
+ @@ -107,6 +108,7 @@ layer.msg('请选择所属上级'); return } + console.log(promote_type) $.ajax({ type:"POST", url:"{:U('addPromote')}", From e56256ba1dcd85fe76c5372d208cea06f437f942 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Sat, 9 Nov 2019 16:37:16 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Base/Service/PromoteService.class.php | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/Application/Base/Service/PromoteService.class.php b/Application/Base/Service/PromoteService.class.php index 25032493e..05e1372d6 100644 --- a/Application/Base/Service/PromoteService.class.php +++ b/Application/Base/Service/PromoteService.class.php @@ -380,18 +380,9 @@ class PromoteService { return ['status' => false, 'msg' => '系统异常，修改用户推广员失败']; } - $status = M('user_play', 'tab_')->where($otherMap)->save($updateData); - if (!$status) { - $model->rollback(); - return ['status' => false, 'msg' => '系统异常，修改玩家推广员失败']; - } + M('user_play', 'tab_')->where($otherMap)->save($updateData); + M('user_play_info', 'tab_')->where($otherMap)->save($updateData); - $status = M('user_play_info', 'tab_')->where($otherMap)->save($updateData); - if (!$status) { - $model->rollback(); - return ['status' => false, 'msg' => '系统异常，修改角色推广员失败']; - } - M('spend', 'tab_')->where($otherMap)->where(['is_check' => ['in','1,2']])->save($updateData); // 只改未对账的数据 M('deposit', 'tab_')->where($otherMap)->save($updateData); M('bind_spend', 'tab_')->where($otherMap)->save($updateData);
*{$parentTypeName}：