郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 b4bb305e03436afd5f83d67375a0dd61c160c3be 1 个父辈 4f31ab0b
1 个管道 的构建 通过 耗费 7 秒

修改我的订单

内嵌 并排对比
正在显示 3 个修改的文件 包含 471 行增加 和 247 行删除
... ... @@ -2,8 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -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="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" />
<state relative-caret-position="-3">
<caret line="1201" column="14" lean-forward="true" selection-start-line="1201" selection-start-column="14" selection-end-line="1201" selection-end-column="14" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#365#484#0#PHP" expanded="false" />
... ... @@ -54,6 +54,7 @@
<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#29056#0#PHP" expanded="false" />
<element signature="e#29062#29475#0#PHP" expanded="false" />
<element signature="e#29480#29959#0#PHP" expanded="false" />
... ... @@ -62,14 +63,15 @@
<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" />
<element signature="e#34121#35196#0#PHP" expanded="false" />
<element signature="e#35222#36053#0#PHP" expanded="false" />
<element signature="e#36059#36479#0#PHP" expanded="false" />
<element signature="e#36484#36967#0#PHP" expanded="false" />
<element signature="e#36973#37779#0#PHP" expanded="false" />
<element signature="e#40953#42313#0#PHP" expanded="false" />
<element signature="e#42329#43388#0#PHP" expanded="false" />
<element signature="e#43395#44153#0#PHP" expanded="false" />
<element signature="e#44158#46422#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -78,7 +80,7 @@
<file leaf-file-name="Pay.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="59">
<state relative-caret-position="625">
<caret line="247" column="31" lean-forward="false" selection-start-line="247" selection-start-column="31" selection-end-line="247" selection-end-column="31" />
<folding>
<element signature="e#450#569#0#PHP" expanded="false" />
... ... @@ -173,10 +175,10 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="93" />
<option name="y" value="61" />
<option name="width" value="1699" />
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="104" />
<option name="y" value="-15" />
<option name="width" value="1806" />
<option name="height" value="1009" />
</component>
<component name="ProjectView">
... ... @@ -229,7 +231,7 @@
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../scrap1/scrap" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../project/competition" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
... ... @@ -272,7 +274,8 @@
<workItem from="1574252363848" duration="8841000" />
<workItem from="1574295812843" duration="20536000" />
<workItem from="1574336957891" duration="1350000" />
<workItem from="1574382087071" duration="14575000" />
<workItem from="1574382087071" duration="22007000" />
<workItem from="1574410294356" duration="5166000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -285,7 +288,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="154515000" />
<option name="totallyTimeSpent" value="167113000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -297,16 +300,16 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="93" y="61" width="1699" height="1009" 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.1561928" 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.14220184" 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.14145811" 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" />
... ... @@ -525,7 +528,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297">
<caret line="25" column="6" lean-forward="false" selection-start-line="25" selection-start-column="6" selection-end-line="25" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
... ... @@ -533,7 +535,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="411">
<caret line="28" column="9" lean-forward="false" selection-start-line="28" selection-start-column="9" selection-end-line="28" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
... ... @@ -541,7 +542,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="261">
<caret line="25" column="58" lean-forward="false" selection-start-line="25" selection-start-column="58" selection-end-line="25" selection-end-column="58" />
<folding />
</state>
</provider>
</entry>
... ... @@ -680,7 +680,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="59">
<state relative-caret-position="625">
<caret line="247" column="31" lean-forward="false" selection-start-line="247" selection-start-column="31" selection-end-line="247" selection-end-column="31" />
<folding>
<element signature="e#450#569#0#PHP" expanded="false" />
... ... @@ -703,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="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" />
<state relative-caret-position="-3">
<caret line="1201" column="14" lean-forward="true" selection-start-line="1201" selection-start-column="14" selection-end-line="1201" selection-end-column="14" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#365#484#0#PHP" expanded="false" />
... ... @@ -740,6 +740,7 @@
<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#29056#0#PHP" expanded="false" />
<element signature="e#29062#29475#0#PHP" expanded="false" />
<element signature="e#29480#29959#0#PHP" expanded="false" />
... ... @@ -748,14 +749,15 @@
<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" />
<element signature="e#34121#35196#0#PHP" expanded="false" />
<element signature="e#35222#36053#0#PHP" expanded="false" />
<element signature="e#36059#36479#0#PHP" expanded="false" />
<element signature="e#36484#36967#0#PHP" expanded="false" />
<element signature="e#36973#37779#0#PHP" expanded="false" />
<element signature="e#40953#42313#0#PHP" expanded="false" />
<element signature="e#42329#43388#0#PHP" expanded="false" />
<element signature="e#43395#44153#0#PHP" expanded="false" />
<element signature="e#44158#46422#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -1052,7 +1052,6 @@ class User extends Api
}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')
... ... @@ -1159,103 +1158,140 @@ class User extends Api
$user_id = $this->uid;
$page = $this->request->param('page',1,'intval');
$pageNum = $this->request->param('pageNum',10,'intval');
$rule = config('verify.path');
$type = $this->request->param('type');
$res = Db::name('user')
->where('id',$user_id)
->field('id,is_vip')
->find();
//确认为会员
if($res['is_vip'] == 1){
//判断状态
if(empty($type)){
//全部
$res = Db::name('order')
->where('user_id',$user_id)
->field('id,pic_id,video_id,status,total')
->order('createtime desc,id desc')
->page($page,$pageNum)
->select();
$res = $this->fetch($res);
$this->success('SUCCESS',$res);
}elseif ($type == 1){
//待支付
$res = Db::name('order')
->where('user_id',$user_id)
->where('status',1)
->field('id,pic_id,video_id,status,total')
->order('createtime desc,id desc')
->page($page,$pageNum)
->select();
$res = $this->fetch($res);
$this->success('SUCCESS',$res);
}else{
//已完成
$res = Db::name('order')
->where('user_id',$user_id)
->where('status',2)
->field('id,pic_id,video_id,status,total')
->order('createtime desc,id desc')
->page($page,$pageNum)
->select();
$res = $this->fetch($res);
$this->success('SUCCESS',$res);
}
}else{
//不是会员的状态
//判断状态
if(empty($type)){
$res = Db::name('order')
->where('user_id',$user_id)
->field('id,pic_id,video_id,status,total')
->order('createtime desc,id desc')
->page($page,$pageNum)
->select();
$res = $this->fetch1($res);
$this->success('SUCCESS',$res);
}elseif ($type == 1){
$res = Db::name('order')
->where('user_id',$user_id)
->where('status',1)
->field('id,pic_id,video_id,status,total')
->order('createtime desc,id desc')
->page($page,$pageNum)
->select();
$res = $this->fetch1($res);
$this->success('SUCCESS',$res);
}else{
$res = Db::name('order')
->where('user_id',$user_id)
->where('status',2)
->field('id,pic_id,video_id,status,total')
->order('createtime desc,id desc')
->page($page,$pageNum)
->select();
$res = $this->fetch1($res);
$this->success('SUCCESS',$res);
}
}
}
//判断状态
if(empty($type)){
$res = Db::name('order')
->where('user_id',$user_id)
->field('id,pic_id,video_id,status,total')
->order('createtime desc,id desc')
->page($page,$pageNum)
->select();
foreach ($res 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['thumbnail'] = $rule.$v1['thumbnail'];
$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['thumbnail'] = $rule.$v2['thumbnail'];
$v2['video'] = $rule.$v2['video'];
$v2['vipprice'] = $v2['price']*0.75;
$v2['four_vipprice'] = $v2['four_price'] * 0.75;
$v2['eight_vipprice'] = $v2['eight_price'] * 0.75;
}
//会员
public function fetch($res)
{
$rule = config('verify.path');
foreach ($res 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['thumbnail'] = $rule.$v1['thumbnail'];
$v1['vipprice'] = $v1['price']*0.75;
}
}
$this->success('SUCCESS',$res);
}elseif ($type == 1){
$res = Db::name('order')
->where('user_id',$user_id)
->where('status',1)
->field('id,pic_id,video_id,status,total')
->order('createtime desc,id desc')
->page($page,$pageNum)
->select();
foreach ($res 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['thumbnail'] = $rule.$v1['thumbnail'];
$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['thumbnail'] = $rule.$v2['thumbnail'];
$v2['video'] = $rule.$v2['video'];
$v2['vipprice'] = $v2['price']*0.75;
$v2['four_vipprice'] = $v2['four_price'] * 0.75;
$v2['eight_vipprice'] = $v2['eight_price'] * 0.75;
}
if(!empty($v['video_id'])){
$v['video_id'] = unserialize($v['video_id']);
foreach ($v['video_id'] as &$v2){
$v2['info'] = Db::name('video')->field('keyword,type_ids,content,is_recommend,buy_num,click_num,createtime,updatetime',true)->where('id',$v2['id'])->find();
$v2['info']['attr'] = $v2['attr'];
unset($v2['attr']);
unset($v['id']);
$v2['info']['thumbnail'] = $rule.$v2['info']['thumbnail'];
$v2['info']['vipprice'] = $v2['info']['price']*0.75;
$v2['info']['four_vipprice'] = $v2['info']['four_price'] * 0.75;
$v2['info']['eight_vipprice'] = $v2['info']['eight_price'] * 0.75;
}
}
$this->success('SUCCESS',$res);
}else{
$res = Db::name('order')
->where('user_id',$user_id)
->where('status',2)
->field('id,pic_id,video_id,status,total')
->order('createtime desc,id desc')
->page($page,$pageNum)
->select();
foreach ($res 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['thumbnail'] = $rule.$v1['thumbnail'];
$v1['vipprice'] = $v1['price']*0.75;
}
}
return $res;
}
//非会员
public function fetch1($res)
{
$rule = config('verify.path');
foreach ($res 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['thumbnail'] = $rule.$v1['thumbnail'];
}
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['thumbnail'] = $rule.$v2['thumbnail'];
$v2['video'] = $rule.$v2['video'];
$v2['vipprice'] = $v2['price']*0.75;
$v2['four_vipprice'] = $v2['four_price'] * 0.75;
$v2['eight_vipprice'] = $v2['eight_price'] * 0.75;
}
}
if(!empty($v['video_id'])){
$v['video_id'] = unserialize($v['video_id']);
foreach ($v['video_id'] as &$v2){
$v2['info'] = Db::name('video')->field('keyword,type_ids,content,is_recommend,buy_num,click_num,createtime,updatetime',true)->where('id',$v2['id'])->find();
$v2['info']['attr'] = $v2['attr'];
unset($v2['attr']);
unset($v['id']);
$v2['info']['thumbnail'] = $rule.$v2['info']['thumbnail'];
}
}
$this->success('SUCCESS',$res);
}
return $res;
}
/**
* @ApiTitle (消费记录)
* @ApiSummary (消费记录)
... ...
... ... @@ -164,7 +164,9 @@
<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="26" 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>
<a href="javascript:;" data-id="35" class="list-group-item">删除订单</a>
<a href="javascript:;" data-id="34" class="list-group-item"></a>
... ... @@ -174,9 +176,9 @@
<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="28" class="list-group-item">购物车列表</a>
<a href="javascript:;" data-id="27" class="list-group-item">会员须知</a>
<a href="javascript:;" data-id="25" 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>
<a href="javascript:;" data-id="22" class="list-group-item">历史记录</a>
... ... @@ -187,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="37" class="list-group-item">消费记录</a>
<a href="javascript:;" data-id="39" class="list-group-item">消费记录</a>
</div>
</div>
</div>
... ... @@ -1798,28 +1800,28 @@
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="heading-26">
<div class="panel-heading" id="heading-27">
<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="#accordion27" href="#collapseOne27"> 会员须知 <span class="text-muted">/api/user/vipdetail</span></a>
</h4>
</div>
<div id="collapseOne26" class="panel-collapse collapse">
<div id="collapseOne27" 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="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="info26">
<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">
... ... @@ -1856,7 +1858,7 @@
</div>
</div><!-- #info -->
<div class="tab-pane" id="sandbox26">
<div class="tab-pane" id="sandbox27">
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
... ... @@ -1873,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/vipdesc" method="POST" name="form26" id="form26">
<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="26">提交</button>
<button type="reset" class="btn btn-info" rel="26">重置</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>
... ... @@ -1889,8 +1891,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_headers27"></pre>
<pre id="response27"></pre>
</div>
</div>
</div>
... ... @@ -1905,15 +1907,15 @@
</div>
</div><!-- #sandbox -->
<div class="tab-pane" id="sample26">
<div class="tab-pane" id="sample27">
<div class="row">
<div class="col-md-12">
<pre id="sample_response26">{
<pre id="sample_response27">{
"code": 1,
"msg": "成功",
"time": "1571492001",
"data": {
"content": //会员介绍内容
"text": //会员须知内容
}
}</pre>
</div>
... ... @@ -1925,6 +1927,190 @@
</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>
<a data-toggle="collapse" data-parent="#accordion38" href="#collapseOne38"> <span class="text-muted">/api/user/fetch1</span></a>
</h4>
</div>
<div id="collapseOne38" 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>
<!-- Tab panes -->
<div class="tab-content">
<div class="tab-pane active" id="info38">
<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="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/fetch1" method="get" name="form38" id="form38">
<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>
</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_headers38"></pre>
<pre id="response38"></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="sample38">
<div class="row">
<div class="col-md-12">
<pre id="sample_response38">无</pre>
</div>
</div>
</div><!-- #sample -->
</div><!-- .tab-content -->
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="heading-37">
<h4 class="panel-title">
<span class="label label-success">GET</span>
<a data-toggle="collapse" data-parent="#accordion37" href="#collapseOne37"> <span class="text-muted">/api/user/fetch</span></a>
</h4>
</div>
<div id="collapseOne37" 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>
<!-- Tab panes -->
<div class="tab-content">
<div class="tab-pane active" id="info37">
<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="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/user/fetch" method="get" name="form37" id="form37">
<div class="form-group">
无
</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>
</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_headers37"></pre>
<pre id="response37"></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="sample37">
<div class="row">
<div class="col-md-12">
<pre id="sample_response37">无</pre>
</div>
</div>
</div><!-- #sample -->
</div><!-- .tab-content -->
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="heading-36">
<h4 class="panel-title">
<span class="label label-primary">POST</span>
... ... @@ -3267,28 +3453,28 @@
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="heading-27">
<div class="panel-heading" id="heading-26">
<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="#accordion26" href="#collapseOne26"> 会员介绍 <span class="text-muted">/api/user/vipdesc</span></a>
</h4>
</div>
<div id="collapseOne27" class="panel-collapse collapse">
<div id="collapseOne26" 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="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="info27">
<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">
... ... @@ -3325,7 +3511,7 @@
</div>
</div><!-- #info -->
<div class="tab-pane" id="sandbox27">
<div class="tab-pane" id="sandbox26">
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
... ... @@ -3342,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/vipdetail" method="POST" name="form27" id="form27">
<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="27">提交</button>
<button type="reset" class="btn btn-info" rel="27">重置</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>
... ... @@ -3358,8 +3544,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_headers26"></pre>
<pre id="response26"></pre>
</div>
</div>
</div>
... ... @@ -3374,15 +3560,15 @@
</div>
</div><!-- #sandbox -->
<div class="tab-pane" id="sample27">
<div class="tab-pane" id="sample26">
<div class="row">
<div class="col-md-12">
<pre id="sample_response27">{
<pre id="sample_response26">{
"code": 1,
"msg": "成功",
"time": "1571492001",
"data": {
"text": //会员须知内容
"content": //会员介绍内容
}
}</pre>
</div>
... ... @@ -3394,28 +3580,28 @@
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="heading-25">
<div class="panel-heading" id="heading-14">
<h4 class="panel-title">
<span class="label label-primary">POST</span>
<a data-toggle="collapse" data-parent="#accordion25" href="#collapseOne25"> 创建开通会员订单 <span class="text-muted">/api/user/viporder</span></a>
<a data-toggle="collapse" data-parent="#accordion14" href="#collapseOne14"> 首页视频、图片、精美大片入口 <span class="text-muted">/api/user/index</span></a>
</h4>
</div>
<div id="collapseOne25" class="panel-collapse collapse">
<div id="collapseOne14" class="panel-collapse collapse">
<div class="panel-body">
<!-- Nav tabs -->
<ul class="nav nav-tabs" id="doctab25">
<li class="active"><a href="#info25" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox25" data-toggle="tab">在线测试</a></li>
<li><a href="#sample25" 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="info25">
<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">
... ... @@ -3442,24 +3628,7 @@
<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>total</td>
<td>float</td>
<td>是</td>
<td>金额</td>
</tr>
</tbody>
</table>
无
</div>
</div>
<div class="panel panel-default">
... ... @@ -3469,7 +3638,7 @@
</div>
</div><!-- #info -->
<div class="tab-pane" id="sandbox25">
<div class="tab-pane" id="sandbox14">
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
... ... @@ -3486,14 +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/viporder" method="POST" name="form25" id="form25">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/index" method="POST" name="form14" id="form14">
<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">
无
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="25">提交</button>
<button type="reset" class="btn btn-info" rel="25">重置</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>
... ... @@ -3503,8 +3671,8 @@
<div class="panel-body">
<div class="row">
<div class="col-md-12" style="overflow-x:auto">
<pre id="response_headers25"></pre>
<pre id="response25"></pre>
<pre id="response_headers14"></pre>
<pre id="response14"></pre>
</div>
</div>
</div>
... ... @@ -3519,17 +3687,19 @@
</div>
</div><!-- #sandbox -->
<div class="tab-pane" id="sample25">
<div class="tab-pane" id="sample14">
<div class="row">
<div class="col-md-12">
<pre id="sample_response25">{
"code": 1,
"msg": "成功",
"time": "1571492001",
<pre id="sample_response14">{
'code':'1',
'msg':'返回成功',
"time": "1571492001",
"data": {
"order_id"://订单ID
"video_thumbnail": http://mapwww.baidu.com 视频封面图地址
"pic_thumbnail": http://mapwww.baidu.com 图片地址
"wonderful_thumbnail": http://mapwww.baidu.com 精美大片地址
}
}</pre>
}</pre>
</div>
</div>
</div><!-- #sample -->
... ... @@ -3539,28 +3709,28 @@
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="heading-14">
<div class="panel-heading" id="heading-25">
<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="#accordion25" href="#collapseOne25"> 创建开通会员订单 <span class="text-muted">/api/user/viporder</span></a>
</h4>
</div>
<div id="collapseOne14" class="panel-collapse collapse">
<div id="collapseOne25" 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="doctab25">
<li class="active"><a href="#info25" data-toggle="tab">基础信息</a></li>
<li><a href="#sandbox25" data-toggle="tab">在线测试</a></li>
<li><a href="#sample25" 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="info25">
<div class="well">
首页视频、图片、精美大片入口 </div>
创建开通会员订单 </div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Headers</strong></div>
<div class="panel-body">
... ... @@ -3587,7 +3757,24 @@
<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>total</td>
<td>float</td>
<td>是</td>
<td>金额</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="panel panel-default">
... ... @@ -3597,7 +3784,7 @@
</div>
</div><!-- #info -->
<div class="tab-pane" id="sandbox14">
<div class="tab-pane" id="sandbox25">
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
... ... @@ -3614,13 +3801,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/index" method="POST" name="form14" id="form14">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/user/viporder" method="POST" name="form25" id="form25">
<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">
</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="25">提交</button>
<button type="reset" class="btn btn-info" rel="25">重置</button>
</div>
</form>
</div>
... ... @@ -3630,8 +3818,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_headers25"></pre>
<pre id="response25"></pre>
</div>
</div>
</div>
... ... @@ -3646,19 +3834,17 @@
</div>
</div><!-- #sandbox -->
<div class="tab-pane" id="sample14">
<div class="tab-pane" id="sample25">
<div class="row">
<div class="col-md-12">
<pre id="sample_response14">{
'code':'1',
'msg':'返回成功',
"time": "1571492001",
<pre id="sample_response25">{
"code": 1,
"msg": "成功",
"time": "1571492001",
"data": {
"video_thumbnail": http://mapwww.baidu.com 视频封面图地址
"pic_thumbnail": http://mapwww.baidu.com 图片地址
"wonderful_thumbnail": http://mapwww.baidu.com 精美大片地址
"order_id"://订单ID
}
}</pre>
}</pre>
</div>
</div>
</div><!-- #sample -->
... ... @@ -5176,26 +5362,26 @@
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" id="heading-37">
<div class="panel-heading" id="heading-39">
<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/payhistory</span></a>
<a data-toggle="collapse" data-parent="#accordion39" href="#collapseOne39"> 消费记录 <span class="text-muted">/api/user/payhistory</span></a>
</h4>
</div>
<div id="collapseOne37" class="panel-collapse collapse">
<div id="collapseOne39" 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="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="info37">
<div class="tab-pane active" id="info39">
<div class="well">
消费记录 </div>
<div class="panel panel-default">
... ... @@ -5257,7 +5443,7 @@
</div>
</div><!-- #info -->
<div class="tab-pane" id="sandbox37">
<div class="tab-pane" id="sandbox39">
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
... ... @@ -5274,7 +5460,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="form37" id="form37">
<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">
... ... @@ -5284,8 +5470,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="37">提交</button>
<button type="reset" class="btn btn-info" rel="37">重置</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>
... ... @@ -5295,8 +5481,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_headers39"></pre>
<pre id="response39"></pre>
</div>
</div>
</div>
... ... @@ -5311,10 +5497,10 @@
</div>
</div><!-- #sandbox -->
<div class="tab-pane" id="sample37">
<div class="tab-pane" id="sample39">
<div class="row">
<div class="col-md-12">
<pre id="sample_response37">{
<pre id="sample_response39">{
"code": 1,
"msg": "成功",
"time": "1571492001",
... ... @@ -5343,7 +5529,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-11-22 13:40:12 </div>
Generated on 2019-11-22 17:41:19 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...