正在显示
4 个修改的文件
包含
142 行增加
和
66 行删除
@@ -2,7 +2,10 @@ | @@ -2,7 +2,10 @@ | ||
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/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" /> | 7 | <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" /> | ||
6 | </list> | 9 | </list> |
7 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 10 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
8 | <option name="TRACKING_ENABLED" value="true" /> | 11 | <option name="TRACKING_ENABLED" value="true" /> |
@@ -16,7 +19,7 @@ | @@ -16,7 +19,7 @@ | ||
16 | <file leaf-file-name="User.php" pinned="false" current-in-tab="true"> | 19 | <file leaf-file-name="User.php" pinned="false" current-in-tab="true"> |
17 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> | 20 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> |
18 | <provider selected="true" editor-type-id="text-editor"> | 21 | <provider selected="true" editor-type-id="text-editor"> |
19 | - <state relative-caret-position="721"> | 22 | + <state relative-caret-position="537"> |
20 | <caret line="453" column="58" lean-forward="false" selection-start-line="453" selection-start-column="58" selection-end-line="453" selection-end-column="58" /> | 23 | <caret line="453" column="58" lean-forward="false" selection-start-line="453" selection-start-column="58" selection-end-line="453" selection-end-column="58" /> |
21 | <folding> | 24 | <folding> |
22 | <element signature="e#38#68#0#PHP" expanded="true" /> | 25 | <element signature="e#38#68#0#PHP" expanded="true" /> |
@@ -24,7 +27,6 @@ | @@ -24,7 +27,6 @@ | ||
24 | <element signature="e#462#1200#0#PHP" expanded="false" /> | 27 | <element signature="e#462#1200#0#PHP" expanded="false" /> |
25 | <element signature="e#1205#2868#0#PHP" expanded="false" /> | 28 | <element signature="e#1205#2868#0#PHP" expanded="false" /> |
26 | <element signature="e#2874#3402#0#PHP" expanded="false" /> | 29 | <element signature="e#2874#3402#0#PHP" expanded="false" /> |
27 | - <element signature="e#3407#4178#0#PHP" expanded="false" /> | ||
28 | <element signature="e#4184#4591#0#PHP" expanded="false" /> | 30 | <element signature="e#4184#4591#0#PHP" expanded="false" /> |
29 | <element signature="e#4596#4939#0#PHP" expanded="false" /> | 31 | <element signature="e#4596#4939#0#PHP" expanded="false" /> |
30 | <element signature="e#4945#5782#0#PHP" expanded="false" /> | 32 | <element signature="e#4945#5782#0#PHP" expanded="false" /> |
@@ -36,26 +38,42 @@ | @@ -36,26 +38,42 @@ | ||
36 | <element signature="e#11641#12217#0#PHP" expanded="false" /> | 38 | <element signature="e#11641#12217#0#PHP" expanded="false" /> |
37 | <element signature="e#12222#12769#0#PHP" expanded="false" /> | 39 | <element signature="e#12222#12769#0#PHP" expanded="false" /> |
38 | <element signature="e#12775#13459#0#PHP" expanded="false" /> | 40 | <element signature="e#12775#13459#0#PHP" expanded="false" /> |
39 | - <element signature="e#15142#16012#0#PHP" expanded="false" /> | ||
40 | - <element signature="e#16017#18111#0#PHP" expanded="false" /> | ||
41 | - <element signature="e#18117#18494#0#PHP" expanded="false" /> | ||
42 | - <element signature="e#18499#18763#0#PHP" expanded="false" /> | ||
43 | - <element signature="e#18769#19274#0#PHP" expanded="false" /> | ||
44 | - <element signature="e#19279#19530#0#PHP" expanded="false" /> | ||
45 | - <element signature="e#19536#20015#0#PHP" expanded="false" /> | ||
46 | - <element signature="e#20020#20777#0#PHP" expanded="false" /> | ||
47 | - <element signature="e#20783#21146#0#PHP" expanded="false" /> | ||
48 | - <element signature="e#21151#21342#0#PHP" expanded="false" /> | ||
49 | - <element signature="e#21348#21706#0#PHP" expanded="false" /> | ||
50 | - <element signature="e#21711#21901#0#PHP" expanded="false" /> | ||
51 | - <element signature="e#21907#23050#0#PHP" expanded="false" /> | ||
52 | - <element signature="e#23055#25610#0#PHP" expanded="false" /> | ||
53 | - <element signature="e#25616#26107#0#PHP" expanded="false" /> | ||
54 | - <element signature="e#26112#27325#0#PHP" expanded="false" /> | ||
55 | - <element signature="e#27331#27865#0#PHP" expanded="false" /> | ||
56 | - <element signature="e#27870#28784#0#PHP" expanded="false" /> | ||
57 | - <element signature="e#28790#29321#0#PHP" expanded="false" /> | ||
58 | - <element signature="e#29326#30246#0#PHP" expanded="false" /> | 41 | + <element signature="e#15260#16130#0#PHP" expanded="false" /> |
42 | + <element signature="e#16135#18229#0#PHP" expanded="false" /> | ||
43 | + <element signature="e#18235#18612#0#PHP" expanded="false" /> | ||
44 | + <element signature="e#18617#18881#0#PHP" expanded="false" /> | ||
45 | + <element signature="e#18887#19392#0#PHP" expanded="false" /> | ||
46 | + <element signature="e#19397#19648#0#PHP" expanded="false" /> | ||
47 | + <element signature="e#19654#20133#0#PHP" expanded="false" /> | ||
48 | + <element signature="e#20138#20895#0#PHP" expanded="false" /> | ||
49 | + <element signature="e#20901#21264#0#PHP" expanded="false" /> | ||
50 | + <element signature="e#21269#21460#0#PHP" expanded="false" /> | ||
51 | + <element signature="e#21466#21824#0#PHP" expanded="false" /> | ||
52 | + <element signature="e#21829#22019#0#PHP" expanded="false" /> | ||
53 | + <element signature="e#22025#23168#0#PHP" expanded="false" /> | ||
54 | + <element signature="e#23173#25728#0#PHP" expanded="false" /> | ||
55 | + <element signature="e#25734#26225#0#PHP" expanded="false" /> | ||
56 | + <element signature="e#26230#27443#0#PHP" expanded="false" /> | ||
57 | + <element signature="e#27449#27983#0#PHP" expanded="false" /> | ||
58 | + <element signature="e#27988#28902#0#PHP" expanded="false" /> | ||
59 | + <element signature="e#28908#29439#0#PHP" expanded="false" /> | ||
60 | + <element signature="e#29444#30364#0#PHP" expanded="false" /> | ||
61 | + </folding> | ||
62 | + </state> | ||
63 | + </provider> | ||
64 | + </entry> | ||
65 | + </file> | ||
66 | + <file leaf-file-name="Pay.php" pinned="false" current-in-tab="false"> | ||
67 | + <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> | ||
68 | + <provider selected="true" editor-type-id="text-editor"> | ||
69 | + <state relative-caret-position="525"> | ||
70 | + <caret line="102" column="35" lean-forward="false" selection-start-line="102" selection-start-column="35" selection-end-line="102" selection-end-column="35" /> | ||
71 | + <folding> | ||
72 | + <element signature="e#450#569#0#PHP" expanded="false" /> | ||
73 | + <element signature="e#575#888#0#PHP" expanded="false" /> | ||
74 | + <element signature="e#893#2938#0#PHP" expanded="false" /> | ||
75 | + <element signature="e#5337#5554#0#PHP" expanded="false" /> | ||
76 | + <element signature="e#5581#7480#0#PHP" expanded="false" /> | ||
59 | </folding> | 77 | </folding> |
60 | </state> | 78 | </state> |
61 | </provider> | 79 | </provider> |
@@ -109,13 +127,13 @@ | @@ -109,13 +127,13 @@ | ||
109 | <option value="$PROJECT_DIR$/application/admin/view/video/edit.html" /> | 127 | <option value="$PROJECT_DIR$/application/admin/view/video/edit.html" /> |
110 | <option value="$PROJECT_DIR$/composer.json" /> | 128 | <option value="$PROJECT_DIR$/composer.json" /> |
111 | <option value="$PROJECT_DIR$/public/assets/js/backend/user/user.js" /> | 129 | <option value="$PROJECT_DIR$/public/assets/js/backend/user/user.js" /> |
112 | - <option value="$PROJECT_DIR$/application/api/controller/Pay.php" /> | ||
113 | <option value="$PROJECT_DIR$/application/admin/view/vip/index.html" /> | 130 | <option value="$PROJECT_DIR$/application/admin/view/vip/index.html" /> |
114 | <option value="$PROJECT_DIR$/public/assets/js/backend/vip.js" /> | 131 | <option value="$PROJECT_DIR$/public/assets/js/backend/vip.js" /> |
115 | <option value="$PROJECT_DIR$/application/admin/view/pic/add.html" /> | 132 | <option value="$PROJECT_DIR$/application/admin/view/pic/add.html" /> |
116 | <option value="$PROJECT_DIR$/application/admin/view/pic/edit.html" /> | 133 | <option value="$PROJECT_DIR$/application/admin/view/pic/edit.html" /> |
117 | <option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" /> | 134 | <option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" /> |
118 | <option value="$PROJECT_DIR$/application/extra/verify.php" /> | 135 | <option value="$PROJECT_DIR$/application/extra/verify.php" /> |
136 | + <option value="$PROJECT_DIR$/application/api/controller/Pay.php" /> | ||
119 | <option value="$PROJECT_DIR$/application/api/controller/User.php" /> | 137 | <option value="$PROJECT_DIR$/application/api/controller/User.php" /> |
120 | </list> | 138 | </list> |
121 | </option> | 139 | </option> |
@@ -134,11 +152,11 @@ | @@ -134,11 +152,11 @@ | ||
134 | <sorting>DEFINITION_ORDER</sorting> | 152 | <sorting>DEFINITION_ORDER</sorting> |
135 | </component> | 153 | </component> |
136 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> | 154 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> |
137 | - <component name="ProjectFrameBounds" extendedState="1"> | ||
138 | - <option name="x" value="132" /> | ||
139 | - <option name="y" value="34" /> | 155 | + <component name="ProjectFrameBounds"> |
156 | + <option name="x" value="441" /> | ||
157 | + <option name="y" value="86" /> | ||
140 | <option name="width" value="1699" /> | 158 | <option name="width" value="1699" /> |
141 | - <option name="height" value="977" /> | 159 | + <option name="height" value="974" /> |
142 | </component> | 160 | </component> |
143 | <component name="ProjectView"> | 161 | <component name="ProjectView"> |
144 | <navigator currentView="ProjectPane" proportions="" version="1"> | 162 | <navigator currentView="ProjectPane" proportions="" version="1"> |
@@ -235,7 +253,7 @@ | @@ -235,7 +253,7 @@ | ||
235 | <workItem from="1574141466352" duration="745000" /> | 253 | <workItem from="1574141466352" duration="745000" /> |
236 | <workItem from="1574143209694" duration="3660000" /> | 254 | <workItem from="1574143209694" duration="3660000" /> |
237 | <workItem from="1574146994475" duration="23222000" /> | 255 | <workItem from="1574146994475" duration="23222000" /> |
238 | - <workItem from="1574209189943" duration="31042000" /> | 256 | + <workItem from="1574209189943" duration="31449000" /> |
239 | </task> | 257 | </task> |
240 | <task id="LOCAL-00001" summary="调试"> | 258 | <task id="LOCAL-00001" summary="调试"> |
241 | <created>1574145133364</created> | 259 | <created>1574145133364</created> |
@@ -248,7 +266,7 @@ | @@ -248,7 +266,7 @@ | ||
248 | <servers /> | 266 | <servers /> |
249 | </component> | 267 | </component> |
250 | <component name="TimeTrackingManager"> | 268 | <component name="TimeTrackingManager"> |
251 | - <option name="totallyTimeSpent" value="102617000" /> | 269 | + <option name="totallyTimeSpent" value="103024000" /> |
252 | </component> | 270 | </component> |
253 | <component name="TodoView"> | 271 | <component name="TodoView"> |
254 | <todo-panel id="selected-file"> | 272 | <todo-panel id="selected-file"> |
@@ -260,7 +278,7 @@ | @@ -260,7 +278,7 @@ | ||
260 | </todo-panel> | 278 | </todo-panel> |
261 | </component> | 279 | </component> |
262 | <component name="ToolWindowManager"> | 280 | <component name="ToolWindowManager"> |
263 | - <frame x="132" y="34" width="1699" height="977" extended-state="1" /> | 281 | + <frame x="441" y="86" width="1699" height="974" extended-state="0" /> |
264 | <layout> | 282 | <layout> |
265 | <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14887126" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> | 283 | <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14887126" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> |
266 | <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" /> | 284 | <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" /> |
@@ -269,7 +287,7 @@ | @@ -269,7 +287,7 @@ | ||
269 | <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" /> | 287 | <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" /> |
270 | <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" /> | 288 | <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" /> |
271 | <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" /> | 289 | <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" /> |
272 | - <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15119047" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> | 290 | + <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15053764" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> |
273 | <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" /> | 291 | <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" /> |
274 | <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" /> | 292 | <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" /> |
275 | <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" /> | 293 | <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" /> |
@@ -604,19 +622,6 @@ | @@ -604,19 +622,6 @@ | ||
604 | </state> | 622 | </state> |
605 | </provider> | 623 | </provider> |
606 | </entry> | 624 | </entry> |
607 | - <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> | ||
608 | - <provider selected="true" editor-type-id="text-editor"> | ||
609 | - <state relative-caret-position="409"> | ||
610 | - <caret line="129" column="39" lean-forward="false" selection-start-line="129" selection-start-column="39" selection-end-line="129" selection-end-column="39" /> | ||
611 | - <folding> | ||
612 | - <element signature="e#450#569#0#PHP" expanded="false" /> | ||
613 | - <element signature="e#575#888#0#PHP" expanded="false" /> | ||
614 | - <element signature="e#893#2938#0#PHP" expanded="false" /> | ||
615 | - <element signature="e#2961#3178#0#PHP" expanded="false" /> | ||
616 | - </folding> | ||
617 | - </state> | ||
618 | - </provider> | ||
619 | - </entry> | ||
620 | <entry file="file://$PROJECT_DIR$/application/admin/controller/Vip.php"> | 625 | <entry file="file://$PROJECT_DIR$/application/admin/controller/Vip.php"> |
621 | <provider selected="true" editor-type-id="text-editor"> | 626 | <provider selected="true" editor-type-id="text-editor"> |
622 | <state relative-caret-position="-116"> | 627 | <state relative-caret-position="-116"> |
@@ -689,9 +694,23 @@ | @@ -689,9 +694,23 @@ | ||
689 | </state> | 694 | </state> |
690 | </provider> | 695 | </provider> |
691 | </entry> | 696 | </entry> |
697 | + <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> | ||
698 | + <provider selected="true" editor-type-id="text-editor"> | ||
699 | + <state relative-caret-position="525"> | ||
700 | + <caret line="102" column="35" lean-forward="false" selection-start-line="102" selection-start-column="35" selection-end-line="102" selection-end-column="35" /> | ||
701 | + <folding> | ||
702 | + <element signature="e#450#569#0#PHP" expanded="false" /> | ||
703 | + <element signature="e#575#888#0#PHP" expanded="false" /> | ||
704 | + <element signature="e#893#2938#0#PHP" expanded="false" /> | ||
705 | + <element signature="e#5337#5554#0#PHP" expanded="false" /> | ||
706 | + <element signature="e#5581#7480#0#PHP" expanded="false" /> | ||
707 | + </folding> | ||
708 | + </state> | ||
709 | + </provider> | ||
710 | + </entry> | ||
692 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> | 711 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> |
693 | <provider selected="true" editor-type-id="text-editor"> | 712 | <provider selected="true" editor-type-id="text-editor"> |
694 | - <state relative-caret-position="721"> | 713 | + <state relative-caret-position="537"> |
695 | <caret line="453" column="58" lean-forward="false" selection-start-line="453" selection-start-column="58" selection-end-line="453" selection-end-column="58" /> | 714 | <caret line="453" column="58" lean-forward="false" selection-start-line="453" selection-start-column="58" selection-end-line="453" selection-end-column="58" /> |
696 | <folding> | 715 | <folding> |
697 | <element signature="e#38#68#0#PHP" expanded="true" /> | 716 | <element signature="e#38#68#0#PHP" expanded="true" /> |
@@ -699,7 +718,6 @@ | @@ -699,7 +718,6 @@ | ||
699 | <element signature="e#462#1200#0#PHP" expanded="false" /> | 718 | <element signature="e#462#1200#0#PHP" expanded="false" /> |
700 | <element signature="e#1205#2868#0#PHP" expanded="false" /> | 719 | <element signature="e#1205#2868#0#PHP" expanded="false" /> |
701 | <element signature="e#2874#3402#0#PHP" expanded="false" /> | 720 | <element signature="e#2874#3402#0#PHP" expanded="false" /> |
702 | - <element signature="e#3407#4178#0#PHP" expanded="false" /> | ||
703 | <element signature="e#4184#4591#0#PHP" expanded="false" /> | 721 | <element signature="e#4184#4591#0#PHP" expanded="false" /> |
704 | <element signature="e#4596#4939#0#PHP" expanded="false" /> | 722 | <element signature="e#4596#4939#0#PHP" expanded="false" /> |
705 | <element signature="e#4945#5782#0#PHP" expanded="false" /> | 723 | <element signature="e#4945#5782#0#PHP" expanded="false" /> |
@@ -711,26 +729,26 @@ | @@ -711,26 +729,26 @@ | ||
711 | <element signature="e#11641#12217#0#PHP" expanded="false" /> | 729 | <element signature="e#11641#12217#0#PHP" expanded="false" /> |
712 | <element signature="e#12222#12769#0#PHP" expanded="false" /> | 730 | <element signature="e#12222#12769#0#PHP" expanded="false" /> |
713 | <element signature="e#12775#13459#0#PHP" expanded="false" /> | 731 | <element signature="e#12775#13459#0#PHP" expanded="false" /> |
714 | - <element signature="e#15142#16012#0#PHP" expanded="false" /> | ||
715 | - <element signature="e#16017#18111#0#PHP" expanded="false" /> | ||
716 | - <element signature="e#18117#18494#0#PHP" expanded="false" /> | ||
717 | - <element signature="e#18499#18763#0#PHP" expanded="false" /> | ||
718 | - <element signature="e#18769#19274#0#PHP" expanded="false" /> | ||
719 | - <element signature="e#19279#19530#0#PHP" expanded="false" /> | ||
720 | - <element signature="e#19536#20015#0#PHP" expanded="false" /> | ||
721 | - <element signature="e#20020#20777#0#PHP" expanded="false" /> | ||
722 | - <element signature="e#20783#21146#0#PHP" expanded="false" /> | ||
723 | - <element signature="e#21151#21342#0#PHP" expanded="false" /> | ||
724 | - <element signature="e#21348#21706#0#PHP" expanded="false" /> | ||
725 | - <element signature="e#21711#21901#0#PHP" expanded="false" /> | ||
726 | - <element signature="e#21907#23050#0#PHP" expanded="false" /> | ||
727 | - <element signature="e#23055#25610#0#PHP" expanded="false" /> | ||
728 | - <element signature="e#25616#26107#0#PHP" expanded="false" /> | ||
729 | - <element signature="e#26112#27325#0#PHP" expanded="false" /> | ||
730 | - <element signature="e#27331#27865#0#PHP" expanded="false" /> | ||
731 | - <element signature="e#27870#28784#0#PHP" expanded="false" /> | ||
732 | - <element signature="e#28790#29321#0#PHP" expanded="false" /> | ||
733 | - <element signature="e#29326#30246#0#PHP" expanded="false" /> | 732 | + <element signature="e#15260#16130#0#PHP" expanded="false" /> |
733 | + <element signature="e#16135#18229#0#PHP" expanded="false" /> | ||
734 | + <element signature="e#18235#18612#0#PHP" expanded="false" /> | ||
735 | + <element signature="e#18617#18881#0#PHP" expanded="false" /> | ||
736 | + <element signature="e#18887#19392#0#PHP" expanded="false" /> | ||
737 | + <element signature="e#19397#19648#0#PHP" expanded="false" /> | ||
738 | + <element signature="e#19654#20133#0#PHP" expanded="false" /> | ||
739 | + <element signature="e#20138#20895#0#PHP" expanded="false" /> | ||
740 | + <element signature="e#20901#21264#0#PHP" expanded="false" /> | ||
741 | + <element signature="e#21269#21460#0#PHP" expanded="false" /> | ||
742 | + <element signature="e#21466#21824#0#PHP" expanded="false" /> | ||
743 | + <element signature="e#21829#22019#0#PHP" expanded="false" /> | ||
744 | + <element signature="e#22025#23168#0#PHP" expanded="false" /> | ||
745 | + <element signature="e#23173#25728#0#PHP" expanded="false" /> | ||
746 | + <element signature="e#25734#26225#0#PHP" expanded="false" /> | ||
747 | + <element signature="e#26230#27443#0#PHP" expanded="false" /> | ||
748 | + <element signature="e#27449#27983#0#PHP" expanded="false" /> | ||
749 | + <element signature="e#27988#28902#0#PHP" expanded="false" /> | ||
750 | + <element signature="e#28908#29439#0#PHP" expanded="false" /> | ||
751 | + <element signature="e#29444#30364#0#PHP" expanded="false" /> | ||
734 | </folding> | 752 | </folding> |
735 | </state> | 753 | </state> |
736 | </provider> | 754 | </provider> |
@@ -82,6 +82,62 @@ class Pay extends Api | @@ -82,6 +82,62 @@ class Pay extends Api | ||
82 | } | 82 | } |
83 | } | 83 | } |
84 | 84 | ||
85 | + /** | ||
86 | + * @ApiTitle (图片购买支付) | ||
87 | + * @ApiSummary (图片购买支付) | ||
88 | + * @ApiMethod (POST) | ||
89 | + * @ApiRoute (/api/pay/picpay) | ||
90 | + * @ApiHeaders (name=token, type=string, required=true, description="请求的Token") | ||
91 | + * | ||
92 | + * @ApiParams (name="order_id", type="inter", required=true, description="订单id") | ||
93 | + * | ||
94 | + */ | ||
95 | + public function picpay(){ | ||
96 | + $rule = config('verify.path'); | ||
97 | + if($this->request->isPost()){ | ||
98 | + $order_id = $this->request->post('order_id'); | ||
99 | + $openid = $this->getopenid(); | ||
100 | + if(empty($openid)){ | ||
101 | + $this->error(['code'=>2,'msg'=>'openid不能为空']); | ||
102 | + } | ||
103 | + $data = Db::name('order')->where('id',$order_id)->find(); | ||
104 | + if($data){ | ||
105 | + if($data['status'] == 2){ | ||
106 | + $this->error('该订单已支付过了'); | ||
107 | + }else{ | ||
108 | + //创建支付对象 | ||
109 | + $config = config('verify.wx_pay'); | ||
110 | + $app = Factory::payment($config); | ||
111 | + $result = $app->order->unify([ | ||
112 | + 'body' => '山东航拍', | ||
113 | + 'out_trade_no' => $data['num'],//支付订单号 | ||
114 | + 'total_fee' => $data['money']*100,//单位分 | ||
115 | + 'notify_url' => $rule.'api/pay/payOrderNotify', // 支付结果通知网址,如果不设置则会使用配置里的默认地址 | ||
116 | + 'trade_type' => 'JSAPI', // 请对应换成你的支付方式对应的值类型 | ||
117 | + 'openid' => $openid, | ||
118 | + ]); | ||
119 | + if($result['return_code'] === 'SUCCESS' && $result['result_code'] === 'SUCCESS'){ | ||
120 | + $params = [ | ||
121 | + 'appId' => $config['app_id'], | ||
122 | + 'timeStamp' => time(), | ||
123 | + 'nonceStr' => $result['nonce_str'], // 统一下单返回的随机字符串 | ||
124 | + 'package' => 'prepay_id='.$result['prepay_id'], // 统一下单Id | ||
125 | + 'signType' => 'MD5', // 签名方法 | ||
126 | + ]; | ||
127 | + // 注意这里用的是商户平台的Key进行二次签名 | ||
128 | + $params['paySign'] = generate_sign($params, $config['key']); | ||
129 | + $this->success('成功',$params); | ||
130 | + } | ||
131 | + $this->error($result['err_code_des']); | ||
132 | + } | ||
133 | + }else{ | ||
134 | + $this->error('无效的订单'); | ||
135 | + } | ||
136 | + }else{ | ||
137 | + $this->error('请求方式错误'); | ||
138 | + } | ||
139 | + } | ||
140 | + | ||
85 | //获取用户openid | 141 | //获取用户openid |
86 | public function getopenid() | 142 | public function getopenid() |
87 | { | 143 | { |
@@ -432,6 +432,7 @@ class User extends Api | @@ -432,6 +432,7 @@ class User extends Api | ||
432 | if(empty($data)){ | 432 | if(empty($data)){ |
433 | $this->error(['code'=>2,'msg'=>'参数错误']); | 433 | $this->error(['code'=>2,'msg'=>'参数错误']); |
434 | } | 434 | } |
435 | + $data['water_url'] = $rule.$data['water_url']; | ||
435 | $data['vip_price'] = $data['price'] * 0.75; | 436 | $data['vip_price'] = $data['price'] * 0.75; |
436 | $data['thumbnail'] = $rule.$data['thumbnail']; | 437 | $data['thumbnail'] = $rule.$data['thumbnail']; |
437 | $data['content'] = strip_tags($data['content']); | 438 | $data['content'] = strip_tags($data['content']); |
@@ -450,6 +451,7 @@ class User extends Api | @@ -450,6 +451,7 @@ class User extends Api | ||
450 | $this->error(['code'=>2,'msg'=>'参数错误']); | 451 | $this->error(['code'=>2,'msg'=>'参数错误']); |
451 | } | 452 | } |
452 | $data['is_vip'] = 1; | 453 | $data['is_vip'] = 1; |
454 | + $data['water_url'] = $rule.$data['water_url']; | ||
453 | $data['vip_price'] = $data['price'] * 0.75; | 455 | $data['vip_price'] = $data['price'] * 0.75; |
454 | $data['thumbnail'] = $rule.$data['thumbnail']; | 456 | $data['thumbnail'] = $rule.$data['thumbnail']; |
455 | $data['content'] = strip_tags($data['content']); | 457 | $data['content'] = strip_tags($data['content']); |
此 diff 太大无法显示。
-
请 注册 或 登录 后发表评论