郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 2430c545b514df0590376eba7fea5e7e55fa8564 1 个父辈 fd83fd7c
1 个管道 的构建 通过 耗费 11 秒

完成在详情页搜索功能

内嵌 并排对比
正在显示 4 个修改的文件 包含 323 行增加 和 332 行删除
... ... @@ -5,8 +5,9 @@
</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/admin/controller/Order.php" afterPath="$PROJECT_DIR$/application/admin/controller/Order.php" />
<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/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -17,206 +18,90 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="Order.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">
<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="505">
<caret line="45" column="0" lean-forward="true" selection-start-line="45" selection-start-column="0" selection-end-line="45" selection-end-column="0" />
<state relative-caret-position="315">
<caret line="796" column="5" lean-forward="true" selection-start-line="796" selection-start-column="5" selection-end-line="796" selection-end-column="5" />
<folding>
<element signature="e#631#922#0#PHP" expanded="false" />
<element signature="e#928#2350#0#PHP" expanded="false" />
<marker date="1583590171926" expanded="true" signature="3701:11482" ph="..." />
<marker date="1583590171926" expanded="true" signature="3719:3854" ph="..." />
<marker date="1583590171926" expanded="false" signature="3739:3805" ph="..." />
<marker date="1583590171926" expanded="false" signature="3878:3925" ph="..." />
<marker date="1583590171926" expanded="true" signature="3926:3964" ph="..." />
<marker date="1583590171926" expanded="false" signature="3988:4015" ph="..." />
<marker date="1583590171926" expanded="true" signature="4016:4171" ph="..." />
<marker date="1583590171926" expanded="false" signature="4195:4211" ph="..." />
<marker date="1583590171926" expanded="true" signature="4212:5259" ph="..." />
<marker date="1583590171926" expanded="false" signature="4238:4282" ph="..." />
<marker date="1583590171926" expanded="true" signature="4283:4361" ph="..." />
<marker date="1583590171926" expanded="false" signature="4313:4325" ph="..." />
<marker date="1583590171926" expanded="false" signature="4385:4429" ph="..." />
<marker date="1583590171926" expanded="true" signature="4430:4508" ph="..." />
<marker date="1583590171926" expanded="false" signature="4461:4473" ph="..." />
<marker date="1583590171926" expanded="false" signature="4532:4576" ph="..." />
<marker date="1583590171926" expanded="true" signature="4577:4655" ph="..." />
<marker date="1583590171926" expanded="false" signature="4608:4620" ph="..." />
<marker date="1583590171926" expanded="false" signature="4679:4723" ph="..." />
<marker date="1583590171926" expanded="true" signature="4724:4805" ph="..." />
<marker date="1583590171926" expanded="false" signature="4755:4767" ph="..." />
<marker date="1583590171926" expanded="false" signature="4829:4873" ph="..." />
<marker date="1583590171926" expanded="true" signature="4874:4959" ph="..." />
<marker date="1583590171926" expanded="false" signature="4906:4918" ph="..." />
<marker date="1583590171926" expanded="false" signature="4983:5027" ph="..." />
<marker date="1583590171926" expanded="true" signature="5028:5110" ph="..." />
<marker date="1583590171926" expanded="false" signature="5062:5074" ph="..." />
<marker date="1583590171926" expanded="false" signature="5134:5178" ph="..." />
<marker date="1583590171926" expanded="true" signature="5179:5242" ph="..." />
<marker date="1583590171926" expanded="true" signature="5284:5748" ph="..." />
<marker date="1583590171926" expanded="false" signature="5312:5378" ph="..." />
<marker date="1583590171926" expanded="false" signature="5421:5466" ph="..." />
<marker date="1583590171926" expanded="true" signature="5467:5731" ph="..." />
<marker date="1583590171926" expanded="false" signature="5468:5474" ph=" " />
<marker date="1583590171926" expanded="false" signature="5474:5480" ph=" " />
<marker date="1583590171926" expanded="false" signature="5480:5486" ph=" " />
<marker date="1583590171926" expanded="false" signature="5486:5492" ph=" " />
<marker date="1583590171926" expanded="false" signature="5524:5533" ph="..." />
<marker date="1583590171926" expanded="false" signature="5576:5585" ph="..." />
<marker date="1583590171926" expanded="false" signature="5614:5623" ph="..." />
<marker date="1583590171926" expanded="false" signature="5648:5657" ph="..." />
<marker date="1583590171926" expanded="false" signature="5772:5790" ph="..." />
<marker date="1583590171926" expanded="true" signature="5791:6108" ph="..." />
<marker date="1583590171926" expanded="false" signature="5819:5885" ph="..." />
<marker date="1583590171926" expanded="false" signature="5924:5952" ph="..." />
<marker date="1583590171926" expanded="false" signature="5954:5960" ph=" " />
<marker date="1583590171926" expanded="false" signature="5960:5966" ph=" " />
<marker date="1583590171926" expanded="false" signature="5966:5972" ph=" " />
<marker date="1583590171926" expanded="false" signature="5972:5978" ph=" " />
<marker date="1583590171926" expanded="false" signature="6031:6040" ph="..." />
<marker date="1583590171926" expanded="false" signature="6132:6150" ph="..." />
<marker date="1583590171926" expanded="true" signature="6151:6557" ph="..." />
<marker date="1583590171926" expanded="false" signature="6179:6245" ph="..." />
<marker date="1583590171926" expanded="false" signature="6286:6331" ph="..." />
<marker date="1583590171926" expanded="true" signature="6332:6540" ph="..." />
<marker date="1583590171926" expanded="false" signature="6333:6339" ph=" " />
<marker date="1583590171926" expanded="false" signature="6339:6345" ph=" " />
<marker date="1583590171926" expanded="false" signature="6345:6351" ph=" " />
<marker date="1583590171926" expanded="false" signature="6351:6357" ph=" " />
<marker date="1583590171926" expanded="false" signature="6381:6387" ph=" " />
<marker date="1583590171926" expanded="false" signature="6390:6396" ph=" " />
<marker date="1583590171926" expanded="false" signature="6398:6404" ph=" " />
<marker date="1583590171926" expanded="false" signature="6455:6464" ph="..." />
<marker date="1583590171926" expanded="false" signature="6494:6503" ph="..." />
<marker date="1583590171926" expanded="false" signature="6581:6628" ph="..." />
<marker date="1583590171926" expanded="false" signature="6630:6636" ph=" " />
<marker date="1583590171926" expanded="false" signature="6636:6642" ph=" " />
<marker date="1583590171926" expanded="false" signature="6642:6648" ph=" " />
<marker date="1583590171926" expanded="false" signature="6648:6654" ph=" " />
<marker date="1583590171926" expanded="false" signature="6709:6718" ph="..." />
<marker date="1583590171926" expanded="false" signature="6837:6884" ph="..." />
<marker date="1583590171926" expanded="false" signature="6886:6892" ph=" " />
<marker date="1583590171926" expanded="false" signature="6892:6898" ph=" " />
<marker date="1583590171926" expanded="false" signature="6898:6904" ph=" " />
<marker date="1583590171926" expanded="false" signature="6904:6910" ph=" " />
<marker date="1583590171926" expanded="false" signature="6964:6973" ph="..." />
<marker date="1583590171926" expanded="false" signature="7047:7063" ph="..." />
<marker date="1583590171926" expanded="false" signature="7115:7162" ph="..." />
<marker date="1583590171926" expanded="false" signature="7164:7170" ph=" " />
<marker date="1583590171926" expanded="false" signature="7170:7176" ph=" " />
<marker date="1583590171926" expanded="false" signature="7176:7182" ph=" " />
<marker date="1583590171926" expanded="false" signature="7182:7188" ph=" " />
<marker date="1583590171926" expanded="false" signature="7215:7241" ph="..." />
<marker date="1583590171926" expanded="false" signature="7319:7337" ph="..." />
<marker date="1583590171926" expanded="true" signature="7338:7936" ph="..." />
<marker date="1583590171926" expanded="false" signature="7366:7432" ph="..." />
<marker date="1583590171926" expanded="false" signature="7471:7518" ph="..." />
<marker date="1583590171926" expanded="false" signature="7520:7526" ph=" " />
<marker date="1583590171926" expanded="false" signature="7526:7532" ph=" " />
<marker date="1583590171926" expanded="false" signature="7532:7538" ph=" " />
<marker date="1583590171926" expanded="false" signature="7538:7544" ph=" " />
<marker date="1583590171926" expanded="false" signature="7629:7676" ph="..." />
<marker date="1583590171926" expanded="false" signature="7678:7684" ph=" " />
<marker date="1583590171926" expanded="false" signature="7684:7690" ph=" " />
<marker date="1583590171926" expanded="false" signature="7690:7696" ph=" " />
<marker date="1583590171926" expanded="false" signature="7696:7702" ph=" " />
<marker date="1583590171926" expanded="false" signature="7803:7850" ph="..." />
<marker date="1583590171926" expanded="false" signature="7852:7858" ph=" " />
<marker date="1583590171926" expanded="false" signature="7858:7864" ph=" " />
<marker date="1583590171926" expanded="false" signature="7864:7870" ph=" " />
<marker date="1583590171926" expanded="false" signature="7870:7876" ph=" " />
<marker date="1583590171926" expanded="false" signature="7960:7978" ph="..." />
<marker date="1583590171926" expanded="true" signature="7979:9624" ph="..." />
<marker date="1583590171926" expanded="false" signature="8007:8073" ph="..." />
<marker date="1583590171926" expanded="false" signature="8112:8159" ph="..." />
<marker date="1583590171926" expanded="false" signature="8161:8167" ph=" " />
<marker date="1583590171926" expanded="false" signature="8167:8173" ph=" " />
<marker date="1583590171926" expanded="false" signature="8173:8179" ph=" " />
<marker date="1583590171926" expanded="false" signature="8179:8185" ph=" " />
<marker date="1583590171926" expanded="false" signature="8309:8356" ph="..." />
<marker date="1583590171926" expanded="false" signature="8358:8364" ph=" " />
<marker date="1583590171926" expanded="false" signature="8364:8370" ph=" " />
<marker date="1583590171926" expanded="false" signature="8370:8376" ph=" " />
<marker date="1583590171926" expanded="false" signature="8376:8382" ph=" " />
<marker date="1583590171926" expanded="false" signature="8534:8581" ph="..." />
<marker date="1583590171926" expanded="false" signature="8583:8589" ph=" " />
<marker date="1583590171926" expanded="false" signature="8589:8595" ph=" " />
<marker date="1583590171926" expanded="false" signature="8595:8601" ph=" " />
<marker date="1583590171926" expanded="false" signature="8601:8607" ph=" " />
<marker date="1583590171926" expanded="false" signature="8726:8773" ph="..." />
<marker date="1583590171926" expanded="false" signature="8775:8781" ph=" " />
<marker date="1583590171926" expanded="false" signature="8781:8787" ph=" " />
<marker date="1583590171926" expanded="false" signature="8787:8793" ph=" " />
<marker date="1583590171926" expanded="false" signature="8793:8799" ph=" " />
<marker date="1583590171926" expanded="false" signature="8883:8930" ph="..." />
<marker date="1583590171926" expanded="false" signature="8932:8938" ph=" " />
<marker date="1583590171926" expanded="false" signature="8938:8944" ph=" " />
<marker date="1583590171926" expanded="false" signature="8944:8950" ph=" " />
<marker date="1583590171926" expanded="false" signature="8950:8956" ph=" " />
<marker date="1583590171926" expanded="false" signature="9016:9063" ph="..." />
<marker date="1583590171926" expanded="false" signature="9065:9071" ph=" " />
<marker date="1583590171926" expanded="false" signature="9071:9077" ph=" " />
<marker date="1583590171926" expanded="false" signature="9077:9083" ph=" " />
<marker date="1583590171926" expanded="false" signature="9083:9089" ph=" " />
<marker date="1583590171926" expanded="false" signature="9273:9320" ph="..." />
<marker date="1583590171926" expanded="false" signature="9322:9328" ph=" " />
<marker date="1583590171926" expanded="false" signature="9328:9334" ph=" " />
<marker date="1583590171926" expanded="false" signature="9334:9340" ph=" " />
<marker date="1583590171926" expanded="false" signature="9340:9346" ph=" " />
<marker date="1583590171926" expanded="false" signature="9474:9521" ph="..." />
<marker date="1583590171926" expanded="false" signature="9523:9529" ph=" " />
<marker date="1583590171926" expanded="false" signature="9529:9535" ph=" " />
<marker date="1583590171926" expanded="false" signature="9535:9541" ph=" " />
<marker date="1583590171926" expanded="false" signature="9541:9547" ph=" " />
<marker date="1583590171926" expanded="false" signature="9648:9666" ph="..." />
<marker date="1583590171926" expanded="true" signature="9667:10167" ph="..." />
<marker date="1583590171926" expanded="false" signature="9695:9761" ph="..." />
<marker date="1583590171926" expanded="false" signature="9802:9849" ph="..." />
<marker date="1583590171926" expanded="false" signature="9851:9857" ph=" " />
<marker date="1583590171926" expanded="false" signature="9857:9863" ph=" " />
<marker date="1583590171926" expanded="false" signature="9863:9869" ph=" " />
<marker date="1583590171926" expanded="false" signature="9869:9875" ph=" " />
<marker date="1583590171926" expanded="false" signature="9987:10034" ph="..." />
<marker date="1583590171926" expanded="false" signature="10036:10042" ph=" " />
<marker date="1583590171926" expanded="false" signature="10042:10048" ph=" " />
<marker date="1583590171926" expanded="false" signature="10048:10054" ph=" " />
<marker date="1583590171926" expanded="false" signature="10054:10060" ph=" " />
<marker date="1583590171926" expanded="false" signature="10191:10209" ph="..." />
<marker date="1583590171926" expanded="true" signature="10210:11210" ph="..." />
<marker date="1583590171926" expanded="false" signature="10238:10304" ph="..." />
<marker date="1583590171926" expanded="false" signature="10343:10390" ph="..." />
<marker date="1583590171926" expanded="false" signature="10392:10398" ph=" " />
<marker date="1583590171926" expanded="false" signature="10398:10404" ph=" " />
<marker date="1583590171926" expanded="false" signature="10404:10410" ph=" " />
<marker date="1583590171926" expanded="false" signature="10410:10416" ph=" " />
<marker date="1583590171926" expanded="false" signature="10482:10529" ph="..." />
<marker date="1583590171926" expanded="false" signature="10531:10537" ph=" " />
<marker date="1583590171926" expanded="false" signature="10537:10543" ph=" " />
<marker date="1583590171926" expanded="false" signature="10543:10549" ph=" " />
<marker date="1583590171926" expanded="false" signature="10549:10555" ph=" " />
<marker date="1583590171926" expanded="false" signature="10612:10659" ph="..." />
<marker date="1583590171926" expanded="false" signature="10661:10667" ph=" " />
<marker date="1583590171926" expanded="false" signature="10667:10673" ph=" " />
<marker date="1583590171926" expanded="false" signature="10673:10679" ph=" " />
<marker date="1583590171926" expanded="false" signature="10679:10685" ph=" " />
<marker date="1583590171926" expanded="false" signature="10763:10810" ph="..." />
<marker date="1583590171926" expanded="false" signature="10812:10818" ph=" " />
<marker date="1583590171926" expanded="false" signature="10818:10824" ph=" " />
<marker date="1583590171926" expanded="false" signature="10824:10830" ph=" " />
<marker date="1583590171926" expanded="false" signature="10830:10836" ph=" " />
<marker date="1583590171926" expanded="false" signature="10929:10976" ph="..." />
<marker date="1583590171926" expanded="false" signature="10978:10984" ph=" " />
<marker date="1583590171926" expanded="false" signature="10984:10990" ph=" " />
<marker date="1583590171926" expanded="false" signature="10990:10996" ph=" " />
<marker date="1583590171926" expanded="false" signature="10996:11002" ph=" " />
<marker date="1583590171926" expanded="false" signature="11076:11123" ph="..." />
<marker date="1583590171926" expanded="false" signature="11125:11131" ph=" " />
<marker date="1583590171926" expanded="false" signature="11131:11137" ph=" " />
<marker date="1583590171926" expanded="false" signature="11137:11143" ph=" " />
<marker date="1583590171926" expanded="false" signature="11143:11149" ph=" " />
<marker date="1583590171926" expanded="false" signature="11234:11314" ph="..." />
<marker date="1583590171926" expanded="false" signature="11375:11455" ph="..." />
<element signature="e#544#1282#0#PHP" expanded="false" />
<element signature="e#1287#2950#0#PHP" expanded="false" />
<element signature="e#2956#3318#0#PHP" expanded="false" />
<element signature="e#3323#3613#0#PHP" expanded="false" />
<element signature="e#3619#3941#0#PHP" expanded="false" />
<element signature="e#3946#4233#0#PHP" expanded="false" />
<element signature="e#4240#4674#0#PHP" expanded="false" />
<element signature="e#4679#5037#0#PHP" expanded="false" />
<element signature="e#5043#5450#0#PHP" expanded="false" />
<element signature="e#5455#5798#0#PHP" expanded="false" />
<element signature="e#5804#6217#0#PHP" expanded="false" />
<element signature="e#6222#6539#0#PHP" expanded="false" />
<element signature="e#6545#7633#0#PHP" expanded="false" />
<element signature="e#7638#8356#0#PHP" expanded="false" />
<element signature="e#8362#9042#0#PHP" expanded="false" />
<element signature="e#9047#9960#0#PHP" expanded="false" />
<element signature="e#9966#10755#0#PHP" expanded="false" />
<element signature="e#10760#12109#0#PHP" expanded="false" />
<element signature="e#12115#12817#0#PHP" expanded="false" />
<element signature="e#12822#14142#0#PHP" expanded="false" />
<element signature="e#14148#14724#0#PHP" expanded="false" />
<element signature="e#14729#15341#0#PHP" expanded="false" />
<element signature="e#15347#16063#0#PHP" expanded="false" />
<element signature="e#16068#18608#0#PHP" expanded="false" />
<element signature="e#18614#19544#0#PHP" expanded="false" />
<element signature="e#19549#23599#0#PHP" expanded="false" />
<element signature="e#19777#23593#0#PHP" expanded="false" />
<element signature="e#23605#23982#0#PHP" expanded="false" />
<element signature="e#23987#24429#0#PHP" expanded="false" />
<element signature="e#24435#24985#0#PHP" expanded="false" />
<element signature="e#24990#26504#0#PHP" expanded="false" />
<element signature="e#26507#26516#0#PHP" expanded="false" />
<element signature="e#27276#27781#0#PHP" expanded="false" />
<element signature="e#27786#28037#0#PHP" expanded="false" />
<element signature="e#28043#28522#0#PHP" expanded="false" />
<element signature="e#28527#29284#0#PHP" expanded="false" />
<element signature="e#29290#29771#0#PHP" expanded="false" />
<element signature="e#29776#30546#0#PHP" expanded="false" />
<element signature="e#30552#30915#0#PHP" expanded="false" />
<element signature="e#30920#31111#0#PHP" expanded="false" />
<element signature="e#31117#31475#0#PHP" expanded="false" />
<element signature="e#31480#31671#0#PHP" expanded="false" />
<element signature="e#31677#32820#0#PHP" expanded="false" />
<element signature="e#32825#35490#0#PHP" expanded="false" />
<element signature="e#35496#35994#0#PHP" expanded="false" />
<element signature="e#35999#37745#0#PHP" expanded="false" />
<element signature="e#37751#38164#0#PHP" expanded="false" />
<element signature="e#38169#38648#0#PHP" expanded="false" />
<element signature="e#38654#39188#0#PHP" expanded="false" />
<element signature="e#39193#40578#0#PHP" expanded="false" />
<element signature="e#40584#41238#0#PHP" expanded="false" />
<element signature="e#41243#43258#0#PHP" expanded="false" />
<element signature="e#43264#44024#0#PHP" expanded="false" />
<element signature="e#44029#46738#0#PHP" expanded="false" />
<element signature="e#46764#47595#0#PHP" expanded="false" />
<element signature="e#47601#48021#0#PHP" expanded="false" />
<element signature="e#48026#48509#0#PHP" expanded="false" />
<element signature="e#48515#49321#0#PHP" expanded="false" />
<element signature="e#49326#52484#0#PHP" expanded="false" />
<element signature="e#49705#52478#0#PHP" expanded="false" />
<element signature="e#52499#53834#0#PHP" expanded="false" />
<element signature="e#53850#54884#0#PHP" expanded="false" />
<element signature="e#54890#55648#0#PHP" expanded="false" />
<element signature="e#55653#59396#0#PHP" expanded="false" />
<element signature="e#59402#59794#0#PHP" expanded="false" />
<element signature="e#59799#60751#0#PHP" expanded="false" />
<element signature="e#60775#61348#0#PHP" expanded="false" />
<element signature="e#61354#61953#0#PHP" expanded="false" />
<element signature="e#61958#62885#0#PHP" expanded="false" />
<element signature="e#62891#63605#0#PHP" expanded="false" />
<element signature="e#63611#64038#0#PHP" expanded="false" />
<element signature="e#64043#64512#0#PHP" expanded="false" />
<element signature="e#64519#65724#0#PHP" expanded="false" />
<element signature="e#65729#67432#0#PHP" expanded="false" />
<element signature="e#67438#68215#0#PHP" expanded="false" />
<element signature="e#68220#72158#0#PHP" expanded="false" />
<element signature="e#72164#72673#0#PHP" expanded="false" />
<element signature="e#72678#73350#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -243,6 +128,7 @@
<find>f</find>
<find>history</find>
<find>bootstrap-table-jumpto</find>
<find>words</find>
</findStrings>
<dirStrings>
<dir>D:\htdocs\areial</dir>
... ... @@ -300,11 +186,11 @@
<option value="$PROJECT_DIR$/application/admin/view/share/edit.html" />
<option value="$PROJECT_DIR$/application/admin/view/share/index.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/share.js" />
<option value="$PROJECT_DIR$/application/admin/view/video/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/video/edit.html" />
<option value="$PROJECT_DIR$/application/admin/controller/Video.php" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Order.php" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/admin/view/video/add.html" />
</list>
</option>
</component>
... ... @@ -323,10 +209,10 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="357" />
<option name="y" value="51" />
<option name="x" value="300" />
<option name="y" value="85" />
<option name="width" value="1513" />
<option name="height" value="976" />
<option name="height" value="970" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -343,6 +229,8 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scratches" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -371,20 +259,22 @@
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="view" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="uploads" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="view" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="video" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
<pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
... ... @@ -520,6 +410,7 @@
<workItem from="1583481861278" duration="4890000" />
<workItem from="1583540220249" duration="10194000" />
<workItem from="1583551237397" duration="11815000" />
<workItem from="1583714063562" duration="15711000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -546,7 +437,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="532679000" />
<option name="totallyTimeSpent" value="548390000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -558,17 +449,17 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="357" y="51" width="1513" height="976" extended-state="1" />
<frame x="300" y="85" width="1513" height="970" extended-state="1" />
<editor active="true" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16999312" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17687543" 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" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.329602" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.47087377" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.47079858" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
... ... @@ -930,129 +821,18 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="775">
<caret line="31" column="102" lean-forward="false" selection-start-line="31" selection-start-column="102" selection-end-line="31" selection-end-column="102" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="368">
<caret line="100" column="17" lean-forward="true" selection-start-line="100" selection-start-column="17" selection-end-line="100" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="94" column="10" lean-forward="false" selection-start-line="94" selection-start-column="10" selection-end-line="94" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="363">
<caret line="184" column="12" lean-forward="false" selection-start-line="184" selection-start-column="12" selection-end-line="184" selection-end-column="12" />
<folding>
<element signature="e#700#2169#0#PHP" expanded="false" />
<element signature="e#2201#5830#0#PHP" expanded="false" />
<element signature="e#9580#9824#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="57">
<caret line="1379" column="7" lean-forward="false" selection-start-line="1379" selection-start-column="7" selection-end-line="1379" selection-end-column="7" />
<folding>
<element signature="e#544#1282#0#PHP" expanded="false" />
<element signature="e#1287#2950#0#PHP" expanded="false" />
<element signature="e#2956#3318#0#PHP" expanded="false" />
<element signature="e#3323#3613#0#PHP" expanded="false" />
<element signature="e#3619#3941#0#PHP" expanded="false" />
<element signature="e#3946#4233#0#PHP" expanded="false" />
<element signature="e#4240#4674#0#PHP" expanded="false" />
<element signature="e#4679#5037#0#PHP" expanded="false" />
<element signature="e#5043#5450#0#PHP" expanded="false" />
<element signature="e#5455#5798#0#PHP" expanded="false" />
<element signature="e#5804#6217#0#PHP" expanded="false" />
<element signature="e#6222#6539#0#PHP" expanded="false" />
<element signature="e#6545#7633#0#PHP" expanded="false" />
<element signature="e#7638#8356#0#PHP" expanded="false" />
<element signature="e#8362#9042#0#PHP" expanded="false" />
<element signature="e#9047#9960#0#PHP" expanded="false" />
<element signature="e#9966#10755#0#PHP" expanded="false" />
<element signature="e#10760#12109#0#PHP" expanded="false" />
<element signature="e#12115#12817#0#PHP" expanded="false" />
<element signature="e#12822#14142#0#PHP" expanded="false" />
<element signature="e#14148#14724#0#PHP" expanded="false" />
<element signature="e#14729#15341#0#PHP" expanded="false" />
<element signature="e#15347#16063#0#PHP" expanded="false" />
<element signature="e#16068#18608#0#PHP" expanded="false" />
<element signature="e#18614#19516#0#PHP" expanded="false" />
<element signature="e#19521#22326#0#PHP" expanded="false" />
<element signature="e#22332#22709#0#PHP" expanded="false" />
<element signature="e#22714#23156#0#PHP" expanded="false" />
<element signature="e#23159#23168#0#PHP" expanded="false" />
<element signature="e#23928#24433#0#PHP" expanded="false" />
<element signature="e#24438#24689#0#PHP" expanded="false" />
<element signature="e#24695#25174#0#PHP" expanded="false" />
<element signature="e#25179#25936#0#PHP" expanded="false" />
<element signature="e#25942#26423#0#PHP" expanded="false" />
<element signature="e#26428#27198#0#PHP" expanded="false" />
<element signature="e#27204#27567#0#PHP" expanded="false" />
<element signature="e#27572#27763#0#PHP" expanded="false" />
<element signature="e#27769#28127#0#PHP" expanded="false" />
<element signature="e#28132#28323#0#PHP" expanded="false" />
<element signature="e#28329#29472#0#PHP" expanded="false" />
<element signature="e#29477#32142#0#PHP" expanded="false" />
<element signature="e#32148#32646#0#PHP" expanded="false" />
<element signature="e#32651#34397#0#PHP" expanded="false" />
<element signature="e#34403#34816#0#PHP" expanded="false" />
<element signature="e#34821#35300#0#PHP" expanded="false" />
<element signature="e#35306#35840#0#PHP" expanded="false" />
<element signature="e#35845#37230#0#PHP" expanded="false" />
<element signature="e#37236#37890#0#PHP" expanded="false" />
<element signature="e#37895#39910#0#PHP" expanded="false" />
<element signature="e#39916#40676#0#PHP" expanded="false" />
<element signature="e#40681#43390#0#PHP" expanded="false" />
<element signature="e#43416#44247#0#PHP" expanded="false" />
<element signature="e#44253#44673#0#PHP" expanded="false" />
<element signature="e#44678#45161#0#PHP" expanded="false" />
<element signature="e#45167#45973#0#PHP" expanded="false" />
<element signature="e#45978#49136#0#PHP" expanded="false" />
<element signature="e#46357#49130#0#PHP" expanded="false" />
<element signature="e#49151#50486#0#PHP" expanded="false" />
<element signature="e#50502#51536#0#PHP" expanded="false" />
<element signature="e#51542#52300#0#PHP" expanded="false" />
<element signature="e#52305#56048#0#PHP" expanded="false" />
<element signature="e#56054#56446#0#PHP" expanded="false" />
<element signature="e#56451#57403#0#PHP" expanded="false" />
<element signature="e#57427#58000#0#PHP" expanded="false" />
<element signature="e#58006#58605#0#PHP" expanded="false" />
<element signature="e#58610#59537#0#PHP" expanded="false" />
<element signature="e#59543#60257#0#PHP" expanded="false" />
<element signature="e#60263#60690#0#PHP" expanded="false" />
<element signature="e#60695#61164#0#PHP" expanded="false" />
<element signature="e#61171#62376#0#PHP" expanded="false" />
<element signature="e#62381#64084#0#PHP" expanded="false" />
<element signature="e#64090#64867#0#PHP" expanded="false" />
<element signature="e#64872#68810#0#PHP" expanded="false" />
<element signature="e#68816#69325#0#PHP" expanded="false" />
<element signature="e#69330#70002#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="505">
<caret line="45" column="0" lean-forward="true" selection-start-line="45" selection-start-column="0" selection-end-line="45" selection-end-column="0" />
<state relative-caret-position="775">
<caret line="85" column="0" lean-forward="true" selection-start-line="85" selection-start-column="0" selection-end-line="85" selection-end-column="0" />
<folding>
<element signature="e#631#922#0#PHP" expanded="false" />
<element signature="e#928#2350#0#PHP" expanded="false" />
<element signature="e#2356#11938#0#PHP" expanded="false" />
<element signature="e#11971#14157#0#PHP" expanded="false" />
<marker date="1583590171926" expanded="true" signature="3701:11482" ph="..." />
<marker date="1583590171926" expanded="true" signature="3719:3854" ph="..." />
<marker date="1583590171926" expanded="false" signature="3739:3805" ph="..." />
... ... @@ -1249,5 +1029,120 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="513">
<caret line="184" column="0" lean-forward="true" selection-start-line="184" selection-start-column="0" selection-end-line="184" selection-end-column="0" />
<folding>
<element signature="e#700#2169#0#PHP" expanded="false" />
<element signature="e#2201#5830#0#PHP" expanded="false" />
<element signature="e#9580#9824#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="218">
<caret line="34" column="135" lean-forward="false" selection-start-line="34" selection-start-column="135" selection-end-line="34" selection-end-column="135" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1900">
<caret line="94" column="10" lean-forward="false" selection-start-line="94" selection-start-column="10" selection-end-line="94" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315">
<caret line="796" column="5" lean-forward="true" selection-start-line="796" selection-start-column="5" selection-end-line="796" selection-end-column="5" />
<folding>
<element signature="e#544#1282#0#PHP" expanded="false" />
<element signature="e#1287#2950#0#PHP" expanded="false" />
<element signature="e#2956#3318#0#PHP" expanded="false" />
<element signature="e#3323#3613#0#PHP" expanded="false" />
<element signature="e#3619#3941#0#PHP" expanded="false" />
<element signature="e#3946#4233#0#PHP" expanded="false" />
<element signature="e#4240#4674#0#PHP" expanded="false" />
<element signature="e#4679#5037#0#PHP" expanded="false" />
<element signature="e#5043#5450#0#PHP" expanded="false" />
<element signature="e#5455#5798#0#PHP" expanded="false" />
<element signature="e#5804#6217#0#PHP" expanded="false" />
<element signature="e#6222#6539#0#PHP" expanded="false" />
<element signature="e#6545#7633#0#PHP" expanded="false" />
<element signature="e#7638#8356#0#PHP" expanded="false" />
<element signature="e#8362#9042#0#PHP" expanded="false" />
<element signature="e#9047#9960#0#PHP" expanded="false" />
<element signature="e#9966#10755#0#PHP" expanded="false" />
<element signature="e#10760#12109#0#PHP" expanded="false" />
<element signature="e#12115#12817#0#PHP" expanded="false" />
<element signature="e#12822#14142#0#PHP" expanded="false" />
<element signature="e#14148#14724#0#PHP" expanded="false" />
<element signature="e#14729#15341#0#PHP" expanded="false" />
<element signature="e#15347#16063#0#PHP" expanded="false" />
<element signature="e#16068#18608#0#PHP" expanded="false" />
<element signature="e#18614#19544#0#PHP" expanded="false" />
<element signature="e#19549#23599#0#PHP" expanded="false" />
<element signature="e#19777#23593#0#PHP" expanded="false" />
<element signature="e#23605#23982#0#PHP" expanded="false" />
<element signature="e#23987#24429#0#PHP" expanded="false" />
<element signature="e#24435#24985#0#PHP" expanded="false" />
<element signature="e#24990#26504#0#PHP" expanded="false" />
<element signature="e#26507#26516#0#PHP" expanded="false" />
<element signature="e#27276#27781#0#PHP" expanded="false" />
<element signature="e#27786#28037#0#PHP" expanded="false" />
<element signature="e#28043#28522#0#PHP" expanded="false" />
<element signature="e#28527#29284#0#PHP" expanded="false" />
<element signature="e#29290#29771#0#PHP" expanded="false" />
<element signature="e#29776#30546#0#PHP" expanded="false" />
<element signature="e#30552#30915#0#PHP" expanded="false" />
<element signature="e#30920#31111#0#PHP" expanded="false" />
<element signature="e#31117#31475#0#PHP" expanded="false" />
<element signature="e#31480#31671#0#PHP" expanded="false" />
<element signature="e#31677#32820#0#PHP" expanded="false" />
<element signature="e#32825#35490#0#PHP" expanded="false" />
<element signature="e#35496#35994#0#PHP" expanded="false" />
<element signature="e#35999#37745#0#PHP" expanded="false" />
<element signature="e#37751#38164#0#PHP" expanded="false" />
<element signature="e#38169#38648#0#PHP" expanded="false" />
<element signature="e#38654#39188#0#PHP" expanded="false" />
<element signature="e#39193#40578#0#PHP" expanded="false" />
<element signature="e#40584#41238#0#PHP" expanded="false" />
<element signature="e#41243#43258#0#PHP" expanded="false" />
<element signature="e#43264#44024#0#PHP" expanded="false" />
<element signature="e#44029#46738#0#PHP" expanded="false" />
<element signature="e#46764#47595#0#PHP" expanded="false" />
<element signature="e#47601#48021#0#PHP" expanded="false" />
<element signature="e#48026#48509#0#PHP" expanded="false" />
<element signature="e#48515#49321#0#PHP" expanded="false" />
<element signature="e#49326#52484#0#PHP" expanded="false" />
<element signature="e#49705#52478#0#PHP" expanded="false" />
<element signature="e#52499#53834#0#PHP" expanded="false" />
<element signature="e#53850#54884#0#PHP" expanded="false" />
<element signature="e#54890#55648#0#PHP" expanded="false" />
<element signature="e#55653#59396#0#PHP" expanded="false" />
<element signature="e#59402#59794#0#PHP" expanded="false" />
<element signature="e#59799#60751#0#PHP" expanded="false" />
<element signature="e#60775#61348#0#PHP" expanded="false" />
<element signature="e#61354#61953#0#PHP" expanded="false" />
<element signature="e#61958#62885#0#PHP" expanded="false" />
<element signature="e#62891#63605#0#PHP" expanded="false" />
<element signature="e#63611#64038#0#PHP" expanded="false" />
<element signature="e#64043#64512#0#PHP" expanded="false" />
<element signature="e#64519#65724#0#PHP" expanded="false" />
<element signature="e#65729#67432#0#PHP" expanded="false" />
<element signature="e#67438#68215#0#PHP" expanded="false" />
<element signature="e#68220#72158#0#PHP" expanded="false" />
<element signature="e#72164#72673#0#PHP" expanded="false" />
<element signature="e#72678#73350#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -32,7 +32,7 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Keyword')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-keyword" data-rule="required" class="form-control" name="row[keyword]" type="text" placeholder="请输入视频关键词(多个用英文逗号隔开)">
<input id="c-keyword" data-rule="required" class="form-control" name="row[keyword]" type="text" placeholder="请输入视频关键词(多个用空格隔开)">
</div>
</div>
<div class="form-group">
... ...
... ... @@ -586,6 +586,7 @@ class User extends Api
"data": {
"id": 4,//视频id,
"title"://标题
"keyword"://关键字
"accredit": //授权书图片
"thumbnail": //视频封面图,
"video": //2K视频地址,
... ... @@ -615,15 +616,29 @@ class User extends Api
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}
$data = Db::name('video')
->field('id,click_num,title,thumbnail,video,price,four_price,eight_price,water_url,two_url,four_url,two_code,four_code,eight_code,eight_url,content')
->field('text_ids,address_ids,keyword,id,click_num,title,thumbnail,video,price,four_price,eight_price,water_url,two_url,four_url,two_code,four_code,eight_code,eight_url,content')
->where('id',$pic_id)
->find();
$keyword = str_replace(' ',',',$data['keyword']);
if(empty($data)){
$this->error(['code'=>2,'msg'=>'参数错误']);
}
if(empty($data['eight_price'])){
$data['eight_price'] = 0;
}
//单取出所有关键字合并数组
$text_ids = explode(',',trim($data['text_ids'],','));
$address_ids = explode(',',trim($data['address_ids'],','));
$words = array_merge($text_ids,$address_ids);
$keywords = Db::name('words')
->whereIn('id',$words)
->column('name');
$keywords = implode(',',$keywords);
$key = $keywords.','.$keyword;
$data['keyword'] = explode(',',$key);
$accredit = Db::name('accredit')
->where('id',1)
->find();
... ... @@ -643,12 +658,27 @@ class User extends Api
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}
$data = Db::name('video')
->field('id,click_num,title,thumbnail,video,price,four_price,eight_price,water_url,two_url,two_code,four_code,eight_code,four_url,eight_url,content')
->field('text_ids,address_ids,keyword,id,click_num,title,thumbnail,video,price,four_price,eight_price,water_url,two_url,two_code,four_code,eight_code,four_url,eight_url,content')
->where('id',$pic_id)
->find();
$keyword = str_replace(' ',',',$data['keyword']);
if(empty($data)){
$this->error(['code'=>2,'msg'=>'参数错误']);
}
if(empty($data['eight_price'])){
$data['eight_price'] = 0;
}
//单取出所有关键字合并数组
$text_ids = explode(',',trim($data['text_ids'],','));
$address_ids = explode(',',trim($data['address_ids'],','));
$words = array_merge($text_ids,$address_ids);
$keywords = Db::name('words')
->whereIn('id',$words)
->column('name');
$keywords = implode(',',$keywords);
$key = $keywords.','.$keyword;
$data['keyword'] = explode(',',$key);
$accredit = Db::name('accredit')
->where('id',1)
->find();
... ... @@ -700,6 +730,72 @@ class User extends Api
$this->success('success',$data);
}
/**
* @ApiTitle (通过详情页关键词搜索)
* @ApiSummary (通过详情页关键词搜索)
* @ApiMethod (POST)
* @ApiRoute (/api/user/search_key)
*
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
* @ApiParams (name="keyword", type=string, required=true, description="关键字")
*
*
* @ApiReturn({
"code": 1,
"msg": "成功",
"time": "1571492001",
"data": {
"id": //id,
"thumbnail": //视频封面,
"title"://视频标题
}
})
*/
public function search_key()
{
$user_id = $this->uid;
$rule = config('verify.path');
$keyword = $this->request->param('keyword');
if(empty($keyword)){
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}
//查出所有手动写入该关键词的素材ID
$hand_ids = Db::name('video')
->where('keyword','like',"%$keyword%")
->column('id');
//根据用户点选的关键词搜索对应的关键词表找出该关键词是否存在，如果存在找出ID，继续查素材含有该ID的素材ID
$words_id = Db::name('words')
->where('name',$keyword)
->find();
if(empty($words_id)){
$words_ids = [];
}else{
if($words_id['type'] == 1){
$address_id = ','.$words_id['id'].',';
$words_ids = Db::name('video')
->where('address_ids','like',"%$address_id%")
->column('id');
}
if($words_id['type'] == 2){
$text_id = ','.$words_id['id'].',';
$words_ids = Db::name('video')
->where('text_ids','like',"%$text_id%")
->column('id');
}
}
//合并所有查出的数组ID
$public_ids = array_merge($hand_ids,$words_ids);
$data = Db::name('video')
->whereIn('id',$public_ids)
->field('id,title,thumbnail')
->select();
foreach ($data as &$v){
$v['thumbnail'] = $rule.$v['thumbnail'];
}
$this->success('SUCCESS',$data);
}
// /**
// * @ApiTitle (历史记录)
... ...
此 diff 太大无法显示。