郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 4f31ab0b441de566b26b28ba221c6bec9e82dad3 1 个父辈 90de0c4e master
1 个管道 的构建 通过 耗费 6 秒

修改组合订单

内嵌 并排对比
正在显示 3 个修改的文件 包含 257 行增加 和 100 行删除
... ... @@ -17,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="200">
<caret line="17" column="64" lean-forward="false" selection-start-line="17" selection-start-column="64" selection-end-line="17" selection-end-column="64" />
<state relative-caret-position="269">
<caret line="1095" column="0" lean-forward="true" selection-start-line="1095" selection-start-column="0" selection-end-line="1095" selection-end-column="0" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#365#484#0#PHP" expanded="false" />
... ... @@ -54,20 +54,22 @@
<element signature="e#23173#23363#0#PHP" expanded="false" />
<element signature="e#23369#24512#0#PHP" expanded="false" />
<element signature="e#24517#27182#0#PHP" expanded="false" />
<element signature="e#27188#27686#0#PHP" expanded="false" />
<element signature="e#27691#28778#0#PHP" expanded="false" />
<element signature="e#28784#29197#0#PHP" expanded="false" />
<element signature="e#29202#29681#0#PHP" expanded="false" />
<element signature="e#29687#30221#0#PHP" expanded="false" />
<element signature="e#30226#31140#0#PHP" expanded="false" />
<element signature="e#33033#33682#0#PHP" expanded="false" />
<element signature="e#33687#34560#0#PHP" expanded="false" />
<element signature="e#34566#34986#0#PHP" expanded="false" />
<element signature="e#34991#35474#0#PHP" expanded="false" />
<element signature="e#35480#36286#0#PHP" expanded="false" />
<element signature="e#36291#41214#0#PHP" expanded="false" />
<element signature="e#41220#41978#0#PHP" expanded="false" />
<element signature="e#41983#44247#0#PHP" expanded="false" />
<element signature="e#27691#29056#0#PHP" expanded="false" />
<element signature="e#29062#29475#0#PHP" expanded="false" />
<element signature="e#29480#29959#0#PHP" expanded="false" />
<element signature="e#29965#30499#0#PHP" expanded="false" />
<element signature="e#30504#31418#0#PHP" expanded="false" />
<element signature="e#31424#32078#0#PHP" expanded="false" />
<element signature="e#32083#33350#0#PHP" expanded="false" />
<element signature="e#33356#34116#0#PHP" expanded="false" />
<element signature="e#34121#35197#0#PHP" expanded="false" />
<element signature="e#35223#36054#0#PHP" expanded="false" />
<element signature="e#36060#36480#0#PHP" expanded="false" />
<element signature="e#36485#36968#0#PHP" expanded="false" />
<element signature="e#36974#37780#0#PHP" expanded="false" />
<element signature="e#37785#42708#0#PHP" expanded="false" />
<element signature="e#42714#43472#0#PHP" expanded="false" />
<element signature="e#43477#45741#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -171,11 +173,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="370" />
<option name="y" value="57" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="93" />
<option name="y" value="61" />
<option name="width" value="1699" />
<option name="height" value="970" />
<option name="height" value="1009" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -270,7 +272,7 @@
<workItem from="1574252363848" duration="8841000" />
<workItem from="1574295812843" duration="20536000" />
<workItem from="1574336957891" duration="1350000" />
<workItem from="1574382087071" duration="7846000" />
<workItem from="1574382087071" duration="14575000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -283,7 +285,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="147786000" />
<option name="totallyTimeSpent" value="154515000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -295,7 +297,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="370" y="57" width="1699" height="970" extended-state="0" />
<frame x="93" y="61" width="1699" height="1009" extended-state="1" />
<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" />
... ... @@ -304,7 +306,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.14885955" 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.14220184" 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" />
... ... @@ -701,8 +703,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="17" column="64" lean-forward="false" selection-start-line="17" selection-start-column="64" selection-end-line="17" selection-end-column="64" />
<state relative-caret-position="269">
<caret line="1095" column="0" lean-forward="true" selection-start-line="1095" selection-start-column="0" selection-end-line="1095" selection-end-column="0" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#365#484#0#PHP" expanded="false" />
... ... @@ -738,20 +740,22 @@
<element signature="e#23173#23363#0#PHP" expanded="false" />
<element signature="e#23369#24512#0#PHP" expanded="false" />
<element signature="e#24517#27182#0#PHP" expanded="false" />
<element signature="e#27188#27686#0#PHP" expanded="false" />
<element signature="e#27691#28778#0#PHP" expanded="false" />
<element signature="e#28784#29197#0#PHP" expanded="false" />
<element signature="e#29202#29681#0#PHP" expanded="false" />
<element signature="e#29687#30221#0#PHP" expanded="false" />
<element signature="e#30226#31140#0#PHP" expanded="false" />
<element signature="e#33033#33682#0#PHP" expanded="false" />
<element signature="e#33687#34560#0#PHP" expanded="false" />
<element signature="e#34566#34986#0#PHP" expanded="false" />
<element signature="e#34991#35474#0#PHP" expanded="false" />
<element signature="e#35480#36286#0#PHP" expanded="false" />
<element signature="e#36291#41214#0#PHP" expanded="false" />
<element signature="e#41220#41978#0#PHP" expanded="false" />
<element signature="e#41983#44247#0#PHP" expanded="false" />
<element signature="e#27691#29056#0#PHP" expanded="false" />
<element signature="e#29062#29475#0#PHP" expanded="false" />
<element signature="e#29480#29959#0#PHP" expanded="false" />
<element signature="e#29965#30499#0#PHP" expanded="false" />
<element signature="e#30504#31418#0#PHP" expanded="false" />
<element signature="e#31424#32078#0#PHP" expanded="false" />
<element signature="e#32083#33350#0#PHP" expanded="false" />
<element signature="e#33356#34116#0#PHP" expanded="false" />
<element signature="e#34121#35197#0#PHP" expanded="false" />
<element signature="e#35223#36054#0#PHP" expanded="false" />
<element signature="e#36060#36480#0#PHP" expanded="false" />
<element signature="e#36485#36968#0#PHP" expanded="false" />
<element signature="e#36974#37780#0#PHP" expanded="false" />
<element signature="e#37785#42708#0#PHP" expanded="false" />
<element signature="e#42714#43472#0#PHP" expanded="false" />
<element signature="e#43477#45741#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -844,8 +844,16 @@ class User extends Api
$user_id = $this->uid;
$pic_id = $this->request->param('pic_id');
$video_id = $this->request->param('video_id');
if(empty($pic_id) && empty($video_id)){
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}
if(empty($pic_id)){
$param['video_id'] = $this->request->param('video_id');
//接受视频ID并判断
$video_id = $this->request->post('video_id');
if(empty($video_id)){
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}
$param['video_id'] = $video_id;
$param['createtime'] = time();
$param['user_id'] = $user_id;
$data = Db::name('car')
... ... @@ -990,7 +998,10 @@ class User extends Api
}elseif ( $param['total']<=0){
$this->error(['code'=>3,'msg'=>'非法操作']);
}else{
$param['video_id'] = serialize(explode(',',$video_id.','.$video_attr.','.$param['total']));
$arr = [];
$arr['id'] = $video_id;
$arr['attr'] = $video_attr;
$param['video_id'] = serialize($arr);
$param['createtime'] = time();
$param['num'] = date('Ymd').substr(implode(NULL, array_map('ord', str_split(substr(uniqid(), 7, 13), 1))), 0, 8);
$data = Db::name('order')
... ... @@ -1009,9 +1020,10 @@ class User extends Api
* @ApiRoute (/api/user/orders)
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
*
* @ApiParams (name="video_id", type="string", required=true, description="视频ID")
* @ApiParams (name="video_id", type="string", required=true, description="视频ID(多个以逗号隔开)")
* @ApiParams (name="video_attr", type="string", required=true, description="视频品质属性（多个以逗号隔开）")
* @ApiParams (name="pic_id", type="string", required=true, description="图片ID")
* @ApiParams (name="total", type="float", required=true, description="价格")
* @ApiParams (name="total", type="float", required=true, description="总价格")
*
* @ApiReturn({
"code": 1,
... ... @@ -1025,14 +1037,22 @@ class User extends Api
public function orders()
{
$param['user_id'] = $this->uid;
$param['video_id'] = $this->request->post('video_id');
$video_id = explode(',',$this->request->post('video_id'));
$video_attr = explode(',',$this->request->post('video_attr'));
$key = ['id','attr'];
$param['video_id'] = serialize($this->array_merge_more($key,$video_id,$video_attr));
$param['pic_id'] = $this->request->post('pic_id');
$param['total'] = $this->request->post('total');
if(empty( $param['total'])){
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}elseif ( $param['total']<=0){
$this->error(['code'=>3,'msg'=>'非法操作']);
}else{
$param['createtime'] = time();
$param['num'] = date('Ymd').substr(implode(NULL, array_map('ord', str_split(substr(uniqid(), 7, 13), 1))), 0, 8);
$data = Db::name('order')
... ... @@ -1044,6 +1064,36 @@ class User extends Api
}
}
//将多个一维数组转为二维数组
public function array_merge_more($keys, ...$arrs){
// 检查参数是否正确
if(!$keys || !is_array($keys) || !$arrs || !is_array($arrs) || count($keys)!=count($arrs)){
return array();
}
// 一维数组中最大长度
$max_len = 0;
// 整理数据，把所有一维数组转重新索引
for($i=0,$len=count($arrs); $i<$len; $i++){
$arrs[$i] = array_values($arrs[$i]);
if(count($arrs[$i])>$max_len){
$max_len = count($arrs[$i]);
}
}
// 合拼数据
$result = array();
for($i=0; $i<$max_len; $i++){
$tmp = array();
foreach($keys as $k=>$v){
if(isset($arrs[$k][$i])){
$tmp[$v] = $arrs[$k][$i];
}
}
$result[] = $tmp;
}
return $result;
}
/**
* @ApiTitle (删除订单)
* @ApiSummary (删除订单)
... ...
... ... @@ -165,8 +165,9 @@
<div class="child collapse" id="个人中心">
<a href="javascript:;" data-id="13" class="list-group-item">小程序登录</a>
<a href="javascript:;" data-id="26" class="list-group-item">会员介绍</a>
<a href="javascript:;" data-id="35" class="list-group-item">我的订单</a>
<a href="javascript:;" data-id="34" class="list-group-item">删除订单</a>
<a href="javascript:;" data-id="36" class="list-group-item">我的订单</a>
<a href="javascript:;" data-id="35" class="list-group-item">删除订单</a>
<a href="javascript:;" data-id="34" class="list-group-item"></a>
<a href="javascript:;" data-id="33" class="list-group-item">创建组合订单</a>
<a href="javascript:;" data-id="32" class="list-group-item">创建视频订单</a>
<a href="javascript:;" data-id="31" class="list-group-item">创建图片订单</a>
... ... @@ -186,7 +187,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="36" class="list-group-item">消费记录</a>
<a href="javascript:;" data-id="37" class="list-group-item">消费记录</a>
</div>
</div>
</div>
... ... @@ -1924,26 +1925,26 @@
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="heading-35">
<div class="panel-heading" id="heading-36">
<h4 class="panel-title">
<span class="label label-primary">POST</span>
<a data-toggle="collapse" data-parent="#accordion35" href="#collapseOne35"> 我的订单 <span class="text-muted">/api/user/myorder</span></a>
<a data-toggle="collapse" data-parent="#accordion36" href="#collapseOne36"> 我的订单 <span class="text-muted">/api/user/myorder</span></a>
</h4>
</div>
<div id="collapseOne35" class="panel-collapse collapse">
<div id="collapseOne36" class="panel-collapse collapse">
<div class="panel-body">
<!-- Nav tabs -->
<ul class="nav nav-tabs" id="doctab35">
<li class="active"><a href="#info35" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox35" data-toggle="tab">在线测试</a></li>
<li><a href="#sample35" data-toggle="tab">返回示例</a></li>
<ul class="nav nav-tabs" id="doctab36">
<li class="active"><a href="#info36" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox36" data-toggle="tab">在线测试</a></li>
<li><a href="#sample36" data-toggle="tab">返回示例</a></li>
</ul>
<!-- Tab panes -->
<div class="tab-content">
<div class="tab-pane active" id="info35">
<div class="tab-pane active" id="info36">
<div class="well">
我的订单 </div>
<div class="panel panel-default">
... ... @@ -2011,7 +2012,7 @@
</div>
</div><!-- #info -->
<div class="tab-pane" id="sandbox35">
<div class="tab-pane" id="sandbox36">
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
... ... @@ -2028,7 +2029,7 @@
<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/myorder" method="POST" name="form35" id="form35">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/myorder" method="POST" name="form36" id="form36">
<div class="form-group">
<label class="control-label" for="type">type</label>
<input type="inter" class="form-control input-sm" id="type" placeholder="状态(不传默认为全部 1为待支付 2为已完成" name="type">
... ... @@ -2042,8 +2043,8 @@
<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>
<button type="submit" class="btn btn-success send" rel="36">提交</button>
<button type="reset" class="btn btn-info" rel="36">重置</button>
</div>
</form>
</div>
... ... @@ -2053,8 +2054,8 @@
<div class="panel-body">
<div class="row">
<div class="col-md-12" style="overflow-x:auto">
<pre id="response_headers35"></pre>
<pre id="response35"></pre>
<pre id="response_headers36"></pre>
<pre id="response36"></pre>
</div>
</div>
</div>
... ... @@ -2069,10 +2070,10 @@
</div>
</div><!-- #sandbox -->
<div class="tab-pane" id="sample35">
<div class="tab-pane" id="sample36">
<div class="row">
<div class="col-md-12">
<pre id="sample_response35">{
<pre id="sample_response36">{
"code": 1,
"msg": "成功",
"time": "1571492001",
... ... @@ -2090,26 +2091,26 @@
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="heading-34">
<div class="panel-heading" id="heading-35">
<h4 class="panel-title">
<span class="label label-primary">POST</span>
<a data-toggle="collapse" data-parent="#accordion34" href="#collapseOne34"> 删除订单 <span class="text-muted">/api/user/delorder</span></a>
<a data-toggle="collapse" data-parent="#accordion35" href="#collapseOne35"> 删除订单 <span class="text-muted">/api/user/delorder</span></a>
</h4>
</div>
<div id="collapseOne34" class="panel-collapse collapse">
<div id="collapseOne35" class="panel-collapse collapse">
<div class="panel-body">
<!-- Nav tabs -->
<ul class="nav nav-tabs" id="doctab34">
<li class="active"><a href="#info34" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox34" data-toggle="tab">在线测试</a></li>
<li><a href="#sample34" data-toggle="tab">返回示例</a></li>
<ul class="nav nav-tabs" id="doctab35">
<li class="active"><a href="#info35" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox35" data-toggle="tab">在线测试</a></li>
<li><a href="#sample35" data-toggle="tab">返回示例</a></li>
</ul>
<!-- Tab panes -->
<div class="tab-content">
<div class="tab-pane active" id="info34">
<div class="tab-pane active" id="info35">
<div class="well">
删除订单 </div>
<div class="panel panel-default">
... ... @@ -2165,7 +2166,7 @@
</div>
</div><!-- #info -->
<div class="tab-pane" id="sandbox34">
<div class="tab-pane" id="sandbox35">
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
... ... @@ -2182,12 +2183,108 @@
<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/delorder" method="POST" name="form34" id="form34">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/delorder" method="POST" name="form35" id="form35">
<div class="form-group">
<label class="control-label" for="ids[]">ids[]</label>
<input type="inter" class="form-control input-sm" id="ids[]" required placeholder="订单ID" name="ids[]">
</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>
</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_headers35"></pre>
<pre id="response35"></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="sample35">
<div class="row">
<div class="col-md-12">
<pre id="sample_response35">{
"code": 1,
"msg": "成功",
"time": "1571492001",
}</pre>
</div>
</div>
</div><!-- #sample -->
</div><!-- .tab-content -->
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="heading-34">
<h4 class="panel-title">
<span class="label label-success">GET</span>
<a data-toggle="collapse" data-parent="#accordion34" href="#collapseOne34"> <span class="text-muted">/api/user/array_merge_more</span></a>
</h4>
</div>
<div id="collapseOne34" class="panel-collapse collapse">
<div class="panel-body">
<!-- Nav tabs -->
<ul class="nav nav-tabs" id="doctab34">
<li class="active"><a href="#info34" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox34" data-toggle="tab">在线测试</a></li>
<li><a href="#sample34" data-toggle="tab">返回示例</a></li>
</ul>
<!-- Tab panes -->
<div class="tab-content">
<div class="tab-pane active" id="info34">
<div class="well">
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Headers</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 class="panel panel-default">
<div class="panel-heading"><strong>正文</strong></div>
<div class="panel-body">
无 </div>
</div>
</div><!-- #info -->
<div class="tab-pane" id="sandbox34">
<div class="row">
<div class="col-md-12">
<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/array_merge_more" method="get" name="form34" id="form34">
<div class="form-group">
无
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="34">提交</button>
<button type="reset" class="btn btn-info" rel="34">重置</button>
</div>
... ... @@ -2218,11 +2315,7 @@
<div class="tab-pane" id="sample34">
<div class="row">
<div class="col-md-12">
<pre id="sample_response34">{
"code": 1,
"msg": "成功",
"time": "1571492001",
}</pre>
<pre id="sample_response34">无</pre>
</div>
</div>
</div><!-- #sample -->
... ... @@ -2294,7 +2387,13 @@
<td>video_id</td>
<td>string</td>
<td>是</td>
<td>视频ID</td>
<td>视频ID(多个以逗号隔开</td>
</tr>
<tr>
<td>video_attr</td>
<td>string</td>
<td>是</td>
<td>视频品质属性（多个以逗号隔开）</td>
</tr>
<tr>
<td>pic_id</td>
... ... @@ -2306,7 +2405,7 @@
<td>total</td>
<td>float</td>
<td>是</td>
<td>价格</td>
<td>总价格</td>
</tr>
</tbody>
</table>
... ... @@ -2339,7 +2438,11 @@
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/orders" method="POST" name="form33" id="form33">
<div class="form-group">
<label class="control-label" for="video_id">video_id</label>
<input type="string" class="form-control input-sm" id="video_id" required placeholder="视频ID" name="video_id">
<input type="string" class="form-control input-sm" id="video_id" required placeholder="视频ID(多个以逗号隔开" name="video_id">
</div>
<div class="form-group">
<label class="control-label" for="video_attr">video_attr</label>
<input type="string" class="form-control input-sm" id="video_attr" required placeholder="视频品质属性（多个以逗号隔开）" name="video_attr">
</div>
<div class="form-group">
<label class="control-label" for="pic_id">pic_id</label>
... ... @@ -2347,7 +2450,7 @@
</div>
<div class="form-group">
<label class="control-label" for="total">total</label>
<input type="float" class="form-control input-sm" id="total" required placeholder="价格" name="total">
<input type="float" class="form-control input-sm" id="total" required placeholder="总价格" name="total">
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="33">提交</button>
... ... @@ -5073,26 +5176,26 @@
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="heading-36">
<div class="panel-heading" id="heading-37">
<h4 class="panel-title">
<span class="label label-primary">POST</span>
<a data-toggle="collapse" data-parent="#accordion36" href="#collapseOne36"> 消费记录 <span class="text-muted">/api/user/payhistory</span></a>
<a data-toggle="collapse" data-parent="#accordion37" href="#collapseOne37"> 消费记录 <span class="text-muted">/api/user/payhistory</span></a>
</h4>
</div>
<div id="collapseOne36" class="panel-collapse collapse">
<div id="collapseOne37" class="panel-collapse collapse">
<div class="panel-body">
<!-- Nav tabs -->
<ul class="nav nav-tabs" id="doctab36">
<li class="active"><a href="#info36" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox36" data-toggle="tab">在线测试</a></li>
<li><a href="#sample36" data-toggle="tab">返回示例</a></li>
<ul class="nav nav-tabs" id="doctab37">
<li class="active"><a href="#info37" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox37" data-toggle="tab">在线测试</a></li>
<li><a href="#sample37" data-toggle="tab">返回示例</a></li>
</ul>
<!-- Tab panes -->
<div class="tab-content">
<div class="tab-pane active" id="info36">
<div class="tab-pane active" id="info37">
<div class="well">
消费记录 </div>
<div class="panel panel-default">
... ... @@ -5154,7 +5257,7 @@
</div>
</div><!-- #info -->
<div class="tab-pane" id="sandbox36">
<div class="tab-pane" id="sandbox37">
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
... ... @@ -5171,7 +5274,7 @@
<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="form36" id="form36">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/payhistory" method="POST" name="form37" id="form37">
<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">
... ... @@ -5181,8 +5284,8 @@
<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>
<button type="reset" class="btn btn-info" rel="36">重置</button>
<button type="submit" class="btn btn-success send" rel="37">提交</button>
<button type="reset" class="btn btn-info" rel="37">重置</button>
</div>
</form>
</div>
... ... @@ -5192,8 +5295,8 @@
<div class="panel-body">
<div class="row">
<div class="col-md-12" style="overflow-x:auto">
<pre id="response_headers36"></pre>
<pre id="response36"></pre>
<pre id="response_headers37"></pre>
<pre id="response37"></pre>
</div>
</div>
</div>
... ... @@ -5208,10 +5311,10 @@
</div>
</div><!-- #sandbox -->
<div class="tab-pane" id="sample36">
<div class="tab-pane" id="sample37">
<div class="row">
<div class="col-md-12">
<pre id="sample_response36">{
<pre id="sample_response37">{
"code": 1,
"msg": "成功",
"time": "1571492001",
... ... @@ -5240,7 +5343,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-11-22 10:52:38 </div>
Generated on 2019-11-22 13:40:12 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...