郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 8e47d6bc09e264592f8d0adfb4955993276c2e1c 1 个父辈 ae50ad57
1 个管道 的构建 通过 耗费 1 秒

修改小样地址路径

内嵌 并排对比
正在显示 3 个修改的文件 包含 62 行增加 和 61 行删除
... ... @@ -2,9 +2,7 @@
<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" />
... ... @@ -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="115">
<caret line="638" column="5" lean-forward="true" selection-start-line="638" selection-start-column="5" selection-end-line="638" selection-end-column="5" />
<state relative-caret-position="721">
<caret line="453" column="58" lean-forward="false" selection-start-line="453" selection-start-column="58" selection-end-line="453" selection-end-column="58" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#337#456#0#PHP" expanded="false" />
... ... @@ -38,27 +36,26 @@
<element signature="e#11641#12217#0#PHP" expanded="false" />
<element signature="e#12222#12769#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" />
<element signature="e#26989#27523#0#PHP" expanded="false" />
<element signature="e#27528#28442#0#PHP" expanded="false" />
<element signature="e#28448#28979#0#PHP" expanded="false" />
<element signature="e#28984#29904#0#PHP" expanded="false" />
<element signature="e#15142#16012#0#PHP" expanded="false" />
<element signature="e#16017#18111#0#PHP" expanded="false" />
<element signature="e#18117#18494#0#PHP" expanded="false" />
<element signature="e#18499#18763#0#PHP" expanded="false" />
<element signature="e#18769#19274#0#PHP" expanded="false" />
<element signature="e#19279#19530#0#PHP" expanded="false" />
<element signature="e#19536#20015#0#PHP" expanded="false" />
<element signature="e#20020#20777#0#PHP" expanded="false" />
<element signature="e#20783#21146#0#PHP" expanded="false" />
<element signature="e#21151#21342#0#PHP" expanded="false" />
<element signature="e#21348#21706#0#PHP" expanded="false" />
<element signature="e#21711#21901#0#PHP" expanded="false" />
<element signature="e#21907#23050#0#PHP" expanded="false" />
<element signature="e#23055#25610#0#PHP" expanded="false" />
<element signature="e#25616#26107#0#PHP" expanded="false" />
<element signature="e#26112#27325#0#PHP" expanded="false" />
<element signature="e#27331#27865#0#PHP" expanded="false" />
<element signature="e#27870#28784#0#PHP" expanded="false" />
<element signature="e#28790#29321#0#PHP" expanded="false" />
<element signature="e#29326#30246#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -138,8 +135,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="14" />
<option name="y" value="48" />
<option name="x" value="132" />
<option name="y" value="34" />
<option name="width" value="1699" />
<option name="height" value="977" />
</component>
... ... @@ -238,7 +235,7 @@
<workItem from="1574141466352" duration="745000" />
<workItem from="1574143209694" duration="3660000" />
<workItem from="1574146994475" duration="23222000" />
<workItem from="1574209189943" duration="28745000" />
<workItem from="1574209189943" duration="31042000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -251,7 +248,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="100320000" />
<option name="totallyTimeSpent" value="102617000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -263,8 +260,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="14" y="48" width="1699" height="977" extended-state="1" />
<editor active="true" />
<frame x="132" y="34" width="1699" height="977" 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.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" />
... ... @@ -273,7 +269,7 @@
<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="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.15119047" 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.15119047" 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" />
... ... @@ -695,8 +691,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="115">
<caret line="638" column="5" lean-forward="true" selection-start-line="638" selection-start-column="5" selection-end-line="638" selection-end-column="5" />
<state relative-caret-position="721">
<caret line="453" column="58" lean-forward="false" selection-start-line="453" selection-start-column="58" selection-end-line="453" selection-end-column="58" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#337#456#0#PHP" expanded="false" />
... ... @@ -715,27 +711,26 @@
<element signature="e#11641#12217#0#PHP" expanded="false" />
<element signature="e#12222#12769#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" />
<element signature="e#26989#27523#0#PHP" expanded="false" />
<element signature="e#27528#28442#0#PHP" expanded="false" />
<element signature="e#28448#28979#0#PHP" expanded="false" />
<element signature="e#28984#29904#0#PHP" expanded="false" />
<element signature="e#15142#16012#0#PHP" expanded="false" />
<element signature="e#16017#18111#0#PHP" expanded="false" />
<element signature="e#18117#18494#0#PHP" expanded="false" />
<element signature="e#18499#18763#0#PHP" expanded="false" />
<element signature="e#18769#19274#0#PHP" expanded="false" />
<element signature="e#19279#19530#0#PHP" expanded="false" />
<element signature="e#19536#20015#0#PHP" expanded="false" />
<element signature="e#20020#20777#0#PHP" expanded="false" />
<element signature="e#20783#21146#0#PHP" expanded="false" />
<element signature="e#21151#21342#0#PHP" expanded="false" />
<element signature="e#21348#21706#0#PHP" expanded="false" />
<element signature="e#21711#21901#0#PHP" expanded="false" />
<element signature="e#21907#23050#0#PHP" expanded="false" />
<element signature="e#23055#25610#0#PHP" expanded="false" />
<element signature="e#25616#26107#0#PHP" expanded="false" />
<element signature="e#26112#27325#0#PHP" expanded="false" />
<element signature="e#27331#27865#0#PHP" expanded="false" />
<element signature="e#27870#28784#0#PHP" expanded="false" />
<element signature="e#28790#29321#0#PHP" expanded="false" />
<element signature="e#29326#30246#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -434,7 +434,6 @@ class User extends Api
}
$data['vip_price'] = $data['price'] * 0.75;
$data['thumbnail'] = $rule.$data['thumbnail'];
$data['water_url'] = $rule.$data['water_url'];
$data['content'] = strip_tags($data['content']);
$data['is_vip'] = 0;
$this->success('SUCCESS',$data);
... ... @@ -453,7 +452,6 @@ class User extends Api
$data['is_vip'] = 1;
$data['vip_price'] = $data['price'] * 0.75;
$data['thumbnail'] = $rule.$data['thumbnail'];
$data['water_url'] = $rule.$data['water_url'];
$data['content'] = strip_tags($data['content']);
$this->success('SUCCESS',$data);
}
... ... @@ -513,7 +511,6 @@ class User extends Api
$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'];
$data['content'] = strip_tags($data['content']);
$data['is_vip'] = 0;
$this->success('SUCCESS',$data);
... ... @@ -535,7 +532,6 @@ class User extends Api
$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'];
$data['content'] = strip_tags($data['content']);
$this->success('SUCCESS',$data);
}
... ... @@ -733,7 +729,7 @@ class User extends Api
public function car()
{
$user_id = $this->uid;
$rule = config('verify.path');
//查询该用户是否为会员
$res = Db::name('user')
->where('id',$user_id)
... ... @@ -749,7 +745,14 @@ class User extends Api
->select();
foreach ($data as &$v){
$v['pic'] = Db::name('pic')->field('id,title,thumbnail,url,price')->whereIn('id',explode(',',$v['pic_id']))->select();
foreach ($v['pic'] as &$val){
$val['thumbnail'] = $rule.$val['thumbnail'];
}
$v['video'] = Db::name('video')->field('id,title,thumbnail,video,two_url,four_url,eight_url,price,four_price,eight_price')->whereIn('id',explode(',',$v['video_id']))->select();
foreach ($v['video'] as &$v_video){
$v_video['thumbnail'] = $rule.$v_video['thumbnail'];
$v_video['video'] = $rule.$v_video['video'];
}
}
$this->success('SUCCESS',$data);
}else{
... ... @@ -762,10 +765,13 @@ class User extends Api
foreach ($data as &$v){
$v['pic'] = Db::name('pic')->field('id,title,thumbnail,url,price')->whereIn('id',explode(',',$v['pic_id']))->select();
foreach ($v['pic'] as &$val){
$val['thumbnail'] = $rule.$val['thumbnail'];
$val['vip_price'] = $val['price']*0.75;
}
$v['video'] = Db::name('video')->field('id,title,thumbnail,video,two_url,four_url,eight_url,price,four_price,eight_price')->whereIn('id',explode(',',$v['video_id']))->select();
foreach ($v['video'] as &$v_video){
$v_video['thumbnail'] = $rule.$v_video['thumbnail'];
$v_video['video'] = $rule.$v_video['video'];
$v_video['vip_price'] = $v_video['price']*0.75;
$v_video['four_vipprice'] = $v_video['four_price']*0.75;
$v_video['eight_vipprice'] = $v_video['eight_price']*0.75;
... ...
... ... @@ -3586,7 +3586,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-11-20 17:14:39 </div>
Generated on 2019-11-20 18:27:19 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...