Merge pull request '修改' (#685) from feature/GamePaymentRule into master

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

Application/Admin/View/PaymentMerchant/masterForm.html

@@ -91,7 +91,7 @@
             <tr>
                 <td class="l"><i class="mustmark">*</i>游戏：</td>
                 <td class="r">
-                    <select name="game_id" id="game-select" class="select_gallery">
+                    <select name="base_game_id" id="game-select" class="select_gallery">
                         <option value="0">所有游戏</option>
                         <?php foreach($games as $game):?>
                         <option value="<?=$game['id']?>" <?php if($rule && $rule['base_game_id']==$game['id']):?>selected<?php endif;?>><?=$game['name']?></option>
@@ -103,7 +103,7 @@
                 <td class="l"><i class="mustmark">*</i>首充限制：</td>
                 <td class="r">
                     <label>
-                        <input type="radio" name="is_first_pay" class="" <?php if($rule && $rule['is_first_pay']==1):?>checked<?php endif;?> value="1"> 开启
+                        <input type="radio" name="is_first_pay" class="" <?php if(empty($rule) || $rule['is_first_pay']==1):?>checked<?php endif;?> value="1"> 开启
                     </label>
                     <label></label>
                         <input type="radio" name="is_first_pay" class="" <?php if($rule && $rule['is_first_pay']==0):?>checked<?php endif;?> value="0"> 关闭
@@ -119,7 +119,7 @@
             <tr>
                 <td class="l"><i class="mustmark">*</i>充值金额限制：</td>
                 <td class="r">
-                    <input type="text" name="max_pay_amount" placeholder="请输入充值金额限制 value="<?=$rule['max_pay_amount'] ?: 0;?>" style="width: 150px">
+                    <input type="text" name="max_pay_amount" placeholder="请输入充值金额限制" value="<?=$rule['max_pay_amount'] ?: 0;?>" style="width: 150px">
                 </td>
             </tr>
             </tbody>

Application/Admin/View/PaymentMerchant/masterRules.html

@@ -262,7 +262,7 @@
                         title: "编辑策略",
                         shadeClose: true,
                         shade: 0.8,
-                        area: ['500px', '300px'],
+                        area: ['500px', '365px'],
                         content: '/{$Think.SUBSITE_INDEX}?s=/PaymentMerchant/editMaster&id=' + id
                     })
                 }
@@ -275,7 +275,7 @@
                         title: "新增策略",
                         shadeClose: true,
                         shade: 0.8,
-                        area: ['500px', '300px'],
+                        area: ['500px', '365px'],
                         content: '/{$Think.SUBSITE_INDEX}?s=/PaymentMerchant/editMaster'
                     })
                 }