1

modules/api/models/LoginForm.php

@@ -30,7 +30,7 @@ class LoginForm extends ApiModel
             [['username', 'password'], 'trim'],
             [['username', 'password'], 'string'],
             [['cx_mch_id', 'token_type'], 'integer'],
-            [['username', 'password', 'cx_mch_id', 'token_type'], 'required'],
+            [['username', 'password', 'token_type'], 'required'],
         ];
     }
     

modules/api/models/ReportForm.php

@@ -87,15 +87,25 @@ class ReportForm extends ApiModel
             if (!empty($value['pdf_at'])) {
                 $value['pdf_at_cn'] = date('Y-m-d H:i:s', $value['pdf_at']);
             }
+
+            $value['pdf_path'] = SiteHelper::getFullUrl($value['pdf_path']);
+
             $list[$key] = $value;
         }
 
-        $data = [];
-        $data['code'] = 0;
-        $data['msg'] = 'ok';
-        $data['data'] = $list;
-        $data['count'] = $count;
-        return $data;
+
+        $end_flag = $this->page > $pagination->pageCount ? true : false;
+
+        return [
+            'code' => 0,
+            'msg' => 'ok',
+            'data' => $list,
+            'count' => $count,
+            'page_size' => $this->limit,
+            'page_count' => $pagination->pageCount,
+            'page_no' => $this->page,
+            'end_flag' => $end_flag
+        ];
     }
 
 

modules/api/models/UserModifyForm.php

@@ -112,6 +112,7 @@ class UserModifyForm extends ApiModel
 
             $form->username = $username;
             $form->password = $password;
+            $form->token_type = 3;
             $data = $form->login();