diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1cab464..2449821 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,16 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/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/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/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" />
@@ -12,90 +21,121 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
- <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file leaf-file-name="User.php" pinned="false" current-in-tab="false">
+ <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="462">
- <caret line="118" column="30" lean-forward="true" selection-start-line="118" selection-start-column="30" selection-end-line="118" selection-end-column="30" />
+ <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" />
<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#4212#4619#0#PHP" expanded="false" />
- <element signature="e#4624#4967#0#PHP" expanded="false" />
- <element signature="e#4973#5810#0#PHP" expanded="false" />
- <element signature="e#5815#8010#0#PHP" expanded="false" />
- <element signature="e#8016#8661#0#PHP" expanded="false" />
- <element signature="e#8666#9762#0#PHP" expanded="false" />
- <element signature="e#9768#10557#0#PHP" expanded="false" />
- <element signature="e#10562#11886#0#PHP" expanded="false" />
- <element signature="e#11892#12594#0#PHP" expanded="false" />
- <element signature="e#12599#13799#0#PHP" expanded="false" />
- <element signature="e#13805#14381#0#PHP" expanded="false" />
- <element signature="e#14386#14933#0#PHP" expanded="false" />
- <element signature="e#14939#15623#0#PHP" expanded="false" />
- <element signature="e#15628#17724#0#PHP" expanded="false" />
- <element signature="e#17730#18600#0#PHP" expanded="false" />
- <element signature="e#18605#21101#0#PHP" expanded="false" />
- <element signature="e#21107#21484#0#PHP" expanded="false" />
- <element signature="e#21489#21810#0#PHP" expanded="false" />
- <element signature="e#21816#22321#0#PHP" expanded="false" />
- <element signature="e#22326#22577#0#PHP" expanded="false" />
- <element signature="e#22583#23062#0#PHP" expanded="false" />
- <element signature="e#23067#23824#0#PHP" expanded="false" />
- <element signature="e#23830#24311#0#PHP" expanded="false" />
- <element signature="e#24316#25086#0#PHP" expanded="false" />
- <element signature="e#25092#25455#0#PHP" expanded="false" />
- <element signature="e#25460#25651#0#PHP" expanded="false" />
- <element signature="e#25657#26015#0#PHP" expanded="false" />
- <element signature="e#26020#26211#0#PHP" expanded="false" />
- <element signature="e#26217#27360#0#PHP" expanded="false" />
- <element signature="e#27365#30030#0#PHP" expanded="false" />
- <element signature="e#30036#30534#0#PHP" expanded="false" />
- <element signature="e#30539#32285#0#PHP" expanded="false" />
- <element signature="e#32291#32704#0#PHP" expanded="false" />
- <element signature="e#32709#33188#0#PHP" expanded="false" />
- <element signature="e#33194#33728#0#PHP" expanded="false" />
- <element signature="e#33733#35118#0#PHP" expanded="false" />
- <element signature="e#35124#35778#0#PHP" expanded="false" />
- <element signature="e#35783#37798#0#PHP" expanded="false" />
- <element signature="e#36821#37283#0#PHP" expanded="false" />
- <element signature="e#37804#38564#0#PHP" expanded="false" />
- <element signature="e#38569#41278#0#PHP" expanded="false" />
- <element signature="e#41304#42135#0#PHP" expanded="false" />
- <element signature="e#42141#42561#0#PHP" expanded="false" />
- <element signature="e#42566#43049#0#PHP" expanded="false" />
- <element signature="e#43055#43861#0#PHP" expanded="false" />
- <element signature="e#43866#47020#0#PHP" expanded="false" />
- <element signature="e#47035#48363#0#PHP" expanded="false" />
- <element signature="e#48379#49406#0#PHP" expanded="false" />
- <element signature="e#49412#50170#0#PHP" expanded="false" />
- <element signature="e#50175#53918#0#PHP" expanded="false" />
- <element signature="e#53924#54316#0#PHP" expanded="false" />
- <element signature="e#54321#55273#0#PHP" expanded="false" />
- <element signature="e#55297#55870#0#PHP" expanded="false" />
- <element signature="e#55876#56475#0#PHP" expanded="false" />
- <element signature="e#56480#57407#0#PHP" expanded="false" />
- <element signature="e#57413#58127#0#PHP" expanded="false" />
- <element signature="e#58133#58560#0#PHP" expanded="false" />
- <element signature="e#58565#59034#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" />
</folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="verify.php" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/application/extra/verify.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="450">
- <caret line="18" column="45" lean-forward="true" selection-start-line="18" selection-start-column="45" selection-end-line="18" selection-end-column="45" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
</leaf>
</component>
<component name="FindInProjectRecents">
@@ -116,8 +156,6 @@
<list>
<option value="$PROJECT_DIR$/application/admin/view/video/index.html" />
<option value="$PROJECT_DIR$/application/admin/view/wonderful/index.html" />
- <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php" />
- <option value="$PROJECT_DIR$/application/admin/controller/Wonderful.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/type.js" />
<option value="$PROJECT_DIR$/application/admin/view/type/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/type/index.html" />
@@ -136,8 +174,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/view/wonderful/add.html" />
- <option value="$PROJECT_DIR$/application/admin/view/wonderful/edit.html" />
<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" />
@@ -145,11 +181,9 @@
<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$/public/assets/js/backend/wonderful.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" />
- <option value="$PROJECT_DIR$/public/assets/js/backend/video.js" />
<option value="$PROJECT_DIR$/application/admin/model/User.php" />
<option value="$PROJECT_DIR$/application/admin/model/Order.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/order.js" />
@@ -163,8 +197,14 @@
<option value="$USER_HOME$/Desktop/1.html" />
<option value="$PROJECT_DIR$/application/nsms/nsms.php" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
- <option value="$PROJECT_DIR$/application/api/controller/User.php" />
<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$/application/api/controller/User.php" />
</list>
</option>
</component>
@@ -182,11 +222,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
- <component name="ProjectFrameBounds" extendedState="1">
- <option name="x" value="195" />
- <option name="y" value="60" />
+ <component name="ProjectFrameBounds">
+ <option name="x" value="608" />
+ <option name="y" value="63" />
<option name="width" value="1696" />
- <option name="height" value="945" />
+ <option name="height" value="948" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
@@ -203,8 +243,8 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="Scratches" />
<pane id="Scope" />
+ <pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -230,12 +270,6 @@
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
- <path>
- <item name="areial" type="b2602c69:ProjectViewProjectNode" />
- <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
- <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
- <item name="extra" type="2a2b976b:PhpTreeStructureProvider$1" />
- </path>
</expand>
<select />
</subPane>
@@ -306,7 +340,11 @@
<workItem from="1574904867625" duration="793000" />
<workItem from="1574908494078" duration="8000" />
<workItem from="1574908927190" duration="2693000" />
- <workItem from="1574917615987" duration="631000" />
+ <workItem from="1574917615987" duration="1388000" />
+ <workItem from="1574988912149" duration="1103000" />
+ <workItem from="1575337352423" duration="994000" />
+ <workItem from="1575340427887" duration="256000" />
+ <workItem from="1575420983161" duration="4929000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
@@ -319,7 +357,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="286451000" />
+ <option name="totallyTimeSpent" value="294490000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -331,17 +369,17 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="195" y="60" width="1696" height="945" extended-state="1" />
+ <frame x="608" y="63" width="1696" height="948" extended-state="0" />
<editor active="true" />
<layout>
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16687042" 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.17420538" 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.33" 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="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="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="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="true" show_stripe_button="true" weight="0.103960395" 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.103535354" sideWeight="0.5" order="2" side_tool="false" 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="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="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" />
@@ -389,101 +427,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/public/uploads/20191118/ceshi.jpg">
- <provider selected="true" editor-type-id="images">
- <state />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/public/uploads/20191118/816159a7bdf6f41ec9b48ff9e719138a.gif">
- <provider selected="true" editor-type-id="images">
- <state />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/public/uploads/20191118/654e4493c68c2061349696c949520d8e.jpg">
- <provider selected="true" editor-type-id="images">
- <state />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/public/uploads/20191118/641ab72907d3118b1ca3976e0f869f09.jpg">
- <provider selected="true" editor-type-id="images">
- <state />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/public/uploads/20191118/6c67e6b0911d47744cdffc3d1e422ee4.jpg">
- <provider selected="true" editor-type-id="images">
- <state />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/addons/qiniu/controller/Index.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-1875">
- <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>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-150">
- <caret line="9" column="43" lean-forward="true" selection-start-line="9" selection-start-column="43" selection-end-line="9" selection-end-column="43" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/application/admin/view/order/index.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="175">
- <caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/application/admin/library/traits/Backend.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="275">
- <caret line="39" column="4" lean-forward="true" selection-start-line="39" selection-start-column="4" selection-end-line="69" selection-end-column="5" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/application/admin/model/UserRule.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>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/application/admin/model/User.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="325">
- <caret line="22" column="6" lean-forward="true" selection-start-line="22" selection-start-column="6" selection-end-line="22" selection-end-column="6" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/application/admin/view/pic/index.html">
- <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>
- </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="1030">
- <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>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/application/admin/model/Order.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="654">
- <caret line="30" column="0" lean-forward="true" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/public/assets/js/backend/user/user.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="425">
- <caret line="44" column="129" lean-forward="false" selection-start-line="44" selection-start-column="60" selection-end-line="44" selection-end-column="129" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="494">
@@ -491,20 +434,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/public/assets/js/backend/order.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="400">
- <caret line="27" column="78" lean-forward="true" selection-start-line="27" selection-start-column="78" selection-end-line="27" selection-end-column="78" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="234">
- <caret line="27" column="75" lean-forward="true" selection-start-line="27" selection-start-column="75" selection-end-line="27" selection-end-column="75" />
- </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">
@@ -612,14 +541,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/application/common/controller/Api.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="225">
- <caret line="18" column="6" lean-forward="false" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="6" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Notify.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="203">
@@ -708,7 +629,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1644">
<caret line="66" column="50" lean-forward="false" selection-start-line="66" selection-start-column="50" selection-end-line="66" selection-end-column="50" />
- <folding />
</state>
</provider>
</entry>
@@ -717,7 +637,7 @@
<state relative-caret-position="381">
<caret line="362" column="61" lean-forward="false" selection-start-line="362" selection-start-column="61" selection-end-line="362" selection-end-column="61" />
<folding>
- <element signature="e#38#68#0#PHP" expanded="true" />
+ <element signature="e#38#68#0#PHP" expanded="false" />
<element signature="e#574#693#0#PHP" expanded="false" />
<element signature="e#699#1012#0#PHP" expanded="false" />
<element signature="e#1017#3093#0#PHP" expanded="false" />
@@ -750,84 +670,228 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/application/extra/verify.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="450">
+ <caret line="18" column="45" lean-forward="false" selection-start-line="18" selection-start-column="45" selection-end-line="18" selection-end-column="45" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/application/common/controller/Api.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="228">
+ <caret line="57" column="14" lean-forward="false" selection-start-line="57" selection-start-column="14" selection-end-line="57" selection-end-column="14" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/application/admin/library/traits/Backend.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="225">
+ <caret line="39" column="4" lean-forward="true" selection-start-line="39" selection-start-column="4" selection-end-line="69" selection-end-column="5" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/index.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="575">
+ <caret line="23" column="26" lean-forward="true" selection-start-line="23" selection-start-column="26" selection-end-line="23" selection-end-column="26" />
+ <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="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">
+ <caret line="7" column="27" lean-forward="false" selection-start-line="7" selection-start-column="27" selection-end-line="7" selection-end-column="27" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/public/api.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-2175">
+ <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/order.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="575">
+ <caret line="34" column="140" lean-forward="false" selection-start-line="34" selection-start-column="71" selection-end-line="34" selection-end-column="140" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">
+ <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" />
+ <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" />
+ <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" />
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/application/admin/view/pic/edit.html">
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/application/admin/view/pic/index.html">
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/application/admin/view/category/add.html">
+ <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" />
+ <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/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>
+ <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>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="462">
- <caret line="118" column="30" lean-forward="true" selection-start-line="118" selection-start-column="30" selection-end-line="118" selection-end-column="30" />
+ <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" />
<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#4212#4619#0#PHP" expanded="false" />
- <element signature="e#4624#4967#0#PHP" expanded="false" />
- <element signature="e#4973#5810#0#PHP" expanded="false" />
- <element signature="e#5815#8010#0#PHP" expanded="false" />
- <element signature="e#8016#8661#0#PHP" expanded="false" />
- <element signature="e#8666#9762#0#PHP" expanded="false" />
- <element signature="e#9768#10557#0#PHP" expanded="false" />
- <element signature="e#10562#11886#0#PHP" expanded="false" />
- <element signature="e#11892#12594#0#PHP" expanded="false" />
- <element signature="e#12599#13799#0#PHP" expanded="false" />
- <element signature="e#13805#14381#0#PHP" expanded="false" />
- <element signature="e#14386#14933#0#PHP" expanded="false" />
- <element signature="e#14939#15623#0#PHP" expanded="false" />
- <element signature="e#15628#17724#0#PHP" expanded="false" />
- <element signature="e#17730#18600#0#PHP" expanded="false" />
- <element signature="e#18605#21101#0#PHP" expanded="false" />
- <element signature="e#21107#21484#0#PHP" expanded="false" />
- <element signature="e#21489#21810#0#PHP" expanded="false" />
- <element signature="e#21816#22321#0#PHP" expanded="false" />
- <element signature="e#22326#22577#0#PHP" expanded="false" />
- <element signature="e#22583#23062#0#PHP" expanded="false" />
- <element signature="e#23067#23824#0#PHP" expanded="false" />
- <element signature="e#23830#24311#0#PHP" expanded="false" />
- <element signature="e#24316#25086#0#PHP" expanded="false" />
- <element signature="e#25092#25455#0#PHP" expanded="false" />
- <element signature="e#25460#25651#0#PHP" expanded="false" />
- <element signature="e#25657#26015#0#PHP" expanded="false" />
- <element signature="e#26020#26211#0#PHP" expanded="false" />
- <element signature="e#26217#27360#0#PHP" expanded="false" />
- <element signature="e#27365#30030#0#PHP" expanded="false" />
- <element signature="e#30036#30534#0#PHP" expanded="false" />
- <element signature="e#30539#32285#0#PHP" expanded="false" />
- <element signature="e#32291#32704#0#PHP" expanded="false" />
- <element signature="e#32709#33188#0#PHP" expanded="false" />
- <element signature="e#33194#33728#0#PHP" expanded="false" />
- <element signature="e#33733#35118#0#PHP" expanded="false" />
- <element signature="e#35124#35778#0#PHP" expanded="false" />
- <element signature="e#35783#37798#0#PHP" expanded="false" />
- <element signature="e#36821#37283#0#PHP" expanded="false" />
- <element signature="e#37804#38564#0#PHP" expanded="false" />
- <element signature="e#38569#41278#0#PHP" expanded="false" />
- <element signature="e#41304#42135#0#PHP" expanded="false" />
- <element signature="e#42141#42561#0#PHP" expanded="false" />
- <element signature="e#42566#43049#0#PHP" expanded="false" />
- <element signature="e#43055#43861#0#PHP" expanded="false" />
- <element signature="e#43866#47020#0#PHP" expanded="false" />
- <element signature="e#47035#48363#0#PHP" expanded="false" />
- <element signature="e#48379#49406#0#PHP" expanded="false" />
- <element signature="e#49412#50170#0#PHP" expanded="false" />
- <element signature="e#50175#53918#0#PHP" expanded="false" />
- <element signature="e#53924#54316#0#PHP" expanded="false" />
- <element signature="e#54321#55273#0#PHP" expanded="false" />
- <element signature="e#55297#55870#0#PHP" expanded="false" />
- <element signature="e#55876#56475#0#PHP" expanded="false" />
- <element signature="e#56480#57407#0#PHP" expanded="false" />
- <element signature="e#57413#58127#0#PHP" expanded="false" />
- <element signature="e#58133#58560#0#PHP" expanded="false" />
- <element signature="e#58565#59034#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" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/application/extra/verify.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="450">
- <caret line="18" column="45" lean-forward="true" selection-start-line="18" selection-start-column="45" selection-end-line="18" selection-end-column="45" />
- <folding />
- </state>
- </provider>
- </entry>
</component>
</project>
\ No newline at end of file
diff --git a/application/admin/controller/Wonderful.php b/application/admin/controller/Wonderful.php
index c1f29b8..f72fa69 100644
--- a/application/admin/controller/Wonderful.php
+++ b/application/admin/controller/Wonderful.php
@@ -31,6 +31,37 @@ class Wonderful extends Backend
* 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
* 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
*/
-
+
+ /**
+ * 查看
+ */
+ public function index()
+ {
+ //设置过滤方法
+ $this->request->filter(['strip_tags']);
+ if ($this->request->isAjax()) {
+ //如果发送的来源是Selectpage，则转发到Selectpage
+ if ($this->request->request('keyField')) {
+ return $this->selectpage();
+ }
+ list($where, $sort, $order, $offset, $limit) = $this->buildparams();
+ $total = $this->model
+ ->where($where)
+ ->order($sort, $order)
+ ->count();
+
+ $list = $this->model
+ ->where($where)
+ ->order($sort, $order)
+ ->limit($offset, $limit)
+ ->select();
+
+ $list = collection($list)->toArray();
+ $result = array("total" => $total, "rows" => $list);
+
+ return json($result);
+ }
+ return $this->view->fetch();
+ }
}
diff --git a/application/admin/lang/zh-cn/wonderful.php b/application/admin/lang/zh-cn/wonderful.php
index 0c590c0..ba2e4ab 100644
--- a/application/admin/lang/zh-cn/wonderful.php
+++ b/application/admin/lang/zh-cn/wonderful.php
@@ -4,7 +4,8 @@ return [
'Title' => '视频标题',
'Thumbnail' => '视频封面',
'Video' => '视频',
- 'Is_show' => '是否在首页显示',
+ 'Is_show' => '首页展示权重',
+ 'Is_top' => '是否置顶',
'Createtime' => '创建时间',
'Updatetime' => '修改时间'
];
diff --git a/application/admin/view/wonderful/add.html b/application/admin/view/wonderful/add.html
index e2d0dc5..7918d9c 100644
--- a/application/admin/view/wonderful/add.html
+++ b/application/admin/view/wonderful/add.html
@@ -1,5 +1,10 @@
<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">
@@ -34,6 +39,12 @@
<ul class="row list-inline plupload-preview" id="p-avatar"></ul>
</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">
diff --git a/application/admin/view/wonderful/edit.html b/application/admin/view/wonderful/edit.html
index 0b44f2e..7976e28 100644
--- a/application/admin/view/wonderful/edit.html
+++ b/application/admin/view/wonderful/edit.html
@@ -1,5 +1,10 @@
<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">
@@ -34,6 +39,12 @@
<ul class="row list-inline plupload-preview" id="p-avatar"></ul>
</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">
diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index 6deb181..1e122a6 100644
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -121,9 +121,15 @@ class User extends Api
->find();
$wonderful = Db::name('wonderful')
->field('id,thumbnail')
- ->order('id desc')
+ ->where('is_top',1)
+ ->order('createtime desc,id desc')
->limit('1')
- ->find();
+ ->select();
+// $res['wonderful_thumbnail'] = [];
+// foreach ($wonderful as &$v){
+// $v['thumbnail'] = $rule.$v['thumbnail'];
+// array_push($res['wonderful_thumbnail'],$v['thumbnail']);
+// }
$this->auth;
$res['video_thumbnail'] = $rule.$data['thumbnail'];
$res['pic_thumbnail'] = $rule.$pic['thumbnail'];
diff --git a/application/extra/site.php b/application/extra/site.php
index 54c33d2..5fd278b 100644
--- a/application/extra/site.php
+++ b/application/extra/site.php
@@ -1,7 +1,7 @@
<?php
return array (
- 'name' => '航拍视频',
+ 'name' => '仁甲看见SHOP',
'beian' => '',
'cdnurl' => '',
'version' => '1.0.1',
diff --git a/public/api.html b/public/api.html
index 931477f..689924e 100644
--- a/public/api.html
+++ b/public/api.html
@@ -5,8 +5,8 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
- <meta name="author" content="航拍视频">
- <title>航拍视频</title>
+ <meta name="author" content="仁甲看见SHOP">
+ <title>仁甲看见SHOP</title>
<!-- Bootstrap Core CSS -->
<link href="https://cdn.staticfile.org/twitter-bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
@@ -109,7 +109,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand" href="https://www.fastadmin.net" target="_blank">航拍视频</a>
+ <a class="navbar-brand" href="https://www.fastadmin.net" target="_blank">仁甲看见SHOP</a>
</div>
<div class="navbar-collapse collapse">
<form class="navbar-form navbar-right">
@@ -6482,7 +6482,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
- Generated on 2019-11-28 13:17:09 </div>
+ Generated on 2019-12-03 09:58:30 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
diff --git a/public/assets/js/backend/video.js b/public/assets/js/backend/video.js
index 79be6c7..3d668b0 100644
--- a/public/assets/js/backend/video.js
+++ b/public/assets/js/backend/video.js
@@ -28,7 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{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},
- {field: 'type_ids', title: __('Type_ids')},
+ {field: 'type_ids', title: __('Type_ids'),searchList:$.getJSON('video/type')},
{field: 'water_url', title: __('Water_url'),operate:false, formatter: Table.api.formatter.url},
{field: 'two_url', title: __('Two_url'),operate:false, formatter: Table.api.formatter.url},
{field: 'two_code', title: __('Two_code'),operate:false},
diff --git a/public/assets/js/backend/wonderful.js b/public/assets/js/backend/wonderful.js
index a92fe2a..5570bfb 100644
--- a/public/assets/js/backend/wonderful.js
+++ b/public/assets/js/backend/wonderful.js
@@ -20,13 +20,16 @@ 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: 'thumbnail', title: __('Thumbnail'),operate:false,formatter: Table.api.formatter.image},
+ {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: 'updatetime', title: __('Updatetime'), 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}