From 8c1cc90185fe777388952ad9eb50c0de7495f2f5 Mon Sep 17 00:00:00 2001 From: elf <360197197@qq.com> Date: Fri, 1 Jul 2022 01:13:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=8F=AF=E6=89=8B=E5=8A=A8=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TestingResourceController.class.php | 5 ++++- Application/Admin/View/TestingResource/apply.html | 14 ++++++++++---- .../Base/Tool/GameResource/LeyouClient.class.php | 1 + .../TestingResourceController.class.php | 3 +++ .../Home/View/default/TestingResource/apply.html | 15 +++++++++++---- 5 files changed, 29 insertions(+), 9 deletions(-) diff --git a/Application/Admin/Controller/TestingResourceController.class.php b/Application/Admin/Controller/TestingResourceController.class.php index 6ed20c1a5..60503e2b7 100644 --- a/Application/Admin/Controller/TestingResourceController.class.php +++ b/Application/Admin/Controller/TestingResourceController.class.php @@ -438,7 +438,8 @@ class TestingResourceController extends ThinkController } $hasItf = 0; - + $isEnableNum = 0; + $servers = []; $bindingRole = null; if ($role) { @@ -469,6 +470,7 @@ class TestingResourceController extends ThinkController $gameSetting = $repository->getGameSettingByGameId($role['game_id']); $hasItf = $gameSetting ? $gameSetting['has_itf'] : 0; + $isEnableNum = $gameSetting ? $gameSetting['is_enable_num'] : 0; } $testingResourceService = new TestingResourceService(); @@ -476,6 +478,7 @@ class TestingResourceController extends ThinkController $games = M('game', 'tab_')->field(['id' , 'game_name'])->select(); + $this->assign('isEnableNum', $isEnableNum); $this->assign('hasItf', $hasItf); $this->assign('games', $games); $this->assign('servers', $servers); diff --git a/Application/Admin/View/TestingResource/apply.html b/Application/Admin/View/TestingResource/apply.html index 557f12371..bd00ef9d1 100644 --- a/Application/Admin/View/TestingResource/apply.html +++ b/Application/Admin/View/TestingResource/apply.html @@ -186,6 +186,7 @@ body {
+
+

资源数量: 1

- +
@@ -289,6 +293,7 @@ body { $(".select_gallery").select2() var globalGameId = $('#game-select').val() var hasItf = $('#hasItf').val() + var isEnableNum = $('#isEnableNum').val() if (globalGameId > 0) { initTable(globalGameId) } @@ -465,8 +470,7 @@ body { var resourceName = $('#resource-select option:selected').html() var amount = $('#resource-select option:selected').attr('data-amount') amount = amount == undefined ? '--' : amount - // var num = $('#num-input').val() - var num = 1 + var num = isEnableNum == 1 ? $('#num-input').val() : 1 var remark = $('#remark-input').val() if (resourceTypeId == '') { @@ -481,7 +485,9 @@ body { if (!isNumber(num)) { return layer.msg('资源数量只能为正整数') } - + if (num <= 0) { + return layer.msg('资源数量需要大于0') + } var html = '' + '' + resourceTypeName + '' + '' + resourceName + '' + diff --git a/Application/Base/Tool/GameResource/LeyouClient.class.php b/Application/Base/Tool/GameResource/LeyouClient.class.php index 1ba5ea35f..5198a6aa5 100644 --- a/Application/Base/Tool/GameResource/LeyouClient.class.php +++ b/Application/Base/Tool/GameResource/LeyouClient.class.php @@ -101,6 +101,7 @@ class LeyouClient $data['type'] = 2; } else { $data['goods_id'] = $order['ref_id']; + $data['goods_num'] = $order['num']; $data['type'] = 1; } diff --git a/Application/Home/Controller/TestingResourceController.class.php b/Application/Home/Controller/TestingResourceController.class.php index a48d5f2ce..825a854de 100644 --- a/Application/Home/Controller/TestingResourceController.class.php +++ b/Application/Home/Controller/TestingResourceController.class.php @@ -131,6 +131,7 @@ class TestingResourceController extends BaseController } $hasItf = 0; + $isEnableNum = 0; $servers = []; $bindingRole = null; @@ -161,11 +162,13 @@ class TestingResourceController extends BaseController $repository = new TestingResourceRepository(); $gameSetting = $repository->getGameSettingByGameId($role['game_id']); $hasItf = $gameSetting ? $gameSetting['has_itf'] : 0; + $isEnableNum = $gameSetting ? $gameSetting['is_enable_num'] : 0; } $testingResourceService = new TestingResourceService(); $quota = $testingResourceService->getRemainQuota($role, $bindingRole); $this->assign('hasItf', $hasItf); + $this->assign('isEnableNum', $isEnableNum); $games = M('game', 'tab_')->field(['id' , 'game_name'])->select(); diff --git a/Application/Home/View/default/TestingResource/apply.html b/Application/Home/View/default/TestingResource/apply.html index 0c52547e7..656b0dbd5 100644 --- a/Application/Home/View/default/TestingResource/apply.html +++ b/Application/Home/View/default/TestingResource/apply.html @@ -138,6 +138,7 @@
+
+

资源数量: 1

- +
@@ -242,6 +246,7 @@ $(".select_gallery").select2() var globalGameId = $('#game-select').val() var hasItf = $('#hasItf').val() + var isEnableNum = $('#isEnableNum').val() if (globalGameId > 0) { initTable(globalGameId) } @@ -418,8 +423,7 @@ var resourceName = $('#resource-select option:selected').html() var amount = $('#resource-select option:selected').attr('data-amount') amount = amount == undefined ? '--' : amount - // var num = $('#num-input').val() - var num = 1 + var num = isEnableNum == 1 ? $('#num-input').val() : 1 var remark = $('#remark-input').val() if (resourceTypeId == '') { @@ -434,6 +438,9 @@ if (!isNumber(num)) { return layer.msg('资源数量只能为正整数') } + if (num <= 0) { + return layer.msg('资源数量需要大于0') + } var html = '' + '' + resourceTypeName + '' + @@ -465,7 +472,7 @@ }) $('#resource-table').on('blur', 'input[name=amount]', function() { if($(this).val() == '') { - return layer.msg('请输入资源数量') + return layer.msg('请输入资源价值') } else { statQuota() } From 4dc81e3a8d9b65c2ba6a718301d821c85eed697c Mon Sep 17 00:00:00 2001 From: elf <360197197@qq.com> Date: Fri, 1 Jul 2022 02:40:34 +0800 Subject: [PATCH 2/3] =?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/TestingResourceService.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Base/Service/TestingResourceService.class.php b/Application/Base/Service/TestingResourceService.class.php index c26ac2a3e..b9a76df31 100644 --- a/Application/Base/Service/TestingResourceService.class.php +++ b/Application/Base/Service/TestingResourceService.class.php @@ -488,7 +488,7 @@ class TestingResourceService /** * @todo 游戏猫只能每个资源数量只能为1 */ - if ($record['num'] != 1) { + if ($gameSetting['is_enable_num'] == 0 && $record['num'] != 1) { throw new \Exception('该游戏每次申请单项资源数量只能为1'); } } From 41fe81d4a1ce3121bcda722a6e775e002b43788f Mon Sep 17 00:00:00 2001 From: elf <360197197@qq.com> Date: Fri, 1 Jul 2022 02:49:08 +0800 Subject: [PATCH 3/3] =?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/Admin/View/TestingResource/apply.html | 3 ++- Application/Home/View/default/TestingResource/apply.html | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Application/Admin/View/TestingResource/apply.html b/Application/Admin/View/TestingResource/apply.html index bd00ef9d1..c0a5a7208 100644 --- a/Application/Admin/View/TestingResource/apply.html +++ b/Application/Admin/View/TestingResource/apply.html @@ -488,11 +488,12 @@ body { if (num <= 0) { return layer.msg('资源数量需要大于0') } + var numReadonly = isEnableNum == 1 ? '' : 'readonly' var html = '' + '' + resourceTypeName + '' + '' + resourceName + '' + '' + amount + '' + - '' + + '' + '' + '' + ''; diff --git a/Application/Home/View/default/TestingResource/apply.html b/Application/Home/View/default/TestingResource/apply.html index 656b0dbd5..2031a9b88 100644 --- a/Application/Home/View/default/TestingResource/apply.html +++ b/Application/Home/View/default/TestingResource/apply.html @@ -442,11 +442,12 @@ return layer.msg('资源数量需要大于0') } + var numReadonly = isEnableNum == 1 ? '' : 'readonly' var html = '' + '' + resourceTypeName + '' + '' + resourceName + '' + '' + amount + '' + - '' + + '' + '' + '' + '';