update

admin/control/provider_group.php

@@ -192,4 +192,23 @@ class provider_groupControl extends SystemControl
             return 'unknown';
         }
     }
+
+    public function merchant_sel_groupOp()
+    {
+        $mchid = $_GET['mchid'] ?? $_POST['mchid'];
+        $model_merchant = Model('merchant');
+        $merchant = $model_merchant->getMerchantInfo(['mchid' => $mchid]);
+        if (empty($merchant)) {
+            showMessage('机构信息有误');
+        }
+
+        $group_mod = Model('provider_group');
+        $group_list = $group_mod->getGroupList(['group_id' => ['gt', 0]], 30, 'add_time desc');
+        if(empty($group_list)) {
+            showMessage('暂无可用通道组，请先添加。','index.php?act=provider_group&op=index');
+        }
+        Tpl::output('merchant', $merchant);
+        Tpl::output('group_list', $group_list);
+        Tpl::showpage('merchant.sel.group');
+    }
 }

admin/templates/default/css/recharge.css

@@ -110,3 +110,6 @@ input[type="number"] {
   border-color: #ABADB3 #E2E3EA #E2E3EA #ABADB3;
   padding: 2px 4px;
 }
+input[type="checkbox"] {
+  vertical-align: middle;
+}

admin/templates/default/merchant.index.php

@@ -63,6 +63,8 @@ defined('InShopNC') or exit('Access Invalid!'); ?>
                 <th class="align-center">机构状态</th>
                 <th class="align-center">上次登录ip</th>
                 <th class="align-center">上次登录日期</th>
+                <th class="align-center">加款操作</th>
+                <th class="align-center">机构操作</th>
                 <th class="align-center"><?php echo $lang['operation']; ?></th>
             </tr>
             </thead>
@@ -92,24 +94,25 @@ defined('InShopNC') or exit('Access Invalid!'); ?>
                         <td class="align-center"><?php echo $v['last_login_ip'] ?? $lang['no_limit']; ?></td>
                         <td class="nowarp align-center"><?php echo $v['last_login_time'] ? date('Y-m-d H:i', $v['last_login_time']) : $lang['no_limit']; ?></td>
                         <td class="align-center w200">
-                            <div>
-                                <a href="index.php?act=merchant&op=merchant_edit&mchid=<?php echo $v['mchid'] ?>">编辑</a>
-                                <?php if($v['merchant_state'] == 1){?>
-                                    |
-                                    <a href="index.php?act=merchant&op=changeState&state=2&mchid=<?php echo $v['mchid'] ?>">关闭机构</a>
-                                <?php }?>
-                                <?php if($v['merchant_state'] == 2){?>
-                                    |
-                                    <a href="index.php?act=merchant&op=changeState&state=1&mchid=<?php echo $v['mchid'] ?>">启用机构</a>
-                                <?php }?>
-                            </div>
-                                <div>
-                                    <a href="index.php?act=merchant&op=recharge_manual&type=add&mchid=<?php echo $v['mchid'] ?>">加款</a>
-                                    |
-                                    <a href="index.php?act=merchant&op=recharge_manual&type=edit&mchid=<?php echo $v['mchid'] ?>">调款</a>
-                                    |
-                                    <a href="index.php?act=merchant&op=price&quality=1&mchid=<?php echo $v['mchid'] ?>">通道费率设置</a>
-                                </div>
+                            <a href="index.php?act=merchant&op=recharge_manual&type=add&mchid=<?php echo $v['mchid'] ?>">加款</a>
+                            |
+                            <a href="index.php?act=merchant&op=recharge_manual&type=edit&mchid=<?php echo $v['mchid'] ?>">调款</a>
+                        </td>
+                        <td class="align-center w200">
+                            <a href="index.php?act=merchant&op=merchant_edit&mchid=<?php echo $v['mchid'] ?>">编辑</a>
+                            <?php if($v['merchant_state'] == 1){?>
+                                |
+                                <a href="index.php?act=merchant&op=changeState&state=2&mchid=<?php echo $v['mchid'] ?>">关闭机构</a>
+                            <?php }?>
+                            <?php if($v['merchant_state'] == 2){?>
+                                |
+                                <a href="index.php?act=merchant&op=changeState&state=1&mchid=<?php echo $v['mchid'] ?>">启用机构</a>
+                            <?php }?>
+                        </td>
+                        <td class="align-center w200">
+                            <a href="index.php?act=merchant&op=price&quality=1&mchid=<?php echo $v['mchid'] ?>">通道费率设置</a>
+                            |
+                            <a href="index.php?act=provider_group&op=merchant_sel_group&mchid=<?php echo $v['mchid'] ?>">通道组设置</a>
                         </td>
                     </tr>
                 <?php } ?>

admin/templates/default/merchant.sel.group.php

@@ -0,0 +1,100 @@
+<link href="<?php echo ADMIN_TEMPLATES_URL;?>/css/recharge.css?<?php echo rand(1,10);?>" rel="stylesheet" type="text/css" id="cssfile2" />
+<?php defined('InShopNC') or exit('Access Invalid!'); ?>
+
+<div class="page">
+    <div class="fixed-bar">
+        <div class="item-title">
+            <h3><?php echo $lang['nc_merchant'] ?></h3>
+            <ul class="tab-base">
+                <li><a href="index.php?act=merchant&op=merchant"><span><?php echo $lang['nc_manage'] ?></span></a></li>
+                <li><a href="JavaScript:void(0);" class="current"><span>选择通道组</span></a></li>
+            </ul>
+        </div>
+    </div>
+    <div class="fixed-empty"></div>
+    <form id="user_form" enctype="multipart/form-data" method="post">
+        <input type="hidden" name="form_submit" value="ok"/>
+        <input type="hidden" name="mchid" value="<?php echo $output['merchant']['mchid'];?>"/>
+        <table class="table tb-type2">
+            <tbody>
+            <tr class="noborder">
+                <td colspan="2" class="required"><label class="validation" for="name">机构名称:</label></td>
+            </tr>
+            <tr class="noborder">
+                <td class="vatop"><?php echo $output['merchant']['name'];?></td>
+            </tr>
+            <tr>
+                <td colspan="2" class="required"><label class="validation" for="name">选择通道组:</label></td>
+            </tr>
+            <tr class="noborder" style="display:block;height:auto">
+                <?php if(!empty($output['group_list'])){?>
+                <?php foreach ($output['group_list'] as $group) {?>
+                    <td>
+                        <span>
+                            <label>
+                                <?php echo $group['group_name'];?>:
+                                <input type="checkbox" name="sel[]" data-name="unicom" id="unicom_cb_all" value="<?php echo $group['group_id'];?>">
+                            </label>
+                        </span>
+                    </td>
+                    <?php }?>
+                <?php }?>
+            </tr>
+            </tbody>
+            <tfoot style="border-top: 1px solid #CBE9F3;">
+            <tr class="tfoot w200" style="display: block;">
+                <td colspan="15">
+                    <a href="JavaScript:void(0);" class="btn" id="submitBtn"><span><?php echo $lang['nc_submit']; ?></span></a>
+                </td>
+                <td colspan="15">
+                    <a href="JavaScript:void(0);" class="btn" id="emptyBtn">
+                        <span>清空</span>
+                    </a>
+                </td>
+            </tr>
+            </tfoot>
+        </table>
+    </form>
+</div>
+<script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/js/dialog/dialog.js" id="dialog_js"
+        charset="utf-8"></script>
+<script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/js/jquery-ui/jquery.ui.js"></script>
+<script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/js/ajaxfileupload/ajaxfileupload.js"></script>
+<script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/js/jquery.Jcrop/jquery.Jcrop.js"></script>
+<link href="<?php echo RESOURCE_SITE_URL; ?>/js/jquery.Jcrop/jquery.Jcrop.min.css" rel="stylesheet" type="text/css"
+      id="cssfile2"/>
+<script type="text/javascript">
+    $(function () {
+        //按钮先执行验证再提交表单
+        $("#submitBtn").click(function () {
+            if ($("#user_form").valid()) {
+                $("#user_form").submit();
+            }
+        });
+        $('#user_form').validate({
+            errorPlacement: function (error, element) {
+                error.appendTo(element.parent().parent().prev().find('td:first'));
+            },
+            rules: {
+                company_name: {
+                    required: true,
+                },
+                password: {
+                    required: true,
+                    maxlength: 20,
+                    minlength: 6
+                },
+            },
+            messages: {
+                company_name: {
+                    required: '机构公司名称不能为空',
+                },
+                password: {
+                    required: '密码不能为空',
+                    maxlength: '<?php echo $lang['merchant_edit_password_tip']?>',
+                    minlength: '<?php echo $lang['merchant_edit_password_tip']?>'
+                }
+            }
+        });
+    });
+</script>