xiaoyu %!s(int64=2) %!d(string=hai) anos
pai
achega
703c98a91a

+ 1 - 0
admin/include/limit.php

@@ -35,6 +35,7 @@ $_limit =  array(
         array('name'=> '订单列表', 'op'=>null, 'act'=>'refill_order'),
         array('name'=> '通道列表', 'op'=>null, 'act'=>'provider'),
         array('name'=> '通道控制', 'op'=>null, 'act'=>'provider_ctl'),
+        array('name'=> '机构通道配置', 'op'=>null, 'act'=>'refill_merchant_channel_cfg'),
         array('name'=> '通道组管理', 'op'=> null, 'act'=>'provider_group'),
         array('name'=> '订单监控', 'op'=>null, 'act'=>'ordersendlist'),
         array('name'=> '对账管理', 'op'=>null, 'act'=>'orderstats'),

+ 1 - 1
admin/include/menu.php

@@ -94,11 +94,11 @@ $arr = array(
 				'text' => '充值业务',
 				'list' => array(
 					array('args'=>'merchant,merchant,merchant',				'text'=>'机构管理'),
-					array('args'=>'index,refill_merchant_channel_cfg,merchant',			'text'=>'机构通道配置'),
 					array('args'=>'index,refill_evidence,merchant',			'text'=>'充值申请'),
 					array('args'=>'index,refill_order,merchant',			'text'=>'订单列表'),
 					array('args'=>'index,provider,merchant',				'text'=>'通道列表'),
 					array('args'=>'index,provider_ctl,merchant',			'text'=>'通道控制'),
+					array('args'=>'index,refill_merchant_channel_cfg,merchant',			'text'=>'机构通道配置'),
 					array('args'=>'index,provider_group,merchant',			'text'=>'通道组管理'),
 					array('args'=>'index,ordersendlist,merchant',			'text'=>'订单监控'),
 					array('args'=>'index,orderstats,merchant',				'text'=>'对账管理'),

+ 14 - 2
admin/templates/default/refill.merchant.channel.cfg.php

@@ -185,7 +185,13 @@
                                 <?php foreach ($output['provider_list'] as $k => $provider) { ?>
                                     <th class="align-center" style="vertical-align: top;">
                                         <div><input type="checkbox" name="chbox" value="" class="checkAllCol" data-index="<?php echo $k ?>"></div>
-                                        <span><?php echo $provider['store_name'] ?></span>
+                                            <?php if ($provider['opened'] == 1) { ?>
+                                                <span style="color: #0bb20c">
+                                            <?php } ?><?php if ($provider['opened'] == 2) { ?>
+                                                <span style="color: #f30707">
+                                            <?php } ?>
+
+                                            <?php echo $provider['store_name'] ?></span>
 
                                     </th>
                                 <?php } ?>
@@ -204,7 +210,13 @@
                                 <tr class="w500 trFlex">
                                     <td style="width: 130px;min-width:130px;white-space: nowrap;display: flex;align-items: center;" class="tbFlex">
                                         <input type="checkbox" class="checkAllRow" />
-                                        <span><?php echo $merchant['company_name'] ?? $merchant['name']; ?></span>
+                                        <?php if ($merchant['merchant_state'] == 1) { ?>
+                                        <span style="color: #0bb20c">
+                                            <?php } ?><?php if ($merchant['merchant_state'] == 2) { ?>
+                                                <span style="color: #f30707">
+                                            <?php } ?>
+
+                                            <?php echo $merchant['company_name'] ?? $merchant['name']; ?></span>
                                     </td>
                                     <?php foreach ($output['provider_list'] as $provider) { ?>
                                         <td class="batch-td">