xiaoyu 2 年之前
父节点
当前提交
7ac265d33d

+ 6 - 1
admin/control/provider.php

@@ -709,8 +709,13 @@ class providerControl extends SystemControl
         foreach ($datas as $co_id => $data)
         {
             $available_total = 0;
-            foreach ($data as $value)
+            foreach ($data as $key => $value)
             {
+                if($value['available_predeposit'] > $remit_cfg['remit_money']) {
+                    $data[$key]['remit'] = 0;
+                }else{
+                    $data[$key]['remit'] = abs($value['available_predeposit'] + $remit_cfg['remit_money']);
+                }
                 $available_total += $value['available_predeposit'];
             }
             if($available_total > $remit_cfg['remit_money']) continue;

+ 11 - 0
admin/templates/default/provider.remit.edit.php

@@ -103,9 +103,20 @@
             }
             
             let total_chineseStr = convertCurrency(total);
+            total = numFormat(total);
             let total_text = total + '('+ total_chineseStr +')';
             $('#total').html(total_text)
         }
+
+        function numFormat(num){
+            return num.toString().replace(/\d+/, function (n) { // 先提取小数点前后的整数部分
+                //(\d)(?=(\d{3})正则的意思是匹配连续三个数结尾的数字,例如1234,1后面有234连续三个数的数字,就可以匹配上,匹配的是1这个数字。如果是123,因为1后面是两位数,所以就匹配不上了
+                return n.replace(/(\d)(?=(\d{3})+$)/g, function ($1) {
+                    return $1 + ",";
+                });
+            });
+        }
+
         $("#submitBtn").click(function() {
             if ($("#price_form").valid()) {
                 $("#price_form").submit();

+ 12 - 1
admin/templates/default/provider.remit.php

@@ -56,7 +56,7 @@
                                     </td>
                                     <td class="w100 align-center">
                                         <input type="hidden" name="strs[]" value="<?php echo $v['co_id']?>-<?php echo $v['provider_id']?>">
-                                        <input type="text" name="remits[]" class="priceInput" value="">
+                                        <input type="text" name="remits[]" class="priceInput" value="<?php echo $v['remit'];?>">
                                         <div id="money" style="color:red;"></div>
                                     </td>
                                 </tr>
@@ -109,9 +109,20 @@
             }
             
             let total_chineseStr = convertCurrency(total);
+            total = numFormat(total);
             let total_text = total + '('+ total_chineseStr +')';
             $('#total').html(total_text)
         }
+
+        function numFormat(num){
+            return num.toString().replace(/\d+/, function (n) { // 先提取小数点前后的整数部分
+                //(\d)(?=(\d{3})正则的意思是匹配连续三个数结尾的数字,例如1234,1后面有234连续三个数的数字,就可以匹配上,匹配的是1这个数字。如果是123,因为1后面是两位数,所以就匹配不上了
+                return n.replace(/(\d)(?=(\d{3})+$)/g, function ($1) {
+                    return $1 + ",";
+                });
+            });
+        }
+
         $("#submitBtn").click(function() {
             if ($("#price_form").valid()) {
                 $("#price_form").submit();