wupengfei 2 年之前
父節點
當前提交
8491c3d2f4
共有 2 個文件被更改,包括 6 次插入6 次删除
  1. 4 4
      .idea/workspace.xml
  2. 2 2
      application/common/model/ArticleIntro.php

+ 4 - 4
.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/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" />
@@ -213,7 +213,7 @@
       <workItem from="1672966192005" duration="19617000" />
       <workItem from="1673052319155" duration="16867000" />
       <workItem from="1673226266250" duration="24113000" />
-      <workItem from="1673312216057" duration="5966000" />
+      <workItem from="1673312216057" duration="6179000" />
     </task>
     <servers />
   </component>
@@ -376,10 +376,10 @@
     </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="1673053690530" />
-    <state x="1057" y="460" width="746" height="548" key="find.popup" timestamp="1673328013692">
+    <state x="1057" y="460" width="746" height="548" key="find.popup" timestamp="1673328302274">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="1057" y="460" width="746" height="548" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1673328013692" />
+    <state x="1057" y="460" width="746" height="548" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1673328302274" />
     <state x="1291" y="317" key="run.anything.popup" timestamp="1672903043103">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>

+ 2 - 2
application/common/model/ArticleIntro.php

@@ -8,8 +8,8 @@ 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,content_type,pdf,video_id,video_item,datum_id,datum_item,author')
-            ->order('sort desc,read_num desc');
+            ->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');
     }
 
     public function itemChildren()