郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 187f057c7af6e8a40ad4926ac7986610a794f727 1 个父辈 55acd390
1 个管道 的构建 通过 耗费 1 秒

修改图片详情

内嵌 并排对比
正在显示 2 个修改的文件 包含 42 行增加 和 41 行删除
... ... @@ -2,11 +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$/application/admin/view/pic/add.html" afterPath="$PROJECT_DIR$/application/admin/view/pic/add.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/pic/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/pic/edit.html" />
<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" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/pic.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -20,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="261">
<caret line="416" column="0" lean-forward="true" selection-start-line="416" selection-start-column="0" selection-end-line="416" selection-end-column="0" />
<state relative-caret-position="561">
<caret line="413" column="13" lean-forward="false" selection-start-line="413" selection-start-column="13" selection-end-line="413" selection-end-column="13" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#337#456#0#PHP" expanded="false" />
... ... @@ -38,19 +35,18 @@
<element signature="e#9728#10430#0#PHP" expanded="false" />
<element signature="e#10435#11635#0#PHP" expanded="false" />
<element signature="e#11641#12325#0#PHP" expanded="false" />
<element signature="e#12330#13918#0#PHP" expanded="false" />
<element signature="e#13924#14794#0#PHP" expanded="false" />
<element signature="e#14799#16612#0#PHP" expanded="false" />
<element signature="e#16618#16995#0#PHP" expanded="false" />
<element signature="e#17000#17264#0#PHP" expanded="false" />
<element signature="e#17270#17775#0#PHP" expanded="false" />
<element signature="e#17780#18031#0#PHP" expanded="false" />
<element signature="e#18037#18516#0#PHP" expanded="false" />
<element signature="e#18521#19278#0#PHP" expanded="false" />
<element signature="e#19284#19647#0#PHP" expanded="false" />
<element signature="e#19652#19843#0#PHP" expanded="false" />
<element signature="e#19849#20207#0#PHP" expanded="false" />
<element signature="e#20212#20402#0#PHP" expanded="false" />
<element signature="e#14126#14996#0#PHP" expanded="false" />
<element signature="e#15001#16814#0#PHP" expanded="false" />
<element signature="e#16820#17197#0#PHP" expanded="false" />
<element signature="e#17202#17466#0#PHP" expanded="false" />
<element signature="e#17472#17977#0#PHP" expanded="false" />
<element signature="e#17982#18233#0#PHP" expanded="false" />
<element signature="e#18239#18718#0#PHP" expanded="false" />
<element signature="e#18723#19480#0#PHP" expanded="false" />
<element signature="e#19486#19849#0#PHP" expanded="false" />
<element signature="e#19854#20045#0#PHP" expanded="false" />
<element signature="e#20051#20409#0#PHP" expanded="false" />
<element signature="e#20414#20604#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -108,10 +104,10 @@
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
<option value="$PROJECT_DIR$/application/admin/view/vip/index.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/vip.js" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/admin/view/pic/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/pic/edit.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
</list>
</option>
</component>
... ... @@ -129,9 +125,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="119" />
<option name="y" value="67" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="20" />
<option name="y" value="76" />
<option name="width" value="1883" />
<option name="height" value="946" />
</component>
... ... @@ -224,7 +220,7 @@
<workItem from="1574141466352" duration="745000" />
<workItem from="1574143209694" duration="3660000" />
<workItem from="1574146994475" duration="23222000" />
<workItem from="1574209189943" duration="15001000" />
<workItem from="1574209189943" duration="15167000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -237,7 +233,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="86576000" />
<option name="totallyTimeSpent" value="86742000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -249,7 +245,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="119" y="67" width="1883" height="946" extended-state="0" />
<frame x="20" y="76" width="1883" height="946" extended-state="1" />
<editor active="true" />
<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.15743281" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
... ... @@ -681,8 +677,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="261">
<caret line="416" column="0" lean-forward="true" selection-start-line="416" selection-start-column="0" selection-end-line="416" selection-end-column="0" />
<state relative-caret-position="561">
<caret line="413" column="13" lean-forward="false" selection-start-line="413" selection-start-column="13" selection-end-line="413" selection-end-column="13" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#337#456#0#PHP" expanded="false" />
... ... @@ -699,19 +695,18 @@
<element signature="e#9728#10430#0#PHP" expanded="false" />
<element signature="e#10435#11635#0#PHP" expanded="false" />
<element signature="e#11641#12325#0#PHP" expanded="false" />
<element signature="e#12330#13918#0#PHP" expanded="false" />
<element signature="e#13924#14794#0#PHP" expanded="false" />
<element signature="e#14799#16612#0#PHP" expanded="false" />
<element signature="e#16618#16995#0#PHP" expanded="false" />
<element signature="e#17000#17264#0#PHP" expanded="false" />
<element signature="e#17270#17775#0#PHP" expanded="false" />
<element signature="e#17780#18031#0#PHP" expanded="false" />
<element signature="e#18037#18516#0#PHP" expanded="false" />
<element signature="e#18521#19278#0#PHP" expanded="false" />
<element signature="e#19284#19647#0#PHP" expanded="false" />
<element signature="e#19652#19843#0#PHP" expanded="false" />
<element signature="e#19849#20207#0#PHP" expanded="false" />
<element signature="e#20212#20402#0#PHP" expanded="false" />
<element signature="e#14126#14996#0#PHP" expanded="false" />
<element signature="e#15001#16814#0#PHP" expanded="false" />
<element signature="e#16820#17197#0#PHP" expanded="false" />
<element signature="e#17202#17466#0#PHP" expanded="false" />
<element signature="e#17472#17977#0#PHP" expanded="false" />
<element signature="e#17982#18233#0#PHP" expanded="false" />
<element signature="e#18239#18718#0#PHP" expanded="false" />
<element signature="e#18723#19480#0#PHP" expanded="false" />
<element signature="e#19486#19849#0#PHP" expanded="false" />
<element signature="e#19854#20045#0#PHP" expanded="false" />
<element signature="e#20051#20409#0#PHP" expanded="false" />
<element signature="e#20414#20604#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -391,6 +391,9 @@ class User extends Api
->field('id,title,thumbnail,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['thumbnail'] = $rule.$data['thumbnail'];
$data['water_url'] = $rule.$data['water_url'];
... ... @@ -406,6 +409,9 @@ class User extends Api
->field('id,title,thumbnail,price,water_url,content')
->where('id',$pic_id)
->find();
if(empty($data)){
$this->error(['code'=>2,'msg'=>'参数错误']);
}
$data['is_vip'] = 1;
$data['vip_price'] = $data['price'] * 0.75;
$data['thumbnail'] = $rule.$data['thumbnail'];
... ...