正在显示
3 个修改的文件
包含
39 行增加
和
41 行删除
@@ -2,9 +2,7 @@ | @@ -2,9 +2,7 @@ | ||
2 | <project version="4"> | 2 | <project version="4"> |
3 | <component name="ChangeListManager"> | 3 | <component name="ChangeListManager"> |
4 | <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> | 4 | <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> |
5 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> | ||
6 | <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" /> | 5 | <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" /> |
7 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" /> | ||
8 | </list> | 6 | </list> |
9 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 7 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
10 | <option name="TRACKING_ENABLED" value="true" /> | 8 | <option name="TRACKING_ENABLED" value="true" /> |
@@ -18,8 +16,8 @@ | @@ -18,8 +16,8 @@ | ||
18 | <file leaf-file-name="User.php" pinned="false" current-in-tab="true"> | 16 | <file leaf-file-name="User.php" pinned="false" current-in-tab="true"> |
19 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> | 17 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> |
20 | <provider selected="true" editor-type-id="text-editor"> | 18 | <provider selected="true" editor-type-id="text-editor"> |
21 | - <state relative-caret-position="295"> | ||
22 | - <caret line="780" column="33" lean-forward="true" selection-start-line="780" selection-start-column="33" selection-end-line="780" selection-end-column="33" /> | 19 | + <state relative-caret-position="243"> |
20 | + <caret line="483" column="31" lean-forward="true" selection-start-line="483" selection-start-column="31" selection-end-line="483" selection-end-column="31" /> | ||
23 | <folding> | 21 | <folding> |
24 | <element signature="e#38#68#0#PHP" expanded="true" /> | 22 | <element signature="e#38#68#0#PHP" expanded="true" /> |
25 | <element signature="e#337#456#0#PHP" expanded="false" /> | 23 | <element signature="e#337#456#0#PHP" expanded="false" /> |
@@ -38,20 +36,20 @@ | @@ -38,20 +36,20 @@ | ||
38 | <element signature="e#11641#12325#0#PHP" expanded="false" /> | 36 | <element signature="e#11641#12325#0#PHP" expanded="false" /> |
39 | <element signature="e#12330#14120#0#PHP" expanded="false" /> | 37 | <element signature="e#12330#14120#0#PHP" expanded="false" /> |
40 | <element signature="e#14126#14996#0#PHP" expanded="false" /> | 38 | <element signature="e#14126#14996#0#PHP" expanded="false" /> |
41 | - <element signature="e#15001#17018#0#PHP" expanded="false" /> | ||
42 | - <element signature="e#17024#17401#0#PHP" expanded="false" /> | ||
43 | - <element signature="e#17406#17670#0#PHP" expanded="false" /> | ||
44 | - <element signature="e#17676#18181#0#PHP" expanded="false" /> | ||
45 | - <element signature="e#18186#18437#0#PHP" expanded="false" /> | ||
46 | - <element signature="e#18443#18922#0#PHP" expanded="false" /> | ||
47 | - <element signature="e#18927#19684#0#PHP" expanded="false" /> | ||
48 | - <element signature="e#19690#20053#0#PHP" expanded="false" /> | ||
49 | - <element signature="e#20058#20249#0#PHP" expanded="false" /> | ||
50 | - <element signature="e#20255#20613#0#PHP" expanded="false" /> | ||
51 | - <element signature="e#20618#20808#0#PHP" expanded="false" /> | ||
52 | - <element signature="e#20814#21957#0#PHP" expanded="false" /> | ||
53 | - <element signature="e#21962#23939#0#PHP" expanded="false" /> | ||
54 | - <element signature="e#23945#24436#0#PHP" expanded="false" /> | 39 | + <element signature="e#17014#17391#0#PHP" expanded="false" /> |
40 | + <element signature="e#17396#17660#0#PHP" expanded="false" /> | ||
41 | + <element signature="e#17666#18171#0#PHP" expanded="false" /> | ||
42 | + <element signature="e#18176#18427#0#PHP" expanded="false" /> | ||
43 | + <element signature="e#18433#18912#0#PHP" expanded="false" /> | ||
44 | + <element signature="e#18917#19674#0#PHP" expanded="false" /> | ||
45 | + <element signature="e#19680#20043#0#PHP" expanded="false" /> | ||
46 | + <element signature="e#20048#20239#0#PHP" expanded="false" /> | ||
47 | + <element signature="e#20245#20603#0#PHP" expanded="false" /> | ||
48 | + <element signature="e#20608#20798#0#PHP" expanded="false" /> | ||
49 | + <element signature="e#20804#21947#0#PHP" expanded="false" /> | ||
50 | + <element signature="e#21952#23929#0#PHP" expanded="false" /> | ||
51 | + <element signature="e#23935#24426#0#PHP" expanded="false" /> | ||
52 | + <element signature="e#24431#25644#0#PHP" expanded="false" /> | ||
55 | </folding> | 53 | </folding> |
56 | </state> | 54 | </state> |
57 | </provider> | 55 | </provider> |
@@ -131,8 +129,8 @@ | @@ -131,8 +129,8 @@ | ||
131 | </component> | 129 | </component> |
132 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> | 130 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> |
133 | <component name="ProjectFrameBounds"> | 131 | <component name="ProjectFrameBounds"> |
134 | - <option name="x" value="510" /> | ||
135 | - <option name="y" value="72" /> | 132 | + <option name="x" value="288" /> |
133 | + <option name="y" value="26" /> | ||
136 | <option name="width" value="1614" /> | 134 | <option name="width" value="1614" /> |
137 | <option name="height" value="977" /> | 135 | <option name="height" value="977" /> |
138 | </component> | 136 | </component> |
@@ -225,7 +223,7 @@ | @@ -225,7 +223,7 @@ | ||
225 | <workItem from="1574141466352" duration="745000" /> | 223 | <workItem from="1574141466352" duration="745000" /> |
226 | <workItem from="1574143209694" duration="3660000" /> | 224 | <workItem from="1574143209694" duration="3660000" /> |
227 | <workItem from="1574146994475" duration="23222000" /> | 225 | <workItem from="1574146994475" duration="23222000" /> |
228 | - <workItem from="1574209189943" duration="24458000" /> | 226 | + <workItem from="1574209189943" duration="24824000" /> |
229 | </task> | 227 | </task> |
230 | <task id="LOCAL-00001" summary="调试"> | 228 | <task id="LOCAL-00001" summary="调试"> |
231 | <created>1574145133364</created> | 229 | <created>1574145133364</created> |
@@ -238,7 +236,7 @@ | @@ -238,7 +236,7 @@ | ||
238 | <servers /> | 236 | <servers /> |
239 | </component> | 237 | </component> |
240 | <component name="TimeTrackingManager"> | 238 | <component name="TimeTrackingManager"> |
241 | - <option name="totallyTimeSpent" value="96033000" /> | 239 | + <option name="totallyTimeSpent" value="96399000" /> |
242 | </component> | 240 | </component> |
243 | <component name="TodoView"> | 241 | <component name="TodoView"> |
244 | <todo-panel id="selected-file"> | 242 | <todo-panel id="selected-file"> |
@@ -250,7 +248,7 @@ | @@ -250,7 +248,7 @@ | ||
250 | </todo-panel> | 248 | </todo-panel> |
251 | </component> | 249 | </component> |
252 | <component name="ToolWindowManager"> | 250 | <component name="ToolWindowManager"> |
253 | - <frame x="510" y="72" width="1614" height="977" extended-state="0" /> | 251 | + <frame x="288" y="26" width="1614" height="977" extended-state="0" /> |
254 | <layout> | 252 | <layout> |
255 | <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15701416" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> | 253 | <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15701416" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> |
256 | <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" /> | 254 | <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" /> |
@@ -681,8 +679,8 @@ | @@ -681,8 +679,8 @@ | ||
681 | </entry> | 679 | </entry> |
682 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> | 680 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> |
683 | <provider selected="true" editor-type-id="text-editor"> | 681 | <provider selected="true" editor-type-id="text-editor"> |
684 | - <state relative-caret-position="295"> | ||
685 | - <caret line="780" column="33" lean-forward="true" selection-start-line="780" selection-start-column="33" selection-end-line="780" selection-end-column="33" /> | 682 | + <state relative-caret-position="243"> |
683 | + <caret line="483" column="31" lean-forward="true" selection-start-line="483" selection-start-column="31" selection-end-line="483" selection-end-column="31" /> | ||
686 | <folding> | 684 | <folding> |
687 | <element signature="e#38#68#0#PHP" expanded="true" /> | 685 | <element signature="e#38#68#0#PHP" expanded="true" /> |
688 | <element signature="e#337#456#0#PHP" expanded="false" /> | 686 | <element signature="e#337#456#0#PHP" expanded="false" /> |
@@ -701,20 +699,20 @@ | @@ -701,20 +699,20 @@ | ||
701 | <element signature="e#11641#12325#0#PHP" expanded="false" /> | 699 | <element signature="e#11641#12325#0#PHP" expanded="false" /> |
702 | <element signature="e#12330#14120#0#PHP" expanded="false" /> | 700 | <element signature="e#12330#14120#0#PHP" expanded="false" /> |
703 | <element signature="e#14126#14996#0#PHP" expanded="false" /> | 701 | <element signature="e#14126#14996#0#PHP" expanded="false" /> |
704 | - <element signature="e#15001#17018#0#PHP" expanded="false" /> | ||
705 | - <element signature="e#17024#17401#0#PHP" expanded="false" /> | ||
706 | - <element signature="e#17406#17670#0#PHP" expanded="false" /> | ||
707 | - <element signature="e#17676#18181#0#PHP" expanded="false" /> | ||
708 | - <element signature="e#18186#18437#0#PHP" expanded="false" /> | ||
709 | - <element signature="e#18443#18922#0#PHP" expanded="false" /> | ||
710 | - <element signature="e#18927#19684#0#PHP" expanded="false" /> | ||
711 | - <element signature="e#19690#20053#0#PHP" expanded="false" /> | ||
712 | - <element signature="e#20058#20249#0#PHP" expanded="false" /> | ||
713 | - <element signature="e#20255#20613#0#PHP" expanded="false" /> | ||
714 | - <element signature="e#20618#20808#0#PHP" expanded="false" /> | ||
715 | - <element signature="e#20814#21957#0#PHP" expanded="false" /> | ||
716 | - <element signature="e#21962#23939#0#PHP" expanded="false" /> | ||
717 | - <element signature="e#23945#24436#0#PHP" expanded="false" /> | 702 | + <element signature="e#17014#17391#0#PHP" expanded="false" /> |
703 | + <element signature="e#17396#17660#0#PHP" expanded="false" /> | ||
704 | + <element signature="e#17666#18171#0#PHP" expanded="false" /> | ||
705 | + <element signature="e#18176#18427#0#PHP" expanded="false" /> | ||
706 | + <element signature="e#18433#18912#0#PHP" expanded="false" /> | ||
707 | + <element signature="e#18917#19674#0#PHP" expanded="false" /> | ||
708 | + <element signature="e#19680#20043#0#PHP" expanded="false" /> | ||
709 | + <element signature="e#20048#20239#0#PHP" expanded="false" /> | ||
710 | + <element signature="e#20245#20603#0#PHP" expanded="false" /> | ||
711 | + <element signature="e#20608#20798#0#PHP" expanded="false" /> | ||
712 | + <element signature="e#20804#21947#0#PHP" expanded="false" /> | ||
713 | + <element signature="e#21952#23929#0#PHP" expanded="false" /> | ||
714 | + <element signature="e#23935#24426#0#PHP" expanded="false" /> | ||
715 | + <element signature="e#24431#25644#0#PHP" expanded="false" /> | ||
718 | </folding> | 716 | </folding> |
719 | </state> | 717 | </state> |
720 | </provider> | 718 | </provider> |
@@ -485,7 +485,7 @@ class User extends Api | @@ -485,7 +485,7 @@ class User extends Api | ||
485 | $this->error(['code'=>2,'msg'=>'缺少必要参数']); | 485 | $this->error(['code'=>2,'msg'=>'缺少必要参数']); |
486 | } | 486 | } |
487 | $data = Db::name('video') | 487 | $data = Db::name('video') |
488 | - ->field('id,title,thumbnail,video,price,vip_price,water_url,content') | 488 | + ->field('id,title,thumbnail,video,price,water_url,content') |
489 | ->where('id',$pic_id) | 489 | ->where('id',$pic_id) |
490 | ->find(); | 490 | ->find(); |
491 | if(empty($data)){ | 491 | if(empty($data)){ |
@@ -3116,7 +3116,7 @@ | @@ -3116,7 +3116,7 @@ | ||
3116 | 3116 | ||
3117 | <div class="row mt0 footer"> | 3117 | <div class="row mt0 footer"> |
3118 | <div class="col-md-6" align="left"> | 3118 | <div class="col-md-6" align="left"> |
3119 | - Generated on 2019-11-20 15:56:47 </div> | 3119 | + Generated on 2019-11-20 16:02:54 </div> |
3120 | <div class="col-md-6" align="right"> | 3120 | <div class="col-md-6" align="right"> |
3121 | <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a> | 3121 | <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a> |
3122 | </div> | 3122 | </div> |
-
请 注册 或 登录 后发表评论