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

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

Application/Admin/Controller/PaymentMerchantController.class.php

@@ -181,6 +181,7 @@ class PaymentMerchantController extends ThinkController
         $config = I('config', []);
         $ways = I('ways', []);
         $mainId = I('main_id', 0);
+        $isMaster = I('is_master', 0);
 
         if ($name == '') {
             $this->ajaxReturn([
@@ -230,6 +231,7 @@ class PaymentMerchantController extends ThinkController
         $data['update_time'] = time();
         $data['main_name'] = $mainName;
         $data['main_id'] = $mainId;
+        $data['is_master'] = $isMaster;
         if ($id == 0) {
             $data['create_time'] = time();
             $data['channel'] = $channel;

Application/Admin/View/PaymentMerchant/form.html

@@ -115,8 +115,8 @@
               <td class="l noticeinfo"><i class="mustmark">*</i>启用状态</td>
               <td class="r table_radio">
                 <span class="form_radio">
-                    <label><input type="radio" name="status" value="0"> 禁用</label>
+                    <label><input type="radio" name="status" value="0" <?php if($record && $record['status'] == 0):?>checked<?php endif;?>> 禁用</label>
-                    <label><input type="radio" name="status" value="1" checked="checked"> 启用</label>
+                    <label><input type="radio" name="status" value="1" <?php if(empty($record) || $record['status'] == 1):?>checked<?php endif;?>> 启用</label>
                 </span>
                 <span class="notice-text"></span>
               </td>
@@ -133,6 +133,16 @@
                 <span class="notice-text"></span>
               </td>
             </tr>
+            <tr>
+              <td class="l noticeinfo"><i class="mustmark">*</i>是否公户</td>
+              <td class="r table_radio">
+                <span class="form_radio">
+                    <label><input type="radio" name="is_master" value="0" <?php if(empty($record) || $record['is_master'] == 0):?>checked<?php endif;?>> 否</label>
+                    <label><input type="radio" name="is_master" value="1" <?php if($record && $record['is_master'] == 1):?>checked<?php endif;?>> 是</label>
+                </span>
+                <span class="notice-text"></span>
+              </td>
+            </tr>
             </tbody>
           </table>
           <div id="merchant-detail" style="margin-top: 10px;">