edit

learn/active/src/Home.php

@@ -15,9 +15,21 @@ Class Home extends Core
 			$data['info'][$k]['act_status_name'] = Dever::status($config,$v['act_status']);
 			if ($v['act_status'] == 2) {
 				if ($v['sign_end']) {
-					$data['info'][$k]['day'] = '剩余'.floor(($v['sign_end'] - time())/86400).'天';
+					$day = floor(($v['sign_end'] - time())/86400);
+					if ($day < 0){
+						$data['info'][$k]['day'] = '';
+					} else {
+						$data['info'][$k]['day'] = '剩余'.$day.'天';
+					}
+					
 				} else {
-					$data['info'][$k]['day'] = '剩余'.floor(($v['act_start'] - time())/86400).'天';
+					$day = floor(($v['act_start'] - time())/86400);
+					if ($day >= 0) {
+						$data['info'][$k]['day'] = '剩余'.$day.'天';
+					} else {
+						$data['info'][$k]['day'] = '';
+					}
+					
 				}
 			}else {
 				$data['info'][$k]['day'] = '';

learn/active/src/User.php

@@ -131,9 +131,11 @@ Class User extends Core
             $data['list'][$k]['mobile'] = $active['mobile'];
             $data['list'][$k]['time'] = '';
             if ($v['status'] == 1) {
-                if (time() <= $v['cdate'] + 300 ){
-                    $time = $v['cdate'] + 300 - time();
-                    $data['list'][$k]['time'] = date('H:i',$time);
+                $time = time() - $v['cdate'];
+                if ($time >= 300){
+                    $data['list'][$k]['time'] = -1;
+                } else{
+                    $data['list'][$k]['time'] = 300 - $time;
                 }
             }
             $data['list'][$k]['cdate'] = date('Y.m.d H:i',$v['cdate']);
@@ -158,10 +160,16 @@ Class User extends Core
 			$data['info']['cash'] = $active['price'];#单价
             $data['info']['time'] = '';
             if ($data['info']['status'] == 1) {
-                if (time() <= $data['info']['cdate'] + 300) {
-                    $time = $data['info']['cdate'] + 300 - time();
-                    $data['info']['time'] = date('H:i',$time);
+                $time = time() - $data['info']['cdate'];
+                if ($time >= 300){
+                    $data['info']['time'] = -1;
+                } else{
+                    $data['info']['time'] = 300 - $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'];