郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 057d571627fe68a66440f4c249f6c462f1d73193 1 个父辈 9ac3ded0
1 个管道 的构建 通过 耗费 0 秒

视频详情

内嵌 并排对比
正在显示 3 个修改的文件 包含 43 行增加 和 37 行删除
... ... @@ -16,8 +16,8 @@
<file leaf-file-name="User.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="479" column="52" lean-forward="false" selection-start-line="479" selection-start-column="52" selection-end-line="479" selection-end-column="52" />
<state relative-caret-position="450">
<caret line="492" column="13" lean-forward="false" selection-start-line="492" selection-start-column="13" selection-end-line="492" selection-end-column="13" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#337#456#0#PHP" expanded="false" />
... ... @@ -36,20 +36,20 @@
<element signature="e#11641#12325#0#PHP" expanded="false" />
<element signature="e#12330#14120#0#PHP" expanded="false" />
<element signature="e#14126#14996#0#PHP" expanded="false" />
<element signature="e#16822#17199#0#PHP" expanded="false" />
<element signature="e#17204#17468#0#PHP" expanded="false" />
<element signature="e#17474#17979#0#PHP" expanded="false" />
<element signature="e#17984#18235#0#PHP" expanded="false" />
<element signature="e#18241#18720#0#PHP" expanded="false" />
<element signature="e#18725#19482#0#PHP" expanded="false" />
<element signature="e#19488#19851#0#PHP" expanded="false" />
<element signature="e#19856#20047#0#PHP" expanded="false" />
<element signature="e#20053#20411#0#PHP" expanded="false" />
<element signature="e#20416#20606#0#PHP" expanded="false" />
<element signature="e#20612#21755#0#PHP" expanded="false" />
<element signature="e#21760#23737#0#PHP" expanded="false" />
<element signature="e#23743#24234#0#PHP" expanded="false" />
<element signature="e#24239#24987#0#PHP" expanded="false" />
<element signature="e#17024#17401#0#PHP" expanded="false" />
<element signature="e#17406#17670#0#PHP" expanded="false" />
<element signature="e#17676#18181#0#PHP" expanded="false" />
<element signature="e#18186#18437#0#PHP" expanded="false" />
<element signature="e#18443#18922#0#PHP" expanded="false" />
<element signature="e#18927#19684#0#PHP" expanded="false" />
<element signature="e#19690#20053#0#PHP" expanded="false" />
<element signature="e#20058#20249#0#PHP" expanded="false" />
<element signature="e#20255#20613#0#PHP" expanded="false" />
<element signature="e#20618#20808#0#PHP" expanded="false" />
<element signature="e#20814#21957#0#PHP" expanded="false" />
<element signature="e#21962#23939#0#PHP" expanded="false" />
<element signature="e#23945#24436#0#PHP" expanded="false" />
<element signature="e#24441#25189#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -128,7 +128,7 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<component name="ProjectFrameBounds">
<option name="x" value="293" />
<option name="y" value="97" />
<option name="width" value="1614" />
... ... @@ -223,7 +223,7 @@
<workItem from="1574141466352" duration="745000" />
<workItem from="1574143209694" duration="3660000" />
<workItem from="1574146994475" duration="23222000" />
<workItem from="1574209189943" duration="21992000" />
<workItem from="1574209189943" duration="22091000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -236,7 +236,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="93567000" />
<option name="totallyTimeSpent" value="93666000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -248,7 +248,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="293" y="97" width="1614" height="977" extended-state="1" />
<frame x="293" y="97" width="1614" 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.15701416" 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" />
... ... @@ -679,8 +679,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="479" column="52" lean-forward="false" selection-start-line="479" selection-start-column="52" selection-end-line="479" selection-end-column="52" />
<state relative-caret-position="450">
<caret line="492" column="13" lean-forward="false" selection-start-line="492" selection-start-column="13" selection-end-line="492" selection-end-column="13" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#337#456#0#PHP" expanded="false" />
... ... @@ -699,20 +699,20 @@
<element signature="e#11641#12325#0#PHP" expanded="false" />
<element signature="e#12330#14120#0#PHP" expanded="false" />
<element signature="e#14126#14996#0#PHP" expanded="false" />
<element signature="e#16822#17199#0#PHP" expanded="false" />
<element signature="e#17204#17468#0#PHP" expanded="false" />
<element signature="e#17474#17979#0#PHP" expanded="false" />
<element signature="e#17984#18235#0#PHP" expanded="false" />
<element signature="e#18241#18720#0#PHP" expanded="false" />
<element signature="e#18725#19482#0#PHP" expanded="false" />
<element signature="e#19488#19851#0#PHP" expanded="false" />
<element signature="e#19856#20047#0#PHP" expanded="false" />
<element signature="e#20053#20411#0#PHP" expanded="false" />
<element signature="e#20416#20606#0#PHP" expanded="false" />
<element signature="e#20612#21755#0#PHP" expanded="false" />
<element signature="e#21760#23737#0#PHP" expanded="false" />
<element signature="e#23743#24234#0#PHP" expanded="false" />
<element signature="e#24239#24987#0#PHP" expanded="false" />
<element signature="e#17024#17401#0#PHP" expanded="false" />
<element signature="e#17406#17670#0#PHP" expanded="false" />
<element signature="e#17676#18181#0#PHP" expanded="false" />
<element signature="e#18186#18437#0#PHP" expanded="false" />
<element signature="e#18443#18922#0#PHP" expanded="false" />
<element signature="e#18927#19684#0#PHP" expanded="false" />
<element signature="e#19690#20053#0#PHP" expanded="false" />
<element signature="e#20058#20249#0#PHP" expanded="false" />
<element signature="e#20255#20613#0#PHP" expanded="false" />
<element signature="e#20618#20808#0#PHP" expanded="false" />
<element signature="e#20814#21957#0#PHP" expanded="false" />
<element signature="e#21962#23939#0#PHP" expanded="false" />
<element signature="e#23945#24436#0#PHP" expanded="false" />
<element signature="e#24441#25189#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -467,6 +467,9 @@ class User extends Api
->field('id,title,thumbnail,video,price,four_price,eight_price,water_url,content')
->where('id',$pic_id)
->find();
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;
... ... @@ -485,6 +488,9 @@ class User extends Api
->field('id,title,thumbnail,video,price,vip_price,water_url,content')
->where('id',$pic_id)
->find();
if(empty($data)){
$this->error(['code'=>2,'msg'=>'参数错误']);
}
$data['is_vip'] = 1;
$data['thumbnail'] = $rule.$data['thumbnail'];
$data['video'] = $rule.$data['video'];
... ...
... ... @@ -3116,7 +3116,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-11-20 15:15:40 </div>
Generated on 2019-11-20 15:17:18 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...