郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 97b15b3c8a18cb5b3e3d5d27887cbccdb3c71f0e 1 个父辈 3e6d8020
1 个管道 的构建 通过 耗费 10 秒

修改组合订单

内嵌 并排对比
正在显示 4 个修改的文件 包含 663 行增加 和 178 行删除
@@ -2,7 +2,6 @@ @@ -2,7 +2,6 @@
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="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />  
6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Pay.php" afterPath="$PROJECT_DIR$/application/api/controller/Pay.php" /> 5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Pay.php" afterPath="$PROJECT_DIR$/application/api/controller/Pay.php" />
7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" /> 6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
8 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" /> 7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
@@ -19,14 +18,15 @@ @@ -19,14 +18,15 @@
19 <file leaf-file-name="User.php" pinned="false" current-in-tab="true"> 18 <file leaf-file-name="User.php" pinned="false" current-in-tab="true">
20 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 19 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
21 <provider selected="true" editor-type-id="text-editor"> 20 <provider selected="true" editor-type-id="text-editor">
22 - <state relative-caret-position="25">  
23 - <caret line="748" column="41" lean-forward="false" selection-start-line="748" selection-start-column="41" selection-end-line="748" selection-end-column="41" /> 21 + <state relative-caret-position="182">
  22 + <caret line="1049" column="50" lean-forward="true" selection-start-line="1049" selection-start-column="50" selection-end-line="1049" selection-end-column="50" />
24 <folding> 23 <folding>
25 <element signature="e#38#68#0#PHP" expanded="true" /> 24 <element signature="e#38#68#0#PHP" expanded="true" />
26 <element signature="e#337#456#0#PHP" expanded="false" /> 25 <element signature="e#337#456#0#PHP" expanded="false" />
27 <element signature="e#462#1200#0#PHP" expanded="false" /> 26 <element signature="e#462#1200#0#PHP" expanded="false" />
28 <element signature="e#1205#2868#0#PHP" expanded="false" /> 27 <element signature="e#1205#2868#0#PHP" expanded="false" />
29 <element signature="e#2874#3402#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" /> 30 <element signature="e#4184#4591#0#PHP" expanded="false" />
31 <element signature="e#4596#4939#0#PHP" expanded="false" /> 31 <element signature="e#4596#4939#0#PHP" expanded="false" />
32 <element signature="e#4945#5782#0#PHP" expanded="false" /> 32 <element signature="e#4945#5782#0#PHP" expanded="false" />
@@ -52,12 +52,16 @@ @@ -52,12 +52,16 @@
52 <element signature="e#21466#21824#0#PHP" expanded="false" /> 52 <element signature="e#21466#21824#0#PHP" expanded="false" />
53 <element signature="e#21829#22019#0#PHP" expanded="false" /> 53 <element signature="e#21829#22019#0#PHP" expanded="false" />
54 <element signature="e#22025#23168#0#PHP" expanded="false" /> 54 <element signature="e#22025#23168#0#PHP" expanded="false" />
  55 + <element signature="e#23173#25838#0#PHP" expanded="false" />
55 <element signature="e#25844#26335#0#PHP" expanded="false" /> 56 <element signature="e#25844#26335#0#PHP" expanded="false" />
56 <element signature="e#26340#27427#0#PHP" expanded="false" /> 57 <element signature="e#26340#27427#0#PHP" expanded="false" />
57 <element signature="e#27433#27967#0#PHP" expanded="false" /> 58 <element signature="e#27433#27967#0#PHP" expanded="false" />
58 <element signature="e#27972#28886#0#PHP" expanded="false" /> 59 <element signature="e#27972#28886#0#PHP" expanded="false" />
59 <element signature="e#28892#29423#0#PHP" expanded="false" /> 60 <element signature="e#28892#29423#0#PHP" expanded="false" />
60 - <element signature="e#29428#30348#0#PHP" expanded="false" /> 61 + <element signature="e#29428#30347#0#PHP" expanded="false" />
  62 + <element signature="e#30353#31002#0#PHP" expanded="false" />
  63 + <element signature="e#31007#31880#0#PHP" expanded="false" />
  64 + <element signature="e#31886#32481#0#PHP" expanded="false" />
61 </folding> 65 </folding>
62 </state> 66 </state>
63 </provider> 67 </provider>
@@ -66,8 +70,8 @@ @@ -66,8 +70,8 @@
66 <file leaf-file-name="Pay.php" pinned="false" current-in-tab="false"> 70 <file leaf-file-name="Pay.php" pinned="false" current-in-tab="false">
67 <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> 71 <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
68 <provider selected="true" editor-type-id="text-editor"> 72 <provider selected="true" editor-type-id="text-editor">
69 - <state relative-caret-position="450">  
70 - <caret line="94" column="7" lean-forward="false" selection-start-line="94" selection-start-column="7" selection-end-line="94" selection-end-column="7" /> 73 + <state relative-caret-position="558">
  74 + <caret line="372" column="16" lean-forward="true" selection-start-line="372" selection-start-column="16" selection-end-line="372" selection-end-column="16" />
71 <folding> 75 <folding>
72 <element signature="e#450#569#0#PHP" expanded="false" /> 76 <element signature="e#450#569#0#PHP" expanded="false" />
73 <element signature="e#575#888#0#PHP" expanded="false" /> 77 <element signature="e#575#888#0#PHP" expanded="false" />
@@ -75,11 +79,11 @@ @@ -75,11 +79,11 @@
75 <element signature="e#2944#3362#0#PHP" expanded="false" /> 79 <element signature="e#2944#3362#0#PHP" expanded="false" />
76 <element signature="e#3367#7202#0#PHP" expanded="false" /> 80 <element signature="e#3367#7202#0#PHP" expanded="false" />
77 <element signature="e#7208#7628#0#PHP" expanded="false" /> 81 <element signature="e#7208#7628#0#PHP" expanded="false" />
78 - <element signature="e#7633#11475#0#PHP" expanded="false" />  
79 - <element signature="e#11502#13401#0#PHP" expanded="false" />  
80 - <element signature="e#13430#14260#0#PHP" expanded="false" />  
81 - <element signature="e#14289#15122#0#PHP" expanded="false" />  
82 - <element signature="e#15145#15362#0#PHP" expanded="false" /> 82 + <element signature="e#7633#11473#0#PHP" expanded="false" />
  83 + <element signature="e#11500#13399#0#PHP" expanded="false" />
  84 + <element signature="e#13428#14258#0#PHP" expanded="false" />
  85 + <element signature="e#14287#15120#0#PHP" expanded="false" />
  86 + <element signature="e#15143#15360#0#PHP" expanded="false" />
83 </folding> 87 </folding>
84 </state> 88 </state>
85 </provider> 89 </provider>
@@ -159,10 +163,10 @@ @@ -159,10 +163,10 @@
159 </component> 163 </component>
160 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 164 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
161 <component name="ProjectFrameBounds" extendedState="1"> 165 <component name="ProjectFrameBounds" extendedState="1">
162 - <option name="x" value="136" />  
163 - <option name="y" value="61" /> 166 + <option name="x" value="145" />
  167 + <option name="y" value="19" />
164 <option name="width" value="1699" /> 168 <option name="width" value="1699" />
165 - <option name="height" value="970" /> 169 + <option name="height" value="994" />
166 </component> 170 </component>
167 <component name="ProjectView"> 171 <component name="ProjectView">
168 <navigator currentView="ProjectPane" proportions="" version="1"> 172 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -260,7 +264,7 @@ @@ -260,7 +264,7 @@
260 <workItem from="1574143209694" duration="3660000" /> 264 <workItem from="1574143209694" duration="3660000" />
261 <workItem from="1574146994475" duration="23222000" /> 265 <workItem from="1574146994475" duration="23222000" />
262 <workItem from="1574209189943" duration="37638000" /> 266 <workItem from="1574209189943" duration="37638000" />
263 - <workItem from="1574252363848" duration="62000" /> 267 + <workItem from="1574252363848" duration="8640000" />
264 </task> 268 </task>
265 <task id="LOCAL-00001" summary="调试"> 269 <task id="LOCAL-00001" summary="调试">
266 <created>1574145133364</created> 270 <created>1574145133364</created>
@@ -273,7 +277,7 @@ @@ -273,7 +277,7 @@
273 <servers /> 277 <servers />
274 </component> 278 </component>
275 <component name="TimeTrackingManager"> 279 <component name="TimeTrackingManager">
276 - <option name="totallyTimeSpent" value="109275000" /> 280 + <option name="totallyTimeSpent" value="117853000" />
277 </component> 281 </component>
278 <component name="TodoView"> 282 <component name="TodoView">
279 <todo-panel id="selected-file"> 283 <todo-panel id="selected-file">
@@ -285,7 +289,7 @@ @@ -285,7 +289,7 @@
285 </todo-panel> 289 </todo-panel>
286 </component> 290 </component>
287 <component name="ToolWindowManager"> 291 <component name="ToolWindowManager">
288 - <frame x="136" y="61" width="1699" height="970" extended-state="1" /> 292 + <frame x="145" y="19" width="1699" height="994" extended-state="1" />
289 <layout> 293 <layout>
290 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15070164" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> 294 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15070164" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
291 <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" /> 295 <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" />
@@ -294,7 +298,7 @@ @@ -294,7 +298,7 @@
294 <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" /> 298 <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" />
295 <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" /> 299 <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" />
296 <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" /> 300 <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" />
297 - <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15006003" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 301 + <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14935823" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
298 <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" /> 302 <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" />
299 <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" /> 303 <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" />
300 <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" /> 304 <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" />
@@ -450,6 +454,7 @@ @@ -450,6 +454,7 @@
450 <provider selected="true" editor-type-id="text-editor"> 454 <provider selected="true" editor-type-id="text-editor">
451 <state relative-caret-position="200"> 455 <state relative-caret-position="200">
452 <caret line="8" column="33" lean-forward="false" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="33" /> 456 <caret line="8" column="33" lean-forward="false" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="33" />
  457 + <folding />
453 </state> 458 </state>
454 </provider> 459 </provider>
455 </entry> 460 </entry>
@@ -569,6 +574,7 @@ @@ -569,6 +574,7 @@
569 <provider selected="true" editor-type-id="text-editor"> 574 <provider selected="true" editor-type-id="text-editor">
570 <state relative-caret-position="297"> 575 <state relative-caret-position="297">
571 <caret line="25" column="6" lean-forward="false" selection-start-line="25" selection-start-column="6" selection-end-line="25" selection-end-column="6" /> 576 <caret line="25" column="6" lean-forward="false" selection-start-line="25" selection-start-column="6" selection-end-line="25" selection-end-column="6" />
  577 + <folding />
572 </state> 578 </state>
573 </provider> 579 </provider>
574 </entry> 580 </entry>
@@ -576,6 +582,7 @@ @@ -576,6 +582,7 @@
576 <provider selected="true" editor-type-id="text-editor"> 582 <provider selected="true" editor-type-id="text-editor">
577 <state relative-caret-position="411"> 583 <state relative-caret-position="411">
578 <caret line="28" column="9" lean-forward="false" selection-start-line="28" selection-start-column="9" selection-end-line="28" selection-end-column="9" /> 584 <caret line="28" column="9" lean-forward="false" selection-start-line="28" selection-start-column="9" selection-end-line="28" selection-end-column="9" />
  585 + <folding />
579 </state> 586 </state>
580 </provider> 587 </provider>
581 </entry> 588 </entry>
@@ -583,6 +590,7 @@ @@ -583,6 +590,7 @@
583 <provider selected="true" editor-type-id="text-editor"> 590 <provider selected="true" editor-type-id="text-editor">
584 <state relative-caret-position="261"> 591 <state relative-caret-position="261">
585 <caret line="25" column="58" lean-forward="false" selection-start-line="25" selection-start-column="58" selection-end-line="25" selection-end-column="58" /> 592 <caret line="25" column="58" lean-forward="false" selection-start-line="25" selection-start-column="58" selection-end-line="25" selection-end-column="58" />
  593 + <folding />
586 </state> 594 </state>
587 </provider> 595 </provider>
588 </entry> 596 </entry>
@@ -666,8 +674,8 @@ @@ -666,8 +674,8 @@
666 </entry> 674 </entry>
667 <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> 675 <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
668 <provider selected="true" editor-type-id="text-editor"> 676 <provider selected="true" editor-type-id="text-editor">
669 - <state relative-caret-position="450">  
670 - <caret line="94" column="7" lean-forward="false" selection-start-line="94" selection-start-column="7" selection-end-line="94" selection-end-column="7" /> 677 + <state relative-caret-position="558">
  678 + <caret line="372" column="16" lean-forward="true" selection-start-line="372" selection-start-column="16" selection-end-line="372" selection-end-column="16" />
671 <folding> 679 <folding>
672 <element signature="e#450#569#0#PHP" expanded="false" /> 680 <element signature="e#450#569#0#PHP" expanded="false" />
673 <element signature="e#575#888#0#PHP" expanded="false" /> 681 <element signature="e#575#888#0#PHP" expanded="false" />
@@ -675,25 +683,26 @@ @@ -675,25 +683,26 @@
675 <element signature="e#2944#3362#0#PHP" expanded="false" /> 683 <element signature="e#2944#3362#0#PHP" expanded="false" />
676 <element signature="e#3367#7202#0#PHP" expanded="false" /> 684 <element signature="e#3367#7202#0#PHP" expanded="false" />
677 <element signature="e#7208#7628#0#PHP" expanded="false" /> 685 <element signature="e#7208#7628#0#PHP" expanded="false" />
678 - <element signature="e#7633#11475#0#PHP" expanded="false" />  
679 - <element signature="e#11502#13401#0#PHP" expanded="false" />  
680 - <element signature="e#13430#14260#0#PHP" expanded="false" />  
681 - <element signature="e#14289#15122#0#PHP" expanded="false" />  
682 - <element signature="e#15145#15362#0#PHP" expanded="false" /> 686 + <element signature="e#7633#11473#0#PHP" expanded="false" />
  687 + <element signature="e#11500#13399#0#PHP" expanded="false" />
  688 + <element signature="e#13428#14258#0#PHP" expanded="false" />
  689 + <element signature="e#14287#15120#0#PHP" expanded="false" />
  690 + <element signature="e#15143#15360#0#PHP" expanded="false" />
683 </folding> 691 </folding>
684 </state> 692 </state>
685 </provider> 693 </provider>
686 </entry> 694 </entry>
687 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 695 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
688 <provider selected="true" editor-type-id="text-editor"> 696 <provider selected="true" editor-type-id="text-editor">
689 - <state relative-caret-position="25">  
690 - <caret line="748" column="41" lean-forward="false" selection-start-line="748" selection-start-column="41" selection-end-line="748" selection-end-column="41" /> 697 + <state relative-caret-position="182">
  698 + <caret line="1049" column="50" lean-forward="true" selection-start-line="1049" selection-start-column="50" selection-end-line="1049" selection-end-column="50" />
691 <folding> 699 <folding>
692 <element signature="e#38#68#0#PHP" expanded="true" /> 700 <element signature="e#38#68#0#PHP" expanded="true" />
693 <element signature="e#337#456#0#PHP" expanded="false" /> 701 <element signature="e#337#456#0#PHP" expanded="false" />
694 <element signature="e#462#1200#0#PHP" expanded="false" /> 702 <element signature="e#462#1200#0#PHP" expanded="false" />
695 <element signature="e#1205#2868#0#PHP" expanded="false" /> 703 <element signature="e#1205#2868#0#PHP" expanded="false" />
696 <element signature="e#2874#3402#0#PHP" expanded="false" /> 704 <element signature="e#2874#3402#0#PHP" expanded="false" />
  705 + <element signature="e#3407#4178#0#PHP" expanded="false" />
697 <element signature="e#4184#4591#0#PHP" expanded="false" /> 706 <element signature="e#4184#4591#0#PHP" expanded="false" />
698 <element signature="e#4596#4939#0#PHP" expanded="false" /> 707 <element signature="e#4596#4939#0#PHP" expanded="false" />
699 <element signature="e#4945#5782#0#PHP" expanded="false" /> 708 <element signature="e#4945#5782#0#PHP" expanded="false" />
@@ -719,12 +728,16 @@ @@ -719,12 +728,16 @@
719 <element signature="e#21466#21824#0#PHP" expanded="false" /> 728 <element signature="e#21466#21824#0#PHP" expanded="false" />
720 <element signature="e#21829#22019#0#PHP" expanded="false" /> 729 <element signature="e#21829#22019#0#PHP" expanded="false" />
721 <element signature="e#22025#23168#0#PHP" expanded="false" /> 730 <element signature="e#22025#23168#0#PHP" expanded="false" />
  731 + <element signature="e#23173#25838#0#PHP" expanded="false" />
722 <element signature="e#25844#26335#0#PHP" expanded="false" /> 732 <element signature="e#25844#26335#0#PHP" expanded="false" />
723 <element signature="e#26340#27427#0#PHP" expanded="false" /> 733 <element signature="e#26340#27427#0#PHP" expanded="false" />
724 <element signature="e#27433#27967#0#PHP" expanded="false" /> 734 <element signature="e#27433#27967#0#PHP" expanded="false" />
725 <element signature="e#27972#28886#0#PHP" expanded="false" /> 735 <element signature="e#27972#28886#0#PHP" expanded="false" />
726 <element signature="e#28892#29423#0#PHP" expanded="false" /> 736 <element signature="e#28892#29423#0#PHP" expanded="false" />
727 - <element signature="e#29428#30348#0#PHP" expanded="false" /> 737 + <element signature="e#29428#30347#0#PHP" expanded="false" />
  738 + <element signature="e#30353#31002#0#PHP" expanded="false" />
  739 + <element signature="e#31007#31880#0#PHP" expanded="false" />
  740 + <element signature="e#31886#32481#0#PHP" expanded="false" />
728 </folding> 741 </folding>
729 </state> 742 </state>
730 </provider> 743 </provider>
@@ -201,7 +201,7 @@ class Pay extends Api @@ -201,7 +201,7 @@ class Pay extends Api
201 if(empty($type)){ 201 if(empty($type)){
202 $this->error(['code'=>2,'msg'=>'缺少必要参数']); 202 $this->error(['code'=>2,'msg'=>'缺少必要参数']);
203 } 203 }
204 - $data = Db::name('vorder')->where('id',$order_id)->find(); 204 + $data = Db::name('order')->where('id',$order_id)->find();
205 if($type == 1){ 205 if($type == 1){
206 if($data){ 206 if($data){
207 if($data['status'] == 2){ 207 if($data['status'] == 2){
@@ -218,7 +218,7 @@ class Pay extends Api @@ -218,7 +218,7 @@ class Pay extends Api
218 Db::startTrans(); 218 Db::startTrans();
219 try{ 219 try{
220 $arr = Db::name('user')->where('id',$data['user_id'])->update(['money'=>$money]); 220 $arr = Db::name('user')->where('id',$data['user_id'])->update(['money'=>$money]);
221 - $res = Db::name('vorder')->where('id',$order_id)->update(['status'=>2,'paytime'=>time()]); 221 + $res = Db::name('order')->where('id',$order_id)->update(['status'=>2,'paytime'=>time()]);
222 if($res && $arr){ 222 if($res && $arr){
223 true; 223 true;
224 }else{ 224 }else{
@@ -908,7 +908,7 @@ class User extends Api @@ -908,7 +908,7 @@ class User extends Api
908 }else{ 908 }else{
909 $param['createtime'] = time(); 909 $param['createtime'] = time();
910 $param['num'] = date('Ymd').substr(implode(NULL, array_map('ord', str_split(substr(uniqid(), 7, 13), 1))), 0, 8); 910 $param['num'] = date('Ymd').substr(implode(NULL, array_map('ord', str_split(substr(uniqid(), 7, 13), 1))), 0, 8);
911 - $data = Db::name('vorder') 911 + $data = Db::name('order')
912 ->insertGetId($param); 912 ->insertGetId($param);
913 if(empty($data)){ 913 if(empty($data)){
914 $this->error(['code'=>2,'msg'=>'sql执行失败']); 914 $this->error(['code'=>2,'msg'=>'sql执行失败']);
@@ -917,4 +917,163 @@ class User extends Api @@ -917,4 +917,163 @@ class User extends Api
917 } 917 }
918 } 918 }
919 919
  920 + /**
  921 + * @ApiTitle (创建组合订单)
  922 + * @ApiSummary (创建组合订单)
  923 + * @ApiMethod (POST)
  924 + * @ApiRoute (/api/user/orders)
  925 + * @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
  926 + *
  927 + * @ApiParams (name="video_id", type="string", required=true, description="视频ID")
  928 + * @ApiParams (name="pic_id", type="string", required=true, description="图片ID")
  929 + * @ApiParams (name="total", type="float", required=true, description="价格")
  930 + *
  931 + * @ApiReturn({
  932 + "code": 1,
  933 + "msg": "成功",
  934 + "time": "1571492001",
  935 + "data": {
  936 + "order_id"://订单ID
  937 + }
  938 + })
  939 + */
  940 + public function orders()
  941 + {
  942 + $param['user_id'] = $this->uid;
  943 + $param['video_id'] = $this->request->post('video_id');
  944 + $param['pic_id'] = $this->request->post('pic_id');
  945 + $param['total'] = $this->request->post('total');
  946 + if(empty( $param['total'])){
  947 + $this->error(['code'=>2,'msg'=>'缺少必要参数']);
  948 + }elseif ( $param['total']<=0){
  949 + $this->error(['code'=>3,'msg'=>'非法操作']);
  950 + }else{
  951 + $param['createtime'] = time();
  952 + $param['num'] = date('Ymd').substr(implode(NULL, array_map('ord', str_split(substr(uniqid(), 7, 13), 1))), 0, 8);
  953 + $data = Db::name('order')
  954 + ->insertGetId($param);
  955 + if(empty($data)){
  956 + $this->error(['code'=>2,'msg'=>'sql执行失败']);
  957 + }
  958 + $this->success('SUCCESS',['order_id'=>$data]);
  959 + }
  960 + }
  961 +
  962 + /**
  963 + * @ApiTitle (我的订单)
  964 + * @ApiSummary (我的订单)
  965 + * @ApiMethod (POST)
  966 + * @ApiRoute (/api/user/myorder)
  967 + * @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
  968 + *
  969 + * @ApiParams (name="type", type="inter", required=false, description="状态(不传默认为全部 1为待支付 2为已完成)")
  970 + *
  971 + * @ApiReturn({
  972 + "code": 1,
  973 + "msg": "成功",
  974 + "time": "1571492001",
  975 + "data": {
  976 + "id": //用户ID
  977 + "pic_id": //图片,
  978 + "video_id": //视频,
  979 + "status" : //状态(1待支付 2已完成)
  980 + }
  981 + })
  982 + */
  983 + public function myorder()
  984 + {
  985 + $user_id = $this->uid;
  986 + $rule = config('verify.path');
  987 + $type = $this->request->param('type');
  988 + if(empty($type)){
  989 + $res = Db::name('order')
  990 + ->where('user_id',$user_id)
  991 + ->field('id,pic_id,video_id,status')
  992 + ->order('createtime desc,id desc')
  993 + ->select();
  994 + foreach ($res as &$v){
  995 + if(!empty($v['pic_id'])){
  996 + $v['pic_id'] = explode(',',$v['pic_id']);
  997 + foreach ($v['pic_id'] as &$v1){
  998 + $v1 = Db::name('pic')->field('id,title,thumbnail,url,price')->where('id',$v1)->find();
  999 + $v1['thumbnail'] = $rule.$v1['thumbnail'];
  1000 + $v1['vipprice'] = $v1['price']*0.75;
  1001 + }
  1002 + }
  1003 + if(!empty($v['video_id'])){
  1004 + $v['video_id'] = explode(',',$v['video_id']);
  1005 + foreach ($v['video_id'] as &$v2){
  1006 + $v2 = Db::name('video')->field('keyword,type_ids,content,is_recommend,buy_num,click_num,createtime,updatetime',true)->where('id',$v2)->find();
  1007 + $v2['thumbnail'] = $rule.$v2['thumbnail'];
  1008 + $v2['video'] = $rule.$v2['video'];
  1009 + $v2['vipprice'] = $v2['price']*0.75;
  1010 + $v2['four_vipprice'] = $v2['four_price'] * 0.75;
  1011 + $v2['eight_vipprice'] = $v2['eight_price'] * 0.75;
  1012 + }
  1013 + }
  1014 + }
  1015 + $this->success('SUCCESS',$res);
  1016 + }elseif ($type == 1){
  1017 + $res = Db::name('order')
  1018 + ->where('user_id',$user_id)
  1019 + ->where('status',1)
  1020 + ->field('id,pic_id,video_id,status')
  1021 + ->order('createtime desc,id desc')
  1022 + ->select();
  1023 + foreach ($res as &$v){
  1024 + if(!empty($v['pic_id'])){
  1025 + $v['pic_id'] = explode(',',$v['pic_id']);
  1026 + foreach ($v['pic_id'] as &$v1){
  1027 + $v1 = Db::name('pic')->field('id,title,thumbnail,url,price')->where('id',$v1)->find();
  1028 + $v1['thumbnail'] = $rule.$v1['thumbnail'];
  1029 + $v1['vipprice'] = $v1['price']*0.75;
  1030 + }
  1031 + }
  1032 + if(!empty($v['video_id'])){
  1033 + $v['video_id'] = explode(',',$v['video_id']);
  1034 + foreach ($v['video_id'] as &$v2){
  1035 + $v2 = Db::name('video')->field('keyword,type_ids,content,is_recommend,buy_num,click_num,createtime,updatetime',true)->where('id',$v2)->find();
  1036 + $v2['thumbnail'] = $rule.$v2['thumbnail'];
  1037 + $v2['video'] = $rule.$v2['video'];
  1038 + $v2['vipprice'] = $v2['price']*0.75;
  1039 + $v2['four_vipprice'] = $v2['four_price'] * 0.75;
  1040 + $v2['eight_vipprice'] = $v2['eight_price'] * 0.75;
  1041 + }
  1042 + }
  1043 + }
  1044 + $this->success('SUCCESS',$res);
  1045 + }else{
  1046 + $res = Db::name('order')
  1047 + ->where('user_id',$user_id)
  1048 + ->where('status',2)
  1049 + ->field('id,pic_id,video_id,status')
  1050 + ->order('createtime desc,id desc')
  1051 + ->select();
  1052 + foreach ($res as &$v){
  1053 + if(!empty($v['pic_id'])){
  1054 + $v['pic_id'] = explode(',',$v['pic_id']);
  1055 + foreach ($v['pic_id'] as &$v1){
  1056 + $v1 = Db::name('pic')->field('id,title,thumbnail,url,price')->where('id',$v1)->find();
  1057 + $v1['thumbnail'] = $rule.$v1['thumbnail'];
  1058 + $v1['vipprice'] = $v1['price']*0.75;
  1059 + }
  1060 + }
  1061 + if(!empty($v['video_id'])){
  1062 + $v['video_id'] = explode(',',$v['video_id']);
  1063 + foreach ($v['video_id'] as &$v2){
  1064 + $v2 = Db::name('video')->field('keyword,type_ids,content,is_recommend,buy_num,click_num,createtime,updatetime',true)->where('id',$v2)->find();
  1065 + $v2['thumbnail'] = $rule.$v2['thumbnail'];
  1066 + $v2['video'] = $rule.$v2['video'];
  1067 + $v2['vipprice'] = $v2['price']*0.75;
  1068 + $v2['four_vipprice'] = $v2['four_price'] * 0.75;
  1069 + $v2['eight_vipprice'] = $v2['eight_price'] * 0.75;
  1070 + }
  1071 + }
  1072 + }
  1073 + $this->success('SUCCESS',$res);
  1074 + }
  1075 +
  1076 + }
  1077 +
  1078 +
920 } 1079 }
@@ -162,15 +162,17 @@ @@ -162,15 +162,17 @@
162 <a href="#个人中心" class="list-group-item" data-toggle="collapse" data-parent="#sidebar">个人中心 <i class="fa fa-caret-down"></i></a> 162 <a href="#个人中心" class="list-group-item" data-toggle="collapse" data-parent="#sidebar">个人中心 <i class="fa fa-caret-down"></i></a>
163 <div class="child collapse" id="个人中心"> 163 <div class="child collapse" id="个人中心">
164 <a href="javascript:;" data-id="11" class="list-group-item">小程序登录</a> 164 <a href="javascript:;" data-id="11" class="list-group-item">小程序登录</a>
165 - <a href="javascript:;" data-id="21" class="list-group-item">我的</a> 165 + <a href="javascript:;" data-id="22" class="list-group-item">创建充值订单</a>
  166 + <a href="javascript:;" data-id="29" class="list-group-item">创建组合订单</a>
  167 + <a href="javascript:;" data-id="28" class="list-group-item">创建视频订单</a>
166 <a href="javascript:;" data-id="27" class="list-group-item">创建图片订单</a> 168 <a href="javascript:;" data-id="27" class="list-group-item">创建图片订单</a>
167 <a href="javascript:;" data-id="26" class="list-group-item">加入购物车</a> 169 <a href="javascript:;" data-id="26" class="list-group-item">加入购物车</a>
168 <a href="javascript:;" data-id="25" class="list-group-item">购物车列表</a> 170 <a href="javascript:;" data-id="25" class="list-group-item">购物车列表</a>
169 <a href="javascript:;" data-id="24" class="list-group-item">会员须知</a> 171 <a href="javascript:;" data-id="24" class="list-group-item">会员须知</a>
170 <a href="javascript:;" data-id="23" class="list-group-item">会员介绍</a> 172 <a href="javascript:;" data-id="23" class="list-group-item">会员介绍</a>
171 - <a href="javascript:;" data-id="22" class="list-group-item">创建充值订单</a>  
172 - <a href="javascript:;" data-id="20" class="list-group-item">历史记录</a> 173 + <a href="javascript:;" data-id="21" class="list-group-item">我的</a>
173 <a href="javascript:;" data-id="12" class="list-group-item">首页视频、图片、精美大片入口</a> 174 <a href="javascript:;" data-id="12" class="list-group-item">首页视频、图片、精美大片入口</a>
  175 + <a href="javascript:;" data-id="20" class="list-group-item">历史记录</a>
174 <a href="javascript:;" data-id="19" class="list-group-item">视频详情</a> 176 <a href="javascript:;" data-id="19" class="list-group-item">视频详情</a>
175 <a href="javascript:;" data-id="18" class="list-group-item">图片详情</a> 177 <a href="javascript:;" data-id="18" class="list-group-item">图片详情</a>
176 <a href="javascript:;" data-id="17" class="list-group-item">精美大片列表</a> 178 <a href="javascript:;" data-id="17" class="list-group-item">精美大片列表</a>
@@ -178,7 +180,7 @@ @@ -178,7 +180,7 @@
178 <a href="javascript:;" data-id="15" class="list-group-item">图片列表</a> 180 <a href="javascript:;" data-id="15" class="list-group-item">图片列表</a>
179 <a href="javascript:;" data-id="14" class="list-group-item">搜索页</a> 181 <a href="javascript:;" data-id="14" class="list-group-item">搜索页</a>
180 <a href="javascript:;" data-id="13" class="list-group-item">地区分类</a> 182 <a href="javascript:;" data-id="13" class="list-group-item">地区分类</a>
181 - <a href="javascript:;" data-id="28" class="list-group-item">创建视频订单</a> 183 + <a href="javascript:;" data-id="30" class="list-group-item">我的订单</a>
182 </div> 184 </div>
183 </div> 185 </div>
184 </div> 186 </div>
@@ -1559,28 +1561,338 @@ @@ -1559,28 +1561,338 @@
1559 </div> 1561 </div>
1560 </div> 1562 </div>
1561 <div class="panel panel-default"> 1563 <div class="panel panel-default">
1562 - <div class="panel-heading" id="heading-21"> 1564 + <div class="panel-heading" id="heading-22">
1563 <h4 class="panel-title"> 1565 <h4 class="panel-title">
1564 <span class="label label-primary">POST</span> 1566 <span class="label label-primary">POST</span>
1565 - <a data-toggle="collapse" data-parent="#accordion21" href="#collapseOne21"> 我的 <span class="text-muted">/api/user/mine</span></a> 1567 + <a data-toggle="collapse" data-parent="#accordion22" href="#collapseOne22"> 创建充值订单 <span class="text-muted">/api/user/toporder</span></a>
1566 </h4> 1568 </h4>
1567 </div> 1569 </div>
1568 - <div id="collapseOne21" class="panel-collapse collapse"> 1570 + <div id="collapseOne22" class="panel-collapse collapse">
1569 <div class="panel-body"> 1571 <div class="panel-body">
1570 1572
1571 <!-- Nav tabs --> 1573 <!-- Nav tabs -->
1572 - <ul class="nav nav-tabs" id="doctab21">  
1573 - <li class="active"><a href="#info21" data-toggle="tab">基础信息</a></li>  
1574 - <li><a href="#sandbox21" data-toggle="tab">在线测试</a></li>  
1575 - <li><a href="#sample21" data-toggle="tab">返回示例</a></li> 1574 + <ul class="nav nav-tabs" id="doctab22">
  1575 + <li class="active"><a href="#info22" data-toggle="tab">基础信息</a></li>
  1576 + <li><a href="#sandbox22" data-toggle="tab">在线测试</a></li>
  1577 + <li><a href="#sample22" data-toggle="tab">返回示例</a></li>
  1578 + </ul>
  1579 +
  1580 + <!-- Tab panes -->
  1581 + <div class="tab-content">
  1582 +
  1583 + <div class="tab-pane active" id="info22">
  1584 + <div class="well">
  1585 + 创建充值订单 </div>
  1586 + <div class="panel panel-default">
  1587 + <div class="panel-heading"><strong>Headers</strong></div>
  1588 + <div class="panel-body">
  1589 + <table class="table table-hover">
  1590 + <thead>
  1591 + <tr>
  1592 + <th>名称</th>
  1593 + <th>类型</th>
  1594 + <th>必选</th>
  1595 + <th>描述</th>
  1596 + </tr>
  1597 + </thead>
  1598 + <tbody>
  1599 + <tr>
  1600 + <td>token</td>
  1601 + <td>string</td>
  1602 + <td>是</td>
  1603 + <td>请求的Token</td>
  1604 + </tr>
  1605 + </tbody>
  1606 + </table>
  1607 + </div>
  1608 + </div>
  1609 + <div class="panel panel-default">
  1610 + <div class="panel-heading"><strong>参数</strong></div>
  1611 + <div class="panel-body">
  1612 + <table class="table table-hover">
  1613 + <thead>
  1614 + <tr>
  1615 + <th>名称</th>
  1616 + <th>类型</th>
  1617 + <th>必选</th>
  1618 + <th>描述</th>
  1619 + </tr>
  1620 + </thead>
  1621 + <tbody>
  1622 + <tr>
  1623 + <td>money</td>
  1624 + <td>float</td>
  1625 + <td>是</td>
  1626 + <td>充值金额</td>
  1627 + </tr>
  1628 + </tbody>
  1629 + </table>
  1630 + </div>
  1631 + </div>
  1632 + <div class="panel panel-default">
  1633 + <div class="panel-heading"><strong>正文</strong></div>
  1634 + <div class="panel-body">
  1635 + 无 </div>
  1636 + </div>
  1637 + </div><!-- #info -->
  1638 +
  1639 + <div class="tab-pane" id="sandbox22">
  1640 + <div class="row">
  1641 + <div class="col-md-12">
  1642 + <div class="panel panel-default">
  1643 + <div class="panel-heading"><strong>Headers</strong></div>
  1644 + <div class="panel-body">
  1645 + <div class="headers">
  1646 + <div class="form-group">
  1647 + <label class="control-label" for="token">token</label>
  1648 + <input type="string" class="form-control input-sm" id="token" required placeholder="请求的Token - Ex: " name="token">
  1649 + </div>
  1650 + </div>
  1651 + </div>
  1652 + </div>
  1653 + <div class="panel panel-default">
  1654 + <div class="panel-heading"><strong>参数</strong></div>
  1655 + <div class="panel-body">
  1656 + <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/toporder" method="POST" name="form22" id="form22">
  1657 + <div class="form-group">
  1658 + <label class="control-label" for="money">money</label>
  1659 + <input type="float" class="form-control input-sm" id="money" required placeholder="充值金额" name="money">
  1660 + </div>
  1661 + <div class="form-group">
  1662 + <button type="submit" class="btn btn-success send" rel="22">提交</button>
  1663 + <button type="reset" class="btn btn-info" rel="22">重置</button>
  1664 + </div>
  1665 + </form>
  1666 + </div>
  1667 + </div>
  1668 + <div class="panel panel-default">
  1669 + <div class="panel-heading"><strong>响应输出</strong></div>
  1670 + <div class="panel-body">
  1671 + <div class="row">
  1672 + <div class="col-md-12" style="overflow-x:auto">
  1673 + <pre id="response_headers22"></pre>
  1674 + <pre id="response22"></pre>
  1675 + </div>
  1676 + </div>
  1677 + </div>
  1678 + </div>
  1679 + <div class="panel panel-default">
  1680 + <div class="panel-heading"><strong>返回参数</strong></div>
  1681 + <div class="panel-body">
  1682 + 无
  1683 + </div>
  1684 + </div>
  1685 + </div>
  1686 + </div>
  1687 + </div><!-- #sandbox -->
  1688 +
  1689 + <div class="tab-pane" id="sample22">
  1690 + <div class="row">
  1691 + <div class="col-md-12">
  1692 + <pre id="sample_response22">{
  1693 + "code": 1,
  1694 + "msg": "成功",
  1695 + "time": "1571492001",
  1696 + "data": {
  1697 + "order_id"://订单ID
  1698 + }
  1699 + }</pre>
  1700 + </div>
  1701 + </div>
  1702 + </div><!-- #sample -->
  1703 +
  1704 + </div><!-- .tab-content -->
  1705 + </div>
  1706 + </div>
  1707 + </div>
  1708 + <div class="panel panel-default">
  1709 + <div class="panel-heading" id="heading-29">
  1710 + <h4 class="panel-title">
  1711 + <span class="label label-primary">POST</span>
  1712 + <a data-toggle="collapse" data-parent="#accordion29" href="#collapseOne29"> 创建组合订单 <span class="text-muted">/api/user/orders</span></a>
  1713 + </h4>
  1714 + </div>
  1715 + <div id="collapseOne29" class="panel-collapse collapse">
  1716 + <div class="panel-body">
  1717 +
  1718 + <!-- Nav tabs -->
  1719 + <ul class="nav nav-tabs" id="doctab29">
  1720 + <li class="active"><a href="#info29" data-toggle="tab">基础信息</a></li>
  1721 + <li><a href="#sandbox29" data-toggle="tab">在线测试</a></li>
  1722 + <li><a href="#sample29" data-toggle="tab">返回示例</a></li>
  1723 + </ul>
  1724 +
  1725 + <!-- Tab panes -->
  1726 + <div class="tab-content">
  1727 +
  1728 + <div class="tab-pane active" id="info29">
  1729 + <div class="well">
  1730 + 创建组合订单 </div>
  1731 + <div class="panel panel-default">
  1732 + <div class="panel-heading"><strong>Headers</strong></div>
  1733 + <div class="panel-body">
  1734 + <table class="table table-hover">
  1735 + <thead>
  1736 + <tr>
  1737 + <th>名称</th>
  1738 + <th>类型</th>
  1739 + <th>必选</th>
  1740 + <th>描述</th>
  1741 + </tr>
  1742 + </thead>
  1743 + <tbody>
  1744 + <tr>
  1745 + <td>token</td>
  1746 + <td>string</td>
  1747 + <td>是</td>
  1748 + <td>请求的Token</td>
  1749 + </tr>
  1750 + </tbody>
  1751 + </table>
  1752 + </div>
  1753 + </div>
  1754 + <div class="panel panel-default">
  1755 + <div class="panel-heading"><strong>参数</strong></div>
  1756 + <div class="panel-body">
  1757 + <table class="table table-hover">
  1758 + <thead>
  1759 + <tr>
  1760 + <th>名称</th>
  1761 + <th>类型</th>
  1762 + <th>必选</th>
  1763 + <th>描述</th>
  1764 + </tr>
  1765 + </thead>
  1766 + <tbody>
  1767 + <tr>
  1768 + <td>video_id</td>
  1769 + <td>string</td>
  1770 + <td>是</td>
  1771 + <td>视频ID</td>
  1772 + </tr>
  1773 + <tr>
  1774 + <td>pic_id</td>
  1775 + <td>string</td>
  1776 + <td>是</td>
  1777 + <td>图片ID</td>
  1778 + </tr>
  1779 + <tr>
  1780 + <td>total</td>
  1781 + <td>float</td>
  1782 + <td>是</td>
  1783 + <td>价格</td>
  1784 + </tr>
  1785 + </tbody>
  1786 + </table>
  1787 + </div>
  1788 + </div>
  1789 + <div class="panel panel-default">
  1790 + <div class="panel-heading"><strong>正文</strong></div>
  1791 + <div class="panel-body">
  1792 + 无 </div>
  1793 + </div>
  1794 + </div><!-- #info -->
  1795 +
  1796 + <div class="tab-pane" id="sandbox29">
  1797 + <div class="row">
  1798 + <div class="col-md-12">
  1799 + <div class="panel panel-default">
  1800 + <div class="panel-heading"><strong>Headers</strong></div>
  1801 + <div class="panel-body">
  1802 + <div class="headers">
  1803 + <div class="form-group">
  1804 + <label class="control-label" for="token">token</label>
  1805 + <input type="string" class="form-control input-sm" id="token" required placeholder="请求的Token - Ex: " name="token">
  1806 + </div>
  1807 + </div>
  1808 + </div>
  1809 + </div>
  1810 + <div class="panel panel-default">
  1811 + <div class="panel-heading"><strong>参数</strong></div>
  1812 + <div class="panel-body">
  1813 + <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/orders" method="POST" name="form29" id="form29">
  1814 + <div class="form-group">
  1815 + <label class="control-label" for="video_id">video_id</label>
  1816 + <input type="string" class="form-control input-sm" id="video_id" required placeholder="视频ID" name="video_id">
  1817 + </div>
  1818 + <div class="form-group">
  1819 + <label class="control-label" for="pic_id">pic_id</label>
  1820 + <input type="string" class="form-control input-sm" id="pic_id" required placeholder="图片ID" name="pic_id">
  1821 + </div>
  1822 + <div class="form-group">
  1823 + <label class="control-label" for="total">total</label>
  1824 + <input type="float" class="form-control input-sm" id="total" required placeholder="价格" name="total">
  1825 + </div>
  1826 + <div class="form-group">
  1827 + <button type="submit" class="btn btn-success send" rel="29">提交</button>
  1828 + <button type="reset" class="btn btn-info" rel="29">重置</button>
  1829 + </div>
  1830 + </form>
  1831 + </div>
  1832 + </div>
  1833 + <div class="panel panel-default">
  1834 + <div class="panel-heading"><strong>响应输出</strong></div>
  1835 + <div class="panel-body">
  1836 + <div class="row">
  1837 + <div class="col-md-12" style="overflow-x:auto">
  1838 + <pre id="response_headers29"></pre>
  1839 + <pre id="response29"></pre>
  1840 + </div>
  1841 + </div>
  1842 + </div>
  1843 + </div>
  1844 + <div class="panel panel-default">
  1845 + <div class="panel-heading"><strong>返回参数</strong></div>
  1846 + <div class="panel-body">
  1847 + 无
  1848 + </div>
  1849 + </div>
  1850 + </div>
  1851 + </div>
  1852 + </div><!-- #sandbox -->
  1853 +
  1854 + <div class="tab-pane" id="sample29">
  1855 + <div class="row">
  1856 + <div class="col-md-12">
  1857 + <pre id="sample_response29">{
  1858 + "code": 1,
  1859 + "msg": "成功",
  1860 + "time": "1571492001",
  1861 + "data": {
  1862 + "order_id"://订单ID
  1863 + }
  1864 + }</pre>
  1865 + </div>
  1866 + </div>
  1867 + </div><!-- #sample -->
  1868 +
  1869 + </div><!-- .tab-content -->
  1870 + </div>
  1871 + </div>
  1872 + </div>
  1873 + <div class="panel panel-default">
  1874 + <div class="panel-heading" id="heading-28">
  1875 + <h4 class="panel-title">
  1876 + <span class="label label-primary">POST</span>
  1877 + <a data-toggle="collapse" data-parent="#accordion28" href="#collapseOne28"> 创建视频订单 <span class="text-muted">/api/user/v_order</span></a>
  1878 + </h4>
  1879 + </div>
  1880 + <div id="collapseOne28" class="panel-collapse collapse">
  1881 + <div class="panel-body">
  1882 +
  1883 + <!-- Nav tabs -->
  1884 + <ul class="nav nav-tabs" id="doctab28">
  1885 + <li class="active"><a href="#info28" data-toggle="tab">基础信息</a></li>
  1886 + <li><a href="#sandbox28" data-toggle="tab">在线测试</a></li>
  1887 + <li><a href="#sample28" data-toggle="tab">返回示例</a></li>
1576 </ul> 1888 </ul>
1577 1889
1578 <!-- Tab panes --> 1890 <!-- Tab panes -->
1579 <div class="tab-content"> 1891 <div class="tab-content">
1580 1892
1581 - <div class="tab-pane active" id="info21"> 1893 + <div class="tab-pane active" id="info28">
1582 <div class="well"> 1894 <div class="well">
1583 - 我的 </div> 1895 + 创建视频订单 </div>
1584 <div class="panel panel-default"> 1896 <div class="panel panel-default">
1585 <div class="panel-heading"><strong>Headers</strong></div> 1897 <div class="panel-heading"><strong>Headers</strong></div>
1586 <div class="panel-body"> 1898 <div class="panel-body">
@@ -1607,7 +1919,30 @@ @@ -1607,7 +1919,30 @@
1607 <div class="panel panel-default"> 1919 <div class="panel panel-default">
1608 <div class="panel-heading"><strong>参数</strong></div> 1920 <div class="panel-heading"><strong>参数</strong></div>
1609 <div class="panel-body"> 1921 <div class="panel-body">
1610 - 无 1922 + <table class="table table-hover">
  1923 + <thead>
  1924 + <tr>
  1925 + <th>名称</th>
  1926 + <th>类型</th>
  1927 + <th>必选</th>
  1928 + <th>描述</th>
  1929 + </tr>
  1930 + </thead>
  1931 + <tbody>
  1932 + <tr>
  1933 + <td>video_id</td>
  1934 + <td>inter</td>
  1935 + <td>是</td>
  1936 + <td>视频ID</td>
  1937 + </tr>
  1938 + <tr>
  1939 + <td>total</td>
  1940 + <td>float</td>
  1941 + <td>是</td>
  1942 + <td>价格</td>
  1943 + </tr>
  1944 + </tbody>
  1945 + </table>
1611 </div> 1946 </div>
1612 </div> 1947 </div>
1613 <div class="panel panel-default"> 1948 <div class="panel panel-default">
@@ -1617,7 +1952,7 @@ @@ -1617,7 +1952,7 @@
1617 </div> 1952 </div>
1618 </div><!-- #info --> 1953 </div><!-- #info -->
1619 1954
1620 - <div class="tab-pane" id="sandbox21"> 1955 + <div class="tab-pane" id="sandbox28">
1621 <div class="row"> 1956 <div class="row">
1622 <div class="col-md-12"> 1957 <div class="col-md-12">
1623 <div class="panel panel-default"> 1958 <div class="panel panel-default">
@@ -1634,13 +1969,18 @@ @@ -1634,13 +1969,18 @@
1634 <div class="panel panel-default"> 1969 <div class="panel panel-default">
1635 <div class="panel-heading"><strong>参数</strong></div> 1970 <div class="panel-heading"><strong>参数</strong></div>
1636 <div class="panel-body"> 1971 <div class="panel-body">
1637 - <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/mine" method="POST" name="form21" id="form21"> 1972 + <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/v_order" method="POST" name="form28" id="form28">
1638 <div class="form-group"> 1973 <div class="form-group">
1639 - 无 1974 + <label class="control-label" for="video_id">video_id</label>
  1975 + <input type="inter" class="form-control input-sm" id="video_id" required placeholder="视频ID" name="video_id">
1640 </div> 1976 </div>
1641 <div class="form-group"> 1977 <div class="form-group">
1642 - <button type="submit" class="btn btn-success send" rel="21">提交</button>  
1643 - <button type="reset" class="btn btn-info" rel="21">重置</button> 1978 + <label class="control-label" for="total">total</label>
  1979 + <input type="float" class="form-control input-sm" id="total" required placeholder="价格" name="total">
  1980 + </div>
  1981 + <div class="form-group">
  1982 + <button type="submit" class="btn btn-success send" rel="28">提交</button>
  1983 + <button type="reset" class="btn btn-info" rel="28">重置</button>
1644 </div> 1984 </div>
1645 </form> 1985 </form>
1646 </div> 1986 </div>
@@ -1650,8 +1990,8 @@ @@ -1650,8 +1990,8 @@
1650 <div class="panel-body"> 1990 <div class="panel-body">
1651 <div class="row"> 1991 <div class="row">
1652 <div class="col-md-12" style="overflow-x:auto"> 1992 <div class="col-md-12" style="overflow-x:auto">
1653 - <pre id="response_headers21"></pre>  
1654 - <pre id="response21"></pre> 1993 + <pre id="response_headers28"></pre>
  1994 + <pre id="response28"></pre>
1655 </div> 1995 </div>
1656 </div> 1996 </div>
1657 </div> 1997 </div>
@@ -1666,19 +2006,17 @@ @@ -1666,19 +2006,17 @@
1666 </div> 2006 </div>
1667 </div><!-- #sandbox --> 2007 </div><!-- #sandbox -->
1668 2008
1669 - <div class="tab-pane" id="sample21"> 2009 + <div class="tab-pane" id="sample28">
1670 <div class="row"> 2010 <div class="row">
1671 <div class="col-md-12"> 2011 <div class="col-md-12">
1672 - <pre id="sample_response21">{ 2012 + <pre id="sample_response28">{
1673 "code": 1, 2013 "code": 1,
1674 "msg": "成功", 2014 "msg": "成功",
1675 "time": "1571492001", 2015 "time": "1571492001",
1676 "data": { 2016 "data": {
1677 - "id": //用户ID  
1678 - "nickname": //昵称,  
1679 - "avatar": //头像,  
1680 - "money" : //余额  
1681 - "is_vip": //是否为会员(0否 1是</pre> 2017 + "order_id"://订单ID
  2018 + }
  2019 + }</pre>
1682 </div> 2020 </div>
1683 </div> 2021 </div>
1684 </div><!-- #sample --> 2022 </div><!-- #sample -->
@@ -2402,28 +2740,28 @@ @@ -2402,28 +2740,28 @@
2402 </div> 2740 </div>
2403 </div> 2741 </div>
2404 <div class="panel panel-default"> 2742 <div class="panel panel-default">
2405 - <div class="panel-heading" id="heading-22"> 2743 + <div class="panel-heading" id="heading-21">
2406 <h4 class="panel-title"> 2744 <h4 class="panel-title">
2407 <span class="label label-primary">POST</span> 2745 <span class="label label-primary">POST</span>
2408 - <a data-toggle="collapse" data-parent="#accordion22" href="#collapseOne22"> 创建充值订单 <span class="text-muted">/api/user/toporder</span></a> 2746 + <a data-toggle="collapse" data-parent="#accordion21" href="#collapseOne21"> 我的 <span class="text-muted">/api/user/mine</span></a>
2409 </h4> 2747 </h4>
2410 </div> 2748 </div>
2411 - <div id="collapseOne22" class="panel-collapse collapse"> 2749 + <div id="collapseOne21" class="panel-collapse collapse">
2412 <div class="panel-body"> 2750 <div class="panel-body">
2413 2751
2414 <!-- Nav tabs --> 2752 <!-- Nav tabs -->
2415 - <ul class="nav nav-tabs" id="doctab22">  
2416 - <li class="active"><a href="#info22" data-toggle="tab">基础信息</a></li>  
2417 - <li><a href="#sandbox22" data-toggle="tab">在线测试</a></li>  
2418 - <li><a href="#sample22" data-toggle="tab">返回示例</a></li> 2753 + <ul class="nav nav-tabs" id="doctab21">
  2754 + <li class="active"><a href="#info21" data-toggle="tab">基础信息</a></li>
  2755 + <li><a href="#sandbox21" data-toggle="tab">在线测试</a></li>
  2756 + <li><a href="#sample21" data-toggle="tab">返回示例</a></li>
2419 </ul> 2757 </ul>
2420 2758
2421 <!-- Tab panes --> 2759 <!-- Tab panes -->
2422 <div class="tab-content"> 2760 <div class="tab-content">
2423 2761
2424 - <div class="tab-pane active" id="info22"> 2762 + <div class="tab-pane active" id="info21">
2425 <div class="well"> 2763 <div class="well">
2426 - 创建充值订单 </div> 2764 + 我的 </div>
2427 <div class="panel panel-default"> 2765 <div class="panel panel-default">
2428 <div class="panel-heading"><strong>Headers</strong></div> 2766 <div class="panel-heading"><strong>Headers</strong></div>
2429 <div class="panel-body"> 2767 <div class="panel-body">
@@ -2450,24 +2788,7 @@ @@ -2450,24 +2788,7 @@
2450 <div class="panel panel-default"> 2788 <div class="panel panel-default">
2451 <div class="panel-heading"><strong>参数</strong></div> 2789 <div class="panel-heading"><strong>参数</strong></div>
2452 <div class="panel-body"> 2790 <div class="panel-body">
2453 - <table class="table table-hover">  
2454 - <thead>  
2455 - <tr>  
2456 - <th>名称</th>  
2457 - <th>类型</th>  
2458 - <th>必选</th>  
2459 - <th>描述</th>  
2460 - </tr>  
2461 - </thead>  
2462 - <tbody>  
2463 - <tr>  
2464 - <td>money</td>  
2465 - <td>float</td>  
2466 - <td>是</td>  
2467 - <td>充值金额</td>  
2468 - </tr>  
2469 - </tbody>  
2470 - </table> 2791 + 无
2471 </div> 2792 </div>
2472 </div> 2793 </div>
2473 <div class="panel panel-default"> 2794 <div class="panel panel-default">
@@ -2477,7 +2798,7 @@ @@ -2477,7 +2798,7 @@
2477 </div> 2798 </div>
2478 </div><!-- #info --> 2799 </div><!-- #info -->
2479 2800
2480 - <div class="tab-pane" id="sandbox22"> 2801 + <div class="tab-pane" id="sandbox21">
2481 <div class="row"> 2802 <div class="row">
2482 <div class="col-md-12"> 2803 <div class="col-md-12">
2483 <div class="panel panel-default"> 2804 <div class="panel panel-default">
@@ -2494,14 +2815,13 @@ @@ -2494,14 +2815,13 @@
2494 <div class="panel panel-default"> 2815 <div class="panel panel-default">
2495 <div class="panel-heading"><strong>参数</strong></div> 2816 <div class="panel-heading"><strong>参数</strong></div>
2496 <div class="panel-body"> 2817 <div class="panel-body">
2497 - <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/toporder" method="POST" name="form22" id="form22"> 2818 + <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/mine" method="POST" name="form21" id="form21">
2498 <div class="form-group"> 2819 <div class="form-group">
2499 - <label class="control-label" for="money">money</label>  
2500 - <input type="float" class="form-control input-sm" id="money" required placeholder="充值金额" name="money"> 2820 + 无
2501 </div> 2821 </div>
2502 <div class="form-group"> 2822 <div class="form-group">
2503 - <button type="submit" class="btn btn-success send" rel="22">提交</button>  
2504 - <button type="reset" class="btn btn-info" rel="22">重置</button> 2823 + <button type="submit" class="btn btn-success send" rel="21">提交</button>
  2824 + <button type="reset" class="btn btn-info" rel="21">重置</button>
2505 </div> 2825 </div>
2506 </form> 2826 </form>
2507 </div> 2827 </div>
@@ -2511,8 +2831,8 @@ @@ -2511,8 +2831,8 @@
2511 <div class="panel-body"> 2831 <div class="panel-body">
2512 <div class="row"> 2832 <div class="row">
2513 <div class="col-md-12" style="overflow-x:auto"> 2833 <div class="col-md-12" style="overflow-x:auto">
2514 - <pre id="response_headers22"></pre>  
2515 - <pre id="response22"></pre> 2834 + <pre id="response_headers21"></pre>
  2835 + <pre id="response21"></pre>
2516 </div> 2836 </div>
2517 </div> 2837 </div>
2518 </div> 2838 </div>
@@ -2527,17 +2847,19 @@ @@ -2527,17 +2847,19 @@
2527 </div> 2847 </div>
2528 </div><!-- #sandbox --> 2848 </div><!-- #sandbox -->
2529 2849
2530 - <div class="tab-pane" id="sample22"> 2850 + <div class="tab-pane" id="sample21">
2531 <div class="row"> 2851 <div class="row">
2532 <div class="col-md-12"> 2852 <div class="col-md-12">
2533 - <pre id="sample_response22">{ 2853 + <pre id="sample_response21">{
2534 "code": 1, 2854 "code": 1,
2535 "msg": "成功", 2855 "msg": "成功",
2536 "time": "1571492001", 2856 "time": "1571492001",
2537 "data": { 2857 "data": {
2538 - "order_id"://订单ID  
2539 - }  
2540 - }</pre> 2858 + "id": //用户ID
  2859 + "nickname": //昵称,
  2860 + "avatar": //头像,
  2861 + "money" : //余额
  2862 + "is_vip": //是否为会员(0否 1是</pre>
2541 </div> 2863 </div>
2542 </div> 2864 </div>
2543 </div><!-- #sample --> 2865 </div><!-- #sample -->
@@ -2547,28 +2869,28 @@ @@ -2547,28 +2869,28 @@
2547 </div> 2869 </div>
2548 </div> 2870 </div>
2549 <div class="panel panel-default"> 2871 <div class="panel panel-default">
2550 - <div class="panel-heading" id="heading-20"> 2872 + <div class="panel-heading" id="heading-12">
2551 <h4 class="panel-title"> 2873 <h4 class="panel-title">
2552 <span class="label label-primary">POST</span> 2874 <span class="label label-primary">POST</span>
2553 - <a data-toggle="collapse" data-parent="#accordion20" href="#collapseOne20"> 历史记录 <span class="text-muted">/api/user/history</span></a> 2875 + <a data-toggle="collapse" data-parent="#accordion12" href="#collapseOne12"> 首页视频、图片、精美大片入口 <span class="text-muted">/api/user/index</span></a>
2554 </h4> 2876 </h4>
2555 </div> 2877 </div>
2556 - <div id="collapseOne20" class="panel-collapse collapse"> 2878 + <div id="collapseOne12" class="panel-collapse collapse">
2557 <div class="panel-body"> 2879 <div class="panel-body">
2558 2880
2559 <!-- Nav tabs --> 2881 <!-- Nav tabs -->
2560 - <ul class="nav nav-tabs" id="doctab20">  
2561 - <li class="active"><a href="#info20" data-toggle="tab">基础信息</a></li>  
2562 - <li><a href="#sandbox20" data-toggle="tab">在线测试</a></li>  
2563 - <li><a href="#sample20" data-toggle="tab">返回示例</a></li> 2882 + <ul class="nav nav-tabs" id="doctab12">
  2883 + <li class="active"><a href="#info12" data-toggle="tab">基础信息</a></li>
  2884 + <li><a href="#sandbox12" data-toggle="tab">在线测试</a></li>
  2885 + <li><a href="#sample12" data-toggle="tab">返回示例</a></li>
2564 </ul> 2886 </ul>
2565 2887
2566 <!-- Tab panes --> 2888 <!-- Tab panes -->
2567 <div class="tab-content"> 2889 <div class="tab-content">
2568 2890
2569 - <div class="tab-pane active" id="info20"> 2891 + <div class="tab-pane active" id="info12">
2570 <div class="well"> 2892 <div class="well">
2571 - 历史记录 </div> 2893 + 首页视频、图片、精美大片入口 </div>
2572 <div class="panel panel-default"> 2894 <div class="panel panel-default">
2573 <div class="panel-heading"><strong>Headers</strong></div> 2895 <div class="panel-heading"><strong>Headers</strong></div>
2574 <div class="panel-body"> 2896 <div class="panel-body">
@@ -2605,7 +2927,7 @@ @@ -2605,7 +2927,7 @@
2605 </div> 2927 </div>
2606 </div><!-- #info --> 2928 </div><!-- #info -->
2607 2929
2608 - <div class="tab-pane" id="sandbox20"> 2930 + <div class="tab-pane" id="sandbox12">
2609 <div class="row"> 2931 <div class="row">
2610 <div class="col-md-12"> 2932 <div class="col-md-12">
2611 <div class="panel panel-default"> 2933 <div class="panel panel-default">
@@ -2622,13 +2944,13 @@ @@ -2622,13 +2944,13 @@
2622 <div class="panel panel-default"> 2944 <div class="panel panel-default">
2623 <div class="panel-heading"><strong>参数</strong></div> 2945 <div class="panel-heading"><strong>参数</strong></div>
2624 <div class="panel-body"> 2946 <div class="panel-body">
2625 - <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/history" method="POST" name="form20" id="form20"> 2947 + <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/index" method="POST" name="form12" id="form12">
2626 <div class="form-group"> 2948 <div class="form-group">
2627 无 2949 无
2628 </div> 2950 </div>
2629 <div class="form-group"> 2951 <div class="form-group">
2630 - <button type="submit" class="btn btn-success send" rel="20">提交</button>  
2631 - <button type="reset" class="btn btn-info" rel="20">重置</button> 2952 + <button type="submit" class="btn btn-success send" rel="12">提交</button>
  2953 + <button type="reset" class="btn btn-info" rel="12">重置</button>
2632 </div> 2954 </div>
2633 </form> 2955 </form>
2634 </div> 2956 </div>
@@ -2638,8 +2960,8 @@ @@ -2638,8 +2960,8 @@
2638 <div class="panel-body"> 2960 <div class="panel-body">
2639 <div class="row"> 2961 <div class="row">
2640 <div class="col-md-12" style="overflow-x:auto"> 2962 <div class="col-md-12" style="overflow-x:auto">
2641 - <pre id="response_headers20"></pre>  
2642 - <pre id="response20"></pre> 2963 + <pre id="response_headers12"></pre>
  2964 + <pre id="response12"></pre>
2643 </div> 2965 </div>
2644 </div> 2966 </div>
2645 </div> 2967 </div>
@@ -2654,16 +2976,17 @@ @@ -2654,16 +2976,17 @@
2654 </div> 2976 </div>
2655 </div><!-- #sandbox --> 2977 </div><!-- #sandbox -->
2656 2978
2657 - <div class="tab-pane" id="sample20"> 2979 + <div class="tab-pane" id="sample12">
2658 <div class="row"> 2980 <div class="row">
2659 <div class="col-md-12"> 2981 <div class="col-md-12">
2660 - <pre id="sample_response20">{  
2661 - "code": 1,  
2662 - "msg": "成功", 2982 + <pre id="sample_response12">{
  2983 + 'code':'1',
  2984 + 'msg':'返回成功',
2663 "time": "1571492001", 2985 "time": "1571492001",
2664 "data": { 2986 "data": {
2665 - "id": 4,//记录id,  
2666 - "title"://搜索的内容 2987 + "video_thumbnail": http://mapwww.baidu.com 视频封面图地址
  2988 + "pic_thumbnail": http://mapwww.baidu.com 图片地址
  2989 + "wonderful_thumbnail": http://mapwww.baidu.com 精美大片地址
2667 } 2990 }
2668 }</pre> 2991 }</pre>
2669 </div> 2992 </div>
@@ -2675,28 +2998,28 @@ @@ -2675,28 +2998,28 @@
2675 </div> 2998 </div>
2676 </div> 2999 </div>
2677 <div class="panel panel-default"> 3000 <div class="panel panel-default">
2678 - <div class="panel-heading" id="heading-12"> 3001 + <div class="panel-heading" id="heading-20">
2679 <h4 class="panel-title"> 3002 <h4 class="panel-title">
2680 <span class="label label-primary">POST</span> 3003 <span class="label label-primary">POST</span>
2681 - <a data-toggle="collapse" data-parent="#accordion12" href="#collapseOne12"> 首页视频、图片、精美大片入口 <span class="text-muted">/api/user/index</span></a> 3004 + <a data-toggle="collapse" data-parent="#accordion20" href="#collapseOne20"> 历史记录 <span class="text-muted">/api/user/history</span></a>
2682 </h4> 3005 </h4>
2683 </div> 3006 </div>
2684 - <div id="collapseOne12" class="panel-collapse collapse"> 3007 + <div id="collapseOne20" class="panel-collapse collapse">
2685 <div class="panel-body"> 3008 <div class="panel-body">
2686 3009
2687 <!-- Nav tabs --> 3010 <!-- Nav tabs -->
2688 - <ul class="nav nav-tabs" id="doctab12">  
2689 - <li class="active"><a href="#info12" data-toggle="tab">基础信息</a></li>  
2690 - <li><a href="#sandbox12" data-toggle="tab">在线测试</a></li>  
2691 - <li><a href="#sample12" data-toggle="tab">返回示例</a></li> 3011 + <ul class="nav nav-tabs" id="doctab20">
  3012 + <li class="active"><a href="#info20" data-toggle="tab">基础信息</a></li>
  3013 + <li><a href="#sandbox20" data-toggle="tab">在线测试</a></li>
  3014 + <li><a href="#sample20" data-toggle="tab">返回示例</a></li>
2692 </ul> 3015 </ul>
2693 3016
2694 <!-- Tab panes --> 3017 <!-- Tab panes -->
2695 <div class="tab-content"> 3018 <div class="tab-content">
2696 3019
2697 - <div class="tab-pane active" id="info12"> 3020 + <div class="tab-pane active" id="info20">
2698 <div class="well"> 3021 <div class="well">
2699 - 首页视频、图片、精美大片入口 </div> 3022 + 历史记录 </div>
2700 <div class="panel panel-default"> 3023 <div class="panel panel-default">
2701 <div class="panel-heading"><strong>Headers</strong></div> 3024 <div class="panel-heading"><strong>Headers</strong></div>
2702 <div class="panel-body"> 3025 <div class="panel-body">
@@ -2733,7 +3056,7 @@ @@ -2733,7 +3056,7 @@
2733 </div> 3056 </div>
2734 </div><!-- #info --> 3057 </div><!-- #info -->
2735 3058
2736 - <div class="tab-pane" id="sandbox12"> 3059 + <div class="tab-pane" id="sandbox20">
2737 <div class="row"> 3060 <div class="row">
2738 <div class="col-md-12"> 3061 <div class="col-md-12">
2739 <div class="panel panel-default"> 3062 <div class="panel panel-default">
@@ -2750,13 +3073,13 @@ @@ -2750,13 +3073,13 @@
2750 <div class="panel panel-default"> 3073 <div class="panel panel-default">
2751 <div class="panel-heading"><strong>参数</strong></div> 3074 <div class="panel-heading"><strong>参数</strong></div>
2752 <div class="panel-body"> 3075 <div class="panel-body">
2753 - <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/index" method="POST" name="form12" id="form12"> 3076 + <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/history" method="POST" name="form20" id="form20">
2754 <div class="form-group"> 3077 <div class="form-group">
2755 无 3078 无
2756 </div> 3079 </div>
2757 <div class="form-group"> 3080 <div class="form-group">
2758 - <button type="submit" class="btn btn-success send" rel="12">提交</button>  
2759 - <button type="reset" class="btn btn-info" rel="12">重置</button> 3081 + <button type="submit" class="btn btn-success send" rel="20">提交</button>
  3082 + <button type="reset" class="btn btn-info" rel="20">重置</button>
2760 </div> 3083 </div>
2761 </form> 3084 </form>
2762 </div> 3085 </div>
@@ -2766,8 +3089,8 @@ @@ -2766,8 +3089,8 @@
2766 <div class="panel-body"> 3089 <div class="panel-body">
2767 <div class="row"> 3090 <div class="row">
2768 <div class="col-md-12" style="overflow-x:auto"> 3091 <div class="col-md-12" style="overflow-x:auto">
2769 - <pre id="response_headers12"></pre>  
2770 - <pre id="response12"></pre> 3092 + <pre id="response_headers20"></pre>
  3093 + <pre id="response20"></pre>
2771 </div> 3094 </div>
2772 </div> 3095 </div>
2773 </div> 3096 </div>
@@ -2782,17 +3105,16 @@ @@ -2782,17 +3105,16 @@
2782 </div> 3105 </div>
2783 </div><!-- #sandbox --> 3106 </div><!-- #sandbox -->
2784 3107
2785 - <div class="tab-pane" id="sample12"> 3108 + <div class="tab-pane" id="sample20">
2786 <div class="row"> 3109 <div class="row">
2787 <div class="col-md-12"> 3110 <div class="col-md-12">
2788 - <pre id="sample_response12">{  
2789 - 'code':'1',  
2790 - 'msg':'返回成功', 3111 + <pre id="sample_response20">{
  3112 + "code": 1,
  3113 + "msg": "成功",
2791 "time": "1571492001", 3114 "time": "1571492001",
2792 "data": { 3115 "data": {
2793 - "video_thumbnail": http://mapwww.baidu.com 视频封面图地址  
2794 - "pic_thumbnail": http://mapwww.baidu.com 图片地址  
2795 - "wonderful_thumbnail": http://mapwww.baidu.com 精美大片地址 3116 + "id": 4,//记录id,
  3117 + "title"://搜索的内容
2796 } 3118 }
2797 }</pre> 3119 }</pre>
2798 </div> 3120 </div>
@@ -3910,28 +4232,28 @@ @@ -3910,28 +4232,28 @@
3910 </div> 4232 </div>
3911 </div> 4233 </div>
3912 <div class="panel panel-default"> 4234 <div class="panel panel-default">
3913 - <div class="panel-heading" id="heading-28"> 4235 + <div class="panel-heading" id="heading-30">
3914 <h4 class="panel-title"> 4236 <h4 class="panel-title">
3915 <span class="label label-primary">POST</span> 4237 <span class="label label-primary">POST</span>
3916 - <a data-toggle="collapse" data-parent="#accordion28" href="#collapseOne28"> 创建视频订单 <span class="text-muted">/api/user/v_order</span></a> 4238 + <a data-toggle="collapse" data-parent="#accordion30" href="#collapseOne30"> 我的订单 <span class="text-muted">/api/user/myorder</span></a>
3917 </h4> 4239 </h4>
3918 </div> 4240 </div>
3919 - <div id="collapseOne28" class="panel-collapse collapse"> 4241 + <div id="collapseOne30" class="panel-collapse collapse">
3920 <div class="panel-body"> 4242 <div class="panel-body">
3921 4243
3922 <!-- Nav tabs --> 4244 <!-- Nav tabs -->
3923 - <ul class="nav nav-tabs" id="doctab28">  
3924 - <li class="active"><a href="#info28" data-toggle="tab">基础信息</a></li>  
3925 - <li><a href="#sandbox28" data-toggle="tab">在线测试</a></li>  
3926 - <li><a href="#sample28" data-toggle="tab">返回示例</a></li> 4245 + <ul class="nav nav-tabs" id="doctab30">
  4246 + <li class="active"><a href="#info30" data-toggle="tab">基础信息</a></li>
  4247 + <li><a href="#sandbox30" data-toggle="tab">在线测试</a></li>
  4248 + <li><a href="#sample30" data-toggle="tab">返回示例</a></li>
3927 </ul> 4249 </ul>
3928 4250
3929 <!-- Tab panes --> 4251 <!-- Tab panes -->
3930 <div class="tab-content"> 4252 <div class="tab-content">
3931 4253
3932 - <div class="tab-pane active" id="info28"> 4254 + <div class="tab-pane active" id="info30">
3933 <div class="well"> 4255 <div class="well">
3934 - 创建视频订单 </div> 4256 + 我的订单 </div>
3935 <div class="panel panel-default"> 4257 <div class="panel panel-default">
3936 <div class="panel-heading"><strong>Headers</strong></div> 4258 <div class="panel-heading"><strong>Headers</strong></div>
3937 <div class="panel-body"> 4259 <div class="panel-body">
@@ -3969,16 +4291,10 @@ @@ -3969,16 +4291,10 @@
3969 </thead> 4291 </thead>
3970 <tbody> 4292 <tbody>
3971 <tr> 4293 <tr>
3972 - <td>video_id</td> 4294 + <td>type</td>
3973 <td>inter</td> 4295 <td>inter</td>
3974 - <td>是</td>  
3975 - <td>视频ID</td>  
3976 - </tr>  
3977 - <tr>  
3978 - <td>total</td>  
3979 - <td>float</td>  
3980 - <td>是</td>  
3981 - <td>价格</td> 4296 + <td>否</td>
  4297 + <td>状态(不传默认为全部 1为待支付 2为已完成</td>
3982 </tr> 4298 </tr>
3983 </tbody> 4299 </tbody>
3984 </table> 4300 </table>
@@ -3991,7 +4307,7 @@ @@ -3991,7 +4307,7 @@
3991 </div> 4307 </div>
3992 </div><!-- #info --> 4308 </div><!-- #info -->
3993 4309
3994 - <div class="tab-pane" id="sandbox28"> 4310 + <div class="tab-pane" id="sandbox30">
3995 <div class="row"> 4311 <div class="row">
3996 <div class="col-md-12"> 4312 <div class="col-md-12">
3997 <div class="panel panel-default"> 4313 <div class="panel panel-default">
@@ -4008,18 +4324,14 @@ @@ -4008,18 +4324,14 @@
4008 <div class="panel panel-default"> 4324 <div class="panel panel-default">
4009 <div class="panel-heading"><strong>参数</strong></div> 4325 <div class="panel-heading"><strong>参数</strong></div>
4010 <div class="panel-body"> 4326 <div class="panel-body">
4011 - <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/v_order" method="POST" name="form28" id="form28">  
4012 - <div class="form-group">  
4013 - <label class="control-label" for="video_id">video_id</label>  
4014 - <input type="inter" class="form-control input-sm" id="video_id" required placeholder="视频ID" name="video_id">  
4015 - </div> 4327 + <form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/myorder" method="POST" name="form30" id="form30">
4016 <div class="form-group"> 4328 <div class="form-group">
4017 - <label class="control-label" for="total">total</label>  
4018 - <input type="float" class="form-control input-sm" id="total" required placeholder="价格" name="total"> 4329 + <label class="control-label" for="type">type</label>
  4330 + <input type="inter" class="form-control input-sm" id="type" placeholder="状态(不传默认为全部 1为待支付 2为已完成" name="type">
4019 </div> 4331 </div>
4020 <div class="form-group"> 4332 <div class="form-group">
4021 - <button type="submit" class="btn btn-success send" rel="28">提交</button>  
4022 - <button type="reset" class="btn btn-info" rel="28">重置</button> 4333 + <button type="submit" class="btn btn-success send" rel="30">提交</button>
  4334 + <button type="reset" class="btn btn-info" rel="30">重置</button>
4023 </div> 4335 </div>
4024 </form> 4336 </form>
4025 </div> 4337 </div>
@@ -4029,8 +4341,8 @@ @@ -4029,8 +4341,8 @@
4029 <div class="panel-body"> 4341 <div class="panel-body">
4030 <div class="row"> 4342 <div class="row">
4031 <div class="col-md-12" style="overflow-x:auto"> 4343 <div class="col-md-12" style="overflow-x:auto">
4032 - <pre id="response_headers28"></pre>  
4033 - <pre id="response28"></pre> 4344 + <pre id="response_headers30"></pre>
  4345 + <pre id="response30"></pre>
4034 </div> 4346 </div>
4035 </div> 4347 </div>
4036 </div> 4348 </div>
@@ -4045,17 +4357,18 @@ @@ -4045,17 +4357,18 @@
4045 </div> 4357 </div>
4046 </div><!-- #sandbox --> 4358 </div><!-- #sandbox -->
4047 4359
4048 - <div class="tab-pane" id="sample28"> 4360 + <div class="tab-pane" id="sample30">
4049 <div class="row"> 4361 <div class="row">
4050 <div class="col-md-12"> 4362 <div class="col-md-12">
4051 - <pre id="sample_response28">{ 4363 + <pre id="sample_response30">{
4052 "code": 1, 4364 "code": 1,
4053 "msg": "成功", 4365 "msg": "成功",
4054 "time": "1571492001", 4366 "time": "1571492001",
4055 "data": { 4367 "data": {
4056 - "order_id"://订单ID  
4057 - }  
4058 - }</pre> 4368 + "id": //用户ID
  4369 + "pic_id": //图片,
  4370 + "video_id": //视频,
  4371 + "status" : //状态(1待支付 2已完成</pre>
4059 </div> 4372 </div>
4060 </div> 4373 </div>
4061 </div><!-- #sample --> 4374 </div><!-- #sample -->
@@ -4070,7 +4383,7 @@ @@ -4070,7 +4383,7 @@
4070 4383
4071 <div class="row mt0 footer"> 4384 <div class="row mt0 footer">
4072 <div class="col-md-6" align="left"> 4385 <div class="col-md-6" align="left">
4073 - Generated on 2019-11-20 20:20:24 </div> 4386 + Generated on 2019-11-20 22:45:23 </div>
4074 <div class="col-md-6" align="right"> 4387 <div class="col-md-6" align="right">
4075 <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a> 4388 <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
4076 </div> 4389 </div>