正在显示
2 个修改的文件
包含
21 行增加
和
23 行删除
| @@ -88,8 +88,8 @@ | @@ -88,8 +88,8 @@ | ||
| 88 | <file leaf-file-name="Pay.php" pinned="false" current-in-tab="true"> | 88 | <file leaf-file-name="Pay.php" pinned="false" current-in-tab="true"> |
| 89 | <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> | 89 | <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> |
| 90 | <provider selected="true" editor-type-id="text-editor"> | 90 | <provider selected="true" editor-type-id="text-editor"> |
| 91 | - <state relative-caret-position="513"> | ||
| 92 | - <caret line="659" column="53" lean-forward="false" selection-start-line="659" selection-start-column="53" selection-end-line="659" selection-end-column="53" /> | 91 | + <state relative-caret-position="13"> |
| 92 | + <caret line="642" column="60" lean-forward="true" selection-start-line="642" selection-start-column="60" selection-end-line="642" selection-end-column="60" /> | ||
| 93 | <folding> | 93 | <folding> |
| 94 | <element signature="e#574#693#0#PHP" expanded="false" /> | 94 | <element signature="e#574#693#0#PHP" expanded="false" /> |
| 95 | <element signature="e#699#1012#0#PHP" expanded="false" /> | 95 | <element signature="e#699#1012#0#PHP" expanded="false" /> |
| @@ -107,12 +107,12 @@ | @@ -107,12 +107,12 @@ | ||
| 107 | <element signature="e#22939#23332#0#PHP" expanded="false" /> | 107 | <element signature="e#22939#23332#0#PHP" expanded="false" /> |
| 108 | <element signature="e#23359#26837#0#PHP" expanded="false" /> | 108 | <element signature="e#23359#26837#0#PHP" expanded="false" /> |
| 109 | <element signature="e#26866#29771#0#PHP" expanded="false" /> | 109 | <element signature="e#26866#29771#0#PHP" expanded="false" /> |
| 110 | - <element signature="e#31790#32039#0#PHP" expanded="false" /> | ||
| 111 | - <element signature="e#32082#33519#0#PHP" expanded="false" /> | ||
| 112 | - <element signature="e#32541#33497#0#PHP" expanded="false" /> | ||
| 113 | - <element signature="e#34059#38522#0#PHP" expanded="false" /> | ||
| 114 | - <element signature="e#36289#38037#0#PHP" expanded="false" /> | ||
| 115 | - <element signature="e#38545#38762#0#PHP" expanded="false" /> | 110 | + <element signature="e#31735#31984#0#PHP" expanded="false" /> |
| 111 | + <element signature="e#32027#33464#0#PHP" expanded="false" /> | ||
| 112 | + <element signature="e#32486#33442#0#PHP" expanded="false" /> | ||
| 113 | + <element signature="e#34004#38467#0#PHP" expanded="false" /> | ||
| 114 | + <element signature="e#36234#37982#0#PHP" expanded="false" /> | ||
| 115 | + <element signature="e#38490#38707#0#PHP" expanded="false" /> | ||
| 116 | </folding> | 116 | </folding> |
| 117 | </state> | 117 | </state> |
| 118 | </provider> | 118 | </provider> |
| @@ -205,8 +205,8 @@ | @@ -205,8 +205,8 @@ | ||
| 205 | </component> | 205 | </component> |
| 206 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> | 206 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> |
| 207 | <component name="ProjectFrameBounds"> | 207 | <component name="ProjectFrameBounds"> |
| 208 | - <option name="x" value="224" /> | ||
| 209 | - <option name="y" value="49" /> | 208 | + <option name="x" value="25" /> |
| 209 | + <option name="y" value="73" /> | ||
| 210 | <option name="width" value="1700" /> | 210 | <option name="width" value="1700" /> |
| 211 | <option name="height" value="1000" /> | 211 | <option name="height" value="1000" /> |
| 212 | </component> | 212 | </component> |
| @@ -336,7 +336,7 @@ | @@ -336,7 +336,7 @@ | ||
| 336 | <workItem from="1575541798312" duration="2359000" /> | 336 | <workItem from="1575541798312" duration="2359000" /> |
| 337 | <workItem from="1575592025964" duration="640000" /> | 337 | <workItem from="1575592025964" duration="640000" /> |
| 338 | <workItem from="1575599624364" duration="95000" /> | 338 | <workItem from="1575599624364" duration="95000" /> |
| 339 | - <workItem from="1575680867057" duration="10904000" /> | 339 | + <workItem from="1575680867057" duration="11275000" /> |
| 340 | </task> | 340 | </task> |
| 341 | <task id="LOCAL-00001" summary="调试"> | 341 | <task id="LOCAL-00001" summary="调试"> |
| 342 | <created>1574145133364</created> | 342 | <created>1574145133364</created> |
| @@ -349,7 +349,7 @@ | @@ -349,7 +349,7 @@ | ||
| 349 | <servers /> | 349 | <servers /> |
| 350 | </component> | 350 | </component> |
| 351 | <component name="TimeTrackingManager"> | 351 | <component name="TimeTrackingManager"> |
| 352 | - <option name="totallyTimeSpent" value="320803000" /> | 352 | + <option name="totallyTimeSpent" value="321174000" /> |
| 353 | </component> | 353 | </component> |
| 354 | <component name="TodoView"> | 354 | <component name="TodoView"> |
| 355 | <todo-panel id="selected-file"> | 355 | <todo-panel id="selected-file"> |
| @@ -361,7 +361,7 @@ | @@ -361,7 +361,7 @@ | ||
| 361 | </todo-panel> | 361 | </todo-panel> |
| 362 | </component> | 362 | </component> |
| 363 | <component name="ToolWindowManager"> | 363 | <component name="ToolWindowManager"> |
| 364 | - <frame x="224" y="49" width="1700" height="1000" extended-state="0" /> | 364 | + <frame x="25" y="73" width="1700" height="1000" extended-state="0" /> |
| 365 | <editor active="true" /> | 365 | <editor active="true" /> |
| 366 | <layout> | 366 | <layout> |
| 367 | <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19512194" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> | 367 | <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19512194" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> |
| @@ -858,8 +858,8 @@ | @@ -858,8 +858,8 @@ | ||
| 858 | </entry> | 858 | </entry> |
| 859 | <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> | 859 | <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> |
| 860 | <provider selected="true" editor-type-id="text-editor"> | 860 | <provider selected="true" editor-type-id="text-editor"> |
| 861 | - <state relative-caret-position="513"> | ||
| 862 | - <caret line="659" column="53" lean-forward="false" selection-start-line="659" selection-start-column="53" selection-end-line="659" selection-end-column="53" /> | 861 | + <state relative-caret-position="13"> |
| 862 | + <caret line="642" column="60" lean-forward="true" selection-start-line="642" selection-start-column="60" selection-end-line="642" selection-end-column="60" /> | ||
| 863 | <folding> | 863 | <folding> |
| 864 | <element signature="e#574#693#0#PHP" expanded="false" /> | 864 | <element signature="e#574#693#0#PHP" expanded="false" /> |
| 865 | <element signature="e#699#1012#0#PHP" expanded="false" /> | 865 | <element signature="e#699#1012#0#PHP" expanded="false" /> |
| @@ -877,12 +877,12 @@ | @@ -877,12 +877,12 @@ | ||
| 877 | <element signature="e#22939#23332#0#PHP" expanded="false" /> | 877 | <element signature="e#22939#23332#0#PHP" expanded="false" /> |
| 878 | <element signature="e#23359#26837#0#PHP" expanded="false" /> | 878 | <element signature="e#23359#26837#0#PHP" expanded="false" /> |
| 879 | <element signature="e#26866#29771#0#PHP" expanded="false" /> | 879 | <element signature="e#26866#29771#0#PHP" expanded="false" /> |
| 880 | - <element signature="e#31790#32039#0#PHP" expanded="false" /> | ||
| 881 | - <element signature="e#32082#33519#0#PHP" expanded="false" /> | ||
| 882 | - <element signature="e#32541#33497#0#PHP" expanded="false" /> | ||
| 883 | - <element signature="e#34059#38522#0#PHP" expanded="false" /> | ||
| 884 | - <element signature="e#36289#38037#0#PHP" expanded="false" /> | ||
| 885 | - <element signature="e#38545#38762#0#PHP" expanded="false" /> | 880 | + <element signature="e#31735#31984#0#PHP" expanded="false" /> |
| 881 | + <element signature="e#32027#33464#0#PHP" expanded="false" /> | ||
| 882 | + <element signature="e#32486#33442#0#PHP" expanded="false" /> | ||
| 883 | + <element signature="e#34004#38467#0#PHP" expanded="false" /> | ||
| 884 | + <element signature="e#36234#37982#0#PHP" expanded="false" /> | ||
| 885 | + <element signature="e#38490#38707#0#PHP" expanded="false" /> | ||
| 886 | </folding> | 886 | </folding> |
| 887 | </state> | 887 | </state> |
| 888 | </provider> | 888 | </provider> |
| @@ -657,8 +657,6 @@ class Pay extends Api | @@ -657,8 +657,6 @@ class Pay extends Api | ||
| 657 | ->where('id',$data['user_id']) | 657 | ->where('id',$data['user_id']) |
| 658 | ->field('id,is_vip') | 658 | ->field('id,is_vip') |
| 659 | ->find(); | 659 | ->find(); |
| 660 | - $this->success('success',$login); | ||
| 661 | - | ||
| 662 | if(!empty($pic_id)){ | 660 | if(!empty($pic_id)){ |
| 663 | foreach ($pic_id as $key => $v){ | 661 | foreach ($pic_id as $key => $v){ |
| 664 | //非会员 | 662 | //非会员 |
-
请 注册 或 登录 后发表评论