1

.idea/workspace.xml

@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="" />
+    <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/nutrition/controller/OneArticle.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/OneArticle.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/controller/OneDatum.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/OneDatum.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/controller/SeriesArticle.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/SeriesArticle.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/controller/SeriesDatum.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/SeriesDatum.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/controller/SeriesManage.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/SeriesManage.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/controller/VideoManage.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/VideoManage.php" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -118,7 +126,7 @@
   <component name="PropertiesComponent">
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../dineng" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <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" />
@@ -179,7 +187,9 @@
       <workItem from="1668473035617" duration="5552000" />
       <workItem from="1668559891944" duration="1972000" />
       <workItem from="1668562566617" duration="3108000" />
-      <workItem from="1668644889000" duration="2456000" />
+      <workItem from="1668644889000" duration="5906000" />
+      <workItem from="1668670847013" duration="9000" />
+      <workItem from="1668749820707" duration="210000" />
     </task>
     <servers />
   </component>

application/nutrition/controller/OneArticle.php

@@ -41,7 +41,7 @@ class OneArticle extends Controller
         $this->is_vip = $is_vip = $this->request->get('is_vip',-1);
         if($is_vip >= 0) $sel_where[] = ['is_vip','=',$is_vip ];
         $query = $this->_query($this->table);
-        $query->where($sel_where)->order('status desc ,is_top desc ,sort desc,id desc')->page();
+        $query->where($sel_where)->order('sort desc,id desc')->page();
     }
 
     /**

application/nutrition/controller/OneDatum.php

@@ -43,7 +43,7 @@ class OneDatum extends Controller
         $sel_where[] = ['type','=',1];
         if($title = $this->request->get('title')) $sel_where[] = ['title','like','%'.$title.'%'];
         $query = $this->_query($this->table);
-        $query->where($sel_where)->order('status desc ,is_top desc ,sort desc,id desc')->page();
+        $query->where($sel_where)->order('sort desc,id desc')->page();
     }
 
     /**

application/nutrition/controller/SeriesArticle.php

@@ -42,7 +42,7 @@ class SeriesArticle extends Controller
         $this->is_vip = $is_vip = $this->request->get('is_vip',-1);
         if($is_vip >= 0) $sel_where[] = ['is_vip','=',$is_vip ];
         $query = $this->_query($this->table);
-        $query->where($sel_where)->order('status desc ,is_top desc ,sort desc,id desc')->page();
+        $query->where($sel_where)->order('sort desc,id desc')->page();
 
     }
 

application/nutrition/controller/SeriesDatum.php

@@ -43,7 +43,7 @@ class SeriesDatum extends Controller
         $sel_where[] = ['type','=',2];
         if($title = $this->request->get('title')) $sel_where[] = ['title','like','%'.$title.'%'];
         $query = $this->_query($this->table);
-        $query->where($sel_where)->order('status desc ,is_top desc ,sort desc,id desc')->page();
+        $query->where($sel_where)->order('sort desc,id desc')->page();
     }
 
     /**

application/nutrition/controller/SeriesManage.php

@@ -41,7 +41,7 @@ class SeriesManage extends Controller
         if($title = $this->request->get('title')) $sel_where[] = ['title','like','%'.$title.'%'];
         if($label = $this->request->get('label')) $sel_where[] = ['label','like','%'.trim(',',$label).'%'];
         $query = $this->_query($this->table);
-        $query->where($sel_where)->order('sort desc,status desc ,is_top desc,id desc')->page();
+        $query->where($sel_where)->order('sort desc,id desc')->page();
     }
 
     /**

application/nutrition/controller/VideoManage.php

@@ -47,7 +47,7 @@ class VideoManage extends Controller
         if($label = $this->request->get('label')) $sel_where[] = ['label','like','%'.$label.'%'];
         if($user_id = $this->request->get('user_id')) $sel_where[] = ['user_id','=',$user_id];
         $query = $this->_query($this->table);
-        $query->where($sel_where)->order('status desc ,is_top desc ,sort desc,id desc')->page();
+        $query->where($sel_where)->order('sort desc,id desc')->page();
     }
 
     /**