From 0a819757cbc17f94b25f3c6e4765d176511a382f Mon Sep 17 00:00:00 2001 From: zyx Date: Thu, 7 Nov 2019 15:02:59 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=97=B6=E9=97=B4bug=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/View/TestResource/index.html | 26 +++++++++++++++++++ .../Admin/View/TestResource/lists.html | 26 +++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/Application/Admin/View/TestResource/index.html b/Application/Admin/View/TestResource/index.html index 72d2a6bec..cfa496488 100644 --- a/Application/Admin/View/TestResource/index.html +++ b/Application/Admin/View/TestResource/index.html @@ -180,6 +180,11 @@ + + if(C('COLOR_STYLE')=='blue_color') echo ''; + + + + - - - - - From 4ea2029976e285c0988f60ca79bd69ee145d9d5a Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Fri, 8 Nov 2019 11:03:26 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/default/Download/listsIndex.html | 238 ++++++++++++++++++ 1 file changed, 238 insertions(+) create mode 100644 Application/Home/View/default/Download/listsIndex.html diff --git a/Application/Home/View/default/Download/listsIndex.html b/Application/Home/View/default/Download/listsIndex.html new file mode 100644 index 000000000..110f7c81c --- /dev/null +++ b/Application/Home/View/default/Download/listsIndex.html @@ -0,0 +1,238 @@ + + + + + + + + + + +
+
+
+
当前位置：下载管理>控制台
+
+ + 下载日志 + 记录数据管理中导出数据事件 +
+
+
+
+ +
+ +
+
+ +
+ +
+ +
+ + +
+ +
+ +
+ +
+ +
+
+ + +
+ +
+ + +
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
ID报表类型操作人申请时间下载时间状态
+ +

暂无数据

+
{$vo.logid}{$vo.dataname}{$vo.actor}{$vo.addtime|date='Y-m-d H:i:s',###} + + {$vo.begintime|date='Y-m-d H:i:s',###} + + 暂无下载时间 + + + + 可下载 + + 已下载 + +
+
+
+ {$_page} +
+
+
+
+ + + + + + + + + + + From c057c5cf47c7284437bdcce99035a0d2627c052e Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Fri, 8 Nov 2019 11:31:03 +0800 Subject: [PATCH 12/14] =?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=BB=93=E7=AE=97=E7=AE=A1?= =?UTF-8?q?=E7=90=86->=E6=8E=A8=E5=B9=BF=E6=8F=90=E7=8E=B0->=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=B1=87=E6=AC=BE=E8=AF=81=E6=98=8E--=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Query/withdraw.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Application/Admin/View/Query/withdraw.html b/Application/Admin/View/Query/withdraw.html index d9f71f886..e4d233f10 100644 --- a/Application/Admin/View/Query/withdraw.html +++ b/Application/Admin/View/Query/withdraw.html @@ -376,6 +376,11 @@ function details(id){ }, // dnd: false, paste: document.body, + accept: { + title: '文件', + extensions: 'png,gif,jpg,jpeg,bmp,txt,doc*,xlsx,asp,pdf', + mimeTypes: '.png,.gif,.jpg,.jpeg,.bmp,.txt,.doc*,.xlsx,.asp,.pdf', + }, // 不压缩image, 默认如果是jpeg，文件上传前会压缩一把再上传！ resize: false, disableGlobalDnd: true, From afb6de56f83f8783afdc1598badbf37f8535207b Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Fri, 8 Nov 2019 11:47:41 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A03=E7=BA=A7=E5=8F=98?= =?UTF-8?q?=E5=9B=9B=E7=BA=A7=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/ConsoleController.class.php | 50 +++++++++++++++---- Data/update.sql | 5 ++ 2 files changed, 46 insertions(+), 9 deletions(-) diff --git a/Application/Admin/Controller/ConsoleController.class.php b/Application/Admin/Controller/ConsoleController.class.php index cd6fd82a8..53113ade2 100644 --- a/Application/Admin/Controller/ConsoleController.class.php +++ b/Application/Admin/Controller/ConsoleController.class.php @@ -5,23 +5,55 @@ namespace Admin\Controller; use Admin\Model\SpendModel; use Think\Think; -use Org\RedisSDK\Redis; -class AutoController extends Think { +class ConsoleController extends Think { protected function _initialize() { C(api('Config/lists')); } - public function modifyUserRole() - { - M('user_play_info', 'tab_')->select(['game_id', 'server_id', 'role_id'])->group('game_id, server_id, role_id')->having('count(*)>1')->select(); - - } - - public function modifyRecharge() + public function modifyPromote() { + $promotes = M('promote', 'tab_')->where(['parent_id' => 0])->select(); + foreach ($promotes as $promote) { + $promote['chain'] = '/'; + $promote['level'] = 1; + + M('promote', 'tab_')->where(['id' => $promote['id']])->save(['chain' => '/', 'level' => 1]); + $subPromote = $promote; + unset($subPromote['id']); + $subPromote['parent_id'] = $promote['id']; + $subPromote['parent_name'] = $promote['account']; + $subPromote['chain'] = $promote['chain'] . $promote['id'] . '/'; + $subPromote['level'] = $promote['level'] + 1; + $subPromote['account'] = 'second_' . $promote['account']; + $subPromote['nickname'] = '二级_' . $promote['nickname']; + $subPromote['mobile_phone'] = ''; + $subPromote['email'] = ''; + $subPromote['real_name'] = ''; + $subPromote['money'] = 0; + $subPromote['total_money'] = 0; + $subPromote['balance_coin'] = 0; + $subPromote['create_time'] = time(); + $subPromote['last_login_time'] = 0; + $subPromote['idcard'] = ''; + M('promote', 'tab_')->add($subPromote); + $subId = M()->getLastInsID(); + $subChain = $subPromote['chain'] . $subId . '/'; + M('promote', 'tab_')->where(['parent_id' => $promote['id'], 'id' => ['neq', $subId]])->save([ + 'parent_id' => $subId, + 'parent_name' => $subPromote['account'], + 'chain' => $subChain, + 'level' => 3, + ]); + // echo M()->getLastSql() . "\n"; + M('promote', 'tab_')->where(['grand_id' => $promote['id']])->save([ + 'chain' => ['exp', 'concat("' . $subChain. '",parent_id,"/")'], + 'level' => 4, + ]); + // echo M()->getLastSql() . "\n"; + } } } diff --git a/Data/update.sql b/Data/update.sql index 612fc1f47..b22117111 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -355,9 +355,14 @@ CREATE TABLE `tab_device_bans` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8; +-- 2019-11-07 elf 推广员三级变四级 +ALTER TABLE `tab_promote` ADD COLUMN `level` tinyint(1) NOT NULL DEFAULT 0 COMMENT '推广员级别' after parent_name; +ALTER TABLE `tab_promote` ADD COLUMN `chain` varchar(30) NOT NULL DEFAULT '' COMMENT '推广员链路' after level; + -- 2019-11-07 elf 迁移任务 ALTER TABLE `sys_shift_task` ADD COLUMN `shift_ids` varchar(255) NOT NULL DEFAULT '' COMMENT '迁移ID'; ALTER TABLE `sys_shift_task` ADD COLUMN `remark` varchar(255) NOT NULL DEFAULT '' COMMENT '备注'; + -- 2019-11-07 cxj ALTER TABLE `platform_query`.`tab_withdraw` ADD COLUMN `transfer_proof` int(11) NOT NULL DEFAULT 0 COMMENT '汇款证明' AFTER `settlement_end_time`; \ No newline at end of file From d57e4a211f1bae65f13215bb3676bcff03dc4a22 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Fri, 8 Nov 2019 11:50:27 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->?= =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E7=AE=A1=E7=90=86->=E6=8F=90=E7=8E=B0?= =?UTF-8?q?=E8=AE=B0=E5=BD=95->=E7=BB=93=E7=AE=97=E5=8D=95--=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Finance/settlementOrder.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Home/View/default/Finance/settlementOrder.html b/Application/Home/View/default/Finance/settlementOrder.html index 16dfbf387..d05184dc1 100644 --- a/Application/Home/View/default/Finance/settlementOrder.html +++ b/Application/Home/View/default/Finance/settlementOrder.html @@ -124,7 +124,7 @@ {$withdraw.sum_money} - (实际提现金额=提现金额+奖惩金额) + (实际提现金额=收益金额+奖惩金额)