郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 b5d1ca3af50f94f8e61b8721b3615211efe6a6d4 1 个父辈 4dc276ae
1 个管道 的构建 失败 耗费 3 秒

修改图片跟视频的显示规则

内嵌 并排对比
正在显示 10 个修改的文件 包含 270 行增加 和 251 行删除
... ... @@ -3,15 +3,15 @@
<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/Wonderful.php" afterPath="$PROJECT_DIR$/application/admin/controller/Wonderful.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/wonderful/add.html" afterPath="$PROJECT_DIR$/application/admin/view/wonderful/add.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/wonderful/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/wonderful/edit.html" />
<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$/application/extra/site.php" afterPath="$PROJECT_DIR$/application/extra/site.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
<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" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -22,115 +22,74 @@
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="Wonderful.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Wonderful.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="244">
<caret line="46" column="25" lean-forward="false" selection-start-line="46" selection-start-column="25" selection-end-line="46" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="wonderful.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/wonderful.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="31" column="130" lean-forward="false" selection-start-line="31" selection-start-column="130" selection-end-line="31" selection-end-column="130" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="add.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="575">
<caret line="44" column="67" lean-forward="false" selection-start-line="44" selection-start-column="67" selection-end-line="44" selection-end-column="67" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="edit.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="472">
<caret line="44" column="84" lean-forward="false" selection-start-line="44" selection-start-column="84" selection-end-line="44" selection-end-column="84" />
<folding />
</state>
</provider>
</entry>
</file>
<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="133">
<caret line="89" column="5" lean-forward="true" selection-start-line="89" selection-start-column="5" selection-end-line="89" selection-end-column="5" />
<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" />
<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#4477#0#PHP" expanded="false" />
<element signature="e#4483#4890#0#PHP" expanded="false" />
<element signature="e#4895#5238#0#PHP" expanded="false" />
<element signature="e#5244#6081#0#PHP" expanded="false" />
<element signature="e#6086#8281#0#PHP" expanded="false" />
<element signature="e#8287#8932#0#PHP" expanded="false" />
<element signature="e#8937#10033#0#PHP" expanded="false" />
<element signature="e#10039#10828#0#PHP" expanded="false" />
<element signature="e#10833#12157#0#PHP" expanded="false" />
<element signature="e#12163#12865#0#PHP" expanded="false" />
<element signature="e#12870#14070#0#PHP" expanded="false" />
<element signature="e#14076#14652#0#PHP" expanded="false" />
<element signature="e#14657#15204#0#PHP" expanded="false" />
<element signature="e#15210#15894#0#PHP" expanded="false" />
<element signature="e#15899#17995#0#PHP" expanded="false" />
<element signature="e#18001#18871#0#PHP" expanded="false" />
<element signature="e#18876#21372#0#PHP" expanded="false" />
<element signature="e#21378#21755#0#PHP" expanded="false" />
<element signature="e#21760#22081#0#PHP" expanded="false" />
<element signature="e#22087#22592#0#PHP" expanded="false" />
<element signature="e#22597#22848#0#PHP" expanded="false" />
<element signature="e#22854#23333#0#PHP" expanded="false" />
<element signature="e#23338#24095#0#PHP" expanded="false" />
<element signature="e#24101#24582#0#PHP" expanded="false" />
<element signature="e#24587#25357#0#PHP" expanded="false" />
<element signature="e#25363#25726#0#PHP" expanded="false" />
<element signature="e#25731#25922#0#PHP" expanded="false" />
<element signature="e#25928#26286#0#PHP" expanded="false" />
<element signature="e#26291#26482#0#PHP" expanded="false" />
<element signature="e#26488#27631#0#PHP" expanded="false" />
<element signature="e#27636#30301#0#PHP" expanded="false" />
<element signature="e#30307#30805#0#PHP" expanded="false" />
<element signature="e#30810#32556#0#PHP" expanded="false" />
<element signature="e#32562#32975#0#PHP" expanded="false" />
<element signature="e#32980#33459#0#PHP" expanded="false" />
<element signature="e#33465#33999#0#PHP" expanded="false" />
<element signature="e#34004#35389#0#PHP" expanded="false" />
<element signature="e#35395#36049#0#PHP" expanded="false" />
<element signature="e#36054#38069#0#PHP" expanded="false" />
<element signature="e#37092#37554#0#PHP" expanded="false" />
<element signature="e#38075#38835#0#PHP" expanded="false" />
<element signature="e#38840#41549#0#PHP" expanded="false" />
<element signature="e#41575#42406#0#PHP" expanded="false" />
<element signature="e#42412#42832#0#PHP" expanded="false" />
<element signature="e#42837#43320#0#PHP" expanded="false" />
<element signature="e#43326#44132#0#PHP" expanded="false" />
<element signature="e#44137#47291#0#PHP" expanded="false" />
<element signature="e#47306#48634#0#PHP" expanded="false" />
<element signature="e#48650#49677#0#PHP" expanded="false" />
<element signature="e#49683#50441#0#PHP" expanded="false" />
<element signature="e#50446#54189#0#PHP" expanded="false" />
<element signature="e#54195#54587#0#PHP" expanded="false" />
<element signature="e#54592#55544#0#PHP" expanded="false" />
<element signature="e#55568#56141#0#PHP" expanded="false" />
<element signature="e#56147#56746#0#PHP" expanded="false" />
<element signature="e#56751#57678#0#PHP" expanded="false" />
<element signature="e#57684#58398#0#PHP" expanded="false" />
<element signature="e#58404#58831#0#PHP" expanded="false" />
<element signature="e#58836#59305#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" />
</folding>
</state>
</provider>
... ... @@ -174,13 +133,6 @@
<option value="$PROJECT_DIR$/public/assets/js/backend/user/user.js" />
<option value="$PROJECT_DIR$/application/admin/view/vip/index.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/vip.js" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />
<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/view/pic/edit.html" />
<option value="$PROJECT_DIR$/application/admin/view/pic/add.html" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
<option value="$PROJECT_DIR$/application/admin/controller/Pic.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Video.php" />
<option value="$PROJECT_DIR$/application/admin/view/order/index.html" />
... ... @@ -200,10 +152,17 @@
<option value="$PROJECT_DIR$/application/extra/verify.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Wonderful.php" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/video.js" />
<option value="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" />
<option value="$PROJECT_DIR$/application/admin/view/wonderful/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/wonderful/edit.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/video.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/lang/zh-cn/video.php" />
<option value="$PROJECT_DIR$/application/admin/view/pic/add.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" />
<option value="$PROJECT_DIR$/application/admin/view/pic/edit.html" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
</list>
</option>
... ... @@ -222,11 +181,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="608" />
<option name="y" value="63" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="165" />
<option name="y" value="86" />
<option name="width" value="1696" />
<option name="height" value="948" />
<option name="height" value="970" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -344,7 +303,7 @@
<workItem from="1574988912149" duration="1103000" />
<workItem from="1575337352423" duration="994000" />
<workItem from="1575340427887" duration="256000" />
<workItem from="1575420983161" duration="4929000" />
<workItem from="1575420983161" duration="7294000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -357,7 +316,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="294490000" />
<option name="totallyTimeSpent" value="296855000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -369,7 +328,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="608" y="63" width="1696" height="948" extended-state="0" />
<frame x="165" y="86" width="1696" 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="true" show_stripe_button="true" weight="0.17420538" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
... ... @@ -427,27 +386,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="494">
<caret line="60" column="12" lean-forward="false" selection-start-line="60" selection-start-column="12" selection-end-line="63" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/order.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="6" column="34" lean-forward="true" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" />
</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="637">
<caret line="99" column="0" lean-forward="true" selection-start-line="99" selection-start-column="0" selection-end-line="99" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/Index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-17250">
... ... @@ -701,14 +639,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Wonderful.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="244">
<caret line="46" column="25" lean-forward="false" selection-start-line="46" selection-start-column="25" selection-end-line="46" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
... ... @@ -733,162 +663,195 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="259">
<caret line="28" column="79" lean-forward="true" selection-start-line="28" selection-start-column="79" selection-end-line="28" selection-end-column="79" />
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">
<entry file="file://$PROJECT_DIR$/application/admin/view/category/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="25" column="41" lean-forward="true" selection-start-line="25" selection-start-column="41" selection-end-line="25" selection-end-column="41" />
<state relative-caret-position="271">
<caret line="86" column="4" lean-forward="true" selection-start-line="86" selection-start-column="4" selection-end-line="91" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/category/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
<caret line="82" column="4" lean-forward="false" selection-start-line="82" selection-start-column="4" selection-end-line="87" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Wonderful.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="211">
<caret line="18" column="28" lean-forward="true" selection-start-line="18" selection-start-column="28" selection-end-line="18" selection-end-column="28" />
<folding>
<element signature="e#697#1583#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="41" column="4" lean-forward="false" selection-start-line="41" selection-start-column="4" selection-end-line="46" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="265">
<caret line="41" column="4" lean-forward="true" selection-start-line="41" selection-start-column="4" selection-end-line="46" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/wonderful.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="31" column="130" lean-forward="false" selection-start-line="31" selection-start-column="130" selection-end-line="31" selection-end-column="130" />
<state relative-caret-position="250">
<caret line="22" column="36" lean-forward="true" selection-start-line="22" selection-start-column="36" selection-end-line="22" selection-end-column="36" />
<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="-2453">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<state relative-caret-position="251">
<caret line="119" column="4" lean-forward="true" selection-start-line="119" selection-start-column="4" selection-end-line="124" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1350">
<caret line="54" column="28" lean-forward="true" selection-start-line="54" selection-start-column="28" selection-end-line="54" selection-end-column="28" />
<state relative-caret-position="526">
<caret line="82" column="10" lean-forward="false" selection-start-line="82" selection-start-column="10" selection-end-line="82" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/edit.html">
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/video.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1103">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<state relative-caret-position="100">
<caret line="4" column="4" lean-forward="false" selection-start-line="4" selection-start-column="4" selection-end-line="5" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/index.html">
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<state relative-caret-position="125">
<caret line="5" column="28" lean-forward="false" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/category/add.html">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="271">
<caret line="86" column="4" lean-forward="true" selection-start-line="86" selection-start-column="4" selection-end-line="91" selection-end-column="10" />
<state relative-caret-position="534">
<caret line="39" column="132" lean-forward="false" selection-start-line="39" selection-start-column="132" selection-end-line="39" selection-end-column="132" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/category/edit.html">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
<caret line="82" column="4" lean-forward="false" selection-start-line="82" selection-start-column="4" selection-end-line="87" selection-end-column="10" />
<state relative-caret-position="375">
<caret line="45" column="132" lean-forward="true" selection-start-line="45" selection-start-column="24" selection-end-line="45" selection-end-column="132" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/add.html">
<entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="575">
<caret line="44" column="67" lean-forward="false" selection-start-line="44" selection-start-column="67" selection-end-line="44" selection-end-column="67" />
<state relative-caret-position="25">
<caret line="1" column="4" lean-forward="false" selection-start-line="1" selection-start-column="4" selection-end-line="6" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/edit.html">
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="472">
<caret line="44" column="84" lean-forward="false" selection-start-line="44" selection-start-column="84" selection-end-line="44" selection-end-column="84" />
<state relative-caret-position="150">
<caret line="6" column="10" lean-forward="false" selection-start-line="6" selection-start-column="10" selection-end-line="6" 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="133">
<caret line="89" column="5" lean-forward="true" selection-start-line="89" selection-start-column="5" selection-end-line="89" selection-end-column="5" />
<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" />
<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#4477#0#PHP" expanded="false" />
<element signature="e#4483#4890#0#PHP" expanded="false" />
<element signature="e#4895#5238#0#PHP" expanded="false" />
<element signature="e#5244#6081#0#PHP" expanded="false" />
<element signature="e#6086#8281#0#PHP" expanded="false" />
<element signature="e#8287#8932#0#PHP" expanded="false" />
<element signature="e#8937#10033#0#PHP" expanded="false" />
<element signature="e#10039#10828#0#PHP" expanded="false" />
<element signature="e#10833#12157#0#PHP" expanded="false" />
<element signature="e#12163#12865#0#PHP" expanded="false" />
<element signature="e#12870#14070#0#PHP" expanded="false" />
<element signature="e#14076#14652#0#PHP" expanded="false" />
<element signature="e#14657#15204#0#PHP" expanded="false" />
<element signature="e#15210#15894#0#PHP" expanded="false" />
<element signature="e#15899#17995#0#PHP" expanded="false" />
<element signature="e#18001#18871#0#PHP" expanded="false" />
<element signature="e#18876#21372#0#PHP" expanded="false" />
<element signature="e#21378#21755#0#PHP" expanded="false" />
<element signature="e#21760#22081#0#PHP" expanded="false" />
<element signature="e#22087#22592#0#PHP" expanded="false" />
<element signature="e#22597#22848#0#PHP" expanded="false" />
<element signature="e#22854#23333#0#PHP" expanded="false" />
<element signature="e#23338#24095#0#PHP" expanded="false" />
<element signature="e#24101#24582#0#PHP" expanded="false" />
<element signature="e#24587#25357#0#PHP" expanded="false" />
<element signature="e#25363#25726#0#PHP" expanded="false" />
<element signature="e#25731#25922#0#PHP" expanded="false" />
<element signature="e#25928#26286#0#PHP" expanded="false" />
<element signature="e#26291#26482#0#PHP" expanded="false" />
<element signature="e#26488#27631#0#PHP" expanded="false" />
<element signature="e#27636#30301#0#PHP" expanded="false" />
<element signature="e#30307#30805#0#PHP" expanded="false" />
<element signature="e#30810#32556#0#PHP" expanded="false" />
<element signature="e#32562#32975#0#PHP" expanded="false" />
<element signature="e#32980#33459#0#PHP" expanded="false" />
<element signature="e#33465#33999#0#PHP" expanded="false" />
<element signature="e#34004#35389#0#PHP" expanded="false" />
<element signature="e#35395#36049#0#PHP" expanded="false" />
<element signature="e#36054#38069#0#PHP" expanded="false" />
<element signature="e#37092#37554#0#PHP" expanded="false" />
<element signature="e#38075#38835#0#PHP" expanded="false" />
<element signature="e#38840#41549#0#PHP" expanded="false" />
<element signature="e#41575#42406#0#PHP" expanded="false" />
<element signature="e#42412#42832#0#PHP" expanded="false" />
<element signature="e#42837#43320#0#PHP" expanded="false" />
<element signature="e#43326#44132#0#PHP" expanded="false" />
<element signature="e#44137#47291#0#PHP" expanded="false" />
<element signature="e#47306#48634#0#PHP" expanded="false" />
<element signature="e#48650#49677#0#PHP" expanded="false" />
<element signature="e#49683#50441#0#PHP" expanded="false" />
<element signature="e#50446#54189#0#PHP" expanded="false" />
<element signature="e#54195#54587#0#PHP" expanded="false" />
<element signature="e#54592#55544#0#PHP" expanded="false" />
<element signature="e#55568#56141#0#PHP" expanded="false" />
<element signature="e#56147#56746#0#PHP" expanded="false" />
<element signature="e#56751#57678#0#PHP" expanded="false" />
<element signature="e#57684#58398#0#PHP" expanded="false" />
<element signature="e#58404#58831#0#PHP" expanded="false" />
<element signature="e#58836#59305#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" />
</folding>
</state>
</provider>
... ...
... ... @@ -2,6 +2,8 @@
return [
'Title' => '图片标题',
'Is_show' =>'权重',
'Is_top' =>'是否置顶',
'Keyword' => '关键词（多个关键词中间用逗号隔开）',
'Thumbnail' => '缩略图',
'Type_ids' => '地区标签',
... ...
... ... @@ -2,6 +2,8 @@
return [
'Title' => '视频标题',
'Is_show' =>'权重',
'Is_top' =>'是否置顶',
'Keyword' => '关键词',
'Thumbnail' => '视频封面图',
'Type_ids' => '地区标签',
... ...
<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Is_show')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-is_show" data-rule="required" class="form-control" name="row[is_show]" type="text" placeholder="请输入权重值">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
<div class="col-xs-12 col-sm-8">
... ... @@ -70,6 +75,12 @@
<textarea id="c-content" data-rule="required" class="form-control editor" rows="5" name="row[content]" cols="50"></textarea>
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Is_top')}:</label>
<div class="col-xs-12 col-sm-8">
{:build_radios('row[is_top]', ['0'=>__('否'), '1'=>__('是')])}
</div>
</div>
<div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8">
... ...
<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Is_show')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-is_show" data-rule="required" class="form-control" name="row[is_show]" type="text" value="{$row.is_show|htmlentities}" placeholder="请输入权重值">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
<div class="col-xs-12 col-sm-8">
... ... @@ -70,6 +75,12 @@
<textarea id="c-content" data-rule="required" class="form-control editor" name="row[content]" placeholder="请输入图片介绍">{$row.content}</textarea>
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Is_top')}:</label>
<div class="col-xs-12 col-sm-8">
{:build_radios('row[is_top]', ['0'=>__('否'), '1'=>__('是')], $row['is_top'])}
</div>
</div>
<div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8">
... ...
<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Is_show')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-is_show" data-rule="required" class="form-control" name="row[is_show]" type="text" placeholder="请输入权重值">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
<div class="col-xs-12 col-sm-8">
... ... @@ -112,6 +117,12 @@
<input id="c-eight_price" class="form-control" name="row[eight_price]" type="text" placeholder="请输入8k普通价格">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Is_top')}:</label>
<div class="col-xs-12 col-sm-8">
{:build_radios('row[is_top]', ['0'=>__('否'), '1'=>__('是')])}
</div>
</div>
<div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8">
... ...
<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Is_show')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-is_show" data-rule="required" class="form-control" name="row[is_show]" type="text" value="{$row.is_show|htmlentities}" placeholder="请输入权重值">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
<div class="col-xs-12 col-sm-8">
... ... @@ -112,6 +117,12 @@
<input id="c-eight_price" class="form-control" name="row[eight_price]" type="text" value="{$row.eight_price}" placeholder="请输入8k普通价格">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Is_top')}:</label>
<div class="col-xs-12 col-sm-8">
{:build_radios('row[is_top]', ['0'=>__('否'), '1'=>__('是')], $row['is_top'])}
</div>
</div>
<div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8">
... ...
... ... @@ -111,12 +111,14 @@ class User extends Api
$rule = config('verify.path');
$data = Db::name('video')
->field('id,thumbnail')
->order('id desc')
->where('id_top',1)
->order('createtime desc,id desc')
->limit('1')
->find();
$pic = Db::name('pic')
->field('id,thumbnail')
->order('id desc')
->where('id_top',1)
->order('createtime desc,id desc')
->limit('1')
->find();
$wonderful = Db::name('wonderful')
... ...
... ... @@ -20,11 +20,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
table.bootstrapTable({
url: $.fn.bootstrapTable.defaults.extend.index_url,
pk: 'id',
sortName: 'id',
sortName: 'is_show',
sortOrder:'desc',
columns: [
[
{checkbox: true},
{field: 'id', title: __('Id'),operate:false},
{field: 'is_show', title: __('Is_show'),operate:false},
{field: 'title', title: __('Title'),operate:false},
{field: 'keyword', title: __('Keyword'),operate:false},
{field: 'thumbnail', title: __('Thumbnail'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image},
... ... @@ -35,6 +37,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'price', title: __('Price'),operate:false},
{field: 'buy_num', title: __('Buy_num'),operate:false},
{field: 'click_num', title: __('Click_num'),operate:false},
{field: 'is_top', title: __('Is_top'),formatter: Table.api.formatter.label,searchList:{'0': '否', '1': '是'}},
{field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
]
... ...
... ... @@ -20,11 +20,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
table.bootstrapTable({
url: $.fn.bootstrapTable.defaults.extend.index_url,
pk: 'id',
sortName: 'id',
sortName: 'is_show',
sortOrder:'desc',
columns: [
[
{checkbox: true},
{field: 'id', title: __('Id'),operate:false},
{field: 'is_show', title: __('Is_show'),operate:false},
{field: 'title', title: __('Title'),operate:false},
{field: 'keyword', title: __('Keyword'),operate:false},
{field: 'thumbnail', title: __('Thumbnail'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image},
... ... @@ -41,6 +43,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'price', title: __('Price'),operate:false},
{field: 'four_price', title: __('Four_price'),operate:false},
{field: 'eight_price', title: __('Eight_price'),operate:false},
{field: 'is_top', title: __('Is_top'),formatter: Table.api.formatter.label,searchList:{'0': '否', '1': '是'}},
{field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
]
... ...