20201112

application/master/controller/Article.php

@@ -323,6 +323,7 @@ class Article extends Controller {
      * 
      * @param name:article_id type:int require:1 desc:文章id
      * 
+     * @return journal:期刊信息#
      * @return articleInfo:文章详情@
      * @articleInfo icon:图片
      * @articleInfo tradition_tag:封皮标签
@@ -347,31 +348,20 @@ class Article extends Controller {
         $frag = [];
         foreach ($list as $k => $v){
             if($k>2){
-                $frag[] = $v;
+                $frag[] = ['val'=>$v];
             }
         }
         
+        $re['journal'] = $journal_info;
         $re['articleInfo'] = $article_info;
         $re['files'] = $frag;
         return jsonSuccess($re);
 //        return json(['code'=>0,'msg'=>'success','data'=>$article_info]);
     }
     
-    /**
-     * @title 获取文章html文件列表
-     * @description 获取文章html文件列表
-     * @author wangjinleichang
-     * @url /master/Article/getHtmlFiles
-     * @method POST
-     * 
-     * @param name:article_id type:int require:1 desc:文章id
-     * 
-     * @return files:文件列表#
-     * 
-     */
     public function getHtmlFiles(){
         $data = $this->request->post();
-        $data['article_id'] = 1;
+//        $data['article_id'] = 1;
         $article_info = $this->article_obj->where('article_id',$data['article_id'])->find();
         $journal_info = $this->journal_obj->where('journal_id',$article_info['journal_id'])->find();
         $list = scandir(ROOT_PATH.'public/articleHTML/'.$journal_info['sx']);