|
@@ -132,10 +132,10 @@ Class User extends Core
|
|
|
$data['list'][$k]['time'] = '';
|
|
|
if ($v['status'] == 1) {
|
|
|
$time = time() - $v['cdate'];
|
|
|
- if ($time >= 300){
|
|
|
+ if ($time >= 900){
|
|
|
$data['list'][$k]['time'] = -1;
|
|
|
} else{
|
|
|
- $data['list'][$k]['time'] = 300 - $time;
|
|
|
+ $data['list'][$k]['time'] = 900 - $time;
|
|
|
}
|
|
|
}
|
|
|
$data['list'][$k]['cdate'] = date('Y.m.d H:i',$v['cdate']);
|
|
@@ -161,15 +161,11 @@ Class User extends Core
|
|
|
$data['info']['time'] = '';
|
|
|
if ($data['info']['status'] == 1) {
|
|
|
$time = time() - $data['info']['cdate'];
|
|
|
- if ($time >= 300){
|
|
|
+ if ($time >= 900){
|
|
|
$data['info']['time'] = -1;
|
|
|
} else{
|
|
|
- $data['info']['time'] = 300 - $time;
|
|
|
+ $data['info']['time'] = 900 - $time;
|
|
|
}
|
|
|
- // if (time() <= $data['info']['cdate'] + 300) {
|
|
|
- // $time = $data['info']['cdate'] + 300 - time();
|
|
|
- // $data['info']['time'] = date('i:s', $time);
|
|
|
- // }
|
|
|
}
|
|
|
$data['info']['cdate'] = date('Y-m-d H:i',$data['info']['cdate']);
|
|
|
$config = Dever::db('active/order')->config['config_status'];
|