郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 3aa6b9989285048bc1da90c0a68970aff8b882f5 1 个父辈 d6e5cb23
1 个管道 的构建 通过 耗费 7 秒

消费记录

内嵌 并排对比
正在显示 3 个修改的文件 包含 47 行增加 和 48 行删除
... ... @@ -3,6 +3,7 @@
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<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" />
... ... @@ -16,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="530">
<caret line="1268" column="32" lean-forward="false" selection-start-line="1268" selection-start-column="32" selection-end-line="1268" selection-end-column="32" />
<state relative-caret-position="350">
<caret line="1341" column="13" lean-forward="true" selection-start-line="1341" selection-start-column="13" selection-end-line="1341" selection-end-column="13" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -59,16 +60,17 @@
<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#33477#34237#0#PHP" expanded="false" />
<element signature="e#34242#35317#0#PHP" expanded="false" />
<element signature="e#35343#36174#0#PHP" expanded="false" />
<element signature="e#36180#36600#0#PHP" expanded="false" />
<element signature="e#36605#37088#0#PHP" expanded="false" />
<element signature="e#37094#37900#0#PHP" expanded="false" />
<element signature="e#41074#42402#0#PHP" expanded="false" />
<element signature="e#42418#43445#0#PHP" expanded="false" />
<element signature="e#43452#44210#0#PHP" expanded="false" />
<element signature="e#44215#46479#0#PHP" expanded="false" />
<element signature="e#32161#33420#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#37854#41008#0#PHP" expanded="false" />
<element signature="e#41023#42351#0#PHP" expanded="false" />
<element signature="e#42367#43394#0#PHP" expanded="false" />
<element signature="e#43401#44159#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -172,11 +174,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="138" />
<option name="y" value="-11" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="-34" />
<option name="y" value="112" />
<option name="width" value="1806" />
<option name="height" value="959" />
<option name="height" value="981" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -272,7 +274,7 @@
<workItem from="1574295812843" duration="20536000" />
<workItem from="1574336957891" duration="1350000" />
<workItem from="1574382087071" duration="22007000" />
<workItem from="1574410294356" duration="14012000" />
<workItem from="1574410294356" duration="15040000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -285,7 +287,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="175959000" />
<option name="totallyTimeSpent" value="176987000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -297,16 +299,16 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
<frame x="-34" y="112" width="1806" height="981" 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.1380597" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<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" />
<window_info id="Event Log" 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="0" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<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.13710555" 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.13744076" 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" />
... ... @@ -712,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="530">
<caret line="1268" column="32" lean-forward="false" selection-start-line="1268" selection-start-column="32" selection-end-line="1268" selection-end-column="32" />
<state relative-caret-position="350">
<caret line="1341" column="13" lean-forward="true" selection-start-line="1341" selection-start-column="13" selection-end-line="1341" selection-end-column="13" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -755,16 +757,17 @@
<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#33477#34237#0#PHP" expanded="false" />
<element signature="e#34242#35317#0#PHP" expanded="false" />
<element signature="e#35343#36174#0#PHP" expanded="false" />
<element signature="e#36180#36600#0#PHP" expanded="false" />
<element signature="e#36605#37088#0#PHP" expanded="false" />
<element signature="e#37094#37900#0#PHP" expanded="false" />
<element signature="e#41074#42402#0#PHP" expanded="false" />
<element signature="e#42418#43445#0#PHP" expanded="false" />
<element signature="e#43452#44210#0#PHP" expanded="false" />
<element signature="e#44215#46479#0#PHP" expanded="false" />
<element signature="e#32161#33420#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#37854#41008#0#PHP" expanded="false" />
<element signature="e#41023#42351#0#PHP" expanded="false" />
<element signature="e#42367#43394#0#PHP" expanded="false" />
<element signature="e#43401#44159#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -998,11 +998,10 @@ class User extends Api
}elseif ( $param['total']<=0){
$this->error(['code'=>3,'msg'=>'非法操作']);
}else{
$b = explode(',',$video_id.','.$video_attr);
$c['id'] = $b['0'];
$c['attr'] = $b['1'];
$b = $c;
$param['video_id'] = serialize($b);
$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')
... ... @@ -1337,20 +1336,17 @@ class User extends Api
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 = Db::name('pic')->field('id,title,thumbnail,url,code,price')->where('id',$v1)->find();
$v1['thumbnail'] = $rule.$v1['thumbnail'];
$v1['vipprice'] = $v1['price']*0.75;
}
}
if(!empty($v['video_id'])){
$v['video_id'] = explode(',',$v['video_id']);
$v['video_id'] = unserialize($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;
$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'];
}
}
}
... ...
... ... @@ -5529,7 +5529,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-11-22 21:09:21 </div>
Generated on 2019-11-22 21:53:45 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...