Merge pull request '额外额度备注信息显示' (#164) from feature/TestingResource-0205 into release

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/164

Application/Admin/View/TestingResource/index.html

@@ -168,7 +168,7 @@
                     <td colspan="99" class="text-center">aOh! 暂时还没有内容!</td>
                     <else />
                     <volist name="records" id="record">
-                        <tr data-id="<?=$record['id']?>" data-binding-id="{$record.binding_id}" data-other-quota="{$record.other_quota}">
+                        <tr data-id="<?=$record['id']?>" data-binding-id="{$record.binding_id}" data-other-quota="{$record.other_quota}" data-other-quota-remark="{$record.other_quota_remark}">
                             <td>
                                 <input class="ids" type="radio" value="{$record['id']}" name="role_id">
                             </td>
@@ -250,7 +250,7 @@
             <div class="form-group">
                 <label>备注信息:</label>
                 <div class="form-item" style="width: 280px;">
-                    <textarea name="other_quota_remark"id="other_quota_remark" class="form-input" placeholder="100字以内" maxlength="100"></textarea>
+                    <textarea name="other_quota_remark"id="other_quota_remark" class="form-input" placeholder="100字以内" value="" maxlength="100"></textarea>
                 </div>
             </div>
             <div class="form-group">
@@ -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,

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,