郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 c209d9246d72c6c7144a368936a1c67f21d1336c 1 个父辈 677050d2
1 个管道 的构建 通过 耗费 0 秒

修改分页

内嵌 并排对比
正在显示 4 个修改的文件 包含 238 行增加 和 34 行删除
... ... @@ -2,8 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/application/admin/view/vip/add.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/vip/index.html" afterPath="$PROJECT_DIR$/application/admin/view/vip/index.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -15,11 +14,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="User.php" pinned="false" current-in-tab="true">
<file leaf-file-name="User.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-89">
<caret line="165" column="25" lean-forward="true" selection-start-line="165" selection-start-column="25" selection-end-line="165" selection-end-column="25" />
<state relative-caret-position="234">
<caret line="594" column="16" lean-forward="true" selection-start-line="594" selection-start-column="16" selection-end-line="594" selection-end-column="16" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#337#456#0#PHP" expanded="false" />
... ... @@ -29,6 +28,10 @@
<element signature="e#3407#4178#0#PHP" expanded="false" />
<element signature="e#4184#4591#0#PHP" expanded="false" />
<element signature="e#4596#4939#0#PHP" expanded="false" />
<element signature="e#4945#5782#0#PHP" expanded="false" />
<element signature="e#5787#7982#0#PHP" expanded="false" />
<element signature="e#7988#8633#0#PHP" expanded="false" />
<element signature="e#8638#9722#0#PHP" expanded="false" />
<element signature="e#9728#10430#0#PHP" expanded="false" />
<element signature="e#10435#11635#0#PHP" expanded="false" />
<element signature="e#11641#12325#0#PHP" expanded="false" />
... ... @@ -46,6 +49,26 @@
</provider>
</entry>
</file>
<file leaf-file-name="vip.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/vip.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="24" column="21" lean-forward="true" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/admin/view/vip/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="12" column="24" lean-forward="false" selection-start-line="12" selection-start-column="24" selection-end-line="12" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FindInProjectRecents">
... ... @@ -99,8 +122,8 @@
<option value="$PROJECT_DIR$/composer.json" />
<option value="$PROJECT_DIR$/public/assets/js/backend/user/user.js" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
<option value="$PROJECT_DIR$/application/admin/view/vip/index.html" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/admin/view/vip/index.html" />
</list>
</option>
</component>
... ... @@ -118,9 +141,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="8" />
<option name="y" value="59" />
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="-72" />
<option name="y" value="56" />
<option name="width" value="1883" />
<option name="height" value="946" />
</component>
... ... @@ -156,6 +179,27 @@
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="view" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="view" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="vip" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
... ... @@ -239,7 +283,7 @@
<workItem from="1574141466352" duration="745000" />
<workItem from="1574143209694" duration="3660000" />
<workItem from="1574146994475" duration="23222000" />
<workItem from="1574209189943" duration="11380000" />
<workItem from="1574209189943" duration="11839000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -252,7 +296,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="82955000" />
<option name="totallyTimeSpent" value="83414000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -264,16 +308,16 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="8" y="59" width="1883" height="946" extended-state="1" />
<frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
<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.15743281" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15298508" 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" />
<window_info id="Event Log" 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="0" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<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.33868974" 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.33841133" 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" />
... ... @@ -667,14 +711,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/vip/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/vip/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
... ... @@ -683,18 +719,10 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/vip.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="14" column="15" lean-forward="false" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-89">
<caret line="165" column="25" lean-forward="true" selection-start-line="165" selection-start-column="25" selection-end-line="165" selection-end-column="25" />
<state relative-caret-position="234">
<caret line="594" column="16" lean-forward="true" selection-start-line="594" selection-start-column="16" selection-end-line="594" selection-end-column="16" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#337#456#0#PHP" expanded="false" />
... ... @@ -704,6 +732,10 @@
<element signature="e#3407#4178#0#PHP" expanded="false" />
<element signature="e#4184#4591#0#PHP" expanded="false" />
<element signature="e#4596#4939#0#PHP" expanded="false" />
<element signature="e#4945#5782#0#PHP" expanded="false" />
<element signature="e#5787#7982#0#PHP" expanded="false" />
<element signature="e#7988#8633#0#PHP" expanded="false" />
<element signature="e#8638#9722#0#PHP" expanded="false" />
<element signature="e#9728#10430#0#PHP" expanded="false" />
<element signature="e#10435#11635#0#PHP" expanded="false" />
<element signature="e#11641#12325#0#PHP" expanded="false" />
... ... @@ -720,5 +752,21 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/vip.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="24" column="21" lean-forward="true" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/vip/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="12" column="24" lean-forward="false" selection-start-line="12" selection-start-column="24" selection-end-line="12" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -9,7 +9,7 @@
<a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
<!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('vip/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>-->
<a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('vip/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
<a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('vip/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
<!--<a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('vip/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
<!--<a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('vip/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>-->
<div class="dropdown btn-group {:$auth->check('vip/multi')?'':'hide'}">
... ...
... ... @@ -583,4 +583,30 @@ class User extends Api
}
/**
* @ApiTitle (我的)
* @ApiSummary (我的)
* @ApiMethod (POST)
* @ApiRoute (/api/user/vipdesc)
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
*
* @ApiReturn({
"code": 1,
"msg": "成功",
"time": "1571492001",
"data": {
"id": //用户ID
"nickname": //昵称,
"avatar": //头像,
"money" : //余额
"is_vip": //是否为会员(0否 1是)
}
})
*/
public function vipdesc()
{
$data =
$this->success('SUCCESS',$data);
}
}
... ...
... ... @@ -168,6 +168,7 @@
<a href="javascript:;" data-id="15" class="list-group-item">历史记录</a>
<a href="javascript:;" data-id="16" class="list-group-item">我的</a>
<a href="javascript:;" data-id="17" class="list-group-item">创建充值订单</a>
<a href="javascript:;" data-id="18" class="list-group-item">我的</a>
</div>
</div>
</div>
... ... @@ -2547,13 +2548,142 @@
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="heading-18">
<h4 class="panel-title">
<span class="label label-primary">POST</span>
<a data-toggle="collapse" data-parent="#accordion18" href="#collapseOne18"> 我的 <span class="text-muted">/api/user/vipdesc</span></a>
</h4>
</div>
<div id="collapseOne18" class="panel-collapse collapse">
<div class="panel-body">
<!-- Nav tabs -->
<ul class="nav nav-tabs" id="doctab18">
<li class="active"><a href="#info18" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox18" data-toggle="tab">在线测试</a></li>
<li><a href="#sample18" data-toggle="tab">返回示例</a></li>
</ul>
<!-- Tab panes -->
<div class="tab-content">
<div class="tab-pane active" id="info18">
<div class="well">
我的 </div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Headers</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>token</td>
<td>string</td>
<td>是</td>
<td>请求的Token</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
无
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>正文</strong></div>
<div class="panel-body">
无 </div>
</div>
</div><!-- #info -->
<div class="tab-pane" id="sandbox18">
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
<div class="panel-heading"><strong>Headers</strong></div>
<div class="panel-body">
<div class="headers">
<div class="form-group">
<label class="control-label" for="token">token</label>
<input type="string" class="form-control input-sm" id="token" required placeholder="请求的Token - Ex: " name="token">
</div>
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/vipdesc" method="POST" name="form18" id="form18">
<div class="form-group">
无
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="18">提交</button>
<button type="reset" class="btn btn-info" rel="18">重置</button>
</div>
</form>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>响应输出</strong></div>
<div class="panel-body">
<div class="row">
<div class="col-md-12" style="overflow-x:auto">
<pre id="response_headers18"></pre>
<pre id="response18"></pre>
</div>
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>返回参数</strong></div>
<div class="panel-body">
无
</div>
</div>
</div>
</div>
</div><!-- #sandbox -->
<div class="tab-pane" id="sample18">
<div class="row">
<div class="col-md-12">
<pre id="sample_response18">{
"code": 1,
"msg": "成功",
"time": "1571492001",
"data": {
"id": //用户ID
"nickname": //昵称,
"avatar": //头像,
"money" : //余额
"is_vip": //是否为会员(0否 1是</pre>
</div>
</div>
</div><!-- #sample -->
</div><!-- .tab-content -->
</div>
</div>
</div>
</div>
<hr>
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-11-20 11:36:51 </div>
Generated on 2019-11-20 11:44:31 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...