郭盛 / areial · 提交

转到一个项目

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

修改我的订单

内嵌 并排对比
正在显示 3 个修改的文件 包含 25 行增加 和 26 行删除
... ... @@ -2,7 +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/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -17,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="730">
<caret line="1110" column="7" lean-forward="true" selection-start-line="1110" selection-start-column="7" selection-end-line="1110" selection-end-column="7" />
<state relative-caret-position="5">
<caret line="1241" column="30" lean-forward="true" selection-start-line="1241" selection-start-column="30" selection-end-line="1241" selection-end-column="30" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -67,9 +66,9 @@
<element signature="e#36560#37043#0#PHP" expanded="false" />
<element signature="e#37049#37855#0#PHP" expanded="false" />
<element signature="e#37860#41014#0#PHP" expanded="false" />
<element signature="e#42391#43418#0#PHP" expanded="false" />
<element signature="e#43425#44183#0#PHP" expanded="false" />
<element signature="e#44188#46575#0#PHP" expanded="false" />
<element signature="e#42373#43400#0#PHP" expanded="false" />
<element signature="e#43407#44165#0#PHP" expanded="false" />
<element signature="e#44170#46557#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -173,8 +172,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="-217" />
<option name="y" value="52" />
<option name="x" value="118" />
<option name="y" value="2" />
<option name="width" value="1806" />
<option name="height" value="981" />
</component>
... ... @@ -273,7 +272,7 @@
<workItem from="1574336957891" duration="1350000" />
<workItem from="1574382087071" duration="22007000" />
<workItem from="1574410294356" duration="15863000" />
<workItem from="1574469667436" duration="435000" />
<workItem from="1574469667436" duration="943000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -286,7 +285,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="178245000" />
<option name="totallyTimeSpent" value="178753000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -298,7 +297,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="-217" y="52" width="1806" height="981" extended-state="1" />
<frame x="118" y="2" 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.15005727" 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" />
... ... @@ -703,8 +702,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="730">
<caret line="1110" column="7" lean-forward="true" selection-start-line="1110" selection-start-column="7" selection-end-line="1110" selection-end-column="7" />
<state relative-caret-position="5">
<caret line="1241" column="30" lean-forward="true" selection-start-line="1241" selection-start-column="30" selection-end-line="1241" selection-end-column="30" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -753,9 +752,9 @@
<element signature="e#36560#37043#0#PHP" expanded="false" />
<element signature="e#37049#37855#0#PHP" expanded="false" />
<element signature="e#37860#41014#0#PHP" expanded="false" />
<element signature="e#42391#43418#0#PHP" expanded="false" />
<element signature="e#43425#44183#0#PHP" expanded="false" />
<element signature="e#44188#46575#0#PHP" expanded="false" />
<element signature="e#42373#43400#0#PHP" expanded="false" />
<element signature="e#43407#44165#0#PHP" expanded="false" />
<element signature="e#44170#46557#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -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;
... ...
... ... @@ -5529,7 +5529,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-11-23 08:48:19 </div>
Generated on 2019-11-23 08:56:48 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...