Merge remote-tracking branch 'origin/master'

@@ -113,7 +113,7 @@ class MailListV2 extends Base {
         // 目录
         $folder = app()->request('folder','收件箱');
         // 只允许查询这里文件夹
-        if(!in_array($folder,['收件箱','发件箱','垃圾箱','星标邮件','预热收件箱','预热发件箱','自动回复收件箱','Starred'])){
+        if(!in_array($folder,['收件箱','发件箱','垃圾箱','星标邮件','预热收件箱','预热发件箱','自动回复收件箱','Starred','草稿箱'])){
             app()->e('folder_not_fount');
         }
         $where['is_hots'] = 0;
@@ -132,6 +132,9 @@ class MailListV2 extends Base {
             $is_auto_inbox = 1;
             $folder = '收件箱';
             $where['is_hots'] = 0;
+        }elseif ($folder=='草稿箱'){
+            $folder = '草稿箱';
+            $where['is_hots'] = 0;
         }
 
         $seen =   app()->request('seen',-1,'intval');
@@ -178,7 +181,7 @@ class MailListV2 extends Base {
         // 软删
         $where['deleted'] = 0;
 
-        $filed = '`id`,`uid`,`subject`,`from`,`from_name`,`flagged`,`seen`,`udate`,`folder_id`,`is_file`,`description`,`'.$this->getTable().'`.`email_id`,`to_name`';
+        $filed = '`id`,`uid`,`subject`,`from`,`from_name`,`flagged`,`seen`,`udate`,`folder_id`,`is_file`,`description`,`'.$this->getTable().'`.`email_id`,`to_name`,`draft`';
         $filedhot = '`id`,`uid`,`subject`,`from`,`from_name`,`flagged`,`seen`,`udate`,`folder_id`,`is_file`,`description`,`lists_hot`.`email_id`,`to_name`';
 
         $sql = "select %s from `".$this->getTable()."` where ".dbWhere($where);