Merge branch 'feature/add_item' of 47.111.118.107:wmtx/platform into feature/add_item

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;

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;

Application/Admin/View/MarketPercentage/addcompanybelonggame.html

@@ -236,6 +236,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);
 				$.post(target,query).success(function(data){

Application/Admin/View/MarketPercentage/editcompanybelonggame.html

@@ -236,6 +236,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);
 				$.post(target,query).success(function(data){