admin update

admin/control/merchant.php

@@ -35,7 +35,7 @@ class merchantControl extends SystemControl
 
         $merchant_list = $model_merchant->getMerchantList($condition, 100, 'available_predeposit desc,merchant_state asc,mchid desc', true);
         foreach ($merchant_list as $key => $merchant) {
-            $merchant_list[$key]['available_predeposit'] = ncPriceFormat($merchant['available_predeposit'] - $merchant['credit_bonus']);
+            $merchant_list[$key]['available_predeposit'] = number_format(($merchant['available_predeposit'] - $merchant['credit_bonus']),4,'.',',');
             $merchant_list[$key]['credit_bonus'] = $merchant['credit_bonus'];
         }
         $merchant_state_text = ['使用中', '已禁用'];

admin/templates/default/merchant.index.php

@@ -99,10 +99,10 @@ defined('InShopNC') or exit('Access Invalid!'); ?>
                                 <?php if($v['available_predeposit'] < 0){?>
                                 <span style="color: #f30707">
                             <?php }?>
-                            <?php echo number_format($v['available_predeposit'],4,'.',','); ?>
+                            <?php echo $v['available_predeposit']; ?>
                                 </span>
                         </td>
-                        <td><?php echo number_format($v['credit_bonus'],4,'.',','); ?></td>
+                        <td><?php echo $v['credit_bonus']; ?></td>
             <!--  <td>--><?php //echo $v['org_pwd']; ?><!--</td>-->
                         <td class="align-center"><?php echo $v['alarm_amount']; ?></td>
                         <td class="align-center">