From 91ae987c3cfc1c10050c967e3dbe872f1a09ed41 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Mon, 29 Jun 2020 15:37:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B8=B8=E6=88=8F=E6=AF=94?= =?UTF-8?q?=E4=BE=8B=E5=88=86=E6=88=90=E6=97=A0=E9=9C=80=E5=A4=A7=E4=BA=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyGameRatioController.class.php | 12 ++++++------ .../Controller/GameRatioMouldController.class.php | 12 ++++++------ .../Admin/View/CompanyGameRatio/addRatio.html | 14 +++++++------- .../Admin/View/CompanyGameRatio/editRatio.html | 14 +++++++------- Application/Admin/View/GameRatioMould/add.html | 14 +++++++------- Application/Admin/View/GameRatioMould/edit.html | 14 +++++++------- 6 files changed, 40 insertions(+), 40 deletions(-) diff --git a/Application/Admin/Controller/CompanyGameRatioController.class.php b/Application/Admin/Controller/CompanyGameRatioController.class.php index bfe5d3cc1..096dc1c88 100644 --- a/Application/Admin/Controller/CompanyGameRatioController.class.php +++ b/Application/Admin/Controller/CompanyGameRatioController.class.php @@ -653,15 +653,15 @@ class CompanyGameRatioController extends AdminController $this->error('月流水必须以正序的方式填写，且必须大于上一个月流水'); } $ratio = $params['ratio'] ?? 0; - if ($params['turnover_ratio'][0] <= $ratio) { - $this->error('月流水分成比例必须大于默认分成比例'); - } + // if ($params['turnover_ratio'][0] <= $ratio) { + // $this->error('月流水分成比例必须大于默认分成比例'); + // } $turnoverRatioCount = count($params['turnover_ratio']); $sortTurnoverRatio = $params['turnover_ratio']; sort($sortTurnoverRatio); - if ($params['turnover_ratio'] != $sortTurnoverRatio || $turnoverRatioCount != count(array_unique($params['turnover_ratio']))) { - $this->error('月流水分成比例必须以正序的方式填写，且必须大于上一个月流水分成比例'); - } + // if ($params['turnover_ratio'] != $sortTurnoverRatio || $turnoverRatioCount != count(array_unique($params['turnover_ratio']))) { + // $this->error('月流水分成比例必须以正序的方式填写，且必须大于上一个月流水分成比例'); + // } foreach ($params['turnover'] as $key => $turnover) { $save['turnover_ratio'][] = [ diff --git a/Application/Admin/Controller/GameRatioMouldController.class.php b/Application/Admin/Controller/GameRatioMouldController.class.php index fc68091f9..d1d02b081 100644 --- a/Application/Admin/Controller/GameRatioMouldController.class.php +++ b/Application/Admin/Controller/GameRatioMouldController.class.php @@ -211,15 +211,15 @@ class GameRatioMouldController extends AdminController $this->error('月流水必须以正序的方式填写，且必须大于上一个月流水'); } $ratio = $params['ratio'] ?? 0; - if ($params['turnover_ratio'][0] <= $ratio) { - $this->error('月流水分成比例必须大于默认分成比例'); - } + // if ($params['turnover_ratio'][0] <= $ratio) { + // $this->error('月流水分成比例必须大于默认分成比例'); + // } $turnoverRatioCount = count($params['turnover_ratio']); $sortTurnoverRatio = $params['turnover_ratio']; sort($sortTurnoverRatio); - if ($params['turnover_ratio'] != $sortTurnoverRatio || $turnoverRatioCount != count(array_unique($params['turnover_ratio']))) { - $this->error('月流水分成比例必须以正序的方式填写，且必须大于上一个月流水分成比例'); - } + // if ($params['turnover_ratio'] != $sortTurnoverRatio || $turnoverRatioCount != count(array_unique($params['turnover_ratio']))) { + // $this->error('月流水分成比例必须以正序的方式填写，且必须大于上一个月流水分成比例'); + // } foreach ($params['turnover'] as $key => $turnover) { $save['turnover_ratio'][] = [ diff --git a/Application/Admin/View/CompanyGameRatio/addRatio.html b/Application/Admin/View/CompanyGameRatio/addRatio.html index 3986541fc..e06e7f857 100644 --- a/Application/Admin/View/CompanyGameRatio/addRatio.html +++ b/Application/Admin/View/CompanyGameRatio/addRatio.html @@ -407,13 +407,13 @@ $(function(){ function prevTurnoverRatioHandle(thatTurnoverRatio, prevTurnoverRatio, that, isDefault = false) { - if (thatTurnoverRatio <= prevTurnoverRatio) { - var msg = isDefault ? '月流水分成比例必须大于默认分成比例' : '月流水分成比例必须大于上一个月流水分成比例'; - that.parent().children('.error-message').text(msg); - that.parent().children('.error-message').show(); - } else { - that.parent().children('.error-message').hide(); - } + // if (thatTurnoverRatio <= prevTurnoverRatio) { + // var msg = isDefault ? '月流水分成比例必须大于默认分成比例' : '月流水分成比例必须大于上一个月流水分成比例'; + // that.parent().children('.error-message').text(msg); + // that.parent().children('.error-message').show(); + // } else { + // that.parent().children('.error-message').hide(); + // } return true; } diff --git a/Application/Admin/View/CompanyGameRatio/editRatio.html b/Application/Admin/View/CompanyGameRatio/editRatio.html index 3a208e093..817519238 100644 --- a/Application/Admin/View/CompanyGameRatio/editRatio.html +++ b/Application/Admin/View/CompanyGameRatio/editRatio.html @@ -408,13 +408,13 @@ $(function(){ function prevTurnoverRatioHandle(thatTurnoverRatio, prevTurnoverRatio, that, isDefault = false) { - if (thatTurnoverRatio <= prevTurnoverRatio) { - var msg = isDefault ? '月流水分成比例必须大于默认分成比例' : '月流水分成比例必须大于上一个月流水分成比例'; - that.parent().children('.error-message').text(msg); - that.parent().children('.error-message').show(); - } else { - that.parent().children('.error-message').hide(); - } + // if (thatTurnoverRatio <= prevTurnoverRatio) { + // var msg = isDefault ? '月流水分成比例必须大于默认分成比例' : '月流水分成比例必须大于上一个月流水分成比例'; + // that.parent().children('.error-message').text(msg); + // that.parent().children('.error-message').show(); + // } else { + // that.parent().children('.error-message').hide(); + // } return true; } diff --git a/Application/Admin/View/GameRatioMould/add.html b/Application/Admin/View/GameRatioMould/add.html index 9943dc648..74cddb3b9 100644 --- a/Application/Admin/View/GameRatioMould/add.html +++ b/Application/Admin/View/GameRatioMould/add.html @@ -432,13 +432,13 @@ $(function(){ function prevTurnoverRatioHandle(thatTurnoverRatio, prevTurnoverRatio, that, isDefault = false) { - if (thatTurnoverRatio <= prevTurnoverRatio) { - var msg = isDefault ? '月流水分成比例必须大于默认分成比例' : '月流水分成比例必须大于上一个月流水分成比例'; - that.parent().children('.error-message').text(msg); - that.parent().children('.error-message').show(); - } else { - that.parent().children('.error-message').hide(); - } + // if (thatTurnoverRatio <= prevTurnoverRatio) { + // var msg = isDefault ? '月流水分成比例必须大于默认分成比例' : '月流水分成比例必须大于上一个月流水分成比例'; + // that.parent().children('.error-message').text(msg); + // that.parent().children('.error-message').show(); + // } else { + // that.parent().children('.error-message').hide(); + // } return true; } diff --git a/Application/Admin/View/GameRatioMould/edit.html b/Application/Admin/View/GameRatioMould/edit.html index 85aeba38a..574900e82 100644 --- a/Application/Admin/View/GameRatioMould/edit.html +++ b/Application/Admin/View/GameRatioMould/edit.html @@ -434,13 +434,13 @@ $(function(){ function prevTurnoverRatioHandle(thatTurnoverRatio, prevTurnoverRatio, that, isDefault = false) { - if (thatTurnoverRatio <= prevTurnoverRatio) { - var msg = isDefault ? '月流水分成比例必须大于默认分成比例' : '月流水分成比例必须大于上一个月流水分成比例'; - that.parent().children('.error-message').text(msg); - that.parent().children('.error-message').show(); - } else { - that.parent().children('.error-message').hide(); - } + // if (thatTurnoverRatio <= prevTurnoverRatio) { + // var msg = isDefault ? '月流水分成比例必须大于默认分成比例' : '月流水分成比例必须大于上一个月流水分成比例'; + // that.parent().children('.error-message').text(msg); + // that.parent().children('.error-message').show(); + // } else { + // that.parent().children('.error-message').hide(); + // } return true; }