|
|
@@ -116,8 +116,8 @@ class openmeetClassAction extends openapiAction
|
|
|
// 会议议题处理
|
|
|
for ($i = 0; $i < count($topics); $i++) {
|
|
|
$info = $topics[$i];
|
|
|
- $data['meetingTopic'][$i]['state'] = $info['topic_state'];
|
|
|
- $data['meetingTopic'][$i]['tip'] = m("meeting")->ytarra[$info['topic_state']];
|
|
|
+ $data['meetingTopic'][$i]['state'] = $info['topic_state'] == 1 ? 1 : 0;
|
|
|
+ $data['meetingTopic'][$i]['tip'] = $info['topic_state'] == 1 ? "会议中" : "正常";
|
|
|
$data['meetingTopic'][$i]['text'] = $info['topic_title'];
|
|
|
if ($info['topic_state'] == 2) {
|
|
|
$this_topics = [
|
|
|
@@ -143,7 +143,7 @@ class openmeetClassAction extends openapiAction
|
|
|
$data['participants'] = [];
|
|
|
}
|
|
|
} else {
|
|
|
- $data['$basic_information'] = [
|
|
|
+ $data['basic_information'] = [
|
|
|
"meeting_room_name" => $rawData['room_name'],
|
|
|
"meeting_name" => '空闲中',
|
|
|
"meeting_time" => null,
|
