郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 c74cd7adc147f819352c2160076a9276ecd1b381 1 个父辈 009e84ca
1 个管道 的构建 通过 耗费 3 秒

修改后台价格

内嵌 并排对比
正在显示 9 个修改的文件 包含 617 行增加 和 461 行删除
@@ -2,9 +2,15 @@ @@ -2,9 +2,15 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> 4 <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
  5 + <change type="DELETED" beforePath="$PROJECT_DIR$/application/api/controller/Demo.php" afterPath="" />
  6 + <change type="DELETED" beforePath="$PROJECT_DIR$/application/api/controller/Index.php" afterPath="" />
5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
  8 + <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/view/video/add.html" afterPath="$PROJECT_DIR$/application/admin/view/video/add.html" />
  10 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/video/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/video/edit.html" />
6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" /> 11 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" /> 12 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
  13 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/video.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/video.js" />
8 </list> 14 </list>
9 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 15 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
10 <option name="TRACKING_ENABLED" value="true" /> 16 <option name="TRACKING_ENABLED" value="true" />
@@ -15,28 +21,52 @@ @@ -15,28 +21,52 @@
15 </component> 21 </component>
16 <component name="FileEditorManager"> 22 <component name="FileEditorManager">
17 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 23 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
18 - <file leaf-file-name="User.php" pinned="false" current-in-tab="true">  
19 - <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 24 + <file leaf-file-name="Video.php" pinned="false" current-in-tab="false">
  25 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
20 <provider selected="true" editor-type-id="text-editor"> 26 <provider selected="true" editor-type-id="text-editor">
21 - <state relative-caret-position="327">  
22 - <caret line="197" column="33" lean-forward="false" selection-start-line="197" selection-start-column="33" selection-end-line="197" selection-end-column="33" />  
23 - <folding>  
24 - <element signature="e#38#68#0#PHP" expanded="true" />  
25 - <element signature="e#337#456#0#PHP" expanded="false" />  
26 - <element signature="e#462#1200#0#PHP" expanded="false" />  
27 - <element signature="e#1205#2868#0#PHP" expanded="false" />  
28 - <element signature="e#2874#3402#0#PHP" expanded="false" />  
29 - <element signature="e#3407#4178#0#PHP" expanded="false" />  
30 - <element signature="e#4184#4591#0#PHP" expanded="false" />  
31 - <element signature="e#4596#4939#0#PHP" expanded="false" />  
32 - <element signature="e#4945#5597#0#PHP" expanded="false" />  
33 - <element signature="e#7551#8000#0#PHP" expanded="false" />  
34 - <element signature="e#8005#8888#0#PHP" expanded="false" />  
35 - <element signature="e#8894#9578#0#PHP" expanded="false" />  
36 - <element signature="e#9583#11079#0#PHP" expanded="false" />  
37 - <element signature="e#11085#11462#0#PHP" expanded="false" />  
38 - <element signature="e#11467#11731#0#PHP" expanded="false" />  
39 - </folding> 27 + <state relative-caret-position="1464">
  28 + <caret line="169" column="0" lean-forward="true" selection-start-line="169" selection-start-column="0" selection-end-line="169" selection-end-column="0" />
  29 + <folding />
  30 + </state>
  31 + </provider>
  32 + </entry>
  33 + </file>
  34 + <file leaf-file-name="video.php" pinned="false" current-in-tab="true">
  35 + <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/video.php">
  36 + <provider selected="true" editor-type-id="text-editor">
  37 + <state relative-caret-position="325">
  38 + <caret line="13" column="24" lean-forward="false" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="24" />
  39 + <folding />
  40 + </state>
  41 + </provider>
  42 + </entry>
  43 + </file>
  44 + <file leaf-file-name="video.js" pinned="false" current-in-tab="false">
  45 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">
  46 + <provider selected="true" editor-type-id="text-editor">
  47 + <state relative-caret-position="50">
  48 + <caret line="23" column="26" lean-forward="true" selection-start-line="23" selection-start-column="26" selection-end-line="23" selection-end-column="26" />
  49 + <folding />
  50 + </state>
  51 + </provider>
  52 + </entry>
  53 + </file>
  54 + <file leaf-file-name="add.html" pinned="false" current-in-tab="false">
  55 + <entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
  56 + <provider selected="true" editor-type-id="text-editor">
  57 + <state relative-caret-position="51">
  58 + <caret line="90" column="4" lean-forward="false" selection-start-line="90" selection-start-column="4" selection-end-line="113" selection-end-column="10" />
  59 + <folding />
  60 + </state>
  61 + </provider>
  62 + </entry>
  63 + </file>
  64 + <file leaf-file-name="edit.html" pinned="false" current-in-tab="false">
  65 + <entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
  66 + <provider selected="true" editor-type-id="text-editor">
  67 + <state relative-caret-position="326">
  68 + <caret line="104" column="40" lean-forward="true" selection-start-line="104" selection-start-column="40" selection-end-line="104" selection-end-column="40" />
  69 + <folding />
40 </state> 70 </state>
41 </provider> 71 </provider>
42 </entry> 72 </entry>
@@ -73,10 +103,6 @@ @@ -73,10 +103,6 @@
73 <option value="$PROJECT_DIR$/application/admin/model/Pic.php" /> 103 <option value="$PROJECT_DIR$/application/admin/model/Pic.php" />
74 <option value="$PROJECT_DIR$/application/admin/model/Type.php" /> 104 <option value="$PROJECT_DIR$/application/admin/model/Type.php" />
75 <option value="$PROJECT_DIR$/application/admin/view/pic/index.html" /> 105 <option value="$PROJECT_DIR$/application/admin/view/pic/index.html" />
76 - <option value="$PROJECT_DIR$/application/admin/view/video/edit.html" />  
77 - <option value="$PROJECT_DIR$/application/admin/view/video/add.html" />  
78 - <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />  
79 - <option value="$PROJECT_DIR$/public/assets/js/backend/video.js" />  
80 <option value="$PROJECT_DIR$/application/admin/controller/Pic.php" /> 106 <option value="$PROJECT_DIR$/application/admin/controller/Pic.php" />
81 <option value="$PROJECT_DIR$/application/admin/controller/Video.php" /> 107 <option value="$PROJECT_DIR$/application/admin/controller/Video.php" />
82 <option value="$PROJECT_DIR$/application/index/controller/User.php" /> 108 <option value="$PROJECT_DIR$/application/index/controller/User.php" />
@@ -92,6 +118,10 @@ @@ -92,6 +118,10 @@
92 <option value="$PROJECT_DIR$/application/admin/view/pic/add.html" /> 118 <option value="$PROJECT_DIR$/application/admin/view/pic/add.html" />
93 <option value="$PROJECT_DIR$/application/admin/view/pic/edit.html" /> 119 <option value="$PROJECT_DIR$/application/admin/view/pic/edit.html" />
94 <option value="$PROJECT_DIR$/application/api/controller/User.php" /> 120 <option value="$PROJECT_DIR$/application/api/controller/User.php" />
  121 + <option value="$PROJECT_DIR$/public/assets/js/backend/video.js" />
  122 + <option value="$PROJECT_DIR$/application/admin/view/video/add.html" />
  123 + <option value="$PROJECT_DIR$/application/admin/view/video/edit.html" />
  124 + <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />
95 </list> 125 </list>
96 </option> 126 </option>
97 </component> 127 </component>
@@ -109,11 +139,11 @@ @@ -109,11 +139,11 @@
109 <sorting>DEFINITION_ORDER</sorting> 139 <sorting>DEFINITION_ORDER</sorting>
110 </component> 140 </component>
111 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 141 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
112 - <component name="ProjectFrameBounds">  
113 - <option name="x" value="311" />  
114 - <option name="y" value="58" />  
115 - <option name="width" value="1589" />  
116 - <option name="height" value="939" /> 142 + <component name="ProjectFrameBounds" extendedState="7">
  143 + <option name="x" value="44" />
  144 + <option name="y" value="79" />
  145 + <option name="width" value="1560" />
  146 + <option name="height" value="948" />
117 </component> 147 </component>
118 <component name="ProjectView"> 148 <component name="ProjectView">
119 <navigator currentView="ProjectPane" proportions="" version="1"> 149 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -168,7 +198,7 @@ @@ -168,7 +198,7 @@
168 <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> 198 <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
169 <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" /> 199 <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
170 <item name="view" type="2a2b976b:PhpTreeStructureProvider$1" /> 200 <item name="view" type="2a2b976b:PhpTreeStructureProvider$1" />
171 - <item name="pic" type="2a2b976b:PhpTreeStructureProvider$1" /> 201 + <item name="video" type="2a2b976b:PhpTreeStructureProvider$1" />
172 </path> 202 </path>
173 <path> 203 <path>
174 <item name="areial" type="b2602c69:ProjectViewProjectNode" /> 204 <item name="areial" type="b2602c69:ProjectViewProjectNode" />
@@ -242,7 +272,7 @@ @@ -242,7 +272,7 @@
242 <workItem from="1574122453532" duration="15780000" /> 272 <workItem from="1574122453532" duration="15780000" />
243 <workItem from="1574141466352" duration="745000" /> 273 <workItem from="1574141466352" duration="745000" />
244 <workItem from="1574143209694" duration="3660000" /> 274 <workItem from="1574143209694" duration="3660000" />
245 - <workItem from="1574146994475" duration="12061000" /> 275 + <workItem from="1574146994475" duration="15295000" />
246 </task> 276 </task>
247 <task id="LOCAL-00001" summary="调试"> 277 <task id="LOCAL-00001" summary="调试">
248 <created>1574145133364</created> 278 <created>1574145133364</created>
@@ -255,7 +285,7 @@ @@ -255,7 +285,7 @@
255 <servers /> 285 <servers />
256 </component> 286 </component>
257 <component name="TimeTrackingManager"> 287 <component name="TimeTrackingManager">
258 - <option name="totallyTimeSpent" value="60414000" /> 288 + <option name="totallyTimeSpent" value="63648000" />
259 </component> 289 </component>
260 <component name="TodoView"> 290 <component name="TodoView">
261 <todo-panel id="selected-file"> 291 <todo-panel id="selected-file">
@@ -267,9 +297,10 @@ @@ -267,9 +297,10 @@
267 </todo-panel> 297 </todo-panel>
268 </component> 298 </component>
269 <component name="ToolWindowManager"> 299 <component name="ToolWindowManager">
270 - <frame x="311" y="58" width="1589" height="939" extended-state="0" /> 300 + <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
  301 + <editor active="true" />
271 <layout> 302 <layout>
272 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18574232" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> 303 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15138593" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
273 <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" /> 304 <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" />
274 <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" /> 305 <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" />
275 <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" /> 306 <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" />
@@ -277,7 +308,7 @@ @@ -277,7 +308,7 @@
277 <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" /> 308 <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" />
278 <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" /> 309 <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" />
279 <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" /> 310 <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" />
280 - <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2319202" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 311 + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.1772784" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
281 <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" /> 312 <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" />
282 <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" /> 313 <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" />
283 <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" /> 314 <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" />
@@ -324,13 +355,6 @@ @@ -324,13 +355,6 @@
324 <watches-manager /> 355 <watches-manager />
325 </component> 356 </component>
326 <component name="editorHistoryManager"> 357 <component name="editorHistoryManager">
327 - <entry file="file://$PROJECT_DIR$/application/admin/view/type/index.html">  
328 - <provider selected="true" editor-type-id="text-editor">  
329 - <state relative-caret-position="325">  
330 - <caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />  
331 - </state>  
332 - </provider>  
333 - </entry>  
334 <entry file="file://$PROJECT_DIR$/application/admin/view/type/add.html"> 358 <entry file="file://$PROJECT_DIR$/application/admin/view/type/add.html">
335 <provider selected="true" editor-type-id="text-editor"> 359 <provider selected="true" editor-type-id="text-editor">
336 <state relative-caret-position="550"> 360 <state relative-caret-position="550">
@@ -450,34 +474,6 @@ @@ -450,34 +474,6 @@
450 </state> 474 </state>
451 </provider> 475 </provider>
452 </entry> 476 </entry>
453 - <entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">  
454 - <provider selected="true" editor-type-id="text-editor">  
455 - <state relative-caret-position="675">  
456 - <caret line="89" column="10" lean-forward="false" selection-start-line="89" selection-start-column="10" selection-end-line="89" selection-end-column="10" />  
457 - </state>  
458 - </provider>  
459 - </entry>  
460 - <entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">  
461 - <provider selected="true" editor-type-id="text-editor">  
462 - <state relative-caret-position="600">  
463 - <caret line="89" column="10" lean-forward="false" selection-start-line="89" selection-start-column="10" selection-end-line="89" selection-end-column="10" />  
464 - </state>  
465 - </provider>  
466 - </entry>  
467 - <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/video.php">  
468 - <provider selected="true" editor-type-id="text-editor">  
469 - <state relative-caret-position="325">  
470 - <caret line="13" column="28" lean-forward="false" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />  
471 - </state>  
472 - </provider>  
473 - </entry>  
474 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">  
475 - <provider selected="true" editor-type-id="text-editor">  
476 - <state relative-caret-position="325">  
477 - <caret line="13" column="17" lean-forward="true" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />  
478 - </state>  
479 - </provider>  
480 - </entry>  
481 <entry file="file://$PROJECT_DIR$/application/common/controller/Backend.php"> 477 <entry file="file://$PROJECT_DIR$/application/common/controller/Backend.php">
482 <provider selected="true" editor-type-id="text-editor"> 478 <provider selected="true" editor-type-id="text-editor">
483 <state relative-caret-position="3867"> 479 <state relative-caret-position="3867">
@@ -485,13 +481,6 @@ @@ -485,13 +481,6 @@
485 </state> 481 </state>
486 </provider> 482 </provider>
487 </entry> 483 </entry>
488 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">  
489 - <provider selected="true" editor-type-id="text-editor">  
490 - <state relative-caret-position="539">  
491 - <caret line="177" column="5" lean-forward="true" selection-start-line="177" selection-start-column="5" selection-end-line="177" selection-end-column="5" />  
492 - </state>  
493 - </provider>  
494 - </entry>  
495 <entry file="file://$PROJECT_DIR$/application/api/library/ExceptionHandle.php"> 484 <entry file="file://$PROJECT_DIR$/application/api/library/ExceptionHandle.php">
496 <provider selected="true" editor-type-id="text-editor"> 485 <provider selected="true" editor-type-id="text-editor">
497 <state relative-caret-position="-61"> 486 <state relative-caret-position="-61">
@@ -531,13 +520,6 @@ @@ -531,13 +520,6 @@
531 </provider> 520 </provider>
532 </entry> 521 </entry>
533 <entry file="file://$PROJECT_DIR$/application/api/controller/Sms.php" /> 522 <entry file="file://$PROJECT_DIR$/application/api/controller/Sms.php" />
534 - <entry file="file://$PROJECT_DIR$/application/api/controller/Index.php">  
535 - <provider selected="true" editor-type-id="text-editor">  
536 - <state relative-caret-position="-11">  
537 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
538 - </state>  
539 - </provider>  
540 - </entry>  
541 <entry file="file://$PROJECT_DIR$/application/api/controller/Token.php"> 523 <entry file="file://$PROJECT_DIR$/application/api/controller/Token.php">
542 <provider selected="true" editor-type-id="text-editor"> 524 <provider selected="true" editor-type-id="text-editor">
543 <state relative-caret-position="175"> 525 <state relative-caret-position="175">
@@ -545,13 +527,6 @@ @@ -545,13 +527,6 @@
545 </state> 527 </state>
546 </provider> 528 </provider>
547 </entry> 529 </entry>
548 - <entry file="file://$PROJECT_DIR$/application/api/controller/Demo.php">  
549 - <provider selected="true" editor-type-id="text-editor">  
550 - <state relative-caret-position="450">  
551 - <caret line="21" column="4" lean-forward="true" selection-start-line="21" selection-start-column="4" selection-end-line="39" selection-end-column="7" />  
552 - </state>  
553 - </provider>  
554 - </entry>  
555 <entry file="file://$PROJECT_DIR$/application/database.php"> 530 <entry file="file://$PROJECT_DIR$/application/database.php">
556 <provider selected="true" editor-type-id="text-editor"> 531 <provider selected="true" editor-type-id="text-editor">
557 <state relative-caret-position="450"> 532 <state relative-caret-position="450">
@@ -682,10 +657,34 @@ @@ -682,10 +657,34 @@
682 </state> 657 </state>
683 </provider> 658 </provider>
684 </entry> 659 </entry>
  660 + <entry file="file://$PROJECT_DIR$/application/api/controller/Demo.php">
  661 + <provider selected="true" editor-type-id="text-editor">
  662 + <state relative-caret-position="375">
  663 + <caret line="21" column="4" lean-forward="true" selection-start-line="21" selection-start-column="4" selection-end-line="39" selection-end-column="7" />
  664 + <folding />
  665 + </state>
  666 + </provider>
  667 + </entry>
  668 + <entry file="file://$PROJECT_DIR$/application/api/controller/Ems.php">
  669 + <provider selected="true" editor-type-id="text-editor">
  670 + <state relative-caret-position="0">
  671 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  672 + <folding />
  673 + </state>
  674 + </provider>
  675 + </entry>
  676 + <entry file="file://$PROJECT_DIR$/application/api/controller/Index.php">
  677 + <provider selected="true" editor-type-id="text-editor">
  678 + <state relative-caret-position="0">
  679 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  680 + <folding />
  681 + </state>
  682 + </provider>
  683 + </entry>
685 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 684 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
686 <provider selected="true" editor-type-id="text-editor"> 685 <provider selected="true" editor-type-id="text-editor">
687 - <state relative-caret-position="327">  
688 - <caret line="197" column="33" lean-forward="false" selection-start-line="197" selection-start-column="33" selection-end-line="197" selection-end-column="33" /> 686 + <state relative-caret-position="309">
  687 + <caret line="459" column="5" lean-forward="true" selection-start-line="459" selection-start-column="5" selection-end-line="459" selection-end-column="5" />
689 <folding> 688 <folding>
690 <element signature="e#38#68#0#PHP" expanded="true" /> 689 <element signature="e#38#68#0#PHP" expanded="true" />
691 <element signature="e#337#456#0#PHP" expanded="false" /> 690 <element signature="e#337#456#0#PHP" expanded="false" />
@@ -696,15 +695,60 @@ @@ -696,15 +695,60 @@
696 <element signature="e#4184#4591#0#PHP" expanded="false" /> 695 <element signature="e#4184#4591#0#PHP" expanded="false" />
697 <element signature="e#4596#4939#0#PHP" expanded="false" /> 696 <element signature="e#4596#4939#0#PHP" expanded="false" />
698 <element signature="e#4945#5597#0#PHP" expanded="false" /> 697 <element signature="e#4945#5597#0#PHP" expanded="false" />
  698 + <element signature="e#5602#7545#0#PHP" expanded="false" />
699 <element signature="e#7551#8000#0#PHP" expanded="false" /> 699 <element signature="e#7551#8000#0#PHP" expanded="false" />
700 <element signature="e#8005#8888#0#PHP" expanded="false" /> 700 <element signature="e#8005#8888#0#PHP" expanded="false" />
701 - <element signature="e#8894#9578#0#PHP" expanded="false" />  
702 - <element signature="e#9583#11079#0#PHP" expanded="false" />  
703 - <element signature="e#11085#11462#0#PHP" expanded="false" />  
704 - <element signature="e#11467#11731#0#PHP" expanded="false" /> 701 + <element signature="e#8894#9411#0#PHP" expanded="false" />
  702 + <element signature="e#9416#10415#0#PHP" expanded="false" />
  703 + <element signature="e#10421#11105#0#PHP" expanded="false" />
  704 + <element signature="e#11110#12606#0#PHP" expanded="false" />
  705 + <element signature="e#12612#13336#0#PHP" expanded="false" />
  706 + <element signature="e#13341#14959#0#PHP" expanded="false" />
  707 + <element signature="e#14965#15342#0#PHP" expanded="false" />
  708 + <element signature="e#15347#15611#0#PHP" expanded="false" />
705 </folding> 709 </folding>
706 </state> 710 </state>
707 </provider> 711 </provider>
708 </entry> 712 </entry>
  713 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
  714 + <provider selected="true" editor-type-id="text-editor">
  715 + <state relative-caret-position="1464">
  716 + <caret line="169" column="0" lean-forward="true" selection-start-line="169" selection-start-column="0" selection-end-line="169" selection-end-column="0" />
  717 + <folding />
  718 + </state>
  719 + </provider>
  720 + </entry>
  721 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">
  722 + <provider selected="true" editor-type-id="text-editor">
  723 + <state relative-caret-position="50">
  724 + <caret line="23" column="26" lean-forward="true" selection-start-line="23" selection-start-column="26" selection-end-line="23" selection-end-column="26" />
  725 + <folding />
  726 + </state>
  727 + </provider>
  728 + </entry>
  729 + <entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
  730 + <provider selected="true" editor-type-id="text-editor">
  731 + <state relative-caret-position="51">
  732 + <caret line="90" column="4" lean-forward="false" selection-start-line="90" selection-start-column="4" selection-end-line="113" selection-end-column="10" />
  733 + <folding />
  734 + </state>
  735 + </provider>
  736 + </entry>
  737 + <entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
  738 + <provider selected="true" editor-type-id="text-editor">
  739 + <state relative-caret-position="326">
  740 + <caret line="104" column="40" lean-forward="true" selection-start-line="104" selection-start-column="40" selection-end-line="104" selection-end-column="40" />
  741 + <folding />
  742 + </state>
  743 + </provider>
  744 + </entry>
  745 + <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/video.php">
  746 + <provider selected="true" editor-type-id="text-editor">
  747 + <state relative-caret-position="325">
  748 + <caret line="13" column="24" lean-forward="false" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="24" />
  749 + <folding />
  750 + </state>
  751 + </provider>
  752 + </entry>
709 </component> 753 </component>
710 </project> 754 </project>
@@ -10,8 +10,12 @@ return [ @@ -10,8 +10,12 @@ return [
10 'Two_url' => '2k视频地址', 10 'Two_url' => '2k视频地址',
11 'Four_url' => '4k视频地址', 11 'Four_url' => '4k视频地址',
12 'Eight_url' => '8k视频地址', 12 'Eight_url' => '8k视频地址',
13 - 'Price' =>'正常价格',  
14 - 'Vip_price' =>'会员价格', 13 + 'Price' =>'2k正常价格',
  14 + 'Vip_price' =>'2k会员价格',
  15 + 'Four_price' =>'4K正常价格',
  16 + 'Four_vipprice' =>'4K会员价格',
  17 + 'Eight_price' =>'8K正常价格',
  18 + 'Eight_vipprice' =>'8K会员价格',
15 'Content' =>'视频介绍', 19 'Content' =>'视频介绍',
16 'Is_recommend' => '是否精选', 20 'Is_recommend' => '是否精选',
17 'Buy_num' =>'购买数量', 21 'Buy_num' =>'购买数量',
@@ -55,19 +55,19 @@ @@ -55,19 +55,19 @@
55 <div class="form-group"> 55 <div class="form-group">
56 <label class="control-label col-xs-12 col-sm-2">{:__('Two_url')}:</label> 56 <label class="control-label col-xs-12 col-sm-2">{:__('Two_url')}:</label>
57 <div class="col-xs-12 col-sm-8"> 57 <div class="col-xs-12 col-sm-8">
58 - <input id="c-two_url" data-rule="required" class="form-control" name="row[two_url]" type="text" placeholder="请输入2k视频网址"> 58 + <input id="c-two_url" class="form-control" name="row[two_url]" type="text" placeholder="请输入2k视频网址">
59 </div> 59 </div>
60 </div> 60 </div>
61 <div class="form-group"> 61 <div class="form-group">
62 <label class="control-label col-xs-12 col-sm-2">{:__('Four_url')}:</label> 62 <label class="control-label col-xs-12 col-sm-2">{:__('Four_url')}:</label>
63 <div class="col-xs-12 col-sm-8"> 63 <div class="col-xs-12 col-sm-8">
64 - <input id="c-four_url" data-rule="required" class="form-control" name="row[four_url]" type="text" placeholder="请输入4k视频网址"> 64 + <input id="c-four_url" class="form-control" name="row[four_url]" type="text" placeholder="请输入4k视频网址">
65 </div> 65 </div>
66 </div> 66 </div>
67 <div class="form-group"> 67 <div class="form-group">
68 <label class="control-label col-xs-12 col-sm-2">{:__('Eight_url')}:</label> 68 <label class="control-label col-xs-12 col-sm-2">{:__('Eight_url')}:</label>
69 <div class="col-xs-12 col-sm-8"> 69 <div class="col-xs-12 col-sm-8">
70 - <input id="c-eight_url" data-rule="required" class="form-control" name="row[eight_url]" type="text" placeholder="请输入8k视频网址"> 70 + <input id="c-eight_url" class="form-control" name="row[eight_url]" type="text" placeholder="请输入8k视频网址">
71 </div> 71 </div>
72 </div> 72 </div>
73 <div class="form-group"> 73 <div class="form-group">
@@ -79,13 +79,37 @@ @@ -79,13 +79,37 @@
79 <div class="form-group"> 79 <div class="form-group">
80 <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label> 80 <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
81 <div class="col-xs-12 col-sm-8"> 81 <div class="col-xs-12 col-sm-8">
82 - <input id="c-price" data-rule="required" class="form-control" name="row[price]" type="text" placeholder="请输入普通价格"> 82 + <input id="c-price" class="form-control" name="row[price]" type="text" placeholder="请输入2k普通价格">
83 </div> 83 </div>
84 </div> 84 </div>
85 <div class="form-group"> 85 <div class="form-group">
86 <label class="control-label col-xs-12 col-sm-2">{:__('Vip_price')}:</label> 86 <label class="control-label col-xs-12 col-sm-2">{:__('Vip_price')}:</label>
87 <div class="col-xs-12 col-sm-8"> 87 <div class="col-xs-12 col-sm-8">
88 - <input id="c-vip_price" data-rule="required" class="form-control" name="row[vip_price]" type="text" placeholder="请输入会员价格"> 88 + <input id="c-vip_price" class="form-control" name="row[vip_price]" type="text" placeholder="请输入2k会员价格">
  89 + </div>
  90 + </div>
  91 + <div class="form-group">
  92 + <label class="control-label col-xs-12 col-sm-2">{:__('Four_price')}:</label>
  93 + <div class="col-xs-12 col-sm-8">
  94 + <input id="c-four_price" class="form-control" name="row[four_price]" type="text" placeholder="请输入4k普通价格">
  95 + </div>
  96 + </div>
  97 + <div class="form-group">
  98 + <label class="control-label col-xs-12 col-sm-2">{:__('Four_vipprice')}:</label>
  99 + <div class="col-xs-12 col-sm-8">
  100 + <input id="c-four_vipprice" class="form-control" name="row[four_vipprice]" type="text" placeholder="请输入4k会员价格">
  101 + </div>
  102 + </div>
  103 + <div class="form-group">
  104 + <label class="control-label col-xs-12 col-sm-2">{:__('Eight_price')}:</label>
  105 + <div class="col-xs-12 col-sm-8">
  106 + <input id="c-eight_price" class="form-control" name="row[eight_price]" type="text" placeholder="请输入8k普通价格">
  107 + </div>
  108 + </div>
  109 + <div class="form-group">
  110 + <label class="control-label col-xs-12 col-sm-2">{:__('Eight_vipprice')}:</label>
  111 + <div class="col-xs-12 col-sm-8">
  112 + <input id="c-eight_vipprice" class="form-control" name="row[eight_vipprice]" type="text" placeholder="请输入8k会员价格">
89 </div> 113 </div>
90 </div> 114 </div>
91 <div class="form-group"> 115 <div class="form-group">
@@ -55,19 +55,19 @@ @@ -55,19 +55,19 @@
55 <div class="form-group"> 55 <div class="form-group">
56 <label class="control-label col-xs-12 col-sm-2">{:__('Two_url')}:</label> 56 <label class="control-label col-xs-12 col-sm-2">{:__('Two_url')}:</label>
57 <div class="col-xs-12 col-sm-8"> 57 <div class="col-xs-12 col-sm-8">
58 - <input id="c-two_url" data-rule="required" class="form-control" name="row[two_url]" type="text" value="{$row.two_url|htmlentities}" placeholder="请输入2k云盘地址"> 58 + <input id="c-two_url" class="form-control" name="row[two_url]" type="text" value="{$row.two_url|htmlentities}" placeholder="请输入2k云盘地址">
59 </div> 59 </div>
60 </div> 60 </div>
61 <div class="form-group"> 61 <div class="form-group">
62 <label class="control-label col-xs-12 col-sm-2">{:__('Four_url')}:</label> 62 <label class="control-label col-xs-12 col-sm-2">{:__('Four_url')}:</label>
63 <div class="col-xs-12 col-sm-8"> 63 <div class="col-xs-12 col-sm-8">
64 - <input id="c-four_url" data-rule="required" class="form-control" name="row[four_url]" type="text" value="{$row.four_url|htmlentities}" placeholder="请输入4k云盘地址"> 64 + <input id="c-four_url" class="form-control" name="row[four_url]" type="text" value="{$row.four_url|htmlentities}" placeholder="请输入4k云盘地址">
65 </div> 65 </div>
66 </div> 66 </div>
67 <div class="form-group"> 67 <div class="form-group">
68 <label class="control-label col-xs-12 col-sm-2">{:__('Eight_url')}:</label> 68 <label class="control-label col-xs-12 col-sm-2">{:__('Eight_url')}:</label>
69 <div class="col-xs-12 col-sm-8"> 69 <div class="col-xs-12 col-sm-8">
70 - <input id="c-eight_url" data-rule="required" class="form-control" name="row[eight_url]" type="text" value="{$row.eight_url|htmlentities}" placeholder="请输入8k云盘地址"> 70 + <input id="c-eight_url" class="form-control" name="row[eight_url]" type="text" value="{$row.eight_url|htmlentities}" placeholder="请输入8k云盘地址">
71 </div> 71 </div>
72 </div> 72 </div>
73 <div class="form-group"> 73 <div class="form-group">
@@ -79,13 +79,37 @@ @@ -79,13 +79,37 @@
79 <div class="form-group"> 79 <div class="form-group">
80 <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label> 80 <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
81 <div class="col-xs-12 col-sm-8"> 81 <div class="col-xs-12 col-sm-8">
82 - <input id="c-price" data-rule="required" class="form-control" name="row[price]" type="text" value="{$row.price}" placeholder="请输入普通价格"> 82 + <input id="c-price" class="form-control" name="row[price]" type="text" value="{$row.price}" placeholder="请输入2k普通价格">
83 </div> 83 </div>
84 </div> 84 </div>
85 <div class="form-group"> 85 <div class="form-group">
86 <label class="control-label col-xs-12 col-sm-2">{:__('Vip_price')}:</label> 86 <label class="control-label col-xs-12 col-sm-2">{:__('Vip_price')}:</label>
87 <div class="col-xs-12 col-sm-8"> 87 <div class="col-xs-12 col-sm-8">
88 - <input id="c-vip_price" data-rule="required" class="form-control" name="row[vip_price]" type="text" value="{$row.vip_price}" placeholder="请输入会员价格"> 88 + <input id="c-vip_price" class="form-control" name="row[vip_price]" type="text" value="{$row.vip_price}" placeholder="请输入2k会员价格">
  89 + </div>
  90 + </div>
  91 + <div class="form-group">
  92 + <label class="control-label col-xs-12 col-sm-2">{:__('Four_price')}:</label>
  93 + <div class="col-xs-12 col-sm-8">
  94 + <input id="c-four_price" class="form-control" name="row[four_price]" type="text" value="{$row.four_price}" placeholder="请输入4k普通价格">
  95 + </div>
  96 + </div>
  97 + <div class="form-group">
  98 + <label class="control-label col-xs-12 col-sm-2">{:__('Four_vipprice')}:</label>
  99 + <div class="col-xs-12 col-sm-8">
  100 + <input id="c-four_vipprice" class="form-control" name="row[four_vipprice]" type="text" value="{$row.four_vipprice}" placeholder="请输入4k会员价格">
  101 + </div>
  102 + </div>
  103 + <div class="form-group">
  104 + <label class="control-label col-xs-12 col-sm-2">{:__('Eight_price')}:</label>
  105 + <div class="col-xs-12 col-sm-8">
  106 + <input id="c-eight_price" class="form-control" name="row[eight_price]" type="text" value="{$row.eight_price}" placeholder="请输入8k普通价格">
  107 + </div>
  108 + </div>
  109 + <div class="form-group">
  110 + <label class="control-label col-xs-12 col-sm-2">{:__('Eight_vipprice')}:</label>
  111 + <div class="col-xs-12 col-sm-8">
  112 + <input id="c-eight_vipprice" class="form-control" name="row[eight_vipprice]" type="text" value="{$row.eight_vipprice}" placeholder="请输入8k会员价格">
89 </div> 113 </div>
90 </div> 114 </div>
91 <div class="form-group"> 115 <div class="form-group">
1 -<?php  
2 -  
3 -namespace app\api\controller;  
4 -  
5 -use app\common\controller\Api;  
6 -  
7 -/**  
8 - * 示例接口  
9 - */  
10 -class Demo extends Api  
11 -{  
12 -  
13 - //如果$noNeedLogin为空表示所有接口都需要登录才能请求  
14 - //如果$noNeedRight为空表示所有接口都需要验证权限才能请求  
15 - //如果接口已经设置无需登录,那也就无需鉴权了  
16 - //  
17 - // 无需登录的接口,*表示全部  
18 - protected $noNeedLogin = ['test', 'test1'];  
19 - // 无需鉴权的接口,*表示全部  
20 - protected $noNeedRight = ['test2'];  
21 -  
22 - /**  
23 - * 测试方法  
24 - *  
25 - * @ApiTitle (测试名称)  
26 - * @ApiSummary (测试描述信息)  
27 - * @ApiMethod (POST)  
28 - * @ApiRoute (/api/demo/test/id/{id}/name/{name})  
29 - * @ApiHeaders (name=token, type=string, required=true, description="请求的Token")  
30 - * @ApiParams (name="id", type="integer", required=true, description="会员ID")  
31 - * @ApiParams (name="name", type="string", required=true, description="用户名")  
32 - * @ApiParams (name="data", type="object", sample="{'user_id':'int','user_name':'string','profile':{'email':'string','age':'integer'}}", description="扩展数据")  
33 - * @ApiReturnParams (name="code", type="integer", required=true, sample="0")  
34 - * @ApiReturnParams (name="msg", type="string", required=true, sample="返回成功")  
35 - * @ApiReturnParams (name="data", type="object", sample="{'user_id':'int','user_name':'string','profile':{'email':'string','age':'integer'}}", description="扩展数据返回")  
36 - * @ApiReturn ({  
37 - 'code':'1',  
38 - 'msg':'返回成功'  
39 - })  
40 - */  
41 - public function test()  
42 - {  
43 - var_dump(1111);exit;  
44 - $this->success('返回成功', $this->request->param());  
45 - }  
46 -  
47 -}  
1 -<?php  
2 -  
3 -namespace app\api\controller;  
4 -  
5 -use app\common\controller\Api;  
6 -  
7 -/**  
8 - * 首页接口  
9 - */  
10 -class Index extends Api  
11 -{  
12 - protected $noNeedLogin = ['*'];  
13 - protected $noNeedRight = ['*'];  
14 -  
15 - /**  
16 - * 首页  
17 - *  
18 - */  
19 - public function index()  
20 - {  
21 - $this->success('请求成功');  
22 - }  
23 -}  
@@ -282,6 +282,54 @@ class User extends Api @@ -282,6 +282,54 @@ class User extends Api
282 } 282 }
283 283
284 /** 284 /**
  285 + * @ApiTitle (视频列表)
  286 + * @ApiSummary (视频列表)
  287 + * @ApiMethod (POST)
  288 + * @ApiRoute (/api/user/video)
  289 + * @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
  290 + * @ApiParams (name="type_id", type="inter", required=false, description="地区ID")
  291 + * @ApiReturn({
  292 + "code": 1,
  293 + "msg": "成功",
  294 + "time": "1571492001",
  295 + "data": {
  296 + "id": //图片id,
  297 + "thumbnail": //视频封面,
  298 + "video"://视频地址
  299 + }
  300 + })
  301 + */
  302 + public function video()
  303 + {
  304 + $rule = config('verify.path');
  305 + $type_id = $this->request->post('type_id');
  306 + if(empty($type_id)){
  307 + $data = Db::name('video')
  308 + ->field('id,thumbnail,video')
  309 + ->order('id desc')
  310 + ->select();
  311 + foreach ($data as &$v){
  312 + $v['thumbnail'] = $rule.$v['thumbnail'];
  313 + $v['video'] = $rule.$v['video'];
  314 + }
  315 + $this->success('SUCCESS',$data);
  316 + }else{
  317 + $type = ','.$type_id.',';
  318 + $where['type_ids'] = ['like',"%$type%"];
  319 + $data = Db::name('video')
  320 + ->where($where)
  321 + ->field('id,thumbnail,video')
  322 + ->order('id desc')
  323 + ->select();
  324 + foreach ($data as &$v){
  325 + $v['thumbnail'] = $rule.$v['thumbnail'];
  326 + $v['video'] = $rule.$v['video'];
  327 + }
  328 + $this->success('SUCCESS',$data);
  329 + }
  330 + }
  331 +
  332 + /**
285 * @ApiTitle (图片详情) 333 * @ApiTitle (图片详情)
286 * @ApiSummary (图片详情) 334 * @ApiSummary (图片详情)
287 * @ApiMethod (POST) 335 * @ApiMethod (POST)
@@ -346,6 +394,72 @@ class User extends Api @@ -346,6 +394,72 @@ class User extends Api
346 } 394 }
347 395
348 /** 396 /**
  397 + * @ApiTitle (视频详情)
  398 + * @ApiSummary (视频详情)
  399 + * @ApiMethod (POST)
  400 + * @ApiRoute (/api/user/videodetail)
  401 + * @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
  402 + *
  403 + * @ApiParams (name="video_id", type="inter", required=true, description="视频ID")
  404 + * @ApiReturn({
  405 + "code": 1,
  406 + "msg": "成功",
  407 + "time": "1571492001",
  408 + "data": {
  409 + "id": 4,//视频id,
  410 + "title"://标题
  411 + "thumbnail": //视频封面图,
  412 + "video": //2K视频地址,
  413 + "water_url"://小样视频网址
  414 + "price"://2K价格,
  415 + "vip_price"://2Kvip价格,
  416 + "content"://图片介绍,
  417 + "is_vip"://是否为会员（0否 1是）
  418 + }
  419 + })
  420 + */
  421 + public function videodetail()
  422 + {
  423 + $uid = $this->uid;
  424 + $rule = config('verify.path');
  425 + $res = Db::name('user')
  426 + ->where('id',$uid)
  427 + ->field('id,is_vip')
  428 + ->find();
  429 + if($res['is_vip'] == 0){
  430 + $pic_id = $this->request->post('video_id');
  431 + if(empty($pic_id)){
  432 + $this->error(['code'=>2,'msg'=>'缺少必要参数']);
  433 + }
  434 + $data = Db::name('video')
  435 + ->field('id,title,thumbnail,video,price,vip_price,water_url,content')
  436 + ->where('id',$pic_id)
  437 + ->find();
  438 + $data['thumbnail'] = $rule.$data['thumbnail'];
  439 + $data['video'] = $rule.$data['video'];
  440 + $data['water_url'] = $rule.$data['water_url'];
  441 + $data['content'] = strip_tags($data['content']);
  442 + $data['is_vip'] = 0;
  443 + $this->success('SUCCESS',$data);
  444 + }elseif($res['is_vip'] == 1){
  445 + $pic_id = $this->request->post('pic_id');
  446 + if(empty($pic_id)){
  447 + $this->error(['code'=>2,'msg'=>'缺少必要参数']);
  448 + }
  449 + $data = Db::name('video')
  450 + ->field('id,title,thumbnail,video,price,vip_price,water_url,content')
  451 + ->where('id',$pic_id)
  452 + ->find();
  453 + $data['is_vip'] = 1;
  454 + $data['thumbnail'] = $rule.$data['thumbnail'];
  455 + $data['video'] = $rule.$data['video'];
  456 + $data['water_url'] = $rule.$data['water_url'];
  457 + $data['content'] = strip_tags($data['content']);
  458 + $this->success('SUCCESS',$data);
  459 + }
  460 + }
  461 +
  462 + /**
349 * @ApiTitle (历史记录) 463 * @ApiTitle (历史记录)
350 * @ApiSummary (历史记录) 464 * @ApiSummary (历史记录)
351 * @ApiMethod (POST) 465 * @ApiMethod (POST)
@@ -144,32 +144,26 @@ @@ -144,32 +144,26 @@
144 <a href="javascript:;" data-id="0" class="list-group-item">加载初始化</a> 144 <a href="javascript:;" data-id="0" class="list-group-item">加载初始化</a>
145 <a href="javascript:;" data-id="1" class="list-group-item">上传文件</a> 145 <a href="javascript:;" data-id="1" class="list-group-item">上传文件</a>
146 </div> 146 </div>
147 - <a href="#示例接口" class="list-group-item" data-toggle="collapse" data-parent="#sidebar">示例接口 <i class="fa fa-caret-down"></i></a>  
148 - <div class="child collapse" id="示例接口">  
149 - <a href="javascript:;" data-id="2" class="list-group-item">测试名称</a>  
150 - </div>  
151 <a href="#邮箱验证码接口" class="list-group-item" data-toggle="collapse" data-parent="#sidebar">邮箱验证码接口 <i class="fa fa-caret-down"></i></a> 147 <a href="#邮箱验证码接口" class="list-group-item" data-toggle="collapse" data-parent="#sidebar">邮箱验证码接口 <i class="fa fa-caret-down"></i></a>
152 <div class="child collapse" id="邮箱验证码接口"> 148 <div class="child collapse" id="邮箱验证码接口">
153 - <a href="javascript:;" data-id="3" class="list-group-item">发送验证码</a>  
154 - <a href="javascript:;" data-id="4" class="list-group-item">检测验证码</a>  
155 - </div>  
156 - <a href="#首页接口" class="list-group-item" data-toggle="collapse" data-parent="#sidebar">首页接口 <i class="fa fa-caret-down"></i></a>  
157 - <div class="child collapse" id="首页接口">  
158 - <a href="javascript:;" data-id="5" class="list-group-item">首页</a> 149 + <a href="javascript:;" data-id="2" class="list-group-item">发送验证码</a>
  150 + <a href="javascript:;" data-id="3" class="list-group-item">检测验证码</a>
159 </div> 151 </div>
160 <a href="#Token接口" class="list-group-item" data-toggle="collapse" data-parent="#sidebar">Token接口 <i class="fa fa-caret-down"></i></a> 152 <a href="#Token接口" class="list-group-item" data-toggle="collapse" data-parent="#sidebar">Token接口 <i class="fa fa-caret-down"></i></a>
161 <div class="child collapse" id="Token接口"> 153 <div class="child collapse" id="Token接口">
162 - <a href="javascript:;" data-id="6" class="list-group-item">检测Token是否过期</a>  
163 - <a href="javascript:;" data-id="7" class="list-group-item">刷新Token</a> 154 + <a href="javascript:;" data-id="4" class="list-group-item">检测Token是否过期</a>
  155 + <a href="javascript:;" data-id="5" class="list-group-item">刷新Token</a>
164 </div> 156 </div>
165 <a href="#个人中心" class="list-group-item" data-toggle="collapse" data-parent="#sidebar">个人中心 <i class="fa fa-caret-down"></i></a> 157 <a href="#个人中心" class="list-group-item" data-toggle="collapse" data-parent="#sidebar">个人中心 <i class="fa fa-caret-down"></i></a>
166 <div class="child collapse" id="个人中心"> 158 <div class="child collapse" id="个人中心">
167 - <a href="javascript:;" data-id="8" class="list-group-item">小程序登录</a>  
168 - <a href="javascript:;" data-id="9" class="list-group-item">首页视频、图片、精美大片入口</a>  
169 - <a href="javascript:;" data-id="10" class="list-group-item">地区分类</a>  
170 - <a href="javascript:;" data-id="11" class="list-group-item">搜索页</a>  
171 - <a href="javascript:;" data-id="12" class="list-group-item">图片列表</a>  
172 - <a href="javascript:;" data-id="13" class="list-group-item">图片详情</a> 159 + <a href="javascript:;" data-id="6" class="list-group-item">小程序登录</a>
  160 + <a href="javascript:;" data-id="7" class="list-group-item">首页视频、图片、精美大片入口</a>
  161 + <a href="javascript:;" data-id="8" class="list-group-item">地区分类</a>
  162 + <a href="javascript:;" data-id="9" class="list-group-item">搜索页</a>
  163 + <a href="javascript:;" data-id="10" class="list-group-item">图片列表</a>
  164 + <a href="javascript:;" data-id="11" class="list-group-item">视频列表</a>
  165 + <a href="javascript:;" data-id="12" class="list-group-item">图片详情</a>
  166 + <a href="javascript:;" data-id="13" class="list-group-item">视频详情</a>
173 <a href="javascript:;" data-id="14" class="list-group-item">历史记录</a> 167 <a href="javascript:;" data-id="14" class="list-group-item">历史记录</a>
174 </div> 168 </div>
175 </div> 169 </div>
@@ -417,13 +411,13 @@ @@ -417,13 +411,13 @@
417 </div> 411 </div>
418 </div> 412 </div>
419 </div> 413 </div>
420 - <h2>示例接口</h2> 414 + <h2>邮箱验证码接口</h2>
421 <hr> 415 <hr>
422 <div class="panel panel-default"> 416 <div class="panel panel-default">
423 <div class="panel-heading" id="heading-2"> 417 <div class="panel-heading" id="heading-2">
424 <h4 class="panel-title"> 418 <h4 class="panel-title">
425 - <span class="label label-primary">POST</span>  
426 - <a data-toggle="collapse" data-parent="#accordion2" href="#collapseOne2"> 测试名称 <span class="text-muted">/api/demo/test/id/{id}/name/{name}</span></a> 419 + <span class="label label-success">GET</span>
  420 + <a data-toggle="collapse" data-parent="#accordion2" href="#collapseOne2"> 发送验证码 <span class="text-muted">/api/ems/send</span></a>
427 </h4> 421 </h4>
428 </div> 422 </div>
429 <div id="collapseOne2" class="panel-collapse collapse"> 423 <div id="collapseOne2" class="panel-collapse collapse">
@@ -441,28 +435,11 @@ @@ -441,28 +435,11 @@
441 435
442 <div class="tab-pane active" id="info2"> 436 <div class="tab-pane active" id="info2">
443 <div class="well"> 437 <div class="well">
444 - 测试描述信息 </div> 438 + 发送验证码 </div>
445 <div class="panel panel-default"> 439 <div class="panel panel-default">
446 <div class="panel-heading"><strong>Headers</strong></div> 440 <div class="panel-heading"><strong>Headers</strong></div>
447 <div class="panel-body"> 441 <div class="panel-body">
448 - <table class="table table-hover">  
449 - <thead>  
450 - <tr>  
451 - <th>名称</th>  
452 - <th>类型</th>  
453 - <th>必选</th>  
454 - <th>描述</th>  
455 - </tr>  
456 - </thead>  
457 - <tbody>  
458 - <tr>  
459 - <td>token</td>  
460 - <td>string</td>  
461 - <td>是</td>  
462 - <td>请求的Token</td>  
463 - </tr>  
464 - </tbody>  
465 - </table> 442 + 无
466 </div> 443 </div>
467 </div> 444 </div>
468 <div class="panel panel-default"> 445 <div class="panel panel-default">
@@ -479,22 +456,16 @@ @@ -479,22 +456,16 @@
479 </thead> 456 </thead>
480 <tbody> 457 <tbody>
481 <tr> 458 <tr>
482 - <td>id</td>  
483 - <td>integer</td>  
484 - <td>是</td>  
485 - <td>会员ID</td>  
486 - </tr>  
487 - <tr>  
488 - <td>name</td> 459 + <td>email</td>
489 <td>string</td> 460 <td>string</td>
490 <td>是</td> 461 <td>是</td>
491 - <td>用户名</td> 462 + <td>邮箱</td>
492 </tr> 463 </tr>
493 <tr> 464 <tr>
494 - <td>data</td>  
495 - <td>object</td> 465 + <td>event</td>
  466 + <td>string</td>
496 <td>是</td> 467 <td>是</td>
497 - <td>扩展数据</td> 468 + <td>事件名称</td>
498 </tr> 469 </tr>
499 </tbody> 470 </tbody>
500 </table> 471 </table>
@@ -511,31 +482,16 @@ @@ -511,31 +482,16 @@
511 <div class="row"> 482 <div class="row">
512 <div class="col-md-12"> 483 <div class="col-md-12">
513 <div class="panel panel-default"> 484 <div class="panel panel-default">
514 - <div class="panel-heading"><strong>Headers</strong></div>  
515 - <div class="panel-body">  
516 - <div class="headers">  
517 - <div class="form-group">  
518 - <label class="control-label" for="token">token</label>  
519 - <input type="string" class="form-control input-sm" id="token" required placeholder="请求的Token - Ex: " name="token">  
520 - </div>  
521 - </div>  
522 - </div>  
523 - </div>  
524 - <div class="panel panel-default">  
525 <div class="panel-heading"><strong>参数</strong></div> 485 <div class="panel-heading"><strong>参数</strong></div>
526 <div class="panel-body"> 486 <div class="panel-body">
527 - <form enctype="application/x-www-form-urlencoded" role="form" action="/api/demo/test/id/{id}/name/{name}" method="POST" name="form2" id="form2"> 487 + <form enctype="application/x-www-form-urlencoded" role="form" action="/api/ems/send" method="get" name="form2" id="form2">
528 <div class="form-group"> 488 <div class="form-group">
529 - <label class="control-label" for="id">id</label>  
530 - <input type="integer" class="form-control input-sm" id="id" required placeholder="会员ID" name="id">  
531 - </div>  
532 - <div class="form-group">  
533 - <label class="control-label" for="name">name</label>  
534 - <input type="string" class="form-control input-sm" id="name" required placeholder="用户名" name="name"> 489 + <label class="control-label" for="email">email</label>
  490 + <input type="string" class="form-control input-sm" id="email" required placeholder="邮箱" name="email">
535 </div> 491 </div>
536 <div class="form-group"> 492 <div class="form-group">
537 - <label class="control-label" for="data">data</label>  
538 - <input type="object" class="form-control input-sm" id="data" required placeholder="扩展数据 - 例: {'user_id':'int','user_name':'string','profile':{'email':'string','age':'integer'}}" name="data"> 493 + <label class="control-label" for="event">event</label>
  494 + <input type="string" class="form-control input-sm" id="event" required placeholder="事件名称" name="event">
539 </div> 495 </div>
540 <div class="form-group"> 496 <div class="form-group">
541 <button type="submit" class="btn btn-success send" rel="2">提交</button> 497 <button type="submit" class="btn btn-success send" rel="2">提交</button>
@@ -558,32 +514,7 @@ @@ -558,32 +514,7 @@
558 <div class="panel panel-default"> 514 <div class="panel panel-default">
559 <div class="panel-heading"><strong>返回参数</strong></div> 515 <div class="panel-heading"><strong>返回参数</strong></div>
560 <div class="panel-body"> 516 <div class="panel-body">
561 - <table class="table table-hover">  
562 - <thead>  
563 - <tr>  
564 - <th>名称</th>  
565 - <th>类型</th>  
566 - <th>描述</th>  
567 - </tr>  
568 - </thead>  
569 - <tbody>  
570 - <tr>  
571 - <td>code</td>  
572 - <td>integer</td>  
573 - <td></td>  
574 - </tr>  
575 - <tr>  
576 - <td>msg</td>  
577 - <td>string</td>  
578 - <td></td>  
579 - </tr>  
580 - <tr>  
581 - <td>data</td>  
582 - <td>object</td>  
583 - <td>扩展数据返回</td>  
584 - </tr>  
585 - </tbody>  
586 - </table> 517 + 无
587 </div> 518 </div>
588 </div> 519 </div>
589 </div> 520 </div>
@@ -593,10 +524,7 @@ @@ -593,10 +524,7 @@
593 <div class="tab-pane" id="sample2"> 524 <div class="tab-pane" id="sample2">
594 <div class="row"> 525 <div class="row">
595 <div class="col-md-12"> 526 <div class="col-md-12">
596 - <pre id="sample_response2">{  
597 - 'code':'1',  
598 - 'msg':'返回成功'  
599 - }</pre> 527 + <pre id="sample_response2">无</pre>
600 </div> 528 </div>
601 </div> 529 </div>
602 </div><!-- #sample --> 530 </div><!-- #sample -->
@@ -605,13 +533,11 @@ @@ -605,13 +533,11 @@
605 </div> 533 </div>
606 </div> 534 </div>
607 </div> 535 </div>
608 - <h2>邮箱验证码接口</h2>  
609 - <hr>  
610 <div class="panel panel-default"> 536 <div class="panel panel-default">
611 <div class="panel-heading" id="heading-3"> 537 <div class="panel-heading" id="heading-3">
612 <h4 class="panel-title"> 538 <h4 class="panel-title">
613 <span class="label label-success">GET</span> 539 <span class="label label-success">GET</span>
614 - <a data-toggle="collapse" data-parent="#accordion3" href="#collapseOne3"> 发送验证码 <span class="text-muted">/api/ems/send</span></a> 540 + <a data-toggle="collapse" data-parent="#accordion3" href="#collapseOne3"> 检测验证码 <span class="text-muted">/api/ems/check</span></a>
615 </h4> 541 </h4>
616 </div> 542 </div>
617 <div id="collapseOne3" class="panel-collapse collapse"> 543 <div id="collapseOne3" class="panel-collapse collapse">
@@ -629,7 +555,7 @@ @@ -629,7 +555,7 @@
629 555
630 <div class="tab-pane active" id="info3"> 556 <div class="tab-pane active" id="info3">
631 <div class="well"> 557 <div class="well">
632 - 发送验证码 </div> 558 + 检测验证码 </div>
633 <div class="panel panel-default"> 559 <div class="panel panel-default">
634 <div class="panel-heading"><strong>Headers</strong></div> 560 <div class="panel-heading"><strong>Headers</strong></div>
635 <div class="panel-body"> 561 <div class="panel-body">
@@ -661,6 +587,12 @@ @@ -661,6 +587,12 @@
661 <td>是</td> 587 <td>是</td>
662 <td>事件名称</td> 588 <td>事件名称</td>
663 </tr> 589 </tr>
  590 + <tr>
  591 + <td>captcha</td>
  592 + <td>string</td>
  593 + <td>是</td>
  594 + <td>验证码</td>
  595 + </tr>
664 </tbody> 596 </tbody>
665 </table> 597 </table>
666 </div> 598 </div>
@@ -678,7 +610,7 @@ @@ -678,7 +610,7 @@
678 <div class="panel panel-default"> 610 <div class="panel panel-default">
679 <div class="panel-heading"><strong>参数</strong></div> 611 <div class="panel-heading"><strong>参数</strong></div>
680 <div class="panel-body"> 612 <div class="panel-body">
681 - <form enctype="application/x-www-form-urlencoded" role="form" action="/api/ems/send" method="get" name="form3" id="form3"> 613 + <form enctype="application/x-www-form-urlencoded" role="form" action="/api/ems/check" method="get" name="form3" id="form3">
682 <div class="form-group"> 614 <div class="form-group">
683 <label class="control-label" for="email">email</label> 615 <label class="control-label" for="email">email</label>
684 <input type="string" class="form-control input-sm" id="email" required placeholder="邮箱" name="email"> 616 <input type="string" class="form-control input-sm" id="email" required placeholder="邮箱" name="email">
@@ -688,6 +620,10 @@ @@ -688,6 +620,10 @@
688 <input type="string" class="form-control input-sm" id="event" required placeholder="事件名称" name="event"> 620 <input type="string" class="form-control input-sm" id="event" required placeholder="事件名称" name="event">
689 </div> 621 </div>
690 <div class="form-group"> 622 <div class="form-group">
  623 + <label class="control-label" for="captcha">captcha</label>
  624 + <input type="string" class="form-control input-sm" id="captcha" required placeholder="验证码" name="captcha">
  625 + </div>
  626 + <div class="form-group">
691 <button type="submit" class="btn btn-success send" rel="3">提交</button> 627 <button type="submit" class="btn btn-success send" rel="3">提交</button>
692 <button type="reset" class="btn btn-info" rel="3">重置</button> 628 <button type="reset" class="btn btn-info" rel="3">重置</button>
693 </div> 629 </div>
@@ -727,11 +663,13 @@ @@ -727,11 +663,13 @@
727 </div> 663 </div>
728 </div> 664 </div>
729 </div> 665 </div>
  666 + <h2>Token接口</h2>
  667 + <hr>
730 <div class="panel panel-default"> 668 <div class="panel panel-default">
731 <div class="panel-heading" id="heading-4"> 669 <div class="panel-heading" id="heading-4">
732 <h4 class="panel-title"> 670 <h4 class="panel-title">
733 <span class="label label-success">GET</span> 671 <span class="label label-success">GET</span>
734 - <a data-toggle="collapse" data-parent="#accordion4" href="#collapseOne4"> 检测验证码 <span class="text-muted">/api/ems/check</span></a> 672 + <a data-toggle="collapse" data-parent="#accordion4" href="#collapseOne4"> 检测Token是否过期 <span class="text-muted">/api/token/check</span></a>
735 </h4> 673 </h4>
736 </div> 674 </div>
737 <div id="collapseOne4" class="panel-collapse collapse"> 675 <div id="collapseOne4" class="panel-collapse collapse">
@@ -749,7 +687,7 @@ @@ -749,7 +687,7 @@
749 687
750 <div class="tab-pane active" id="info4"> 688 <div class="tab-pane active" id="info4">
751 <div class="well"> 689 <div class="well">
752 - 检测验证码 </div> 690 + 检测Token是否过期 </div>
753 <div class="panel panel-default"> 691 <div class="panel panel-default">
754 <div class="panel-heading"><strong>Headers</strong></div> 692 <div class="panel-heading"><strong>Headers</strong></div>
755 <div class="panel-body"> 693 <div class="panel-body">
@@ -759,36 +697,7 @@ @@ -759,36 +697,7 @@
759 <div class="panel panel-default"> 697 <div class="panel panel-default">
760 <div class="panel-heading"><strong>参数</strong></div> 698 <div class="panel-heading"><strong>参数</strong></div>
761 <div class="panel-body"> 699 <div class="panel-body">
762 - <table class="table table-hover">  
763 - <thead>  
764 - <tr>  
765 - <th>名称</th>  
766 - <th>类型</th>  
767 - <th>必选</th>  
768 - <th>描述</th>  
769 - </tr>  
770 - </thead>  
771 - <tbody>  
772 - <tr>  
773 - <td>email</td>  
774 - <td>string</td>  
775 - <td>是</td>  
776 - <td>邮箱</td>  
777 - </tr>  
778 - <tr>  
779 - <td>event</td>  
780 - <td>string</td>  
781 - <td>是</td>  
782 - <td>事件名称</td>  
783 - </tr>  
784 - <tr>  
785 - <td>captcha</td>  
786 - <td>string</td>  
787 - <td>是</td>  
788 - <td>验证码</td>  
789 - </tr>  
790 - </tbody>  
791 - </table> 700 + 无
792 </div> 701 </div>
793 </div> 702 </div>
794 <div class="panel panel-default"> 703 <div class="panel panel-default">
@@ -804,18 +713,9 @@ @@ -804,18 +713,9 @@
804 <div class="panel panel-default"> 713 <div class="panel panel-default">
805 <div class="panel-heading"><strong>参数</strong></div> 714 <div class="panel-heading"><strong>参数</strong></div>
806 <div class="panel-body"> 715 <div class="panel-body">
807 - <form enctype="application/x-www-form-urlencoded" role="form" action="/api/ems/check" method="get" name="form4" id="form4">  
808 - <div class="form-group">  
809 - <label class="control-label" for="email">email</label>  
810 - <input type="string" class="form-control input-sm" id="email" required placeholder="邮箱" name="email">  
811 - </div>  
812 - <div class="form-group">  
813 - <label class="control-label" for="event">event</label>  
814 - <input type="string" class="form-control input-sm" id="event" required placeholder="事件名称" name="event">  
815 - </div> 716 + <form enctype="application/x-www-form-urlencoded" role="form" action="/api/token/check" method="get" name="form4" id="form4">
816 <div class="form-group"> 717 <div class="form-group">
817 - <label class="control-label" for="captcha">captcha</label>  
818 - <input type="string" class="form-control input-sm" id="captcha" required placeholder="验证码" name="captcha"> 718 + 无
819 </div> 719 </div>
820 <div class="form-group"> 720 <div class="form-group">
821 <button type="submit" class="btn btn-success send" rel="4">提交</button> 721 <button type="submit" class="btn btn-success send" rel="4">提交</button>
@@ -857,13 +757,11 @@ @@ -857,13 +757,11 @@
857 </div> 757 </div>
858 </div> 758 </div>
859 </div> 759 </div>
860 - <h2>首页接口</h2>  
861 - <hr>  
862 <div class="panel panel-default"> 760 <div class="panel panel-default">
863 <div class="panel-heading" id="heading-5"> 761 <div class="panel-heading" id="heading-5">
864 <h4 class="panel-title"> 762 <h4 class="panel-title">
865 <span class="label label-success">GET</span> 763 <span class="label label-success">GET</span>
866 - <a data-toggle="collapse" data-parent="#accordion5" href="#collapseOne5"> 首页 <span class="text-muted">/api/index/index</span></a> 764 + <a data-toggle="collapse" data-parent="#accordion5" href="#collapseOne5"> 刷新Token <span class="text-muted">/api/token/refresh</span></a>
867 </h4> 765 </h4>
868 </div> 766 </div>
869 <div id="collapseOne5" class="panel-collapse collapse"> 767 <div id="collapseOne5" class="panel-collapse collapse">
@@ -881,7 +779,7 @@ @@ -881,7 +779,7 @@
881 779
882 <div class="tab-pane active" id="info5"> 780 <div class="tab-pane active" id="info5">
883 <div class="well"> 781 <div class="well">
884 - 首页 </div> 782 + 刷新Token </div>
885 <div class="panel panel-default"> 783 <div class="panel panel-default">
886 <div class="panel-heading"><strong>Headers</strong></div> 784 <div class="panel-heading"><strong>Headers</strong></div>
887 <div class="panel-body"> 785 <div class="panel-body">
@@ -907,7 +805,7 @@ @@ -907,7 +805,7 @@
907 <div class="panel panel-default"> 805 <div class="panel panel-default">
908 <div class="panel-heading"><strong>参数</strong></div> 806 <div class="panel-heading"><strong>参数</strong></div>
909 <div class="panel-body"> 807 <div class="panel-body">
910 - <form enctype="application/x-www-form-urlencoded" role="form" action="/api/index/index" method="get" name="form5" id="form5"> 808 + <form enctype="application/x-www-form-urlencoded" role="form" action="/api/token/refresh" method="get" name="form5" id="form5">
911 <div class="form-group"> 809 <div class="form-group">
912 无 810 无
913 </div> 811 </div>
@@ -951,13 +849,13 @@ @@ -951,13 +849,13 @@
951 </div> 849 </div>
952 </div> 850 </div>
953 </div> 851 </div>
954 - <h2>Token接口</h2> 852 + <h2>个人中心</h2>
955 <hr> 853 <hr>
956 <div class="panel panel-default"> 854 <div class="panel panel-default">
957 <div class="panel-heading" id="heading-6"> 855 <div class="panel-heading" id="heading-6">
958 <h4 class="panel-title"> 856 <h4 class="panel-title">
959 - <span class="label label-success">GET</span>  
960 - <a data-toggle="collapse" data-parent="#accordion6" href="#collapseOne6"> 检测Token是否过期 <span class="text-muted">/api/token/check</span></a> 857 + <span class="label label-primary">POST</span>
  858 + <a data-toggle="collapse" data-parent="#accordion6" href="#collapseOne6"> 小程序登录 <span class="text-muted">/api/user/login</span></a>
961 </h4> 859 </h4>
962 </div> 860 </div>
963 <div id="collapseOne6" class="panel-collapse collapse"> 861 <div id="collapseOne6" class="panel-collapse collapse">
@@ -975,7 +873,7 @@ @@ -975,7 +873,7 @@
975 873
976 <div class="tab-pane active" id="info6"> 874 <div class="tab-pane active" id="info6">
977 <div class="well"> 875 <div class="well">
978 - 检测Token是否过期 </div> 876 + 小程序登录 </div>
979 <div class="panel panel-default"> 877 <div class="panel panel-default">
980 <div class="panel-heading"><strong>Headers</strong></div> 878 <div class="panel-heading"><strong>Headers</strong></div>
981 <div class="panel-body"> 879 <div class="panel-body">
@@ -985,7 +883,36 @@ @@ -985,7 +883,36 @@
985 <div class="panel panel-default"> 883 <div class="panel panel-default">
986 <div class="panel-heading"><strong>参数</strong></div> 884 <div class="panel-heading"><strong>参数</strong></div>
987 <div class="panel-body"> 885 <div class="panel-body">
988 - 无 886 + <table class="table table-hover">
  887 + <thead>
  888 + <tr>
  889 + <th>名称</th>
  890 + <th>类型</th>
  891 + <th>必选</th>
  892 + <th>描述</th>
  893 + </tr>
  894 + </thead>
  895 + <tbody>
  896 + <tr>
  897 + <td>code</td>
  898 + <td>string</td>
  899 + <td>是</td>
  900 + <td>小程序code</td>
  901 + </tr>
  902 + <tr>
  903 + <td>nickname</td>
  904 + <td>string</td>
  905 + <td>是</td>
  906 + <td>小程序昵称</td>
  907 + </tr>
  908 + <tr>
  909 + <td>avatar</td>
  910 + <td>string</td>
  911 + <td>是</td>
  912 + <td>小程序头像</td>
  913 + </tr>
  914 + </tbody>
  915 + </table>
989 </div> 916 </div>
990 </div> 917 </div>
991 <div class="panel panel-default"> 918 <div class="panel panel-default">
@@ -1001,9 +928,18 @@ @@ -1001,9 +928,18 @@
1001 <div class="panel panel-default"> 928 <div class="panel panel-default">
1002 <div class="panel-heading"><strong>参数</strong></div> 929 <div class="panel-heading"><strong>参数</strong></div>
1003 <div class="panel-body"> 930 <div class="panel-body">
1004 - <form enctype="application/x-www-form-urlencoded" role="form" action="/api/token/check" method="get" name="form6" id="form6"> 931 + <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/login" method="POST" name="form6" id="form6">
1005 <div class="form-group"> 932 <div class="form-group">
1006 - 无 933 + <label class="control-label" for="code">code</label>
  934 + <input type="string" class="form-control input-sm" id="code" required placeholder="小程序code" name="code">
  935 + </div>
  936 + <div class="form-group">
  937 + <label class="control-label" for="nickname">nickname</label>
  938 + <input type="string" class="form-control input-sm" id="nickname" required placeholder="小程序昵称" name="nickname">
  939 + </div>
  940 + <div class="form-group">
  941 + <label class="control-label" for="avatar">avatar</label>
  942 + <input type="string" class="form-control input-sm" id="avatar" required placeholder="小程序头像" name="avatar">
1007 </div> 943 </div>
1008 <div class="form-group"> 944 <div class="form-group">
1009 <button type="submit" class="btn btn-success send" rel="6">提交</button> 945 <button type="submit" class="btn btn-success send" rel="6">提交</button>
@@ -1036,7 +972,18 @@ @@ -1036,7 +972,18 @@
1036 <div class="tab-pane" id="sample6"> 972 <div class="tab-pane" id="sample6">
1037 <div class="row"> 973 <div class="row">
1038 <div class="col-md-12"> 974 <div class="col-md-12">
1039 - <pre id="sample_response6">无</pre> 975 + <pre id="sample_response6">{
  976 + "code": 1,
  977 + "msg": "登录成功",
  978 + "time": "1553839125",
  979 + "data": {
  980 + "token": "677afb39-1a4f-4492-84d3-0bcf32016b8a",//token
  981 + "user_id": 27,//用户id
  982 + "createtime": 1553839125,//登录时间
  983 + "expiretime": 1556431125,//token失效时间
  984 + "expires_in": 2592000//token失效剩余时间（单位s）
  985 + "openid": 1485212522522//openid
  986 + }</pre>
1040 </div> 987 </div>
1041 </div> 988 </div>
1042 </div><!-- #sample --> 989 </div><!-- #sample -->
@@ -1048,8 +995,8 @@ @@ -1048,8 +995,8 @@
1048 <div class="panel panel-default"> 995 <div class="panel panel-default">
1049 <div class="panel-heading" id="heading-7"> 996 <div class="panel-heading" id="heading-7">
1050 <h4 class="panel-title"> 997 <h4 class="panel-title">
1051 - <span class="label label-success">GET</span>  
1052 - <a data-toggle="collapse" data-parent="#accordion7" href="#collapseOne7"> 刷新Token <span class="text-muted">/api/token/refresh</span></a> 998 + <span class="label label-primary">POST</span>
  999 + <a data-toggle="collapse" data-parent="#accordion7" href="#collapseOne7"> 首页视频、图片、精美大片入口 <span class="text-muted">/api/user/index</span></a>
1053 </h4> 1000 </h4>
1054 </div> 1001 </div>
1055 <div id="collapseOne7" class="panel-collapse collapse"> 1002 <div id="collapseOne7" class="panel-collapse collapse">
@@ -1067,11 +1014,28 @@ @@ -1067,11 +1014,28 @@
1067 1014
1068 <div class="tab-pane active" id="info7"> 1015 <div class="tab-pane active" id="info7">
1069 <div class="well"> 1016 <div class="well">
1070 - 刷新Token </div> 1017 + 首页视频、图片、精美大片入口 </div>
1071 <div class="panel panel-default"> 1018 <div class="panel panel-default">
1072 <div class="panel-heading"><strong>Headers</strong></div> 1019 <div class="panel-heading"><strong>Headers</strong></div>
1073 <div class="panel-body"> 1020 <div class="panel-body">
1074 - 无 1021 + <table class="table table-hover">
  1022 + <thead>
  1023 + <tr>
  1024 + <th>名称</th>
  1025 + <th>类型</th>
  1026 + <th>必选</th>
  1027 + <th>描述</th>
  1028 + </tr>
  1029 + </thead>
  1030 + <tbody>
  1031 + <tr>
  1032 + <td>token</td>
  1033 + <td>string</td>
  1034 + <td>是</td>
  1035 + <td>请求的Token</td>
  1036 + </tr>
  1037 + </tbody>
  1038 + </table>
1075 </div> 1039 </div>
1076 </div> 1040 </div>
1077 <div class="panel panel-default"> 1041 <div class="panel panel-default">
@@ -1091,9 +1055,20 @@ @@ -1091,9 +1055,20 @@
1091 <div class="row"> 1055 <div class="row">
1092 <div class="col-md-12"> 1056 <div class="col-md-12">
1093 <div class="panel panel-default"> 1057 <div class="panel panel-default">
  1058 + <div class="panel-heading"><strong>Headers</strong></div>
  1059 + <div class="panel-body">
  1060 + <div class="headers">
  1061 + <div class="form-group">
  1062 + <label class="control-label" for="token">token</label>
  1063 + <input type="string" class="form-control input-sm" id="token" required placeholder="请求的Token - Ex: " name="token">
  1064 + </div>
  1065 + </div>
  1066 + </div>
  1067 + </div>
  1068 + <div class="panel panel-default">
1094 <div class="panel-heading"><strong>参数</strong></div> 1069 <div class="panel-heading"><strong>参数</strong></div>
1095 <div class="panel-body"> 1070 <div class="panel-body">
1096 - <form enctype="application/x-www-form-urlencoded" role="form" action="/api/token/refresh" method="get" name="form7" id="form7"> 1071 + <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/index" method="POST" name="form7" id="form7">
1097 <div class="form-group"> 1072 <div class="form-group">
1098 无 1073 无
1099 </div> 1074 </div>
@@ -1128,7 +1103,16 @@ @@ -1128,7 +1103,16 @@
1128 <div class="tab-pane" id="sample7"> 1103 <div class="tab-pane" id="sample7">
1129 <div class="row"> 1104 <div class="row">
1130 <div class="col-md-12"> 1105 <div class="col-md-12">
1131 - <pre id="sample_response7">无</pre> 1106 + <pre id="sample_response7">{
  1107 + 'code':'1',
  1108 + 'msg':'返回成功',
  1109 + "time": "1571492001",
  1110 + "data": {
  1111 + "video_thumbnail": http://mapwww.baidu.com 视频封面图地址
  1112 + "pic_thumbnail": http://mapwww.baidu.com 图片地址
  1113 + "wonderful_thumbnail": http://mapwww.baidu.com 精美大片地址
  1114 + }
  1115 + }</pre>
1132 </div> 1116 </div>
1133 </div> 1117 </div>
1134 </div><!-- #sample --> 1118 </div><!-- #sample -->
@@ -1137,13 +1121,11 @@ @@ -1137,13 +1121,11 @@
1137 </div> 1121 </div>
1138 </div> 1122 </div>
1139 </div> 1123 </div>
1140 - <h2>个人中心</h2>  
1141 - <hr>  
1142 <div class="panel panel-default"> 1124 <div class="panel panel-default">
1143 <div class="panel-heading" id="heading-8"> 1125 <div class="panel-heading" id="heading-8">
1144 <h4 class="panel-title"> 1126 <h4 class="panel-title">
1145 <span class="label label-primary">POST</span> 1127 <span class="label label-primary">POST</span>
1146 - <a data-toggle="collapse" data-parent="#accordion8" href="#collapseOne8"> 小程序登录 <span class="text-muted">/api/user/login</span></a> 1128 + <a data-toggle="collapse" data-parent="#accordion8" href="#collapseOne8"> 地区分类 <span class="text-muted">/api/user/type</span></a>
1147 </h4> 1129 </h4>
1148 </div> 1130 </div>
1149 <div id="collapseOne8" class="panel-collapse collapse"> 1131 <div id="collapseOne8" class="panel-collapse collapse">
@@ -1161,16 +1143,10 @@ @@ -1161,16 +1143,10 @@
1161 1143
1162 <div class="tab-pane active" id="info8"> 1144 <div class="tab-pane active" id="info8">
1163 <div class="well"> 1145 <div class="well">
1164 - 小程序登录 </div> 1146 + 地区分类 </div>
1165 <div class="panel panel-default"> 1147 <div class="panel panel-default">
1166 <div class="panel-heading"><strong>Headers</strong></div> 1148 <div class="panel-heading"><strong>Headers</strong></div>
1167 <div class="panel-body"> 1149 <div class="panel-body">
1168 - 无  
1169 - </div>  
1170 - </div>  
1171 - <div class="panel panel-default">  
1172 - <div class="panel-heading"><strong>参数</strong></div>  
1173 - <div class="panel-body">  
1174 <table class="table table-hover"> 1150 <table class="table table-hover">
1175 <thead> 1151 <thead>
1176 <tr> 1152 <tr>
@@ -1182,28 +1158,22 @@ @@ -1182,28 +1158,22 @@
1182 </thead> 1158 </thead>
1183 <tbody> 1159 <tbody>
1184 <tr> 1160 <tr>
1185 - <td>code</td>  
1186 - <td>string</td>  
1187 - <td>是</td>  
1188 - <td>小程序code</td>  
1189 - </tr>  
1190 - <tr>  
1191 - <td>nickname</td>  
1192 - <td>string</td>  
1193 - <td>是</td>  
1194 - <td>小程序昵称</td>  
1195 - </tr>  
1196 - <tr>  
1197 - <td>avatar</td> 1161 + <td>token</td>
1198 <td>string</td> 1162 <td>string</td>
1199 <td>是</td> 1163 <td>是</td>
1200 - <td>小程序头像</td> 1164 + <td>请求的Token</td>
1201 </tr> 1165 </tr>
1202 </tbody> 1166 </tbody>
1203 </table> 1167 </table>
1204 </div> 1168 </div>
1205 </div> 1169 </div>
1206 <div class="panel panel-default"> 1170 <div class="panel panel-default">
  1171 + <div class="panel-heading"><strong>参数</strong></div>
  1172 + <div class="panel-body">
  1173 + 无
  1174 + </div>
  1175 + </div>
  1176 + <div class="panel panel-default">
1207 <div class="panel-heading"><strong>正文</strong></div> 1177 <div class="panel-heading"><strong>正文</strong></div>
1208 <div class="panel-body"> 1178 <div class="panel-body">
1209 无 </div> 1179 无 </div>
@@ -1214,20 +1184,22 @@ @@ -1214,20 +1184,22 @@
1214 <div class="row"> 1184 <div class="row">
1215 <div class="col-md-12"> 1185 <div class="col-md-12">
1216 <div class="panel panel-default"> 1186 <div class="panel panel-default">
1217 - <div class="panel-heading"><strong>参数</strong></div> 1187 + <div class="panel-heading"><strong>Headers</strong></div>
1218 <div class="panel-body"> 1188 <div class="panel-body">
1219 - <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/login" method="POST" name="form8" id="form8">  
1220 - <div class="form-group">  
1221 - <label class="control-label" for="code">code</label>  
1222 - <input type="string" class="form-control input-sm" id="code" required placeholder="小程序code" name="code">  
1223 - </div> 1189 + <div class="headers">
1224 <div class="form-group"> 1190 <div class="form-group">
1225 - <label class="control-label" for="nickname">nickname</label>  
1226 - <input type="string" class="form-control input-sm" id="nickname" required placeholder="小程序昵称" name="nickname"> 1191 + <label class="control-label" for="token">token</label>
  1192 + <input type="string" class="form-control input-sm" id="token" required placeholder="请求的Token - Ex: " name="token">
1227 </div> 1193 </div>
  1194 + </div>
  1195 + </div>
  1196 + </div>
  1197 + <div class="panel panel-default">
  1198 + <div class="panel-heading"><strong>参数</strong></div>
  1199 + <div class="panel-body">
  1200 + <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/type" method="POST" name="form8" id="form8">
1228 <div class="form-group"> 1201 <div class="form-group">
1229 - <label class="control-label" for="avatar">avatar</label>  
1230 - <input type="string" class="form-control input-sm" id="avatar" required placeholder="小程序头像" name="avatar"> 1202 + 无
1231 </div> 1203 </div>
1232 <div class="form-group"> 1204 <div class="form-group">
1233 <button type="submit" class="btn btn-success send" rel="8">提交</button> 1205 <button type="submit" class="btn btn-success send" rel="8">提交</button>
@@ -1262,15 +1234,13 @@ @@ -1262,15 +1234,13 @@
1262 <div class="col-md-12"> 1234 <div class="col-md-12">
1263 <pre id="sample_response8">{ 1235 <pre id="sample_response8">{
1264 "code": 1, 1236 "code": 1,
1265 - "msg": "登录成功",  
1266 - "time": "1553839125", 1237 + "msg": "成功",
  1238 + "time": "1571492001",
1267 "data": { 1239 "data": {
1268 - "token": "677afb39-1a4f-4492-84d3-0bcf32016b8a",//token  
1269 - "user_id": 27,//用户id  
1270 - "createtime": 1553839125,//登录时间  
1271 - "expiretime": 1556431125,//token失效时间  
1272 - "expires_in": 2592000//token失效剩余时间（单位s）  
1273 - "openid": 1485212522522//openid 1240 + "id": 4,//分类id
  1241 + "area_name": //分类名称
  1242 + "thumbnail": //图片
  1243 + }
1274 }</pre> 1244 }</pre>
1275 </div> 1245 </div>
1276 </div> 1246 </div>
@@ -1284,7 +1254,7 @@ @@ -1284,7 +1254,7 @@
1284 <div class="panel-heading" id="heading-9"> 1254 <div class="panel-heading" id="heading-9">
1285 <h4 class="panel-title"> 1255 <h4 class="panel-title">
1286 <span class="label label-primary">POST</span> 1256 <span class="label label-primary">POST</span>
1287 - <a data-toggle="collapse" data-parent="#accordion9" href="#collapseOne9"> 首页视频、图片、精美大片入口 <span class="text-muted">/api/user/index</span></a> 1257 + <a data-toggle="collapse" data-parent="#accordion9" href="#collapseOne9"> 搜索页 <span class="text-muted">/api/user/search</span></a>
1288 </h4> 1258 </h4>
1289 </div> 1259 </div>
1290 <div id="collapseOne9" class="panel-collapse collapse"> 1260 <div id="collapseOne9" class="panel-collapse collapse">
@@ -1302,7 +1272,7 @@ @@ -1302,7 +1272,7 @@
1302 1272
1303 <div class="tab-pane active" id="info9"> 1273 <div class="tab-pane active" id="info9">
1304 <div class="well"> 1274 <div class="well">
1305 - 首页视频、图片、精美大片入口 </div> 1275 + 搜索页 </div>
1306 <div class="panel panel-default"> 1276 <div class="panel panel-default">
1307 <div class="panel-heading"><strong>Headers</strong></div> 1277 <div class="panel-heading"><strong>Headers</strong></div>
1308 <div class="panel-body"> 1278 <div class="panel-body">
@@ -1329,7 +1299,30 @@ @@ -1329,7 +1299,30 @@
1329 <div class="panel panel-default"> 1299 <div class="panel panel-default">
1330 <div class="panel-heading"><strong>参数</strong></div> 1300 <div class="panel-heading"><strong>参数</strong></div>
1331 <div class="panel-body"> 1301 <div class="panel-body">
1332 - 无 1302 + <table class="table table-hover">
  1303 + <thead>
  1304 + <tr>
  1305 + <th>名称</th>
  1306 + <th>类型</th>
  1307 + <th>必选</th>
  1308 + <th>描述</th>
  1309 + </tr>
  1310 + </thead>
  1311 + <tbody>
  1312 + <tr>
  1313 + <td>type_id</td>
  1314 + <td>inter</td>
  1315 + <td>否</td>
  1316 + <td>视频/图片 （视频为1 图片为2 精美大片为3）</td>
  1317 + </tr>
  1318 + <tr>
  1319 + <td>keyword</td>
  1320 + <td>string</td>
  1321 + <td>是</td>
  1322 + <td>关键字</td>
  1323 + </tr>
  1324 + </tbody>
  1325 + </table>
1333 </div> 1326 </div>
1334 </div> 1327 </div>
1335 <div class="panel panel-default"> 1328 <div class="panel panel-default">
@@ -1356,9 +1349,14 @@ @@ -1356,9 +1349,14 @@
1356 <div class="panel panel-default"> 1349 <div class="panel panel-default">
1357 <div class="panel-heading"><strong>参数</strong></div> 1350 <div class="panel-heading"><strong>参数</strong></div>
1358 <div class="panel-body"> 1351 <div class="panel-body">
1359 - <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/index" method="POST" name="form9" id="form9"> 1352 + <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/search" method="POST" name="form9" id="form9">
1360 <div class="form-group"> 1353 <div class="form-group">
1361 - 无 1354 + <label class="control-label" for="type_id">type_id</label>
  1355 + <input type="inter" class="form-control input-sm" id="type_id" placeholder="视频/图片 （视频为1 图片为2 精美大片为3）" name="type_id">
  1356 + </div>
  1357 + <div class="form-group">
  1358 + <label class="control-label" for="keyword">keyword</label>
  1359 + <input type="string" class="form-control input-sm" id="keyword" required placeholder="关键字" name="keyword">
1362 </div> 1360 </div>
1363 <div class="form-group"> 1361 <div class="form-group">
1364 <button type="submit" class="btn btn-success send" rel="9">提交</button> 1362 <button type="submit" class="btn btn-success send" rel="9">提交</button>
@@ -1392,13 +1390,13 @@ @@ -1392,13 +1390,13 @@
1392 <div class="row"> 1390 <div class="row">
1393 <div class="col-md-12"> 1391 <div class="col-md-12">
1394 <pre id="sample_response9">{ 1392 <pre id="sample_response9">{
1395 - 'code':'1',  
1396 - 'msg':'返回成功',  
1397 - "time": "1571492001", 1393 + "code": 1,
  1394 + "msg": "成功",
  1395 + "time": "1571492001",
1398 "data": { 1396 "data": {
1399 - "video_thumbnail": http://mapwww.baidu.com 视频封面图地址  
1400 - "pic_thumbnail": http://mapwww.baidu.com 图片地址  
1401 - "wonderful_thumbnail": http://mapwww.baidu.com 精美大片地址 1397 + "id": 4,//视频id/图片id,
  1398 + "thumbnail": //视频封面图地址/图片地址,
  1399 + "video": //视频路径/精美大片视频路径,
1402 } 1400 }
1403 }</pre> 1401 }</pre>
1404 </div> 1402 </div>
@@ -1413,7 +1411,7 @@ @@ -1413,7 +1411,7 @@
1413 <div class="panel-heading" id="heading-10"> 1411 <div class="panel-heading" id="heading-10">
1414 <h4 class="panel-title"> 1412 <h4 class="panel-title">
1415 <span class="label label-primary">POST</span> 1413 <span class="label label-primary">POST</span>
1416 - <a data-toggle="collapse" data-parent="#accordion10" href="#collapseOne10"> 地区分类 <span class="text-muted">/api/user/type</span></a> 1414 + <a data-toggle="collapse" data-parent="#accordion10" href="#collapseOne10"> 图片列表 <span class="text-muted">/api/user/pic</span></a>
1417 </h4> 1415 </h4>
1418 </div> 1416 </div>
1419 <div id="collapseOne10" class="panel-collapse collapse"> 1417 <div id="collapseOne10" class="panel-collapse collapse">
@@ -1431,7 +1429,7 @@ @@ -1431,7 +1429,7 @@
1431 1429
1432 <div class="tab-pane active" id="info10"> 1430 <div class="tab-pane active" id="info10">
1433 <div class="well"> 1431 <div class="well">
1434 - 地区分类 </div> 1432 + 图片列表 </div>
1435 <div class="panel panel-default"> 1433 <div class="panel panel-default">
1436 <div class="panel-heading"><strong>Headers</strong></div> 1434 <div class="panel-heading"><strong>Headers</strong></div>
1437 <div class="panel-body"> 1435 <div class="panel-body">
@@ -1458,7 +1456,24 @@ @@ -1458,7 +1456,24 @@
1458 <div class="panel panel-default"> 1456 <div class="panel panel-default">
1459 <div class="panel-heading"><strong>参数</strong></div> 1457 <div class="panel-heading"><strong>参数</strong></div>
1460 <div class="panel-body"> 1458 <div class="panel-body">
1461 - 无 1459 + <table class="table table-hover">
  1460 + <thead>
  1461 + <tr>
  1462 + <th>名称</th>
  1463 + <th>类型</th>
  1464 + <th>必选</th>
  1465 + <th>描述</th>
  1466 + </tr>
  1467 + </thead>
  1468 + <tbody>
  1469 + <tr>
  1470 + <td>type_id</td>
  1471 + <td>inter</td>
  1472 + <td>否</td>
  1473 + <td>地区ID</td>
  1474 + </tr>
  1475 + </tbody>
  1476 + </table>
1462 </div> 1477 </div>
1463 </div> 1478 </div>
1464 <div class="panel panel-default"> 1479 <div class="panel panel-default">
@@ -1485,9 +1500,10 @@ @@ -1485,9 +1500,10 @@
1485 <div class="panel panel-default"> 1500 <div class="panel panel-default">
1486 <div class="panel-heading"><strong>参数</strong></div> 1501 <div class="panel-heading"><strong>参数</strong></div>
1487 <div class="panel-body"> 1502 <div class="panel-body">
1488 - <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/type" method="POST" name="form10" id="form10"> 1503 + <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/pic" method="POST" name="form10" id="form10">
1489 <div class="form-group"> 1504 <div class="form-group">
1490 - 无 1505 + <label class="control-label" for="type_id">type_id</label>
  1506 + <input type="inter" class="form-control input-sm" id="type_id" placeholder="地区ID" name="type_id">
1491 </div> 1507 </div>
1492 <div class="form-group"> 1508 <div class="form-group">
1493 <button type="submit" class="btn btn-success send" rel="10">提交</button> 1509 <button type="submit" class="btn btn-success send" rel="10">提交</button>
@@ -1525,10 +1541,9 @@ @@ -1525,10 +1541,9 @@
1525 "msg": "成功", 1541 "msg": "成功",
1526 "time": "1571492001", 1542 "time": "1571492001",
1527 "data": { 1543 "data": {
1528 - "id": 4,//分类id  
1529 - "area_name": //分类名称  
1530 - "thumbnail": //图片  
1531 - } 1544 + "id": 4,//图片id,
  1545 + "thumbnail": //缩略图,
  1546 + }
1532 }</pre> 1547 }</pre>
1533 </div> 1548 </div>
1534 </div> 1549 </div>
@@ -1542,7 +1557,7 @@ @@ -1542,7 +1557,7 @@
1542 <div class="panel-heading" id="heading-11"> 1557 <div class="panel-heading" id="heading-11">
1543 <h4 class="panel-title"> 1558 <h4 class="panel-title">
1544 <span class="label label-primary">POST</span> 1559 <span class="label label-primary">POST</span>
1545 - <a data-toggle="collapse" data-parent="#accordion11" href="#collapseOne11"> 搜索页 <span class="text-muted">/api/user/search</span></a> 1560 + <a data-toggle="collapse" data-parent="#accordion11" href="#collapseOne11"> 视频列表 <span class="text-muted">/api/user/video</span></a>
1546 </h4> 1561 </h4>
1547 </div> 1562 </div>
1548 <div id="collapseOne11" class="panel-collapse collapse"> 1563 <div id="collapseOne11" class="panel-collapse collapse">
@@ -1560,7 +1575,7 @@ @@ -1560,7 +1575,7 @@
1560 1575
1561 <div class="tab-pane active" id="info11"> 1576 <div class="tab-pane active" id="info11">
1562 <div class="well"> 1577 <div class="well">
1563 - 搜索页 </div> 1578 + 视频列表 </div>
1564 <div class="panel panel-default"> 1579 <div class="panel panel-default">
1565 <div class="panel-heading"><strong>Headers</strong></div> 1580 <div class="panel-heading"><strong>Headers</strong></div>
1566 <div class="panel-body"> 1581 <div class="panel-body">
@@ -1601,13 +1616,7 @@ @@ -1601,13 +1616,7 @@
1601 <td>type_id</td> 1616 <td>type_id</td>
1602 <td>inter</td> 1617 <td>inter</td>
1603 <td>否</td> 1618 <td>否</td>
1604 - <td>视频/图片 （视频为1 图片为2 精美大片为3）</td>  
1605 - </tr>  
1606 - <tr>  
1607 - <td>keyword</td>  
1608 - <td>string</td>  
1609 - <td>是</td>  
1610 - <td>关键字</td> 1619 + <td>地区ID</td>
1611 </tr> 1620 </tr>
1612 </tbody> 1621 </tbody>
1613 </table> 1622 </table>
@@ -1637,14 +1646,10 @@ @@ -1637,14 +1646,10 @@
1637 <div class="panel panel-default"> 1646 <div class="panel panel-default">
1638 <div class="panel-heading"><strong>参数</strong></div> 1647 <div class="panel-heading"><strong>参数</strong></div>
1639 <div class="panel-body"> 1648 <div class="panel-body">
1640 - <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/search" method="POST" name="form11" id="form11"> 1649 + <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/video" method="POST" name="form11" id="form11">
1641 <div class="form-group"> 1650 <div class="form-group">
1642 <label class="control-label" for="type_id">type_id</label> 1651 <label class="control-label" for="type_id">type_id</label>
1643 - <input type="inter" class="form-control input-sm" id="type_id" placeholder="视频/图片 （视频为1 图片为2 精美大片为3）" name="type_id">  
1644 - </div>  
1645 - <div class="form-group">  
1646 - <label class="control-label" for="keyword">keyword</label>  
1647 - <input type="string" class="form-control input-sm" id="keyword" required placeholder="关键字" name="keyword"> 1652 + <input type="inter" class="form-control input-sm" id="type_id" placeholder="地区ID" name="type_id">
1648 </div> 1653 </div>
1649 <div class="form-group"> 1654 <div class="form-group">
1650 <button type="submit" class="btn btn-success send" rel="11">提交</button> 1655 <button type="submit" class="btn btn-success send" rel="11">提交</button>
@@ -1682,11 +1687,11 @@ @@ -1682,11 +1687,11 @@
1682 "msg": "成功", 1687 "msg": "成功",
1683 "time": "1571492001", 1688 "time": "1571492001",
1684 "data": { 1689 "data": {
1685 - "id": 4,//视频id/图片id,  
1686 - "thumbnail": //视频封面图地址/图片地址,  
1687 - "video": //视频路径/精美大片视频路径, 1690 + "id": //图片id,
  1691 + "thumbnail": //视频封面,
  1692 + "video"://视频地址
1688 } 1693 }
1689 - }</pre> 1694 + }</pre>
1690 </div> 1695 </div>
1691 </div> 1696 </div>
1692 </div><!-- #sample --> 1697 </div><!-- #sample -->
@@ -1699,7 +1704,7 @@ @@ -1699,7 +1704,7 @@
1699 <div class="panel-heading" id="heading-12"> 1704 <div class="panel-heading" id="heading-12">
1700 <h4 class="panel-title"> 1705 <h4 class="panel-title">
1701 <span class="label label-primary">POST</span> 1706 <span class="label label-primary">POST</span>
1702 - <a data-toggle="collapse" data-parent="#accordion12" href="#collapseOne12"> 图片列表 <span class="text-muted">/api/user/pic</span></a> 1707 + <a data-toggle="collapse" data-parent="#accordion12" href="#collapseOne12"> 图片详情 <span class="text-muted">/api/user/picdetail</span></a>
1703 </h4> 1708 </h4>
1704 </div> 1709 </div>
1705 <div id="collapseOne12" class="panel-collapse collapse"> 1710 <div id="collapseOne12" class="panel-collapse collapse">
@@ -1717,7 +1722,7 @@ @@ -1717,7 +1722,7 @@
1717 1722
1718 <div class="tab-pane active" id="info12"> 1723 <div class="tab-pane active" id="info12">
1719 <div class="well"> 1724 <div class="well">
1720 - 图片列表 </div> 1725 + 图片详情 </div>
1721 <div class="panel panel-default"> 1726 <div class="panel panel-default">
1722 <div class="panel-heading"><strong>Headers</strong></div> 1727 <div class="panel-heading"><strong>Headers</strong></div>
1723 <div class="panel-body"> 1728 <div class="panel-body">
@@ -1755,10 +1760,10 @@ @@ -1755,10 +1760,10 @@
1755 </thead> 1760 </thead>
1756 <tbody> 1761 <tbody>
1757 <tr> 1762 <tr>
1758 - <td>type_id</td> 1763 + <td>pic_id</td>
1759 <td>inter</td> 1764 <td>inter</td>
1760 - <td>否</td>  
1761 - <td>地区ID</td> 1765 + <td>是</td>
  1766 + <td>图片ID</td>
1762 </tr> 1767 </tr>
1763 </tbody> 1768 </tbody>
1764 </table> 1769 </table>
@@ -1788,10 +1793,10 @@ @@ -1788,10 +1793,10 @@
1788 <div class="panel panel-default"> 1793 <div class="panel panel-default">
1789 <div class="panel-heading"><strong>参数</strong></div> 1794 <div class="panel-heading"><strong>参数</strong></div>
1790 <div class="panel-body"> 1795 <div class="panel-body">
1791 - <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/pic" method="POST" name="form12" id="form12"> 1796 + <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/picdetail" method="POST" name="form12" id="form12">
1792 <div class="form-group"> 1797 <div class="form-group">
1793 - <label class="control-label" for="type_id">type_id</label>  
1794 - <input type="inter" class="form-control input-sm" id="type_id" placeholder="地区ID" name="type_id"> 1798 + <label class="control-label" for="pic_id">pic_id</label>
  1799 + <input type="inter" class="form-control input-sm" id="pic_id" required placeholder="图片ID" name="pic_id">
1795 </div> 1800 </div>
1796 <div class="form-group"> 1801 <div class="form-group">
1797 <button type="submit" class="btn btn-success send" rel="12">提交</button> 1802 <button type="submit" class="btn btn-success send" rel="12">提交</button>
@@ -1825,13 +1830,20 @@ @@ -1825,13 +1830,20 @@
1825 <div class="row"> 1830 <div class="row">
1826 <div class="col-md-12"> 1831 <div class="col-md-12">
1827 <pre id="sample_response12">{ 1832 <pre id="sample_response12">{
1828 - "code": 1,  
1829 - "msg": "成功",  
1830 - "time": "1571492001",  
1831 - "data": {  
1832 - "id": 4,//图片id,  
1833 - "thumbnail": //缩略图,  
1834 - } 1833 + "code": 1,
  1834 + "msg": "成功",
  1835 + "time": "1571492001",
  1836 + "data": {
  1837 + "id": 4,//图片id,
  1838 + "title"://标题
  1839 + "thumbnail": //缩略图,
  1840 + "water_url": //小样带水印的图片地址,
  1841 + "price"://正常价格,
  1842 + "vip_price"://vip价格,
  1843 + "content"://图片介绍,
  1844 + "is_vip"://是否为会员（0否 1是）
  1845 +
  1846 + }
1835 }</pre> 1847 }</pre>
1836 </div> 1848 </div>
1837 </div> 1849 </div>
@@ -1845,7 +1857,7 @@ @@ -1845,7 +1857,7 @@
1845 <div class="panel-heading" id="heading-13"> 1857 <div class="panel-heading" id="heading-13">
1846 <h4 class="panel-title"> 1858 <h4 class="panel-title">
1847 <span class="label label-primary">POST</span> 1859 <span class="label label-primary">POST</span>
1848 - <a data-toggle="collapse" data-parent="#accordion13" href="#collapseOne13"> 图片详情 <span class="text-muted">/api/user/picdetail</span></a> 1860 + <a data-toggle="collapse" data-parent="#accordion13" href="#collapseOne13"> 视频详情 <span class="text-muted">/api/user/videodetail</span></a>
1849 </h4> 1861 </h4>
1850 </div> 1862 </div>
1851 <div id="collapseOne13" class="panel-collapse collapse"> 1863 <div id="collapseOne13" class="panel-collapse collapse">
@@ -1863,7 +1875,7 @@ @@ -1863,7 +1875,7 @@
1863 1875
1864 <div class="tab-pane active" id="info13"> 1876 <div class="tab-pane active" id="info13">
1865 <div class="well"> 1877 <div class="well">
1866 - 图片详情 </div> 1878 + 视频详情 </div>
1867 <div class="panel panel-default"> 1879 <div class="panel panel-default">
1868 <div class="panel-heading"><strong>Headers</strong></div> 1880 <div class="panel-heading"><strong>Headers</strong></div>
1869 <div class="panel-body"> 1881 <div class="panel-body">
@@ -1901,10 +1913,10 @@ @@ -1901,10 +1913,10 @@
1901 </thead> 1913 </thead>
1902 <tbody> 1914 <tbody>
1903 <tr> 1915 <tr>
1904 - <td>pic_id</td> 1916 + <td>video_id</td>
1905 <td>inter</td> 1917 <td>inter</td>
1906 <td>是</td> 1918 <td>是</td>
1907 - <td>图片ID</td> 1919 + <td>视频ID</td>
1908 </tr> 1920 </tr>
1909 </tbody> 1921 </tbody>
1910 </table> 1922 </table>
@@ -1934,10 +1946,10 @@ @@ -1934,10 +1946,10 @@
1934 <div class="panel panel-default"> 1946 <div class="panel panel-default">
1935 <div class="panel-heading"><strong>参数</strong></div> 1947 <div class="panel-heading"><strong>参数</strong></div>
1936 <div class="panel-body"> 1948 <div class="panel-body">
1937 - <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/picdetail" method="POST" name="form13" id="form13"> 1949 + <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/videodetail" method="POST" name="form13" id="form13">
1938 <div class="form-group"> 1950 <div class="form-group">
1939 - <label class="control-label" for="pic_id">pic_id</label>  
1940 - <input type="inter" class="form-control input-sm" id="pic_id" required placeholder="图片ID" name="pic_id"> 1951 + <label class="control-label" for="video_id">video_id</label>
  1952 + <input type="inter" class="form-control input-sm" id="video_id" required placeholder="视频ID" name="video_id">
1941 </div> 1953 </div>
1942 <div class="form-group"> 1954 <div class="form-group">
1943 <button type="submit" class="btn btn-success send" rel="13">提交</button> 1955 <button type="submit" class="btn btn-success send" rel="13">提交</button>
@@ -1975,17 +1987,17 @@ @@ -1975,17 +1987,17 @@
1975 "msg": "成功", 1987 "msg": "成功",
1976 "time": "1571492001", 1988 "time": "1571492001",
1977 "data": { 1989 "data": {
1978 - "id": 4,//图片id, 1990 + "id": 4,//视频id,
1979 "title"://标题 1991 "title"://标题
1980 - "thumbnail": //缩略图,  
1981 - "water_url": //小样带水印的图片地址,  
1982 - "price"://正常价格,  
1983 - "vip_price"://vip价格,  
1984 - "content"://图片介绍,  
1985 - "is_vip"://是否为会员（0否 1是）  
1986 - 1992 + "thumbnail": //视频封面图,
  1993 + "video": //2K视频地址,
  1994 + "water_url"://小样视频网址
  1995 + "price"://2K价格,
  1996 + "vip_price"://2Kvip价格,
  1997 + "content"://图片介绍,
  1998 + "is_vip"://是否为会员（0否 1是）
1987 } 1999 }
1988 - }</pre> 2000 + }</pre>
1989 </div> 2001 </div>
1990 </div> 2002 </div>
1991 </div><!-- #sample --> 2003 </div><!-- #sample -->
@@ -2128,7 +2140,7 @@ @@ -2128,7 +2140,7 @@
2128 2140
2129 <div class="row mt0 footer"> 2141 <div class="row mt0 footer">
2130 <div class="col-md-6" align="left"> 2142 <div class="col-md-6" align="left">
2131 - Generated on 2019-11-19 18:57:51 </div> 2143 + Generated on 2019-11-19 19:24:34 </div>
2132 <div class="col-md-6" align="right"> 2144 <div class="col-md-6" align="right">
2133 <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a> 2145 <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
2134 </div> 2146 </div>
@@ -38,6 +38,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -38,6 +38,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
38 {field: 'click_num', title: __('Click_num')}, 38 {field: 'click_num', title: __('Click_num')},
39 {field: 'price', title: __('Price')}, 39 {field: 'price', title: __('Price')},
40 {field: 'vip_price', title: __('Vip_price')}, 40 {field: 'vip_price', title: __('Vip_price')},
  41 + {field: 'four_price', title: __('Four_price')},
  42 + {field: 'four_vipprice', title: __('Four_vipprice')},
  43 + {field: 'eight_price', title: __('Eight_price')},
  44 + {field: 'eight_vipprice', title: __('Eight_vipprice')},
41 {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime}, 45 {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
42 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} 46 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
43 ] 47 ]