wupengfei 2 years ago
parent
commit
d4ca683f1c
2 changed files with 8 additions and 7 deletions
  1. 7 7
      .idea/workspace.xml
  2. 1 0
      application/api/controller/Forum.php

+ 7 - 7
.idea/workspace.xml

@@ -3,7 +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/mall/controller/StoreGoods.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/mall/controller/StoreGoods.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Forum.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Forum.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -121,7 +121,7 @@
   <component name="PropertiesComponent">
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/application/operate/view/forum" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../dineng" />
     <property name="node.js.detected.package.eslint" value="true" />
     <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.path.for.package.eslint" value="project" />
@@ -202,7 +202,7 @@
       <workItem from="1670547445908" duration="12147000" />
       <workItem from="1670633686675" duration="15717000" />
       <workItem from="1670719843429" duration="8446000" />
-      <workItem from="1670807412269" duration="7048000" />
+      <workItem from="1670807412269" duration="8791000" />
     </task>
     <servers />
   </component>
@@ -280,10 +280,10 @@
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="283" y="145" width="1942" height="1088" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1670291222413" />
-    <state x="1418" y="514" key="FileChooserDialogImpl" timestamp="1670810057067">
+    <state x="1418" y="514" key="FileChooserDialogImpl" timestamp="1670821657806">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="1418" y="514" key="FileChooserDialogImpl/0.0.2560.1400@0.0.2560.1400" timestamp="1670810057067" />
+    <state x="1418" y="514" key="FileChooserDialogImpl/0.0.2560.1400@0.0.2560.1400" timestamp="1670821657806" />
     <state x="981" y="616" key="VCS.ChangelistChooser" timestamp="1667975342482">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
@@ -296,11 +296,11 @@
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="533" y="290" key="com.intellij.ide.util.TipDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1670807432611" />
-    <state x="1166" y="605" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1670665863869">
+    <state x="1166" y="605" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1670816936058">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="875" y="449" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1920.1040@0.0.1920.1040" timestamp="1665835639346" />
-    <state x="1166" y="605" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.2560.1400@0.0.2560.1400" timestamp="1670665863869" />
+    <state x="1166" y="605" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.2560.1400@0.0.2560.1400" timestamp="1670816936058" />
     <state x="1057" y="460" width="746" height="548" key="find.popup" timestamp="1670816597032">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>

+ 1 - 0
application/api/controller/Forum.php

@@ -365,6 +365,7 @@ class Forum extends Base
             ->field('c.id,c.create_at,c.pid,c.content,u.name,u.headimg')
             ->leftJoin('store_member u','u.id = c.user_id')
             ->order('c.id desc')
+            ->limit($this->off_set,$this->page_num)
             ->select()->toArray();
        foreach ($list as &$c){
            $c['like_num'] = PlatformLike::getPraiseNum($c['id'], 8);