郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 e982fbde331a05ffbbf698876b2b705136bc6c79 1 个父辈 007e5c74
1 个管道 的构建 通过 耗费 1 秒

修改文字提醒

内嵌 并排对比
正在显示 3 个修改的文件 包含 31 行增加 和 34 行删除
... ... @@ -3,7 +3,6 @@
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<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" />
... ... @@ -17,8 +16,8 @@
<file leaf-file-name="User.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="291">
<caret line="1010" column="13" lean-forward="false" selection-start-line="1010" selection-start-column="13" selection-end-line="1010" selection-end-column="13" />
<state relative-caret-position="491">
<caret line="1009" column="55" lean-forward="false" selection-start-line="1009" selection-start-column="55" selection-end-line="1009" selection-end-column="55" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -60,17 +59,16 @@
<element signature="e#30043#30577#0#PHP" expanded="false" />
<element signature="e#30582#31496#0#PHP" expanded="false" />
<element signature="e#31502#32156#0#PHP" expanded="false" />
<element signature="e#33763#34523#0#PHP" expanded="false" />
<element signature="e#34528#35603#0#PHP" expanded="false" />
<element signature="e#35629#36460#0#PHP" expanded="false" />
<element signature="e#36466#36886#0#PHP" expanded="false" />
<element signature="e#36891#37374#0#PHP" expanded="false" />
<element signature="e#37380#38186#0#PHP" expanded="false" />
<element signature="e#38191#41345#0#PHP" expanded="false" />
<element signature="e#41360#42688#0#PHP" expanded="false" />
<element signature="e#42704#43731#0#PHP" expanded="false" />
<element signature="e#43738#44496#0#PHP" expanded="false" />
<element signature="e#44501#46888#0#PHP" expanded="false" />
<element signature="e#33756#34516#0#PHP" expanded="false" />
<element signature="e#35622#36453#0#PHP" expanded="false" />
<element signature="e#36459#36879#0#PHP" expanded="false" />
<element signature="e#36884#37367#0#PHP" expanded="false" />
<element signature="e#37373#38179#0#PHP" expanded="false" />
<element signature="e#38184#41338#0#PHP" expanded="false" />
<element signature="e#41353#42681#0#PHP" expanded="false" />
<element signature="e#42697#43724#0#PHP" expanded="false" />
<element signature="e#43731#44489#0#PHP" expanded="false" />
<element signature="e#44494#46881#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -174,8 +172,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="379" />
<option name="y" value="84" />
<option name="x" value="183" />
<option name="y" value="61" />
<option name="width" value="1806" />
<option name="height" value="981" />
</component>
... ... @@ -274,7 +272,7 @@
<workItem from="1574336957891" duration="1350000" />
<workItem from="1574382087071" duration="22007000" />
<workItem from="1574410294356" duration="15863000" />
<workItem from="1574469667436" duration="1441000" />
<workItem from="1574469667436" duration="2189000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -287,7 +285,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="179251000" />
<option name="totallyTimeSpent" value="179999000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -299,7 +297,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="379" y="84" width="1806" height="981" extended-state="0" />
<frame x="183" y="61" width="1806" height="981" 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.15005727" 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" />
... ... @@ -704,8 +702,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="291">
<caret line="1010" column="13" lean-forward="false" selection-start-line="1010" selection-start-column="13" selection-end-line="1010" selection-end-column="13" />
<state relative-caret-position="491">
<caret line="1009" column="55" lean-forward="false" selection-start-line="1009" selection-start-column="55" selection-end-line="1009" selection-end-column="55" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -747,17 +745,16 @@
<element signature="e#30043#30577#0#PHP" expanded="false" />
<element signature="e#30582#31496#0#PHP" expanded="false" />
<element signature="e#31502#32156#0#PHP" expanded="false" />
<element signature="e#33763#34523#0#PHP" expanded="false" />
<element signature="e#34528#35603#0#PHP" expanded="false" />
<element signature="e#35629#36460#0#PHP" expanded="false" />
<element signature="e#36466#36886#0#PHP" expanded="false" />
<element signature="e#36891#37374#0#PHP" expanded="false" />
<element signature="e#37380#38186#0#PHP" expanded="false" />
<element signature="e#38191#41345#0#PHP" expanded="false" />
<element signature="e#41360#42688#0#PHP" expanded="false" />
<element signature="e#42704#43731#0#PHP" expanded="false" />
<element signature="e#43738#44496#0#PHP" expanded="false" />
<element signature="e#44501#46888#0#PHP" expanded="false" />
<element signature="e#33756#34516#0#PHP" expanded="false" />
<element signature="e#35622#36453#0#PHP" expanded="false" />
<element signature="e#36459#36879#0#PHP" expanded="false" />
<element signature="e#36884#37367#0#PHP" expanded="false" />
<element signature="e#37373#38179#0#PHP" expanded="false" />
<element signature="e#38184#41338#0#PHP" expanded="false" />
<element signature="e#41353#42681#0#PHP" expanded="false" />
<element signature="e#42697#43724#0#PHP" expanded="false" />
<element signature="e#43731#44489#0#PHP" expanded="false" />
<element signature="e#44494#46881#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -1007,7 +1007,7 @@ class User extends Api
$where['status'] = ['eq',2];
$res = Db::name('order')->where($where)->find();
if(!empty($res)){
$this->error(['code'=>2,'msg'=>'您已经购买过了,无需重复购买']);
$this->error(['code'=>2,'msg'=>'您已经购买过了']);
}
$param['createtime'] = time();
$param['num'] = date('Ymd').substr(implode(NULL, array_map('ord', str_split(substr(uniqid(), 7, 13), 1))), 0, 8);
... ...
... ... @@ -5529,7 +5529,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-11-23 09:05:05 </div>
Generated on 2019-11-23 09:17:36 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...