Merge branch 'sprint/sunhao/firefox_bug' into 'master'

* Fix $(window).height() value is difference in firefox: avoid to insert js before <!DOCTYPE html>. See merge request easycorp/zentaopms!2401
2022-03-22 00:34:50 +00:00
parent abaf5322da aee62254eb
commit a222494e09
1 changed files with 2 additions and 2 deletions
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -86,9 +86,9 @@ class my extends control
     */
    public function work($mode = 'task', $type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
    {
-        $this->showWorkCount($recTotal, $recPerPage, $pageID);
-
        echo $this->fetch('my', $mode, "type=$type&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID");
+
+        $this->showWorkCount($recTotal, $recPerPage, $pageID);
    }

    /**