Revert "merchant.ctl"

This reverts commit db994672686d0d61c6553e3a36243703ab4908a5.

admin/control/merchant.php

@@ -1073,34 +1073,6 @@ class merchantControl extends SystemControl
         }
     }
 
-    public function merchant_ctlOp()
-    {
-        $mchid = $_GET['mchid'] ?? $_POST['mchid'];
-        $model_merchant = Model('merchant');
-        $merchant = $model_merchant->getMerchantInfo(['mchid' => $mchid], '*', true);
-        if (empty($merchant)) {
-            showMessage('机构信息有误');
-        }
-        $qualitys = [
-            refill\Quality::Normal,refill\Quality::Quick,refill\Quality::CardKey,refill\Quality::ThirdShop,
-            refill\Quality::SlowTwentyFour,refill\Quality::SlowSix,refill\Quality::SlowTwo,refill\Quality::SlowFortyEight,
-            refill\Quality::SlowSeventyTwo,refill\Quality::Fastest
-        ];
-        if(chksubmit())
-        {
-
-        }
-        else
-        {
-            foreach ($qualitys as $value) {
-                $quality[$value] = $this->quality_format($value,mtopcard\ChinaMobileCard);
-            }
-            Tpl::output('merchant', $merchant);
-            Tpl::output('card_state', mtopcard\CardState);
-            Tpl::showpage('merchant.ctl');
-        }
-    }
-
     public function merchant_interceptOp()
     {
         $mchid = $_GET['mchid'] ?? $_POST['mchid'];

admin/templates/default/merchant.ctl.php

@@ -1,187 +0,0 @@
-<style>
-    .mleft {
-        margin-left: 45px;
-    }
-    hr {
-  border: none;
-  border-top: 1px solid #cbe9f3;
-  margin-bottom: 10px;
-  margin-top: 10px;
-}
-</style>
-<?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">机构名称:</label></td>
-            </tr>
-            <tr class="noborder">
-                <td class="mleft" style="display: block"><?php echo "{$output['merchant']['mchid']} ：{$output['merchant']['company_name']}";?></td>
-            </tr>
-            
-            <tr class="noborder">
-                <td colspan="2" class="required"><label class="validation">拦截设置:</label></td>
-            </tr>
-            <tr class="noborder">
-                <td colspan="2" class="required mleft"><label class="mleft" for="name">转网：</label>
-                <input type="radio" name="is_transfer" value="1" <?php if($output['intercept']['is_transfer'] == 1){ echo 'checked'; }?>>是
-                <input type="radio" name="is_transfer" value="0" <?php if($output['intercept']['is_transfer'] == 0){ echo 'checked'; }?>>否
-            </td>
-            </tr>
-            <tr class="noborder">
-                <td colspan="2" class="required"><label class="mleft" for="name">状态码：</label>
-                    <?php foreach ($output['card_state'] as $key => $value){?>
-                    <input type="checkbox" name="card_states[]" value="<?php echo $key;?>"
-                        <?php if( !empty($output['intercept']['card_states']) && in_array($key, $output['intercept']['card_states'])){ echo 'checked'; }?>
-                        ><?php echo $value;?>
-                    <?php }?>
-            </td>
-        </tr>
-        
-        <tr class="noborder">
-                <td colspan="2" class="required"><label class="mleft" style="margin-right: 12px;" for="name">三网：</label>
-                    
-                    <input type="checkbox" name="" value="">移动
-                    <input type="checkbox" name="" value="">联通
-                    <input type="checkbox" name="" value="">电信
-            </td>
-        </tr>
-        <tr  class="noborder">
-            <td>
-        <hr>
-        </td>
-        </tr>
-        <tr class="noborder">
-                <td colspan="2" class="required"><label class="validation">高价补充条件:</label></td>
-            </tr>
-            <tr class="noborder">
-                <td colspan="2" class="required"><label class="mleft" for="name">开启状态：</label>
-                开启<input type="radio" class="open" name="opened" value="1" <?php if($output['retry_times']['opened'] == 1){ echo 'checked'; }?>>
-                关闭<input type="radio" class="open" name="opened" value="0" <?php if($output['retry_times']['opened'] == 0){ echo 'checked'; }?>>
-            </td>
-            </tr>
-
-            <tr class="noborder">
-            <td colspan="2" class="required"><label style="margin-left: 45px;" for="name">成功率不低于：</label>
-            <input type="text" name="ratio" value="<?php echo $output['retry_times']['lower_ratio']['ratio'] ?? 0;?>" id="success">
-            <label style="margin-left: 15px;" for="name">检测时间：</label>
-            <select name="" id="">
-                <option value="">请选择</option>
-                <option value="900">900</option>
-                <option value="1800">1800</option>
-                <option value="3600">3600</option>
-            </select>
-            <label for="name">( 秒 )</label>
-
-            </td>
-            </tr>
-
-            <tr class="noborder">
-            <td colspan="2" class="required"><label style="margin-left: 45px;" for="name">利润率不低于：</label>
-            <input type="text" name="ratio" value="<?php echo $output['retry_times']['lower_ratio']['ratio'] ?? 0;?>" id="success">
-            <label style="margin-left: 15px;" for="name">时自动不补充</label>
-            </td>
-            </tr>
-            
-        <tr  class="noborder">
-            <td>
-        <hr>
-        </td>
-        </tr>
-        <tr class="noborder">
-                <td colspan="2" class="required"><label class="validation">充值时间和次数设置:</label></td>
-            </tr> 
-            <tr class="noborder">
-                <td colspan="2" class="required">
-                    <label class="seconds" style="margin-left: 16px;display:inline-block;  margin-right: 16px; min-width: 38px" for="name"><?php echo $value;?>：</label>
-                    <label for="name">白天秒数：</label>
-                    <input type="text" name="<?php echo "{$key}-secs";?>" value="<?php echo $output['retry_times']['qualities'][$key]['secs'] ?? 0;?>" class="secondss">
-                    <label for="name">黑夜秒数：</label>
-                    <input type="text" name="<?php echo "{$key}-secs";?>" value="<?php echo $output['retry_times']['qualities'][$key]['secs'] ?? 0;?>" class="secondss">
-                    <label style="margin-left: 15px;" for="name">重试次数：</label>
-                    <input type="text" name="<?php echo "{$key}-times";?>" value="<?php echo $output['retry_times']['qualities'][$key]['times'] ?? 0;?>" class="frequency">
-                </td>
-            </tr>   
-
-        <tr>
-                <td colspan="2" class="required"><label class="validation" for="oil_quality">油卡通道质量:</label></td>
-            </tr>
-            <tr class="noborder">
-                <td class="vatop" style="display: block; margin-left: 11px;">
-                    <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == refill\Quality::Normal){ echo 'checked';}?> value="<?php echo refill\Quality::Normal;?>" type="radio">无流水
-                    <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == refill\Quality::SlowTwentyFour){ echo 'checked';}?> value="<?php echo refill\Quality::SlowTwentyFour;?>" type="radio">有流水
-                    <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == refill\Quality::CardKey){ echo 'checked';}?> value="<?php echo refill\Quality::CardKey;?>" type="radio">卡密
-                    <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == refill\Quality::Quick){ echo 'checked';}?> value="<?php echo refill\Quality::Quick;?>" type="radio">快充
-                    <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == refill\Quality::OilSN_NONE_HAS){ echo 'checked';}?> value="<?php echo refill\Quality::OilSN_NONE_HAS;?>" type="radio">无流水+有流水
-                    <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == refill\Quality::OilSN_HAS_NONE){ echo 'checked';}?> value="<?php echo refill\Quality::OilSN_HAS_NONE;?>" type="radio">有流水+无流水
-                    <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == refill\Quality::OIL_SN_CARDKEY){ echo 'checked';}?> value="<?php echo refill\Quality::OIL_SN_CARDKEY;?>" type="radio">有流水+卡密
-                    <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == refill\Quality::OIL_SNNONE_CARDKEY){ echo 'checked';}?> value="<?php echo refill\Quality::OIL_SNNONE_CARDKEY;?>" type="radio">无流水+卡密
-                    <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == refill\Quality::OIL_SN_SNNONE_CARDKEY){ echo 'checked';}?> value="<?php echo refill\Quality::OIL_SN_SNNONE_CARDKEY;?>" type="radio">有流水+无流水+卡密
-                    <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == refill\Quality::OIL_SNNONE_SN_CARDKEY){ echo 'checked';}?> value="<?php echo refill\Quality::OIL_SNNONE_SN_CARDKEY;?>" type="radio">无流水+有流水+卡密
-                    <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == refill\Quality::OIL_SNNONE_SN_CARDKEY_QUICK){ echo 'checked';}?> value="<?php echo refill\Quality::OIL_SNNONE_SN_CARDKEY_QUICK;?>" type="radio">无流水+有流水+卡密+快充
-                </td>
-            </tr>
-            <tr>
-                <td colspan="2" class="required"><label class="validation" for="quality">话费通道质量:</label></td>
-            </tr>
-            <tr class="noborder">
-                <td class="vatop" >
-                    <input name="quality" <?php if($output['merchant']['quality'] == refill\Quality::Normal){ echo 'checked';}?> value="<?php echo refill\Quality::Normal;?>" type="radio">普通
-                    <input name="quality" <?php if($output['merchant']['quality'] == refill\Quality::Quick){ echo 'checked';}?> value="<?php echo refill\Quality::Quick;?>" type="radio">快速
-                    <input name="quality" <?php if($output['merchant']['quality'] == refill\Quality::CardKey){ echo 'checked';}?> value="<?php echo refill\Quality::CardKey;?>" type="radio">卡密
-                    <input name="quality" <?php if($output['merchant']['quality'] == refill\Quality::ThirdShop){ echo 'checked';}?> value="<?php echo refill\Quality::ThirdShop;?>" type="radio">三方
-                    <input name="quality" <?php if($output['merchant']['quality'] == refill\Quality::SlowTwentyFour){ echo 'checked';}?> value="<?php echo refill\Quality::SlowTwentyFour;?>" type="radio">慢24
-                    <input name="quality" <?php if($output['merchant']['quality'] == refill\Quality::SlowSix){ echo 'checked';}?> value="<?php echo refill\Quality::SlowSix;?>" type="radio">慢6
-                    <input name="quality" <?php if($output['merchant']['quality'] == refill\Quality::SlowTwo){ echo 'checked';}?> value="<?php echo refill\Quality::SlowTwo;?>" type="radio">慢2
-                    <input name="quality" <?php if($output['merchant']['quality'] == refill\Quality::SlowFortyEight){ echo 'checked';}?> value="<?php echo refill\Quality::SlowFortyEight;?>" type="radio">慢48
-                    <input name="quality" <?php if($output['merchant']['quality'] == refill\Quality::SlowSeventyTwo){ echo 'checked';}?> value="<?php echo refill\Quality::SlowSeventyTwo;?>" type="radio">慢72
-                    <input name="quality" <?php if($output['merchant']['quality'] == refill\Quality::Fastest){ echo 'checked';}?> value="<?php echo refill\Quality::Fastest;?>" type="radio">速充
-                    <input name="quality" <?php if($output['merchant']['quality'] == refill\Quality::SlowNormal){ echo 'checked';}?> value="<?php echo refill\Quality::SlowNormal;?>" type="radio">慢充一次+普充
-                    <input name="quality" <?php if($output['merchant']['quality'] == refill\Quality::ThirdNormal){ echo 'checked';}?> value="<?php echo refill\Quality::ThirdNormal;?>" type="radio">三方一次+普充
-                    <input name="quality" <?php if($output['merchant']['quality'] == refill\Quality::DefSuccess){ echo 'checked';}?> value="<?php echo refill\Quality::DefSuccess;?>" type="radio">普充+卡密+快充
-                    <input name="quality" <?php if($output['merchant']['quality'] == refill\Quality::NormalQuick){ echo 'checked';}?> value="<?php echo refill\Quality::NormalQuick;?>" type="radio">普充+快充
-                    <input name="quality" <?php if($output['merchant']['quality'] == refill\Quality::SlowSixNormal){ echo 'checked';}?> value="<?php echo refill\Quality::SlowSixNormal;?>" type="radio">慢充6+普充
-                </td>
-            </tr>
-            </tbody>
-            <tfoot>
-            <tr class="tfoot">
-                <td colspan="15"><a href="JavaScript:void(0);" class="btn"
-                                    id="submitBtn"><span><?php echo $lang['nc_submit']; ?></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();
-            }
-        });
- });
-</script>

admin/templates/default/merchant.index.php

@@ -124,7 +124,7 @@ defined('InShopNC') or exit('Access Invalid!'); ?>
                             <a href="index.php?act=merchant&op=recharge_manual&type=edit&mchid=<?php echo $v['mchid'] ?>">调款</a>
                         </td>
                         <td class="align-center w200" id="mechanism">
-                            <a href="index.php?act=merchant&op=merchant_edit&mchid=<?php echo $v['mchid'] ?>">基础设置</a>
+                            <a href="index.php?act=merchant&op=merchant_edit&mchid=<?php echo $v['mchid'] ?>">编辑</a>
                             <?php if($v['merchant_state'] == 1){?>
                                 |
                                 <a class="closeall" href="index.php?act=merchant&op=changeState&state=2&mchid=<?php echo $v['mchid'] ?>" style="color: red">关闭机构</a>
@@ -135,16 +135,13 @@ defined('InShopNC') or exit('Access Invalid!'); ?>
                             <?php }?>
                         </td>
                         <td class="align-center">
-                            <a href="index.php?act=merchant&op=merchant_ctl&mchid=<?php echo $v['mchid'] ?>">
-                                充值设置
+                            <a href="index.php?act=merchant&op=merchant_retry_times&mchid=<?php echo $v['mchid'] ?>">
+                                质量设置
+                            </a>
+                            |
+                            <a href="index.php?act=merchant&op=merchant_intercept&mchid=<?php echo $v['mchid'] ?>">
+                                拦截设置
                             </a>
-<!--                            <a href="index.php?act=merchant&op=merchant_retry_times&mchid=--><?php //echo $v['mchid'] ?><!--">-->
-<!--                                质量设置-->
-<!--                            </a>-->
-<!--                            |-->
-<!--                            <a href="index.php?act=merchant&op=merchant_intercept&mchid=--><?php //echo $v['mchid'] ?><!--">-->
-<!--                                拦截设置-->
-<!--                            </a>-->
                         </td>
                         <td class="align-center w200">
                             <a href="index.php?act=merchant&op=price&quality=1&mchid=<?php echo $v['mchid'] ?>">通道费率设置</a>