|
|
@@ -51,9 +51,9 @@ class MeetingModel extends BaseModel
|
|
|
$startTime = $this->start_at? strtotime($this->start_at) : 0;
|
|
|
$endTime = $this->end_at? strtotime($this->end_at) : time();
|
|
|
$w = datetime('w',$startTime);
|
|
|
- $week = isset($weeks[$w])?' '.$weeks[$w]: '';
|
|
|
- $startAt = $this->start_at? datetime($this->start_at,"Y年m月d日{$week} H:i") : '';
|
|
|
-
|
|
|
+ $week = isset($weeks[$w])?' '.$weeks[$w].' ': '';
|
|
|
+ $startAt = $this->start_at? datetime($this->start_at,"Y年m月d日").$week.datetime($this->start_at,"H:i") : '';
|
|
|
+
|
|
|
$formatType = 'm月d日 H:i';
|
|
|
if($endTime && $endTime <= $startTime+86400){
|
|
|
$formatType = 'H:i';
|