郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 10ade5620b221c7988b6261fcd7b1df635757677 1 个父辈 7f05612a
1 个管道 的构建 通过 耗费 1 秒

修改精美大片

内嵌 并排对比
正在显示 3 个修改的文件 包含 62 行增加 和 78 行删除
... ... @@ -3,6 +3,7 @@
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<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" />
... ... @@ -16,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="421">
<caret line="540" column="13" lean-forward="true" selection-start-line="540" selection-start-column="13" selection-end-line="540" selection-end-column="13" />
<state relative-caret-position="253">
<caret line="381" column="31" lean-forward="true" selection-start-line="381" selection-start-column="31" selection-end-line="381" selection-end-column="31" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#337#456#0#PHP" expanded="false" />
... ... @@ -33,25 +34,25 @@
<element signature="e#8638#9722#0#PHP" expanded="false" />
<element signature="e#9728#10430#0#PHP" expanded="false" />
<element signature="e#10435#11635#0#PHP" expanded="false" />
<element signature="e#11642#12218#0#PHP" expanded="false" />
<element signature="e#12223#13421#0#PHP" expanded="false" />
<element signature="e#13430#14114#0#PHP" expanded="false" />
<element signature="e#14119#15909#0#PHP" expanded="false" />
<element signature="e#15915#16785#0#PHP" expanded="false" />
<element signature="e#18826#19203#0#PHP" expanded="false" />
<element signature="e#19208#19472#0#PHP" expanded="false" />
<element signature="e#19478#19983#0#PHP" expanded="false" />
<element signature="e#19988#20239#0#PHP" expanded="false" />
<element signature="e#20245#20724#0#PHP" expanded="false" />
<element signature="e#20729#21486#0#PHP" expanded="false" />
<element signature="e#21492#21855#0#PHP" expanded="false" />
<element signature="e#21860#22051#0#PHP" expanded="false" />
<element signature="e#22057#22415#0#PHP" expanded="false" />
<element signature="e#22420#22610#0#PHP" expanded="false" />
<element signature="e#22616#23759#0#PHP" expanded="false" />
<element signature="e#23764#25741#0#PHP" expanded="false" />
<element signature="e#25747#26238#0#PHP" expanded="false" />
<element signature="e#26243#27456#0#PHP" expanded="false" />
<element signature="e#11641#12217#0#PHP" expanded="false" />
<element signature="e#12775#13459#0#PHP" expanded="false" />
<element signature="e#13464#15254#0#PHP" expanded="false" />
<element signature="e#15260#16130#0#PHP" expanded="false" />
<element signature="e#16135#18347#0#PHP" expanded="false" />
<element signature="e#18353#18730#0#PHP" expanded="false" />
<element signature="e#18735#18999#0#PHP" expanded="false" />
<element signature="e#19005#19510#0#PHP" expanded="false" />
<element signature="e#19515#19766#0#PHP" expanded="false" />
<element signature="e#19772#20251#0#PHP" expanded="false" />
<element signature="e#20256#21013#0#PHP" expanded="false" />
<element signature="e#21019#21382#0#PHP" expanded="false" />
<element signature="e#21387#21578#0#PHP" expanded="false" />
<element signature="e#21584#21942#0#PHP" expanded="false" />
<element signature="e#21947#22137#0#PHP" expanded="false" />
<element signature="e#22143#23286#0#PHP" expanded="false" />
<element signature="e#23291#25268#0#PHP" expanded="false" />
<element signature="e#25274#25765#0#PHP" expanded="false" />
<element signature="e#25770#26983#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -131,8 +132,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="279" />
<option name="y" value="10" />
<option name="x" value="837" />
<option name="y" value="76" />
<option name="width" value="1699" />
<option name="height" value="977" />
</component>
... ... @@ -225,7 +226,7 @@
<workItem from="1574141466352" duration="745000" />
<workItem from="1574143209694" duration="3660000" />
<workItem from="1574146994475" duration="23222000" />
<workItem from="1574209189943" duration="25458000" />
<workItem from="1574209189943" duration="25757000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -238,7 +239,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="97033000" />
<option name="totallyTimeSpent" value="97332000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -250,7 +251,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="279" y="10" width="1699" height="977" extended-state="0" />
<frame x="837" y="76" width="1699" height="977" extended-state="0" />
<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.14887126" 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" />
... ... @@ -681,8 +682,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="421">
<caret line="540" column="13" lean-forward="true" selection-start-line="540" selection-start-column="13" selection-end-line="540" selection-end-column="13" />
<state relative-caret-position="253">
<caret line="381" column="31" lean-forward="true" selection-start-line="381" selection-start-column="31" selection-end-line="381" selection-end-column="31" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#337#456#0#PHP" expanded="false" />
... ... @@ -698,25 +699,25 @@
<element signature="e#8638#9722#0#PHP" expanded="false" />
<element signature="e#9728#10430#0#PHP" expanded="false" />
<element signature="e#10435#11635#0#PHP" expanded="false" />
<element signature="e#11642#12218#0#PHP" expanded="false" />
<element signature="e#12223#13421#0#PHP" expanded="false" />
<element signature="e#13430#14114#0#PHP" expanded="false" />
<element signature="e#14119#15909#0#PHP" expanded="false" />
<element signature="e#15915#16785#0#PHP" expanded="false" />
<element signature="e#18826#19203#0#PHP" expanded="false" />
<element signature="e#19208#19472#0#PHP" expanded="false" />
<element signature="e#19478#19983#0#PHP" expanded="false" />
<element signature="e#19988#20239#0#PHP" expanded="false" />
<element signature="e#20245#20724#0#PHP" expanded="false" />
<element signature="e#20729#21486#0#PHP" expanded="false" />
<element signature="e#21492#21855#0#PHP" expanded="false" />
<element signature="e#21860#22051#0#PHP" expanded="false" />
<element signature="e#22057#22415#0#PHP" expanded="false" />
<element signature="e#22420#22610#0#PHP" expanded="false" />
<element signature="e#22616#23759#0#PHP" expanded="false" />
<element signature="e#23764#25741#0#PHP" expanded="false" />
<element signature="e#25747#26238#0#PHP" expanded="false" />
<element signature="e#26243#27456#0#PHP" expanded="false" />
<element signature="e#11641#12217#0#PHP" expanded="false" />
<element signature="e#12775#13459#0#PHP" expanded="false" />
<element signature="e#13464#15254#0#PHP" expanded="false" />
<element signature="e#15260#16130#0#PHP" expanded="false" />
<element signature="e#16135#18347#0#PHP" expanded="false" />
<element signature="e#18353#18730#0#PHP" expanded="false" />
<element signature="e#18735#18999#0#PHP" expanded="false" />
<element signature="e#19005#19510#0#PHP" expanded="false" />
<element signature="e#19515#19766#0#PHP" expanded="false" />
<element signature="e#19772#20251#0#PHP" expanded="false" />
<element signature="e#20256#21013#0#PHP" expanded="false" />
<element signature="e#21019#21382#0#PHP" expanded="false" />
<element signature="e#21387#21578#0#PHP" expanded="false" />
<element signature="e#21584#21942#0#PHP" expanded="false" />
<element signature="e#21947#22137#0#PHP" expanded="false" />
<element signature="e#22143#23286#0#PHP" expanded="false" />
<element signature="e#23291#25268#0#PHP" expanded="false" />
<element signature="e#25274#25765#0#PHP" expanded="false" />
<element signature="e#25770#26983#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -349,7 +349,6 @@ class User extends Api
}
}
/**
* @ApiTitle (精美大片列表)
* @ApiSummary (精美大片列表)
... ... @@ -375,37 +374,18 @@ class User extends Api
$rule = config('verify.path');
$page = $this->request->param('page',1,'intval');
$pageNum = $this->request->param('pageNum',10,'intval');
$type_id = $this->request->post('type_id');
if(empty($type_id)){
$data = Db::name('video')
->field('id,thumbnail,video')
->order('id desc')
->page($page,$pageNum)
->select();
foreach ($data as &$v){
$v['thumbnail'] = $rule.$v['thumbnail'];
$v['video'] = $rule.$v['video'];
}
$this->success('SUCCESS',$data);
}else{
$type = ','.$type_id.',';
$where['type_ids'] = ['like',"%$type%"];
$data = Db::name('video')
->where($where)
->field('id,thumbnail,video')
->order('id desc')
->page($page,$pageNum)
->select();
foreach ($data as &$v){
$v['thumbnail'] = $rule.$v['thumbnail'];
$v['video'] = $rule.$v['video'];
}
$this->success('SUCCESS',$data);
$data = Db::name('wonderful')
->field('id,thumbnail,video')
->order('id desc')
->page($page,$pageNum)
->select();
foreach ($data as &$v){
$v['thumbnail'] = $rule.$v['thumbnail'];
$v['video'] = $rule.$v['video'];
}
}
$this->success('SUCCESS',$data);
}
/**
* @ApiTitle (图片详情)
... ... @@ -528,6 +508,9 @@ class User extends Api
if(empty($data)){
$this->error(['code'=>2,'msg'=>'参数错误']);
}
$data['vip_price'] = $data['price']*0.75;
$data['four_vipprice'] = $data['four_price']*0.75;
$data['eight_vipprice'] = $data['eight_price']*0.75;
$data['thumbnail'] = $rule.$data['thumbnail'];
$data['video'] = $rule.$data['video'];
$data['water_url'] = $rule.$data['water_url'];
... ...
... ... @@ -3274,7 +3274,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-11-20 16:13:29 </div>
Generated on 2019-11-20 16:18:28 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...