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

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

Application/Admin/Controller/PaymentMerchantController.class.php

@@ -938,7 +938,7 @@ class PaymentMerchantController extends ThinkController
 
         $gameService = new GameService();
         $games = $gameService->getBaseGames();
-        $gameNameMap = array_column($games, 'id', 'name');
+        $gameNameMap = array_column($games, 'name', 'id');
 
         $records = [];
         foreach ($items as $item) {

Application/Admin/View/PaymentMerchant/masterForm.html

@@ -102,10 +102,10 @@
             <tr>
                 <td class="l"><i class="mustmark">*</i>首充限制：</td>
                 <td class="r">
-                    <label>
+                    <label style="margin-right: 20px;">
                         <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>
+                    <label>
                         <input type="radio" name="is_first_pay" class="" <?php if($rule && $rule['is_first_pay']==0):?>checked<?php endif;?> value="0"> 关闭
                     </label>
                 </td>

Application/Admin/View/PaymentMerchant/masterRules.html

@@ -232,9 +232,17 @@
                 })
                 return ids;
             }
+
             $('.delete-btn').on({
                 click: function() {
-                    var id = $(this).parents('tr').eq(0).attr('data-id');
+                    var id = $(this).parents('tr').eq(0).attr('data-id')
+                    layer.confirm('确定要删除该规则 ？', {icon: 3, title:'提示'}, function(index){
+                        deleteRule(id)
+                    })
+                }
+            })
+
+            function deleteRule(id) {
                 $.ajax({
                     url: '{:U("deleteMasterRule")}',
                     type: 'post',
@@ -252,7 +260,6 @@
                     }
                 })
             }
-            })
             
             $('.edit-form-btn').on({
                 click: function() {