diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 87998c3..d76eaca 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -89,7 +89,7 @@ <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="513"> - <caret line="659" column="38" lean-forward="false" selection-start-line="659" selection-start-column="38" selection-end-line="659" selection-end-column="38" /> + <caret line="659" column="53" lean-forward="false" selection-start-line="659" selection-start-column="53" selection-end-line="659" selection-end-column="53" /> <folding> <element signature="e#574#693#0#PHP" expanded="false" /> <element signature="e#699#1012#0#PHP" expanded="false" /> @@ -107,12 +107,12 @@ <element signature="e#22939#23332#0#PHP" expanded="false" /> <element signature="e#23359#26837#0#PHP" expanded="false" /> <element signature="e#26866#29771#0#PHP" expanded="false" /> - <element signature="e#31775#32024#0#PHP" expanded="false" /> - <element signature="e#32067#33504#0#PHP" expanded="false" /> - <element signature="e#32526#33482#0#PHP" expanded="false" /> - <element signature="e#34044#38507#0#PHP" expanded="false" /> - <element signature="e#36274#38022#0#PHP" expanded="false" /> - <element signature="e#38530#38747#0#PHP" expanded="false" /> + <element signature="e#31790#32039#0#PHP" expanded="false" /> + <element signature="e#32082#33519#0#PHP" expanded="false" /> + <element signature="e#32541#33497#0#PHP" expanded="false" /> + <element signature="e#34059#38522#0#PHP" expanded="false" /> + <element signature="e#36289#38037#0#PHP" expanded="false" /> + <element signature="e#38545#38762#0#PHP" expanded="false" /> </folding> </state> </provider> @@ -336,7 +336,7 @@ <workItem from="1575541798312" duration="2359000" /> <workItem from="1575592025964" duration="640000" /> <workItem from="1575599624364" duration="95000" /> - <workItem from="1575680867057" duration="10726000" /> + <workItem from="1575680867057" duration="10904000" /> </task> <task id="LOCAL-00001" summary="调试"> <created>1574145133364</created> @@ -349,7 +349,7 @@ <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="320625000" /> + <option name="totallyTimeSpent" value="320803000" /> </component> <component name="TodoView"> <todo-panel id="selected-file"> @@ -859,7 +859,7 @@ <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="513"> - <caret line="659" column="38" lean-forward="false" selection-start-line="659" selection-start-column="38" selection-end-line="659" selection-end-column="38" /> + <caret line="659" column="53" lean-forward="false" selection-start-line="659" selection-start-column="53" selection-end-line="659" selection-end-column="53" /> <folding> <element signature="e#574#693#0#PHP" expanded="false" /> <element signature="e#699#1012#0#PHP" expanded="false" /> @@ -877,12 +877,12 @@ <element signature="e#22939#23332#0#PHP" expanded="false" /> <element signature="e#23359#26837#0#PHP" expanded="false" /> <element signature="e#26866#29771#0#PHP" expanded="false" /> - <element signature="e#31775#32024#0#PHP" expanded="false" /> - <element signature="e#32067#33504#0#PHP" expanded="false" /> - <element signature="e#32526#33482#0#PHP" expanded="false" /> - <element signature="e#34044#38507#0#PHP" expanded="false" /> - <element signature="e#36274#38022#0#PHP" expanded="false" /> - <element signature="e#38530#38747#0#PHP" expanded="false" /> + <element signature="e#31790#32039#0#PHP" expanded="false" /> + <element signature="e#32082#33519#0#PHP" expanded="false" /> + <element signature="e#32541#33497#0#PHP" expanded="false" /> + <element signature="e#34059#38522#0#PHP" expanded="false" /> + <element signature="e#36289#38037#0#PHP" expanded="false" /> + <element signature="e#38545#38762#0#PHP" expanded="false" /> </folding> </state> </provider> diff --git a/application/api/controller/Pay.php b/application/api/controller/Pay.php index 51cb2dc..eafb2da 100644 --- a/application/api/controller/Pay.php +++ b/application/api/controller/Pay.php @@ -657,7 +657,7 @@ class Pay extends Api ->where('id',$data['user_id']) ->field('id,is_vip') ->find(); - dump($login);exit; + $this->success('success',$login); if(!empty($pic_id)){ foreach ($pic_id as $key => $v){