From f00450e80ad8ebf11c96af0968b4b4247be64709 Mon Sep 17 00:00:00 2001
From: guosheng <gs@bronet.cn>
Date: Sat, 7 Dec 2019 13:18:06 +0800
Subject: [PATCH] 修改
---
.idea/workspace.xml | 42 +++++++++++++++++++++---------------------
application/api/controller/Pay.php | 2 --
2 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d76eaca..d69fa78 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -88,8 +88,8 @@
<file leaf-file-name="Pay.php" pinned="false" current-in-tab="true">
<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="53" lean-forward="false" selection-start-line="659" selection-start-column="53" selection-end-line="659" selection-end-column="53" />
+ <state relative-caret-position="13">
+ <caret line="642" column="60" lean-forward="true" selection-start-line="642" selection-start-column="60" selection-end-line="642" selection-end-column="60" />
<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#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" />
+ <element signature="e#31735#31984#0#PHP" expanded="false" />
+ <element signature="e#32027#33464#0#PHP" expanded="false" />
+ <element signature="e#32486#33442#0#PHP" expanded="false" />
+ <element signature="e#34004#38467#0#PHP" expanded="false" />
+ <element signature="e#36234#37982#0#PHP" expanded="false" />
+ <element signature="e#38490#38707#0#PHP" expanded="false" />
</folding>
</state>
</provider>
@@ -205,8 +205,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
- <option name="x" value="224" />
- <option name="y" value="49" />
+ <option name="x" value="25" />
+ <option name="y" value="73" />
<option name="width" value="1700" />
<option name="height" value="1000" />
</component>
@@ -336,7 +336,7 @@
<workItem from="1575541798312" duration="2359000" />
<workItem from="1575592025964" duration="640000" />
<workItem from="1575599624364" duration="95000" />
- <workItem from="1575680867057" duration="10904000" />
+ <workItem from="1575680867057" duration="11275000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
@@ -349,7 +349,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="320803000" />
+ <option name="totallyTimeSpent" value="321174000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -361,7 +361,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="224" y="49" width="1700" height="1000" extended-state="0" />
+ <frame x="25" y="73" width="1700" height="1000" extended-state="0" />
<editor active="true" />
<layout>
<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 @@
</entry>
<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="53" lean-forward="false" selection-start-line="659" selection-start-column="53" selection-end-line="659" selection-end-column="53" />
+ <state relative-caret-position="13">
+ <caret line="642" column="60" lean-forward="true" selection-start-line="642" selection-start-column="60" selection-end-line="642" selection-end-column="60" />
<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#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" />
+ <element signature="e#31735#31984#0#PHP" expanded="false" />
+ <element signature="e#32027#33464#0#PHP" expanded="false" />
+ <element signature="e#32486#33442#0#PHP" expanded="false" />
+ <element signature="e#34004#38467#0#PHP" expanded="false" />
+ <element signature="e#36234#37982#0#PHP" expanded="false" />
+ <element signature="e#38490#38707#0#PHP" expanded="false" />
</folding>
</state>
</provider>
diff --git a/application/api/controller/Pay.php b/application/api/controller/Pay.php
index eafb2da..7ad1f71 100644
--- a/application/api/controller/Pay.php
+++ b/application/api/controller/Pay.php
@@ -657,8 +657,6 @@ class Pay extends Api
->where('id',$data['user_id'])
->field('id,is_vip')
->find();
- $this->success('success',$login);
-
if(!empty($pic_id)){
foreach ($pic_id as $key => $v){
//非会员
--
libgit2 0.24.0