郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 16443590db590b22496b1176da2865159cc1d4c9 1 个父辈 ae32235f
1 个管道 的构建 通过 耗费 1 秒

修改授权书图片

内嵌 并排对比
正在显示 3 个修改的文件 包含 98 行增加 和 104 行删除
... ... @@ -2,8 +2,6 @@
<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/admin/view/pic/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/pic/edit.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -18,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="275">
<caret line="563" column="0" lean-forward="true" selection-start-line="563" selection-start-column="0" selection-end-line="563" selection-end-column="0" />
<state relative-caret-position="503">
<caret line="646" column="61" lean-forward="true" selection-start-line="646" selection-start-column="61" selection-end-line="646" selection-end-column="61" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -42,50 +40,48 @@
<element signature="e#14758#15334#0#PHP" expanded="false" />
<element signature="e#15339#15900#0#PHP" expanded="false" />
<element signature="e#15906#16622#0#PHP" expanded="false" />
<element signature="e#16627#19041#0#PHP" expanded="false" />
<element signature="e#19047#19949#0#PHP" expanded="false" />
<element signature="e#19954#22768#0#PHP" expanded="false" />
<element signature="e#22774#23151#0#PHP" expanded="false" />
<element signature="e#23156#23477#0#PHP" expanded="false" />
<element signature="e#23483#23988#0#PHP" expanded="false" />
<element signature="e#23993#24244#0#PHP" expanded="false" />
<element signature="e#24250#24729#0#PHP" expanded="false" />
<element signature="e#24734#25491#0#PHP" expanded="false" />
<element signature="e#25497#25978#0#PHP" expanded="false" />
<element signature="e#25983#26753#0#PHP" expanded="false" />
<element signature="e#26759#27122#0#PHP" expanded="false" />
<element signature="e#27127#27318#0#PHP" expanded="false" />
<element signature="e#27324#27682#0#PHP" expanded="false" />
<element signature="e#27687#27878#0#PHP" expanded="false" />
<element signature="e#27884#29027#0#PHP" expanded="false" />
<element signature="e#29032#31697#0#PHP" expanded="false" />
<element signature="e#31703#32201#0#PHP" expanded="false" />
<element signature="e#32206#33952#0#PHP" expanded="false" />
<element signature="e#33958#34371#0#PHP" expanded="false" />
<element signature="e#34376#34855#0#PHP" expanded="false" />
<element signature="e#34861#35395#0#PHP" expanded="false" />
<element signature="e#35400#36785#0#PHP" expanded="false" />
<element signature="e#36791#37445#0#PHP" expanded="false" />
<element signature="e#37450#39465#0#PHP" expanded="false" />
<element signature="e#39471#40231#0#PHP" expanded="false" />
<element signature="e#40236#42945#0#PHP" expanded="false" />
<element signature="e#42971#43802#0#PHP" expanded="false" />
<element signature="e#43808#44228#0#PHP" expanded="false" />
<element signature="e#44233#44716#0#PHP" expanded="false" />
<element signature="e#44722#45528#0#PHP" expanded="false" />
<element signature="e#45533#48687#0#PHP" expanded="false" />
<element signature="e#48702#50030#0#PHP" expanded="false" />
<element signature="e#50046#51073#0#PHP" expanded="false" />
<element signature="e#51079#51837#0#PHP" expanded="false" />
<element signature="e#51842#55585#0#PHP" expanded="false" />
<element signature="e#55591#55983#0#PHP" expanded="false" />
<element signature="e#55988#56940#0#PHP" expanded="false" />
<element signature="e#56964#57537#0#PHP" expanded="false" />
<element signature="e#57543#58142#0#PHP" expanded="false" />
<element signature="e#58147#59074#0#PHP" expanded="false" />
<element signature="e#59080#59794#0#PHP" expanded="false" />
<element signature="e#59800#60227#0#PHP" expanded="false" />
<element signature="e#60232#60701#0#PHP" expanded="false" />
<element signature="e#19059#19961#0#PHP" expanded="false" />
<element signature="e#22798#23175#0#PHP" expanded="false" />
<element signature="e#23180#23501#0#PHP" expanded="false" />
<element signature="e#23507#24012#0#PHP" expanded="false" />
<element signature="e#24017#24268#0#PHP" expanded="false" />
<element signature="e#24274#24753#0#PHP" expanded="false" />
<element signature="e#24758#25515#0#PHP" expanded="false" />
<element signature="e#25521#26002#0#PHP" expanded="false" />
<element signature="e#26007#26777#0#PHP" expanded="false" />
<element signature="e#26783#27146#0#PHP" expanded="false" />
<element signature="e#27151#27342#0#PHP" expanded="false" />
<element signature="e#27348#27706#0#PHP" expanded="false" />
<element signature="e#27711#27902#0#PHP" expanded="false" />
<element signature="e#27908#29051#0#PHP" expanded="false" />
<element signature="e#29056#31721#0#PHP" expanded="false" />
<element signature="e#31727#32225#0#PHP" expanded="false" />
<element signature="e#32230#33976#0#PHP" expanded="false" />
<element signature="e#33982#34395#0#PHP" expanded="false" />
<element signature="e#34400#34879#0#PHP" expanded="false" />
<element signature="e#34885#35419#0#PHP" expanded="false" />
<element signature="e#35424#36809#0#PHP" expanded="false" />
<element signature="e#36815#37469#0#PHP" expanded="false" />
<element signature="e#37474#39489#0#PHP" expanded="false" />
<element signature="e#39495#40255#0#PHP" expanded="false" />
<element signature="e#40260#42969#0#PHP" expanded="false" />
<element signature="e#42995#43826#0#PHP" expanded="false" />
<element signature="e#43832#44252#0#PHP" expanded="false" />
<element signature="e#44257#44740#0#PHP" expanded="false" />
<element signature="e#44746#45552#0#PHP" expanded="false" />
<element signature="e#45557#48711#0#PHP" expanded="false" />
<element signature="e#48726#50054#0#PHP" expanded="false" />
<element signature="e#50070#51097#0#PHP" expanded="false" />
<element signature="e#51103#51861#0#PHP" expanded="false" />
<element signature="e#51866#55609#0#PHP" expanded="false" />
<element signature="e#55615#56007#0#PHP" expanded="false" />
<element signature="e#56012#56964#0#PHP" expanded="false" />
<element signature="e#56988#57561#0#PHP" expanded="false" />
<element signature="e#57567#58166#0#PHP" expanded="false" />
<element signature="e#58171#59098#0#PHP" expanded="false" />
<element signature="e#59104#59818#0#PHP" expanded="false" />
<element signature="e#59824#60251#0#PHP" expanded="false" />
<element signature="e#60256#60725#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -179,8 +175,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="323" />
<option name="y" value="30" />
<option name="x" value="311" />
<option name="y" value="48" />
<option name="width" value="1430" />
<option name="height" value="920" />
</component>
... ... @@ -316,7 +312,7 @@
<workItem from="1575773423431" duration="694000" />
<workItem from="1575776183372" duration="2267000" />
<workItem from="1575790089275" duration="377000" />
<workItem from="1575851041026" duration="2668000" />
<workItem from="1575851041026" duration="2810000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -329,7 +325,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="343135000" />
<option name="totallyTimeSpent" value="343277000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -341,7 +337,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="323" y="30" width="1430" height="920" extended-state="1" />
<frame x="311" y="48" width="1430" height="920" extended-state="1" />
<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.17518248" 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" />
... ... @@ -761,8 +757,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="563" column="0" lean-forward="true" selection-start-line="563" selection-start-column="0" selection-end-line="563" selection-end-column="0" />
<state relative-caret-position="503">
<caret line="646" column="61" lean-forward="true" selection-start-line="646" selection-start-column="61" selection-end-line="646" selection-end-column="61" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -785,50 +781,48 @@
<element signature="e#14758#15334#0#PHP" expanded="false" />
<element signature="e#15339#15900#0#PHP" expanded="false" />
<element signature="e#15906#16622#0#PHP" expanded="false" />
<element signature="e#16627#19041#0#PHP" expanded="false" />
<element signature="e#19047#19949#0#PHP" expanded="false" />
<element signature="e#19954#22768#0#PHP" expanded="false" />
<element signature="e#22774#23151#0#PHP" expanded="false" />
<element signature="e#23156#23477#0#PHP" expanded="false" />
<element signature="e#23483#23988#0#PHP" expanded="false" />
<element signature="e#23993#24244#0#PHP" expanded="false" />
<element signature="e#24250#24729#0#PHP" expanded="false" />
<element signature="e#24734#25491#0#PHP" expanded="false" />
<element signature="e#25497#25978#0#PHP" expanded="false" />
<element signature="e#25983#26753#0#PHP" expanded="false" />
<element signature="e#26759#27122#0#PHP" expanded="false" />
<element signature="e#27127#27318#0#PHP" expanded="false" />
<element signature="e#27324#27682#0#PHP" expanded="false" />
<element signature="e#27687#27878#0#PHP" expanded="false" />
<element signature="e#27884#29027#0#PHP" expanded="false" />
<element signature="e#29032#31697#0#PHP" expanded="false" />
<element signature="e#31703#32201#0#PHP" expanded="false" />
<element signature="e#32206#33952#0#PHP" expanded="false" />
<element signature="e#33958#34371#0#PHP" expanded="false" />
<element signature="e#34376#34855#0#PHP" expanded="false" />
<element signature="e#34861#35395#0#PHP" expanded="false" />
<element signature="e#35400#36785#0#PHP" expanded="false" />
<element signature="e#36791#37445#0#PHP" expanded="false" />
<element signature="e#37450#39465#0#PHP" expanded="false" />
<element signature="e#39471#40231#0#PHP" expanded="false" />
<element signature="e#40236#42945#0#PHP" expanded="false" />
<element signature="e#42971#43802#0#PHP" expanded="false" />
<element signature="e#43808#44228#0#PHP" expanded="false" />
<element signature="e#44233#44716#0#PHP" expanded="false" />
<element signature="e#44722#45528#0#PHP" expanded="false" />
<element signature="e#45533#48687#0#PHP" expanded="false" />
<element signature="e#48702#50030#0#PHP" expanded="false" />
<element signature="e#50046#51073#0#PHP" expanded="false" />
<element signature="e#51079#51837#0#PHP" expanded="false" />
<element signature="e#51842#55585#0#PHP" expanded="false" />
<element signature="e#55591#55983#0#PHP" expanded="false" />
<element signature="e#55988#56940#0#PHP" expanded="false" />
<element signature="e#56964#57537#0#PHP" expanded="false" />
<element signature="e#57543#58142#0#PHP" expanded="false" />
<element signature="e#58147#59074#0#PHP" expanded="false" />
<element signature="e#59080#59794#0#PHP" expanded="false" />
<element signature="e#59800#60227#0#PHP" expanded="false" />
<element signature="e#60232#60701#0#PHP" expanded="false" />
<element signature="e#19059#19961#0#PHP" expanded="false" />
<element signature="e#22798#23175#0#PHP" expanded="false" />
<element signature="e#23180#23501#0#PHP" expanded="false" />
<element signature="e#23507#24012#0#PHP" expanded="false" />
<element signature="e#24017#24268#0#PHP" expanded="false" />
<element signature="e#24274#24753#0#PHP" expanded="false" />
<element signature="e#24758#25515#0#PHP" expanded="false" />
<element signature="e#25521#26002#0#PHP" expanded="false" />
<element signature="e#26007#26777#0#PHP" expanded="false" />
<element signature="e#26783#27146#0#PHP" expanded="false" />
<element signature="e#27151#27342#0#PHP" expanded="false" />
<element signature="e#27348#27706#0#PHP" expanded="false" />
<element signature="e#27711#27902#0#PHP" expanded="false" />
<element signature="e#27908#29051#0#PHP" expanded="false" />
<element signature="e#29056#31721#0#PHP" expanded="false" />
<element signature="e#31727#32225#0#PHP" expanded="false" />
<element signature="e#32230#33976#0#PHP" expanded="false" />
<element signature="e#33982#34395#0#PHP" expanded="false" />
<element signature="e#34400#34879#0#PHP" expanded="false" />
<element signature="e#34885#35419#0#PHP" expanded="false" />
<element signature="e#35424#36809#0#PHP" expanded="false" />
<element signature="e#36815#37469#0#PHP" expanded="false" />
<element signature="e#37474#39489#0#PHP" expanded="false" />
<element signature="e#39495#40255#0#PHP" expanded="false" />
<element signature="e#40260#42969#0#PHP" expanded="false" />
<element signature="e#42995#43826#0#PHP" expanded="false" />
<element signature="e#43832#44252#0#PHP" expanded="false" />
<element signature="e#44257#44740#0#PHP" expanded="false" />
<element signature="e#44746#45552#0#PHP" expanded="false" />
<element signature="e#45557#48711#0#PHP" expanded="false" />
<element signature="e#48726#50054#0#PHP" expanded="false" />
<element signature="e#50070#51097#0#PHP" expanded="false" />
<element signature="e#51103#51861#0#PHP" expanded="false" />
<element signature="e#51866#55609#0#PHP" expanded="false" />
<element signature="e#55615#56007#0#PHP" expanded="false" />
<element signature="e#56012#56964#0#PHP" expanded="false" />
<element signature="e#56988#57561#0#PHP" expanded="false" />
<element signature="e#57567#58166#0#PHP" expanded="false" />
<element signature="e#58171#59098#0#PHP" expanded="false" />
<element signature="e#59104#59818#0#PHP" expanded="false" />
<element signature="e#59824#60251#0#PHP" expanded="false" />
<element signature="e#60256#60725#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -528,7 +528,7 @@ class User extends Api
}
$click_num = $data['click_num'] + 1;
Db::name('pic')->where('id',$pic_id)->update(['click_num'=>$click_num]);
$data['accredit'] = $accredit['thumbnail'];
$data['accredit'] = $rule.$accredit['thumbnail'];
$data['water_url'] = $rule.$data['water_url'];
$data['vip_price'] = $data['price'] * 0.75;
$data['thumbnail'] = $rule.$data['thumbnail'];
... ... @@ -553,7 +553,7 @@ class User extends Api
$click_num = $data['click_num'] + 1;
Db::name('pic')->where('id',$pic_id)->update(['click_num'=>$click_num]);
$data['is_vip'] = 1;
$data['accredit'] = $accredit['thumbnail'];
$data['accredit'] = $rule.$accredit['thumbnail'];
$data['water_url'] = $rule.$data['water_url'];
$data['vip_price'] = $data['price'] * 0.75;
$data['thumbnail'] = $rule.$data['thumbnail'];
... ... @@ -618,7 +618,7 @@ class User extends Api
$click_num = $data['click_num']+1;
Db::name('video')->where('id',$pic_id)->update(['click_num'=>$click_num]);
$data['vip_price'] = $data['price']*0.75;
$data['accredit'] = $accredit['thumbnail'];
$data['accredit'] = $rule.$accredit['thumbnail'];
$data['four_vipprice'] = $data['four_price']*0.75;
$data['eight_vipprice'] = $data['eight_price']*0.75;
$data['thumbnail'] = $rule.$data['thumbnail'];
... ... @@ -644,7 +644,7 @@ class User extends Api
$click_num = $data['click_num']+1;
Db::name('video')->where('id',$pic_id)->update(['click_num'=>$click_num]);
$data['is_vip'] = 1;
$data['accredit'] = $accredit['thumbnail'];
$data['accredit'] = $rule.$accredit['thumbnail'];
$data['vip_price'] = $data['price']*0.75;
$data['four_vipprice'] = $data['four_price']*0.75;
$data['eight_vipprice'] = $data['eight_price']*0.75;
... ...
... ... @@ -6614,7 +6614,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-12-09 09:16:25 </div>
Generated on 2019-12-09 09:18:48 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...