1

.idea/workspace.xml

@@ -3,7 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/nutrition/controller/ArticleItem.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/ArticleItem.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Article.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Article.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/common/model/ArticleIntro.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/ArticleIntro.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -205,7 +206,7 @@
       <workItem from="1670547445908" duration="11821000" />
       <workItem from="1671196552398" duration="3806000" />
       <workItem from="1671605812878" duration="482000" />
-      <workItem from="1671670352202" duration="6987000" />
+      <workItem from="1671670352202" duration="8635000" />
     </task>
     <servers />
   </component>

application/api/controller/Article.php

@@ -183,6 +183,8 @@ class Article extends Base
      * @return name:item_list.content type:string default:-- desc:内容
      * @return name:item_list.app_name type:string default:-- desc:发布方名称
      * @return name:item_list.app_logo type:string default:-- desc:发布方头像
+     * @return name:item_list.content_type type:int default:1 desc:1富文本2pdf
+     * @return name:item_list.pdf type:string default:-- desc:pdf文件路径
      */
     public function getArticleList()
     {
@@ -281,6 +283,8 @@ class Article extends Base
      * @return name:item_list.datum_id type:int default:-- desc:资料id【单个id||系列id】
      * @return name:item_list.datum_item type:int default:-- desc:资料详情id【url_arr.id】
      * @return name:item_list.author type:string default:-- desc:原创作者
+     * @return name:item_list.content_type type:int default:1 desc:1富文本2pdf
+     * @return name:item_list.pdf type:string default:-- desc:pdf文件路径
      */
     public function getArticleDetail()
     {
@@ -331,6 +335,8 @@ class Article extends Base
      * @return name:datum_id type:int default:-- desc:资料id【单个id||系列id】
      * @return name:datum_item type:int default:-- desc:资料详情id【url_arr.id】
      * @return name:author type:string default:-- desc:原创作者
+     * @return name:content_type type:int default:1 desc:1富文本2pdf
+     * @return name:pdf type:string default:-- desc:pdf文件路径
      */
     public function getArticleItemInfo()
     {

application/common/model/ArticleIntro.php

@@ -8,7 +8,7 @@ class ArticleIntro extends Model
     public function itemList(){
         return $this->hasMany('ArticleItem','article_id')
             ->where('is_deleted',0)
-            ->field('id,article_id,user_id,cover,is_vip,sort,transmit_num,read_num,title,images,content,video_id,video_item,datum_id,datum_item,author')
+            ->field('id,article_id,user_id,cover,is_vip,sort,transmit_num,read_num,title,images,content,content_type,pdf,video_id,video_item,datum_id,datum_item,author')
             ->order('sort desc,read_num desc');
     }