og/Pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 牛牛单独限红 - 新增limit_low_nn/limit_high_nn字段，代理端添加/编辑代理和会员支持牛牛限红设置，语言包三语支持

Browse Source
This commit is contained in:
li
2026-02-11 19:53:50 +08:00
parent 1ce6c3d780
commit 71d7ff1d7b
36 changed files with 2590 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/agent/.DS_Store
Vendored
BIN
View File
Binary file not shown.
application/agent/controller/Agent.php
+36
View File
@@ -253,6 +253,8 @@ class Agent Extends Common{
$limit_high_tie = round(Request::instance()->post('limit_high_tie'),2);
$limit_low_pair = round(Request::instance()->post('limit_low_pair'),2);
$limit_high_pair = round(Request::instance()->post('limit_high_pair'),2);
$limit_low_nn = round(Request::instance()->post('limit_low_nn'),2);
$limit_high_nn = round(Request::instance()->post('limit_high_nn'),2);
$agent_ximalv = round(Request::instance()->post('agent_ximalv'),2);
$agent_ximalv_dt = round(Request::instance()->post('agent_ximalv_dt'),2);
$agent_ximalv_nn = round(Request::instance()->post('agent_ximalv_nn'),2);
@@ -327,6 +329,15 @@ class Agent Extends Common{
if($limit_low_pair > $limit_high_pair && $limit_low_pair > 0 && $limit_high_pair > 0){
die(json_encode(['code'=>0,'msg'=>$lang['min_pair_limit_bigger_than_max_tie_limit']]));
}
if($limit_low_nn < 0){
die(json_encode(['code'=>0,'msg'=>$lang['min_nn_limit_0']]));
}
if($limit_high_nn < 0){
die(json_encode(['code'=>0,'msg'=>$lang['max_nn_limit_0']]));
}
if($limit_low_nn > $limit_high_nn && $limit_low_nn > 0 && $limit_high_nn > 0){
die(json_encode(['code'=>0,'msg'=>$lang['min_nn_limit_bigger_than_max']]));
}
if($limit_low < $agentParent['limit_low'] || $limit_low > $agentParent['limit_high'] || $limit_high < $agentParent['limit_low'] || $limit_high > $agentParent['limit_high']){
die(json_encode(['code'=>0,'msg'=>$lang['limit_cannot_bigger'].' '.$agentParent['limit_low'].'-'.$agentParent['limit_high']]));
}
@@ -336,6 +347,11 @@ class Agent Extends Common{
if($limit_low_pair < $agentParent['limit_low_pair'] || $limit_low_pair > $agentParent['limit_high_pair'] || $limit_high_pair < $agentParent['limit_low_pair'] || $limit_high_pair > $agentParent['limit_high_pair']){
die(json_encode(['code'=>0,'msg'=>$lang['pair_limit_cannot_bigger'].' '.$agentParent['limit_low_pair'].'-'.$agentParent['limit_high_pair']]));
}
if($limit_low_nn > 0 && $limit_high_nn > 0 && $agentParent['limit_low_nn'] > 0 && $agentParent['limit_high_nn'] > 0){
if($limit_low_nn < $agentParent['limit_low_nn'] || $limit_low_nn > $agentParent['limit_high_nn'] || $limit_high_nn < $agentParent['limit_low_nn'] || $limit_high_nn > $agentParent['limit_high_nn']){
die(json_encode(['code'=>0,'msg'=>$lang['nn_limit_cannot_bigger'].' '.$agentParent['limit_low_nn'].'-'.$agentParent['limit_high_nn']]));
}
}
if($agent_ximalv < 0){
die(json_encode(['code'=>0,'msg'=>$lang['baccarat_limit_0']]));
}
@@ -395,6 +411,8 @@ class Agent Extends Common{
$user_data['limit_high_tie'] = $limit_high_tie;
$user_data['limit_low_pair'] = $limit_low_pair;
$user_data['limit_high_pair'] = $limit_high_pair;
$user_data['limit_low_nn'] = $limit_low_nn;
$user_data['limit_high_nn'] = $limit_high_nn;
$user_data['bet_type'] = $bet_type;
$user_data['reg_time'] = time();
$ip = '0.0.0.0';
@@ -533,6 +551,8 @@ class Agent Extends Common{
$limit_high_tie = round(Request::instance()->post('limit_high_tie'),2);
$limit_low_pair = round(Request::instance()->post('limit_low_pair'),2);
$limit_high_pair = round(Request::instance()->post('limit_high_pair'),2);
$limit_low_nn = round(Request::instance()->post('limit_low_nn'),2);
$limit_high_nn = round(Request::instance()->post('limit_high_nn'),2);
$agent_ximalv = round(Request::instance()->post('agent_ximalv'),2);
$agent_ximalv_dt = round(Request::instance()->post('agent_ximalv_dt'),2);
$agent_ximalv_nn = round(Request::instance()->post('agent_ximalv_nn'),2);
@@ -594,6 +614,20 @@ class Agent Extends Common{
if($limit_low_pair < $agentParent['limit_low_pair'] || $limit_low_pair > $agentParent['limit_high_pair'] || $limit_high_pair < $agentParent['limit_low_pair'] || $limit_high_pair > $agentParent['limit_high_pair']){
die(json_encode(['code'=>0,'msg'=>$lang['pair_limit_cannot_bigger'].' '.$agentParent['limit_low_pair'].'-'.$agentParent['limit_high_pair'].'范围']));
}
if($limit_low_nn < 0){
die(json_encode(['code'=>0,'msg'=>$lang['min_nn_limit_0']]));
}
if($limit_high_nn < 0){
die(json_encode(['code'=>0,'msg'=>$lang['max_nn_limit_0']]));
}
if($limit_low_nn > $limit_high_nn && $limit_low_nn > 0 && $limit_high_nn > 0){
die(json_encode(['code'=>0,'msg'=>$lang['min_nn_limit_bigger_than_max']]));
}
if($limit_low_nn > 0 && $limit_high_nn > 0 && $agentParent['limit_low_nn'] > 0 && $agentParent['limit_high_nn'] > 0){
if($limit_low_nn < $agentParent['limit_low_nn'] || $limit_low_nn > $agentParent['limit_high_nn'] || $limit_high_nn < $agentParent['limit_low_nn'] || $limit_high_nn > $agentParent['limit_high_nn']){
die(json_encode(['code'=>0,'msg'=>$lang['nn_limit_cannot_bigger'].' '.$agentParent['limit_low_nn'].'-'.$agentParent['limit_high_nn']]));
}
}
if($agent_ximalv > $agentParent['agent_ximalv']){
die(json_encode(['code'=>0,'msg'=>$lang['baccarat_cannot_bigger_agent'].' '.$agentParent['agent_ximalv'].'!']));
}
@@ -662,6 +696,8 @@ class Agent Extends Common{
$user_data['limit_high_tie'] = $limit_high_tie;
$user_data['limit_low_pair'] = $limit_low_pair;
$user_data['limit_high_pair'] = $limit_high_pair;
$user_data['limit_low_nn'] = $limit_low_nn;
$user_data['limit_high_nn'] = $limit_high_nn;
$user_data['agent_ximalv'] = $agent_ximalv;
$user_data['agent_ximalv_dt'] = $agent_ximalv_dt;
$user_data['agent_ximalv_nn'] = $agent_ximalv_nn;
application/agent/controller/Player.php
+37 -1
View File
@@ -281,6 +281,8 @@ class Player Extends Common{
$limit_high_tie = round(Request::instance()->post('limit_high_tie'),2);
$limit_low_pair = round(Request::instance()->post('limit_low_pair'),2);
$limit_high_pair = round(Request::instance()->post('limit_high_pair'),2);
$limit_low_nn = round(Request::instance()->post('limit_low_nn'),2);
$limit_high_nn = round(Request::instance()->post('limit_high_nn'),2);
$win_limit = round(Request::instance()->post('win_limit'),2);
$agent_commission = round(Request::instance()->post('agent_commission'),2);
$agent_commission_dt = round(Request::instance()->post('agent_commission_dt'),2);
@@ -385,6 +387,20 @@ class Player Extends Common{
if($limit_low_pair < $agentParent['limit_low_pair'] || $limit_low_pair > $agentParent['limit_high_pair'] || $limit_high_pair < $agentParent['limit_low_pair'] || $limit_high_pair > $agentParent['limit_high_pair']){
die(json_encode(['code'=>0,'msg'=>$lang['pair_limit_cannot_bigger'].' '.$agentParent['limit_low_pair'].'-'.$agentParent['limit_high_pair']]));
}
if($limit_low_nn < 0){
die(json_encode(['code'=>0,'msg'=>$lang['min_nn_limit_0']]));
}
if($limit_high_nn < 0){
die(json_encode(['code'=>0,'msg'=>$lang['max_nn_limit_0']]));
}
if($limit_low_nn > $limit_high_nn && $limit_low_nn > 0 && $limit_high_nn > 0){
die(json_encode(['code'=>0,'msg'=>$lang['min_nn_limit_bigger_than_max']]));
}
if($limit_low_nn > 0 && $limit_high_nn > 0 && $agentParent['limit_low_nn'] > 0 && $agentParent['limit_high_nn'] > 0){
if($limit_low_nn < $agentParent['limit_low_nn'] || $limit_low_nn > $agentParent['limit_high_nn'] || $limit_high_nn < $agentParent['limit_low_nn'] || $limit_high_nn > $agentParent['limit_high_nn']){
die(json_encode(['code'=>0,'msg'=>$lang['nn_limit_cannot_bigger'].' '.$agentParent['limit_low_nn'].'-'.$agentParent['limit_high_nn']]));
}
}
if($agent_ximalv > $agentParent['agent_ximalv']){
die(json_encode(['code'=>0,'msg'=>$lang['baccarat_cannot_bigger_agent'].$agentParent['agent_ximalv'].'!']));
}
@@ -427,6 +443,8 @@ class Player Extends Common{
$user_data['limit_high_tie'] = $limit_high_tie;
$user_data['limit_low_pair'] = $limit_low_pair;
$user_data['limit_high_pair'] = $limit_high_pair;
$user_data['limit_low_nn'] = $limit_low_nn;
$user_data['limit_high_nn'] = $limit_high_nn;
$user_data['price_banker'] = $agentParent['price_banker'];
$user_data['price_player'] = $agentParent['price_player'];
$user_data['price_tie_baccarat'] = $agentParent['price_tie_baccarat'];
@@ -605,6 +623,8 @@ class Player Extends Common{
$limit_high_tie = round(Request::instance()->post('limit_high_tie'),2);
$limit_low_pair = round(Request::instance()->post('limit_low_pair'),2);
$limit_high_pair = round(Request::instance()->post('limit_high_pair'),2);
$limit_low_nn = round(Request::instance()->post('limit_low_nn'),2);
$limit_high_nn = round(Request::instance()->post('limit_high_nn'),2);
$agent_ximalv = round(Request::instance()->post('agent_ximalv'),2);
$agent_ximalv_dt = round(Request::instance()->post('agent_ximalv_dt'),2);
$agent_ximalv_nn = round(Request::instance()->post('agent_ximalv_nn'),2);
@@ -681,7 +701,21 @@ class Player Extends Common{
if($limit_low_pair < $agentParent['limit_low_pair'] || $limit_low_pair > $agentParent['limit_high_pair'] || $limit_high_pair < $agentParent['limit_low_pair'] || $limit_high_pair > $agentParent['limit_high_pair']){
die(json_encode(['code'=>0,'msg'=>$lang['pair_limit_cannot_bigger'].' '.$agentParent['limit_low_pair'].'-'.$agentParent['limit_high_pair']]));
}
if($limit_low_nn < 0){
die(json_encode(['code'=>0,'msg'=>$lang['min_nn_limit_0']]));
}
if($limit_high_nn < 0){
die(json_encode(['code'=>0,'msg'=>$lang['max_nn_limit_0']]));
}
if($limit_low_nn > $limit_high_nn && $limit_low_nn > 0 && $limit_high_nn > 0){
die(json_encode(['code'=>0,'msg'=>$lang['min_nn_limit_bigger_than_max']]));
}
if($limit_low_nn > 0 && $limit_high_nn > 0 && $agentParent['limit_low_nn'] > 0 && $agentParent['limit_high_nn'] > 0){
if($limit_low_nn < $agentParent['limit_low_nn'] || $limit_low_nn > $agentParent['limit_high_nn'] || $limit_high_nn < $agentParent['limit_low_nn'] || $limit_high_nn > $agentParent['limit_high_nn']){
die(json_encode(['code'=>0,'msg'=>$lang['nn_limit_cannot_bigger'].' '.$agentParent['limit_low_nn'].'-'.$agentParent['limit_high_nn']]));
}
}
if($agent_ximalv > $agentParent['agent_ximalv']){
die(json_encode(['code'=>0,'msg'=>$lang['baccarat_cannot_bigger_agent'].$agentParent['agent_ximalv'].'!']));
}
@@ -719,6 +753,8 @@ class Player Extends Common{
$user_data['limit_high_tie'] = $limit_high_tie;
$user_data['limit_low_pair'] = $limit_low_pair;
$user_data['limit_high_pair'] = $limit_high_pair;
$user_data['limit_low_nn'] = $limit_low_nn;
$user_data['limit_high_nn'] = $limit_high_nn;
$user_data['agent_ximalv'] = $agent_ximalv;
$user_data['agent_ximalv_dt'] = $agent_ximalv_dt;
$user_data['agent_ximalv_nn'] = $agent_ximalv_nn;
application/agent/controller/Report.php
+3 -3
View File
@@ -35,17 +35,17 @@ class Report Extends Common{
$game_id = intval(Request::instance()->get('game_id'));
$export = intval(Request::instance()->get('export'));
// 转换日期时间
// 转换日期时间（默认：今天07:00:00 ~ 明天06:59:59）
if ($startDate) {
$startTime = strtotime($startDate);
} else {
$startTime = strtotime(date('Y-m-d'));
$startTime = strtotime(date('Y-m-d') . ' 07:00:00');
$get['startDate'] = date('Y-m-d H:i:s', $startTime);
}
if ($endDate) {
$endTime = strtotime($endDate);
} else {
$endTime = time();
$endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 06:59:59');
$get['endDate'] = date('Y-m-d H:i:s', $endTime);
}
application/agent/lang/en-us.php
+8
View File
@@ -185,6 +185,14 @@ return [
'limit_cannot_bigger' => 'Limit cannot exceed',
'tie_limit_cannot_bigger' => 'Tie limit cannot exceed',
'pair_limit_cannot_bigger' => 'Pair limit cannot exceed',
'min_nn_limit' => 'Min bull limit',
'max_nn_limit' => 'Max bull limit',
'empty_min_nn_limit' => 'Please enter the min bull limit',
'empty_max_nn_limit' => 'Please enter the max bull limit',
'min_nn_limit_0' => 'Min bull limit cannot be less than 0',
'max_nn_limit_0' => 'Max bull limit cannot be less than 0',
'min_nn_limit_bigger_than_max' => 'Min bull limit cannot exceed max bull limit',
'nn_limit_cannot_bigger' => 'Bull limit cannot exceed',
'baccarat_limit_0' => 'Baccarat code rate cannot be lower than 0',
'baccarat_cannot_bigger_agent' => 'The Baccarat code rate cannot exceed the Baccarat code rate of the affiliated agent',
'dt_limit_0' => 'The Dragon tiger code rate cannot be lower than 0',
application/agent/lang/zh-cn.php
+8
View File
@@ -185,6 +185,14 @@ return [
'limit_cannot_bigger' => '限红不能超出',
'tie_limit_cannot_bigger' => '和限红不能超出',
'pair_limit_cannot_bigger' => '对子限红不能超出',
'min_nn_limit' => '最小牛牛限红',
'max_nn_limit' => '最大牛牛限红',
'empty_min_nn_limit' => '请输入最小牛牛限红',
'empty_max_nn_limit' => '请输入最大牛牛限红',
'min_nn_limit_0' => '最小牛牛限红不能低于0',
'max_nn_limit_0' => '最大牛牛限红不能低于0',
'min_nn_limit_bigger_than_max' => '最小牛牛限红不能超过最大牛牛限红',
'nn_limit_cannot_bigger' => '牛牛限红不能超出',
'baccarat_limit_0' => '百家乐码率不能低于0',
'baccarat_cannot_bigger_agent' => '百家乐码率不能超过所属代理的百家乐码率',
'dt_limit_0' => '龙虎码率不能低于0',
application/agent/lang/zh-tw.php
+8
View File
@@ -185,6 +185,14 @@ return [
'limit_cannot_bigger' => '限紅不能超出',
'tie_limit_cannot_bigger' => '和限紅不能超出',
'pair_limit_cannot_bigger' => '對子限紅不能超出',
'min_nn_limit' => '最小牛牛限紅',
'max_nn_limit' => '最大牛牛限紅',
'empty_min_nn_limit' => '請輸入最小牛牛限紅',
'empty_max_nn_limit' => '請輸入最大牛牛限紅',
'min_nn_limit_0' => '最小牛牛限紅不能低於0',
'max_nn_limit_0' => '最大牛牛限紅不能低於0',
'min_nn_limit_bigger_than_max' => '最小牛牛限紅不能超過最大牛牛限紅',
'nn_limit_cannot_bigger' => '牛牛限紅不能超出',
'baccarat_limit_0' => '百家樂碼率不能低於0',
'baccarat_cannot_bigger_agent' => '百家樂碼率不能超過所屬代理的百家樂碼率',
'dt_limit_0' => '龍虎碼率不能低於0',
application/agent/view/.DS_Store
Vendored
BIN
View File
Binary file not shown.
application/agent/view/agent/add.html
+24
View File
@@ -129,6 +129,16 @@
<input type="text" id="limit_high_pair" autocomplete="off" class="layui-input" value="{$agentParent.limit_high_pair}">
</div>
</div>
<div class="layui-form-item">
<label for="limit_low_nn" class="layui-form-label">{$lang['min_nn_limit']}</label>
<div class="layui-input-inline">
<input type="text" id="limit_low_nn" autocomplete="off" class="layui-input" value="{$agentParent.limit_low_nn}">
</div>
<label for="limit_high_nn" class="layui-form-label">{$lang['max_nn_limit']}</label>
<div class="layui-input-inline">
<input type="text" id="limit_high_nn" autocomplete="off" class="layui-input" value="{$agentParent.limit_high_nn}">
</div>
</div>
<!-- 信用线展示码率 -->
<?php if($user_info['agent_type'] == 2) : ?>
@@ -242,6 +252,8 @@
query.limit_high_tie = $('#limit_high_tie').val();
query.limit_low_pair = $('#limit_low_pair').val();
query.limit_high_pair = $('#limit_high_pair').val();
query.limit_low_nn = $('#limit_low_nn').val();
query.limit_high_nn = $('#limit_high_nn').val();
query.type_xima = $('#xima_type').val();
query.agent_ximalv = $('#agent_ximalv').val() || 0;
query.agent_ximalv_dt = $('#agent_ximalv_dt').val() || 0;
@@ -320,6 +332,18 @@
});
return false;
}
if(query.limit_low_nn.length == 0 || query.limit_low_nn == undefined){
layer.alert(lang.empty_min_nn_limit,{
title:lang.message,
});
return false;
}
if(query.limit_high_nn.length == 0 || query.limit_high_nn == undefined){
layer.alert(lang.empty_max_nn_limit,{
title:lang.message,
});
return false;
}
if(query.type_xima == ''){
layer.alert(lang.empty_wash_type,{
title:lang.message,
application/agent/view/agent/edit.html
+26
View File
@@ -81,6 +81,16 @@
<input type="text" id="limit_high_pair" autocomplete="off" value="{$user.limit_high_pair}" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label for="limit_low_nn" class="layui-form-label">{$lang['min_nn_limit']}</label>
<div class="layui-input-inline">
<input type="text" id="limit_low_nn" autocomplete="off" value="{$user.limit_low_nn}" class="layui-input">
</div>
<label for="limit_high_nn" class="layui-form-label">{$lang['max_nn_limit']}</label>
<div class="layui-input-inline">
<input type="text" id="limit_high_nn" autocomplete="off" value="{$user.limit_high_nn}" class="layui-input">
</div>
</div>
<!-- 信用线展示码率 -->
<?php if($user['agent_type'] == 2) : ?>
<div class="layui-form-item">
@@ -152,6 +162,8 @@
query.limit_high_tie = $('#limit_high_tie').val();
query.limit_low_pair = $('#limit_low_pair').val();
query.limit_high_pair = $('#limit_high_pair').val();
query.limit_low_nn = $('#limit_low_nn').val();
query.limit_high_nn = $('#limit_high_nn').val();
query.agent_ximalv = $('#agent_ximalv').val() || 0;
query.agent_ximalv_dt = $('#agent_ximalv_dt').val() || 0;
query.agent_ximalv_nn = $('#agent_ximalv_nn').val() || 0;
@@ -209,6 +221,20 @@
});
return false;
}
if(query.limit_low_nn.length == 0 || query.limit_low_nn == undefined){
layer.alert(lang.empty_min_nn_limit,{
title:lang.message,
});
return false;
}
if(query.limit_high_nn.length == 0 || query.limit_high_nn == undefined){
layer.alert(lang.empty_max_nn_limit,{
title:lang.message,
});
return false;
}
return false;
}
if(query.agent_ximalv.length == 0 || query.agent_ximalv == undefined){
ayer.alert(lang.empty_baccacat_rate,{
title:lang.message,
application/agent/view/player/add.html
+24
View File
@@ -547,6 +547,16 @@
<input type="text" id="limit_high_pair" autocomplete="off" class="layui-input" value="{$agentParent.limit_high_pair}">
</div>
</div>
<div class="layui-form-item">
<label for="limit_low_nn" class="layui-form-label">{$lang['min_nn_limit']}</label>
<div class="layui-input-inline">
<input type="text" id="limit_low_nn" autocomplete="off" class="layui-input" value="{$agentParent.limit_low_nn}">
</div>
<label for="limit_high_nn" class="layui-form-label">{$lang['max_nn_limit']}</label>
<div class="layui-input-inline">
<input type="text" id="limit_high_nn" autocomplete="off" class="layui-input" value="{$agentParent.limit_high_nn}">
</div>
</div>
<div class="layui-form-item">
<label for="win_limit" class="layui-form-label">{$lang['daily_win_limit']}</label>
<div class="layui-input-inline">
@@ -695,6 +705,8 @@
query.limit_high_tie = $('#limit_high_tie').val();
query.limit_low_pair = $('#limit_low_pair').val();
query.limit_high_pair = $('#limit_high_pair').val();
query.limit_low_nn = $('#limit_low_nn').val();
query.limit_high_nn = $('#limit_high_nn').val();
query.win_limit = $('#win_limit').val();
query.agent_commission = $('#agent_commission').val();
query.agent_commission_dt = $('#agent_commission_dt').val();
@@ -787,6 +799,18 @@
});
return false;
}
if(query.limit_low_nn.length == 0 || query.limit_low_nn == undefined){
layer.alert(lang.empty_min_nn_limit,{
title:lang.message,
});
return false;
}
if(query.limit_high_nn.length == 0 || query.limit_high_nn == undefined){
layer.alert(lang.empty_max_nn_limit,{
title:lang.message,
});
return false;
}
if(query.win_limit.length == 0 || query.win_limit == undefined){
layer.alert(lang.empty_day_win_limit,{
title:lang.message,
application/agent/view/player/edit.html
+28
View File
@@ -134,6 +134,18 @@
</div>
<div class="layui-form-mid layui-word-aux limit_high_pair"></div>
</div>
<div class="layui-form-item">
<label for="limit_low_nn" class="layui-form-label">{$lang['min_nn_limit']}</label>
<div class="layui-input-inline">
<input type="text" id="limit_low_nn" autocomplete="off" class="layui-input" value="{$user.limit_low_nn}">
</div>
<div class="layui-form-mid layui-word-aux limit_low_nn"></div>
<label for="limit_high_nn" class="layui-form-label">{$lang['max_nn_limit']}</label>
<div class="layui-input-inline">
<input type="text" id="limit_high_nn" autocomplete="off" class="layui-input" value="{$user.limit_high_nn}">
</div>
<div class="layui-form-mid layui-word-aux limit_high_nn"></div>
</div>
<div class="layui-form-item">
<label for="price_banker" class="layui-form-label">{$lang['banker_odds']}</label>
<div class="layui-input-inline">
@@ -616,6 +628,8 @@
<input type="hidden" id="hidden_limit_high_tie" value="{$agent_parent.limit_high_tie}">
<input type="hidden" id="hidden_limit_low_pair" value="{$agent_parent.limit_low_pair}">
<input type="hidden" id="hidden_limit_high_pair" value="{$agent_parent.limit_high_pair}">
<input type="hidden" id="hidden_limit_low_nn" value="{$agent_parent.limit_low_nn}">
<input type="hidden" id="hidden_limit_high_nn" value="{$agent_parent.limit_high_nn}">
</div>
<script>
$(function(){
@@ -643,6 +657,8 @@
query.limit_high_tie = $('#limit_high_tie').val();
query.limit_low_pair = $('#limit_low_pair').val();
query.limit_high_pair = $('#limit_high_pair').val();
query.limit_low_nn = $('#limit_low_nn').val();
query.limit_high_nn = $('#limit_high_nn').val();
query.agent_ximalv = $('#agent_ximalv').val() || 0;
query.agent_ximalv_dt = $('#agent_ximalv_dt').val() || 0;
query.agent_ximalv_nn = $('#agent_ximalv_nn').val() || 0;
@@ -730,6 +746,18 @@
});
return false;
}
if(query.limit_low_nn.length == 0 || query.limit_low_nn == undefined){
layer.alert(lang.empty_min_nn_limit,{
title:lang.message,
});
return false;
}
if(query.limit_high_nn.length == 0 || query.limit_high_nn == undefined){
layer.alert(lang.empty_max_nn_limit,{
title:lang.message,
});
return false;
}
if(query.agent_ximalv.length == 0 || query.agent_ximalv == undefined){
layer.alert(lang.empty_baccacat_rate,{
title:lang.message,
application/agent/view/report/agent.html
+22 -8
View File
@@ -180,17 +180,31 @@
}else{
dateLang = 'cn';
}
// 计算默认时间：今天07:00:00 ~ 明天06:59:59
var now = new Date();
var y = now.getFullYear();
var m = ('0' + (now.getMonth() + 1)).slice(-2);
var d = ('0' + now.getDate()).slice(-2);
var tomorrow = new Date(now.getTime() + 86400000);
var ty = tomorrow.getFullYear();
var tm = ('0' + (tomorrow.getMonth() + 1)).slice(-2);
var td = ('0' + tomorrow.getDate()).slice(-2);
var defaultStart = y + '-' + m + '-' + d + ' 07:00:00';
var defaultEnd = ty + '-' + tm + '-' + td + ' 06:59:59';
//执行一个laydate实例
laydate.render({
elem: '#start' //指定元素
elem: '#start'
,type:'datetime',
lang: dateLang
lang: dateLang,
value: defaultStart
});
//执行一个laydate实例
laydate.render({
elem: '#end' //指定元素
elem: '#end'
,type:'datetime',
lang: dateLang
lang: dateLang,
value: defaultEnd
});
});
@@ -292,11 +306,11 @@
break;
}
if(format == 1){
startDate = startYear + '-' + startMonth + '-' + startDay + ' 00:00:00';
endDate = endYear + '-' + endMonth + '-' + endDay + ' 23:59:59';
startDate = startYear + '-' + startMonth + '-' + startDay + ' 07:00:00';
endDate = endYear + '-' + endMonth + '-' + endDay + ' 06:59:59';
}else{
startDate = startDay + ' 00:00:00';
endDate = endDay + ' 23:59:59';
startDate = startDay + ' 07:00:00';
endDate = endDay + ' 06:59:59';
}
query.startDate = startDate;