郭盛 / areial · 提交

转到一个项目

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

修改加入购物车

内嵌 并排对比
正在显示 3 个修改的文件 包含 51 行增加 和 55 行删除
... ... @@ -2,8 +2,8 @@
<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" />
... ... @@ -17,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="387">
<caret line="882" column="13" lean-forward="true" selection-start-line="882" selection-start-column="13" selection-end-line="882" selection-end-column="13" />
<state relative-caret-position="337">
<caret line="874" column="25" lean-forward="true" selection-start-line="874" selection-start-column="25" selection-end-line="874" selection-end-column="25" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -54,25 +54,25 @@
<element signature="e#23459#24602#0#PHP" expanded="false" />
<element signature="e#24607#27272#0#PHP" expanded="false" />
<element signature="e#27278#27776#0#PHP" expanded="false" />
<element signature="e#29733#30146#0#PHP" expanded="false" />
<element signature="e#30151#30630#0#PHP" expanded="false" />
<element signature="e#30636#31170#0#PHP" expanded="false" />
<element signature="e#31175#32560#0#PHP" expanded="false" />
<element signature="e#32566#33220#0#PHP" expanded="false" />
<element signature="e#33225#35178#0#PHP" expanded="false" />
<element signature="e#33379#33465#0#PHP" expanded="false" />
<element signature="e#33554#33642#0#PHP" expanded="false" />
<element signature="e#35184#35944#0#PHP" expanded="false" />
<element signature="e#35949#38658#0#PHP" expanded="false" />
<element signature="e#38684#39515#0#PHP" expanded="false" />
<element signature="e#39521#39941#0#PHP" expanded="false" />
<element signature="e#39946#40429#0#PHP" expanded="false" />
<element signature="e#40435#41241#0#PHP" expanded="false" />
<element signature="e#41246#44400#0#PHP" expanded="false" />
<element signature="e#44415#45743#0#PHP" expanded="false" />
<element signature="e#45759#46786#0#PHP" expanded="false" />
<element signature="e#46792#47550#0#PHP" expanded="false" />
<element signature="e#47555#49942#0#PHP" expanded="false" />
<element signature="e#29533#29946#0#PHP" expanded="false" />
<element signature="e#29951#30430#0#PHP" expanded="false" />
<element signature="e#30436#30970#0#PHP" expanded="false" />
<element signature="e#30975#32360#0#PHP" expanded="false" />
<element signature="e#32366#33020#0#PHP" expanded="false" />
<element signature="e#33025#34978#0#PHP" expanded="false" />
<element signature="e#33179#33265#0#PHP" expanded="false" />
<element signature="e#33354#33442#0#PHP" expanded="false" />
<element signature="e#34984#35744#0#PHP" expanded="false" />
<element signature="e#35749#38458#0#PHP" expanded="false" />
<element signature="e#38484#39315#0#PHP" expanded="false" />
<element signature="e#39321#39741#0#PHP" expanded="false" />
<element signature="e#39746#40229#0#PHP" expanded="false" />
<element signature="e#40235#41041#0#PHP" expanded="false" />
<element signature="e#41046#44200#0#PHP" expanded="false" />
<element signature="e#44215#45543#0#PHP" expanded="false" />
<element signature="e#45559#46586#0#PHP" expanded="false" />
<element signature="e#46592#47350#0#PHP" expanded="false" />
<element signature="e#47355#49742#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -177,8 +177,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="542" />
<option name="y" value="20" />
<option name="x" value="498" />
<option name="y" value="45" />
<option name="width" value="1806" />
<option name="height" value="974" />
</component>
... ... @@ -277,7 +277,7 @@
<workItem from="1574336957891" duration="1350000" />
<workItem from="1574382087071" duration="22007000" />
<workItem from="1574410294356" duration="15863000" />
<workItem from="1574469667436" duration="24271000" />
<workItem from="1574469667436" duration="24639000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -290,7 +290,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="202081000" />
<option name="totallyTimeSpent" value="202449000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -302,7 +302,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="542" y="20" width="1806" height="974" extended-state="0" />
<frame x="498" y="45" width="1806" height="974" 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.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" />
... ... @@ -708,8 +708,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="387">
<caret line="882" column="13" lean-forward="true" selection-start-line="882" selection-start-column="13" selection-end-line="882" selection-end-column="13" />
<state relative-caret-position="337">
<caret line="874" column="25" lean-forward="true" selection-start-line="874" selection-start-column="25" selection-end-line="874" selection-end-column="25" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -745,25 +745,25 @@
<element signature="e#23459#24602#0#PHP" expanded="false" />
<element signature="e#24607#27272#0#PHP" expanded="false" />
<element signature="e#27278#27776#0#PHP" expanded="false" />
<element signature="e#29733#30146#0#PHP" expanded="false" />
<element signature="e#30151#30630#0#PHP" expanded="false" />
<element signature="e#30636#31170#0#PHP" expanded="false" />
<element signature="e#31175#32560#0#PHP" expanded="false" />
<element signature="e#32566#33220#0#PHP" expanded="false" />
<element signature="e#33225#35178#0#PHP" expanded="false" />
<element signature="e#33379#33465#0#PHP" expanded="false" />
<element signature="e#33554#33642#0#PHP" expanded="false" />
<element signature="e#35184#35944#0#PHP" expanded="false" />
<element signature="e#35949#38658#0#PHP" expanded="false" />
<element signature="e#38684#39515#0#PHP" expanded="false" />
<element signature="e#39521#39941#0#PHP" expanded="false" />
<element signature="e#39946#40429#0#PHP" expanded="false" />
<element signature="e#40435#41241#0#PHP" expanded="false" />
<element signature="e#41246#44400#0#PHP" expanded="false" />
<element signature="e#44415#45743#0#PHP" expanded="false" />
<element signature="e#45759#46786#0#PHP" expanded="false" />
<element signature="e#46792#47550#0#PHP" expanded="false" />
<element signature="e#47555#49942#0#PHP" expanded="false" />
<element signature="e#29533#29946#0#PHP" expanded="false" />
<element signature="e#29951#30430#0#PHP" expanded="false" />
<element signature="e#30436#30970#0#PHP" expanded="false" />
<element signature="e#30975#32360#0#PHP" expanded="false" />
<element signature="e#32366#33020#0#PHP" expanded="false" />
<element signature="e#33025#34978#0#PHP" expanded="false" />
<element signature="e#33179#33265#0#PHP" expanded="false" />
<element signature="e#33354#33442#0#PHP" expanded="false" />
<element signature="e#34984#35744#0#PHP" expanded="false" />
<element signature="e#35749#38458#0#PHP" expanded="false" />
<element signature="e#38484#39315#0#PHP" expanded="false" />
<element signature="e#39321#39741#0#PHP" expanded="false" />
<element signature="e#39746#40229#0#PHP" expanded="false" />
<element signature="e#40235#41041#0#PHP" expanded="false" />
<element signature="e#41046#44200#0#PHP" expanded="false" />
<element signature="e#44215#45543#0#PHP" expanded="false" />
<element signature="e#45559#46586#0#PHP" expanded="false" />
<element signature="e#46592#47350#0#PHP" expanded="false" />
<element signature="e#47355#49742#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -849,10 +849,6 @@ class User extends Api
}
if(empty($pic_id)){
//接受视频ID并判断
$video_id = $this->request->post('video_id');
if(empty($video_id)){
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}
$data = Db::name('car')
->field('id')
->where('user_id',$user_id)
... ... @@ -872,15 +868,15 @@ class User extends Api
$this->error(['code'=>3,'msg'=>'加入购物车失败']);
}
}elseif (empty($video_id)){
$param['pic_id'] = $this->request->param('pic_id');
$data = Db::name('car')
->field('id')
->where('user_id',$user_id)
->where('video_id',$param['pic_id'])
->where('pic_id',$pic_id)
->find();
if(!empty($data)){
$this->error(['code'=>2,'msg'=>'您已经添加过了']);
}
$param['pic_id'] = $pic_id;
$param['createtime'] = time();
$param['user_id'] = $user_id;
$data = Db::name('car')
... ...
... ... @@ -5529,7 +5529,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-11-23 17:59:08 </div>
Generated on 2019-11-23 18:05:16 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...