正在显示
3 个修改的文件
包含
44 行增加
和
31 行删除
@@ -17,8 +17,8 @@ | @@ -17,8 +17,8 @@ | ||
17 | <file leaf-file-name="User.php" pinned="false" current-in-tab="true"> | 17 | <file leaf-file-name="User.php" pinned="false" current-in-tab="true"> |
18 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> | 18 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> |
19 | <provider selected="true" editor-type-id="text-editor"> | 19 | <provider selected="true" editor-type-id="text-editor"> |
20 | - <state relative-caret-position="529"> | ||
21 | - <caret line="1116" column="0" lean-forward="true" selection-start-line="1116" selection-start-column="0" selection-end-line="1116" selection-end-column="0" /> | 20 | + <state relative-caret-position="304"> |
21 | + <caret line="1112" column="9" lean-forward="true" selection-start-line="1112" selection-start-column="9" selection-end-line="1112" selection-end-column="9" /> | ||
22 | <folding> | 22 | <folding> |
23 | <element signature="e#365#484#0#PHP" expanded="false" /> | 23 | <element signature="e#365#484#0#PHP" expanded="false" /> |
24 | <element signature="e#490#1228#0#PHP" expanded="false" /> | 24 | <element signature="e#490#1228#0#PHP" expanded="false" /> |
@@ -64,15 +64,15 @@ | @@ -64,15 +64,15 @@ | ||
64 | <element signature="e#32786#32872#0#PHP" expanded="false" /> | 64 | <element signature="e#32786#32872#0#PHP" expanded="false" /> |
65 | <element signature="e#32961#33049#0#PHP" expanded="false" /> | 65 | <element signature="e#32961#33049#0#PHP" expanded="false" /> |
66 | <element signature="e#34597#35357#0#PHP" expanded="false" /> | 66 | <element signature="e#34597#35357#0#PHP" expanded="false" /> |
67 | - <element signature="e#37207#38038#0#PHP" expanded="false" /> | ||
68 | - <element signature="e#38044#38464#0#PHP" expanded="false" /> | ||
69 | - <element signature="e#38469#38952#0#PHP" expanded="false" /> | ||
70 | - <element signature="e#38958#39764#0#PHP" expanded="false" /> | ||
71 | - <element signature="e#39769#42923#0#PHP" expanded="false" /> | ||
72 | - <element signature="e#42938#44266#0#PHP" expanded="false" /> | ||
73 | - <element signature="e#44282#45309#0#PHP" expanded="false" /> | ||
74 | - <element signature="e#45316#46074#0#PHP" expanded="false" /> | ||
75 | - <element signature="e#46079#48466#0#PHP" expanded="false" /> | 67 | + <element signature="e#37798#38629#0#PHP" expanded="false" /> |
68 | + <element signature="e#38635#39055#0#PHP" expanded="false" /> | ||
69 | + <element signature="e#39060#39543#0#PHP" expanded="false" /> | ||
70 | + <element signature="e#39549#40355#0#PHP" expanded="false" /> | ||
71 | + <element signature="e#40360#43514#0#PHP" expanded="false" /> | ||
72 | + <element signature="e#43529#44857#0#PHP" expanded="false" /> | ||
73 | + <element signature="e#44873#45900#0#PHP" expanded="false" /> | ||
74 | + <element signature="e#45907#46665#0#PHP" expanded="false" /> | ||
75 | + <element signature="e#46670#49057#0#PHP" expanded="false" /> | ||
76 | </folding> | 76 | </folding> |
77 | </state> | 77 | </state> |
78 | </provider> | 78 | </provider> |
@@ -177,8 +177,8 @@ | @@ -177,8 +177,8 @@ | ||
177 | </component> | 177 | </component> |
178 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> | 178 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> |
179 | <component name="ProjectFrameBounds"> | 179 | <component name="ProjectFrameBounds"> |
180 | - <option name="x" value="570" /> | ||
181 | - <option name="y" value="88" /> | 180 | + <option name="x" value="294" /> |
181 | + <option name="y" value="75" /> | ||
182 | <option name="width" value="1806" /> | 182 | <option name="width" value="1806" /> |
183 | <option name="height" value="981" /> | 183 | <option name="height" value="981" /> |
184 | </component> | 184 | </component> |
@@ -277,7 +277,7 @@ | @@ -277,7 +277,7 @@ | ||
277 | <workItem from="1574336957891" duration="1350000" /> | 277 | <workItem from="1574336957891" duration="1350000" /> |
278 | <workItem from="1574382087071" duration="22007000" /> | 278 | <workItem from="1574382087071" duration="22007000" /> |
279 | <workItem from="1574410294356" duration="15863000" /> | 279 | <workItem from="1574410294356" duration="15863000" /> |
280 | - <workItem from="1574469667436" duration="13439000" /> | 280 | + <workItem from="1574469667436" duration="13682000" /> |
281 | </task> | 281 | </task> |
282 | <task id="LOCAL-00001" summary="调试"> | 282 | <task id="LOCAL-00001" summary="调试"> |
283 | <created>1574145133364</created> | 283 | <created>1574145133364</created> |
@@ -290,7 +290,7 @@ | @@ -290,7 +290,7 @@ | ||
290 | <servers /> | 290 | <servers /> |
291 | </component> | 291 | </component> |
292 | <component name="TimeTrackingManager"> | 292 | <component name="TimeTrackingManager"> |
293 | - <option name="totallyTimeSpent" value="191249000" /> | 293 | + <option name="totallyTimeSpent" value="191492000" /> |
294 | </component> | 294 | </component> |
295 | <component name="TodoView"> | 295 | <component name="TodoView"> |
296 | <todo-panel id="selected-file"> | 296 | <todo-panel id="selected-file"> |
@@ -302,8 +302,7 @@ | @@ -302,8 +302,7 @@ | ||
302 | </todo-panel> | 302 | </todo-panel> |
303 | </component> | 303 | </component> |
304 | <component name="ToolWindowManager"> | 304 | <component name="ToolWindowManager"> |
305 | - <frame x="570" y="88" width="1806" height="981" extended-state="0" /> | ||
306 | - <editor active="true" /> | 305 | + <frame x="294" y="75" width="1806" height="981" extended-state="0" /> |
307 | <layout> | 306 | <layout> |
308 | <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" /> | 307 | <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" /> |
309 | <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" /> | 308 | <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" /> |
@@ -312,7 +311,7 @@ | @@ -312,7 +311,7 @@ | ||
312 | <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" /> | 311 | <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" /> |
313 | <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" /> | 312 | <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" /> |
314 | <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" /> | 313 | <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" /> |
315 | - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.13625592" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> | 314 | + <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.13625592" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> |
316 | <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" /> | 315 | <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" /> |
317 | <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" /> | 316 | <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" /> |
318 | <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" /> | 317 | <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" /> |
@@ -709,8 +708,8 @@ | @@ -709,8 +708,8 @@ | ||
709 | </entry> | 708 | </entry> |
710 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> | 709 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> |
711 | <provider selected="true" editor-type-id="text-editor"> | 710 | <provider selected="true" editor-type-id="text-editor"> |
712 | - <state relative-caret-position="529"> | ||
713 | - <caret line="1116" column="0" lean-forward="true" selection-start-line="1116" selection-start-column="0" selection-end-line="1116" selection-end-column="0" /> | 711 | + <state relative-caret-position="304"> |
712 | + <caret line="1112" column="9" lean-forward="true" selection-start-line="1112" selection-start-column="9" selection-end-line="1112" selection-end-column="9" /> | ||
714 | <folding> | 713 | <folding> |
715 | <element signature="e#365#484#0#PHP" expanded="false" /> | 714 | <element signature="e#365#484#0#PHP" expanded="false" /> |
716 | <element signature="e#490#1228#0#PHP" expanded="false" /> | 715 | <element signature="e#490#1228#0#PHP" expanded="false" /> |
@@ -756,15 +755,15 @@ | @@ -756,15 +755,15 @@ | ||
756 | <element signature="e#32786#32872#0#PHP" expanded="false" /> | 755 | <element signature="e#32786#32872#0#PHP" expanded="false" /> |
757 | <element signature="e#32961#33049#0#PHP" expanded="false" /> | 756 | <element signature="e#32961#33049#0#PHP" expanded="false" /> |
758 | <element signature="e#34597#35357#0#PHP" expanded="false" /> | 757 | <element signature="e#34597#35357#0#PHP" expanded="false" /> |
759 | - <element signature="e#37207#38038#0#PHP" expanded="false" /> | ||
760 | - <element signature="e#38044#38464#0#PHP" expanded="false" /> | ||
761 | - <element signature="e#38469#38952#0#PHP" expanded="false" /> | ||
762 | - <element signature="e#38958#39764#0#PHP" expanded="false" /> | ||
763 | - <element signature="e#39769#42923#0#PHP" expanded="false" /> | ||
764 | - <element signature="e#42938#44266#0#PHP" expanded="false" /> | ||
765 | - <element signature="e#44282#45309#0#PHP" expanded="false" /> | ||
766 | - <element signature="e#45316#46074#0#PHP" expanded="false" /> | ||
767 | - <element signature="e#46079#48466#0#PHP" expanded="false" /> | 758 | + <element signature="e#37798#38629#0#PHP" expanded="false" /> |
759 | + <element signature="e#38635#39055#0#PHP" expanded="false" /> | ||
760 | + <element signature="e#39060#39543#0#PHP" expanded="false" /> | ||
761 | + <element signature="e#39549#40355#0#PHP" expanded="false" /> | ||
762 | + <element signature="e#40360#43514#0#PHP" expanded="false" /> | ||
763 | + <element signature="e#43529#44857#0#PHP" expanded="false" /> | ||
764 | + <element signature="e#44873#45900#0#PHP" expanded="false" /> | ||
765 | + <element signature="e#45907#46665#0#PHP" expanded="false" /> | ||
766 | + <element signature="e#46670#49057#0#PHP" expanded="false" /> | ||
768 | </folding> | 767 | </folding> |
769 | </state> | 768 | </state> |
770 | </provider> | 769 | </provider> |
@@ -1096,8 +1096,22 @@ class User extends Api | @@ -1096,8 +1096,22 @@ class User extends Api | ||
1096 | } | 1096 | } |
1097 | } | 1097 | } |
1098 | $param['video_id'] = serialize($a); | 1098 | $param['video_id'] = serialize($a); |
1099 | + $arr = Db::name('order') | ||
1100 | + ->field('id,pic_id') | ||
1101 | + ->where($where) | ||
1102 | + ->select(); | ||
1103 | + foreach ($arr as &$v){ | ||
1104 | + $v['pic_id'] = explode(',',$v['pic_id']); | ||
1105 | + $param['pic_id'] = explode(',',$this->request->post('pic_id')); | ||
1106 | + if(!empty($param['pic_id'])){ | ||
1107 | + foreach ($param['pic_id'] as $v3){ | ||
1108 | + if(in_array($v3['pic_id'],$v['pic_id'])){ | ||
1109 | + $this->error(['code'=>2,'msg'=>'该图片已经购买过了','pic_id'=>$v3['pic_id']]); | ||
1110 | + } | ||
1111 | + } | ||
1112 | + } | ||
1113 | + } | ||
1099 | $param['pic_id'] = $this->request->post('pic_id'); | 1114 | $param['pic_id'] = $this->request->post('pic_id'); |
1100 | - | ||
1101 | $param['total'] = $this->request->post('total'); | 1115 | $param['total'] = $this->request->post('total'); |
1102 | if(empty( $param['total'])){ | 1116 | if(empty( $param['total'])){ |
1103 | $this->error(['code'=>2,'msg'=>'缺少必要参数']); | 1117 | $this->error(['code'=>2,'msg'=>'缺少必要参数']); |
@@ -5529,7 +5529,7 @@ | @@ -5529,7 +5529,7 @@ | ||
5529 | 5529 | ||
5530 | <div class="row mt0 footer"> | 5530 | <div class="row mt0 footer"> |
5531 | <div class="col-md-6" align="left"> | 5531 | <div class="col-md-6" align="left"> |
5532 | - Generated on 2019-11-23 13:23:54 </div> | 5532 | + Generated on 2019-11-23 13:28:51 </div> |
5533 | <div class="col-md-6" align="right"> | 5533 | <div class="col-md-6" align="right"> |
5534 | <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a> | 5534 | <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a> |
5535 | </div> | 5535 | </div> |
-
请 注册 或 登录 后发表评论