Pārlūkot izejas kodu

会议功能调整

q 1 gadu atpakaļ
vecāks
revīzija
f94d3b53e3

+ 1 - 1
webmain/flow/page/input_meeting.html

@@ -30,7 +30,7 @@
     </tr>
     <tr>
         <td height="34" width="15%" align="right" class="ys1">*^meeting_room^</td>
-        <td width="35%" class="ys2">{meeting_room}{room_id}</td>
+        <td width="35%" class="ys2">{meeting_room}{room_id}{meet_state}</td>
         <td height="34" align="right" class="ys1"></td>
         <td class="ys2"></td>
     </tr>

+ 1 - 1
webmain/flow/page/input_meeting_key.html

@@ -14,7 +14,7 @@
         <td height="34" width="15%" align="right" class="ys1">*^compere^</td>
         <td width="35%" class="ys2">{compere}</td>
         <td height="34" align="right" class="ys1">*^meeting_room^</td>
-        <td class="ys2">{meeting_room}{room_id}</td>
+        <td class="ys2">{meeting_room}{room_id}{meet_state}</td>
     </tr>
     <tr>
         <td height="34" align="right" class="ys1">*^attendees^</td>

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 40 - 1
webmain/flow/page/view_meeting_key_0.html


+ 5 - 1
webmain/task/openapi/openmeetAction.php

@@ -185,7 +185,11 @@ class openmeetClassAction extends openapiAction
     public function mMeetRoomListAction() {
 
         $rawArr = $this->getpostarr();
-        $dataDate =  substr($rawArr['date'], 0, 10) ?? date("Y-m-d");
+        if (isset($rawArr['date'])) {
+            $dataDate = substr($rawArr['date'], 0, 10);
+        } else {
+            $dataDate = date("Y-m-d");
+        }
 
         $dataArr = m("meeting_room")->getall('1=1');
         $list = [];