From 490b6a336943cbe3aa7042837ee4f79ebb565b9f Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Wed, 15 Jan 2020 16:45:33 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=B7=A5=E4=BC=9A=E5=BD=92=E5=B1=9E?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/Promote/belong.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/View/Promote/belong.html b/Application/Admin/View/Promote/belong.html
index ae7200bee..e5bf97126 100644
--- a/Application/Admin/View/Promote/belong.html
+++ b/Application/Admin/View/Promote/belong.html
@@ -208,9 +208,9 @@
 
     </div>
     <div class="page">
-        <if condition="$is_admin eq true ">
+      <!--  <if condition="$is_admin eq true ">
             <a class="sch-btn" href="{:U('Export/promote_list',array_merge(['xlsname'=>'推广员管理_推广员列表'.((I('type',1)==2)?'_混服申请':'_推广员列表')],I('get.')))}">导出</a>
-        </if>
+        </if>-->
         {$_page|default=''}
     </div>
 

From 561e6bd84c975320a6aafd5434652f798e1f33fa Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Wed, 15 Jan 2020 16:59:34 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=8B=E6=B8=B8=E8=BE=93=E5=87=BA?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../View/StatementMangement/createDownstreamOrder.html      | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Application/Admin/View/StatementMangement/createDownstreamOrder.html b/Application/Admin/View/StatementMangement/createDownstreamOrder.html
index 8bc59c8a6..fa057619b 100644
--- a/Application/Admin/View/StatementMangement/createDownstreamOrder.html
+++ b/Application/Admin/View/StatementMangement/createDownstreamOrder.html
@@ -473,8 +473,14 @@
 
       $(".forfeit").off("blur");
     $(".forfeit").on("blur", function() {
+
       var lastNumber = $(this).parent().next().next().next().text();
 
+      if(!$(this).val()) {
+        $(this).val(lastNumber);
+        return;
+      }
+
       $(this).parent().next().next().next().text(parseFloat($(this).val()).toFixed(2));
       $(".sumAmount").text($(".sumAmount").attr("data-value")-$(this).val());
 

From ef41dbfcee512dccbbbc928d2a7b630bcda1175d Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Wed, 15 Jan 2020 17:37:13 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=8B=E6=B8=B8=E8=BE=93=E5=87=BA?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../createDownstreamOrder.html                | 17 ++++++++++++++++-
 .../Admin/View/StatementMangement/edit.html   | 19 +++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/Application/Admin/View/StatementMangement/createDownstreamOrder.html b/Application/Admin/View/StatementMangement/createDownstreamOrder.html
index fa057619b..ecc9c7baf 100644
--- a/Application/Admin/View/StatementMangement/createDownstreamOrder.html
+++ b/Application/Admin/View/StatementMangement/createDownstreamOrder.html
@@ -200,6 +200,14 @@
 <script type="text/javascript">
 
   $(function(){
+
+    var CHECK = {
+      number: /^\d+(\.{1}\d+)?$/,
+      mobile:/^1[3456789]\d{9}$/,
+      BankNo:/^([1-9]{1})(\d{15}|\d{18})$/,
+      money:/((^[1-9]\d*)|^0)(\.\d{0,2}){0,1}$/
+    }
+
     var queryData = [];
     var statement = [];
     var key = 0;
@@ -464,6 +472,12 @@
   function eventnew(){
       $(".tax").off("blur");
       $(".tax").on("blur", function() {
+
+        if (!CHECK.number.test($(this).val())) {
+          layer.msg("结算单的罚款与税率必须是数字且不能为空");
+          $(this).val('0');
+        }
+
         var lastNum = (parseFloat($(this).parent().next().text())).toFixed(2);
         $(this).parent().next().text(($(this).parent().next().attr('data-value')*(1-$(this).val()/100)).toFixed(2));
         var nowNum = (parseFloat($(this).parent().next().text())).toFixed(2);
@@ -476,7 +490,8 @@
 
       var lastNumber = $(this).parent().next().next().next().text();
 
-      if(!$(this).val()) {
+      if(!$(this).val()||!CHECK.number.test($(this).val())) {
+        layer.msg("结算单的罚款与税率必须是数字且不能为空");
         $(this).val(lastNumber);
         return;
       }
diff --git a/Application/Admin/View/StatementMangement/edit.html b/Application/Admin/View/StatementMangement/edit.html
index d3367b8a6..7462853b8 100644
--- a/Application/Admin/View/StatementMangement/edit.html
+++ b/Application/Admin/View/StatementMangement/edit.html
@@ -177,6 +177,13 @@
     var statement = [];
     var key = 0;
 
+    var CHECK = {
+      number: /^\d+(\.{1}\d+)?$/,
+      mobile:/^1[3456789]\d{9}$/,
+      BankNo:/^([1-9]{1})(\d{15}|\d{18})$/,
+      money:/((^[1-9]\d*)|^0)(\.\d{0,2}){0,1}$/
+    }
+
     //搜索功能
     $("#ext_field").change(function(){
       var ext_field = $("#ext_field").val();
@@ -287,6 +294,12 @@
       $(".tax").off("blur");
       $(".tax").on("blur", function() {
         var lastNum = (parseFloat($(this).parent().next().text())).toFixed(2);
+
+        if (!CHECK.number.test($(this).val())) {
+          layer.msg("结算单的罚款与税率必须是数字且不能为空");
+          $(this).val('0');
+        }
+
         $(this).parent().next().text(($(this).parent().next().attr('data-value')*(1-$(this).val()/100)).toFixed(2));
         var nowNum = (parseFloat($(this).parent().next().text())).toFixed(2);
         console.log((nowNum-lastNum))
@@ -297,6 +310,12 @@
     $(".forfeit").on("blur", function() {
       var lastNumber = $(this).parent().next().next().next().text();
 
+      if(!$(this).val()||!CHECK.number.test($(this).val())) {
+        layer.msg("结算单的罚款与税率必须是数字且不能为空");
+        $(this).val(lastNumber);
+        return;
+      }
+
       $(this).parent().next().next().next().text(parseFloat($(this).val()).toFixed(2));
       $(".sumAmount").text(($(".sumAmount").attr("data-value")-$(this).val()).toFixed(2));