郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 40037a768be6ae71d9a796890da1980d6ebb7f36 1 个父辈 1efc57c0
1 个管道 的构建 通过 耗费 2 秒

图片详情

内嵌 并排对比
正在显示 3 个修改的文件 包含 101 行增加 和 101 行删除
... ... @@ -4,6 +4,7 @@
<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" />
... ... @@ -17,8 +18,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="375">
<caret line="1256" column="78" lean-forward="true" selection-start-line="1256" selection-start-column="78" selection-end-line="1256" selection-end-column="78" />
<state relative-caret-position="310">
<caret line="446" column="68" lean-forward="false" selection-start-line="446" selection-start-column="68" selection-end-line="446" selection-end-column="68" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -36,40 +37,40 @@
<element signature="e#11669#12245#0#PHP" expanded="false" />
<element signature="e#12250#12797#0#PHP" expanded="false" />
<element signature="e#12803#13487#0#PHP" expanded="false" />
<element signature="e#13492#15290#0#PHP" expanded="false" />
<element signature="e#15296#16166#0#PHP" expanded="false" />
<element signature="e#16171#18379#0#PHP" expanded="false" />
<element signature="e#18385#18762#0#PHP" expanded="false" />
<element signature="e#18767#19031#0#PHP" expanded="false" />
<element signature="e#19037#19542#0#PHP" expanded="false" />
<element signature="e#19547#19798#0#PHP" expanded="false" />
<element signature="e#19804#20283#0#PHP" expanded="false" />
<element signature="e#20288#21045#0#PHP" expanded="false" />
<element signature="e#21051#21532#0#PHP" expanded="false" />
<element signature="e#21537#22307#0#PHP" expanded="false" />
<element signature="e#22313#22676#0#PHP" expanded="false" />
<element signature="e#22681#22872#0#PHP" expanded="false" />
<element signature="e#22878#23236#0#PHP" expanded="false" />
<element signature="e#23241#23431#0#PHP" expanded="false" />
<element signature="e#23437#24580#0#PHP" expanded="false" />
<element signature="e#24585#27250#0#PHP" expanded="false" />
<element signature="e#27256#27754#0#PHP" expanded="false" />
<element signature="e#27759#29124#0#PHP" expanded="false" />
<element signature="e#29130#29543#0#PHP" expanded="false" />
<element signature="e#29548#30027#0#PHP" expanded="false" />
<element signature="e#30033#30567#0#PHP" expanded="false" />
<element signature="e#30572#31486#0#PHP" expanded="false" />
<element signature="e#31492#32146#0#PHP" expanded="false" />
<element signature="e#32151#33418#0#PHP" expanded="false" />
<element signature="e#33424#34184#0#PHP" expanded="false" />
<element signature="e#34189#35264#0#PHP" expanded="false" />
<element signature="e#35290#36121#0#PHP" expanded="false" />
<element signature="e#36127#36547#0#PHP" expanded="false" />
<element signature="e#36552#37035#0#PHP" expanded="false" />
<element signature="e#37041#37847#0#PHP" expanded="false" />
<element signature="e#42365#43429#0#PHP" expanded="false" />
<element signature="e#43436#44194#0#PHP" expanded="false" />
<element signature="e#44199#46463#0#PHP" expanded="false" />
<element signature="e#15306#16176#0#PHP" expanded="false" />
<element signature="e#16181#18389#0#PHP" expanded="false" />
<element signature="e#18395#18772#0#PHP" expanded="false" />
<element signature="e#18777#19041#0#PHP" expanded="false" />
<element signature="e#19047#19552#0#PHP" expanded="false" />
<element signature="e#19557#19808#0#PHP" expanded="false" />
<element signature="e#19814#20293#0#PHP" expanded="false" />
<element signature="e#20298#21055#0#PHP" expanded="false" />
<element signature="e#21061#21542#0#PHP" expanded="false" />
<element signature="e#21547#22317#0#PHP" expanded="false" />
<element signature="e#22323#22686#0#PHP" expanded="false" />
<element signature="e#22691#22882#0#PHP" expanded="false" />
<element signature="e#22888#23246#0#PHP" expanded="false" />
<element signature="e#23251#23441#0#PHP" expanded="false" />
<element signature="e#23447#24590#0#PHP" expanded="false" />
<element signature="e#24595#27260#0#PHP" expanded="false" />
<element signature="e#27266#27764#0#PHP" expanded="false" />
<element signature="e#27769#29134#0#PHP" expanded="false" />
<element signature="e#29140#29553#0#PHP" expanded="false" />
<element signature="e#29558#30037#0#PHP" expanded="false" />
<element signature="e#30043#30577#0#PHP" expanded="false" />
<element signature="e#30582#31496#0#PHP" expanded="false" />
<element signature="e#31502#32156#0#PHP" expanded="false" />
<element signature="e#33426#34186#0#PHP" expanded="false" />
<element signature="e#34191#35266#0#PHP" expanded="false" />
<element signature="e#35292#36123#0#PHP" expanded="false" />
<element signature="e#36129#36549#0#PHP" expanded="false" />
<element signature="e#36554#37037#0#PHP" expanded="false" />
<element signature="e#37043#37849#0#PHP" expanded="false" />
<element signature="e#42385#43449#0#PHP" expanded="false" />
<element signature="e#43456#44214#0#PHP" expanded="false" />
<element signature="e#44219#46483#0#PHP" expanded="false" />
<element signature="e#46490#46941#0#PHP" expanded="false" />
<element signature="e#46946#48087#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -174,10 +175,10 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="133" />
<option name="y" value="60" />
<option name="x" value="505" />
<option name="y" value="83" />
<option name="width" value="1806" />
<option name="height" value="989" />
<option name="height" value="977" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -273,7 +274,7 @@
<workItem from="1574295812843" duration="20536000" />
<workItem from="1574336957891" duration="1350000" />
<workItem from="1574382087071" duration="22007000" />
<workItem from="1574410294356" duration="10165000" />
<workItem from="1574410294356" duration="12452000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -286,7 +287,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="172112000" />
<option name="totallyTimeSpent" value="174399000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -298,7 +299,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="133" y="60" width="1806" height="989" extended-state="0" />
<frame x="505" y="83" width="1806" 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.14833906" 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" />
... ... @@ -307,7 +308,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="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14906104" 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" />
... ... @@ -713,8 +714,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="1256" column="78" lean-forward="true" selection-start-line="1256" selection-start-column="78" selection-end-line="1256" selection-end-column="78" />
<state relative-caret-position="310">
<caret line="446" column="68" lean-forward="false" selection-start-line="446" selection-start-column="68" selection-end-line="446" selection-end-column="68" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -732,40 +733,40 @@
<element signature="e#11669#12245#0#PHP" expanded="false" />
<element signature="e#12250#12797#0#PHP" expanded="false" />
<element signature="e#12803#13487#0#PHP" expanded="false" />
<element signature="e#13492#15290#0#PHP" expanded="false" />
<element signature="e#15296#16166#0#PHP" expanded="false" />
<element signature="e#16171#18379#0#PHP" expanded="false" />
<element signature="e#18385#18762#0#PHP" expanded="false" />
<element signature="e#18767#19031#0#PHP" expanded="false" />
<element signature="e#19037#19542#0#PHP" expanded="false" />
<element signature="e#19547#19798#0#PHP" expanded="false" />
<element signature="e#19804#20283#0#PHP" expanded="false" />
<element signature="e#20288#21045#0#PHP" expanded="false" />
<element signature="e#21051#21532#0#PHP" expanded="false" />
<element signature="e#21537#22307#0#PHP" expanded="false" />
<element signature="e#22313#22676#0#PHP" expanded="false" />
<element signature="e#22681#22872#0#PHP" expanded="false" />
<element signature="e#22878#23236#0#PHP" expanded="false" />
<element signature="e#23241#23431#0#PHP" expanded="false" />
<element signature="e#23437#24580#0#PHP" expanded="false" />
<element signature="e#24585#27250#0#PHP" expanded="false" />
<element signature="e#27256#27754#0#PHP" expanded="false" />
<element signature="e#27759#29124#0#PHP" expanded="false" />
<element signature="e#29130#29543#0#PHP" expanded="false" />
<element signature="e#29548#30027#0#PHP" expanded="false" />
<element signature="e#30033#30567#0#PHP" expanded="false" />
<element signature="e#30572#31486#0#PHP" expanded="false" />
<element signature="e#31492#32146#0#PHP" expanded="false" />
<element signature="e#32151#33418#0#PHP" expanded="false" />
<element signature="e#33424#34184#0#PHP" expanded="false" />
<element signature="e#34189#35264#0#PHP" expanded="false" />
<element signature="e#35290#36121#0#PHP" expanded="false" />
<element signature="e#36127#36547#0#PHP" expanded="false" />
<element signature="e#36552#37035#0#PHP" expanded="false" />
<element signature="e#37041#37847#0#PHP" expanded="false" />
<element signature="e#42365#43429#0#PHP" expanded="false" />
<element signature="e#43436#44194#0#PHP" expanded="false" />
<element signature="e#44199#46463#0#PHP" expanded="false" />
<element signature="e#15306#16176#0#PHP" expanded="false" />
<element signature="e#16181#18389#0#PHP" expanded="false" />
<element signature="e#18395#18772#0#PHP" expanded="false" />
<element signature="e#18777#19041#0#PHP" expanded="false" />
<element signature="e#19047#19552#0#PHP" expanded="false" />
<element signature="e#19557#19808#0#PHP" expanded="false" />
<element signature="e#19814#20293#0#PHP" expanded="false" />
<element signature="e#20298#21055#0#PHP" expanded="false" />
<element signature="e#21061#21542#0#PHP" expanded="false" />
<element signature="e#21547#22317#0#PHP" expanded="false" />
<element signature="e#22323#22686#0#PHP" expanded="false" />
<element signature="e#22691#22882#0#PHP" expanded="false" />
<element signature="e#22888#23246#0#PHP" expanded="false" />
<element signature="e#23251#23441#0#PHP" expanded="false" />
<element signature="e#23447#24590#0#PHP" expanded="false" />
<element signature="e#24595#27260#0#PHP" expanded="false" />
<element signature="e#27266#27764#0#PHP" expanded="false" />
<element signature="e#27769#29134#0#PHP" expanded="false" />
<element signature="e#29140#29553#0#PHP" expanded="false" />
<element signature="e#29558#30037#0#PHP" expanded="false" />
<element signature="e#30043#30577#0#PHP" expanded="false" />
<element signature="e#30582#31496#0#PHP" expanded="false" />
<element signature="e#31502#32156#0#PHP" expanded="false" />
<element signature="e#33426#34186#0#PHP" expanded="false" />
<element signature="e#34191#35266#0#PHP" expanded="false" />
<element signature="e#35292#36123#0#PHP" expanded="false" />
<element signature="e#36129#36549#0#PHP" expanded="false" />
<element signature="e#36554#37037#0#PHP" expanded="false" />
<element signature="e#37043#37849#0#PHP" expanded="false" />
<element signature="e#42385#43449#0#PHP" expanded="false" />
<element signature="e#43456#44214#0#PHP" expanded="false" />
<element signature="e#44219#46483#0#PHP" expanded="false" />
<element signature="e#46490#46941#0#PHP" expanded="false" />
<element signature="e#46946#48087#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -426,7 +426,7 @@ class User extends Api
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}
$data = Db::name('pic')
->field('id,title,thumbnail,price,water_url,url,content')
->field('id,title,thumbnail,price,water_url,url,code,content')
->where('id',$pic_id)
->find();
if(empty($data)){
... ... @@ -444,7 +444,7 @@ class User extends Api
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}
$data = Db::name('pic')
->field('id,title,thumbnail,price,water_url,url,content')
->field('id,title,thumbnail,price,water_url,url,code,content')
->where('id',$pic_id)
->find();
if(empty($data)){
... ... @@ -998,10 +998,10 @@ class User extends Api
}elseif ( $param['total']<=0){
$this->error(['code'=>3,'msg'=>'非法操作']);
}else{
$arr = [];
$arr['id'] = $video_id;
$arr['attr'] = $video_attr;
$param['video_id'] = serialize($arr);
$a = [];
$a['id'] = $video_id;
$a['attr'] = $video_attr;
$param['video_id'] = serialize($a);
$param['createtime'] = time();
$param['num'] = date('Ymd').substr(implode(NULL, array_map('ord', str_split(substr(uniqid(), 7, 13), 1))), 0, 8);
$data = Db::name('order')
... ... @@ -1250,15 +1250,15 @@ class User extends Api
}
if(!empty($v['video_id'])){
$v['video_id'] = unserialize($v['video_id']);
foreach ($v['video_id'] as &$v2){
$v2['info'] = Db::name('video')->field('keyword,type_ids,content,is_recommend,buy_num,click_num,createtime,updatetime',true)->where('id',$v2['id'])->find();
$v2['info']['attr'] = $v2['attr'];
unset($v2['attr']);
$v2['info']['thumbnail'] = $rule.$v2['info']['thumbnail'];
$v2['info']['vipprice'] = $v2['info']['price']*0.75;
$v2['info']['four_vipprice'] = $v2['info']['four_price'] * 0.75;
$v2['info']['eight_vipprice'] = $v2['info']['eight_price'] * 0.75;
}
// foreach ($v['video_id'] as &$v2){
// $v2['info'] = Db::name('video')->field('keyword,type_ids,content,is_recommend,buy_num,click_num,createtime,updatetime',true)->where('id',$v2['id'])->find();
// $v2['info']['attr'] = $v2['attr'];
// unset($v2['attr']);
// $v2['info']['thumbnail'] = $rule.$v2['info']['thumbnail'];
// $v2['info']['vipprice'] = $v2['info']['price']*0.75;
// $v2['info']['four_vipprice'] = $v2['info']['four_price'] * 0.75;
// $v2['info']['eight_vipprice'] = $v2['info']['eight_price'] * 0.75;
// }
}
}
return $res;
... ... @@ -1394,15 +1394,16 @@ class User extends Api
*/
public function merage()
{
$user_id = $this->uid;
$order_id = $this->request->param('order_id');
foreach ($order_id as &$v){
$data = Db::name('order')
->whereIn('id',$order_id)
->select();
print_r($data);die;
foreach ($data as &$v){
if(!empty($v['pic_id'])){
$v['pic_id'] = explode(',',$v['pic_id']);
foreach ($v['pic_id'] as &$v1){
$v1 = Db::name('pic')->field('id,title,thumbnail,url,price')->where('id',$v1)->find();
$v1['thumbnail'] = $rule.$v1['thumbnail'];
$v1['vipprice'] = $v1['price']*0.75;
}
}
... ... @@ -1410,8 +1411,6 @@ class User extends Api
$v['video_id'] = explode(',',$v['video_id']);
foreach ($v['video_id'] as &$v2){
$v2 = Db::name('video')->field('keyword,type_ids,content,is_recommend,buy_num,click_num,createtime,updatetime',true)->where('id',$v2)->find();
$v2['thumbnail'] = $rule.$v2['thumbnail'];
$v2['video'] = $rule.$v2['video'];
$v2['vipprice'] = $v2['price']*0.75;
$v2['four_vipprice'] = $v2['four_price'] * 0.75;
$v2['eight_vipprice'] = $v2['eight_price'] * 0.75;
... ...
... ... @@ -5675,7 +5675,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-11-22 20:05:13 </div>
Generated on 2019-11-22 20:43:20 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...