diff --git a/Application/Admin/Controller/GameRatioMouldController.class.php b/Application/Admin/Controller/GameRatioMouldController.class.php
index 1183e0b55..f56269f05 100644
--- a/Application/Admin/Controller/GameRatioMouldController.class.php
+++ b/Application/Admin/Controller/GameRatioMouldController.class.php
@@ -46,22 +46,9 @@ class GameRatioMouldController extends AdminController
foreach($dbres as $k=>&$v){
$v['create_time'] = date("Y-m-d H:i:s",$v['create_time']);
$v['company_belong'] ="下游".getCompanyBlong($v['company_belong']);
-
- $thisTurnoverRatios = $v['turnover_ratio'] ? json_decode($v['turnover_ratio'], true) : [];
- $thisRatioDtl = "默认:{$v['ratio']}%";
- if ($thisTurnoverRatios) {
- if (I('export', 0) == 1) {
- $symbol = "\n";
- } else {
- $symbol = "
";
- }
- foreach ($thisTurnoverRatios as $thisTurnoverRatio) {
- $thisIntervalClosedStatusText = isset($thisTurnoverRatio['instanceof']) ? ($thisTurnoverRatio['instanceof'] == 1 ? '≥' : '>') : '≥';
- $thisRatioDtl .= "{$symbol}月流水{$thisIntervalClosedStatusText}{$thisTurnoverRatio['turnover']},比例:{$thisTurnoverRatio['ratio']}%";
- }
- }
- $v['turnover_ratio_str'] = $thisRatioDtl;
+ $this->readTurnoverRatio($v);
}
+ // dd($dbres);
//判断导出
if(isset($_REQUEST['export'])){
$GetData = $_GET;
@@ -232,7 +219,29 @@ class GameRatioMouldController extends AdminController
}
}
return $save['turnover_ratio'];
-
+ }
+ //设置比例阶梯
+ protected function readTurnoverRatio(&$v){
+ $turnover_ratio = json_decode($v['turnover_ratio'],true);
+ $v['turnover_ratio'] = array(
+ array("ratio"=>$v['ratio']."%","name"=>"默认比例")
+ );
+
+ foreach($turnover_ratio as $ke=>$va){
+ $t=array("ratio"=>$va["ratio"]."%");
+ if(array_key_exists("instanceof",$va)){
+ //存在
+ if($va['instanceof']=='1'){
+ $t['name']="月流水≥".$va['turnover'];
+ }else{
+ $t['name']="月流水>".$va['turnover'];
+ }
+ }else{
+ $t['name']="月流水≥".$va['turnover'];
+ }
+ $v['turnover_ratio'][]=$t;
+ }
+ $v['row'] = count($v['turnover_ratio']);
}
diff --git a/Application/Admin/View/GameRatioMould/index.html b/Application/Admin/View/GameRatioMould/index.html
index 0ad7e5e83..56374ab90 100644
--- a/Application/Admin/View/GameRatioMould/index.html
+++ b/Application/Admin/View/GameRatioMould/index.html
@@ -42,6 +42,9 @@
margin: 0 3px;
margin-left:-7px
}
+ tr{
+ border-bottom: 1px solid #e6e6e6;
+ }