郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 642a9e92ad26037ba43670559b4ce37b647b5b02 1 个父辈 889008b7 master
1 个管道 的构建 通过 耗费 1 秒

删除合并下载

内嵌 并排对比
正在显示 3 个修改的文件 包含 166 行增加 和 363 行删除
... ... @@ -16,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="31">
<caret line="1250" column="13" lean-forward="true" selection-start-line="1250" selection-start-column="13" selection-end-line="1250" selection-end-column="13" />
<state relative-caret-position="528">
<caret line="1375" column="0" lean-forward="false" selection-start-line="1375" selection-start-column="0" selection-end-line="1375" selection-end-column="0" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -68,8 +68,6 @@
<element signature="e#42418#43482#0#PHP" expanded="false" />
<element signature="e#43489#44247#0#PHP" expanded="false" />
<element signature="e#44252#46516#0#PHP" expanded="false" />
<element signature="e#46523#46974#0#PHP" expanded="false" />
<element signature="e#46979#48120#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -173,9 +171,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="102" />
<option name="y" value="181" />
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="138" />
<option name="y" value="-11" />
<option name="width" value="1806" />
<option name="height" value="959" />
</component>
... ... @@ -273,7 +271,7 @@
<workItem from="1574295812843" duration="20536000" />
<workItem from="1574336957891" duration="1350000" />
<workItem from="1574382087071" duration="22007000" />
<workItem from="1574410294356" duration="13756000" />
<workItem from="1574410294356" duration="13955000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -286,7 +284,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="175703000" />
<option name="totallyTimeSpent" value="175902000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -298,16 +296,16 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="102" y="181" width="1806" height="959" 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.14833906" 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.1380597" 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.15450121" 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.13819368" 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" />
... ... @@ -713,8 +711,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="31">
<caret line="1250" column="13" lean-forward="true" selection-start-line="1250" selection-start-column="13" selection-end-line="1250" selection-end-column="13" />
<state relative-caret-position="528">
<caret line="1375" column="0" lean-forward="false" selection-start-line="1375" selection-start-column="0" selection-end-line="1375" selection-end-column="0" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -765,8 +763,6 @@
<element signature="e#42418#43482#0#PHP" expanded="false" />
<element signature="e#43489#44247#0#PHP" expanded="false" />
<element signature="e#44252#46516#0#PHP" expanded="false" />
<element signature="e#46523#46974#0#PHP" expanded="false" />
<element signature="e#46979#48120#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -1374,51 +1374,4 @@ class User extends Api
$this->success('SUCCESS',$arr);
}
/**
* @ApiTitle (合并下载)
* @ApiSummary (合并下载)
* @ApiMethod (POST)
* @ApiRoute (/api/user/merage)
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
*
* @ApiParams (name="order_id", type="inter", required=true, description="订单ID")
*
* @ApiReturn({
"code": 1,
"msg": "成功",
"time": "1571492001",
"data": {
}
})
*/
public function merage()
{
$order_id = $this->request->param('order_id');
$data = Db::name('order')
->whereIn('id',$order_id)
->select();
print_r($data);die;
foreach ($data as &$v){
if(!empty($v['pic_id'])){
$v['pic_id'] = explode(',',$v['pic_id']);
foreach ($v['pic_id'] as &$v1){
$v1 = Db::name('pic')->field('id,title,thumbnail,url,price')->where('id',$v1)->find();
$v1['vipprice'] = $v1['price']*0.75;
}
}
if(!empty($v['video_id'])){
$v['video_id'] = explode(',',$v['video_id']);
foreach ($v['video_id'] as &$v2){
$v2 = Db::name('video')->field('keyword,type_ids,content,is_recommend,buy_num,click_num,createtime,updatetime',true)->where('id',$v2)->find();
$v2['vipprice'] = $v2['price']*0.75;
$v2['four_vipprice'] = $v2['four_price'] * 0.75;
$v2['eight_vipprice'] = $v2['eight_price'] * 0.75;
}
}
}
}
}
... ...
... ... @@ -164,8 +164,7 @@
<a href="#个人中心" class="list-group-item" data-toggle="collapse" data-parent="#sidebar">个人中心 <i class="fa fa-caret-down"></i></a>
<div class="child collapse" id="个人中心">
<a href="javascript:;" data-id="13" class="list-group-item">小程序登录</a>
<a href="javascript:;" data-id="28" class="list-group-item">购物车列表</a>
<a href="javascript:;" data-id="39" class="list-group-item">消费记录</a>
<a href="javascript:;" data-id="27" class="list-group-item">会员须知</a>
<a href="javascript:;" data-id="38" class="list-group-item"></a>
<a href="javascript:;" data-id="37" class="list-group-item"></a>
<a href="javascript:;" data-id="36" class="list-group-item">我的订单</a>
... ... @@ -176,9 +175,9 @@
<a href="javascript:;" data-id="31" class="list-group-item">创建图片订单</a>
<a href="javascript:;" data-id="30" class="list-group-item">删除购物车商品</a>
<a href="javascript:;" data-id="29" class="list-group-item">加入购物车</a>
<a href="javascript:;" data-id="27" class="list-group-item">会员须知</a>
<a href="javascript:;" data-id="14" class="list-group-item">首页视频、图片、精美大片入口</a>
<a href="javascript:;" data-id="28" class="list-group-item">购物车列表</a>
<a href="javascript:;" data-id="26" class="list-group-item">会员介绍</a>
<a href="javascript:;" data-id="14" class="list-group-item">首页视频、图片、精美大片入口</a>
<a href="javascript:;" data-id="25" class="list-group-item">创建开通会员订单</a>
<a href="javascript:;" data-id="24" class="list-group-item">创建充值订单</a>
<a href="javascript:;" data-id="23" class="list-group-item">我的</a>
... ... @@ -190,7 +189,7 @@
<a href="javascript:;" data-id="17" class="list-group-item">图片列表</a>
<a href="javascript:;" data-id="16" class="list-group-item">搜索页</a>
<a href="javascript:;" data-id="15" class="list-group-item">地区分类</a>
<a href="javascript:;" data-id="40" class="list-group-item">合并下载</a>
<a href="javascript:;" data-id="39" class="list-group-item">消费记录</a>
</div>
</div>
</div>
... ... @@ -1801,28 +1800,28 @@
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="heading-28">
<div class="panel-heading" id="heading-27">
<h4 class="panel-title">
<span class="label label-primary">POST</span>
<a data-toggle="collapse" data-parent="#accordion28" href="#collapseOne28"> 购物车列表 <span class="text-muted">/api/user/car</span></a>
<a data-toggle="collapse" data-parent="#accordion27" href="#collapseOne27"> 会员须知 <span class="text-muted">/api/user/vipdetail</span></a>
</h4>
</div>
<div id="collapseOne28" class="panel-collapse collapse">
<div id="collapseOne27" class="panel-collapse collapse">
<div class="panel-body">
<!-- Nav tabs -->
<ul class="nav nav-tabs" id="doctab28">
<li class="active"><a href="#info28" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox28" data-toggle="tab">在线测试</a></li>
<li><a href="#sample28" data-toggle="tab">返回示例</a></li>
<ul class="nav nav-tabs" id="doctab27">
<li class="active"><a href="#info27" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox27" data-toggle="tab">在线测试</a></li>
<li><a href="#sample27" data-toggle="tab">返回示例</a></li>
</ul>
<!-- Tab panes -->
<div class="tab-content">
<div class="tab-pane active" id="info28">
<div class="tab-pane active" id="info27">
<div class="well">
购物车列表 </div>
会员须知 </div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Headers</strong></div>
<div class="panel-body">
... ... @@ -1859,7 +1858,7 @@
</div>
</div><!-- #info -->
<div class="tab-pane" id="sandbox28">
<div class="tab-pane" id="sandbox27">
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
... ... @@ -1876,13 +1875,13 @@
<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/car" method="POST" name="form28" id="form28">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/vipdetail" method="POST" name="form27" id="form27">
<div class="form-group">
无
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="28">提交</button>
<button type="reset" class="btn btn-info" rel="28">重置</button>
<button type="submit" class="btn btn-success send" rel="27">提交</button>
<button type="reset" class="btn btn-info" rel="27">重置</button>
</div>
</form>
</div>
... ... @@ -1892,8 +1891,8 @@
<div class="panel-body">
<div class="row">
<div class="col-md-12" style="overflow-x:auto">
<pre id="response_headers28"></pre>
<pre id="response28"></pre>
<pre id="response_headers27"></pre>
<pre id="response27"></pre>
</div>
</div>
</div>
... ... @@ -1908,41 +1907,15 @@
</div>
</div><!-- #sandbox -->
<div class="tab-pane" id="sample28">
<div class="tab-pane" id="sample27">
<div class="row">
<div class="col-md-12">
<pre id="sample_response28">{
<pre id="sample_response27">{
"code": 1,
"msg": "成功",
"time": "1571492001",
"data": {
"id"://购物车ID
"user_id"://用户ID
"pic_id"://图片的ID
"video_id"://视频的ID
"pic":[
"id"://图片ID
"title"://图片标题
"thumbnail"://缩略图
"url"://高清百度云盘地址
"price"://普通价格
"vip_price"://vip价格
],
"video":[
"id"://视频ID
"title"://视频标题
"thumbnail"://视频封面图片
"video"://视频地址
"two_url"://2K视频云盘地址
"four_url"://4k视频云盘地址
"eight_url"://8k视频云盘地址
"price"://2k视频原价格
"four_price"://4k视频原价格
"eight_price"://8k视频原价格
"vip_price"://2k会员价格
"four_vipprice"://4k会员价格
"eight_vipprice"://8k会员价格
]
"text": //会员须知内容
}
}</pre>
</div>
... ... @@ -1954,168 +1927,6 @@
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="heading-39">
<h4 class="panel-title">
<span class="label label-primary">POST</span>
<a data-toggle="collapse" data-parent="#accordion39" href="#collapseOne39"> 消费记录 <span class="text-muted">/api/user/payhistory</span></a>
</h4>
</div>
<div id="collapseOne39" class="panel-collapse collapse">
<div class="panel-body">
<!-- Nav tabs -->
<ul class="nav nav-tabs" id="doctab39">
<li class="active"><a href="#info39" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox39" data-toggle="tab">在线测试</a></li>
<li><a href="#sample39" data-toggle="tab">返回示例</a></li>
</ul>
<!-- Tab panes -->
<div class="tab-content">
<div class="tab-pane active" id="info39">
<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">
<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">
<div class="panel-heading"><strong>正文</strong></div>
<div class="panel-body">
无 </div>
</div>
</div><!-- #info -->
<div class="tab-pane" id="sandbox39">
<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/payhistory" method="POST" name="form39" id="form39">
<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="39">提交</button>
<button type="reset" class="btn btn-info" rel="39">重置</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_headers39"></pre>
<pre id="response39"></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="sample39">
<div class="row">
<div class="col-md-12">
<pre id="sample_response39">{
"code": 1,
"msg": "成功",
"time": "1571492001",
"data": {
"times"://时间分段,
"info":[
"id": 4,//id,
"user_id"://用户ID
"pic_id"://图片ID
"video_id"://视频ID
],
"total"://总价
}
}</pre>
</div>
</div>
</div><!-- #sample -->
</div><!-- .tab-content -->
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="heading-38">
<h4 class="panel-title">
<span class="label label-success">GET</span>
... ... @@ -3489,28 +3300,28 @@
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="heading-27">
<div class="panel-heading" id="heading-28">
<h4 class="panel-title">
<span class="label label-primary">POST</span>
<a data-toggle="collapse" data-parent="#accordion27" href="#collapseOne27"> 会员须知 <span class="text-muted">/api/user/vipdetail</span></a>
<a data-toggle="collapse" data-parent="#accordion28" href="#collapseOne28"> 购物车列表 <span class="text-muted">/api/user/car</span></a>
</h4>
</div>
<div id="collapseOne27" class="panel-collapse collapse">
<div id="collapseOne28" class="panel-collapse collapse">
<div class="panel-body">
<!-- Nav tabs -->
<ul class="nav nav-tabs" id="doctab27">
<li class="active"><a href="#info27" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox27" data-toggle="tab">在线测试</a></li>
<li><a href="#sample27" data-toggle="tab">返回示例</a></li>
<ul class="nav nav-tabs" id="doctab28">
<li class="active"><a href="#info28" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox28" data-toggle="tab">在线测试</a></li>
<li><a href="#sample28" data-toggle="tab">返回示例</a></li>
</ul>
<!-- Tab panes -->
<div class="tab-content">
<div class="tab-pane active" id="info27">
<div class="tab-pane active" id="info28">
<div class="well">
会员须知 </div>
购物车列表 </div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Headers</strong></div>
<div class="panel-body">
... ... @@ -3547,7 +3358,7 @@
</div>
</div><!-- #info -->
<div class="tab-pane" id="sandbox27">
<div class="tab-pane" id="sandbox28">
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
... ... @@ -3564,13 +3375,13 @@
<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/vipdetail" method="POST" name="form27" id="form27">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/car" method="POST" name="form28" id="form28">
<div class="form-group">
无
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="27">提交</button>
<button type="reset" class="btn btn-info" rel="27">重置</button>
<button type="submit" class="btn btn-success send" rel="28">提交</button>
<button type="reset" class="btn btn-info" rel="28">重置</button>
</div>
</form>
</div>
... ... @@ -3580,8 +3391,8 @@
<div class="panel-body">
<div class="row">
<div class="col-md-12" style="overflow-x:auto">
<pre id="response_headers27"></pre>
<pre id="response27"></pre>
<pre id="response_headers28"></pre>
<pre id="response28"></pre>
</div>
</div>
</div>
... ... @@ -3596,15 +3407,41 @@
</div>
</div><!-- #sandbox -->
<div class="tab-pane" id="sample27">
<div class="tab-pane" id="sample28">
<div class="row">
<div class="col-md-12">
<pre id="sample_response27">{
<pre id="sample_response28">{
"code": 1,
"msg": "成功",
"time": "1571492001",
"data": {
"text": //会员须知内容
"id"://购物车ID
"user_id"://用户ID
"pic_id"://图片的ID
"video_id"://视频的ID
"pic":[
"id"://图片ID
"title"://图片标题
"thumbnail"://缩略图
"url"://高清百度云盘地址
"price"://普通价格
"vip_price"://vip价格
],
"video":[
"id"://视频ID
"title"://视频标题
"thumbnail"://视频封面图片
"video"://视频地址
"two_url"://2K视频云盘地址
"four_url"://4k视频云盘地址
"eight_url"://8k视频云盘地址
"price"://2k视频原价格
"four_price"://4k视频原价格
"eight_price"://8k视频原价格
"vip_price"://2k会员价格
"four_vipprice"://4k会员价格
"eight_vipprice"://8k会员价格
]
}
}</pre>
</div>
... ... @@ -3616,28 +3453,28 @@
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="heading-14">
<div class="panel-heading" id="heading-26">
<h4 class="panel-title">
<span class="label label-primary">POST</span>
<a data-toggle="collapse" data-parent="#accordion14" href="#collapseOne14"> 首页视频、图片、精美大片入口 <span class="text-muted">/api/user/index</span></a>
<a data-toggle="collapse" data-parent="#accordion26" href="#collapseOne26"> 会员介绍 <span class="text-muted">/api/user/vipdesc</span></a>
</h4>
</div>
<div id="collapseOne14" class="panel-collapse collapse">
<div id="collapseOne26" class="panel-collapse collapse">
<div class="panel-body">
<!-- Nav tabs -->
<ul class="nav nav-tabs" id="doctab14">
<li class="active"><a href="#info14" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox14" data-toggle="tab">在线测试</a></li>
<li><a href="#sample14" data-toggle="tab">返回示例</a></li>
<ul class="nav nav-tabs" id="doctab26">
<li class="active"><a href="#info26" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox26" data-toggle="tab">在线测试</a></li>
<li><a href="#sample26" data-toggle="tab">返回示例</a></li>
</ul>
<!-- Tab panes -->
<div class="tab-content">
<div class="tab-pane active" id="info14">
<div class="tab-pane active" id="info26">
<div class="well">
首页视频、图片、精美大片入口 </div>
会员介绍 </div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Headers</strong></div>
<div class="panel-body">
... ... @@ -3674,7 +3511,7 @@
</div>
</div><!-- #info -->
<div class="tab-pane" id="sandbox14">
<div class="tab-pane" id="sandbox26">
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
... ... @@ -3691,13 +3528,13 @@
<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/index" method="POST" name="form14" id="form14">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/vipdesc" method="POST" name="form26" id="form26">
<div class="form-group">
无
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="14">提交</button>
<button type="reset" class="btn btn-info" rel="14">重置</button>
<button type="submit" class="btn btn-success send" rel="26">提交</button>
<button type="reset" class="btn btn-info" rel="26">重置</button>
</div>
</form>
</div>
... ... @@ -3707,8 +3544,8 @@
<div class="panel-body">
<div class="row">
<div class="col-md-12" style="overflow-x:auto">
<pre id="response_headers14"></pre>
<pre id="response14"></pre>
<pre id="response_headers26"></pre>
<pre id="response26"></pre>
</div>
</div>
</div>
... ... @@ -3723,18 +3560,16 @@
</div>
</div><!-- #sandbox -->
<div class="tab-pane" id="sample14">
<div class="tab-pane" id="sample26">
<div class="row">
<div class="col-md-12">
<pre id="sample_response14">{
'code':'1',
'msg':'返回成功',
<pre id="sample_response26">{
"code": 1,
"msg": "成功",
"time": "1571492001",
"data": {
"video_thumbnail": http://mapwww.baidu.com 视频封面图地址
"pic_thumbnail": http://mapwww.baidu.com 图片地址
"wonderful_thumbnail": http://mapwww.baidu.com 精美大片地址
}
"data": {
"content": //会员介绍内容
}
}</pre>
</div>
</div>
... ... @@ -3745,28 +3580,28 @@
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="heading-26">
<div class="panel-heading" id="heading-14">
<h4 class="panel-title">
<span class="label label-primary">POST</span>
<a data-toggle="collapse" data-parent="#accordion26" href="#collapseOne26"> 会员介绍 <span class="text-muted">/api/user/vipdesc</span></a>
<a data-toggle="collapse" data-parent="#accordion14" href="#collapseOne14"> 首页视频、图片、精美大片入口 <span class="text-muted">/api/user/index</span></a>
</h4>
</div>
<div id="collapseOne26" class="panel-collapse collapse">
<div id="collapseOne14" class="panel-collapse collapse">
<div class="panel-body">
<!-- Nav tabs -->
<ul class="nav nav-tabs" id="doctab26">
<li class="active"><a href="#info26" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox26" data-toggle="tab">在线测试</a></li>
<li><a href="#sample26" data-toggle="tab">返回示例</a></li>
<ul class="nav nav-tabs" id="doctab14">
<li class="active"><a href="#info14" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox14" data-toggle="tab">在线测试</a></li>
<li><a href="#sample14" data-toggle="tab">返回示例</a></li>
</ul>
<!-- Tab panes -->
<div class="tab-content">
<div class="tab-pane active" id="info26">
<div class="tab-pane active" id="info14">
<div class="well">
会员介绍 </div>
首页视频、图片、精美大片入口 </div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Headers</strong></div>
<div class="panel-body">
... ... @@ -3803,7 +3638,7 @@
</div>
</div><!-- #info -->
<div class="tab-pane" id="sandbox26">
<div class="tab-pane" id="sandbox14">
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
... ... @@ -3820,13 +3655,13 @@
<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="form26" id="form26">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/index" method="POST" name="form14" id="form14">
<div class="form-group">
无
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="26">提交</button>
<button type="reset" class="btn btn-info" rel="26">重置</button>
<button type="submit" class="btn btn-success send" rel="14">提交</button>
<button type="reset" class="btn btn-info" rel="14">重置</button>
</div>
</form>
</div>
... ... @@ -3836,8 +3671,8 @@
<div class="panel-body">
<div class="row">
<div class="col-md-12" style="overflow-x:auto">
<pre id="response_headers26"></pre>
<pre id="response26"></pre>
<pre id="response_headers14"></pre>
<pre id="response14"></pre>
</div>
</div>
</div>
... ... @@ -3852,16 +3687,18 @@
</div>
</div><!-- #sandbox -->
<div class="tab-pane" id="sample26">
<div class="tab-pane" id="sample14">
<div class="row">
<div class="col-md-12">
<pre id="sample_response26">{
"code": 1,
"msg": "成功",
<pre id="sample_response14">{
'code':'1',
'msg':'返回成功',
"time": "1571492001",
"data": {
"content": //会员介绍内容
}
"data": {
"video_thumbnail": http://mapwww.baidu.com 视频封面图地址
"pic_thumbnail": http://mapwww.baidu.com 图片地址
"wonderful_thumbnail": http://mapwww.baidu.com 精美大片地址
}
}</pre>
</div>
</div>
... ... @@ -5525,28 +5362,28 @@
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="heading-40">
<div class="panel-heading" id="heading-39">
<h4 class="panel-title">
<span class="label label-primary">POST</span>
<a data-toggle="collapse" data-parent="#accordion40" href="#collapseOne40"> 合并下载 <span class="text-muted">/api/user/merage</span></a>
<a data-toggle="collapse" data-parent="#accordion39" href="#collapseOne39"> 消费记录 <span class="text-muted">/api/user/payhistory</span></a>
</h4>
</div>
<div id="collapseOne40" class="panel-collapse collapse">
<div id="collapseOne39" class="panel-collapse collapse">
<div class="panel-body">
<!-- Nav tabs -->
<ul class="nav nav-tabs" id="doctab40">
<li class="active"><a href="#info40" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox40" data-toggle="tab">在线测试</a></li>
<li><a href="#sample40" data-toggle="tab">返回示例</a></li>
<ul class="nav nav-tabs" id="doctab39">
<li class="active"><a href="#info39" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox39" data-toggle="tab">在线测试</a></li>
<li><a href="#sample39" data-toggle="tab">返回示例</a></li>
</ul>
<!-- Tab panes -->
<div class="tab-content">
<div class="tab-pane active" id="info40">
<div class="tab-pane active" id="info39">
<div class="well">
合并下载 </div>
消费记录 </div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Headers</strong></div>
<div class="panel-body">
... ... @@ -5584,10 +5421,16 @@
</thead>
<tbody>
<tr>
<td>order_id</td>
<td>page</td>
<td>inter</td>
<td>是</td>
<td>订单ID</td>
<td>否</td>
<td>当前页(默认1</td>
</tr>
<tr>
<td>pageNum</td>
<td>inter</td>
<td>否</td>
<td>每页显示数据个数（默认10）</td>
</tr>
</tbody>
</table>
... ... @@ -5600,7 +5443,7 @@
</div>
</div><!-- #info -->
<div class="tab-pane" id="sandbox40">
<div class="tab-pane" id="sandbox39">
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
... ... @@ -5617,14 +5460,18 @@
<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/merage" method="POST" name="form40" id="form40">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/payhistory" method="POST" name="form39" id="form39">
<div class="form-group">
<label class="control-label" for="order_id">order_id</label>
<input type="inter" class="form-control input-sm" id="order_id" required placeholder="订单ID" name="order_id">
<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="40">提交</button>
<button type="reset" class="btn btn-info" rel="40">重置</button>
<button type="submit" class="btn btn-success send" rel="39">提交</button>
<button type="reset" class="btn btn-info" rel="39">重置</button>
</div>
</form>
</div>
... ... @@ -5634,8 +5481,8 @@
<div class="panel-body">
<div class="row">
<div class="col-md-12" style="overflow-x:auto">
<pre id="response_headers40"></pre>
<pre id="response40"></pre>
<pre id="response_headers39"></pre>
<pre id="response39"></pre>
</div>
</div>
</div>
... ... @@ -5650,16 +5497,23 @@
</div>
</div><!-- #sandbox -->
<div class="tab-pane" id="sample40">
<div class="tab-pane" id="sample39">
<div class="row">
<div class="col-md-12">
<pre id="sample_response40">{
<pre id="sample_response39">{
"code": 1,
"msg": "成功",
"time": "1571492001",
"data": {
}
"times"://时间分段,
"info":[
"id": 4,//id,
"user_id"://用户ID
"pic_id"://图片ID
"video_id"://视频ID
],
"total"://总价
}
}</pre>
</div>
</div>
... ... @@ -5675,7 +5529,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-11-22 21:05:06 </div>
Generated on 2019-11-22 21:08:25 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...