Merge branch 'rpage' into raccount

admin/templates/default/merchant.index.php

@@ -1,15 +1,21 @@
 <style>
     .page .fixed-bar .item-title h3 {
-        margin-top:18px !important;
-        margin-bottom:10px !important;
-        font-weight:700 !important;
+        margin-top: 18px !important;
+        margin-bottom: 10px !important;
+        font-weight: 700 !important;
     }
+
     .tab-base li span {
-        font-size:12px !important;
+        font-size: 12px !important;
     }
 
+    a {
+        color: #0D93BF !important;
+    }
 </style>
-<?php use refill\LZRefillFactory;
+<?php
+
+use refill\LZRefillFactory;
 
 defined('InShopNC') or exit('Access Invalid!'); ?>
 
@@ -29,182 +35,185 @@ defined('InShopNC') or exit('Access Invalid!'); ?>
         <input type="hidden" value="merchant" name="op">
         <table class="tb-type1 noborder search">
             <tbody>
-            <tr>
-                <th><label for="merchant_name"><?php echo $lang['merchant_name']; ?></label></th>
-                <td><input type="text" value="<?php echo $_GET['merchant_name']; ?>" name="merchant_name"
-                           id="merchant_name" class="txt"></td>
-                <td><a href="javascript:void(0);" id="ncsubmit" class="btn-search "
-                       title="<?php echo $lang['nc_query']; ?>">&nbsp;</a>
-                    <?php if ($_GET['merchant_name'] != '') { ?>
-                        <a href="index.php?act=merchant&op=merchant" class="btns "
-                           title="<?php echo $lang['nc_cancel_search']; ?>"><span><?php echo $lang['nc_cancel_search']; ?></span></a>
-                    <?php } ?>
-                
-                </td>
-            </tr>
+                <tr>
+                    <th><label for="merchant_name"><?php echo $lang['merchant_name']; ?></label></th>
+                    <td><input type="text" value="<?php echo $_GET['merchant_name']; ?>" name="merchant_name" id="merchant_name" class="txt"></td>
+                    <td><a href="javascript:void(0);" id="ncsubmit" class="btn-search " title="<?php echo $lang['nc_query']; ?>">&nbsp;</a>
+                        <?php if ($_GET['merchant_name'] != '') { ?>
+                            <a href="index.php?act=merchant&op=merchant" class="btns " title="<?php echo $lang['nc_cancel_search']; ?>"><span><?php echo $lang['nc_cancel_search']; ?></span></a>
+                        <?php } ?>
+
+                    </td>
+                </tr>
             </tbody>
         </table>
     </form>
-       <table class="table tb-type2" id="prompt">
+    <table class="table tb-type2" id="prompt">
         <tbody>
-          <tr class="space odd">
-            <th colspan="12"><div class="title">
-                <h5>余额统计</h5>
-                <span class="arrow"></span></div></th>
-          </tr>
-          <tr>
-            <td>
-                <ul class="row_w">
-                    <li class="lineLi" style="color:#000;">总剩余： <?php echo ncPriceFormat($output['stats']['available_total']);?></li>
-                    <li class="lineLi" style="color:#000;">总欠款：<?php echo ncPriceFormat($output['stats']['debt_total']);?></li>
-                    <li class="lineLi" style="color:#000;">合计：<?php echo ncPriceFormat($output['stats']['available_total'] + $output['stats']['debt_total']);?></li>
-                </ul>
-            </td>
-          </tr>
+            <tr class="space odd">
+                <th colspan="12">
+                    <div class="title">
+                        <h5>余额统计</h5>
+                        <span class="arrow"></span>
+                    </div>
+                </th>
+            </tr>
+            <tr>
+                <td>
+                    <ul class="row_w">
+                        <li class="lineLi" style="color:#000;">总剩余： <?php echo ncPriceFormat($output['stats']['available_total']); ?></li>
+                        <li class="lineLi" style="color:#000;">总欠款：<?php echo ncPriceFormat($output['stats']['debt_total']); ?></li>
+                        <li class="lineLi" style="color:#000;">合计：<?php echo ncPriceFormat($output['stats']['available_total'] + $output['stats']['debt_total']); ?></li>
+                    </ul>
+                </td>
+            </tr>
         </tbody>
-      </table>
+    </table>
     <form method="post" id="merchant_name_form">
-        <input type="hidden" name="form_submit" value="ok"/>
+        <input type="hidden" name="form_submit" value="ok" />
         <a href="#" class="btns" id="close"><span>全部关闭机构</span></a>
 
         <div>
-        <table class="table tb-type2 myTable" width="100%"  id="app-gas-content">
-            <thead>
-            <tr class="thead">
-                <th class="align-center"><?php echo $lang['merchant_name']; ?>编号</th>
-                <th class="align-left" style="text-align: left">机构账号</th>
-                <th class="align-center">会员ID</th>
-                <th class="align-left">机构公司名称</th>
-                <th class="align-right">所剩余额</th>
-                <th class="align-right">授信额度</th>
-                <th class="align-right">预警余额</th>
-                <th class="align-center">机构状态</th>
-                <th class="align-left">上次登录ip</th>
-                <th class="align-left">上次登录日期</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>
-        <div class="table-body">
-         <tbody id="app-gas-body">
-            <?php if (!empty($output['merchant_list']) && is_array($output['merchant_list'])) { ?>
-                <?php foreach ($output['merchant_list'] as $k => $v) { ?>
-                    <tr class="trFlex">
-                        <td class="align-center"><?php echo $v['mchid']; ?></td>
-                        <td class="align-left"><?php echo $v['name']; ?></td>
-                        <td class="align-center"><?php echo $v['admin_id']; ?></td>
-                        <td class="align-left"><?php echo $v['company_name']; ?></td>
-                        <td id="just" class="align-right">
-                            <?php if($v['available_predeposit'] > 0){?>
-                                <span style="color: #0bb20c">
-                            <?php }?>
-                                <?php if($v['available_predeposit'] < 0){?>
-                                <span style="color: #f30707">
-                            <?php }?>
-                            <?php echo $v['available_predeposit'];?>
-                                </span>
-                        </td>
-                        <td class="align-right"><?php echo $v['credit_bonus']; ?></td>
-                        <td class="align-right"><?php echo $v['alarm_amount']; ?></td>
-                        <td  class="align-center">
-                            <?php if($v['merchant_state'] == 1){?>
-                                <span style="color: #0bb20c">
-                            <?php }?>
-                            <?php if($v['merchant_state'] == 2){?>
-                                <span style="color: #f30707">
-                            <?php }?>
-                            <?php echo $output['merchant_state_text'][$v['merchant_state']-1]; ?>
-                            </span>
-                        </td>
-                        <td class="align-left"><?php echo $v['last_login_ip'] ?? $lang['no_limit']; ?></td>
-                        <td class="nowarp align-left"><?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">
-                            <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" id="mechanism">
-                            <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>
-                            <?php }?>
-                            <?php if($v['merchant_state'] == 2){?>
-                                |
-                                <a href="index.php?act=merchant&op=changeState&state=1&mchid=<?php echo $v['mchid'] ?>" style="color: green">启用机构</a>
-                            <?php }?>
-                        </td>
-                        <td class="align-center">
-                            <a href="index.php?act=merchant&op=merchant_ctl&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>
-                            |
-                            <a href="index.php?act=provider_group&op=merchant_sel_group&mchid=<?php echo $v['mchid'] ?>">通道组设置</a>
+            <table class="table tb-type2 myTable" width="100%" id="app-gas-content">
+                <thead>
+                    <tr class="thead">
+                        <th class="align-center"><?php echo $lang['merchant_name']; ?>编号</th>
+                        <th class="align-left" style="text-align: left">机构账号</th>
+                        <th class="align-center">会员ID</th>
+                        <th class="align-left">机构公司名称</th>
+                        <th class="align-right">所剩余额</th>
+                        <th class="align-right">授信额度</th>
+                        <th class="align-right">预警余额</th>
+                        <th class="align-center">机构状态</th>
+                        <th class="align-left">上次登录ip</th>
+                        <th class="align-left">上次登录日期</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>
+                <div class="table-body">
+                    <tbody id="app-gas-body">
+                        <?php if (!empty($output['merchant_list']) && is_array($output['merchant_list'])) { ?>
+                            <?php foreach ($output['merchant_list'] as $k => $v) { ?>
+                                <tr class="trFlex">
+                                    <td class="align-center"><?php echo $v['mchid']; ?></td>
+                                    <td class="align-left"><?php echo $v['name']; ?></td>
+                                    <td class="align-center"><?php echo $v['admin_id']; ?></td>
+                                    <td class="align-left"><?php echo $v['company_name']; ?></td>
+                                    <td id="just" class="align-right">
+                                        <?php if ($v['available_predeposit'] > 0) { ?>
+                                            <span style="color: #0bb20c">
+                                            <?php } ?>
+                                            <?php if ($v['available_predeposit'] < 0) { ?>
+                                                <span style="color: #f30707">
+                                                <?php } ?>
+                                                <?php echo $v['available_predeposit']; ?>
+                                                </span>
+                                    </td>
+                                    <td class="align-right"><?php echo $v['credit_bonus']; ?></td>
+                                    <td class="align-right"><?php echo $v['alarm_amount']; ?></td>
+                                    <td class="align-center">
+                                        <?php if ($v['merchant_state'] == 1) { ?>
+                                            <span style="color: #0bb20c">
+                                            <?php } ?>
+                                            <?php if ($v['merchant_state'] == 2) { ?>
+                                                <span style="color: #f30707">
+                                                <?php } ?>
+                                                <?php echo $output['merchant_state_text'][$v['merchant_state'] - 1]; ?>
+                                                </span>
+                                    </td>
+                                    <td class="align-left"><?php echo $v['last_login_ip'] ?? $lang['no_limit']; ?></td>
+                                    <td class="nowarp align-left"><?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">
+                                        <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" id="mechanism">
+                                        <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>
+                                        <?php } ?>
+                                        <?php if ($v['merchant_state'] == 2) { ?>
+                                            |
+                                            <a href="index.php?act=merchant&op=changeState&state=1&mchid=<?php echo $v['mchid'] ?>" style="color: green">启用机构</a>
+                                        <?php } ?>
+                                    </td>
+                                    <td class="align-center">
+                                        <a href="index.php?act=merchant&op=merchant_ctl&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>
+                                        |
+                                        <a href="index.php?act=provider_group&op=merchant_sel_group&mchid=<?php echo $v['mchid'] ?>">通道组设置</a>
+                                    </td>
+                                </tr>
+                            <?php } ?>
+                        <?php } else { ?>
+                            <tr class="no_data">
+                                <td colspan="15"><?php echo $lang['nc_no_record']; ?></td>
+                            </tr>
+                        <?php } ?>
+                    </tbody>
+                </div>
+                <tfoot>
+                    <tr class="tfoot">
+                        <td></td>
+                        <td colspan="16">
+                            <div class="pagination"><?php echo $output['page']; ?></div>
                         </td>
                     </tr>
-                <?php } ?>
-            <?php } else { ?>
-                <tr class="no_data">
-                    <td colspan="15"><?php echo $lang['nc_no_record']; ?></td>
-                </tr>
-            <?php } ?>
-            </tbody>
-        </div>
-            <tfoot>
-            <tr class="tfoot">
-                <td></td>
-                <td colspan="16">
-                    <div class="pagination"><?php echo $output['page']; ?></div>
-                </td>
-            </tr>
-            </tfoot>
-        </table>
+                </tfoot>
+            </table>
         </div>
     </form>
 </div>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/js/jquery.edit.js" charset="utf-8"></script>
-<script type="text/javascript" src="<?php echo ADMIN_TEMPLATES_URL;?>/layui/layui.js"></script>
-<link rel="stylesheet" type="text/css" href="<?php echo ADMIN_TEMPLATES_URL; ?>/layui/css/layui.css"/>
+<script type="text/javascript" src="<?php echo ADMIN_TEMPLATES_URL; ?>/layui/layui.js"></script>
+<link rel="stylesheet" type="text/css" href="<?php echo ADMIN_TEMPLATES_URL; ?>/layui/css/layui.css" />
 <script>
-    $(function () {
-        $('#ncsubmit').click(function () {
+    $(function() {
+        $('#ncsubmit').click(function() {
             $('input[name="op"]').val('merchant');
             $('#formSearch').submit();
         });
         // 表格hover时背景
-        $('.trFlex').each(function () {
-            $(this).hover(function () {
+        $('.trFlex').each(function() {
+            $(this).hover(function() {
                 $(this)[0].style.backgroundColor = '#cbe9f3'
-            },function() {
+            }, function() {
                 $(this)[0].style.backgroundColor = '#fff'
             })
         })
         // 全部关闭机构
-             $('#close').click(function () {
+        $('#close').click(function() {
             layer.confirm('您确定要全部关闭机构', {
                 btn: ['确定', '取消'],
                 title: '全部关闭'
-            }, function () {
+            }, function() {
                 window.location.href = `index.php?act=merchant&op=AllCloseMerchant`
-            }, function () {
-            });
+            }, function() {});
         });
         //去空格
         $('#just span').each(function(index, item) {
             let text = $.trim($(item).text())
-           $(item).text(text)
+            $(item).text(text)
         })
     });
-</script>
+</script>

admin/templates/default/provider.price.set.php

@@ -1,5 +1,11 @@
 <?php defined('InShopNC') or exit('Access Invalid!'); ?>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjs/3.16.0/math.min.js"></script>
+<script>
+    math.config({
+        number: 'BigNumber',
+        precision: 20
+    });
+</script>
 <style>
     .disInput {
         background: #ccc;
@@ -250,7 +256,7 @@
             let price = tdVals.eq(i).find('.price').val();
             let amountPrice = tdVals.eq(i).find('.price').attr('name').split('-')[2];
             if (tdVals.eq(i).find('input').attr('data-opened') == 1) {
-                rateInput.val(maxDecimal(math.eval(price / amountPrice * 100)));
+                rateInput.val(maxDecimal(math.format(math.multiply(math.divide(math.bignumber(price), math.bignumber(amountPrice)), math.bignumber(100)))));
             } else {
                 rateInput.val('--');
             }
@@ -386,14 +392,30 @@
             var val = $(this).val();
             var changeInputName = $(this).parent('td').prev().find('input').attr('name');
             var amountPrice = changeInputName.split('-')[2];
-            $(this).parent('td').siblings('.tdVal').find('input').val(maxDecimal(math.eval(amountPrice * val / 100)))
+            // $(this).parent('td').siblings('.tdVal').find('input').val(maxDecimal(math.eval(amountPrice * val / 100)))
+
+            if (val) {
+                $(this).parent('td').siblings('.tdVal').find('input').val(maxDecimal(math.format(
+                    math.divide(math.multiply(math.bignumber(amountPrice), math.bignumber(val)), math.bignumber(100))
+                )))
+            } else {
+                $(this).parent('td').siblings('.tdVal').find('input').val('')
+            }
+
+
         })
 
         $('.changePrice').on('input', function() {
             const val = $(this).val();
             const amountPrice = $(this).attr('name').split('-')[2];
             const rateInput = $(this).parent().next().find('input');
-            rateInput.val(maxDecimal(math.eval(val / amountPrice * 100)));
+            // rateInput.val(maxDecimal(math.eval(val / amountPrice * 100)));
+            if (val) {
+                rateInput.val(maxDecimal(math.format(math.multiply(math.divide(math.bignumber(val), math.bignumber(amountPrice)), math.bignumber(100)))));
+            } else {
+                rateInput.val('')
+            }
+
         })
 
         $('.ncsc-btn-mini-price').on('click', function() {

admin/templates/default/refill.intercept.php

@@ -120,7 +120,7 @@
                     </td>
                 </tr>
                 <tr class="noborder">
-                    <table class="table tb-type2" style="margin-top: 77px;width: auto;">
+                    <table class="table tb-type2" style="margin-top: 155px;width: auto;">
                         <thead id="tableHread">
                             <tr class="w550" style="display:block;">
                                 <th class="align-center w120 mw120"></th>