郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 726077ebc47e1b55c2d2963681996c34938c9d2a 1 个父辈 c7a78cd8
1 个管道 的构建 失败 耗费 11 秒

修改点选，取消富文本

内嵌 并排对比
正在显示 15 个修改的文件 包含 421 行增加 和 254 行删除
... ... @@ -6,12 +6,10 @@
<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/lang/zh-cn/video.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/Video.php" afterPath="$PROJECT_DIR$/application/admin/controller/Video.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/video/add.html" afterPath="$PROJECT_DIR$/application/admin/view/video/add.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/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$/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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -21,54 +19,7 @@
<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="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="131">
<caret line="118" column="0" lean-forward="true" selection-start-line="118" selection-start-column="0" selection-end-line="118" selection-end-column="0" />
<folding>
<element signature="e#514#1252#0#PHP" expanded="false" />
<element signature="e#1257#2920#0#PHP" expanded="false" />
<element signature="e#2926#3288#0#PHP" expanded="false" />
<element signature="e#3293#3583#0#PHP" expanded="false" />
<element signature="e#3589#3911#0#PHP" expanded="false" />
<element signature="e#3916#4203#0#PHP" expanded="false" />
<element signature="e#4210#4644#0#PHP" expanded="false" />
<element signature="e#4649#5007#0#PHP" expanded="false" />
<element signature="e#5013#5420#0#PHP" expanded="false" />
<element signature="e#5425#5768#0#PHP" expanded="false" />
<element signature="e#5774#6187#0#PHP" expanded="false" />
<element signature="e#6192#6509#0#PHP" expanded="false" />
<element signature="e#6515#7352#0#PHP" expanded="false" />
<element signature="e#7357#9552#0#PHP" expanded="false" />
<element signature="e#9558#10238#0#PHP" expanded="false" />
<element signature="e#10243#11156#0#PHP" expanded="false" />
<element signature="e#11162#11951#0#PHP" expanded="false" />
<element signature="e#11956#13305#0#PHP" expanded="false" />
<element signature="e#13311#14013#0#PHP" expanded="false" />
<element signature="e#14018#15338#0#PHP" expanded="false" />
<element signature="e#15344#15920#0#PHP" expanded="false" />
<element signature="e#15925#16537#0#PHP" expanded="false" />
<element signature="e#16543#17259#0#PHP" expanded="false" />
<element signature="e#17264#19804#0#PHP" expanded="false" />
<element signature="e#19810#20712#0#PHP" expanded="false" />
<element signature="e#20717#23535#0#PHP" expanded="false" />
<element signature="e#23541#23918#0#PHP" expanded="false" />
<element signature="e#23923#24365#0#PHP" expanded="false" />
<element signature="e#24368#24377#0#PHP" expanded="false" />
<element signature="e#25137#25642#0#PHP" expanded="false" />
<element signature="e#25647#25898#0#PHP" expanded="false" />
<element signature="e#25904#26383#0#PHP" expanded="false" />
<element signature="e#26388#27145#0#PHP" expanded="false" />
<element signature="e#27151#27632#0#PHP" expanded="false" />
<element signature="e#27637#28407#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
... ... @@ -141,16 +92,16 @@
<option value="$PROJECT_DIR$/application/admin/view/words/edit.html" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/words.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Words.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Video.php" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/video.js" />
<option value="$PROJECT_DIR$/application/admin/view/video/edit.html" />
<option value="$PROJECT_DIR$/application/admin/view/video/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/share/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/share/edit.html" />
<option value="$PROJECT_DIR$/application/admin/view/share/index.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/share.js" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/admin/view/video/add.html" />
<option value="$PROJECT_DIR$/application/admin/controller/Video.php" />
<option value="$PROJECT_DIR$/application/admin/view/video/edit.html" />
</list>
</option>
</component>
... ... @@ -169,10 +120,10 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="33" />
<option name="y" value="77" />
<option name="width" value="1940" />
<option name="height" value="941" />
<option name="x" value="309" />
<option name="y" value="63" />
<option name="width" value="1513" />
<option name="height" value="961" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -196,30 +147,12 @@
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" 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" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" 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="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scratches" />
<pane id="Scope" />
<pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
... ... @@ -351,7 +284,9 @@
<workItem from="1583368540533" duration="14325000" />
<workItem from="1583392420452" duration="12446000" />
<workItem from="1583454639047" duration="19611000" />
<workItem from="1583481861278" duration="4120000" />
<workItem from="1583481861278" duration="4890000" />
<workItem from="1583540220249" duration="10194000" />
<workItem from="1583551237397" duration="4626000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -378,7 +313,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="509900000" />
<option name="totallyTimeSpent" value="525490000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -390,18 +325,18 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="33" y="77" width="1940" height="941" extended-state="1" />
<frame x="309" y="63" width="1513" height="961" extended-state="1" />
<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.1319149" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16999312" 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="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.329602" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.47139305" 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="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.47139305" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Message" 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="3" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
... ... @@ -442,18 +377,11 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<option name="time" value="28" />
<option name="time" value="29" />
</breakpoint-manager>
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/application/api/controller/Notify.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/extra/verify.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="531">
... ... @@ -617,7 +545,6 @@
<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>
... ... @@ -690,7 +617,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="4" column="6" lean-forward="false" selection-start-line="4" selection-start-column="6" selection-end-line="4" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
... ... @@ -708,34 +634,10 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="131">
<caret line="80" column="25" lean-forward="false" selection-start-line="80" selection-start-column="25" selection-end-line="80" selection-end-column="25" />
</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="200">
<caret line="31" column="102" lean-forward="false" selection-start-line="31" selection-start-column="102" selection-end-line="31" selection-end-column="102" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/video.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="11" column="30" lean-forward="false" selection-start-line="11" selection-start-column="30" selection-end-line="11" selection-end-column="30" />
<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="75">
<caret line="50" column="10" lean-forward="false" selection-start-line="50" selection-start-column="10" selection-end-line="50" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
... ... @@ -743,15 +645,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="25" column="4" lean-forward="true" selection-start-line="25" selection-start-column="4" selection-end-line="38" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207">
<caret line="50" column="10" lean-forward="false" selection-start-line="50" selection-start-column="10" selection-end-line="50" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
... ... @@ -759,7 +652,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="25" column="4" lean-forward="true" selection-start-line="25" selection-start-column="4" selection-end-line="38" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
... ... @@ -767,7 +659,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -775,7 +666,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="368">
<caret line="28" column="63" lean-forward="true" selection-start-line="28" selection-start-column="63" selection-end-line="28" selection-end-column="63" />
<folding />
</state>
</provider>
</entry>
... ... @@ -783,7 +673,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="26" column="53" lean-forward="true" selection-start-line="26" selection-start-column="53" selection-end-line="26" selection-end-column="53" />
<folding />
</state>
</provider>
</entry>
... ... @@ -791,7 +680,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="14" column="14" lean-forward="true" selection-start-line="14" selection-start-column="14" selection-end-line="14" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
... ... @@ -799,50 +687,56 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="22" column="10" lean-forward="true" selection-start-line="22" selection-start-column="10" selection-end-line="22" 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="131">
<caret line="118" column="0" lean-forward="true" selection-start-line="118" selection-start-column="0" selection-end-line="118" selection-end-column="0" />
<state relative-caret-position="225">
<caret line="273" column="54" lean-forward="true" selection-start-line="273" selection-start-column="54" selection-end-line="273" selection-end-column="54" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Share.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" />
<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="775">
<caret line="31" column="102" lean-forward="false" selection-start-line="31" selection-start-column="102" selection-end-line="31" selection-end-column="102" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-76">
<caret line="146" column="29" lean-forward="false" selection-start-line="146" selection-start-column="29" selection-end-line="146" selection-end-column="29" />
<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="693">
<caret line="167" column="10" lean-forward="true" selection-start-line="167" selection-start-column="10" selection-end-line="167" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="533">
<caret line="160" column="37" lean-forward="false" selection-start-line="160" selection-start-column="37" selection-end-line="160" selection-end-column="37" />
<folding>
<element signature="e#514#1252#0#PHP" expanded="false" />
<element signature="e#1257#2920#0#PHP" expanded="false" />
<element signature="e#2926#3288#0#PHP" expanded="false" />
<element signature="e#3293#3583#0#PHP" expanded="false" />
<element signature="e#3589#3911#0#PHP" expanded="false" />
<element signature="e#3916#4203#0#PHP" expanded="false" />
<element signature="e#4210#4644#0#PHP" expanded="false" />
<element signature="e#4649#5007#0#PHP" expanded="false" />
<element signature="e#5013#5420#0#PHP" expanded="false" />
<element signature="e#5425#5768#0#PHP" expanded="false" />
<element signature="e#5774#6187#0#PHP" expanded="false" />
<element signature="e#6192#6509#0#PHP" expanded="false" />
<element signature="e#6515#7352#0#PHP" expanded="false" />
<element signature="e#7357#9552#0#PHP" expanded="false" />
<element signature="e#9558#10238#0#PHP" expanded="false" />
<element signature="e#10243#11156#0#PHP" expanded="false" />
<element signature="e#11162#11951#0#PHP" expanded="false" />
<element signature="e#11956#13305#0#PHP" expanded="false" />
<element signature="e#13311#14013#0#PHP" expanded="false" />
<element signature="e#14018#15338#0#PHP" expanded="false" />
<element signature="e#15344#15920#0#PHP" expanded="false" />
<element signature="e#15925#16537#0#PHP" expanded="false" />
<element signature="e#16543#17259#0#PHP" expanded="false" />
<element signature="e#17264#19804#0#PHP" expanded="false" />
<element signature="e#19810#20712#0#PHP" expanded="false" />
<element signature="e#20717#23535#0#PHP" expanded="false" />
<element signature="e#23541#23918#0#PHP" expanded="false" />
<element signature="e#23923#24365#0#PHP" expanded="false" />
<element signature="e#24368#24377#0#PHP" expanded="false" />
<element signature="e#25137#25642#0#PHP" expanded="false" />
<element signature="e#25647#25898#0#PHP" expanded="false" />
<element signature="e#25904#26383#0#PHP" expanded="false" />
<element signature="e#26388#27145#0#PHP" expanded="false" />
<element signature="e#27151#27632#0#PHP" expanded="false" />
<element signature="e#27637#28407#0#PHP" expanded="false" />
<element signature="e#700#2169#0#PHP" expanded="false" />
<element signature="e#2201#5403#0#PHP" expanded="false" />
<element signature="e#5435#8735#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
({
cssIn: "D:/htdocs/areial/public/assets/css/backend.css",
out: "D:/htdocs/areial/public/assets/css/backend.min.css",
optimizeCss: "default",
optimize: "none"
})
\ No newline at end of file
... ...
<?php
namespace app\admin\controller;
use app\common\controller\Backend;
/**
* 分享首页图
*
* @icon fa fa-share
*/
class Share extends Backend
{
/**
* Share模型对象
* @var \app\admin\model\Share
*/
protected $model = null;
public function _initialize()
{
parent::_initialize();
$this->model = new \app\admin\model\Share;
}
/**
* 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
* 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
* 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
*/
}
... ...
... ... @@ -84,7 +84,17 @@ class Video extends Backend
$params = $this->request->post("row/a");
if ($params) {
$params = $this->preExcludeFields($params);
$a = $params['one'];
if(!empty($params['two'])){
$a .= ','.$params['two'];
}
if(!empty($params['four'])){
$a .= ','.$params['four'];
}
if(!empty($params['eight'])){
$a .= ','.$params['eight'];
}
$params['content'] = $a;
//如果内容关键字和地名关键字都为空
if($params['text_ids'] == '' && $params['address_ids'] == ''){
$this->error('请选择关键字标签');
... ... @@ -162,7 +172,17 @@ class Video extends Backend
}
if ($this->request->isPost()) {
$params = $this->request->post("row/a");
// print_r($params);die;
$a = $params['one'];
if(!empty($params['two'])){
$a .= ','.$params['two'];
}
if(!empty($params['four'])){
$a .= ','.$params['four'];
}
if(!empty($params['eight'])){
$a .= ','.$params['eight'];
}
$params['content'] = $a;
$params['type_ids'] =','.$params['type_ids'].',';
//如果内容关键字和地名关键字都为空
if($params['text_ids'] == '' && $params['address_ids'] == ''){
... ...
<?php
return [
'Id' => 'id',
'Thumbnail' => '分享图',
'Createtime' => '创建时间',
'Updatetime' => '修改时间'
];
... ...
<?php
namespace app\admin\model;
use think\Model;
class Share extends Model
{
// 表名
protected $name = 'share';
// 自动写入时间戳字段
protected $autoWriteTimestamp = 'int';
// 定义时间戳字段名
protected $createTime = 'createtime';
protected $updateTime = 'updatetime';
protected $deleteTime = false;
// 追加属性
protected $append = [
];
}
... ...
<?php
namespace app\admin\validate;
use think\Validate;
class Share extends Validate
{
/**
* 验证规则
*/
protected $rule = [
];
/**
* 提示消息
*/
protected $message = [
];
/**
* 验证场景
*/
protected $scene = [
'add' => [],
'edit' => [],
];
}
... ...
<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">{:__('Thumbnail')}:</label>
<div class="col-xs-12 col-sm-8">
<div class="input-group">
<input id="c-thumbnail" data-rule="required" class="form-control" size="35" name="row[thumbnail]" type="text" placeholder="请上传图片">
<div class="input-group-addon no-border no-padding">
<span><button type="button" id="plupload-thumbnail" class="btn btn-danger plupload" data-input-id="c-thumbnail" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-thumbnail"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
<span><button type="button" id="fachoose-thumbnail" class="btn btn-primary fachoose" data-input-id="c-thumbnail" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
</div>
<span class="msg-box n-right"></span>
</div>
<ul class="row list-inline plupload-preview" id="p-thumbnail"></ul>
</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">
<button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
<button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
</div>
</div>
</form>
... ...
<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">{:__('Thumbnail')}:</label>
<div class="col-xs-12 col-sm-8">
<div class="input-group">
<input id="c-image" data-rule="required" class="form-control" size="35" name="row[thumbnail]" type="text" value="{$row.thumbnail}" placeholder="请上传图片">
<div class="input-group-addon no-border no-padding">
<span><button type="button" id="plupload-image" class="btn btn-danger plupload" data-input-id="c-image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
<span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
</div>
<span class="msg-box n-right"></span>
</div>
<ul class="row list-inline plupload-preview" id="p-image"></ul>
</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">
<button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
<button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
</div>
</div>
</form>
... ...
<div class="panel panel-default panel-intro">
{:build_heading()}
<div class="panel-body">
<div id="myTabContent" class="tab-content">
<div class="tab-pane fade active in" id="one">
<div class="widget-body no-padding">
<div id="toolbar" class="toolbar">
<a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
<!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('share/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>-->
<a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('share/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
<!--<a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('share/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
<!--<a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('share/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>-->
<div class="dropdown btn-group {:$auth->check('share/multi')?'':'hide'}">
<a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
<ul class="dropdown-menu text-left" role="menu">
<li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
<li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
</ul>
</div>
</div>
<table id="table" class="table table-striped table-bordered table-hover table-nowrap"
data-operate-edit="{:$auth->check('share/edit')}"
data-operate-del="{:$auth->check('share/del')}"
width="100%">
</table>
</div>
</div>
</div>
</div>
</div>
... ...
... ... @@ -111,47 +111,53 @@
<input id="c-eight_code" class="form-control" name="row[eight_code]" type="text" placeholder="请输入8k提取码">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
<div class="col-xs-12 col-sm-8">
<textarea id="c-content" data-rule="required" class="form-control editor" name="row[content]" placeholder="请输入视频介绍"></textarea>
</div>
</div>
<!--<div class="form-group">-->
<!--<label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>-->
<!--<label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>-->
<!--<div class="col-xs-12 col-sm-8">-->
<!--<input id="c-price" class="form-control" name="row[price]" type="text" placeholder="请输入2k普通价格">-->
<!--<textarea id="c-content" data-rule="required" class="form-control editor" name="row[content]" placeholder="请输入视频介绍"></textarea>-->
<!--</div>-->
<!--</div>-->
<!--<div class="form-group">-->
<!--<label class="control-label col-xs-12 col-sm-2">{:__('Four_price')}:</label>-->
<!--<div class="col-xs-12 col-sm-8">-->
<!--<input id="c-four_price" class="form-control" name="row[four_price]" type="text" placeholder="请输入4k普通价格">-->
<!--</div>-->
<!--</div>-->
<!--<div class="form-group">-->
<!--<label class="control-label col-xs-12 col-sm-2">{:__('Eight_price')}:</label>-->
<!--<div class="col-xs-12 col-sm-8">-->
<!--<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">{:__('视频介绍')}:</label>
<div class="col-xs-12 col-sm-8">
{:build_radios('row[one]', ['比较珍贵的奇观天气精品'=>'比较珍贵的奇观天气精品', '地拍相机拍摄的高品质延时素材'=>'地拍相机拍摄的高品质延时素材','升格超级慢动作精品素材'=>'升格超级慢动作精品素材','X7无人机拍摄的高品质航拍素材'=>'X7无人机拍摄的高品质航拍素材','MAIVC 2无人机拍摄的高品质航拍延时素材'=>'MAIVC 2无人机拍摄的高品质航拍延时素材'])}
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('2K分辨率')}:</label>
<div class="col-xs-12 col-sm-8">
{:Form::checkboxs('row[two]', ['2K 分辨率 1920*1080'=>__('2K 分辨率 1920*1080'), '2K 分辨率 1920*1280'=>__('2K 分辨率 1920*1280'),'2K 分辨率 2560*1440'=>__('2K 分辨率 2560*1440')],'2K 分辨率 1920*1080',['data-rule'=>'required'])}
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('4K分辨率')}:</label>
<div class="col-xs-12 col-sm-8">
{:Form::checkboxs('row[four]', ['4K 分辨率 3840*2160'=>__('4K 分辨率 3840*2160'), '4K 分辨率 3840*2560'=>__('4K 分辨率 3840*2560'),'4K 分辨率 4096*2160'=>__('4K 分辨率 4096*2160')],'4K 分辨率 3840*2160',['data-rule'=>'required'])}
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('8K分辨率')}:</label>
<div class="col-xs-12 col-sm-8">
{:Form::checkboxs('row[eight]', ['8K 分辨率 7680*4320'=>__('8K 分辨率 7680*4320'), '6K 分辨率 6144*3456'=>__('6K 分辨率 6144*3456'),'5K 分辨率 5568*3648'=>__('5K 分辨率 5568*3648')],'8K 分辨率 7680*4320',['data-rule'=>'required'])}
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
<div class="col-xs-12 col-sm-8">
{:build_radios('row[price]', ['800'=>__('800'), '1200'=>__('1200'),'1800'=>__('1800')])}
{:Form::checkboxs('row[price]', ['800'=>__('800'), '1200'=>__('1200'),'1800'=>__('1800')], '800', ['data-rule'=>'required'])}
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Four_price')}:</label>
<div class="col-xs-12 col-sm-8">
{:build_radios('row[four_price]', ['1200'=>__('1200'), '2000'=>__('2000'),'2800'=>__('2800')])}
{:Form::checkboxs('row[four_price]', ['1200'=>__('1200'), '2000'=>__('2000'),'2800'=>__('2800')], '1200', ['data-rule'=>'required'])}
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Eight_price')}:</label>
<div class="col-xs-12 col-sm-8">
{:build_radios('row[eight_price]', ['2800'=>__('2800'), '1'=>__('3800'),'2'=>__('4800')])}
{:Form::checkboxs('row[eight_price]', ['2800'=>__('2800'), '1'=>__('3800'),'2'=>__('4800')], '2800', ['data-rule'=>'required'])}
</div>
</div>
<div class="form-group">
... ...
... ... @@ -111,12 +111,12 @@
<input id="c-eight_code" class="form-control" name="row[eight_code]" type="text" value="{$row.eight_code|htmlentities}" placeholder="请输入8k提取码">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
<div class="col-xs-12 col-sm-8">
<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">{:__('Content')}:</label>-->
<!--<div class="col-xs-12 col-sm-8">-->
<!--<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">{:__('Price')}:</label>-->
<!--<div class="col-xs-12 col-sm-8">-->
... ... @@ -135,23 +135,46 @@
<!--<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">{:__('视频介绍')}:</label>
<div class="col-xs-12 col-sm-8">
{:build_radios('row[one]', ['比较珍贵的奇观天气精品'=>'比较珍贵的奇观天气精品', '地拍相机拍摄的高品质延时素材'=>'地拍相机拍摄的高品质延时素材','升格超级慢动作精品素材'=>'升格超级慢动作精品素材','X7无人机拍摄的高品质航拍素材'=>'X7无人机拍摄的高品质航拍素材','MAIVC 2无人机拍摄的高品质航拍延时素材'=>'MAIVC 2无人机拍摄的高品质航拍延时素材'],$row['one'])}
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('2K分辨率')}:</label>
<div class="col-xs-12 col-sm-8">
{:Form::checkboxs('row[two]', ['2K 分辨率 1920*1080'=>__('2K 分辨率 1920*1080'), '2K 分辨率 1920*1280'=>__('2K 分辨率 1920*1280'),'2K 分辨率 2560*1440'=>__('2K 分辨率 2560*1440')],$row['two'])}
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('4K分辨率')}:</label>
<div class="col-xs-12 col-sm-8">
{:Form::checkboxs('row[four]', ['4K 分辨率 3840*2160'=>__('4K 分辨率 3840*2160'), '4K 分辨率 3840*2560'=>__('4K 分辨率 3840*2560'),'4K 分辨率 4096*2160'=>__('4K 分辨率 4096*2160')],$row['four'])}
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('8K分辨率')}:</label>
<div class="col-xs-12 col-sm-8">
{:Form::checkboxs('row[eight]', ['8K 分辨率 7680*4320'=>__('8K 分辨率 7680*4320'), '6K 分辨率 6144*3456'=>__('6K 分辨率 6144*3456'),'5K 分辨率 5568*3648'=>__('5K 分辨率 5568*3648')],$row['eight'])}
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
<div class="col-xs-12 col-sm-8">
{:build_radios('row[price]', ['800'=>__('800'), '1200'=>__('1200'),'1800'=>__('1800元')],$row['price'])}
{:Form::checkboxs('row[price]', ['800'=>__('800'), '1200'=>__('1200'),'1800'=>__('1800元')],$row['price'])}
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Four_price')}:</label>
<div class="col-xs-12 col-sm-8">
{:build_radios('row[four_price]', ['1200'=>__('1200元'), '2000'=>__('2000元'),'2800'=>__('2800元')],$row['four_price'])}
{:Form::checkboxs('row[four_price]', ['1200'=>__('1200元'), '2000'=>__('2000元'),'2800'=>__('2800元')],$row['four_price'])}
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Eight_price')}:</label>
<div class="col-xs-12 col-sm-8">
{:build_radios('row[eight_price]', ['1200'=>__('2800元'), '3800'=>__('3800元'),'4800'=>__('4800元')],$row['eight_price'])}
{:Form::checkboxs('row[eight_price]', ['1200'=>__('2800元'), '3800'=>__('3800元'),'4800'=>__('4800元')],$row['eight_price'])}
</div>
</div>
... ...
... ... @@ -5,6 +5,7 @@ namespace app\api\controller;
use app\common\controller\Api;
use app\common\library\Ems;
use app\common\library\Sms;
use function fast\e;
use fast\Random;
use think\Db;
use think\Validate;
... ... @@ -15,7 +16,7 @@ use fast\Http;
*/
class User extends Api
{
protected $noNeedLogin = ['login','index','type','mine','car','cover','words','share'];
protected $noNeedLogin = ['login','index','type','mine','car','cover','words','share','search'];
protected $noNeedRight = '*';
protected $uid = '';
... ... @@ -244,8 +245,11 @@ class User extends Api
* @ApiRoute (/api/user/search)
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
*
* @ApiParams (name="type_id", type="inter", required=false, description="视频/图片 （视频为1 图片为2 精美大片为3）")
* @ApiParams (name="type_id", type="inter", required=false, description="视频/图片（视频为1 图片为2）")
* @ApiParams (name="keyword", type="string", required=true, description="关键字")
* @ApiParams (name="address", type="string", required=true, description="地名关键词数组")
* @ApiParams (name="text", type="string", required=true, description="内容关键词数组")
* @ApiParams (name="price", type="string", required=true, description="价格")
* @ApiParams (name="page", type="inter", required=false, description="当前页(默认1)")
* @ApiParams (name="pageNum", type="inter", required=false, description="每页显示数据个数（默认10）")
* @ApiReturn({
... ... @@ -261,57 +265,20 @@ class User extends Api
*/
public function search()
{
$user_id = $this->uid;
// $user_id = $this->uid;
$page = $this->request->param('page',1,'intval');
$pageNum = $this->request->param('pageNum',10,'intval');
$rule = config('verify.path');
$type_id = $this->request->post('type_id');
if(empty($type_id)){
$param = $this->request->param();
if(empty($param['type_id'])){
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}
$keyword = $this->request->post('keyword');
if(!empty($keyword)){
$param['user_id'] = $user_id;
$param['title'] = $keyword;
Db::name('history')
->insert($param);
}
if(!empty($keyword)){
if($type_id == 1){
$data = Db::name('video')
->where('keyword','like',"%$keyword%")
->whereOr('title','like',"%$keyword%")
->order('id desc')
->page($page,$pageNum)
->select();
foreach ($data as &$v){
$v['thumbnail'] = $rule.$v['thumbnail'];
$v['video'] = $rule.$v['video'];
}
$this->success('SUCCESS',$data);
}elseif($type_id == 2){
$data = Db::name('pic')
->where('keyword','like',"%$keyword%")
->whereOr('title','like',"%$keyword%")
->order('id desc')
->page($page,$pageNum)
->select();
foreach ($data as &$v){
$v['thumbnail'] = $rule.$v['thumbnail'];
}
$this->success('SUCCESS',$data);
}else{
$data = Db::name('wonderful')
->where('title','like',"%$keyword%")
->order('id desc')
->page($page,$pageNum)
->select();
foreach ($data as &$v){
$v['thumbnail'] = $rule.$v['thumbnail'];
$v['video'] = $rule.$v['video'];
}
$this->success('SUCCESS',$data);
}
if(empty($param['keyword']) && empty($param['address']) && empty($param['']) && empty($price)){
$this->error(['code'=>2,'msg'=>'请输入关键字或者选择对应标签']);
}
if(!empty($keyword) && empty($address) && empty($text) && empty($price)){
}else{
$this->error(['code'=>2,'msg'=>'请输入关键字']);
}
... ...
define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
var Controller = {
index: function () {
// 初始化表格参数配置
Table.api.init({
extend: {
index_url: 'share/index' + location.search,
add_url: 'share/add',
edit_url: 'share/edit',
del_url: 'share/del',
multi_url: 'share/multi',
table: 'share',
}
});
var table = $("#table");
// 初始化表格
table.bootstrapTable({
url: $.fn.bootstrapTable.defaults.extend.index_url,
pk: 'id',
sortName: 'id',
columns: [
[
{checkbox: true},
{field: 'id', title: __('Id')},
{field: 'thumbnail', title: __('Thumbnail'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image},
// {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: function (value, row, index) {
var that = $.extend({}, this);
var table = $(that.table).clone(true);
$(table).data("operate-del", null);
that.table = table;
return Table.api.formatter.operate.call(that, value, row, index);
}}
]
]
});
// 为表格绑定事件
Table.api.bindevent(table);
},
add: function () {
Controller.api.bindevent();
},
edit: function () {
Controller.api.bindevent();
},
api: {
bindevent: function () {
Form.api.bindevent($("form[role=form]"));
}
}
};
return Controller;
});
\ No newline at end of file
... ...