景龙 / feifangu · 提交

转到一个项目

作者 jinglong
提交 e3d66d8ab71888ee8e8f6a3e0d9990e7f5cc8ae2 1 个父辈 8e3030ab
1 个管道 的构建 通过 耗费 1 秒

增加确认收货接口

内嵌 并排对比
正在显示 3 个修改的文件 包含 368 行增加 和 186 行删除
... ... @@ -10,9 +10,7 @@
// +----------------------------------------------------------------------
namespace app\api\controller;
use app\admin\model\Order;
use app\common\controller\Api;
use think\Db;
use think\Validate;
/**
* 物流接口
... ...
... ... @@ -539,4 +539,44 @@ class Orders extends Api
}
}
/**
* @ApiTitle (确认收货)
* @ApiSummary (确认收货)
* @ApiMethod (GET)
* @ApiRoute (/api/orders/confirmGoods)
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
*
* @ApiParams (name="order_id", type="inter", required=true, description="订单id")
*
* @ApiReturn({
"code": 1,
"msg": "成功",
"time": "1571730709",
"data": null
})
*/
public function confirmGoods(){
if($this->request->isGet()){
$order_id = $this->request->get('order_id');
$rule = config('verify.order_detail');
$validate = new Validate($rule['rule'],$rule['msg']);
if (!$validate->check(['order_id'=>$order_id])) {
$this->error($validate->getError());
}
//待收货
$status = $this->order_status;
$orderModel = new Order();
$res = $orderModel->where(['id'=>$order_id,'uid'=>$this->uid,'status'=>$status[5]])->update(['status'=>$status[8]]);
if($res){
$this->success('成功');
}else{
$this->error('失败');
}
}else{
$this->error('请求方式错误');
}
}
}
... ...
... ... @@ -198,29 +198,30 @@
<a href="javascript:;" data-id="30" class="list-group-item">退款撤销</a>
<a href="javascript:;" data-id="31" class="list-group-item">申请退换货</a>
<a href="javascript:;" data-id="32" class="list-group-item">退换货撤销</a>
<a href="javascript:;" data-id="33" class="list-group-item">确认收货</a>
</div>
<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="33" class="list-group-item">支付订单</a>
<a href="javascript:;" data-id="34" class="list-group-item">立即购买</a>
<a href="javascript:;" data-id="34" class="list-group-item">支付订单</a>
<a href="javascript:;" data-id="35" class="list-group-item">立即购买</a>
</div>
<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="35" class="list-group-item">商品检索列表</a>
<a href="javascript:;" data-id="36" class="list-group-item">商品检索列表</a>
</div>
<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="36" class="list-group-item">品类分类</a>
<a href="javascript:;" data-id="37" class="list-group-item">品类分类</a>
</div>
<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="37" class="list-group-item">小程序登录</a>
<a href="javascript:;" data-id="38" class="list-group-item">获取个人信息（新人/旧人）</a>
<a href="javascript:;" data-id="39" class="list-group-item">获取二维码</a>
<a href="javascript:;" data-id="40" class="list-group-item">收藏</a>
<a href="javascript:;" data-id="41" class="list-group-item">取消收藏</a>
<a href="javascript:;" data-id="42" class="list-group-item">我的收藏</a>
<a href="javascript:;" data-id="43" class="list-group-item">我的优惠券</a>
<a href="javascript:;" data-id="38" class="list-group-item">小程序登录</a>
<a href="javascript:;" data-id="39" class="list-group-item">获取个人信息（新人/旧人）</a>
<a href="javascript:;" data-id="40" class="list-group-item">获取二维码</a>
<a href="javascript:;" data-id="41" class="list-group-item">收藏</a>
<a href="javascript:;" data-id="42" class="list-group-item">取消收藏</a>
<a href="javascript:;" data-id="43" class="list-group-item">我的收藏</a>
<a href="javascript:;" data-id="44" class="list-group-item">我的优惠券</a>
</div>
</div>
</div>
... ... @@ -5242,13 +5243,11 @@
</div>
</div>
</div>
<h2>支付接口</h2>
<hr>
<div class="panel panel-default">
<div class="panel-heading" id="heading-33">
<h4 class="panel-title">
<span class="label label-primary">POST</span>
<a data-toggle="collapse" data-parent="#accordion33" href="#collapseOne33"> 支付订单 <span class="text-muted">/api/pay/pay</span></a>
<span class="label label-success">GET</span>
<a data-toggle="collapse" data-parent="#accordion33" href="#collapseOne33"> 确认收货 <span class="text-muted">/api/orders/confirmGoods</span></a>
</h4>
</div>
<div id="collapseOne33" class="panel-collapse collapse">
... ... @@ -5266,6 +5265,151 @@
<div class="tab-pane active" id="info33">
<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>order_id</td>
<td>inter</td>
<td>是</td>
<td>订单id</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="sandbox33">
<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/orders/confirmGoods" method="GET" name="form33" id="form33">
<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">
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="33">提交</button>
<button type="reset" class="btn btn-info" rel="33">重置</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_headers33"></pre>
<pre id="response33"></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="sample33">
<div class="row">
<div class="col-md-12">
<pre id="sample_response33">{
"code": 1,
"msg": "成功",
"time": "1571730709",
"data": null
}</pre>
</div>
</div>
</div><!-- #sample -->
</div><!-- .tab-content -->
</div>
</div>
</div>
<h2>支付接口</h2>
<hr>
<div class="panel panel-default">
<div class="panel-heading" id="heading-34">
<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/pay/pay</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>
... ... @@ -5326,7 +5470,7 @@
</div>
</div><!-- #info -->
<div class="tab-pane" id="sandbox33">
<div class="tab-pane" id="sandbox34">
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
... ... @@ -5343,7 +5487,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/pay/pay" method="POST" name="form33" id="form33">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/pay/pay" method="POST" name="form34" id="form34">
<div class="form-group">
<label class="control-label" for="openid">openid</label>
<input type="string" class="form-control input-sm" id="openid" required placeholder="小程序openid" name="openid">
... ... @@ -5353,8 +5497,8 @@
<input type="inter" class="form-control input-sm" id="order_sn" required placeholder="订单号" name="order_sn">
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="33">提交</button>
<button type="reset" class="btn btn-info" rel="33">重置</button>
<button type="submit" class="btn btn-success send" rel="34">提交</button>
<button type="reset" class="btn btn-info" rel="34">重置</button>
</div>
</form>
</div>
... ... @@ -5364,8 +5508,8 @@
<div class="panel-body">
<div class="row">
<div class="col-md-12" style="overflow-x:auto">
<pre id="response_headers33"></pre>
<pre id="response33"></pre>
<pre id="response_headers34"></pre>
<pre id="response34"></pre>
</div>
</div>
</div>
... ... @@ -5380,10 +5524,10 @@
</div>
</div><!-- #sandbox -->
<div class="tab-pane" id="sample33">
<div class="tab-pane" id="sample34">
<div class="row">
<div class="col-md-12">
<pre id="sample_response33">无</pre>
<pre id="sample_response34">无</pre>
</div>
</div>
</div><!-- #sample -->
... ... @@ -5393,26 +5537,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/pay/purchase</span></a>
<a data-toggle="collapse" data-parent="#accordion35" href="#collapseOne35"> 立即购买 <span class="text-muted">/api/pay/purchase</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">
... ... @@ -5540,7 +5684,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">
... ... @@ -5557,7 +5701,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/pay/purchase" method="POST" name="form34" id="form34">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/pay/purchase" method="POST" name="form35" id="form35">
<div class="form-group">
<label class="control-label" for="receive_name">receive_name</label>
<input type="string" class="form-control input-sm" id="receive_name" required placeholder="收货人" name="receive_name">
... ... @@ -5611,8 +5755,8 @@
<input type="inter" class="form-control input-sm" id="total_expense_price" required placeholder="运费总金额" name="total_expense_price">
</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>
<button type="submit" class="btn btn-success send" rel="35">提交</button>
<button type="reset" class="btn btn-info" rel="35">重置</button>
</div>
</form>
</div>
... ... @@ -5622,8 +5766,8 @@
<div class="panel-body">
<div class="row">
<div class="col-md-12" style="overflow-x:auto">
<pre id="response_headers34"></pre>
<pre id="response34"></pre>
<pre id="response_headers35"></pre>
<pre id="response35"></pre>
</div>
</div>
</div>
... ... @@ -5638,10 +5782,10 @@
</div>
</div><!-- #sandbox -->
<div class="tab-pane" id="sample34">
<div class="tab-pane" id="sample35">
<div class="row">
<div class="col-md-12">
<pre id="sample_response34">无</pre>
<pre id="sample_response35">无</pre>
</div>
</div>
</div><!-- #sample -->
... ... @@ -5653,26 +5797,26 @@
<h2>商品检索接口</h2>
<hr>
<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-success">GET</span>
<a data-toggle="collapse" data-parent="#accordion35" href="#collapseOne35"> 商品检索列表 <span class="text-muted">/api/search/searchGoodsList</span></a>
<a data-toggle="collapse" data-parent="#accordion36" href="#collapseOne36"> 商品检索列表 <span class="text-muted">/api/search/searchGoodsList</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">
... ... @@ -5734,7 +5878,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">
... ... @@ -5751,7 +5895,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/search/searchGoodsList" method="GET" name="form35" id="form35">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/search/searchGoodsList" method="GET" name="form36" id="form36">
<div class="form-group">
<label class="control-label" for="keyword">keyword</label>
<input type="string" class="form-control input-sm" id="keyword" required placeholder="检索关键字" name="keyword">
... ... @@ -5761,8 +5905,8 @@
<input type="inter" class="form-control input-sm" id="page" required placeholder="分页页码" name="page">
</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>
... ... @@ -5772,8 +5916,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>
... ... @@ -5788,10 +5932,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": "1574941706",
... ... @@ -5841,26 +5985,26 @@
<h2>品类接口</h2>
<hr>
<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-success">GET</span>
<a data-toggle="collapse" data-parent="#accordion36" href="#collapseOne36"> 品类分类 <span class="text-muted">/api/sort/sortType</span></a>
<a data-toggle="collapse" data-parent="#accordion37" href="#collapseOne37"> 品类分类 <span class="text-muted">/api/sort/sortType</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">
... ... @@ -5882,19 +6026,19 @@
</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">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/sort/sortType" method="GET" name="form36" id="form36">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/sort/sortType" method="GET" name="form37" id="form37">
<div class="form-group">
无
</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>
... ... @@ -5904,8 +6048,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>
... ... @@ -5920,10 +6064,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": "1574939035",
... ... @@ -5959,26 +6103,26 @@
<h2>个人中心接口</h2>
<hr>
<div class="panel panel-default">
<div class="panel-heading" id="heading-37">
<div class="panel-heading" id="heading-38">
<h4 class="panel-title">
<span class="label label-primary">POST</span>
<a data-toggle="collapse" data-parent="#accordion37" href="#collapseOne37"> 小程序登录 <span class="text-muted">/api/user/login</span></a>
<a data-toggle="collapse" data-parent="#accordion38" href="#collapseOne38"> 小程序登录 <span class="text-muted">/api/user/login</span></a>
</h4>
</div>
<div id="collapseOne37" class="panel-collapse collapse">
<div id="collapseOne38" class="panel-collapse collapse">
<div class="panel-body">
<!-- Nav tabs -->
<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 class="nav nav-tabs" id="doctab38">
<li class="active"><a href="#info38" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox38" data-toggle="tab">在线测试</a></li>
<li><a href="#sample38" data-toggle="tab">返回示例</a></li>
</ul>
<!-- Tab panes -->
<div class="tab-content">
<div class="tab-pane active" id="info37">
<div class="tab-pane active" id="info38">
<div class="well">
小程序登录 </div>
<div class="panel panel-default">
... ... @@ -6029,13 +6173,13 @@
</div>
</div><!-- #info -->
<div class="tab-pane" id="sandbox37">
<div class="tab-pane" id="sandbox38">
<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/login" method="POST" name="form37" id="form37">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/login" method="POST" name="form38" id="form38">
<div class="form-group">
<label class="control-label" for="code">code</label>
<input type="string" class="form-control input-sm" id="code" required placeholder="小程序code" name="code">
... ... @@ -6049,8 +6193,8 @@
<input type="string" class="form-control input-sm" id="avatar" required placeholder="小程序头像" name="avatar">
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="37">提交</button>
<button type="reset" class="btn btn-info" rel="37">重置</button>
<button type="submit" class="btn btn-success send" rel="38">提交</button>
<button type="reset" class="btn btn-info" rel="38">重置</button>
</div>
</form>
</div>
... ... @@ -6060,8 +6204,8 @@
<div class="panel-body">
<div class="row">
<div class="col-md-12" style="overflow-x:auto">
<pre id="response_headers37"></pre>
<pre id="response37"></pre>
<pre id="response_headers38"></pre>
<pre id="response38"></pre>
</div>
</div>
</div>
... ... @@ -6076,10 +6220,10 @@
</div>
</div><!-- #sandbox -->
<div class="tab-pane" id="sample37">
<div class="tab-pane" id="sample38">
<div class="row">
<div class="col-md-12">
<pre id="sample_response37">{
<pre id="sample_response38">{
"code": 1,
"msg": "登录成功",
"time": "1553839125",
... ... @@ -6100,26 +6244,26 @@
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="heading-38">
<div class="panel-heading" id="heading-39">
<h4 class="panel-title">
<span class="label label-success">GET</span>
<a data-toggle="collapse" data-parent="#accordion38" href="#collapseOne38"> 获取个人信息（新人/旧人） <span class="text-muted">/api/user/info</span></a>
<a data-toggle="collapse" data-parent="#accordion39" href="#collapseOne39"> 获取个人信息（新人/旧人） <span class="text-muted">/api/user/info</span></a>
</h4>
</div>
<div id="collapseOne38" class="panel-collapse collapse">
<div id="collapseOne39" class="panel-collapse collapse">
<div class="panel-body">
<!-- Nav tabs -->
<ul class="nav nav-tabs" id="doctab38">
<li class="active"><a href="#info38" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox38" data-toggle="tab">在线测试</a></li>
<li><a href="#sample38" 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="info38">
<div class="tab-pane active" id="info39">
<div class="well">
获取个人信息（新人/旧人） </div>
<div class="panel panel-default">
... ... @@ -6158,7 +6302,7 @@
</div>
</div><!-- #info -->
<div class="tab-pane" id="sandbox38">
<div class="tab-pane" id="sandbox39">
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
... ... @@ -6175,13 +6319,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/info" method="GET" name="form38" id="form38">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/info" method="GET" name="form39" id="form39">
<div class="form-group">
无
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="38">提交</button>
<button type="reset" class="btn btn-info" rel="38">重置</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>
... ... @@ -6191,8 +6335,8 @@
<div class="panel-body">
<div class="row">
<div class="col-md-12" style="overflow-x:auto">
<pre id="response_headers38"></pre>
<pre id="response38"></pre>
<pre id="response_headers39"></pre>
<pre id="response39"></pre>
</div>
</div>
</div>
... ... @@ -6207,10 +6351,10 @@
</div>
</div><!-- #sandbox -->
<div class="tab-pane" id="sample38">
<div class="tab-pane" id="sample39">
<div class="row">
<div class="col-md-12">
<pre id="sample_response38">{
<pre id="sample_response39">{
"code": 1,
"msg": "成功",
"time": "1575188985",
... ... @@ -6237,26 +6381,26 @@
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="heading-39">
<div class="panel-heading" id="heading-40">
<h4 class="panel-title">
<span class="label label-success">GET</span>
<a data-toggle="collapse" data-parent="#accordion39" href="#collapseOne39"> 获取二维码 <span class="text-muted">/api/user/getWxCode</span></a>
<a data-toggle="collapse" data-parent="#accordion40" href="#collapseOne40"> 获取二维码 <span class="text-muted">/api/user/getWxCode</span></a>
</h4>
</div>
<div id="collapseOne39" class="panel-collapse collapse">
<div id="collapseOne40" 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 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>
<!-- Tab panes -->
<div class="tab-content">
<div class="tab-pane active" id="info39">
<div class="tab-pane active" id="info40">
<div class="well">
获取二维码 </div>
<div class="panel panel-default">
... ... @@ -6312,7 +6456,7 @@
</div>
</div><!-- #info -->
<div class="tab-pane" id="sandbox39">
<div class="tab-pane" id="sandbox40">
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
... ... @@ -6329,14 +6473,14 @@
<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/getWxCode" method="GET" name="form39" id="form39">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/getWxCode" method="GET" name="form40" id="form40">
<div class="form-group">
<label class="control-label" for="goods_id">goods_id</label>
<input type="inter" class="form-control input-sm" id="goods_id" required placeholder="商品id" name="goods_id">
</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>
<button type="submit" class="btn btn-success send" rel="40">提交</button>
<button type="reset" class="btn btn-info" rel="40">重置</button>
</div>
</form>
</div>
... ... @@ -6346,8 +6490,8 @@
<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>
<pre id="response_headers40"></pre>
<pre id="response40"></pre>
</div>
</div>
</div>
... ... @@ -6362,10 +6506,10 @@
</div>
</div><!-- #sandbox -->
<div class="tab-pane" id="sample39">
<div class="tab-pane" id="sample40">
<div class="row">
<div class="col-md-12">
<pre id="sample_response39">{
<pre id="sample_response40">{
"code": 1,
"msg": "成功",
"time": "1572602867",
... ... @@ -6382,26 +6526,26 @@
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="heading-40">
<div class="panel-heading" id="heading-41">
<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/collection</span></a>
<a data-toggle="collapse" data-parent="#accordion41" href="#collapseOne41"> 收藏 <span class="text-muted">/api/user/collection</span></a>
</h4>
</div>
<div id="collapseOne40" class="panel-collapse collapse">
<div id="collapseOne41" 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="doctab41">
<li class="active"><a href="#info41" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox41" data-toggle="tab">在线测试</a></li>
<li><a href="#sample41" 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="info41">
<div class="well">
收藏 </div>
<div class="panel panel-default">
... ... @@ -6457,7 +6601,7 @@
</div>
</div><!-- #info -->
<div class="tab-pane" id="sandbox40">
<div class="tab-pane" id="sandbox41">
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
... ... @@ -6474,14 +6618,14 @@
<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/collection" method="POST" name="form40" id="form40">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/collection" method="POST" name="form41" id="form41">
<div class="form-group">
<label class="control-label" for="goods_id">goods_id</label>
<input type="inter" class="form-control input-sm" id="goods_id" required placeholder="商品id" name="goods_id">
</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="41">提交</button>
<button type="reset" class="btn btn-info" rel="41">重置</button>
</div>
</form>
</div>
... ... @@ -6491,8 +6635,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_headers41"></pre>
<pre id="response41"></pre>
</div>
</div>
</div>
... ... @@ -6507,10 +6651,10 @@
</div>
</div><!-- #sandbox -->
<div class="tab-pane" id="sample40">
<div class="tab-pane" id="sample41">
<div class="row">
<div class="col-md-12">
<pre id="sample_response40">{
<pre id="sample_response41">{
"code": 1,
"msg": "成功",
"time": "1571037179",
... ... @@ -6525,26 +6669,26 @@
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="heading-41">
<div class="panel-heading" id="heading-42">
<h4 class="panel-title">
<span class="label label-primary">POST</span>
<a data-toggle="collapse" data-parent="#accordion41" href="#collapseOne41"> 取消收藏 <span class="text-muted">/api/user/cancelCollection</span></a>
<a data-toggle="collapse" data-parent="#accordion42" href="#collapseOne42"> 取消收藏 <span class="text-muted">/api/user/cancelCollection</span></a>
</h4>
</div>
<div id="collapseOne41" class="panel-collapse collapse">
<div id="collapseOne42" class="panel-collapse collapse">
<div class="panel-body">
<!-- Nav tabs -->
<ul class="nav nav-tabs" id="doctab41">
<li class="active"><a href="#info41" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox41" data-toggle="tab">在线测试</a></li>
<li><a href="#sample41" data-toggle="tab">返回示例</a></li>
<ul class="nav nav-tabs" id="doctab42">
<li class="active"><a href="#info42" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox42" data-toggle="tab">在线测试</a></li>
<li><a href="#sample42" data-toggle="tab">返回示例</a></li>
</ul>
<!-- Tab panes -->
<div class="tab-content">
<div class="tab-pane active" id="info41">
<div class="tab-pane active" id="info42">
<div class="well">
取消收藏 </div>
<div class="panel panel-default">
... ... @@ -6600,7 +6744,7 @@
</div>
</div><!-- #info -->
<div class="tab-pane" id="sandbox41">
<div class="tab-pane" id="sandbox42">
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
... ... @@ -6617,14 +6761,14 @@
<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/cancelCollection" method="POST" name="form41" id="form41">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/cancelCollection" method="POST" name="form42" id="form42">
<div class="form-group">
<label class="control-label" for="goods_id">goods_id</label>
<input type="inter" class="form-control input-sm" id="goods_id" required placeholder="商品id" name="goods_id">
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="41">提交</button>
<button type="reset" class="btn btn-info" rel="41">重置</button>
<button type="submit" class="btn btn-success send" rel="42">提交</button>
<button type="reset" class="btn btn-info" rel="42">重置</button>
</div>
</form>
</div>
... ... @@ -6634,8 +6778,8 @@
<div class="panel-body">
<div class="row">
<div class="col-md-12" style="overflow-x:auto">
<pre id="response_headers41"></pre>
<pre id="response41"></pre>
<pre id="response_headers42"></pre>
<pre id="response42"></pre>
</div>
</div>
</div>
... ... @@ -6650,10 +6794,10 @@
</div>
</div><!-- #sandbox -->
<div class="tab-pane" id="sample41">
<div class="tab-pane" id="sample42">
<div class="row">
<div class="col-md-12">
<pre id="sample_response41">{
<pre id="sample_response42">{
"code": 1,
"msg": "成功",
"time": "1571037179",
... ... @@ -6668,26 +6812,26 @@
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="heading-42">
<div class="panel-heading" id="heading-43">
<h4 class="panel-title">
<span class="label label-success">GET</span>
<a data-toggle="collapse" data-parent="#accordion42" href="#collapseOne42"> 我的收藏 <span class="text-muted">/api/user/myCollectionList</span></a>
<a data-toggle="collapse" data-parent="#accordion43" href="#collapseOne43"> 我的收藏 <span class="text-muted">/api/user/myCollectionList</span></a>
</h4>
</div>
<div id="collapseOne42" class="panel-collapse collapse">
<div id="collapseOne43" class="panel-collapse collapse">
<div class="panel-body">
<!-- Nav tabs -->
<ul class="nav nav-tabs" id="doctab42">
<li class="active"><a href="#info42" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox42" data-toggle="tab">在线测试</a></li>
<li><a href="#sample42" data-toggle="tab">返回示例</a></li>
<ul class="nav nav-tabs" id="doctab43">
<li class="active"><a href="#info43" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox43" data-toggle="tab">在线测试</a></li>
<li><a href="#sample43" data-toggle="tab">返回示例</a></li>
</ul>
<!-- Tab panes -->
<div class="tab-content">
<div class="tab-pane active" id="info42">
<div class="tab-pane active" id="info43">
<div class="well">
我的收藏 </div>
<div class="panel panel-default">
... ... @@ -6743,7 +6887,7 @@
</div>
</div><!-- #info -->
<div class="tab-pane" id="sandbox42">
<div class="tab-pane" id="sandbox43">
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
... ... @@ -6760,14 +6904,14 @@
<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/myCollectionList" method="GET" name="form42" id="form42">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/myCollectionList" method="GET" name="form43" id="form43">
<div class="form-group">
<label class="control-label" for="page">page</label>
<input type="inter" class="form-control input-sm" id="page" required placeholder="分页页码" name="page">
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="42">提交</button>
<button type="reset" class="btn btn-info" rel="42">重置</button>
<button type="submit" class="btn btn-success send" rel="43">提交</button>
<button type="reset" class="btn btn-info" rel="43">重置</button>
</div>
</form>
</div>
... ... @@ -6777,8 +6921,8 @@
<div class="panel-body">
<div class="row">
<div class="col-md-12" style="overflow-x:auto">
<pre id="response_headers42"></pre>
<pre id="response42"></pre>
<pre id="response_headers43"></pre>
<pre id="response43"></pre>
</div>
</div>
</div>
... ... @@ -6793,10 +6937,10 @@
</div>
</div><!-- #sandbox -->
<div class="tab-pane" id="sample42">
<div class="tab-pane" id="sample43">
<div class="row">
<div class="col-md-12">
<pre id="sample_response42">{
<pre id="sample_response43">{
"code": 1,
"msg": "成功",
"time": "1574941706",
... ... @@ -6844,26 +6988,26 @@
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="heading-43">
<div class="panel-heading" id="heading-44">
<h4 class="panel-title">
<span class="label label-success">GET</span>
<a data-toggle="collapse" data-parent="#accordion43" href="#collapseOne43"> 我的优惠券 <span class="text-muted">/api/user/myCouponList</span></a>
<a data-toggle="collapse" data-parent="#accordion44" href="#collapseOne44"> 我的优惠券 <span class="text-muted">/api/user/myCouponList</span></a>
</h4>
</div>
<div id="collapseOne43" class="panel-collapse collapse">
<div id="collapseOne44" class="panel-collapse collapse">
<div class="panel-body">
<!-- Nav tabs -->
<ul class="nav nav-tabs" id="doctab43">
<li class="active"><a href="#info43" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox43" data-toggle="tab">在线测试</a></li>
<li><a href="#sample43" data-toggle="tab">返回示例</a></li>
<ul class="nav nav-tabs" id="doctab44">
<li class="active"><a href="#info44" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox44" data-toggle="tab">在线测试</a></li>
<li><a href="#sample44" data-toggle="tab">返回示例</a></li>
</ul>
<!-- Tab panes -->
<div class="tab-content">
<div class="tab-pane active" id="info43">
<div class="tab-pane active" id="info44">
<div class="well">
我的优惠券 </div>
<div class="panel panel-default">
... ... @@ -6902,20 +7046,20 @@
</div>
</div><!-- #info -->
<div class="tab-pane" id="sandbox43">
<div class="tab-pane" id="sandbox44">
<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/myCouponList" method="GET" name="form43" id="form43">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/myCouponList" method="GET" name="form44" id="form44">
<div class="form-group">
<label class="control-label" for="is_flag">is_flag</label>
<input type="inter" class="form-control input-sm" id="is_flag" required placeholder="优惠券标识（0：未使用，1：已使用，2：已过期）" name="is_flag">
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="43">提交</button>
<button type="reset" class="btn btn-info" rel="43">重置</button>
<button type="submit" class="btn btn-success send" rel="44">提交</button>
<button type="reset" class="btn btn-info" rel="44">重置</button>
</div>
</form>
</div>
... ... @@ -6925,8 +7069,8 @@
<div class="panel-body">
<div class="row">
<div class="col-md-12" style="overflow-x:auto">
<pre id="response_headers43"></pre>
<pre id="response43"></pre>
<pre id="response_headers44"></pre>
<pre id="response44"></pre>
</div>
</div>
</div>
... ... @@ -6941,10 +7085,10 @@
</div>
</div><!-- #sandbox -->
<div class="tab-pane" id="sample43">
<div class="tab-pane" id="sample44">
<div class="row">
<div class="col-md-12">
<pre id="sample_response43">{
<pre id="sample_response44">{
"code": 1,
"msg": "成功",
"time": "1575372162",
... ... @@ -6983,7 +7127,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-12-05 16:45:28 </div>
Generated on 2019-12-05 17:14:02 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...