1

.idea/workspace.xml

@@ -3,8 +3,7 @@
   <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/api/controller/General.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/General.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/common/model/PlatformSwitch.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/PlatformSwitch.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" />
@@ -251,7 +250,7 @@
       <workItem from="1677805207495" duration="7323000" />
       <workItem from="1678063982310" duration="24531000" />
       <workItem from="1678149106133" duration="24129000" />
-      <workItem from="1678236784872" duration="16311000" />
+      <workItem from="1678236784872" duration="16764000" />
     </task>
     <servers />
   </component>

application/api/controller/Press.php

@@ -106,7 +106,12 @@ class Press extends Base
             $v['praise_num'] = PlatformLike::getPraiseNum($v['id'],1);
             $v['images_arr'] = $v['images'] ? explode('|',$v['images']) : null;
         }
-        $this->success('ok',['list'=>$list]);
+        $total_num = \app\common\model\Press::where(['is_deleted'=>0])
+            ->field('id,images,title,content,read_num,create_at,transmit_num')
+            ->when($title,function ($query)use($title){
+                if($title) $query->where('title|label','like','%'.$title.'%');
+            })->count();
+        $this->success('ok',['list'=>$list,'total_count'=>$total_num,'page_num'=>$this->page_num]);
     }
 
     /**
@@ -220,8 +225,8 @@ class Press extends Base
                 ->find();
             $val['parent']  = $parent ? $parent->toArray() : null;
         });
-        $total_num  = PressComment::where($where)->alias('c')->count();
-        $this->success('ok',['list'=>$list,'total_num'=>numTransform($total_num)]);
+        $total_num  = PressComment::where($where)   ->leftJoin('store_member u','u.id = c.user_id')->alias('c')->count();
+        $this->success('ok',['list'=>$list,'total_num'=>numTransform($total_num),'total_count'=>$total_num,'page_num'=>$this->page_num]);
     }
 
 
@@ -513,7 +518,8 @@ class Press extends Base
                 ->find()->toArray();
             $v['parent_comment'] = $parent_comment;
         }
-        $this->success('ok',['list'=>$list]);
+        $total_num = PressComment::where($sel_where)->alias('t')->leftJoin('store_member u','t.user_id = u.id')->leftJoin('Press i','t.first_id = i.id')->count();
+        $this->success('ok',['list'=>$list,'total_count'=>$total_num,'page_num'=>$this->page_num]);
     }
 
     /**
@@ -558,7 +564,9 @@ class Press extends Base
             $v['cover'] =   $v['images_arr'] ? $v['images_arr'][0] : null;
             $v['is_normal'] = CheckPower::checkModulesPower($v['press_id'],0,$this->request->controller());
         });
-        $this->success('ok',['list'=>$list]);
+        $total_num = PressComment::where($sel_where)->alias('t') ->leftJoin('Press i','t.first_id = i.id')
+            ->leftJoin('store_member u','t.user_id = u.id')->count();
+        $this->success('ok',['list'=>$list,'total_count'=>$total_num,'page_num'=>$this->page_num]);
     }
 
     /**
@@ -601,7 +609,10 @@ class Press extends Base
             $v['cover'] =   $v['images_arr'] ? $v['images_arr'][0] : null;
             $v['is_normal'] = CheckPower::checkModulesPower($v['press_id'],0,$this->request->controller());
         }
-        $this->success('ok',['list'=>$list]);
+        $total_num = PressComment::where($where)
+            ->alias('t')  ->leftJoin('Press i','t.first_id = i.id')
+            ->leftJoin('store_member u','u.id = t.user_id')->count();
+        $this->success('ok',['list'=>$list,'total_count'=>$total_num,'page_num'=>$this->page_num]);
 
     }
 
@@ -661,7 +672,8 @@ class Press extends Base
             $parent_comment['images_arr'] = $parent_comment['images'] ? explode('|',$parent_comment['images']) : null;
             $v['parent_comment'] = $parent_comment;
         }
-        $this->success('ok',['list'=>$list]);
+        $total_num = PressComment::where($sel_where)->alias('t')->leftJoin('Press i','t.first_id = i.id')->count();
+        $this->success('ok',['list'=>$list,'total_count'=>$total_num,'page_num'=>$this->page_num]);
     }
 
 
@@ -705,7 +717,9 @@ class Press extends Base
             $v['collect_num'] = UserCollect::getCollectNum(4,$v['press_id']);
             $v['praise_num'] = PlatformLike::getPraiseNum($v['press_id'],1);*/
         }
-        $this->success('ok',['list'=>$list]);
+        $total_num =  UserCollect::where($sel_where)->alias('t')
+            ->leftJoin('Press i','t.coll_id = i.id')->count();
+        $this->success('ok',['list'=>$list,'total_count'=>$total_num,'page_num'=>$this->page_num]);
     }
 
     /**
@@ -756,7 +770,8 @@ class Press extends Base
             $v['images_arr'] = $v['images'] ? explode('|',$v['images']) : null;
             $v['cover'] =   $v['images_arr'] ? $v['images_arr'][0] : null;
         }
-        $this->success('ok',['list'=>$list]);
+        $total_num = PlatformLike::where($sel_where)->alias('t')->leftJoin('Press i','t.like_id = i.id')->count();
+        $this->success('ok',['list'=>$list,'total_count'=>$total_num,'page_num'=>$this->page_num]);
     }
 
     /**
@@ -800,7 +815,8 @@ class Press extends Base
          $v['collect_num'] = UserCollect::getCollectNum(4,$v['press_id']);
          $v['praise_num'] = PlatformLike::getPraiseNum($v['press_id'],1);*/
         }
-        $this->success('ok',['list'=>$list]);
+        $total_num = UserTrack::where($sel_where)->alias('t')->leftJoin('Press i','t.first_id = i.id')->count();
+        $this->success('ok',['list'=>$list,'total_count'=>$total_num,'page_num'=>$this->page_num]);
     }