郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 060f2c3859ded2c74907ae81a52dbe24ec85242c 1 个父辈 08fdd733
1 个管道 的构建 通过 耗费 1 秒

修改单选框

内嵌 并排对比
正在显示 3 个修改的文件 包含 76 行增加 和 142 行删除
@@ -6,12 +6,8 @@ @@ -6,12 +6,8 @@
6 <component name="ChangeListManager"> 6 <component name="ChangeListManager">
7 <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> 7 <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
8 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 8 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
9 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/pic/add.html" afterPath="$PROJECT_DIR$/application/admin/view/pic/add.html" />  
10 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/pic/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/pic/edit.html" />  
11 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/video/add.html" afterPath="$PROJECT_DIR$/application/admin/view/video/add.html" /> 9 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/video/add.html" afterPath="$PROJECT_DIR$/application/admin/view/video/add.html" />
12 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/video/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/video/edit.html" /> 10 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/video/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/video/edit.html" />
13 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />  
14 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />  
15 </list> 11 </list>
16 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 12 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
17 <option name="TRACKING_ENABLED" value="true" /> 13 <option name="TRACKING_ENABLED" value="true" />
@@ -25,101 +21,21 @@ @@ -25,101 +21,21 @@
25 <file leaf-file-name="Video.php" pinned="false" current-in-tab="false"> 21 <file leaf-file-name="Video.php" pinned="false" current-in-tab="false">
26 <entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php"> 22 <entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
27 <provider selected="true" editor-type-id="text-editor"> 23 <provider selected="true" editor-type-id="text-editor">
28 - <state relative-caret-position="821">  
29 - <caret line="136" column="40" lean-forward="false" selection-start-line="136" selection-start-column="40" selection-end-line="136" selection-end-column="40" />  
30 - <folding /> 24 + <state relative-caret-position="298">
  25 + <caret line="80" column="25" lean-forward="false" selection-start-line="80" selection-start-column="25" selection-end-line="80" selection-end-column="25" />
  26 + <folding>
  27 + <element signature="e#2201#6736#0#PHP" expanded="false" />
  28 + </folding>
31 </state> 29 </state>
32 </provider> 30 </provider>
33 </entry> 31 </entry>
34 </file> 32 </file>
35 - <file leaf-file-name="User.php" pinned="false" current-in-tab="true">  
36 - <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 33 + <file leaf-file-name="edit.html" pinned="false" current-in-tab="true">
  34 + <entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
37 <provider selected="true" editor-type-id="text-editor"> 35 <provider selected="true" editor-type-id="text-editor">
38 - <state relative-caret-position="167">  
39 - <caret line="703" column="33" lean-forward="false" selection-start-line="703" selection-start-column="33" selection-end-line="703" selection-end-column="33" />  
40 - <folding>  
41 - <element signature="e#535#1273#0#PHP" expanded="false" />  
42 - <element signature="e#1278#2941#0#PHP" expanded="false" />  
43 - <element signature="e#2947#3309#0#PHP" expanded="false" />  
44 - <element signature="e#3314#3604#0#PHP" expanded="false" />  
45 - <element signature="e#3610#3932#0#PHP" expanded="false" />  
46 - <element signature="e#3937#4224#0#PHP" expanded="false" />  
47 - <element signature="e#4231#4665#0#PHP" expanded="false" />  
48 - <element signature="e#4670#5028#0#PHP" expanded="false" />  
49 - <element signature="e#5034#5441#0#PHP" expanded="false" />  
50 - <element signature="e#5446#5789#0#PHP" expanded="false" />  
51 - <element signature="e#5795#6208#0#PHP" expanded="false" />  
52 - <element signature="e#6213#6530#0#PHP" expanded="false" />  
53 - <element signature="e#6536#7634#0#PHP" expanded="false" />  
54 - <element signature="e#7639#10426#0#PHP" expanded="false" />  
55 - <element signature="e#8426#8733#0#PHP" expanded="false" />  
56 - <element signature="e#8796#9078#0#PHP" expanded="false" />  
57 - <element signature="e#9142#9412#0#PHP" expanded="false" />  
58 - <element signature="e#10432#11112#0#PHP" expanded="false" />  
59 - <element signature="e#11117#11975#0#PHP" expanded="false" />  
60 - <element signature="e#11981#12770#0#PHP" expanded="false" />  
61 - <element signature="e#12775#14124#0#PHP" expanded="false" />  
62 - <element signature="e#14130#14832#0#PHP" expanded="false" />  
63 - <element signature="e#14837#16157#0#PHP" expanded="false" />  
64 - <element signature="e#16163#16739#0#PHP" expanded="false" />  
65 - <element signature="e#16744#17356#0#PHP" expanded="false" />  
66 - <element signature="e#17362#18078#0#PHP" expanded="false" />  
67 - <element signature="e#18083#22210#0#PHP" expanded="false" />  
68 - <element signature="e#22216#23146#0#PHP" expanded="false" />  
69 - <element signature="e#23151#27836#0#PHP" expanded="false" />  
70 - <element signature="e#27842#28219#0#PHP" expanded="false" />  
71 - <element signature="e#28224#28663#0#PHP" expanded="false" />  
72 - <element signature="e#28669#29490#0#PHP" expanded="false" />  
73 - <element signature="e#29495#32899#0#PHP" expanded="false" />  
74 - <element signature="e#29941#32893#0#PHP" expanded="false" />  
75 - <element signature="e#32905#33410#0#PHP" expanded="false" />  
76 - <element signature="e#33415#33666#0#PHP" expanded="false" />  
77 - <element signature="e#33672#34151#0#PHP" expanded="false" />  
78 - <element signature="e#34156#34913#0#PHP" expanded="false" />  
79 - <element signature="e#34919#35400#0#PHP" expanded="false" />  
80 - <element signature="e#35405#36175#0#PHP" expanded="false" />  
81 - <element signature="e#36181#36544#0#PHP" expanded="false" />  
82 - <element signature="e#36549#36740#0#PHP" expanded="false" />  
83 - <element signature="e#36746#37104#0#PHP" expanded="false" />  
84 - <element signature="e#37109#37300#0#PHP" expanded="false" />  
85 - <element signature="e#37306#38449#0#PHP" expanded="false" />  
86 - <element signature="e#38454#41119#0#PHP" expanded="false" />  
87 - <element signature="e#41125#41623#0#PHP" expanded="false" />  
88 - <element signature="e#41628#43374#0#PHP" expanded="false" />  
89 - <element signature="e#43380#43793#0#PHP" expanded="false" />  
90 - <element signature="e#43798#44277#0#PHP" expanded="false" />  
91 - <element signature="e#44283#44817#0#PHP" expanded="false" />  
92 - <element signature="e#44822#46207#0#PHP" expanded="false" />  
93 - <element signature="e#46213#46867#0#PHP" expanded="false" />  
94 - <element signature="e#46872#48887#0#PHP" expanded="false" />  
95 - <element signature="e#48893#49653#0#PHP" expanded="false" />  
96 - <element signature="e#49658#52367#0#PHP" expanded="false" />  
97 - <element signature="e#52393#53224#0#PHP" expanded="false" />  
98 - <element signature="e#53230#53650#0#PHP" expanded="false" />  
99 - <element signature="e#53655#54138#0#PHP" expanded="false" />  
100 - <element signature="e#54144#54950#0#PHP" expanded="false" />  
101 - <element signature="e#54955#58113#0#PHP" expanded="false" />  
102 - <element signature="e#56748#58107#0#PHP" expanded="false" />  
103 - <element signature="e#58128#59463#0#PHP" expanded="false" />  
104 - <element signature="e#58244#58646#0#PHP" expanded="false" />  
105 - <element signature="e#59479#60513#0#PHP" expanded="false" />  
106 - <element signature="e#60519#61277#0#PHP" expanded="false" />  
107 - <element signature="e#61282#65025#0#PHP" expanded="false" />  
108 - <element signature="e#65031#65423#0#PHP" expanded="false" />  
109 - <element signature="e#65428#66380#0#PHP" expanded="false" />  
110 - <element signature="e#66404#66977#0#PHP" expanded="false" />  
111 - <element signature="e#66983#67582#0#PHP" expanded="false" />  
112 - <element signature="e#67587#68514#0#PHP" expanded="false" />  
113 - <element signature="e#68520#69234#0#PHP" expanded="false" />  
114 - <element signature="e#69240#69667#0#PHP" expanded="false" />  
115 - <element signature="e#69672#70141#0#PHP" expanded="false" />  
116 - <element signature="e#70148#71353#0#PHP" expanded="false" />  
117 - <element signature="e#71358#73061#0#PHP" expanded="false" />  
118 - <element signature="e#73067#73844#0#PHP" expanded="false" />  
119 - <element signature="e#73849#77787#0#PHP" expanded="false" />  
120 - <element signature="e#77793#78302#0#PHP" expanded="false" />  
121 - <element signature="e#78307#78979#0#PHP" expanded="false" />  
122 - </folding> 36 + <state relative-caret-position="346">
  37 + <caret line="118" column="17" lean-forward="true" selection-start-line="118" selection-start-column="17" selection-end-line="118" selection-end-column="17" />
  38 + <folding />
123 </state> 39 </state>
124 </provider> 40 </provider>
125 </entry> 41 </entry>
@@ -205,9 +121,9 @@ @@ -205,9 +121,9 @@
205 <option value="$PROJECT_DIR$/application/api/controller/Pay.php" /> 121 <option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
206 <option value="$PROJECT_DIR$/application/admin/view/pic/add.html" /> 122 <option value="$PROJECT_DIR$/application/admin/view/pic/add.html" />
207 <option value="$PROJECT_DIR$/application/admin/view/pic/edit.html" /> 123 <option value="$PROJECT_DIR$/application/admin/view/pic/edit.html" />
  124 + <option value="$PROJECT_DIR$/application/api/controller/User.php" />
208 <option value="$PROJECT_DIR$/application/admin/view/video/add.html" /> 125 <option value="$PROJECT_DIR$/application/admin/view/video/add.html" />
209 <option value="$PROJECT_DIR$/application/admin/view/video/edit.html" /> 126 <option value="$PROJECT_DIR$/application/admin/view/video/edit.html" />
210 - <option value="$PROJECT_DIR$/application/api/controller/User.php" />  
211 </list> 127 </list>
212 </option> 128 </option>
213 </component> 129 </component>
@@ -225,11 +141,11 @@ @@ -225,11 +141,11 @@
225 <sorting>DEFINITION_ORDER</sorting> 141 <sorting>DEFINITION_ORDER</sorting>
226 </component> 142 </component>
227 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 143 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
228 - <component name="ProjectFrameBounds" extendedState="1">  
229 - <option name="x" value="99" />  
230 - <option name="y" value="111" />  
231 - <option name="width" value="1652" />  
232 - <option name="height" value="933" /> 144 + <component name="ProjectFrameBounds" extendedState="7">
  145 + <option name="x" value="51" />
  146 + <option name="y" value="155" />
  147 + <option name="width" value="1811" />
  148 + <option name="height" value="958" />
233 </component> 149 </component>
234 <component name="ProjectView"> 150 <component name="ProjectView">
235 <navigator currentView="ProjectPane" proportions="" version="1"> 151 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -264,15 +180,30 @@ @@ -264,15 +180,30 @@
264 <item name="areial" type="b2602c69:ProjectViewProjectNode" /> 180 <item name="areial" type="b2602c69:ProjectViewProjectNode" />
265 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> 181 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
266 <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> 182 <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
267 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> 183 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
268 </path> 184 </path>
269 <path> 185 <path>
270 <item name="areial" type="b2602c69:ProjectViewProjectNode" /> 186 <item name="areial" type="b2602c69:ProjectViewProjectNode" />
271 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> 187 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
272 <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> 188 <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
273 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> 189 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
274 <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> 190 <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
275 </path> 191 </path>
  192 + <path>
  193 + <item name="areial" type="b2602c69:ProjectViewProjectNode" />
  194 + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
  195 + <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
  196 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
  197 + <item name="view" type="2a2b976b:PhpTreeStructureProvider$1" />
  198 + </path>
  199 + <path>
  200 + <item name="areial" type="b2602c69:ProjectViewProjectNode" />
  201 + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
  202 + <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
  203 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
  204 + <item name="view" type="2a2b976b:PhpTreeStructureProvider$1" />
  205 + <item name="video" type="2a2b976b:PhpTreeStructureProvider$1" />
  206 + </path>
276 </expand> 207 </expand>
277 <select /> 208 <select />
278 </subPane> 209 </subPane>
@@ -422,7 +353,7 @@ @@ -422,7 +353,7 @@
422 <workItem from="1584405342474" duration="4206000" /> 353 <workItem from="1584405342474" duration="4206000" />
423 <workItem from="1584687351301" duration="330000" /> 354 <workItem from="1584687351301" duration="330000" />
424 <workItem from="1584758035473" duration="1782000" /> 355 <workItem from="1584758035473" duration="1782000" />
425 - <workItem from="1584775386700" duration="2949000" /> 356 + <workItem from="1584775386700" duration="3883000" />
426 </task> 357 </task>
427 <task id="LOCAL-00001" summary="调试"> 358 <task id="LOCAL-00001" summary="调试">
428 <created>1574145133364</created> 359 <created>1574145133364</created>
@@ -449,7 +380,7 @@ @@ -449,7 +380,7 @@
449 <servers /> 380 <servers />
450 </component> 381 </component>
451 <component name="TimeTrackingManager"> 382 <component name="TimeTrackingManager">
452 - <option name="totallyTimeSpent" value="627955000" /> 383 + <option name="totallyTimeSpent" value="628889000" />
453 </component> 384 </component>
454 <component name="TodoView"> 385 <component name="TodoView">
455 <todo-panel id="selected-file"> 386 <todo-panel id="selected-file">
@@ -461,16 +392,17 @@ @@ -461,16 +392,17 @@
461 </todo-panel> 392 </todo-panel>
462 </component> 393 </component>
463 <component name="ToolWindowManager"> 394 <component name="ToolWindowManager">
464 - <frame x="99" y="111" width="1652" height="933" extended-state="1" /> 395 + <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
  396 + <editor active="true" />
465 <layout> 397 <layout>
466 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.15515076" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> 398 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.13166311" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
467 <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" /> 399 <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" />
468 <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.32876712" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" /> 400 <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.32876712" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
469 <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" /> 401 <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" />
470 <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" /> 402 <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" />
471 <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" /> 403 <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" />
472 <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" /> 404 <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" />
473 - <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.46733668" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 405 + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.46733668" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
474 <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" /> 406 <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" />
475 <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" /> 407 <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" />
476 <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" /> 408 <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" />
@@ -1065,22 +997,6 @@ @@ -1065,22 +997,6 @@
1065 </state> 997 </state>
1066 </provider> 998 </provider>
1067 </entry> 999 </entry>
1068 - <entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">  
1069 - <provider selected="true" editor-type-id="text-editor">  
1070 - <state relative-caret-position="371">  
1071 - <caret line="134" column="189" lean-forward="true" selection-start-line="134" selection-start-column="189" selection-end-line="134" selection-end-column="189" />  
1072 - <folding />  
1073 - </state>  
1074 - </provider>  
1075 - </entry>  
1076 - <entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">  
1077 - <provider selected="true" editor-type-id="text-editor">  
1078 - <state relative-caret-position="300">  
1079 - <caret line="129" column="172" lean-forward="true" selection-start-line="129" selection-start-column="172" selection-end-line="129" selection-end-column="172" />  
1080 - <folding />  
1081 - </state>  
1082 - </provider>  
1083 - </entry>  
1084 <entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html"> 1000 <entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html">
1085 <provider selected="true" editor-type-id="text-editor"> 1001 <provider selected="true" editor-type-id="text-editor">
1086 <state relative-caret-position="1315"> 1002 <state relative-caret-position="1315">
@@ -1089,14 +1005,6 @@ @@ -1089,14 +1005,6 @@
1089 </state> 1005 </state>
1090 </provider> 1006 </provider>
1091 </entry> 1007 </entry>
1092 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">  
1093 - <provider selected="true" editor-type-id="text-editor">  
1094 - <state relative-caret-position="821">  
1095 - <caret line="136" column="40" lean-forward="false" selection-start-line="136" selection-start-column="40" selection-end-line="136" selection-end-column="40" />  
1096 - <folding />  
1097 - </state>  
1098 - </provider>  
1099 - </entry>  
1100 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 1008 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
1101 <provider selected="true" editor-type-id="text-editor"> 1009 <provider selected="true" editor-type-id="text-editor">
1102 <state relative-caret-position="167"> 1010 <state relative-caret-position="167">
@@ -1187,5 +1095,31 @@ @@ -1187,5 +1095,31 @@
1187 </state> 1095 </state>
1188 </provider> 1096 </provider>
1189 </entry> 1097 </entry>
  1098 + <entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
  1099 + <provider selected="true" editor-type-id="text-editor">
  1100 + <state relative-caret-position="450">
  1101 + <caret line="135" column="175" lean-forward="false" selection-start-line="135" selection-start-column="175" selection-end-line="135" selection-end-column="175" />
  1102 + <folding />
  1103 + </state>
  1104 + </provider>
  1105 + </entry>
  1106 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
  1107 + <provider selected="true" editor-type-id="text-editor">
  1108 + <state relative-caret-position="298">
  1109 + <caret line="80" column="25" lean-forward="false" selection-start-line="80" selection-start-column="25" selection-end-line="80" selection-end-column="25" />
  1110 + <folding>
  1111 + <element signature="e#2201#6736#0#PHP" expanded="false" />
  1112 + </folding>
  1113 + </state>
  1114 + </provider>
  1115 + </entry>
  1116 + <entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
  1117 + <provider selected="true" editor-type-id="text-editor">
  1118 + <state relative-caret-position="346">
  1119 + <caret line="118" column="17" lean-forward="true" selection-start-line="118" selection-start-column="17" selection-end-line="118" selection-end-column="17" />
  1120 + <folding />
  1121 + </state>
  1122 + </provider>
  1123 + </entry>
1190 </component> 1124 </component>
1191 </project> 1125 </project>
@@ -127,37 +127,37 @@ @@ -127,37 +127,37 @@
127 <div class="form-group"> 127 <div class="form-group">
128 <label class="control-label col-xs-12 col-sm-2">{:__('2K分辨率')}:</label> 128 <label class="control-label col-xs-12 col-sm-2">{:__('2K分辨率')}:</label>
129 <div class="col-xs-12 col-sm-8"> 129 <div class="col-xs-12 col-sm-8">
130 - {:build_radios('row[two]', ['2K 分辨率 1920*1080'=>__('2K 分辨率 1920*1080'), '2K 分辨率 1920*1280'=>__('2K 分辨率 1920*1280'),'2K 分辨率 2560*1440'=>__('2K 分辨率 2560*1440')])} 130 + {:build_radios('row[two]', ['2K 分辨率 1920*1080'=>__('2K 分辨率 1920*1080'), '2K 分辨率 1920*1280'=>__('2K 分辨率 1920*1280'),'2K 分辨率 2560*1440'=>__('2K 分辨率 2560*1440')],'-1')}
131 </div> 131 </div>
132 </div> 132 </div>
133 <div class="form-group"> 133 <div class="form-group">
134 <label class="control-label col-xs-12 col-sm-2">{:__('4K分辨率')}:</label> 134 <label class="control-label col-xs-12 col-sm-2">{:__('4K分辨率')}:</label>
135 <div class="col-xs-12 col-sm-8"> 135 <div class="col-xs-12 col-sm-8">
136 - {:Form::checkboxs('row[four]', ['4K 分辨率 3840*2160'=>__('4K 分辨率 3840*2160'), '4K 分辨率 3840*2560'=>__('4K 分辨率 3840*2560'),'4K 分辨率 4096*2160'=>__('4K 分辨率 4096*2160')],['data-rule'=>'required'])} 136 + {:build_radios('row[four]', ['4K 分辨率 3840*2160'=>__('4K 分辨率 3840*2160'), '4K 分辨率 3840*2560'=>__('4K 分辨率 3840*2560'),'4K 分辨率 4096*2160'=>__('4K 分辨率 4096*2160')],'-1')}
137 </div> 137 </div>
138 </div> 138 </div>
139 <div class="form-group"> 139 <div class="form-group">
140 <label class="control-label col-xs-12 col-sm-2">{:__('8K分辨率')}:</label> 140 <label class="control-label col-xs-12 col-sm-2">{:__('8K分辨率')}:</label>
141 <div class="col-xs-12 col-sm-8"> 141 <div class="col-xs-12 col-sm-8">
142 - {:Form::checkboxs('row[eight]', ['8K 分辨率 7680*4320'=>__('8K 分辨率 7680*4320'), '6K 分辨率 6144*3456'=>__('6K 分辨率 6144*3456'),'5K 分辨率 5568*3648'=>__('5K 分辨率 5568*3648')],['data-rule'=>'required'])} 142 + {:build_radios('row[eight]', ['8K 分辨率 7680*4320'=>__('8K 分辨率 7680*4320'), '6K 分辨率 6144*3456'=>__('6K 分辨率 6144*3456'),'5K 分辨率 5568*3648'=>__('5K 分辨率 5568*3648')],'-1')}
143 </div> 143 </div>
144 </div> 144 </div>
145 <div class="form-group"> 145 <div class="form-group">
146 <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label> 146 <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
147 <div class="col-xs-12 col-sm-8"> 147 <div class="col-xs-12 col-sm-8">
148 - {:Form::checkboxs('row[price]', ['800'=>__('800'), '1200'=>__('1200'),'1800'=>__('1800')],['data-rule'=>'required'])} 148 + {:build_radios('row[price]', ['800'=>__('800'), '1200'=>__('1200'),'1800'=>__('1800')],'-1')}
149 </div> 149 </div>
150 </div> 150 </div>
151 <div class="form-group"> 151 <div class="form-group">
152 <label class="control-label col-xs-12 col-sm-2">{:__('Four_price')}:</label> 152 <label class="control-label col-xs-12 col-sm-2">{:__('Four_price')}:</label>
153 <div class="col-xs-12 col-sm-8"> 153 <div class="col-xs-12 col-sm-8">
154 - {:Form::checkboxs('row[four_price]', ['1200'=>__('1200'), '2000'=>__('2000'),'2800'=>__('2800')],['data-rule'=>'required'])} 154 + {:build_radios('row[four_price]', ['1200'=>__('1200'), '2000'=>__('2000'),'2800'=>__('2800')],'-1')}
155 </div> 155 </div>
156 </div> 156 </div>
157 <div class="form-group"> 157 <div class="form-group">
158 <label class="control-label col-xs-12 col-sm-2">{:__('Eight_price')}:</label> 158 <label class="control-label col-xs-12 col-sm-2">{:__('Eight_price')}:</label>
159 <div class="col-xs-12 col-sm-8"> 159 <div class="col-xs-12 col-sm-8">
160 - {:Form::checkboxs('row[eight_price]', ['2800'=>__('2800'), '1'=>__('3800'),'2'=>__('4800')],['data-rule'=>'required'])} 160 + {:build_radios('row[eight_price]', ['2800'=>__('2800'), '1'=>__('3800'),'2'=>__('4800')],'-1')}
161 </div> 161 </div>
162 </div> 162 </div>
163 <!--<div class="form-group">--> 163 <!--<div class="form-group">-->
@@ -132,31 +132,31 @@ @@ -132,31 +132,31 @@
132 <div class="form-group"> 132 <div class="form-group">
133 <label class="control-label col-xs-12 col-sm-2">{:__('4K分辨率')}:</label> 133 <label class="control-label col-xs-12 col-sm-2">{:__('4K分辨率')}:</label>
134 <div class="col-xs-12 col-sm-8"> 134 <div class="col-xs-12 col-sm-8">
135 - {:Form::checkboxs('row[four]', ['4K 分辨率 3840*2160'=>__('4K 分辨率 3840*2160'), '4K 分辨率 3840*2560'=>__('4K 分辨率 3840*2560'),'4K 分辨率 4096*2160'=>__('4K 分辨率 4096*2160')],$row['four'])} 135 + {:build_radios('row[four]', ['4K 分辨率 3840*2160'=>__('4K 分辨率 3840*2160'), '4K 分辨率 3840*2560'=>__('4K 分辨率 3840*2560'),'4K 分辨率 4096*2160'=>__('4K 分辨率 4096*2160')],$row['four'])}
136 </div> 136 </div>
137 </div> 137 </div>
138 <div class="form-group"> 138 <div class="form-group">
139 <label class="control-label col-xs-12 col-sm-2">{:__('8K分辨率')}:</label> 139 <label class="control-label col-xs-12 col-sm-2">{:__('8K分辨率')}:</label>
140 <div class="col-xs-12 col-sm-8"> 140 <div class="col-xs-12 col-sm-8">
141 - {:Form::checkboxs('row[eight]', ['8K 分辨率 7680*4320'=>__('8K 分辨率 7680*4320'), '6K 分辨率 6144*3456'=>__('6K 分辨率 6144*3456'),'5K 分辨率 5568*3648'=>__('5K 分辨率 5568*3648')],$row['eight'])} 141 + {:build_radios('row[eight]', ['8K 分辨率 7680*4320'=>__('8K 分辨率 7680*4320'), '6K 分辨率 6144*3456'=>__('6K 分辨率 6144*3456'),'5K 分辨率 5568*3648'=>__('5K 分辨率 5568*3648')],$row['eight'])}
142 </div> 142 </div>
143 </div> 143 </div>
144 <div class="form-group"> 144 <div class="form-group">
145 <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label> 145 <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
146 <div class="col-xs-12 col-sm-8"> 146 <div class="col-xs-12 col-sm-8">
147 - {:Form::checkboxs('row[price]', ['800'=>__('800'), '1200'=>__('1200'),'1800'=>__('1800元')],$row['price'])} 147 + {:build_radios('row[price]', ['800'=>__('800'), '1200'=>__('1200'),'1800'=>__('1800元')],$row['price'])}
148 </div> 148 </div>
149 </div> 149 </div>
150 <div class="form-group"> 150 <div class="form-group">
151 <label class="control-label col-xs-12 col-sm-2">{:__('Four_price')}:</label> 151 <label class="control-label col-xs-12 col-sm-2">{:__('Four_price')}:</label>
152 <div class="col-xs-12 col-sm-8"> 152 <div class="col-xs-12 col-sm-8">
153 - {:Form::checkboxs('row[four_price]', ['1200'=>__('1200元'), '2000'=>__('2000元'),'2800'=>__('2800元')],$row['four_price'])} 153 + {:build_radios('row[four_price]', ['1200'=>__('1200元'), '2000'=>__('2000元'),'2800'=>__('2800元')],$row['four_price'])}
154 </div> 154 </div>
155 </div> 155 </div>
156 <div class="form-group"> 156 <div class="form-group">
157 <label class="control-label col-xs-12 col-sm-2">{:__('Eight_price')}:</label> 157 <label class="control-label col-xs-12 col-sm-2">{:__('Eight_price')}:</label>
158 <div class="col-xs-12 col-sm-8"> 158 <div class="col-xs-12 col-sm-8">
159 - {:Form::checkboxs('row[eight_price]', ['1200'=>__('2800元'), '3800'=>__('3800元'),'4800'=>__('4800元')],$row['eight_price'])} 159 + {:build_radios('row[eight_price]', ['1200'=>__('2800元'), '3800'=>__('3800元'),'4800'=>__('4800元')],$row['eight_price'])}
160 </div> 160 </div>
161 </div> 161 </div>
162 162