郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 5582cc8b63e59a1cdec5132946a81476d15e5ef0 1 个父辈 c57835dc
1 个管道 的构建 通过 耗费 1 秒

修改航拍排序

内嵌 并排对比
正在显示 3 个修改的文件 包含 135 行增加 和 137 行删除
... ... @@ -19,8 +19,8 @@
<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="483">
<caret line="388" column="39" lean-forward="false" selection-start-line="388" selection-start-column="39" selection-end-line="388" selection-end-column="39" />
<state relative-caret-position="239">
<caret line="387" column="45" lean-forward="false" selection-start-line="387" selection-start-column="45" selection-end-line="387" selection-end-column="45" />
<folding>
<element signature="e#580#1318#0#PHP" expanded="false" />
<element signature="e#1323#2986#0#PHP" expanded="false" />
... ... @@ -37,70 +37,70 @@
<element signature="e#6583#7682#0#PHP" expanded="false" />
<element signature="e#11205#11614#0#PHP" expanded="false" />
<element signature="e#11678#11948#0#PHP" expanded="false" />
<element signature="e#13094#13774#0#PHP" expanded="false" />
<element signature="e#13779#14637#0#PHP" expanded="false" />
<element signature="e#14643#15432#0#PHP" expanded="false" />
<element signature="e#15437#16786#0#PHP" expanded="false" />
<element signature="e#16792#17494#0#PHP" expanded="false" />
<element signature="e#17499#18819#0#PHP" expanded="false" />
<element signature="e#18825#19401#0#PHP" expanded="false" />
<element signature="e#19406#20018#0#PHP" expanded="false" />
<element signature="e#20024#20740#0#PHP" expanded="false" />
<element signature="e#20745#25613#0#PHP" expanded="false" />
<element signature="e#25622#26552#0#PHP" expanded="false" />
<element signature="e#26557#31698#0#PHP" expanded="false" />
<element signature="e#31704#32081#0#PHP" expanded="false" />
<element signature="e#32086#32525#0#PHP" expanded="false" />
<element signature="e#32531#33352#0#PHP" expanded="false" />
<element signature="e#33357#36761#0#PHP" expanded="false" />
<element signature="e#33803#36755#0#PHP" expanded="false" />
<element signature="e#36767#37272#0#PHP" expanded="false" />
<element signature="e#37277#37528#0#PHP" expanded="false" />
<element signature="e#37534#38013#0#PHP" expanded="false" />
<element signature="e#38018#38775#0#PHP" expanded="false" />
<element signature="e#38781#39262#0#PHP" expanded="false" />
<element signature="e#39267#40037#0#PHP" expanded="false" />
<element signature="e#40043#40406#0#PHP" expanded="false" />
<element signature="e#40411#40602#0#PHP" expanded="false" />
<element signature="e#40608#40966#0#PHP" expanded="false" />
<element signature="e#40971#41162#0#PHP" expanded="false" />
<element signature="e#41168#42311#0#PHP" expanded="false" />
<element signature="e#42316#44981#0#PHP" expanded="false" />
<element signature="e#44987#45485#0#PHP" expanded="false" />
<element signature="e#45490#47236#0#PHP" expanded="false" />
<element signature="e#47242#47655#0#PHP" expanded="false" />
<element signature="e#47660#48139#0#PHP" expanded="false" />
<element signature="e#48145#48679#0#PHP" expanded="false" />
<element signature="e#48684#50069#0#PHP" expanded="false" />
<element signature="e#50075#50729#0#PHP" expanded="false" />
<element signature="e#50734#52749#0#PHP" expanded="false" />
<element signature="e#52755#53515#0#PHP" expanded="false" />
<element signature="e#53520#56229#0#PHP" expanded="false" />
<element signature="e#56255#57086#0#PHP" expanded="false" />
<element signature="e#57092#57512#0#PHP" expanded="false" />
<element signature="e#57517#58000#0#PHP" expanded="false" />
<element signature="e#58006#58812#0#PHP" expanded="false" />
<element signature="e#58817#61975#0#PHP" expanded="false" />
<element signature="e#60610#61969#0#PHP" expanded="false" />
<element signature="e#61990#63325#0#PHP" expanded="false" />
<element signature="e#62106#62508#0#PHP" expanded="false" />
<element signature="e#63341#64375#0#PHP" expanded="false" />
<element signature="e#64381#65139#0#PHP" expanded="false" />
<element signature="e#65144#68887#0#PHP" expanded="false" />
<element signature="e#68893#69285#0#PHP" expanded="false" />
<element signature="e#69290#70242#0#PHP" expanded="false" />
<element signature="e#70266#70839#0#PHP" expanded="false" />
<element signature="e#70845#71444#0#PHP" expanded="false" />
<element signature="e#71449#72376#0#PHP" expanded="false" />
<element signature="e#72382#73096#0#PHP" expanded="false" />
<element signature="e#73102#73529#0#PHP" expanded="false" />
<element signature="e#73534#74003#0#PHP" expanded="false" />
<element signature="e#74010#75215#0#PHP" expanded="false" />
<element signature="e#75220#76923#0#PHP" expanded="false" />
<element signature="e#76929#77706#0#PHP" expanded="false" />
<element signature="e#77711#81649#0#PHP" expanded="false" />
<element signature="e#81655#82164#0#PHP" expanded="false" />
<element signature="e#82169#82841#0#PHP" expanded="false" />
<element signature="e#13014#13694#0#PHP" expanded="false" />
<element signature="e#13699#14557#0#PHP" expanded="false" />
<element signature="e#14563#15352#0#PHP" expanded="false" />
<element signature="e#15357#16706#0#PHP" expanded="false" />
<element signature="e#16712#17414#0#PHP" expanded="false" />
<element signature="e#17419#18739#0#PHP" expanded="false" />
<element signature="e#18745#19321#0#PHP" expanded="false" />
<element signature="e#19326#19938#0#PHP" expanded="false" />
<element signature="e#19944#20660#0#PHP" expanded="false" />
<element signature="e#20665#25533#0#PHP" expanded="false" />
<element signature="e#25542#26472#0#PHP" expanded="false" />
<element signature="e#26477#31618#0#PHP" expanded="false" />
<element signature="e#31624#32001#0#PHP" expanded="false" />
<element signature="e#32006#32445#0#PHP" expanded="false" />
<element signature="e#32451#33272#0#PHP" expanded="false" />
<element signature="e#33277#36681#0#PHP" expanded="false" />
<element signature="e#33723#36675#0#PHP" expanded="false" />
<element signature="e#36687#37192#0#PHP" expanded="false" />
<element signature="e#37197#37448#0#PHP" expanded="false" />
<element signature="e#37454#37933#0#PHP" expanded="false" />
<element signature="e#37938#38695#0#PHP" expanded="false" />
<element signature="e#38701#39182#0#PHP" expanded="false" />
<element signature="e#39187#39957#0#PHP" expanded="false" />
<element signature="e#39963#40326#0#PHP" expanded="false" />
<element signature="e#40331#40522#0#PHP" expanded="false" />
<element signature="e#40528#40886#0#PHP" expanded="false" />
<element signature="e#40891#41082#0#PHP" expanded="false" />
<element signature="e#41088#42231#0#PHP" expanded="false" />
<element signature="e#42236#44901#0#PHP" expanded="false" />
<element signature="e#44907#45405#0#PHP" expanded="false" />
<element signature="e#45410#47156#0#PHP" expanded="false" />
<element signature="e#47162#47575#0#PHP" expanded="false" />
<element signature="e#47580#48059#0#PHP" expanded="false" />
<element signature="e#48065#48599#0#PHP" expanded="false" />
<element signature="e#48604#49989#0#PHP" expanded="false" />
<element signature="e#49995#50649#0#PHP" expanded="false" />
<element signature="e#50654#52669#0#PHP" expanded="false" />
<element signature="e#52675#53435#0#PHP" expanded="false" />
<element signature="e#53440#56149#0#PHP" expanded="false" />
<element signature="e#56175#57006#0#PHP" expanded="false" />
<element signature="e#57012#57432#0#PHP" expanded="false" />
<element signature="e#57437#57920#0#PHP" expanded="false" />
<element signature="e#57926#58732#0#PHP" expanded="false" />
<element signature="e#58737#61895#0#PHP" expanded="false" />
<element signature="e#60530#61889#0#PHP" expanded="false" />
<element signature="e#61910#63245#0#PHP" expanded="false" />
<element signature="e#62026#62428#0#PHP" expanded="false" />
<element signature="e#63261#64295#0#PHP" expanded="false" />
<element signature="e#64301#65059#0#PHP" expanded="false" />
<element signature="e#65064#68807#0#PHP" expanded="false" />
<element signature="e#68813#69205#0#PHP" expanded="false" />
<element signature="e#69210#70162#0#PHP" expanded="false" />
<element signature="e#70186#70759#0#PHP" expanded="false" />
<element signature="e#70765#71364#0#PHP" expanded="false" />
<element signature="e#71369#72296#0#PHP" expanded="false" />
<element signature="e#72302#73016#0#PHP" expanded="false" />
<element signature="e#73022#73449#0#PHP" expanded="false" />
<element signature="e#73454#73923#0#PHP" expanded="false" />
<element signature="e#73930#75135#0#PHP" expanded="false" />
<element signature="e#75140#76843#0#PHP" expanded="false" />
<element signature="e#76849#77626#0#PHP" expanded="false" />
<element signature="e#77631#81569#0#PHP" expanded="false" />
<element signature="e#81575#82084#0#PHP" expanded="false" />
<element signature="e#82089#82761#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -431,7 +431,7 @@
<workItem from="1585528700995" duration="1288000" />
<workItem from="1585557924309" duration="618000" />
<workItem from="1585565173117" duration="2442000" />
<workItem from="1585613706476" duration="3746000" />
<workItem from="1585613706476" duration="4556000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -500,7 +500,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="650692000" />
<option name="totallyTimeSpent" value="651502000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -969,8 +969,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="483">
<caret line="388" column="39" lean-forward="false" selection-start-line="388" selection-start-column="39" selection-end-line="388" selection-end-column="39" />
<state relative-caret-position="239">
<caret line="387" column="45" lean-forward="false" selection-start-line="387" selection-start-column="45" selection-end-line="387" selection-end-column="45" />
<folding>
<element signature="e#580#1318#0#PHP" expanded="false" />
<element signature="e#1323#2986#0#PHP" expanded="false" />
... ... @@ -987,70 +987,70 @@
<element signature="e#6583#7682#0#PHP" expanded="false" />
<element signature="e#11205#11614#0#PHP" expanded="false" />
<element signature="e#11678#11948#0#PHP" expanded="false" />
<element signature="e#13094#13774#0#PHP" expanded="false" />
<element signature="e#13779#14637#0#PHP" expanded="false" />
<element signature="e#14643#15432#0#PHP" expanded="false" />
<element signature="e#15437#16786#0#PHP" expanded="false" />
<element signature="e#16792#17494#0#PHP" expanded="false" />
<element signature="e#17499#18819#0#PHP" expanded="false" />
<element signature="e#18825#19401#0#PHP" expanded="false" />
<element signature="e#19406#20018#0#PHP" expanded="false" />
<element signature="e#20024#20740#0#PHP" expanded="false" />
<element signature="e#20745#25613#0#PHP" expanded="false" />
<element signature="e#25622#26552#0#PHP" expanded="false" />
<element signature="e#26557#31698#0#PHP" expanded="false" />
<element signature="e#31704#32081#0#PHP" expanded="false" />
<element signature="e#32086#32525#0#PHP" expanded="false" />
<element signature="e#32531#33352#0#PHP" expanded="false" />
<element signature="e#33357#36761#0#PHP" expanded="false" />
<element signature="e#33803#36755#0#PHP" expanded="false" />
<element signature="e#36767#37272#0#PHP" expanded="false" />
<element signature="e#37277#37528#0#PHP" expanded="false" />
<element signature="e#37534#38013#0#PHP" expanded="false" />
<element signature="e#38018#38775#0#PHP" expanded="false" />
<element signature="e#38781#39262#0#PHP" expanded="false" />
<element signature="e#39267#40037#0#PHP" expanded="false" />
<element signature="e#40043#40406#0#PHP" expanded="false" />
<element signature="e#40411#40602#0#PHP" expanded="false" />
<element signature="e#40608#40966#0#PHP" expanded="false" />
<element signature="e#40971#41162#0#PHP" expanded="false" />
<element signature="e#41168#42311#0#PHP" expanded="false" />
<element signature="e#42316#44981#0#PHP" expanded="false" />
<element signature="e#44987#45485#0#PHP" expanded="false" />
<element signature="e#45490#47236#0#PHP" expanded="false" />
<element signature="e#47242#47655#0#PHP" expanded="false" />
<element signature="e#47660#48139#0#PHP" expanded="false" />
<element signature="e#48145#48679#0#PHP" expanded="false" />
<element signature="e#48684#50069#0#PHP" expanded="false" />
<element signature="e#50075#50729#0#PHP" expanded="false" />
<element signature="e#50734#52749#0#PHP" expanded="false" />
<element signature="e#52755#53515#0#PHP" expanded="false" />
<element signature="e#53520#56229#0#PHP" expanded="false" />
<element signature="e#56255#57086#0#PHP" expanded="false" />
<element signature="e#57092#57512#0#PHP" expanded="false" />
<element signature="e#57517#58000#0#PHP" expanded="false" />
<element signature="e#58006#58812#0#PHP" expanded="false" />
<element signature="e#58817#61975#0#PHP" expanded="false" />
<element signature="e#60610#61969#0#PHP" expanded="false" />
<element signature="e#61990#63325#0#PHP" expanded="false" />
<element signature="e#62106#62508#0#PHP" expanded="false" />
<element signature="e#63341#64375#0#PHP" expanded="false" />
<element signature="e#64381#65139#0#PHP" expanded="false" />
<element signature="e#65144#68887#0#PHP" expanded="false" />
<element signature="e#68893#69285#0#PHP" expanded="false" />
<element signature="e#69290#70242#0#PHP" expanded="false" />
<element signature="e#70266#70839#0#PHP" expanded="false" />
<element signature="e#70845#71444#0#PHP" expanded="false" />
<element signature="e#71449#72376#0#PHP" expanded="false" />
<element signature="e#72382#73096#0#PHP" expanded="false" />
<element signature="e#73102#73529#0#PHP" expanded="false" />
<element signature="e#73534#74003#0#PHP" expanded="false" />
<element signature="e#74010#75215#0#PHP" expanded="false" />
<element signature="e#75220#76923#0#PHP" expanded="false" />
<element signature="e#76929#77706#0#PHP" expanded="false" />
<element signature="e#77711#81649#0#PHP" expanded="false" />
<element signature="e#81655#82164#0#PHP" expanded="false" />
<element signature="e#82169#82841#0#PHP" expanded="false" />
<element signature="e#13014#13694#0#PHP" expanded="false" />
<element signature="e#13699#14557#0#PHP" expanded="false" />
<element signature="e#14563#15352#0#PHP" expanded="false" />
<element signature="e#15357#16706#0#PHP" expanded="false" />
<element signature="e#16712#17414#0#PHP" expanded="false" />
<element signature="e#17419#18739#0#PHP" expanded="false" />
<element signature="e#18745#19321#0#PHP" expanded="false" />
<element signature="e#19326#19938#0#PHP" expanded="false" />
<element signature="e#19944#20660#0#PHP" expanded="false" />
<element signature="e#20665#25533#0#PHP" expanded="false" />
<element signature="e#25542#26472#0#PHP" expanded="false" />
<element signature="e#26477#31618#0#PHP" expanded="false" />
<element signature="e#31624#32001#0#PHP" expanded="false" />
<element signature="e#32006#32445#0#PHP" expanded="false" />
<element signature="e#32451#33272#0#PHP" expanded="false" />
<element signature="e#33277#36681#0#PHP" expanded="false" />
<element signature="e#33723#36675#0#PHP" expanded="false" />
<element signature="e#36687#37192#0#PHP" expanded="false" />
<element signature="e#37197#37448#0#PHP" expanded="false" />
<element signature="e#37454#37933#0#PHP" expanded="false" />
<element signature="e#37938#38695#0#PHP" expanded="false" />
<element signature="e#38701#39182#0#PHP" expanded="false" />
<element signature="e#39187#39957#0#PHP" expanded="false" />
<element signature="e#39963#40326#0#PHP" expanded="false" />
<element signature="e#40331#40522#0#PHP" expanded="false" />
<element signature="e#40528#40886#0#PHP" expanded="false" />
<element signature="e#40891#41082#0#PHP" expanded="false" />
<element signature="e#41088#42231#0#PHP" expanded="false" />
<element signature="e#42236#44901#0#PHP" expanded="false" />
<element signature="e#44907#45405#0#PHP" expanded="false" />
<element signature="e#45410#47156#0#PHP" expanded="false" />
<element signature="e#47162#47575#0#PHP" expanded="false" />
<element signature="e#47580#48059#0#PHP" expanded="false" />
<element signature="e#48065#48599#0#PHP" expanded="false" />
<element signature="e#48604#49989#0#PHP" expanded="false" />
<element signature="e#49995#50649#0#PHP" expanded="false" />
<element signature="e#50654#52669#0#PHP" expanded="false" />
<element signature="e#52675#53435#0#PHP" expanded="false" />
<element signature="e#53440#56149#0#PHP" expanded="false" />
<element signature="e#56175#57006#0#PHP" expanded="false" />
<element signature="e#57012#57432#0#PHP" expanded="false" />
<element signature="e#57437#57920#0#PHP" expanded="false" />
<element signature="e#57926#58732#0#PHP" expanded="false" />
<element signature="e#58737#61895#0#PHP" expanded="false" />
<element signature="e#60530#61889#0#PHP" expanded="false" />
<element signature="e#61910#63245#0#PHP" expanded="false" />
<element signature="e#62026#62428#0#PHP" expanded="false" />
<element signature="e#63261#64295#0#PHP" expanded="false" />
<element signature="e#64301#65059#0#PHP" expanded="false" />
<element signature="e#65064#68807#0#PHP" expanded="false" />
<element signature="e#68813#69205#0#PHP" expanded="false" />
<element signature="e#69210#70162#0#PHP" expanded="false" />
<element signature="e#70186#70759#0#PHP" expanded="false" />
<element signature="e#70765#71364#0#PHP" expanded="false" />
<element signature="e#71369#72296#0#PHP" expanded="false" />
<element signature="e#72302#73016#0#PHP" expanded="false" />
<element signature="e#73022#73449#0#PHP" expanded="false" />
<element signature="e#73454#73923#0#PHP" expanded="false" />
<element signature="e#73930#75135#0#PHP" expanded="false" />
<element signature="e#75140#76843#0#PHP" expanded="false" />
<element signature="e#76849#77626#0#PHP" expanded="false" />
<element signature="e#77631#81569#0#PHP" expanded="false" />
<element signature="e#81575#82084#0#PHP" expanded="false" />
<element signature="e#82089#82761#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -386,7 +386,6 @@ class User extends Api
$data = Db::name('video')
->whereIn('id',$ids)
->field('id,title,thumbnail')
->order('is_show desc')
->page($page,$pageNum)
->select();
foreach ($data as &$v){
... ... @@ -398,7 +397,6 @@ class User extends Api
$data = Db::name('pic')
->whereIn('id',$ids)
->field('id,title,thumbnail')
->order('is_show desc')
->page($page,$pageNum)
->select();
foreach ($data as &$v){
... ...
... ... @@ -7679,7 +7679,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2020-03-31 09:45:49 </div>
Generated on 2020-03-31 10:00:18 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...