郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 940b714a7080797da11c3a051377d663a0c2889c 1 个父辈 183b026e
1 个管道 的构建 通过 耗费 13 秒

去除历史记录接口，增加关键字标签接口

内嵌 并排对比
正在显示 13 个修改的文件 包含 466 行增加 和 317 行删除
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="BookmarkManager">
<bookmark url="file://$PROJECT_DIR$/application/admin/view/video/add.html" line="25" />
<bookmark url="file://$PROJECT_DIR$/application/admin/view/video/add.html" line="31" />
</component>
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/assets/js/bootstrap-table-jumpto.js" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/assets/libs/bootstrap-table/dist/extensions/page-jumpto/README.md" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/assets/libs/bootstrap-table/dist/extensions/page-jumpto/bootstrap-table-jumpto.css" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/assets/libs/bootstrap-table/dist/extensions/page-jumpto/bootstrap-table-jumpto.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/css/backend.css" afterPath="$PROJECT_DIR$/public/assets/css/backend.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/require-backend.js" afterPath="$PROJECT_DIR$/public/assets/js/require-backend.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/require-table.js" afterPath="$PROJECT_DIR$/public/assets/js/require-table.js" />
<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/controller/Words.php" afterPath="$PROJECT_DIR$/application/admin/controller/Words.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/words.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/words.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/admin/view/words/add.html" afterPath="$PROJECT_DIR$/application/admin/view/words/add.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/words/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/words/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" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/words.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/words.js" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -21,67 +26,63 @@
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<component name="DockManager">
<window id="3">
<content type="file-editors">
<state>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="video.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">
<file leaf-file-name="add.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="11" column="45" lean-forward="false" selection-start-line="11" selection-start-column="45" selection-end-line="11" selection-end-column="45" />
<state relative-caret-position="75">
<caret line="158" column="28" lean-forward="false" selection-start-line="158" selection-start-column="28" selection-end-line="158" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="require-table.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/js/require-table.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-25">
<caret line="29" column="29" lean-forward="true" selection-start-line="29" selection-start-column="29" selection-end-line="29" selection-end-column="29" />
<folding>
<marker date="1583401745828" expanded="true" signature="26283:26309" ph="..." />
</folding>
</leaf>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="require-backend.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/js/require-backend.js">
</content>
</window>
</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="425">
<caret line="92" column="48" lean-forward="true" selection-start-line="92" selection-start-column="48" selection-end-line="92" selection-end-column="48" />
<state relative-caret-position="25">
<caret line="705" column="0" lean-forward="false" selection-start-line="705" selection-start-column="0" selection-end-line="705" selection-end-column="0" />
<folding>
<element signature="e#3390#3492#0" expanded="false" />
<element signature="e#3528#3645#0" expanded="false" />
<element signature="e#3681#3783#0" expanded="false" />
<element signature="e#3827#3929#0" expanded="false" />
<element signature="e#3971#4073#0" expanded="false" />
<element signature="e#4111#4225#0" expanded="false" />
<element signature="e#506#1244#0#PHP" expanded="false" />
<element signature="e#1249#2912#0#PHP" expanded="false" />
<element signature="e#2918#3280#0#PHP" expanded="false" />
<element signature="e#3285#3575#0#PHP" expanded="false" />
<element signature="e#3582#4016#0#PHP" expanded="false" />
<element signature="e#4021#4379#0#PHP" expanded="false" />
<element signature="e#4385#4792#0#PHP" expanded="false" />
<element signature="e#4797#5140#0#PHP" expanded="false" />
<element signature="e#5146#5559#0#PHP" expanded="false" />
<element signature="e#5564#5881#0#PHP" expanded="false" />
<element signature="e#5887#6724#0#PHP" expanded="false" />
<element signature="e#6729#8924#0#PHP" expanded="false" />
<element signature="e#8930#9610#0#PHP" expanded="false" />
<element signature="e#9615#10528#0#PHP" expanded="false" />
<element signature="e#10534#11323#0#PHP" expanded="false" />
<element signature="e#11328#12677#0#PHP" expanded="false" />
<element signature="e#12683#13385#0#PHP" expanded="false" />
<element signature="e#13390#14710#0#PHP" expanded="false" />
<element signature="e#14716#15292#0#PHP" expanded="false" />
<element signature="e#15297#15909#0#PHP" expanded="false" />
<element signature="e#19182#20084#0#PHP" expanded="false" />
<element signature="e#20089#22907#0#PHP" expanded="false" />
<element signature="e#22913#23290#0#PHP" expanded="false" />
<element signature="e#23295#23737#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="bootstrap-table-jumpto.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/js/bootstrap-table-jumpto.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="308">
<caret line="39" column="15" lean-forward="true" selection-start-line="39" selection-start-column="15" selection-end-line="39" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="backend.css" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/public/assets/css/backend.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="431">
<caret line="1002" column="19" lean-forward="true" selection-start-line="1002" selection-start-column="19" selection-end-line="1002" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
... ... @@ -114,7 +115,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/application/admin/view/accredit/index.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/accredit.js" />
<option value="$PROJECT_DIR$/vendor/tecnickcom/tcpdf/examples/example_002.php" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/order.php" />
... ... @@ -146,25 +146,26 @@
<option value="$PROJECT_DIR$/application/admin/view/cover/index.html" />
<option value="$PROJECT_DIR$/application/admin/view/cover/edit.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/cover.js" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/words.js" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/words.php" />
<option value="$PROJECT_DIR$/application/admin/view/words/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/words/edit.html" />
<option value="$PROJECT_DIR$/application/admin/view/words/index.html" />
<option value="$PROJECT_DIR$/application/admin/model/Video.php" />
<option value="$PROJECT_DIR$/application/admin/view/addword/index.html" />
<option value="$PROJECT_DIR$/application/admin/controller/Addword.php" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />
<option value="$PROJECT_DIR$/application/admin/view/video/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/video/edit.html" />
<option value="$PROJECT_DIR$/application/admin/controller/Video.php" />
<option value="$PROJECT_DIR$/bower.json" />
<option value="$PROJECT_DIR$/public/assets/js/bootstrap-table-jumpto.js" />
<option value="$PROJECT_DIR$/public/assets/js/backend/video.js" />
<option value="$PROJECT_DIR$/public/assets/js/require-table.js" />
<option value="$PROJECT_DIR$/public/assets/js/require-backend.js" />
<option value="$PROJECT_DIR$/public/assets/css/backend.css" />
<option value="$PROJECT_DIR$/public/assets/js/backend/words.js" />
<option value="$PROJECT_DIR$/application/admin/view/words/add.html" />
<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/lang/zh-cn/video.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/view/video/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/video/edit.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/video.js" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
</list>
</option>
</component>
... ... @@ -183,10 +184,10 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="192" />
<option name="x" value="99" />
<option name="y" value="105" />
<option name="width" value="1642" />
<option name="height" value="921" />
<option name="width" value="1940" />
<option name="height" value="883" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -203,7 +204,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -214,32 +214,26 @@
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="assets" 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="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="css" 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="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="libs" 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" />
</panes>
</component>
... ... @@ -370,7 +364,9 @@
<workItem from="1578886287019" duration="125000" />
<workItem from="1578887472055" duration="2928000" />
<workItem from="1583368540533" duration="14325000" />
<workItem from="1583392420452" duration="9821000" />
<workItem from="1583392420452" duration="12446000" />
<workItem from="1583454639047" duration="19611000" />
<workItem from="1583481861278" duration="221000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -397,7 +393,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="483544000" />
<option name="totallyTimeSpent" value="506001000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -409,25 +405,25 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="192" y="105" width="1642" height="921" extended-state="1" />
<frame x="99" y="105" width="1940" height="883" extended-state="1" />
<editor active="true" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24968395" 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.1319149" 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="Find" 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="4" 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="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="false" show_stripe_button="true" weight="0.47289973" 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="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.47184986" 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" />
<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" />
<window_info id="Inspection" 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="8" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
<window_info id="Find" 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="4" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" 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" />
</layout>
<layout-to-restore>
... ... @@ -462,41 +458,11 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<option name="time" value="27" />
<option name="time" value="28" />
</breakpoint-manager>
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/application/common/controller/Api.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="91" column="23" lean-forward="false" selection-start-line="91" selection-start-column="23" selection-end-line="91" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/thinkphp/library/think/Request.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1315">
<caret line="716" column="20" lean-forward="false" selection-start-line="716" selection-start-column="20" selection-end-line="716" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/thinkphp/helper.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-115">
<caret line="102" column="13" lean-forward="false" selection-start-line="102" selection-start-column="13" selection-end-line="102" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/thinkphp/library/think/Model.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-865">
<caret line="1695" column="27" lean-forward="false" selection-start-line="1695" selection-start-column="27" selection-end-line="1695" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/library/token/Driver.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="260">
... ... @@ -532,14 +498,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-5641">
<caret line="22" column="60" lean-forward="true" selection-start-line="22" selection-start-column="60" selection-end-line="22" selection-end-column="60" />
<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="531">
... ... @@ -589,13 +547,6 @@
</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="318">
<caret line="32" column="152" lean-forward="false" selection-start-line="32" selection-start-column="24" selection-end-line="32" selection-end-column="152" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/cover.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="675">
... ... @@ -603,13 +554,6 @@
</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="465">
<caret line="116" column="40" lean-forward="false" selection-start-line="116" selection-start-column="40" selection-end-line="116" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/type.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-450">
... ... @@ -631,238 +575,265 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html">
<entry file="file://$PROJECT_DIR$/application/admin/model/Video.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="205">
<caret line="103" column="4" lean-forward="true" selection-start-line="103" selection-start-column="4" selection-end-line="108" selection-end-column="10" />
<state relative-caret-position="425">
<caret line="28" column="6" lean-forward="false" selection-start-line="28" selection-start-column="6" selection-end-line="28" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/words.php">
<entry file="file://$PROJECT_DIR$/application/admin/view/type/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="5" column="25" lean-forward="true" selection-start-line="5" selection-start-column="25" selection-end-line="5" selection-end-column="25" />
<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/edit.html">
<entry file="file://$PROJECT_DIR$/application/admin/view/addword/index.html" />
<entry file="file://$PROJECT_DIR$/application/admin/controller/Addword.php" />
<entry file="file://$USER_HOME$/Desktop/新建文件夹/bower.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="314">
<caret line="109" column="41" lean-forward="true" selection-start-line="109" selection-start-column="41" selection-end-line="109" selection-end-column="41" />
<state relative-caret-position="-25">
<caret line="11" column="58" lean-forward="true" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="58" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/words.js">
<entry file="file://$PROJECT_DIR$/public/assets/js/require-backend.min.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="29" column="132" lean-forward="true" selection-start-line="29" selection-start-column="132" selection-end-line="29" selection-end-column="132" />
<state relative-caret-position="-600">
<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/words/edit.html">
<entry file="file://$PROJECT_DIR$/bower.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="7" column="10" lean-forward="true" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="10" />
<state relative-caret-position="225">
<caret line="9" column="26" lean-forward="true" selection-start-line="9" selection-start-column="26" selection-end-line="9" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/words/add.html">
<entry file="file://$PROJECT_DIR$/public/assets/libs/bootstrap-table/dist/extensions/page-jumpto/README.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor 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" />
</first_editor>
<second_editor />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/libs/bootstrap-table/dist/extensions/page-jumpto/bootstrap-table-jumpto.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="11" column="93" lean-forward="false" selection-start-line="11" selection-start-column="93" selection-end-line="11" selection-end-column="93" />
<state relative-caret-position="-737">
<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/Video.php">
<entry file="file://$USER_HOME$/Desktop/新建文件夹/public/assets/js/require-table.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
<caret line="30" column="28" lean-forward="true" selection-start-line="30" selection-start-column="28" selection-end-line="30" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/新建文件夹/public/assets/js/require-backend.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-900">
<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/css/backend.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="84">
<caret line="987" column="1" lean-forward="true" selection-start-line="987" selection-start-column="1" selection-end-line="987" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/require-backend.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="28" column="6" lean-forward="false" selection-start-line="28" selection-start-column="6" selection-end-line="28" selection-end-column="6" />
<folding />
<caret line="92" column="48" lean-forward="false" selection-start-line="92" selection-start-column="48" selection-end-line="92" selection-end-column="48" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/type/index.html">
<entry file="file://$PROJECT_DIR$/public/index.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/view/words/index.html">
<entry file="file://$PROJECT_DIR$/application/database.php">
<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 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/lang/zh-cn/video.php">
<entry file="file://$PROJECT_DIR$/application/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="11" column="29" lean-forward="false" selection-start-line="11" selection-start-column="29" selection-end-line="11" selection-end-column="29" />
<folding />
<state relative-caret-position="300">
<caret line="20" column="60" lean-forward="true" selection-start-line="20" selection-start-column="60" selection-end-line="20" selection-end-column="60" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/addword/index.html">
<entry file="file://$PROJECT_DIR$/public/assets/js/require-table.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="7" column="0" lean-forward="true" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
<folding />
<state relative-caret-position="25">
<caret line="1" column="17" lean-forward="true" selection-start-line="1" selection-start-column="17" selection-end-line="1" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
<entry file="file://$PROJECT_DIR$/public/assets/js/bootstrap-table-jumpto.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="430">
<caret line="19" column="28" lean-forward="true" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
<folding />
<state relative-caret-position="975">
<caret line="39" column="15" lean-forward="false" selection-start-line="39" selection-start-column="15" selection-end-line="39" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
<entry file="file://$PROJECT_DIR$/public/assets/js/require.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="93">
<caret line="83" column="59" lean-forward="true" selection-start-line="83" selection-start-column="59" selection-end-line="83" selection-end-column="59" />
<folding>
<element signature="e#40#74#0#PHP" expanded="false" />
<element signature="e#700#2022#0#PHP" expanded="false" />
<element signature="e#4170#6464#0#PHP" expanded="false" />
<element signature="e#7119#12920#0#PHP" expanded="false" />
</folding>
<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/controller/Words.php">
<entry file="file://$PROJECT_DIR$/application/admin/view/words/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-37">
<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 relative-caret-position="175">
<caret line="13" column="0" lean-forward="true" 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/controller/Addword.php">
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="17" column="50" lean-forward="true" selection-start-line="17" selection-start-column="50" selection-end-line="17" selection-end-column="50" />
<folding />
<state relative-caret-position="25">
<caret line="1" column="4" lean-forward="false" selection-start-line="1" selection-start-column="4" selection-end-line="6" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="11" column="14" lean-forward="false" selection-start-line="11" selection-start-column="14" selection-end-line="11" selection-end-column="14" />
<folding />
<state relative-caret-position="25">
<caret line="1" column="4" lean-forward="true" selection-start-line="1" selection-start-column="4" selection-end-line="6" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/新建文件夹/bower.json">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-25">
<caret line="11" column="58" lean-forward="true" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="58" />
<folding />
<state relative-caret-position="293">
<caret line="16" column="36" lean-forward="true" selection-start-line="16" selection-start-column="36" selection-end-line="16" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/require-backend.min.js">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/words.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-600">
<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>
<element signature="n#!!doc" expanded="false" />
</folding>
<state relative-caret-position="125">
<caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bower.json">
<entry file="file://$PROJECT_DIR$/application/admin/view/words/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="9" column="26" lean-forward="true" selection-start-line="9" selection-start-column="26" selection-end-line="9" selection-end-column="26" />
<folding />
<state relative-caret-position="100">
<caret line="4" column="122" lean-forward="false" selection-start-line="4" selection-start-column="122" selection-end-line="4" selection-end-column="122" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/libs/bootstrap-table/dist/extensions/page-jumpto/README.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor 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 />
</first_editor>
<second_editor />
<entry file="file://$PROJECT_DIR$/application/admin/view/words/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="4" column="30" lean-forward="false" selection-start-line="4" selection-start-column="25" selection-end-line="4" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/libs/bootstrap-table/dist/extensions/page-jumpto/bootstrap-table-jumpto.js">
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/video.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-737">
<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 relative-caret-position="225">
<caret line="12" column="30" lean-forward="false" selection-start-line="12" selection-start-column="30" selection-end-line="12" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/新建文件夹/public/assets/js/require-table.js">
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/words.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
<caret line="30" column="28" lean-forward="true" selection-start-line="30" selection-start-column="28" selection-end-line="30" selection-end-column="28" />
<folding />
<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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Category.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="11" column="45" lean-forward="false" selection-start-line="11" selection-start-column="45" selection-end-line="11" selection-end-column="45" />
<folding />
<state relative-caret-position="254">
<caret line="134" column="0" lean-forward="true" selection-start-line="134" selection-start-column="0" selection-end-line="144" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/require-table.js">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Words.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-25">
<caret line="29" column="29" lean-forward="true" selection-start-line="29" selection-start-column="29" selection-end-line="29" selection-end-column="29" />
<folding>
<marker date="1583401745828" expanded="true" signature="26283:26309" ph="..." />
</folding>
<state relative-caret-position="1275">
<caret line="51" column="32" lean-forward="true" selection-start-line="51" selection-start-column="32" selection-end-line="51" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/require-backend.js">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="92" column="48" lean-forward="true" selection-start-line="92" selection-start-column="48" selection-end-line="92" selection-end-column="48" />
<folding>
<element signature="e#3390#3492#0" expanded="false" />
<element signature="e#3528#3645#0" expanded="false" />
<element signature="e#3681#3783#0" expanded="false" />
<element signature="e#3827#3929#0" expanded="false" />
<element signature="e#3971#4073#0" expanded="false" />
<element signature="e#4111#4225#0" expanded="false" />
</folding>
<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/bootstrap-table-jumpto.js">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="308">
<caret line="39" column="15" lean-forward="true" selection-start-line="39" selection-start-column="15" selection-end-line="39" selection-end-column="15" />
<folding />
<state relative-caret-position="300">
<caret line="47" column="0" lean-forward="true" selection-start-line="47" selection-start-column="0" selection-end-line="47" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/新建文件夹/public/assets/js/require-backend.js">
<entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-900">
<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 relative-caret-position="475">
<caret line="165" column="85" lean-forward="true" selection-start-line="165" selection-start-column="85" selection-end-line="165" selection-end-column="85" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/css/backend.css">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="431">
<caret line="1002" column="19" lean-forward="true" selection-start-line="1002" selection-start-column="19" selection-end-line="1002" selection-end-column="19" />
<state relative-caret-position="25">
<caret line="705" column="0" lean-forward="false" selection-start-line="705" selection-start-column="0" selection-end-line="705" selection-end-column="0" />
<folding>
<element signature="e#506#1244#0#PHP" expanded="false" />
<element signature="e#1249#2912#0#PHP" expanded="false" />
<element signature="e#2918#3280#0#PHP" expanded="false" />
<element signature="e#3285#3575#0#PHP" expanded="false" />
<element signature="e#3582#4016#0#PHP" expanded="false" />
<element signature="e#4021#4379#0#PHP" expanded="false" />
<element signature="e#4385#4792#0#PHP" expanded="false" />
<element signature="e#4797#5140#0#PHP" expanded="false" />
<element signature="e#5146#5559#0#PHP" expanded="false" />
<element signature="e#5564#5881#0#PHP" expanded="false" />
<element signature="e#5887#6724#0#PHP" expanded="false" />
<element signature="e#6729#8924#0#PHP" expanded="false" />
<element signature="e#8930#9610#0#PHP" expanded="false" />
<element signature="e#9615#10528#0#PHP" expanded="false" />
<element signature="e#10534#11323#0#PHP" expanded="false" />
<element signature="e#11328#12677#0#PHP" expanded="false" />
<element signature="e#12683#13385#0#PHP" expanded="false" />
<element signature="e#13390#14710#0#PHP" expanded="false" />
<element signature="e#14716#15292#0#PHP" expanded="false" />
<element signature="e#15297#15909#0#PHP" expanded="false" />
<element signature="e#19182#20084#0#PHP" expanded="false" />
<element signature="e#20089#22907#0#PHP" expanded="false" />
<element signature="e#22913#23290#0#PHP" expanded="false" />
<element signature="e#23295#23737#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="158" column="28" lean-forward="false" selection-start-line="158" selection-start-column="28" selection-end-line="158" selection-end-column="28" />
<folding />
</state>
</provider>
... ...
... ... @@ -61,8 +61,10 @@ class Video extends Backend
$type = new \app\admin\model\Type();
$words = new \app\admin\model\Words();
foreach ($list as &$v){
$words_ids = $words->whereIn('id',$v['words_ids'])->column('name');
$v['words_ids'] = implode(',',$words_ids);
$text_ids = $words->whereIn('id',$v['text_ids'])->column('name');
$v['text_ids'] = implode(',',$text_ids);
$address_ids = $words->whereIn('id',$v['address_ids'])->column('name');
$v['address_ids'] = implode(',',$address_ids);
$type_ids = $type->whereIn('id',$v['type_ids'])->column('area_name');
$v['type_ids'] = implode(',',$type_ids);
}
... ... @@ -82,13 +84,31 @@ class Video extends Backend
$params = $this->request->post("row/a");
if ($params) {
$params = $this->preExcludeFields($params);
$count = count(explode(',',$params['words_ids']));
//如果内容关键字和地名关键字都为空
if($params['text_ids'] == '' && $params['address_ids'] == ''){
$this->error('请选择关键字标签');
}
//内容关键字不为空
if($params['text_ids'] != ''){
$count_text = count(explode(',',$params['text_ids']));
$params['text_ids'] =','.$params['text_ids'].',';
}else{
$count_text = 0;
}
//地名关键字不为空
if($params['address_ids'] != ''){
$count_address = count(explode(',',$params['address_ids']));
$params['address_ids'] =','.$params['address_ids'].',';
}else{
$count_address = 0;
}
$count = $count_text + $count_address;
if($count>=3){
true;
}else{
$this->error('至少选择三个关键字标签');
}
$params['words_ids'] =','.$params['words_ids'].',';
$params['type_ids'] =','.$params['type_ids'].',';
if ($this->dataLimit && $this->dataLimitFieldAutoFill) {
$params[$this->dataLimitField] = $this->auth->id;
... ... @@ -142,14 +162,32 @@ class Video extends Backend
}
if ($this->request->isPost()) {
$params = $this->request->post("row/a");
// print_r($params);die;
$params['type_ids'] =','.$params['type_ids'].',';
$count = count(explode(',',$params['words_ids']));
//如果内容关键字和地名关键字都为空
if($params['text_ids'] == '' && $params['address_ids'] == ''){
$this->error('请选择关键字标签');
}
//内容关键字不为空
if($params['text_ids'] != ''){
$count_text = count(explode(',',$params['text_ids']));
$params['text_ids'] =','.$params['text_ids'].',';
}else{
$count_text = 0;
}
//地名关键字不为空
if($params['address_ids'] != ''){
$count_address = count(explode(',',$params['address_ids']));
$params['address_ids'] =','.$params['address_ids'].',';
}else{
$count_address = 0;
}
$count = $count_text + $count_address;
if($count>=3){
true;
}else{
$this->error('至少选择三个关键字标签');
}
$params['words_ids'] =','.$params['words_ids'].',';
if ($params) {
$params = $this->preExcludeFields($params);
$result = false;
... ... @@ -194,8 +232,18 @@ class Video extends Backend
return json($arr);
}
public function words(){
$res = Db::name('words')->field('id,type,name')->select();
public function text(){
$res = Db::name('words')->where('type',2)->field('id,type,name')->select();
$arr = [];
foreach($res as $key=>$value){
$arr[$value['id']] = $value['name'];
}
return json($arr);
}
public function address()
{
$res = Db::name('words')->where('type',1)->field('id,type,name')->select();
$arr = [];
foreach($res as $key=>$value){
$arr[$value['id']] = $value['name'];
... ...
... ... @@ -3,6 +3,7 @@
namespace app\admin\controller;
use app\common\controller\Backend;
use think\Db;
/**
* 全部关键字管理
... ... @@ -17,6 +18,7 @@ class Words extends Backend
* @var \app\admin\model\Words
*/
protected $model = null;
protected $noNeedRight = ['selectpage'];
public function _initialize()
{
... ... @@ -31,5 +33,25 @@ class Words extends Backend
* 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
*/
public function text()
{
$res = Db::name('words')->where('type',2)->field('id,type,name')->select();
$arr = [];
foreach($res as $key=>$value){
$arr[$value['id']] = $value['name'];
}
return $arr;
}
/**
* Selectpage搜索
*
* @internal
*/
public function selectpage()
{
return parent::selectpage();
}
}
... ...
... ... @@ -9,7 +9,8 @@ return [
'Thumbnail' => '视频封面图',
'Share' =>'分享到小程序的封面',
'Type_ids' => '地区标签',
'Words_ids' =>'关键字标签',
'text_ids' =>'内容关键字标签',
'Address_ids' =>'地名关键字标签',
'Video' => '2K视频',
'Water_url' => '带水印云盘地址',
'Two_url' => '2k视频地址',
... ...
... ... @@ -2,6 +2,7 @@
return [
'Id' => 'id',
'Weigh' =>'权重值',
'Name' => '关键词',
'Type' => '类型',
'Createtime' => '创建时间',
... ...
... ... @@ -18,9 +18,15 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Words_ids')}:</label>
<label class="control-label col-xs-12 col-sm-2">{:__('Text_ids')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-words_ids" data-rule="required" data-source="words/index" data-multiple="true" data-field="name" class="form-control selectpage" name="row[words_ids]" type="text" value="">
<input id="c-text_ids" data-source="words/selectpage" data-multiple="true" data-field="name" data-params='{"custom[type]":"2"}' class="form-control selectpage" name="row[text_ids]" type="text" value="">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Address_ids')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-address_ids" data-source="words/selectpage" data-multiple="true" data-field="name" data-params='{"custom[type]":"1"}' class="form-control selectpage" name="row[address_ids]" type="text" value="">
</div>
</div>
<div class="form-group">
... ... @@ -125,22 +131,41 @@
<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>-->
<!--<div class="col-xs-12 col-sm-8">-->
<!--<input id="c-price" class="form-control" name="row[price]" type="text" placeholder="请输入2k普通价格">-->
<!--</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">{:__('Price')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-price" class="form-control" name="row[price]" type="text" placeholder="请输入2k普通价格">
{:build_radios('row[price]', ['800'=>__('800'), '1200'=>__('1200'),'1800'=>__('1800')])}
</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普通价格">
{:build_radios('row[four_price]', ['1200'=>__('1200'), '2000'=>__('2000'),'2800'=>__('2800')])}
</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普通价格">
{:build_radios('row[eight_price]', ['2800'=>__('2800'), '1'=>__('3800'),'2'=>__('4800')])}
</div>
</div>
<div class="form-group">
... ...
... ... @@ -18,9 +18,15 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Words_ids')}:</label>
<label class="control-label col-xs-12 col-sm-2">{:__('Text_ids')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-words_ids" data-rule="required" data-source="words/index" data-multiple="true" data-field="name" class="form-control selectpage" name="row[words_ids]" type="text" value="{$row.words_ids}">
<input id="c-text_ids" data-source="words/index" data-multiple="true" data-field="name" data-params='{"custom[type]":"2"}' class="form-control selectpage" name="row[text_ids]" type="text" value="{$row.text_ids}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Address_ids')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-address_ids" data-source="words/index" data-multiple="true" data-field="name" data-params='{"custom[type]":"1"}' class="form-control selectpage" name="row[address_ids]" type="text" value="{$row.address_ids}">
</div>
</div>
<div class="form-group">
... ... @@ -125,24 +131,45 @@
<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">-->
<!--<input id="c-price" class="form-control" name="row[price]" type="text" value="{$row.price}" placeholder="请输入2k普通价格">-->
<!--</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" value="{$row.four_price}" 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" value="{$row.eight_price}" placeholder="请输入8k普通价格">-->
<!--</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">
<input id="c-price" class="form-control" name="row[price]" type="text" value="{$row.price}" placeholder="请输入2k普通价格">
{:build_radios('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">
<input id="c-four_price" class="form-control" name="row[four_price]" type="text" value="{$row.four_price}" placeholder="请输入4k普通价格">
{:build_radios('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">
<input id="c-eight_price" class="form-control" name="row[eight_price]" type="text" value="{$row.eight_price}" placeholder="请输入8k普通价格">
{:build_radios('row[eight_price]', ['1200'=>__('2800元'), '3800'=>__('3800元'),'4800'=>__('4800元')],$row['eight_price'])}
</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">
... ...
<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">{:__('Weigh')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-weigh" data-rule="required" class="form-control" name="row[weigh]" type="text" placeholder="请输入权重值">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
<div class="col-xs-12 col-sm-8">
... ... @@ -9,7 +14,7 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
<div class="col-xs-12 col-sm-8">
{:build_radios('row[type]', ['1'=>__('地名关键词'), '2'=>__('内容关键词'),'3'=>__('价格关键词')])}
{:build_radios('row[type]', ['1'=>__('地名关键词'), '2'=>__('内容关键词')])}
</div>
</div>
<div class="form-group layer-footer">
... ...
<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">{:__('Weigh')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-weigh" data-rule="required" class="form-control" name="row[weigh]" type="text" value="{$row.weigh|htmlentities}" placeholder="请输入权重值">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
<div class="col-xs-12 col-sm-8">
... ... @@ -9,7 +14,7 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
<div class="col-xs-12 col-sm-8">
{:build_radios('row[type]', ['1'=>__('地名关键词'), '2'=>__('内容关键词'),'3'=>__('价格关键词')],$row['type'])}
{:build_radios('row[type]', ['1'=>__('地名关键词'), '2'=>__('内容关键词')],$row['type'])}
</div>
</div>
<div class="form-group layer-footer">
... ...
... ... @@ -15,7 +15,7 @@ use fast\Http;
*/
class User extends Api
{
protected $noNeedLogin = ['login','index','type','mine','car','cover'];
protected $noNeedLogin = ['login','index','type','mine','car','cover','words'];
protected $noNeedRight = '*';
protected $uid = '';
... ... @@ -670,10 +670,10 @@ class User extends Api
}
/**
* @ApiTitle (历史记录)
* @ApiSummary (历史记录)
* @ApiTitle (搜索关键词内容)
* @ApiSummary (搜索关键词内容)
* @ApiMethod (POST)
* @ApiRoute (/api/user/history)
* @ApiRoute (/api/user/words)
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
*
* @ApiReturn({
... ... @@ -681,23 +681,59 @@ class User extends Api
"msg": "成功",
"time": "1571492001",
"data": {
"id": 4,//记录id,
"title"://搜索的内容
"id"://记录id,
"name"://关键字名称
}
})
*/
public function history()
public function words()
{
$user_id = $this->uid;
$data = Db::name('history')
->where('user_id',$user_id)
->order('id desc')
->column('title');
$res = array_unique($data);
$res = array_slice($res,0,10);
$this->success('SUCCESS',$res);
$data['address'] = Db::name('words')
->where('type',1)
->field('id,name')
->select();
$data['text'] = Db::name('words')
->where('type',2)
->field('id,name')
->select();
$data['price'] = [
'0'=>'800元',
'1'=>'1200元',
'2'=>'1800元',
];
$this->success('success',$data);
}
// /**
// * @ApiTitle (历史记录)
// * @ApiSummary (历史记录)
// * @ApiMethod (POST)
// * @ApiRoute (/api/user/history)
// * @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
// *
// * @ApiReturn({
// "code": 1,
// "msg": "成功",
// "time": "1571492001",
// "data": {
// "id": 4,//记录id,
// "title"://搜索的内容
// }
// })
// */
// public function history()
// {
// $user_id = $this->uid;
// $data = Db::name('history')
// ->where('user_id',$user_id)
// ->order('id desc')
// ->column('title');
// $res = array_unique($data);
// $res = array_slice($res,0,10);
// $this->success('SUCCESS',$res);
// }
/**
* @ApiTitle (我的)
* @ApiSummary (我的)
... ...
... ... @@ -202,7 +202,7 @@
<a href="javascript:;" data-id="35" class="list-group-item">会员须知</a>
<a href="javascript:;" data-id="28" class="list-group-item">图片详情</a>
<a href="javascript:;" data-id="29" class="list-group-item">视频详情</a>
<a href="javascript:;" data-id="30" class="list-group-item">历史记录</a>
<a href="javascript:;" data-id="30" class="list-group-item">搜索关键词内容</a>
<a href="javascript:;" data-id="31" class="list-group-item">我的</a>
<a href="javascript:;" data-id="32" class="list-group-item">创建充值订单</a>
<a href="javascript:;" data-id="33" class="list-group-item">创建开通会员订单</a>
... ... @@ -6643,7 +6643,7 @@
<div class="panel-heading" id="heading-30">
<h4 class="panel-title">
<span class="label label-primary">POST</span>
<a data-toggle="collapse" data-parent="#accordion30" href="#collapseOne30"> 历史记录 <span class="text-muted">/api/user/history</span></a>
<a data-toggle="collapse" data-parent="#accordion30" href="#collapseOne30"> 搜索关键词内容 <span class="text-muted">/api/user/words</span></a>
</h4>
</div>
<div id="collapseOne30" class="panel-collapse collapse">
... ... @@ -6661,7 +6661,7 @@
<div class="tab-pane active" id="info30">
<div class="well">
历史记录 </div>
搜索关键词内容 </div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Headers</strong></div>
<div class="panel-body">
... ... @@ -6715,7 +6715,7 @@
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/history" method="POST" name="form30" id="form30">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/words" method="POST" name="form30" id="form30">
<div class="form-group">
无
</div>
... ... @@ -6755,8 +6755,8 @@
"msg": "成功",
"time": "1571492001",
"data": {
"id": 4,//记录id,
"title"://搜索的内容
"id"://记录id,
"name"://关键字名称
}
}</pre>
</div>
... ... @@ -7471,7 +7471,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2020-03-05 16:29:35 </div>
Generated on 2020-03-06 15:59:59 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...
... ... @@ -29,7 +29,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'number', title: __('Number')},
{field: 'is_show', title: __('Is_show'),operate:false},
{field: 'title', title: __('Title'),operate:false},
{field: 'words_ids', title: __('Words_ids'),searchList:$.getJSON('video/words')},
{field: 'text_ids', title: __('Text_ids'),searchList:$.getJSON('video/text')},
{field: 'address_ids', title: __('Address_ids'),searchList:$.getJSON('video/address')},
{field: 'keyword', title: __('Keyword'),operate:false},
{field: 'thumbnail', title: __('Thumbnail'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image},
{field: 'share', title: __('Share'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image},
... ... @@ -44,9 +45,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'buy_num', title: __('Buy_num'),operate:false},
{field: 'money', title: __('Money'),operate:false},
{field: 'click_num', title: __('Click_num'),operate:false},
{field: 'price', title: __('Price'),operate:false},
{field: 'four_price', title: __('Four_price'),operate:false},
{field: 'eight_price', title: __('Eight_price'),operate:false},
// {field: 'price', title: __('Price'),operate:false},
// {field: 'four_price', title: __('Four_price'),operate:false},
// {field: 'eight_price', title: __('Eight_price'),operate:false},
{field: 'price', title: __('Price'),formatter: Table.api.formatter.label,searchList:{'800': '800', '1200': '1200','1800':'1800'}},
{field: 'four_price', title: __('Four_price'),formatter: Table.api.formatter.label,searchList:{'1200': '1200', '2000': '2000','2800':'2800'}},
{field: 'eight_price', title: __('Eight_price'),formatter: Table.api.formatter.label,searchList:{'800': '800', '1200': '1200','1800':'1800'}},
{field: 'is_top', title: __('Is_top'),formatter: Table.api.formatter.label,searchList:{'0': '否', '1': '是'}},
{field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
... ...
... ... @@ -20,15 +20,17 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
table.bootstrapTable({
url: $.fn.bootstrapTable.defaults.extend.index_url,
pk: 'id',
sortName: 'id',
sortName: 'weigh',
sortOrder:'desc',
columns: [
[
{checkbox: true},
{field: 'id', title: __('Id')},
// {field: 'is_show', title: __('Is_show'),operate:false},
{field: 'name', title: __('Name')},
{field: 'type', title: __('Type'),formatter: Table.api.formatter.status,searchList:{'1': '地名关键词','2':'内容关键词','3':'价格关键词'}},
{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: 'type', title: __('Type'),formatter: Table.api.formatter.status,searchList:{'1': '地名关键词','2':'内容关键词'}},
// {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}
]
]
... ...