diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 177d8cc..4ccd3d1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,16 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/pic/add.html" afterPath="$PROJECT_DIR$/application/admin/view/pic/add.html" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/pic/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/pic/edit.html" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/video/add.html" afterPath="$PROJECT_DIR$/application/admin/view/video/add.html" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/video/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/video/edit.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/pic.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/video.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/video.js" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
@@ -25,71 +16,71 @@
<file leaf-file-name="User.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="33">
- <caret line="116" column="21" lean-forward="true" selection-start-line="116" selection-start-column="21" selection-end-line="116" selection-end-column="21" />
+ <state relative-caret-position="211">
+ <caret line="417" column="0" lean-forward="true" selection-start-line="417" selection-start-column="0" selection-end-line="417" selection-end-column="0" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
<element signature="e#1233#2896#0#PHP" expanded="false" />
<element signature="e#2902#3430#0#PHP" expanded="false" />
+ <element signature="e#3435#4573#0#PHP" expanded="false" />
<element signature="e#4579#4986#0#PHP" expanded="false" />
<element signature="e#4991#5334#0#PHP" expanded="false" />
<element signature="e#5340#6177#0#PHP" expanded="false" />
<element signature="e#6182#8377#0#PHP" expanded="false" />
<element signature="e#8383#9028#0#PHP" expanded="false" />
<element signature="e#9033#10129#0#PHP" expanded="false" />
- <element signature="e#10135#10924#0#PHP" expanded="false" />
- <element signature="e#10929#12253#0#PHP" expanded="false" />
- <element signature="e#12259#12961#0#PHP" expanded="false" />
- <element signature="e#12966#14166#0#PHP" expanded="false" />
- <element signature="e#14172#14748#0#PHP" expanded="false" />
- <element signature="e#14753#15300#0#PHP" expanded="false" />
- <element signature="e#15306#15990#0#PHP" expanded="false" />
- <element signature="e#15995#18091#0#PHP" expanded="false" />
- <element signature="e#18097#18967#0#PHP" expanded="false" />
- <element signature="e#18972#21468#0#PHP" expanded="false" />
- <element signature="e#21474#21851#0#PHP" expanded="false" />
- <element signature="e#21856#22177#0#PHP" expanded="false" />
- <element signature="e#22183#22688#0#PHP" expanded="false" />
- <element signature="e#22693#22944#0#PHP" expanded="false" />
- <element signature="e#22950#23429#0#PHP" expanded="false" />
- <element signature="e#23434#24191#0#PHP" expanded="false" />
- <element signature="e#24197#24678#0#PHP" expanded="false" />
- <element signature="e#24683#25453#0#PHP" expanded="false" />
- <element signature="e#25459#25822#0#PHP" expanded="false" />
- <element signature="e#25827#26018#0#PHP" expanded="false" />
- <element signature="e#26024#26382#0#PHP" expanded="false" />
- <element signature="e#26387#26578#0#PHP" expanded="false" />
- <element signature="e#26584#27727#0#PHP" expanded="false" />
- <element signature="e#27732#30397#0#PHP" expanded="false" />
- <element signature="e#30403#30901#0#PHP" expanded="false" />
- <element signature="e#30906#32652#0#PHP" expanded="false" />
- <element signature="e#32658#33071#0#PHP" expanded="false" />
- <element signature="e#33076#33555#0#PHP" expanded="false" />
- <element signature="e#33561#34095#0#PHP" expanded="false" />
- <element signature="e#34100#35485#0#PHP" expanded="false" />
- <element signature="e#35491#36145#0#PHP" expanded="false" />
- <element signature="e#36150#38165#0#PHP" expanded="false" />
- <element signature="e#37188#37650#0#PHP" expanded="false" />
- <element signature="e#38171#38931#0#PHP" expanded="false" />
- <element signature="e#38936#41645#0#PHP" expanded="false" />
- <element signature="e#41671#42502#0#PHP" expanded="false" />
- <element signature="e#42508#42928#0#PHP" expanded="false" />
- <element signature="e#42933#43416#0#PHP" expanded="false" />
- <element signature="e#43422#44228#0#PHP" expanded="false" />
- <element signature="e#44233#47387#0#PHP" expanded="false" />
- <element signature="e#47402#48730#0#PHP" expanded="false" />
- <element signature="e#48746#49773#0#PHP" expanded="false" />
- <element signature="e#49779#50537#0#PHP" expanded="false" />
- <element signature="e#50542#54285#0#PHP" expanded="false" />
- <element signature="e#54291#54683#0#PHP" expanded="false" />
- <element signature="e#54688#55640#0#PHP" expanded="false" />
- <element signature="e#55664#56237#0#PHP" expanded="false" />
- <element signature="e#56243#56842#0#PHP" expanded="false" />
- <element signature="e#56847#57774#0#PHP" expanded="false" />
- <element signature="e#57780#58494#0#PHP" expanded="false" />
- <element signature="e#58500#58927#0#PHP" expanded="false" />
- <element signature="e#58932#59401#0#PHP" expanded="false" />
+ <element signature="e#10929#12277#0#PHP" expanded="false" />
+ <element signature="e#12283#12985#0#PHP" expanded="false" />
+ <element signature="e#12990#14190#0#PHP" expanded="false" />
+ <element signature="e#14196#14772#0#PHP" expanded="false" />
+ <element signature="e#14777#15324#0#PHP" expanded="false" />
+ <element signature="e#15330#16014#0#PHP" expanded="false" />
+ <element signature="e#16019#18115#0#PHP" expanded="false" />
+ <element signature="e#18121#18991#0#PHP" expanded="false" />
+ <element signature="e#18996#21492#0#PHP" expanded="false" />
+ <element signature="e#21498#21875#0#PHP" expanded="false" />
+ <element signature="e#21880#22201#0#PHP" expanded="false" />
+ <element signature="e#22207#22712#0#PHP" expanded="false" />
+ <element signature="e#22717#22968#0#PHP" expanded="false" />
+ <element signature="e#22974#23453#0#PHP" expanded="false" />
+ <element signature="e#23458#24215#0#PHP" expanded="false" />
+ <element signature="e#24221#24702#0#PHP" expanded="false" />
+ <element signature="e#24707#25477#0#PHP" expanded="false" />
+ <element signature="e#25483#25846#0#PHP" expanded="false" />
+ <element signature="e#25851#26042#0#PHP" expanded="false" />
+ <element signature="e#26048#26406#0#PHP" expanded="false" />
+ <element signature="e#26411#26602#0#PHP" expanded="false" />
+ <element signature="e#26608#27751#0#PHP" expanded="false" />
+ <element signature="e#27756#30421#0#PHP" expanded="false" />
+ <element signature="e#30427#30925#0#PHP" expanded="false" />
+ <element signature="e#30930#32676#0#PHP" expanded="false" />
+ <element signature="e#32682#33095#0#PHP" expanded="false" />
+ <element signature="e#33100#33579#0#PHP" expanded="false" />
+ <element signature="e#33585#34119#0#PHP" expanded="false" />
+ <element signature="e#34124#35509#0#PHP" expanded="false" />
+ <element signature="e#35515#36169#0#PHP" expanded="false" />
+ <element signature="e#36174#38189#0#PHP" expanded="false" />
+ <element signature="e#37212#37674#0#PHP" expanded="false" />
+ <element signature="e#38195#38955#0#PHP" expanded="false" />
+ <element signature="e#38960#41669#0#PHP" expanded="false" />
+ <element signature="e#41695#42526#0#PHP" expanded="false" />
+ <element signature="e#42532#42952#0#PHP" expanded="false" />
+ <element signature="e#42957#43440#0#PHP" expanded="false" />
+ <element signature="e#43446#44252#0#PHP" expanded="false" />
+ <element signature="e#44257#47411#0#PHP" expanded="false" />
+ <element signature="e#47426#48754#0#PHP" expanded="false" />
+ <element signature="e#48770#49797#0#PHP" expanded="false" />
+ <element signature="e#49803#50561#0#PHP" expanded="false" />
+ <element signature="e#50566#54309#0#PHP" expanded="false" />
+ <element signature="e#54315#54707#0#PHP" expanded="false" />
+ <element signature="e#54712#55664#0#PHP" expanded="false" />
+ <element signature="e#55688#56261#0#PHP" expanded="false" />
+ <element signature="e#56267#56866#0#PHP" expanded="false" />
+ <element signature="e#56871#57798#0#PHP" expanded="false" />
+ <element signature="e#57804#58518#0#PHP" expanded="false" />
+ <element signature="e#58524#58951#0#PHP" expanded="false" />
+ <element signature="e#58956#59425#0#PHP" expanded="false" />
</folding>
</state>
</provider>
@@ -181,9 +172,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
- <component name="ProjectFrameBounds" extendedState="1">
- <option name="x" value="165" />
- <option name="y" value="86" />
+ <component name="ProjectFrameBounds">
+ <option name="x" value="281" />
+ <option name="y" value="96" />
<option name="width" value="1696" />
<option name="height" value="970" />
</component>
@@ -303,7 +294,7 @@
<workItem from="1574988912149" duration="1103000" />
<workItem from="1575337352423" duration="994000" />
<workItem from="1575340427887" duration="256000" />
- <workItem from="1575420983161" duration="7294000" />
+ <workItem from="1575420983161" duration="7613000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
@@ -316,7 +307,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="296855000" />
+ <option name="totallyTimeSpent" value="297174000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -328,7 +319,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="165" y="86" width="1696" height="970" extended-state="1" />
+ <frame x="281" y="96" width="1696" height="970" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17420538" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
@@ -787,71 +778,71 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="33">
- <caret line="116" column="21" lean-forward="true" selection-start-line="116" selection-start-column="21" selection-end-line="116" selection-end-column="21" />
+ <state relative-caret-position="211">
+ <caret line="417" column="0" lean-forward="true" selection-start-line="417" selection-start-column="0" selection-end-line="417" selection-end-column="0" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
<element signature="e#1233#2896#0#PHP" expanded="false" />
<element signature="e#2902#3430#0#PHP" expanded="false" />
+ <element signature="e#3435#4573#0#PHP" expanded="false" />
<element signature="e#4579#4986#0#PHP" expanded="false" />
<element signature="e#4991#5334#0#PHP" expanded="false" />
<element signature="e#5340#6177#0#PHP" expanded="false" />
<element signature="e#6182#8377#0#PHP" expanded="false" />
<element signature="e#8383#9028#0#PHP" expanded="false" />
<element signature="e#9033#10129#0#PHP" expanded="false" />
- <element signature="e#10135#10924#0#PHP" expanded="false" />
- <element signature="e#10929#12253#0#PHP" expanded="false" />
- <element signature="e#12259#12961#0#PHP" expanded="false" />
- <element signature="e#12966#14166#0#PHP" expanded="false" />
- <element signature="e#14172#14748#0#PHP" expanded="false" />
- <element signature="e#14753#15300#0#PHP" expanded="false" />
- <element signature="e#15306#15990#0#PHP" expanded="false" />
- <element signature="e#15995#18091#0#PHP" expanded="false" />
- <element signature="e#18097#18967#0#PHP" expanded="false" />
- <element signature="e#18972#21468#0#PHP" expanded="false" />
- <element signature="e#21474#21851#0#PHP" expanded="false" />
- <element signature="e#21856#22177#0#PHP" expanded="false" />
- <element signature="e#22183#22688#0#PHP" expanded="false" />
- <element signature="e#22693#22944#0#PHP" expanded="false" />
- <element signature="e#22950#23429#0#PHP" expanded="false" />
- <element signature="e#23434#24191#0#PHP" expanded="false" />
- <element signature="e#24197#24678#0#PHP" expanded="false" />
- <element signature="e#24683#25453#0#PHP" expanded="false" />
- <element signature="e#25459#25822#0#PHP" expanded="false" />
- <element signature="e#25827#26018#0#PHP" expanded="false" />
- <element signature="e#26024#26382#0#PHP" expanded="false" />
- <element signature="e#26387#26578#0#PHP" expanded="false" />
- <element signature="e#26584#27727#0#PHP" expanded="false" />
- <element signature="e#27732#30397#0#PHP" expanded="false" />
- <element signature="e#30403#30901#0#PHP" expanded="false" />
- <element signature="e#30906#32652#0#PHP" expanded="false" />
- <element signature="e#32658#33071#0#PHP" expanded="false" />
- <element signature="e#33076#33555#0#PHP" expanded="false" />
- <element signature="e#33561#34095#0#PHP" expanded="false" />
- <element signature="e#34100#35485#0#PHP" expanded="false" />
- <element signature="e#35491#36145#0#PHP" expanded="false" />
- <element signature="e#36150#38165#0#PHP" expanded="false" />
- <element signature="e#37188#37650#0#PHP" expanded="false" />
- <element signature="e#38171#38931#0#PHP" expanded="false" />
- <element signature="e#38936#41645#0#PHP" expanded="false" />
- <element signature="e#41671#42502#0#PHP" expanded="false" />
- <element signature="e#42508#42928#0#PHP" expanded="false" />
- <element signature="e#42933#43416#0#PHP" expanded="false" />
- <element signature="e#43422#44228#0#PHP" expanded="false" />
- <element signature="e#44233#47387#0#PHP" expanded="false" />
- <element signature="e#47402#48730#0#PHP" expanded="false" />
- <element signature="e#48746#49773#0#PHP" expanded="false" />
- <element signature="e#49779#50537#0#PHP" expanded="false" />
- <element signature="e#50542#54285#0#PHP" expanded="false" />
- <element signature="e#54291#54683#0#PHP" expanded="false" />
- <element signature="e#54688#55640#0#PHP" expanded="false" />
- <element signature="e#55664#56237#0#PHP" expanded="false" />
- <element signature="e#56243#56842#0#PHP" expanded="false" />
- <element signature="e#56847#57774#0#PHP" expanded="false" />
- <element signature="e#57780#58494#0#PHP" expanded="false" />
- <element signature="e#58500#58927#0#PHP" expanded="false" />
- <element signature="e#58932#59401#0#PHP" expanded="false" />
+ <element signature="e#10929#12277#0#PHP" expanded="false" />
+ <element signature="e#12283#12985#0#PHP" expanded="false" />
+ <element signature="e#12990#14190#0#PHP" expanded="false" />
+ <element signature="e#14196#14772#0#PHP" expanded="false" />
+ <element signature="e#14777#15324#0#PHP" expanded="false" />
+ <element signature="e#15330#16014#0#PHP" expanded="false" />
+ <element signature="e#16019#18115#0#PHP" expanded="false" />
+ <element signature="e#18121#18991#0#PHP" expanded="false" />
+ <element signature="e#18996#21492#0#PHP" expanded="false" />
+ <element signature="e#21498#21875#0#PHP" expanded="false" />
+ <element signature="e#21880#22201#0#PHP" expanded="false" />
+ <element signature="e#22207#22712#0#PHP" expanded="false" />
+ <element signature="e#22717#22968#0#PHP" expanded="false" />
+ <element signature="e#22974#23453#0#PHP" expanded="false" />
+ <element signature="e#23458#24215#0#PHP" expanded="false" />
+ <element signature="e#24221#24702#0#PHP" expanded="false" />
+ <element signature="e#24707#25477#0#PHP" expanded="false" />
+ <element signature="e#25483#25846#0#PHP" expanded="false" />
+ <element signature="e#25851#26042#0#PHP" expanded="false" />
+ <element signature="e#26048#26406#0#PHP" expanded="false" />
+ <element signature="e#26411#26602#0#PHP" expanded="false" />
+ <element signature="e#26608#27751#0#PHP" expanded="false" />
+ <element signature="e#27756#30421#0#PHP" expanded="false" />
+ <element signature="e#30427#30925#0#PHP" expanded="false" />
+ <element signature="e#30930#32676#0#PHP" expanded="false" />
+ <element signature="e#32682#33095#0#PHP" expanded="false" />
+ <element signature="e#33100#33579#0#PHP" expanded="false" />
+ <element signature="e#33585#34119#0#PHP" expanded="false" />
+ <element signature="e#34124#35509#0#PHP" expanded="false" />
+ <element signature="e#35515#36169#0#PHP" expanded="false" />
+ <element signature="e#36174#38189#0#PHP" expanded="false" />
+ <element signature="e#37212#37674#0#PHP" expanded="false" />
+ <element signature="e#38195#38955#0#PHP" expanded="false" />
+ <element signature="e#38960#41669#0#PHP" expanded="false" />
+ <element signature="e#41695#42526#0#PHP" expanded="false" />
+ <element signature="e#42532#42952#0#PHP" expanded="false" />
+ <element signature="e#42957#43440#0#PHP" expanded="false" />
+ <element signature="e#43446#44252#0#PHP" expanded="false" />
+ <element signature="e#44257#47411#0#PHP" expanded="false" />
+ <element signature="e#47426#48754#0#PHP" expanded="false" />
+ <element signature="e#48770#49797#0#PHP" expanded="false" />
+ <element signature="e#49803#50561#0#PHP" expanded="false" />
+ <element signature="e#50566#54309#0#PHP" expanded="false" />
+ <element signature="e#54315#54707#0#PHP" expanded="false" />
+ <element signature="e#54712#55664#0#PHP" expanded="false" />
+ <element signature="e#55688#56261#0#PHP" expanded="false" />
+ <element signature="e#56267#56866#0#PHP" expanded="false" />
+ <element signature="e#56871#57798#0#PHP" expanded="false" />
+ <element signature="e#57804#58518#0#PHP" expanded="false" />
+ <element signature="e#58524#58951#0#PHP" expanded="false" />
+ <element signature="e#58956#59425#0#PHP" expanded="false" />
</folding>
</state>
</provider>
diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index 315ff0b..49cd274 100644
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -337,7 +337,7 @@ class User extends Api
$data = Db::name('pic')
->where($where)
->field('id,thumbnail,title')
- ->order('id desc')
+ ->order('is_top desc,id desc')
->page($page,$pageNum)
->select();
foreach ($data as &$v){
@@ -350,7 +350,7 @@ class User extends Api
$data = Db::name('video')
->where($where)
->field('id,thumbnail,video,title')
- ->order('id desc')
+ ->order('is_top desc,id desc')
->page($page,$pageNum)
->select();
foreach ($data as &$v){