1

.idea/workspace.xml

@@ -593,7 +593,7 @@
       <workItem from="1713400278236" duration="25153000" />
       <workItem from="1713486783613" duration="18361000" />
       <workItem from="1713916802858" duration="19129000" />
-      <workItem from="1714004926744" duration="25136000" />
+      <workItem from="1714004926744" duration="25239000" />
     </task>
     <servers />
   </component>

application/api/controller/Article.php

@@ -400,42 +400,42 @@ class Article extends Base
             }
             return  $is_release ? $query->order($order) : $query->where('status',1)->order($order);
         }])->find()->toArray();
-//        $detail['item_list'] = $detail['item_list3'];
-//        unset($detail['item_list3']);
-//        $detail['is_release'] = $is_release;
-//        if($is_release && $detail['is_deleted'] )$this->error('该图文已下线');
-//        if(!$detail['is_release'] && ($detail['is_deleted'] == 1 || $detail['status'] == 0))$this->error('该图文已下线');
-//        if(in_array($this->source_type,[1])) $detail['content'] = openssl_encrypt($detail['content'],'DES-ECB',123456,0);
-//        $detail['read_num']  = array_sum(array_column($detail['item_list'],'read_num'));
-//        $detail['read_num'] = numTransform($detail['read_num']);
-//        $detail['follow_switch'] =  PlatformSwitch::checkSwitch($this->user_id,$detail['id'],3);
-//        $recently_id = UserTrack::getRecentlyTrack($this->user_id,3,$detail['id']);
-//        $level_id = UserLevelRank::getUserVip($this->user_id);
-//        $detail['user_level']  = $level_id;
-
-//        foreach ($detail['item_list'] as &$dv) {
-//            if(in_array($this->source_type,[1])) unset($dv['pdf_clear']);
-//            if(in_array($this->source_type,[1])) $dv['content'] = openssl_encrypt($dv['content'],'DES-ECB',123456,0);
-//            $dv['switch_open'] =  PlatformSwitch::checkSwitch($this->user_id,$dv['id'],8);
-//            $dv['comment_num']  = ArticleComment::getArticleCommentNum($dv['id']);
-//            $dv['collect_num']  = UserCollect::where(['coll_type'=>3,'coll_id'=>$detail['id'],'children_id'=>$dv['id']])->count();
-//            $dv['collect_num']  = numTransform($dv['collect_num']);
-//            $dv['transmit_num']  = numTransform($dv['transmit_num']);
-//            $dv['is_collect']  = UserCollect::checkCollectByType($this->user_id,3,$detail['id'],$dv['id']);
-//            $dv['read_num']  = numTransform($dv['read_num']);
-//            $dv['is_recently'] = $dv['id'] == $recently_id ? 1 : 0;
-//            $dv['is_like'] = ArticleLike::where(['user_id'=>$this->user_id,'article_id'=>$dv['article_id'],'item_id'=>$dv['id']])->count();
-//            $dv['like_num'] = ArticleLike::where(['article_id'=>$dv['article_id'],'item_id'=>$dv['id']])->count();
-//            $article_auth = ArticleItem::getArticleAuth($dv['user_id'],APPNAME,APPLOGO);
-//            $dv['app_name'] = $article_auth['app_name'];
-//            $dv['app_logo'] = $article_auth['app_logo'];
-//            $dv['video_jump'] = VideoUrl::checkVip($dv['video_item'],$this->user_id);
-//            $dv['datum_jump'] = DatumUrl::checkVip($dv['datum_item'],$this->user_id);
-//        }
-//        if($this->user_id){
-//            $General = new General();
-//            $General->label($detail['label']);
-//        }
+        $detail['item_list'] = $detail['item_list3'];
+        unset($detail['item_list3']);
+        $detail['is_release'] = $is_release;
+        if($is_release && $detail['is_deleted'] )$this->error('该图文已下线');
+        if(!$detail['is_release'] && ($detail['is_deleted'] == 1 || $detail['status'] == 0))$this->error('该图文已下线');
+        if(in_array($this->source_type,[1])) $detail['content'] = openssl_encrypt($detail['content'],'DES-ECB',123456,0);
+        $detail['read_num']  = array_sum(array_column($detail['item_list'],'read_num'));
+        $detail['read_num'] = numTransform($detail['read_num']);
+        $detail['follow_switch'] =  PlatformSwitch::checkSwitch($this->user_id,$detail['id'],3);
+        $recently_id = UserTrack::getRecentlyTrack($this->user_id,3,$detail['id']);
+        $level_id = UserLevelRank::getUserVip($this->user_id);
+        $detail['user_level']  = $level_id;
+
+        foreach ($detail['item_list'] as &$dv) {
+            if(in_array($this->source_type,[1])) unset($dv['pdf_clear']);
+            if(in_array($this->source_type,[1])) $dv['content'] = openssl_encrypt($dv['content'],'DES-ECB',123456,0);
+            $dv['switch_open'] =  PlatformSwitch::checkSwitch($this->user_id,$dv['id'],8);
+            $dv['comment_num']  = ArticleComment::getArticleCommentNum($dv['id']);
+            $dv['collect_num']  = UserCollect::where(['coll_type'=>3,'coll_id'=>$detail['id'],'children_id'=>$dv['id']])->count();
+            $dv['collect_num']  = numTransform($dv['collect_num']);
+            $dv['transmit_num']  = numTransform($dv['transmit_num']);
+            $dv['is_collect']  = UserCollect::checkCollectByType($this->user_id,3,$detail['id'],$dv['id']);
+            $dv['read_num']  = numTransform($dv['read_num']);
+            $dv['is_recently'] = $dv['id'] == $recently_id ? 1 : 0;
+            $dv['is_like'] = ArticleLike::where(['user_id'=>$this->user_id,'article_id'=>$dv['article_id'],'item_id'=>$dv['id']])->count();
+            $dv['like_num'] = ArticleLike::where(['article_id'=>$dv['article_id'],'item_id'=>$dv['id']])->count();
+            $article_auth = ArticleItem::getArticleAuth($dv['user_id'],APPNAME,APPLOGO);
+            $dv['app_name'] = $article_auth['app_name'];
+            $dv['app_logo'] = $article_auth['app_logo'];
+            $dv['video_jump'] = VideoUrl::checkVip($dv['video_item'],$this->user_id);
+            $dv['datum_jump'] = DatumUrl::checkVip($dv['datum_item'],$this->user_id);
+        }
+        if($this->user_id){
+            $General = new General();
+            $General->label($detail['label']);
+        }
         $this->success('ok',['detail'=>$detail]);
     }