wupengfei 1 年之前
父節點
當前提交
67630c60eb
共有 3 個文件被更改,包括 57 次插入5 次删除
  1. 5 4
      .idea/workspace.xml
  2. 1 1
      application/api/controller/Demand.php
  3. 51 0
      application/api/controller/Press.php

+ 5 - 4
.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/operate/view/activity_apply/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/activity_apply/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Demand.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Demand.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Press.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Press.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -373,7 +374,7 @@
       <workItem from="1689382026617" duration="17945000" />
       <workItem from="1689555292248" duration="15786000" />
       <workItem from="1689581505379" duration="6890000" />
-      <workItem from="1689641487273" duration="4155000" />
+      <workItem from="1689641487273" duration="5450000" />
     </task>
     <servers />
   </component>
@@ -503,10 +504,10 @@
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="1410" y="539" key="#com.intellij.fileTypes.FileTypeChooser/0.0.2560.1400@0.0.2560.1400" timestamp="1684374232836" />
-    <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1689384005804">
+    <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1689649679704">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1689384005804" />
+    <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1689649679704" />
     <state x="420" y="147" width="1942" height="1088" key="DiffContextDialog" timestamp="1689585156769">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>

+ 1 - 1
application/api/controller/Demand.php

@@ -519,9 +519,9 @@ class Demand extends Base
             ->order('id desc')
             ->limit($this->off_set,$this->page_num)
             ->select()->toArray();
-        $user_info = $this->userInfo('name,headimg');
         foreach ($list as &$lv){
             $lv['label_name'] = $lv['label'] ? explode(',',trim($lv['label'],',')) : null;
+            $lv['is_normal'] = CheckPower::checkModulesPower($lv['id'],0,$this->request->controller());
         }
         $this->success('ok',['list'=>$list]);
     }

+ 51 - 0
application/api/controller/Press.php

@@ -1177,4 +1177,55 @@ class Press extends Base
 
 
 
+
+    /**
+     * @title 我的点赞--评论
+     * @desc 评论点赞列表
+     * @author qc
+     * @method GET
+     * @url /api/Press/getTagsComment
+     * @header name:Authorization require:1 desc:Token
+     * @param  name:page type:int default:0 desc:页数
+     * @param  name:page_num type:int default:20 desc:每页数
+     * @return name:create_at type:string default:-- desc:时间
+     * @return name:self_name type:string default:-- desc:会员名称【自己的】
+     * @return name:self_headimg type:string default:-- desc:会员头像【自己的】
+     * @return name:comment_user type:string default:-- desc:会员名称【评论人】
+     * @return name:content type:string default:-- desc:评论内容
+     * @return name:cover type:string default:-- desc:封面
+     * @return name:title type:string default:-- desc:标题
+     * @return name:read_num type:string default:-- desc:浏览量
+     * @return name:is_normal type:int default:-- desc:是否是正常记录(0已删除或是已禁用1可以正常跳转详情)
+     * @return name:app_name type:string default:-- desc:发布方名称
+     * @return name:app_logo type:string default:-- desc:发布方头像
+     */
+
+    public function getTagsComment()
+    {
+        $list = PlatformLike::field('l.id,c.content,g.read_num,g.cover,u.name comment_user,g.is_over,g.user_id,l.create_at,g.title,g.id press_id')
+            ->alias('l')
+            ->where(['l.user_id'=>$this->user_id,'l.type'=>2])
+            ->where('c.user_id','<>',$this->user_id)
+            ->leftJoin('PressComment c','l.like_id = c.id')
+            ->leftJoin('Press g','g.id = c.first_id')
+            ->leftJoin('store_member u','u.id = c.user_id')
+            ->order('l.id desc')
+            ->limit($this->off_set,$this->page_num)
+            ->select()->toArray();
+        $user_info = $this->userInfo();
+        foreach ($list as &$v) {
+            $v['is_normal'] = CheckPower::checkModulesPower($v['press_id'],0,$this->request->controller());
+            $auth_info = \app\common\model\Press::getInfoAuth($v['user_id'],APPNAME,APPLOGO);
+            $v['app_name']  = $auth_info['app_name'];
+            $v['app_logo']  = $auth_info['app_logo'];
+            $v['read_num'] = numTransform($v['read_num']);
+            $v['self_name'] = $user_info['name'];
+            $v['self_headimg'] = $user_info['headimg'];
+        }
+
+    }
+
+
+
+
 }