diff --git a/Application/Admin/View/TestingResource/index.html b/Application/Admin/View/TestingResource/index.html index 59e7428ae..f9afa4690 100644 --- a/Application/Admin/View/TestingResource/index.html +++ b/Application/Admin/View/TestingResource/index.html @@ -168,7 +168,7 @@ aOh! 暂时还没有内容! - + @@ -250,7 +250,7 @@
- +
@@ -345,8 +345,10 @@ var tr = $(this).parents('tr').eq(0) var id = tr.attr('data-id') var otherQuota = tr.attr('data-other-quota') + var otherQuotaRemark = tr.attr('data-other-quota-remark') box.find('[name=id]').val(id) box.find('[name=other_quota]').val(otherQuota) + box.find('[name=other_quota_remark]').val(otherQuotaRemark) layer.open({ title: '设置额外额度', type: 1, diff --git a/Application/Base/Repository/TestingResourceRepository.class.php b/Application/Base/Repository/TestingResourceRepository.class.php index a75ee3424..c4821b93e 100644 --- a/Application/Base/Repository/TestingResourceRepository.class.php +++ b/Application/Base/Repository/TestingResourceRepository.class.php @@ -508,6 +508,7 @@ class TestingResourceRepository 'bind_role_name' => $bindingRole ? $bindingRole['role_name'] : '', 'base_quota' => $gameSetting ? $gameSetting['base_quota'] : 0, 'other_quota' => intval($role['testing_other_quota']), + 'other_quota_remark' => $role['testing_other_quota_remark'], 'quota' => $quota, 'verify_amount' => $verifyRecords[$role['game_role_id']] ?? 0, 'provide_amount' => $provideRecords[$role['game_role_id']] ?? 0,