郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 c57835dcffad22363a535cc5ba6aecfd1b718b3f 1 个父辈 6c883442
1 个管道 的构建 通过 耗费 1 秒

修改航拍排序

内嵌 并排对比
正在显示 3 个修改的文件 包含 145 行增加 和 150 行删除
... ... @@ -5,7 +5,6 @@
</component>
<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/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -20,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="273">
<caret line="266" column="28" lean-forward="false" selection-start-line="266" selection-start-column="28" selection-end-line="266" selection-end-column="28" />
<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" />
<folding>
<element signature="e#580#1318#0#PHP" expanded="false" />
<element signature="e#1323#2986#0#PHP" expanded="false" />
... ... @@ -36,75 +35,72 @@
<element signature="e#5842#6255#0#PHP" expanded="false" />
<element signature="e#6260#6577#0#PHP" expanded="false" />
<element signature="e#6583#7682#0#PHP" expanded="false" />
<element signature="e#7687#12938#0#PHP" expanded="false" />
<element signature="e#10605#11038#0#PHP" expanded="false" />
<element signature="e#11101#11510#0#PHP" expanded="false" />
<element signature="e#11574#11844#0#PHP" expanded="false" />
<element signature="e#11854#12932#0#PHP" expanded="false" />
<element signature="e#12944#13624#0#PHP" expanded="false" />
<element signature="e#13629#14487#0#PHP" expanded="false" />
<element signature="e#14493#15282#0#PHP" expanded="false" />
<element signature="e#15287#16636#0#PHP" expanded="false" />
<element signature="e#16642#17344#0#PHP" expanded="false" />
<element signature="e#17349#18669#0#PHP" expanded="false" />
<element signature="e#18675#19251#0#PHP" expanded="false" />
<element signature="e#19256#19868#0#PHP" expanded="false" />
<element signature="e#19874#20590#0#PHP" expanded="false" />
<element signature="e#20595#25463#0#PHP" expanded="false" />
<element signature="e#25472#26402#0#PHP" expanded="false" />
<element signature="e#26407#31548#0#PHP" expanded="false" />
<element signature="e#31554#31931#0#PHP" expanded="false" />
<element signature="e#31936#32375#0#PHP" expanded="false" />
<element signature="e#32381#33202#0#PHP" expanded="false" />
<element signature="e#33207#36611#0#PHP" expanded="false" />
<element signature="e#33653#36605#0#PHP" expanded="false" />
<element signature="e#36617#37122#0#PHP" expanded="false" />
<element signature="e#37127#37378#0#PHP" expanded="false" />
<element signature="e#37384#37863#0#PHP" expanded="false" />
<element signature="e#37868#38625#0#PHP" expanded="false" />
<element signature="e#38631#39112#0#PHP" expanded="false" />
<element signature="e#39117#39887#0#PHP" expanded="false" />
<element signature="e#39893#40256#0#PHP" expanded="false" />
<element signature="e#40261#40452#0#PHP" expanded="false" />
<element signature="e#40458#40816#0#PHP" expanded="false" />
<element signature="e#40821#41012#0#PHP" expanded="false" />
<element signature="e#41018#42161#0#PHP" expanded="false" />
<element signature="e#42166#44831#0#PHP" expanded="false" />
<element signature="e#44837#45335#0#PHP" expanded="false" />
<element signature="e#45340#47086#0#PHP" expanded="false" />
<element signature="e#47092#47505#0#PHP" expanded="false" />
<element signature="e#47510#47989#0#PHP" expanded="false" />
<element signature="e#47995#48529#0#PHP" expanded="false" />
<element signature="e#48534#49919#0#PHP" expanded="false" />
<element signature="e#49925#50579#0#PHP" expanded="false" />
<element signature="e#50584#52599#0#PHP" expanded="false" />
<element signature="e#52605#53365#0#PHP" expanded="false" />
<element signature="e#53370#56079#0#PHP" expanded="false" />
<element signature="e#56105#56936#0#PHP" expanded="false" />
<element signature="e#56942#57362#0#PHP" expanded="false" />
<element signature="e#57367#57850#0#PHP" expanded="false" />
<element signature="e#57856#58662#0#PHP" expanded="false" />
<element signature="e#58667#61825#0#PHP" expanded="false" />
<element signature="e#60460#61819#0#PHP" expanded="false" />
<element signature="e#61840#63175#0#PHP" expanded="false" />
<element signature="e#61956#62358#0#PHP" expanded="false" />
<element signature="e#63191#64225#0#PHP" expanded="false" />
<element signature="e#64231#64989#0#PHP" expanded="false" />
<element signature="e#64994#68737#0#PHP" expanded="false" />
<element signature="e#68743#69135#0#PHP" expanded="false" />
<element signature="e#69140#70092#0#PHP" expanded="false" />
<element signature="e#70116#70689#0#PHP" expanded="false" />
<element signature="e#70695#71294#0#PHP" expanded="false" />
<element signature="e#71299#72226#0#PHP" expanded="false" />
<element signature="e#72232#72946#0#PHP" expanded="false" />
<element signature="e#72952#73379#0#PHP" expanded="false" />
<element signature="e#73384#73853#0#PHP" expanded="false" />
<element signature="e#73860#75065#0#PHP" expanded="false" />
<element signature="e#75070#76773#0#PHP" expanded="false" />
<element signature="e#76779#77556#0#PHP" expanded="false" />
<element signature="e#77561#81499#0#PHP" expanded="false" />
<element signature="e#81505#82014#0#PHP" expanded="false" />
<element signature="e#82019#82691#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" />
</folding>
</state>
</provider>
... ... @@ -211,7 +207,7 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="7">
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="116" />
<option name="y" value="65" />
<option name="width" value="1652" />
... ... @@ -435,7 +431,7 @@
<workItem from="1585528700995" duration="1288000" />
<workItem from="1585557924309" duration="618000" />
<workItem from="1585565173117" duration="2442000" />
<workItem from="1585613706476" duration="2722000" />
<workItem from="1585613706476" duration="3746000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -504,7 +500,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="649668000" />
<option name="totallyTimeSpent" value="650692000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -516,7 +512,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<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.141258" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
... ... @@ -973,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="273">
<caret line="266" column="28" lean-forward="false" selection-start-line="266" selection-start-column="28" selection-end-line="266" selection-end-column="28" />
<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" />
<folding>
<element signature="e#580#1318#0#PHP" expanded="false" />
<element signature="e#1323#2986#0#PHP" expanded="false" />
... ... @@ -989,75 +985,72 @@
<element signature="e#5842#6255#0#PHP" expanded="false" />
<element signature="e#6260#6577#0#PHP" expanded="false" />
<element signature="e#6583#7682#0#PHP" expanded="false" />
<element signature="e#7687#12938#0#PHP" expanded="false" />
<element signature="e#10605#11038#0#PHP" expanded="false" />
<element signature="e#11101#11510#0#PHP" expanded="false" />
<element signature="e#11574#11844#0#PHP" expanded="false" />
<element signature="e#11854#12932#0#PHP" expanded="false" />
<element signature="e#12944#13624#0#PHP" expanded="false" />
<element signature="e#13629#14487#0#PHP" expanded="false" />
<element signature="e#14493#15282#0#PHP" expanded="false" />
<element signature="e#15287#16636#0#PHP" expanded="false" />
<element signature="e#16642#17344#0#PHP" expanded="false" />
<element signature="e#17349#18669#0#PHP" expanded="false" />
<element signature="e#18675#19251#0#PHP" expanded="false" />
<element signature="e#19256#19868#0#PHP" expanded="false" />
<element signature="e#19874#20590#0#PHP" expanded="false" />
<element signature="e#20595#25463#0#PHP" expanded="false" />
<element signature="e#25472#26402#0#PHP" expanded="false" />
<element signature="e#26407#31548#0#PHP" expanded="false" />
<element signature="e#31554#31931#0#PHP" expanded="false" />
<element signature="e#31936#32375#0#PHP" expanded="false" />
<element signature="e#32381#33202#0#PHP" expanded="false" />
<element signature="e#33207#36611#0#PHP" expanded="false" />
<element signature="e#33653#36605#0#PHP" expanded="false" />
<element signature="e#36617#37122#0#PHP" expanded="false" />
<element signature="e#37127#37378#0#PHP" expanded="false" />
<element signature="e#37384#37863#0#PHP" expanded="false" />
<element signature="e#37868#38625#0#PHP" expanded="false" />
<element signature="e#38631#39112#0#PHP" expanded="false" />
<element signature="e#39117#39887#0#PHP" expanded="false" />
<element signature="e#39893#40256#0#PHP" expanded="false" />
<element signature="e#40261#40452#0#PHP" expanded="false" />
<element signature="e#40458#40816#0#PHP" expanded="false" />
<element signature="e#40821#41012#0#PHP" expanded="false" />
<element signature="e#41018#42161#0#PHP" expanded="false" />
<element signature="e#42166#44831#0#PHP" expanded="false" />
<element signature="e#44837#45335#0#PHP" expanded="false" />
<element signature="e#45340#47086#0#PHP" expanded="false" />
<element signature="e#47092#47505#0#PHP" expanded="false" />
<element signature="e#47510#47989#0#PHP" expanded="false" />
<element signature="e#47995#48529#0#PHP" expanded="false" />
<element signature="e#48534#49919#0#PHP" expanded="false" />
<element signature="e#49925#50579#0#PHP" expanded="false" />
<element signature="e#50584#52599#0#PHP" expanded="false" />
<element signature="e#52605#53365#0#PHP" expanded="false" />
<element signature="e#53370#56079#0#PHP" expanded="false" />
<element signature="e#56105#56936#0#PHP" expanded="false" />
<element signature="e#56942#57362#0#PHP" expanded="false" />
<element signature="e#57367#57850#0#PHP" expanded="false" />
<element signature="e#57856#58662#0#PHP" expanded="false" />
<element signature="e#58667#61825#0#PHP" expanded="false" />
<element signature="e#60460#61819#0#PHP" expanded="false" />
<element signature="e#61840#63175#0#PHP" expanded="false" />
<element signature="e#61956#62358#0#PHP" expanded="false" />
<element signature="e#63191#64225#0#PHP" expanded="false" />
<element signature="e#64231#64989#0#PHP" expanded="false" />
<element signature="e#64994#68737#0#PHP" expanded="false" />
<element signature="e#68743#69135#0#PHP" expanded="false" />
<element signature="e#69140#70092#0#PHP" expanded="false" />
<element signature="e#70116#70689#0#PHP" expanded="false" />
<element signature="e#70695#71294#0#PHP" expanded="false" />
<element signature="e#71299#72226#0#PHP" expanded="false" />
<element signature="e#72232#72946#0#PHP" expanded="false" />
<element signature="e#72952#73379#0#PHP" expanded="false" />
<element signature="e#73384#73853#0#PHP" expanded="false" />
<element signature="e#73860#75065#0#PHP" expanded="false" />
<element signature="e#75070#76773#0#PHP" expanded="false" />
<element signature="e#76779#77556#0#PHP" expanded="false" />
<element signature="e#77561#81499#0#PHP" expanded="false" />
<element signature="e#81505#82014#0#PHP" expanded="false" />
<element signature="e#82019#82691#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" />
</folding>
</state>
</provider>
... ...
... ... @@ -300,10 +300,12 @@ class User extends Api
if($id2['type'] == 1){
$a = Db::name('video')
->where('address_ids','like','%,'.$id2['id'].',%')
->order('is_show desc')
->column('id');
}elseif ($id2['type'] == 2){
$a = Db::name('video')
->where('text_ids','like','%,'.$id2['id'].',%')
->order('is_show desc')
->column('id');
}
foreach ($a as $val){
... ... @@ -380,7 +382,7 @@ class User extends Api
}
if($param['type_id'] == 1){
$ids = Db::name('video')->where($where_shu)->where($where_address)->where($where_text)->where($where_price)->column('id');
$ids = Db::name('video')->where($where_shu)->where($where_address)->where($where_text)->where($where_price)->order('is_show desc')->column('id');
$data = Db::name('video')
->whereIn('id',$ids)
->field('id,title,thumbnail')
... ... @@ -392,7 +394,7 @@ class User extends Api
}
$this->success('success',$data);
}else{
$ids = Db::name('pic')->where($where_shu)->where($where_address)->where($where_text)->where($where_price)->column('id');
$ids = Db::name('pic')->where($where_shu)->where($where_address)->where($where_text)->where($where_price)->order('is_show desc')->column('id');
$data = Db::name('pic')
->whereIn('id',$ids)
->field('id,title,thumbnail')
... ...
... ... @@ -7679,7 +7679,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2020-03-31 09:28:44 </div>
Generated on 2020-03-31 09:45:49 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...