郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 b98aeb3c4231dbd16a119a95966a5162ae974cf6 1 个父辈 89e0716e
1 个管道 的构建 通过 耗费 3 秒

我的消费记录加分页

内嵌 并排对比
正在显示 3 个修改的文件 包含 82 行增加 和 24 行删除
... ... @@ -2,8 +2,6 @@
<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>
... ... @@ -19,8 +17,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="650">
<caret line="527" column="29" lean-forward="true" selection-start-line="527" selection-start-column="29" selection-end-line="527" selection-end-column="29" />
<state relative-caret-position="44">
<caret line="1198" column="7" lean-forward="false" selection-start-line="1198" selection-start-column="7" selection-end-line="1198" selection-end-column="7" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#337#456#0#PHP" expanded="false" />
... ... @@ -41,6 +39,7 @@
<element signature="e#12775#13459#0#PHP" expanded="false" />
<element signature="e#13464#15254#0#PHP" expanded="false" />
<element signature="e#15260#16130#0#PHP" expanded="false" />
<element signature="e#16135#18283#0#PHP" expanded="false" />
<element signature="e#18289#18666#0#PHP" expanded="false" />
<element signature="e#18671#18935#0#PHP" expanded="false" />
<element signature="e#18941#19446#0#PHP" expanded="false" />
... ... @@ -67,10 +66,7 @@
<element signature="e#33233#34106#0#PHP" expanded="false" />
<element signature="e#34112#34532#0#PHP" expanded="false" />
<element signature="e#34537#35020#0#PHP" expanded="false" />
<element signature="e#35026#35621#0#PHP" expanded="false" />
<element signature="e#35626#40275#0#PHP" expanded="false" />
<element signature="e#40281#40847#0#PHP" expanded="false" />
<element signature="e#40852#42958#0#PHP" expanded="false" />
<element signature="e#40722#41480#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -175,10 +171,10 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="373" />
<option name="y" value="55" />
<option name="x" value="263" />
<option name="y" value="8" />
<option name="width" value="1699" />
<option name="height" value="1003" />
<option name="height" value="970" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -273,7 +269,7 @@
<workItem from="1574252363848" duration="8841000" />
<workItem from="1574295812843" duration="20536000" />
<workItem from="1574336957891" duration="1350000" />
<workItem from="1574382087071" duration="1403000" />
<workItem from="1574382087071" duration="3161000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -286,7 +282,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="141343000" />
<option name="totallyTimeSpent" value="143101000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -298,7 +294,8 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="373" y="55" width="1699" height="1003" extended-state="0" />
<frame x="263" y="8" width="1699" height="970" 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.1561928" 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" />
... ... @@ -307,7 +304,7 @@
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14896074" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.14885955" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
... ... @@ -704,8 +701,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="650">
<caret line="527" column="29" lean-forward="true" selection-start-line="527" selection-start-column="29" selection-end-line="527" selection-end-column="29" />
<state relative-caret-position="44">
<caret line="1198" column="7" lean-forward="false" selection-start-line="1198" selection-start-column="7" selection-end-line="1198" selection-end-column="7" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#337#456#0#PHP" expanded="false" />
... ... @@ -726,6 +723,7 @@
<element signature="e#12775#13459#0#PHP" expanded="false" />
<element signature="e#13464#15254#0#PHP" expanded="false" />
<element signature="e#15260#16130#0#PHP" expanded="false" />
<element signature="e#16135#18283#0#PHP" expanded="false" />
<element signature="e#18289#18666#0#PHP" expanded="false" />
<element signature="e#18671#18935#0#PHP" expanded="false" />
<element signature="e#18941#19446#0#PHP" expanded="false" />
... ... @@ -752,10 +750,7 @@
<element signature="e#33233#34106#0#PHP" expanded="false" />
<element signature="e#34112#34532#0#PHP" expanded="false" />
<element signature="e#34537#35020#0#PHP" expanded="false" />
<element signature="e#35026#35621#0#PHP" expanded="false" />
<element signature="e#35626#40275#0#PHP" expanded="false" />
<element signature="e#40281#40847#0#PHP" expanded="false" />
<element signature="e#40852#42958#0#PHP" expanded="false" />
<element signature="e#40722#41480#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -1079,6 +1079,8 @@ class User extends Api
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
*
* @ApiParams (name="type", type="inter", required=false, description="状态(不传默认为全部 1为待支付 2为已完成)")
* @ApiParams (name="page", type="inter", required=false, description="当前页(默认1)")
* @ApiParams (name="pageNum", type="inter", required=false, description="每页显示数据个数（默认10）")
*
* @ApiReturn({
"code": 1,
... ... @@ -1095,13 +1097,18 @@ class User extends Api
public function myorder()
{
$user_id = $this->uid;
$page = $this->request->param('page',1,'intval');
$pageNum = $this->request->param('pageNum',10,'intval');
$rule = config('verify.path');
$type = $this->request->param('type');
//判断状态
if(empty($type)){
$res = Db::name('order')
->where('user_id',$user_id)
->field('id,pic_id,video_id,status')
->order('createtime desc,id desc')
->page($page,$pageNum)
->select();
foreach ($res as &$v){
if(!empty($v['pic_id'])){
... ... @@ -1131,6 +1138,7 @@ class User extends Api
->where('status',1)
->field('id,pic_id,video_id,status')
->order('createtime desc,id desc')
->page($page,$pageNum)
->select();
foreach ($res as &$v){
if(!empty($v['pic_id'])){
... ... @@ -1160,6 +1168,7 @@ class User extends Api
->where('status',2)
->field('id,pic_id,video_id,status')
->order('createtime desc,id desc')
->page($page,$pageNum)
->select();
foreach ($res as &$v){
if(!empty($v['pic_id'])){
... ... @@ -1194,6 +1203,9 @@ class User extends Api
* @ApiRoute (/api/user/payhistory)
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
*
* @ApiParams (name="page", type="inter", required=false, description="当前页(默认1)")
* @ApiParams (name="pageNum", type="inter", required=false, description="每页显示数据个数（默认10）")
*
* @ApiReturn({
"code": 1,
"msg": "成功",
... ... @@ -1212,6 +1224,8 @@ class User extends Api
*/
public function payhistory()
{
$page = $this->request->param('page',1,'intval');
$pageNum = $this->request->param('pageNum',10,'intval');
$rule = config('verify.path');
$user_id = $this->uid;
$data = Db::name('order')
... ... @@ -1219,6 +1233,7 @@ class User extends Api
->where('user_id',$user_id)
->where('status',2)
->order('createtime desc,id desc')
->page($page,$pageNum)
->select();
foreach ($data as &$v){
$v['createtime'] = date('Y-m-d',$v['createtime']);
... ...
... ... @@ -1988,6 +1988,18 @@
<td>否</td>
<td>状态(不传默认为全部 1为待支付 2为已完成</td>
</tr>
<tr>
<td>page</td>
<td>inter</td>
<td>否</td>
<td>当前页(默认1</td>
</tr>
<tr>
<td>pageNum</td>
<td>inter</td>
<td>否</td>
<td>每页显示数据个数（默认10）</td>
</tr>
</tbody>
</table>
</div>
... ... @@ -2022,6 +2034,14 @@
<input type="inter" class="form-control input-sm" id="type" placeholder="状态(不传默认为全部 1为待支付 2为已完成" name="type">
</div>
<div class="form-group">
<label class="control-label" for="page">page</label>
<input type="inter" class="form-control input-sm" id="page" placeholder="当前页(默认1" name="page">
</div>
<div class="form-group">
<label class="control-label" for="pageNum">pageNum</label>
<input type="inter" class="form-control input-sm" id="pageNum" placeholder="每页显示数据个数（默认10）" name="pageNum">
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="35">提交</button>
<button type="reset" class="btn btn-info" rel="35">重置</button>
</div>
... ... @@ -5091,7 +5111,30 @@
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
无
<table class="table table-hover">
<thead>
<tr>
<th>名称</th>
<th>类型</th>
<th>必选</th>
<th>描述</th>
</tr>
</thead>
<tbody>
<tr>
<td>page</td>
<td>inter</td>
<td>否</td>
<td>当前页(默认1</td>
</tr>
<tr>
<td>pageNum</td>
<td>inter</td>
<td>否</td>
<td>每页显示数据个数（默认10）</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="panel panel-default">
... ... @@ -5120,7 +5163,12 @@
<div class="panel-body">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/payhistory" method="POST" name="form36" id="form36">
<div class="form-group">
无
<label class="control-label" for="page">page</label>
<input type="inter" class="form-control input-sm" id="page" placeholder="当前页(默认1" name="page">
</div>
<div class="form-group">
<label class="control-label" for="pageNum">pageNum</label>
<input type="inter" class="form-control input-sm" id="pageNum" placeholder="每页显示数据个数（默认10）" name="pageNum">
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="36">提交</button>
... ... @@ -5182,7 +5230,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-11-22 08:49:30 </div>
Generated on 2019-11-22 09:22:06 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...