elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '添加用户bug修改' (#325) from feature/add_item into release

Browse Source 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/325
master
郑永星 4 years ago
parent 4824b34681 da8cd1e984
commit 6f1f95adc9
3 changed files with 39 additions and 18 deletions
Show Stats Download Patch File Download Diff File

29
Application/Admin/Controller/CompanySystemRatioController.class.php
Unescape Escape View File

@ -90,7 +90,7 @@ class CompanySystemRatioController extends AdminController
$data[] = $handleData;
}
// dump($data);die();
foreach ($data as $key => $value) {
foreach ($value['data'] as $k => $v) {
@ -116,13 +116,23 @@ class CompanySystemRatioController extends AdminController
} else {
if ($vvv['is_equal'] != 1) {
if (($data[$key]['data'][$k]['game_data'][$vk]['ratio_data'][$vvk+1]['turnover'] == $vvv['turnover'] && !$data[$key]['data'][$k]['game_data'][$vk]['ratio_data'][$vvk+2]['turnover'])
||!($data[$key]['data'][$k]['game_data'][$vk]['ratio_data'][$vvk+1]['turnover'])) {
$end = '∞';
} elseif($data[$key]['data'][$k]['game_data'][$vk]['ratio_data'][$vvk+1]['turnover'] == $vvv['turnover'] && $data[$key]['data'][$k]['game_data'][$vk]['ratio_data'][$vvk+2]['turnover']) {
$end = $data[$key]['data'][$k]['game_data'][$vk]['ratio_data'][$vvk+2]['turnover'];
} else {
$end = $data[$key]['data'][$k]['game_data'][$vk]['ratio_data'][$vvk+1]['turnover'];
}
$data[$key]['data'][$k]['game_data'][$vk]['ratio_data'][$vvk]['turnover']
= $vvv['turnover'].($vvv['instanceof']==1?'<=':'<').'月流水'.
('<').
($data[$key]['data'][$k]['game_data'][$vk]['ratio_data'][$vvk+1]['turnover']??'∞');
($end);
} else {
$data[$key]['data'][$k]['game_data'][$vk]['ratio_data'][$vvk]['turnover']=
'月流水='.$vvv['turnover'];
$data[$key]['data'][$k]['game_data'][$vk]['ratio_data'][$vvk]['turnover']=
'月流水='.$vvv['turnover'];
}
}
@ -223,12 +233,23 @@ class CompanySystemRatioController extends AdminController
$finalData[$key][$k][$cv] = $data[$key][count($data[$key])-1][$cv];
}
}
// dump($finalData[$key]);
$data[$key][] = $finalData[$key][$k];
}
}
foreach ($data as $key => $value) {
$last_names = array_column($data[$key],'turnover');
array_multisort($last_names,SORT_ASC,$data[$key]);
}
// dump($data);
return $data;
}

14
Application/Admin/View/CompanySystemRatio/export.html
Unescape Escape View File

@ -125,10 +125,10 @@
<td rowspan="{$data['data'][0]['row']}">{$data['data'][0]['original_package_name']|default='无'}</td>
<td rowspan="{$data['data'][0]['game_data'][0]['row']|default=1}">{$data['data'][0]['game_data'][0]['game_name']|default='无'}</td>
<td>{$data['data'][0]['game_data'][0]['ratio_data'][0]['turnover']|default='无阶梯'}</td>
<td>{$data['data'][0]['game_data'][0]['ratio_data'][0][3]|default='0.00'}%</td>
<td>{$data['data'][0]['game_data'][0]['ratio_data'][0][0]|default='0.00'}%</td>
<td>{$data['data'][0]['game_data'][0]['ratio_data'][0][1]|default='0.00'}%</td>
<td>{$data['data'][0]['game_data'][0]['ratio_data'][0][2]|default='0.00'}%</td>
<td>{$data['data'][0]['game_data'][0]['ratio_data'][0][3]|default='0.00'}%</td>
<td>{$data['data'][0]['game_data'][0]['ratio_data'][0][4]|default='0.00'}%</td>
</tr>
@ -136,10 +136,10 @@
<if condition="$rkey gt 0">
<tr>
<td>{$ratio_data['turnover']|default='无阶梯'}</td>
<td>{$ratio_data[3]|default='0.00'}%</td>
<td>{$ratio_data[0]|default='0.00'}%</td>
<td>{$ratio_data[1]|default='0.00'}%</td>
<td>{$ratio_data[2]|default='0.00'}%</td>
<td>{$ratio_data[3]|default='0.00'}%</td>
<td>{$ratio_data[4]|default='0.00'}%</td>
</tr>
</if>
@ -154,10 +154,10 @@
<foreach name="game_data['ratio_data']" item="game_data_other" key="okey">
<tr>
<td>{$game_data_other['turnover']|default='无阶梯'}</td>
<td>{$game_data_other['3']|default='0.00'}%</td>
<td>{$game_data_other['0']|default='0.00'}%</td>
<td>{$game_data_other['1']|default='0.00'}%</td>
<td>{$game_data_other['2']|default='0.00'}%</td>
<td>{$game_data_other['3']|default='0.00'}%</td>
<td>{$game_data_other['4']|default='0.00'}%</td>
</tr>
</foreach>
@ -172,10 +172,10 @@
<td rowspan="{$sun_data['row']}">{$sun_data['original_package_name']|default='无'}</td>
<td rowspan="{$sun_data['game_data'][0]['row']}">{$sun_data['game_data'][0]['game_name']|default='无'}</td>
<td>{$sun_data['game_data'][0]['ratio_data'][0]['turnover']|default='无阶梯'}</td>
<td>{$sun_data['game_data'][0]['ratio_data'][0]['3']|default='0.00'}%</td>
<td>{$sun_data['game_data'][0]['ratio_data'][0]['0']|default='0.00'}%</td>
<td>{$sun_data['game_data'][0]['ratio_data'][0]['1']|default='0.00'}%</td>
<td>{$sun_data['game_data'][0]['ratio_data'][0]['2']|default='0.00'}%</td>
<td>{$sun_data['game_data'][0]['ratio_data'][0]['3']|default='0.00'}%</td>
<td>{$sun_data['game_data'][0]['ratio_data'][0]['4']|default='0.00'}%</td>
</tr>
@ -186,10 +186,10 @@
<tr>
<td>{$game_datas['turnover']|default='无阶梯'}</td>
<td>{$game_datas['3']|default='0.00'}%</td>
<td>{$game_datas['0']|default='0.00'}%</td>
<td>{$game_datas['1']|default='0.00'}%</td>
<td>{$game_datas['2']|default='0.00'}%</td>
<td>{$game_datas['3']|default='0.00'}%</td>
<td>{$game_datas['4']|default='0.00'}%</td>
</tr>
@ -202,20 +202,20 @@
<tr>
<td rowspan="{$game_datas['row']}">{$game_datas['game_name']|default='无'}</td>
<td >{$game_datas['ratio_data'][0]['turnover']|default='无阶梯'}</td>
<td >{$game_datas['ratio_data'][0][3]|default='0.00'}%</td>
<td >{$game_datas['ratio_data'][0][0]|default='0.00'}%</td>
<td >{$game_datas['ratio_data'][0][1]|default='0.00'}%</td>
<td >{$game_datas['ratio_data'][0][2]|default='0.00'}%</td>
<td >{$game_datas['ratio_data'][0][3]|default='0.00'}%</td>
<td >{$game_datas['ratio_data'][0][4]|default='0.00'}%</td>
</tr>
<volist name="game_datas['ratio_data']" id="game_data_others" key="otherskey">
<if condition="$otherskey-1 gt 0">
<tr>
<td>{$game_data_others['turnover']|default='无阶梯'}</td>
<td>{$game_data_others['3']|default='0.00'}%</td>
<td>{$game_data_others['0']|default='0.00'}%</td>
<td>{$game_data_others['1']|default='0.00'}%</td>
<td>{$game_data_others['2']|default='0.00'}%</td>
<td>{$game_data_others['3']|default='0.00'}%</td>
<td>{$game_data_others['4']|default='0.00'}%</td>
</tr>
</if>

14
Application/Admin/View/CompanySystemRatio/index.html
Unescape Escape View File

@ -142,10 +142,10 @@
<td rowspan="{$data['data'][0]['row']}">{$data['data'][0]['original_package_name']|default='无'}</td>
<td rowspan="{$data['data'][0]['game_data'][0]['row']|default=1}">{$data['data'][0]['game_data'][0]['game_name']|default='无'}</td>
<td>{$data['data'][0]['game_data'][0]['ratio_data'][0]['turnover']|default='无阶梯'}</td>
<td>{$data['data'][0]['game_data'][0]['ratio_data'][0][3]|default='0.00'}%</td>
<td>{$data['data'][0]['game_data'][0]['ratio_data'][0][0]|default='0.00'}%</td>
<td>{$data['data'][0]['game_data'][0]['ratio_data'][0][1]|default='0.00'}%</td>
<td>{$data['data'][0]['game_data'][0]['ratio_data'][0][2]|default='0.00'}%</td>
<td>{$data['data'][0]['game_data'][0]['ratio_data'][0][3]|default='0.00'}%</td>
<td>{$data['data'][0]['game_data'][0]['ratio_data'][0][4]|default='0.00'}%</td>
</tr>
@ -153,10 +153,10 @@
<if condition="$rkey gt 0">
<tr>
<td>{$ratio_data['turnover']|default='无阶梯'}</td>
<td>{$ratio_data[3]|default='0.00'}%</td>
<td>{$ratio_data[0]|default='0.00'}%</td>
<td>{$ratio_data[1]|default='0.00'}%</td>
<td>{$ratio_data[2]|default='0.00'}%</td>
<td>{$ratio_data[3]|default='0.00'}%</td>
<td>{$ratio_data[4]|default='0.00'}%</td>
</tr>
</if>
@ -171,10 +171,10 @@
<foreach name="game_data['ratio_data']" item="game_data_other" key="okey">
<tr>
<td>{$game_data_other['turnover']|default='无阶梯'}</td>
<td>{$game_data_other['3']|default='0.00'}%</td>
<td>{$game_data_other['0']|default='0.00'}%</td>
<td>{$game_data_other['1']|default='0.00'}%</td>
<td>{$game_data_other['2']|default='0.00'}%</td>
<td>{$game_data_other['3']|default='0.00'}%</td>
<td>{$game_data_other['4']|default='0.00'}%</td>
</tr>
</foreach>
@ -189,10 +189,10 @@
<td rowspan="{$sun_data['row']}">{$sun_data['original_package_name']|default='无'}</td>
<td rowspan="{$sun_data['game_data'][0]['row']}">{$sun_data['game_data'][0]['game_name']|default='无'}</td>
<td>{$sun_data['game_data'][0]['ratio_data'][0]['turnover']|default='无阶梯'}</td>
<td>{$sun_data['game_data'][0]['ratio_data'][0]['3']|default='0.00'}%</td>
<td>{$sun_data['game_data'][0]['ratio_data'][0]['0']|default='0.00'}%</td>
<td>{$sun_data['game_data'][0]['ratio_data'][0]['1']|default='0.00'}%</td>
<td>{$sun_data['game_data'][0]['ratio_data'][0]['2']|default='0.00'}%</td>
<td>{$sun_data['game_data'][0]['ratio_data'][0]['3']|default='0.00'}%</td>
<td>{$sun_data['game_data'][0]['ratio_data'][0]['4']|default='0.00'}%</td>
</tr>
@ -203,10 +203,10 @@
<tr>
<td>{$game_datas['turnover']|default='无阶梯'}</td>
<td>{$game_datas['3']|default='0.00'}%</td>
<td>{$game_datas['0']|default='0.00'}%</td>
<td>{$game_datas['1']|default='0.00'}%</td>
<td>{$game_datas['2']|default='0.00'}%</td>
<td>{$game_datas['3']|default='0.00'}%</td>
<td>{$game_datas['4']|default='0.00'}%</td>
</tr>
@ -219,20 +219,20 @@
<tr>
<td rowspan="{$game_datas['row']}">{$game_datas['game_name']|default='无'}</td>
<td >{$game_datas['ratio_data'][0]['turnover']|default='无阶梯'}</td>
<td >{$game_datas['ratio_data'][0][3]|default='0.00'}%</td>
<td >{$game_datas['ratio_data'][0][0]|default='0.00'}%</td>
<td >{$game_datas['ratio_data'][0][1]|default='0.00'}%</td>
<td >{$game_datas['ratio_data'][0][2]|default='0.00'}%</td>
<td >{$game_datas['ratio_data'][0][3]|default='0.00'}%</td>
<td >{$game_datas['ratio_data'][0][4]|default='0.00'}%</td>
</tr>
<volist name="game_datas['ratio_data']" id="game_data_others" key="otherskey">
<if condition="$otherskey-1 gt 0">
<tr>
<td>{$game_data_others['turnover']|default='无阶梯'}</td>
<td>{$game_data_others['3']|default='0.00'}%</td>
<td>{$game_data_others['0']|default='0.00'}%</td>
<td>{$game_data_others['1']|default='0.00'}%</td>
<td>{$game_data_others['2']|default='0.00'}%</td>
<td>{$game_data_others['3']|default='0.00'}%</td>
<td>{$game_data_others['4']|default='0.00'}%</td>
</tr>
</if>

Write Preview
Loading…
Cancel
Save