郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 9672468c9f53574d18b461bb0b8d0cdeeecbca84 1 个父辈 77a3f960
1 个管道 的构建 通过 耗费 1 秒

修改文字

内嵌 并排对比
正在显示 3 个修改的文件 包含 23 行增加 和 26 行删除
... ... @@ -2,10 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Pay.php" afterPath="$PROJECT_DIR$/application/api/controller/Pay.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -80,8 +77,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="503">
<caret line="190" column="49" lean-forward="false" selection-start-line="190" selection-start-column="49" selection-end-line="190" selection-end-column="49" />
<state relative-caret-position="453">
<caret line="188" column="35" lean-forward="true" selection-start-line="188" selection-start-column="35" selection-end-line="188" selection-end-column="35" />
<folding>
<element signature="e#450#569#0#PHP" expanded="false" />
<element signature="e#575#888#0#PHP" expanded="false" />
... ... @@ -89,12 +86,12 @@
<element signature="e#2944#3264#0#PHP" expanded="false" />
<element signature="e#3269#5320#0#PHP" expanded="false" />
<element signature="e#5326#5744#0#PHP" expanded="false" />
<element signature="e#9607#10027#0#PHP" expanded="false" />
<element signature="e#10032#13872#0#PHP" expanded="false" />
<element signature="e#13899#17601#0#PHP" expanded="false" />
<element signature="e#17630#18460#0#PHP" expanded="false" />
<element signature="e#18489#19322#0#PHP" expanded="false" />
<element signature="e#19345#19562#0#PHP" expanded="false" />
<element signature="e#9609#10029#0#PHP" expanded="false" />
<element signature="e#10034#13874#0#PHP" expanded="false" />
<element signature="e#13901#17603#0#PHP" expanded="false" />
<element signature="e#17632#18462#0#PHP" expanded="false" />
<element signature="e#18491#19324#0#PHP" expanded="false" />
<element signature="e#19347#19564#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -174,8 +171,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="218" />
<option name="y" value="37" />
<option name="x" value="223" />
<option name="y" value="25" />
<option name="width" value="1699" />
<option name="height" value="1003" />
</component>
... ... @@ -271,7 +268,7 @@
<workItem from="1574209189943" duration="37638000" />
<workItem from="1574252363848" duration="8841000" />
<workItem from="1574295812843" duration="20536000" />
<workItem from="1574336957891" duration="152000" />
<workItem from="1574336957891" duration="303000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -284,7 +281,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="138742000" />
<option name="totallyTimeSpent" value="138893000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -296,7 +293,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="218" y="37" width="1699" height="1003" extended-state="0" />
<frame x="223" y="25" width="1699" height="1003" extended-state="0" />
<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.15436241" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<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" />
... ... @@ -737,8 +734,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="503">
<caret line="190" column="49" lean-forward="false" selection-start-line="190" selection-start-column="49" selection-end-line="190" selection-end-column="49" />
<state relative-caret-position="453">
<caret line="188" column="35" lean-forward="true" selection-start-line="188" selection-start-column="35" selection-end-line="188" selection-end-column="35" />
<folding>
<element signature="e#450#569#0#PHP" expanded="false" />
<element signature="e#575#888#0#PHP" expanded="false" />
... ... @@ -746,12 +743,12 @@
<element signature="e#2944#3264#0#PHP" expanded="false" />
<element signature="e#3269#5320#0#PHP" expanded="false" />
<element signature="e#5326#5744#0#PHP" expanded="false" />
<element signature="e#9607#10027#0#PHP" expanded="false" />
<element signature="e#10032#13872#0#PHP" expanded="false" />
<element signature="e#13899#17601#0#PHP" expanded="false" />
<element signature="e#17630#18460#0#PHP" expanded="false" />
<element signature="e#18489#19322#0#PHP" expanded="false" />
<element signature="e#19345#19562#0#PHP" expanded="false" />
<element signature="e#9609#10029#0#PHP" expanded="false" />
<element signature="e#10034#13874#0#PHP" expanded="false" />
<element signature="e#13901#17603#0#PHP" expanded="false" />
<element signature="e#17632#18462#0#PHP" expanded="false" />
<element signature="e#18491#19324#0#PHP" expanded="false" />
<element signature="e#19347#19564#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -190,7 +190,7 @@ class Pay extends Api
Db::rollback();
$this->error('购买失败');
}
$this->success('SUCCESS','成功');
$this->success('SUCCESS','支付成功');
}
}else{
$this->error('无效的订单');
... ...
... ... @@ -5089,7 +5089,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-11-21 19:51:45 </div>
Generated on 2019-11-21 19:54:18 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...