|
|
@@ -66,8 +66,7 @@ class openmeetClassAction extends openapiAction
|
|
|
"meeting_name"=>$meeting['title'],
|
|
|
"meeting_time"=>date("H:i", strtotime($meeting['start_time'])).' ~ '.date("H:i", strtotime($meeting['end_time'])),
|
|
|
"meeting_moderator"=>$meeting['compere'],
|
|
|
- "meeting_state"=>$meeting['meet_state'],
|
|
|
- "meeting_state_text"=>m("meeting")->hyarra[$meeting['meet_state']],
|
|
|
+ "meeting_state"=>$meeting['meet_state'] == 1 ? 1 : 0,
|
|
|
];
|
|
|
|
|
|
// 时间到了自动结束一下
|
|
|
@@ -108,8 +107,8 @@ class openmeetClassAction extends openapiAction
|
|
|
"meeting_time" => date("H:i", strtotime($nowMeet['start_time'])).' ~ '.date("H:i", strtotime($nowMeet['end_time'])),
|
|
|
"meeting_moderator" => $nowMeet['compere'],
|
|
|
];
|
|
|
- $data['participants'] = [];
|
|
|
$data['meetingTopic'] = [];
|
|
|
+ $data['participants'] = [];
|
|
|
|
|
|
// 党委会议（需要加入议题）
|
|
|
if ($nowMeet['type'] == 2) {
|
|
|
@@ -119,8 +118,8 @@ class openmeetClassAction extends openapiAction
|
|
|
// 会议议题处理
|
|
|
for ($i = 0; $i < count($topics); $i++) {
|
|
|
$info = $topics[$i];
|
|
|
- $data['meetingTopic'][$i]['state'] = $info['topic_state'] == 1 ? 1 : 0;
|
|
|
- $data['meetingTopic'][$i]['tip'] = $info['topic_state'] == 1 ? "会议中" : "正常";
|
|
|
+ $data['meetingTopic'][$i]['state'] = $info['topic_state'];
|
|
|
+ $data['meetingTopic'][$i]['tip'] = m("meeting")->ytarra[$info['topic_state']];
|
|
|
$data['meetingTopic'][$i]['text'] = $info['topic_title'];
|
|
|
if ($info['topic_state'] == 2) {
|
|
|
$data['participants'][] = [
|
