najixian / xt_dc_admin · Commits

Go to a project

Commit fbcdb3d7146029892ebafd24162bf6474cecf737

Authored by teemitop
1 parent 9a926945
build: skipped

日期规则调整

Inline Side-by-side
Showing 1 changed file with 5 additions and 6 deletions
@@ -91,11 +91,11 @@ class Card extends Common @@ -91,11 +91,11 @@ class Card extends Common
91 # code... 91 # code...
92 break; 92 break;
93 } 93 }
94 - $rs[0]['start_time'] = date("Y年m月d日",$rs[0]['start_time']);  
95 - $rs[0]['end_time'] = date("Y年m月d日",$rs[0]['end_time']); 94 + $rs[0]['start_time'] = $rs[0]['start_time'] ? date("Y年m月d日",$rs[0]['start_time']) : '';
  95 + $rs[0]['end_time'] = $rs[0]['end_time'] ? date("Y年m月d日",$rs[0]['end_time']) : '';
96 96
97 - $rs[0]['receive_start_time'] = date("Y年m月d日",$rs[0]['receive_start_time']);  
98 - $rs[0]['receive_end_time'] = date("Y年m月d日",$rs[0]['receive_end_time']); 97 + $rs[0]['receive_start_time'] = $rs[0]['receive_start_time'] ? date("Y年m月d日",$rs[0]['receive_start_time']) : '';
  98 + $rs[0]['receive_end_time'] = $rs[0]['receive_end_time'] ? date("Y年m月d日",$rs[0]['receive_end_time']) : '';
99 $this->assign ('rs',$rs[0]); 99 $this->assign ('rs',$rs[0]);
100 $this->assign ( 'title','优惠券详情'); 100 $this->assign ( 'title','优惠券详情');
101 return $this->fetch(); 101 return $this->fetch();
@@ -308,8 +308,7 @@ class Card extends Common @@ -308,8 +308,7 @@ class Card extends Common
308 $arr['contributor_time'] = time(); 308 $arr['contributor_time'] = time();
309 $arr['status'] = 1; 309 $arr['status'] = 1;
310 310
311 -  
312 - if($end_time[0]['end_time'] < $arr['receive_end_time']){ 311 + if(($end_time[0]['end_time']!=0) && ($end_time[0]['end_time'] < $arr['receive_end_time'])) {
313 $result['code'] = 0; 312 $result['code'] = 0;
314 $result['msg'] = '领取期限必须在卡券有效期内！'; 313 $result['msg'] = '领取期限必须在卡券有效期内！';
315 return $result; 314 return $result;