郭盛 / areial · 提交

转到一个项目

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

修改点选，取消富文本

内嵌 并排对比
正在显示 15 个修改的文件 包含 421 行增加 和 254 行删除
@@ -6,12 +6,10 @@ @@ -6,12 +6,10 @@
6 <component name="ChangeListManager"> 6 <component name="ChangeListManager">
7 <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> 7 <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
8 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 8 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
9 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" /> 9 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/Video.php" afterPath="$PROJECT_DIR$/application/admin/controller/Video.php" />
10 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/video/add.html" afterPath="$PROJECT_DIR$/application/admin/view/video/add.html" /> 10 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/video/add.html" afterPath="$PROJECT_DIR$/application/admin/view/video/add.html" />
11 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/video/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/video/edit.html" /> 11 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/video/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/video/edit.html" />
12 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" /> 12 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
13 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />  
14 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/video.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/video.js" />  
15 </list> 13 </list>
16 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 14 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
17 <option name="TRACKING_ENABLED" value="true" /> 15 <option name="TRACKING_ENABLED" value="true" />
@@ -21,54 +19,7 @@ @@ -21,54 +19,7 @@
21 <option name="LAST_RESOLUTION" value="IGNORE" /> 19 <option name="LAST_RESOLUTION" value="IGNORE" />
22 </component> 20 </component>
23 <component name="FileEditorManager"> 21 <component name="FileEditorManager">
24 - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">  
25 - <file leaf-file-name="User.php" pinned="false" current-in-tab="true">  
26 - <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">  
27 - <provider selected="true" editor-type-id="text-editor">  
28 - <state relative-caret-position="131">  
29 - <caret line="118" column="0" lean-forward="true" selection-start-line="118" selection-start-column="0" selection-end-line="118" selection-end-column="0" />  
30 - <folding>  
31 - <element signature="e#514#1252#0#PHP" expanded="false" />  
32 - <element signature="e#1257#2920#0#PHP" expanded="false" />  
33 - <element signature="e#2926#3288#0#PHP" expanded="false" />  
34 - <element signature="e#3293#3583#0#PHP" expanded="false" />  
35 - <element signature="e#3589#3911#0#PHP" expanded="false" />  
36 - <element signature="e#3916#4203#0#PHP" expanded="false" />  
37 - <element signature="e#4210#4644#0#PHP" expanded="false" />  
38 - <element signature="e#4649#5007#0#PHP" expanded="false" />  
39 - <element signature="e#5013#5420#0#PHP" expanded="false" />  
40 - <element signature="e#5425#5768#0#PHP" expanded="false" />  
41 - <element signature="e#5774#6187#0#PHP" expanded="false" />  
42 - <element signature="e#6192#6509#0#PHP" expanded="false" />  
43 - <element signature="e#6515#7352#0#PHP" expanded="false" />  
44 - <element signature="e#7357#9552#0#PHP" expanded="false" />  
45 - <element signature="e#9558#10238#0#PHP" expanded="false" />  
46 - <element signature="e#10243#11156#0#PHP" expanded="false" />  
47 - <element signature="e#11162#11951#0#PHP" expanded="false" />  
48 - <element signature="e#11956#13305#0#PHP" expanded="false" />  
49 - <element signature="e#13311#14013#0#PHP" expanded="false" />  
50 - <element signature="e#14018#15338#0#PHP" expanded="false" />  
51 - <element signature="e#15344#15920#0#PHP" expanded="false" />  
52 - <element signature="e#15925#16537#0#PHP" expanded="false" />  
53 - <element signature="e#16543#17259#0#PHP" expanded="false" />  
54 - <element signature="e#17264#19804#0#PHP" expanded="false" />  
55 - <element signature="e#19810#20712#0#PHP" expanded="false" />  
56 - <element signature="e#20717#23535#0#PHP" expanded="false" />  
57 - <element signature="e#23541#23918#0#PHP" expanded="false" />  
58 - <element signature="e#23923#24365#0#PHP" expanded="false" />  
59 - <element signature="e#24368#24377#0#PHP" expanded="false" />  
60 - <element signature="e#25137#25642#0#PHP" expanded="false" />  
61 - <element signature="e#25647#25898#0#PHP" expanded="false" />  
62 - <element signature="e#25904#26383#0#PHP" expanded="false" />  
63 - <element signature="e#26388#27145#0#PHP" expanded="false" />  
64 - <element signature="e#27151#27632#0#PHP" expanded="false" />  
65 - <element signature="e#27637#28407#0#PHP" expanded="false" />  
66 - </folding>  
67 - </state>  
68 - </provider>  
69 - </entry>  
70 - </file>  
71 - </leaf> 22 + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
72 </component> 23 </component>
73 <component name="FileTemplateManagerImpl"> 24 <component name="FileTemplateManagerImpl">
74 <option name="RECENT_TEMPLATES"> 25 <option name="RECENT_TEMPLATES">
@@ -141,16 +92,16 @@ @@ -141,16 +92,16 @@
141 <option value="$PROJECT_DIR$/application/admin/view/words/edit.html" /> 92 <option value="$PROJECT_DIR$/application/admin/view/words/edit.html" />
142 <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/words.php" /> 93 <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/words.php" />
143 <option value="$PROJECT_DIR$/application/admin/controller/Words.php" /> 94 <option value="$PROJECT_DIR$/application/admin/controller/Words.php" />
144 - <option value="$PROJECT_DIR$/application/admin/controller/Video.php" />  
145 <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" /> 95 <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />
146 <option value="$PROJECT_DIR$/public/assets/js/backend/video.js" /> 96 <option value="$PROJECT_DIR$/public/assets/js/backend/video.js" />
147 - <option value="$PROJECT_DIR$/application/admin/view/video/edit.html" />  
148 - <option value="$PROJECT_DIR$/application/admin/view/video/add.html" />  
149 <option value="$PROJECT_DIR$/application/admin/view/share/add.html" /> 97 <option value="$PROJECT_DIR$/application/admin/view/share/add.html" />
150 <option value="$PROJECT_DIR$/application/admin/view/share/edit.html" /> 98 <option value="$PROJECT_DIR$/application/admin/view/share/edit.html" />
151 <option value="$PROJECT_DIR$/application/admin/view/share/index.html" /> 99 <option value="$PROJECT_DIR$/application/admin/view/share/index.html" />
152 <option value="$PROJECT_DIR$/public/assets/js/backend/share.js" /> 100 <option value="$PROJECT_DIR$/public/assets/js/backend/share.js" />
153 <option value="$PROJECT_DIR$/application/api/controller/User.php" /> 101 <option value="$PROJECT_DIR$/application/api/controller/User.php" />
  102 + <option value="$PROJECT_DIR$/application/admin/view/video/add.html" />
  103 + <option value="$PROJECT_DIR$/application/admin/controller/Video.php" />
  104 + <option value="$PROJECT_DIR$/application/admin/view/video/edit.html" />
154 </list> 105 </list>
155 </option> 106 </option>
156 </component> 107 </component>
@@ -169,10 +120,10 @@ @@ -169,10 +120,10 @@
169 </component> 120 </component>
170 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 121 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
171 <component name="ProjectFrameBounds" extendedState="1"> 122 <component name="ProjectFrameBounds" extendedState="1">
172 - <option name="x" value="33" />  
173 - <option name="y" value="77" />  
174 - <option name="width" value="1940" />  
175 - <option name="height" value="941" /> 123 + <option name="x" value="309" />
  124 + <option name="y" value="63" />
  125 + <option name="width" value="1513" />
  126 + <option name="height" value="961" />
176 </component> 127 </component>
177 <component name="ProjectView"> 128 <component name="ProjectView">
178 <navigator currentView="ProjectPane" proportions="" version="1"> 129 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -196,30 +147,12 @@ @@ -196,30 +147,12 @@
196 <item name="areial" type="b2602c69:ProjectViewProjectNode" /> 147 <item name="areial" type="b2602c69:ProjectViewProjectNode" />
197 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> 148 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
198 </path> 149 </path>
199 - <path>  
200 - <item name="areial" type="b2602c69:ProjectViewProjectNode" />  
201 - <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />  
202 - <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />  
203 - </path>  
204 - <path>  
205 - <item name="areial" type="b2602c69:ProjectViewProjectNode" />  
206 - <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />  
207 - <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />  
208 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />  
209 - </path>  
210 - <path>  
211 - <item name="areial" type="b2602c69:ProjectViewProjectNode" />  
212 - <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />  
213 - <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />  
214 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />  
215 - <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />  
216 - </path>  
217 </expand> 150 </expand>
218 <select /> 151 <select />
219 </subPane> 152 </subPane>
220 </pane> 153 </pane>
221 - <pane id="Scratches" />  
222 <pane id="Scope" /> 154 <pane id="Scope" />
  155 + <pane id="Scratches" />
223 </panes> 156 </panes>
224 </component> 157 </component>
225 <component name="PropertiesComponent"> 158 <component name="PropertiesComponent">
@@ -351,7 +284,9 @@ @@ -351,7 +284,9 @@
351 <workItem from="1583368540533" duration="14325000" /> 284 <workItem from="1583368540533" duration="14325000" />
352 <workItem from="1583392420452" duration="12446000" /> 285 <workItem from="1583392420452" duration="12446000" />
353 <workItem from="1583454639047" duration="19611000" /> 286 <workItem from="1583454639047" duration="19611000" />
354 - <workItem from="1583481861278" duration="4120000" /> 287 + <workItem from="1583481861278" duration="4890000" />
  288 + <workItem from="1583540220249" duration="10194000" />
  289 + <workItem from="1583551237397" duration="4626000" />
355 </task> 290 </task>
356 <task id="LOCAL-00001" summary="调试"> 291 <task id="LOCAL-00001" summary="调试">
357 <created>1574145133364</created> 292 <created>1574145133364</created>
@@ -378,7 +313,7 @@ @@ -378,7 +313,7 @@
378 <servers /> 313 <servers />
379 </component> 314 </component>
380 <component name="TimeTrackingManager"> 315 <component name="TimeTrackingManager">
381 - <option name="totallyTimeSpent" value="509900000" /> 316 + <option name="totallyTimeSpent" value="525490000" />
382 </component> 317 </component>
383 <component name="TodoView"> 318 <component name="TodoView">
384 <todo-panel id="selected-file"> 319 <todo-panel id="selected-file">
@@ -390,18 +325,18 @@ @@ -390,18 +325,18 @@
390 </todo-panel> 325 </todo-panel>
391 </component> 326 </component>
392 <component name="ToolWindowManager"> 327 <component name="ToolWindowManager">
393 - <frame x="33" y="77" width="1940" height="941" extended-state="1" /> 328 + <frame x="309" y="63" width="1513" height="961" extended-state="1" />
394 <layout> 329 <layout>
395 - <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" /> 330 + <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" />
396 <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" /> 331 <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" />
397 - <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" /> 332 + <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" />
398 <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" /> 333 <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" />
399 - <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" />  
400 <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" /> 334 <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" />
  335 + <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" />
401 <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" /> 336 <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" />
402 - <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" />  
403 - <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" /> 337 + <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" />
404 <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" /> 338 <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" />
  339 + <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" />
405 <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" /> 340 <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" />
406 <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" /> 341 <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" />
407 <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" /> 342 <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 @@ @@ -442,18 +377,11 @@
442 </component> 377 </component>
443 <component name="XDebuggerManager"> 378 <component name="XDebuggerManager">
444 <breakpoint-manager> 379 <breakpoint-manager>
445 - <option name="time" value="28" /> 380 + <option name="time" value="29" />
446 </breakpoint-manager> 381 </breakpoint-manager>
447 <watches-manager /> 382 <watches-manager />
448 </component> 383 </component>
449 <component name="editorHistoryManager"> 384 <component name="editorHistoryManager">
450 - <entry file="file://$PROJECT_DIR$/application/api/controller/Notify.php">  
451 - <provider selected="true" editor-type-id="text-editor">  
452 - <state relative-caret-position="0">  
453 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
454 - </state>  
455 - </provider>  
456 - </entry>  
457 <entry file="file://$PROJECT_DIR$/application/extra/verify.php"> 385 <entry file="file://$PROJECT_DIR$/application/extra/verify.php">
458 <provider selected="true" editor-type-id="text-editor"> 386 <provider selected="true" editor-type-id="text-editor">
459 <state relative-caret-position="531"> 387 <state relative-caret-position="531">
@@ -617,7 +545,6 @@ @@ -617,7 +545,6 @@
617 <provider selected="true" editor-type-id="text-editor"> 545 <provider selected="true" editor-type-id="text-editor">
618 <state relative-caret-position="0"> 546 <state relative-caret-position="0">
619 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 547 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
620 - <folding />  
621 </state> 548 </state>
622 </provider> 549 </provider>
623 </entry> 550 </entry>
@@ -690,7 +617,6 @@ @@ -690,7 +617,6 @@
690 <provider selected="true" editor-type-id="text-editor"> 617 <provider selected="true" editor-type-id="text-editor">
691 <state relative-caret-position="100"> 618 <state relative-caret-position="100">
692 <caret line="4" column="6" lean-forward="false" selection-start-line="4" selection-start-column="6" selection-end-line="4" selection-end-column="6" /> 619 <caret line="4" column="6" lean-forward="false" selection-start-line="4" selection-start-column="6" selection-end-line="4" selection-end-column="6" />
693 - <folding />  
694 </state> 620 </state>
695 </provider> 621 </provider>
696 </entry> 622 </entry>
@@ -708,34 +634,10 @@ @@ -708,34 +634,10 @@
708 </state> 634 </state>
709 </provider> 635 </provider>
710 </entry> 636 </entry>
711 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">  
712 - <provider selected="true" editor-type-id="text-editor">  
713 - <state relative-caret-position="131">  
714 - <caret line="80" column="25" lean-forward="false" selection-start-line="80" selection-start-column="25" selection-end-line="80" selection-end-column="25" />  
715 - </state>  
716 - </provider>  
717 - </entry>  
718 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">  
719 - <provider selected="true" editor-type-id="text-editor">  
720 - <state relative-caret-position="200">  
721 - <caret line="31" column="102" lean-forward="false" selection-start-line="31" selection-start-column="102" selection-end-line="31" selection-end-column="102" />  
722 - <folding />  
723 - </state>  
724 - </provider>  
725 - </entry>  
726 <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/video.php"> 637 <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/video.php">
727 <provider selected="true" editor-type-id="text-editor"> 638 <provider selected="true" editor-type-id="text-editor">
728 <state relative-caret-position="275"> 639 <state relative-caret-position="275">
729 <caret line="11" column="30" lean-forward="false" selection-start-line="11" selection-start-column="30" selection-end-line="11" selection-end-column="30" /> 640 <caret line="11" column="30" lean-forward="false" selection-start-line="11" selection-start-column="30" selection-end-line="11" selection-end-column="30" />
730 - <folding />  
731 - </state>  
732 - </provider>  
733 - </entry>  
734 - <entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">  
735 - <provider selected="true" editor-type-id="text-editor">  
736 - <state relative-caret-position="75">  
737 - <caret line="50" column="10" lean-forward="false" selection-start-line="50" selection-start-column="10" selection-end-line="50" selection-end-column="10" />  
738 - <folding />  
739 </state> 641 </state>
740 </provider> 642 </provider>
741 </entry> 643 </entry>
@@ -743,15 +645,6 @@ @@ -743,15 +645,6 @@
743 <provider selected="true" editor-type-id="text-editor"> 645 <provider selected="true" editor-type-id="text-editor">
744 <state relative-caret-position="250"> 646 <state relative-caret-position="250">
745 <caret line="25" column="4" lean-forward="true" selection-start-line="25" selection-start-column="4" selection-end-line="38" selection-end-column="10" /> 647 <caret line="25" column="4" lean-forward="true" selection-start-line="25" selection-start-column="4" selection-end-line="38" selection-end-column="10" />
746 - <folding />  
747 - </state>  
748 - </provider>  
749 - </entry>  
750 - <entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">  
751 - <provider selected="true" editor-type-id="text-editor">  
752 - <state relative-caret-position="207">  
753 - <caret line="50" column="10" lean-forward="false" selection-start-line="50" selection-start-column="10" selection-end-line="50" selection-end-column="10" />  
754 - <folding />  
755 </state> 648 </state>
756 </provider> 649 </provider>
757 </entry> 650 </entry>
@@ -759,7 +652,6 @@ @@ -759,7 +652,6 @@
759 <provider selected="true" editor-type-id="text-editor"> 652 <provider selected="true" editor-type-id="text-editor">
760 <state relative-caret-position="325"> 653 <state relative-caret-position="325">
761 <caret line="25" column="4" lean-forward="true" selection-start-line="25" selection-start-column="4" selection-end-line="38" selection-end-column="10" /> 654 <caret line="25" column="4" lean-forward="true" selection-start-line="25" selection-start-column="4" selection-end-line="38" selection-end-column="10" />
762 - <folding />  
763 </state> 655 </state>
764 </provider> 656 </provider>
765 </entry> 657 </entry>
@@ -767,7 +659,6 @@ @@ -767,7 +659,6 @@
767 <provider selected="true" editor-type-id="text-editor"> 659 <provider selected="true" editor-type-id="text-editor">
768 <state relative-caret-position="325"> 660 <state relative-caret-position="325">
769 <caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" /> 661 <caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
770 - <folding />  
771 </state> 662 </state>
772 </provider> 663 </provider>
773 </entry> 664 </entry>
@@ -775,7 +666,6 @@ @@ -775,7 +666,6 @@
775 <provider selected="true" editor-type-id="text-editor"> 666 <provider selected="true" editor-type-id="text-editor">
776 <state relative-caret-position="368"> 667 <state relative-caret-position="368">
777 <caret line="28" column="63" lean-forward="true" selection-start-line="28" selection-start-column="63" selection-end-line="28" selection-end-column="63" /> 668 <caret line="28" column="63" lean-forward="true" selection-start-line="28" selection-start-column="63" selection-end-line="28" selection-end-column="63" />
778 - <folding />  
779 </state> 669 </state>
780 </provider> 670 </provider>
781 </entry> 671 </entry>
@@ -783,7 +673,6 @@ @@ -783,7 +673,6 @@
783 <provider selected="true" editor-type-id="text-editor"> 673 <provider selected="true" editor-type-id="text-editor">
784 <state relative-caret-position="350"> 674 <state relative-caret-position="350">
785 <caret line="26" column="53" lean-forward="true" selection-start-line="26" selection-start-column="53" selection-end-line="26" selection-end-column="53" /> 675 <caret line="26" column="53" lean-forward="true" selection-start-line="26" selection-start-column="53" selection-end-line="26" selection-end-column="53" />
786 - <folding />  
787 </state> 676 </state>
788 </provider> 677 </provider>
789 </entry> 678 </entry>
@@ -791,7 +680,6 @@ @@ -791,7 +680,6 @@
791 <provider selected="true" editor-type-id="text-editor"> 680 <provider selected="true" editor-type-id="text-editor">
792 <state relative-caret-position="350"> 681 <state relative-caret-position="350">
793 <caret line="14" column="14" lean-forward="true" selection-start-line="14" selection-start-column="14" selection-end-line="14" selection-end-column="14" /> 682 <caret line="14" column="14" lean-forward="true" selection-start-line="14" selection-start-column="14" selection-end-line="14" selection-end-column="14" />
794 - <folding />  
795 </state> 683 </state>
796 </provider> 684 </provider>
797 </entry> 685 </entry>
@@ -799,50 +687,56 @@ @@ -799,50 +687,56 @@
799 <provider selected="true" editor-type-id="text-editor"> 687 <provider selected="true" editor-type-id="text-editor">
800 <state relative-caret-position="550"> 688 <state relative-caret-position="550">
801 <caret line="22" column="10" lean-forward="true" selection-start-line="22" selection-start-column="10" selection-end-line="22" selection-end-column="10" /> 689 <caret line="22" column="10" lean-forward="true" selection-start-line="22" selection-start-column="10" selection-end-line="22" selection-end-column="10" />
802 - <folding />  
803 </state> 690 </state>
804 </provider> 691 </provider>
805 </entry> 692 </entry>
806 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 693 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
807 <provider selected="true" editor-type-id="text-editor"> 694 <provider selected="true" editor-type-id="text-editor">
808 - <state relative-caret-position="131">  
809 - <caret line="118" column="0" lean-forward="true" selection-start-line="118" selection-start-column="0" selection-end-line="118" selection-end-column="0" /> 695 + <state relative-caret-position="225">
  696 + <caret line="273" column="54" lean-forward="true" selection-start-line="273" selection-start-column="54" selection-end-line="273" selection-end-column="54" />
  697 + </state>
  698 + </provider>
  699 + </entry>
  700 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Share.php">
  701 + <provider selected="true" editor-type-id="text-editor">
  702 + <state relative-caret-position="0">
  703 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  704 + <folding />
  705 + </state>
  706 + </provider>
  707 + </entry>
  708 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">
  709 + <provider selected="true" editor-type-id="text-editor">
  710 + <state relative-caret-position="775">
  711 + <caret line="31" column="102" lean-forward="false" selection-start-line="31" selection-start-column="102" selection-end-line="31" selection-end-column="102" />
  712 + <folding />
  713 + </state>
  714 + </provider>
  715 + </entry>
  716 + <entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
  717 + <provider selected="true" editor-type-id="text-editor">
  718 + <state relative-caret-position="-76">
  719 + <caret line="146" column="29" lean-forward="false" selection-start-line="146" selection-start-column="29" selection-end-line="146" selection-end-column="29" />
  720 + <folding />
  721 + </state>
  722 + </provider>
  723 + </entry>
  724 + <entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
  725 + <provider selected="true" editor-type-id="text-editor">
  726 + <state relative-caret-position="693">
  727 + <caret line="167" column="10" lean-forward="true" selection-start-line="167" selection-start-column="10" selection-end-line="167" selection-end-column="10" />
  728 + <folding />
  729 + </state>
  730 + </provider>
  731 + </entry>
  732 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
  733 + <provider selected="true" editor-type-id="text-editor">
  734 + <state relative-caret-position="533">
  735 + <caret line="160" column="37" lean-forward="false" selection-start-line="160" selection-start-column="37" selection-end-line="160" selection-end-column="37" />
810 <folding> 736 <folding>
811 - <element signature="e#514#1252#0#PHP" expanded="false" />  
812 - <element signature="e#1257#2920#0#PHP" expanded="false" />  
813 - <element signature="e#2926#3288#0#PHP" expanded="false" />  
814 - <element signature="e#3293#3583#0#PHP" expanded="false" />  
815 - <element signature="e#3589#3911#0#PHP" expanded="false" />  
816 - <element signature="e#3916#4203#0#PHP" expanded="false" />  
817 - <element signature="e#4210#4644#0#PHP" expanded="false" />  
818 - <element signature="e#4649#5007#0#PHP" expanded="false" />  
819 - <element signature="e#5013#5420#0#PHP" expanded="false" />  
820 - <element signature="e#5425#5768#0#PHP" expanded="false" />  
821 - <element signature="e#5774#6187#0#PHP" expanded="false" />  
822 - <element signature="e#6192#6509#0#PHP" expanded="false" />  
823 - <element signature="e#6515#7352#0#PHP" expanded="false" />  
824 - <element signature="e#7357#9552#0#PHP" expanded="false" />  
825 - <element signature="e#9558#10238#0#PHP" expanded="false" />  
826 - <element signature="e#10243#11156#0#PHP" expanded="false" />  
827 - <element signature="e#11162#11951#0#PHP" expanded="false" />  
828 - <element signature="e#11956#13305#0#PHP" expanded="false" />  
829 - <element signature="e#13311#14013#0#PHP" expanded="false" />  
830 - <element signature="e#14018#15338#0#PHP" expanded="false" />  
831 - <element signature="e#15344#15920#0#PHP" expanded="false" />  
832 - <element signature="e#15925#16537#0#PHP" expanded="false" />  
833 - <element signature="e#16543#17259#0#PHP" expanded="false" />  
834 - <element signature="e#17264#19804#0#PHP" expanded="false" />  
835 - <element signature="e#19810#20712#0#PHP" expanded="false" />  
836 - <element signature="e#20717#23535#0#PHP" expanded="false" />  
837 - <element signature="e#23541#23918#0#PHP" expanded="false" />  
838 - <element signature="e#23923#24365#0#PHP" expanded="false" />  
839 - <element signature="e#24368#24377#0#PHP" expanded="false" />  
840 - <element signature="e#25137#25642#0#PHP" expanded="false" />  
841 - <element signature="e#25647#25898#0#PHP" expanded="false" />  
842 - <element signature="e#25904#26383#0#PHP" expanded="false" />  
843 - <element signature="e#26388#27145#0#PHP" expanded="false" />  
844 - <element signature="e#27151#27632#0#PHP" expanded="false" />  
845 - <element signature="e#27637#28407#0#PHP" expanded="false" /> 737 + <element signature="e#700#2169#0#PHP" expanded="false" />
  738 + <element signature="e#2201#5403#0#PHP" expanded="false" />
  739 + <element signature="e#5435#8735#0#PHP" expanded="false" />
846 </folding> 740 </folding>
847 </state> 741 </state>
848 </provider> 742 </provider>
  1 +({
  2 + cssIn: "D:/htdocs/areial/public/assets/css/backend.css",
  3 + out: "D:/htdocs/areial/public/assets/css/backend.min.css",
  4 + optimizeCss: "default",
  5 + optimize: "none"
  6 +})
  1 +<?php
  2 +
  3 +namespace app\admin\controller;
  4 +
  5 +use app\common\controller\Backend;
  6 +
  7 +/**
  8 + * 分享首页图
  9 + *
  10 + * @icon fa fa-share
  11 + */
  12 +class Share extends Backend
  13 +{
  14 +
  15 + /**
  16 + * Share模型对象
  17 + * @var \app\admin\model\Share
  18 + */
  19 + protected $model = null;
  20 +
  21 + public function _initialize()
  22 + {
  23 + parent::_initialize();
  24 + $this->model = new \app\admin\model\Share;
  25 +
  26 + }
  27 +
  28 + /**
  29 + * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
  30 + * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
  31 + * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
  32 + */
  33 +
  34 +
  35 +}
@@ -84,7 +84,17 @@ class Video extends Backend @@ -84,7 +84,17 @@ class Video extends Backend
84 $params = $this->request->post("row/a"); 84 $params = $this->request->post("row/a");
85 if ($params) { 85 if ($params) {
86 $params = $this->preExcludeFields($params); 86 $params = $this->preExcludeFields($params);
87 - 87 + $a = $params['one'];
  88 + if(!empty($params['two'])){
  89 + $a .= ','.$params['two'];
  90 + }
  91 + if(!empty($params['four'])){
  92 + $a .= ','.$params['four'];
  93 + }
  94 + if(!empty($params['eight'])){
  95 + $a .= ','.$params['eight'];
  96 + }
  97 + $params['content'] = $a;
88 //如果内容关键字和地名关键字都为空 98 //如果内容关键字和地名关键字都为空
89 if($params['text_ids'] == '' && $params['address_ids'] == ''){ 99 if($params['text_ids'] == '' && $params['address_ids'] == ''){
90 $this->error('请选择关键字标签'); 100 $this->error('请选择关键字标签');
@@ -162,7 +172,17 @@ class Video extends Backend @@ -162,7 +172,17 @@ class Video extends Backend
162 } 172 }
163 if ($this->request->isPost()) { 173 if ($this->request->isPost()) {
164 $params = $this->request->post("row/a"); 174 $params = $this->request->post("row/a");
165 -// print_r($params);die; 175 + $a = $params['one'];
  176 + if(!empty($params['two'])){
  177 + $a .= ','.$params['two'];
  178 + }
  179 + if(!empty($params['four'])){
  180 + $a .= ','.$params['four'];
  181 + }
  182 + if(!empty($params['eight'])){
  183 + $a .= ','.$params['eight'];
  184 + }
  185 + $params['content'] = $a;
166 $params['type_ids'] =','.$params['type_ids'].','; 186 $params['type_ids'] =','.$params['type_ids'].',';
167 //如果内容关键字和地名关键字都为空 187 //如果内容关键字和地名关键字都为空
168 if($params['text_ids'] == '' && $params['address_ids'] == ''){ 188 if($params['text_ids'] == '' && $params['address_ids'] == ''){
  1 +<?php
  2 +
  3 +return [
  4 + 'Id' => 'id',
  5 + 'Thumbnail' => '分享图',
  6 + 'Createtime' => '创建时间',
  7 + 'Updatetime' => '修改时间'
  8 +];
  1 +<?php
  2 +
  3 +namespace app\admin\model;
  4 +
  5 +use think\Model;
  6 +
  7 +
  8 +class Share extends Model
  9 +{
  10 +
  11 +
  12 +
  13 +
  14 +
  15 + // 表名
  16 + protected $name = 'share';
  17 +
  18 + // 自动写入时间戳字段
  19 + protected $autoWriteTimestamp = 'int';
  20 +
  21 + // 定义时间戳字段名
  22 + protected $createTime = 'createtime';
  23 + protected $updateTime = 'updatetime';
  24 + protected $deleteTime = false;
  25 +
  26 + // 追加属性
  27 + protected $append = [
  28 +
  29 + ];
  30 +
  31 +
  32 +
  33 +
  34 +
  35 +
  36 +
  37 +
  38 +
  39 +
  40 +}
  1 +<?php
  2 +
  3 +namespace app\admin\validate;
  4 +
  5 +use think\Validate;
  6 +
  7 +class Share extends Validate
  8 +{
  9 + /**
  10 + * 验证规则
  11 + */
  12 + protected $rule = [
  13 + ];
  14 + /**
  15 + * 提示消息
  16 + */
  17 + protected $message = [
  18 + ];
  19 + /**
  20 + * 验证场景
  21 + */
  22 + protected $scene = [
  23 + 'add' => [],
  24 + 'edit' => [],
  25 + ];
  26 +
  27 +}
  1 +<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
  2 +
  3 + <div class="form-group">
  4 + <label class="control-label col-xs-12 col-sm-2">{:__('Thumbnail')}:</label>
  5 + <div class="col-xs-12 col-sm-8">
  6 + <div class="input-group">
  7 + <input id="c-thumbnail" data-rule="required" class="form-control" size="35" name="row[thumbnail]" type="text" placeholder="请上传图片">
  8 + <div class="input-group-addon no-border no-padding">
  9 + <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>
  10 + <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>
  11 + </div>
  12 + <span class="msg-box n-right"></span>
  13 + </div>
  14 + <ul class="row list-inline plupload-preview" id="p-thumbnail"></ul>
  15 + </div>
  16 + </div>
  17 + <div class="form-group layer-footer">
  18 + <label class="control-label col-xs-12 col-sm-2"></label>
  19 + <div class="col-xs-12 col-sm-8">
  20 + <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
  21 + <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
  22 + </div>
  23 + </div>
  24 +</form>
  1 +<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
  2 +
  3 + <div class="form-group">
  4 + <label class="control-label col-xs-12 col-sm-2">{:__('Thumbnail')}:</label>
  5 + <div class="col-xs-12 col-sm-8">
  6 + <div class="input-group">
  7 + <input id="c-image" data-rule="required" class="form-control" size="35" name="row[thumbnail]" type="text" value="{$row.thumbnail}" placeholder="请上传图片">
  8 + <div class="input-group-addon no-border no-padding">
  9 + <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>
  10 + <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>
  11 + </div>
  12 + <span class="msg-box n-right"></span>
  13 + </div>
  14 + <ul class="row list-inline plupload-preview" id="p-image"></ul>
  15 + </div>
  16 + </div>
  17 + <div class="form-group layer-footer">
  18 + <label class="control-label col-xs-12 col-sm-2"></label>
  19 + <div class="col-xs-12 col-sm-8">
  20 + <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
  21 + <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
  22 + </div>
  23 + </div>
  24 +</form>
  1 +<div class="panel panel-default panel-intro">
  2 + {:build_heading()}
  3 +
  4 + <div class="panel-body">
  5 + <div id="myTabContent" class="tab-content">
  6 + <div class="tab-pane fade active in" id="one">
  7 + <div class="widget-body no-padding">
  8 + <div id="toolbar" class="toolbar">
  9 + <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
  10 + <!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('share/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>-->
  11 + <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>
  12 + <!--<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>-->
  13 + <!--<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>-->
  14 +
  15 + <div class="dropdown btn-group {:$auth->check('share/multi')?'':'hide'}">
  16 + <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
  17 + <ul class="dropdown-menu text-left" role="menu">
  18 + <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>
  19 + <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>
  20 + </ul>
  21 + </div>
  22 +
  23 +
  24 + </div>
  25 + <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
  26 + data-operate-edit="{:$auth->check('share/edit')}"
  27 + data-operate-del="{:$auth->check('share/del')}"
  28 + width="100%">
  29 + </table>
  30 + </div>
  31 + </div>
  32 +
  33 + </div>
  34 + </div>
  35 +</div>
@@ -111,47 +111,53 @@ @@ -111,47 +111,53 @@
111 <input id="c-eight_code" class="form-control" name="row[eight_code]" type="text" placeholder="请输入8k提取码"> 111 <input id="c-eight_code" class="form-control" name="row[eight_code]" type="text" placeholder="请输入8k提取码">
112 </div> 112 </div>
113 </div> 113 </div>
114 - <div class="form-group">  
115 - <label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>  
116 - <div class="col-xs-12 col-sm-8">  
117 - <textarea id="c-content" data-rule="required" class="form-control editor" name="row[content]" placeholder="请输入视频介绍"></textarea>  
118 - </div>  
119 - </div>  
120 <!--<div class="form-group">--> 114 <!--<div class="form-group">-->
121 - <!--<label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>--> 115 + <!--<label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>-->
122 <!--<div class="col-xs-12 col-sm-8">--> 116 <!--<div class="col-xs-12 col-sm-8">-->
123 - <!--<input id="c-price" class="form-control" name="row[price]" type="text" placeholder="请输入2k普通价格">--> 117 + <!--<textarea id="c-content" data-rule="required" class="form-control editor" name="row[content]" placeholder="请输入视频介绍"></textarea>-->
124 <!--</div>--> 118 <!--</div>-->
125 <!--</div>--> 119 <!--</div>-->
126 120
127 - <!--<div class="form-group">-->  
128 - <!--<label class="control-label col-xs-12 col-sm-2">{:__('Four_price')}:</label>-->  
129 - <!--<div class="col-xs-12 col-sm-8">-->  
130 - <!--<input id="c-four_price" class="form-control" name="row[four_price]" type="text" placeholder="请输入4k普通价格">-->  
131 - <!--</div>-->  
132 - <!--</div>-->  
133 - <!--<div class="form-group">-->  
134 - <!--<label class="control-label col-xs-12 col-sm-2">{:__('Eight_price')}:</label>-->  
135 - <!--<div class="col-xs-12 col-sm-8">-->  
136 - <!--<input id="c-eight_price" class="form-control" name="row[eight_price]" type="text" placeholder="请输入8k普通价格">-->  
137 - <!--</div>-->  
138 - <!--</div>--> 121 + <div class="form-group">
  122 + <label class="control-label col-xs-12 col-sm-2">{:__('视频介绍')}:</label>
  123 + <div class="col-xs-12 col-sm-8">
  124 + {:build_radios('row[one]', ['比较珍贵的奇观天气精品'=>'比较珍贵的奇观天气精品', '地拍相机拍摄的高品质延时素材'=>'地拍相机拍摄的高品质延时素材','升格超级慢动作精品素材'=>'升格超级慢动作精品素材','X7无人机拍摄的高品质航拍素材'=>'X7无人机拍摄的高品质航拍素材','MAIVC 2无人机拍摄的高品质航拍延时素材'=>'MAIVC 2无人机拍摄的高品质航拍延时素材'])}
  125 + </div>
  126 + </div>
  127 + <div class="form-group">
  128 + <label class="control-label col-xs-12 col-sm-2">{:__('2K分辨率')}:</label>
  129 + <div class="col-xs-12 col-sm-8">
  130 + {: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'])}
  131 + </div>
  132 + </div>
  133 + <div class="form-group">
  134 + <label class="control-label col-xs-12 col-sm-2">{:__('4K分辨率')}:</label>
  135 + <div class="col-xs-12 col-sm-8">
  136 + {: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'])}
  137 + </div>
  138 + </div>
  139 + <div class="form-group">
  140 + <label class="control-label col-xs-12 col-sm-2">{:__('8K分辨率')}:</label>
  141 + <div class="col-xs-12 col-sm-8">
  142 + {: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'])}
  143 + </div>
  144 + </div>
139 <div class="form-group"> 145 <div class="form-group">
140 <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label> 146 <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
141 <div class="col-xs-12 col-sm-8"> 147 <div class="col-xs-12 col-sm-8">
142 - {:build_radios('row[price]', ['800'=>__('800'), '1200'=>__('1200'),'1800'=>__('1800')])} 148 + {:Form::checkboxs('row[price]', ['800'=>__('800'), '1200'=>__('1200'),'1800'=>__('1800')], '800', ['data-rule'=>'required'])}
143 </div> 149 </div>
144 </div> 150 </div>
145 <div class="form-group"> 151 <div class="form-group">
146 <label class="control-label col-xs-12 col-sm-2">{:__('Four_price')}:</label> 152 <label class="control-label col-xs-12 col-sm-2">{:__('Four_price')}:</label>
147 <div class="col-xs-12 col-sm-8"> 153 <div class="col-xs-12 col-sm-8">
148 - {:build_radios('row[four_price]', ['1200'=>__('1200'), '2000'=>__('2000'),'2800'=>__('2800')])} 154 + {:Form::checkboxs('row[four_price]', ['1200'=>__('1200'), '2000'=>__('2000'),'2800'=>__('2800')], '1200', ['data-rule'=>'required'])}
149 </div> 155 </div>
150 </div> 156 </div>
151 <div class="form-group"> 157 <div class="form-group">
152 <label class="control-label col-xs-12 col-sm-2">{:__('Eight_price')}:</label> 158 <label class="control-label col-xs-12 col-sm-2">{:__('Eight_price')}:</label>
153 <div class="col-xs-12 col-sm-8"> 159 <div class="col-xs-12 col-sm-8">
154 - {:build_radios('row[eight_price]', ['2800'=>__('2800'), '1'=>__('3800'),'2'=>__('4800')])} 160 + {:Form::checkboxs('row[eight_price]', ['2800'=>__('2800'), '1'=>__('3800'),'2'=>__('4800')], '2800', ['data-rule'=>'required'])}
155 </div> 161 </div>
156 </div> 162 </div>
157 <div class="form-group"> 163 <div class="form-group">
@@ -111,12 +111,12 @@ @@ -111,12 +111,12 @@
111 <input id="c-eight_code" class="form-control" name="row[eight_code]" type="text" value="{$row.eight_code|htmlentities}" placeholder="请输入8k提取码"> 111 <input id="c-eight_code" class="form-control" name="row[eight_code]" type="text" value="{$row.eight_code|htmlentities}" placeholder="请输入8k提取码">
112 </div> 112 </div>
113 </div> 113 </div>
114 - <div class="form-group">  
115 - <label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>  
116 - <div class="col-xs-12 col-sm-8">  
117 - <textarea id="c-content" data-rule="required" class="form-control editor" name="row[content]" placeholder="请输入视频介绍">{$row.content}</textarea>  
118 - </div>  
119 - </div> 114 + <!--<div class="form-group">-->
  115 + <!--<label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>-->
  116 + <!--<div class="col-xs-12 col-sm-8">-->
  117 + <!--<textarea id="c-content" data-rule="required" class="form-control editor" name="row[content]" placeholder="请输入视频介绍">{$row.content}</textarea>-->
  118 + <!--</div>-->
  119 + <!--</div>-->
120 <!--<div class="form-group">--> 120 <!--<div class="form-group">-->
121 <!--<label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>--> 121 <!--<label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>-->
122 <!--<div class="col-xs-12 col-sm-8">--> 122 <!--<div class="col-xs-12 col-sm-8">-->
@@ -135,23 +135,46 @@ @@ -135,23 +135,46 @@
135 <!--<input id="c-eight_price" class="form-control" name="row[eight_price]" type="text" value="{$row.eight_price}" placeholder="请输入8k普通价格">--> 135 <!--<input id="c-eight_price" class="form-control" name="row[eight_price]" type="text" value="{$row.eight_price}" placeholder="请输入8k普通价格">-->
136 <!--</div>--> 136 <!--</div>-->
137 <!--</div>--> 137 <!--</div>-->
138 - 138 + <div class="form-group">
  139 + <label class="control-label col-xs-12 col-sm-2">{:__('视频介绍')}:</label>
  140 + <div class="col-xs-12 col-sm-8">
  141 + {:build_radios('row[one]', ['比较珍贵的奇观天气精品'=>'比较珍贵的奇观天气精品', '地拍相机拍摄的高品质延时素材'=>'地拍相机拍摄的高品质延时素材','升格超级慢动作精品素材'=>'升格超级慢动作精品素材','X7无人机拍摄的高品质航拍素材'=>'X7无人机拍摄的高品质航拍素材','MAIVC 2无人机拍摄的高品质航拍延时素材'=>'MAIVC 2无人机拍摄的高品质航拍延时素材'],$row['one'])}
  142 + </div>
  143 + </div>
  144 + <div class="form-group">
  145 + <label class="control-label col-xs-12 col-sm-2">{:__('2K分辨率')}:</label>
  146 + <div class="col-xs-12 col-sm-8">
  147 + {:Form::checkboxs('row[two]', ['2K 分辨率 1920*1080'=>__('2K 分辨率 1920*1080'), '2K 分辨率 1920*1280'=>__('2K 分辨率 1920*1280'),'2K 分辨率 2560*1440'=>__('2K 分辨率 2560*1440')],$row['two'])}
  148 + </div>
  149 + </div>
  150 + <div class="form-group">
  151 + <label class="control-label col-xs-12 col-sm-2">{:__('4K分辨率')}:</label>
  152 + <div class="col-xs-12 col-sm-8">
  153 + {:Form::checkboxs('row[four]', ['4K 分辨率 3840*2160'=>__('4K 分辨率 3840*2160'), '4K 分辨率 3840*2560'=>__('4K 分辨率 3840*2560'),'4K 分辨率 4096*2160'=>__('4K 分辨率 4096*2160')],$row['four'])}
  154 + </div>
  155 + </div>
  156 + <div class="form-group">
  157 + <label class="control-label col-xs-12 col-sm-2">{:__('8K分辨率')}:</label>
  158 + <div class="col-xs-12 col-sm-8">
  159 + {:Form::checkboxs('row[eight]', ['8K 分辨率 7680*4320'=>__('8K 分辨率 7680*4320'), '6K 分辨率 6144*3456'=>__('6K 分辨率 6144*3456'),'5K 分辨率 5568*3648'=>__('5K 分辨率 5568*3648')],$row['eight'])}
  160 + </div>
  161 + </div>
139 <div class="form-group"> 162 <div class="form-group">
140 <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label> 163 <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
141 <div class="col-xs-12 col-sm-8"> 164 <div class="col-xs-12 col-sm-8">
142 - {:build_radios('row[price]', ['800'=>__('800'), '1200'=>__('1200'),'1800'=>__('1800元')],$row['price'])} 165 + {:Form::checkboxs('row[price]', ['800'=>__('800'), '1200'=>__('1200'),'1800'=>__('1800元')],$row['price'])}
143 </div> 166 </div>
144 </div> 167 </div>
145 <div class="form-group"> 168 <div class="form-group">
146 <label class="control-label col-xs-12 col-sm-2">{:__('Four_price')}:</label> 169 <label class="control-label col-xs-12 col-sm-2">{:__('Four_price')}:</label>
147 <div class="col-xs-12 col-sm-8"> 170 <div class="col-xs-12 col-sm-8">
148 - {:build_radios('row[four_price]', ['1200'=>__('1200元'), '2000'=>__('2000元'),'2800'=>__('2800元')],$row['four_price'])} 171 + {:Form::checkboxs('row[four_price]', ['1200'=>__('1200元'), '2000'=>__('2000元'),'2800'=>__('2800元')],$row['four_price'])}
149 </div> 172 </div>
150 </div> 173 </div>
151 <div class="form-group"> 174 <div class="form-group">
152 <label class="control-label col-xs-12 col-sm-2">{:__('Eight_price')}:</label> 175 <label class="control-label col-xs-12 col-sm-2">{:__('Eight_price')}:</label>
153 <div class="col-xs-12 col-sm-8"> 176 <div class="col-xs-12 col-sm-8">
154 - {:build_radios('row[eight_price]', ['1200'=>__('2800元'), '3800'=>__('3800元'),'4800'=>__('4800元')],$row['eight_price'])} 177 + {:Form::checkboxs('row[eight_price]', ['1200'=>__('2800元'), '3800'=>__('3800元'),'4800'=>__('4800元')],$row['eight_price'])}
155 </div> 178 </div>
156 </div> 179 </div>
157 180
@@ -5,6 +5,7 @@ namespace app\api\controller; @@ -5,6 +5,7 @@ namespace app\api\controller;
5 use app\common\controller\Api; 5 use app\common\controller\Api;
6 use app\common\library\Ems; 6 use app\common\library\Ems;
7 use app\common\library\Sms; 7 use app\common\library\Sms;
  8 +use function fast\e;
8 use fast\Random; 9 use fast\Random;
9 use think\Db; 10 use think\Db;
10 use think\Validate; 11 use think\Validate;
@@ -15,7 +16,7 @@ use fast\Http; @@ -15,7 +16,7 @@ use fast\Http;
15 */ 16 */
16 class User extends Api 17 class User extends Api
17 { 18 {
18 - protected $noNeedLogin = ['login','index','type','mine','car','cover','words','share']; 19 + protected $noNeedLogin = ['login','index','type','mine','car','cover','words','share','search'];
19 protected $noNeedRight = '*'; 20 protected $noNeedRight = '*';
20 protected $uid = ''; 21 protected $uid = '';
21 22
@@ -244,8 +245,11 @@ class User extends Api @@ -244,8 +245,11 @@ class User extends Api
244 * @ApiRoute (/api/user/search) 245 * @ApiRoute (/api/user/search)
245 * @ApiHeaders (name=token, type=string, required=true, description="请求的Token") 246 * @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
246 * 247 *
247 - * @ApiParams (name="type_id", type="inter", required=false, description="视频/图片 （视频为1 图片为2 精美大片为3）") 248 + * @ApiParams (name="type_id", type="inter", required=false, description="视频/图片（视频为1 图片为2）")
248 * @ApiParams (name="keyword", type="string", required=true, description="关键字") 249 * @ApiParams (name="keyword", type="string", required=true, description="关键字")
  250 + * @ApiParams (name="address", type="string", required=true, description="地名关键词数组")
  251 + * @ApiParams (name="text", type="string", required=true, description="内容关键词数组")
  252 + * @ApiParams (name="price", type="string", required=true, description="价格")
249 * @ApiParams (name="page", type="inter", required=false, description="当前页(默认1)") 253 * @ApiParams (name="page", type="inter", required=false, description="当前页(默认1)")
250 * @ApiParams (name="pageNum", type="inter", required=false, description="每页显示数据个数（默认10）") 254 * @ApiParams (name="pageNum", type="inter", required=false, description="每页显示数据个数（默认10）")
251 * @ApiReturn({ 255 * @ApiReturn({
@@ -261,57 +265,20 @@ class User extends Api @@ -261,57 +265,20 @@ class User extends Api
261 */ 265 */
262 public function search() 266 public function search()
263 { 267 {
264 - $user_id = $this->uid; 268 +// $user_id = $this->uid;
265 $page = $this->request->param('page',1,'intval'); 269 $page = $this->request->param('page',1,'intval');
266 $pageNum = $this->request->param('pageNum',10,'intval'); 270 $pageNum = $this->request->param('pageNum',10,'intval');
267 $rule = config('verify.path'); 271 $rule = config('verify.path');
268 - $type_id = $this->request->post('type_id');  
269 - if(empty($type_id)){ 272 + $param = $this->request->param();
  273 + if(empty($param['type_id'])){
270 $this->error(['code'=>2,'msg'=>'缺少必要参数']); 274 $this->error(['code'=>2,'msg'=>'缺少必要参数']);
271 } 275 }
272 - $keyword = $this->request->post('keyword');  
273 - if(!empty($keyword)){  
274 - $param['user_id'] = $user_id;  
275 - $param['title'] = $keyword;  
276 - Db::name('history')  
277 - ->insert($param);  
278 - }  
279 - if(!empty($keyword)){  
280 - if($type_id == 1){  
281 - $data = Db::name('video')  
282 - ->where('keyword','like',"%$keyword%")  
283 - ->whereOr('title','like',"%$keyword%")  
284 - ->order('id desc')  
285 - ->page($page,$pageNum)  
286 - ->select();  
287 - foreach ($data as &$v){  
288 - $v['thumbnail'] = $rule.$v['thumbnail'];  
289 - $v['video'] = $rule.$v['video'];  
290 - }  
291 - $this->success('SUCCESS',$data);  
292 - }elseif($type_id == 2){  
293 - $data = Db::name('pic')  
294 - ->where('keyword','like',"%$keyword%")  
295 - ->whereOr('title','like',"%$keyword%")  
296 - ->order('id desc')  
297 - ->page($page,$pageNum)  
298 - ->select();  
299 - foreach ($data as &$v){  
300 - $v['thumbnail'] = $rule.$v['thumbnail'];  
301 - }  
302 - $this->success('SUCCESS',$data);  
303 - }else{  
304 - $data = Db::name('wonderful')  
305 - ->where('title','like',"%$keyword%")  
306 - ->order('id desc')  
307 - ->page($page,$pageNum)  
308 - ->select();  
309 - foreach ($data as &$v){  
310 - $v['thumbnail'] = $rule.$v['thumbnail'];  
311 - $v['video'] = $rule.$v['video'];  
312 - }  
313 - $this->success('SUCCESS',$data);  
314 - } 276 +
  277 + if(empty($param['keyword']) && empty($param['address']) && empty($param['']) && empty($price)){
  278 + $this->error(['code'=>2,'msg'=>'请输入关键字或者选择对应标签']);
  279 + }
  280 + if(!empty($keyword) && empty($address) && empty($text) && empty($price)){
  281 +
315 }else{ 282 }else{
316 $this->error(['code'=>2,'msg'=>'请输入关键字']); 283 $this->error(['code'=>2,'msg'=>'请输入关键字']);
317 } 284 }
  1 +define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
  2 +
  3 + var Controller = {
  4 + index: function () {
  5 + // 初始化表格参数配置
  6 + Table.api.init({
  7 + extend: {
  8 + index_url: 'share/index' + location.search,
  9 + add_url: 'share/add',
  10 + edit_url: 'share/edit',
  11 + del_url: 'share/del',
  12 + multi_url: 'share/multi',
  13 + table: 'share',
  14 + }
  15 + });
  16 +
  17 + var table = $("#table");
  18 +
  19 + // 初始化表格
  20 + table.bootstrapTable({
  21 + url: $.fn.bootstrapTable.defaults.extend.index_url,
  22 + pk: 'id',
  23 + sortName: 'id',
  24 + columns: [
  25 + [
  26 + {checkbox: true},
  27 + {field: 'id', title: __('Id')},
  28 + {field: 'thumbnail', title: __('Thumbnail'),operate:false, events: Table.api.events.image,formatter: Table.api.formatter.image},
  29 + // {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
  30 + {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
  31 + {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: function (value, row, index) {
  32 + var that = $.extend({}, this);
  33 + var table = $(that.table).clone(true);
  34 + $(table).data("operate-del", null);
  35 + that.table = table;
  36 + return Table.api.formatter.operate.call(that, value, row, index);
  37 + }}
  38 + ]
  39 + ]
  40 + });
  41 +
  42 + // 为表格绑定事件
  43 + Table.api.bindevent(table);
  44 + },
  45 + add: function () {
  46 + Controller.api.bindevent();
  47 + },
  48 + edit: function () {
  49 + Controller.api.bindevent();
  50 + },
  51 + api: {
  52 + bindevent: function () {
  53 + Form.api.bindevent($("form[role=form]"));
  54 + }
  55 + }
  56 + };
  57 + return Controller;
  58 +});