From 823e241f2eab832e5564ef61bb089e0293a48467 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 29 Oct 2020 14:05:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=96=E5=9B=A2=E6=8E=A8=E5=B9=BF?= =?UTF-8?q?=E5=8A=9F=E8=83=BDbug=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/View/MarketPercentage/addcompanybelonggame.html | 5 +++++ .../Admin/View/MarketPercentage/editcompanybelonggame.html | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Application/Admin/View/MarketPercentage/addcompanybelonggame.html b/Application/Admin/View/MarketPercentage/addcompanybelonggame.html index 3e3d1ae93..d4488923a 100644 --- a/Application/Admin/View/MarketPercentage/addcompanybelonggame.html +++ b/Application/Admin/View/MarketPercentage/addcompanybelonggame.html @@ -235,6 +235,11 @@ //查看是否报错 var target = $('#form').get(0).action; var query = $('#form').serialize(); + + var starttime = $.trim($('#begin_time').val()); + var endtime = $.trim($('#end_time').val()); + + if (starttime && endtime && starttime > endtime) {layer.msg('开始时间必须小于等于结束时间');return false;} var that = this; $(that).addClass('disabled').attr('autocomplete','off').prop('disabled',true); diff --git a/Application/Admin/View/MarketPercentage/editcompanybelonggame.html b/Application/Admin/View/MarketPercentage/editcompanybelonggame.html index 37bf34322..41401706c 100644 --- a/Application/Admin/View/MarketPercentage/editcompanybelonggame.html +++ b/Application/Admin/View/MarketPercentage/editcompanybelonggame.html @@ -235,7 +235,12 @@ //查看是否报错 var target = $('#form').get(0).action; var query = $('#form').serialize(); - + + var starttime = $.trim($('#begin_time').val()); + var endtime = $.trim($('#end_time').val()); + + if (starttime && endtime && starttime > endtime) {layer.msg('开始时间必须小于等于结束时间');return false;} + var that = this; $(that).addClass('disabled').attr('autocomplete','off').prop('disabled',true); $.post(target,query).success(function(data){ From a5c7c224aad2beb1dda196dff855f50c6f331b62 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 29 Oct 2020 14:35:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=AF=94=E4=BE=8B=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CompanyGameRatioController.class.php | 7 ++++--- .../Admin/Controller/GameRatioMouldController.class.php | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Application/Admin/Controller/CompanyGameRatioController.class.php b/Application/Admin/Controller/CompanyGameRatioController.class.php index 9d0cae63b..17fc868d0 100644 --- a/Application/Admin/Controller/CompanyGameRatioController.class.php +++ b/Application/Admin/Controller/CompanyGameRatioController.class.php @@ -982,6 +982,7 @@ class CompanyGameRatioController extends AdminController $radio = explode('|',$v['ratio']); $turnover_ratio = explode('|',$v['turnover_ratio']); + $turnover_type = $v['turnover_types']; $sec_row = 1; @@ -997,12 +998,12 @@ class CompanyGameRatioController extends AdminController if(array_key_exists("instanceof",$va)){ //存在 if($va['instanceof']=='1'){ - $t['name']="月流水≥".$va['turnover']; + $t['name']="{$turnover_type[$key]}≥".$va['turnover']; }else{ - $t['name']="月流水＞".$va['turnover']; + $t['name']="{$turnover_type[$key]}＞".$va['turnover']; } }else{ - $t['name']="月流水≥".$va['turnover']; + $t['name']="{$turnover_type[$key]}≥".$va['turnover']; } $sec_row++; $v['turnover_ratios'][$key][]=$t; diff --git a/Application/Admin/Controller/GameRatioMouldController.class.php b/Application/Admin/Controller/GameRatioMouldController.class.php index 530b1faeb..af2df5c42 100644 --- a/Application/Admin/Controller/GameRatioMouldController.class.php +++ b/Application/Admin/Controller/GameRatioMouldController.class.php @@ -368,6 +368,7 @@ class GameRatioMouldController extends AdminController $radio = explode('|',$v['ratio']); $turnover_ratio = explode('|',$v['turnover_ratio']); + $turnover_type = $v['turnover_types']; $sec_row = 1; @@ -383,12 +384,12 @@ class GameRatioMouldController extends AdminController if(array_key_exists("instanceof",$va)){ //存在 if($va['instanceof']=='1'){ - $t['name']="月流水≥".$va['turnover']; + $t['name']="{$turnover_type[$key]}≥".$va['turnover']; }else{ - $t['name']="月流水＞".$va['turnover']; + $t['name']="{$turnover_type[$key]}＞".$va['turnover']; } }else{ - $t['name']="月流水≥".$va['turnover']; + $t['name']="{$turnover_type[$key]}≥".$va['turnover']; } $sec_row++; $v['turnover_ratios'][$key][]=$t;