lifangxu / cepc · 提交

转到一个项目

作者 lifangxu
提交 0d043f1b6d7e88b32847ca8799f2fa4636327c26 1 个父辈 9fb4cd21

nav

内嵌 并排对比
正在显示 7 个修改的文件 包含 133 行增加 和 57 行删除
@@ -14,14 +14,14 @@ @@ -14,14 +14,14 @@
14 <file leaf-file-name="index.html" pinned="false" current-in-tab="false"> 14 <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
15 <entry file="file://$PROJECT_DIR$/application/index/view/index/index.html"> 15 <entry file="file://$PROJECT_DIR$/application/index/view/index/index.html">
16 <provider selected="true" editor-type-id="text-editor"> 16 <provider selected="true" editor-type-id="text-editor">
17 - <state relative-caret-position="-99">  
18 - <caret line="384" column="37" lean-forward="false" selection-start-line="384" selection-start-column="37" selection-end-line="384" selection-end-column="37" /> 17 + <state relative-caret-position="-284">
  18 + <caret line="221" column="21" lean-forward="false" selection-start-line="221" selection-start-column="21" selection-end-line="221" selection-end-column="21" />
19 <folding> 19 <folding>
20 - <element signature="e#5756#5821#0" expanded="false" />  
21 - <element signature="e#5852#7987#0" expanded="false" />  
22 - <element signature="e#8100#8171#0" expanded="false" />  
23 - <element signature="e#8204#9864#0" expanded="false" />  
24 - <element signature="e#11441#11514#0" expanded="false" /> 20 + <element signature="e#5767#5832#0" expanded="false" />
  21 + <element signature="e#5863#7998#0" expanded="false" />
  22 + <element signature="e#8111#8182#0" expanded="false" />
  23 + <element signature="e#8215#9875#0" expanded="false" />
  24 + <element signature="e#11452#11525#0" expanded="false" />
25 </folding> 25 </folding>
26 </state> 26 </state>
27 </provider> 27 </provider>
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 <file leaf-file-name="Index.php" pinned="false" current-in-tab="false"> 30 <file leaf-file-name="Index.php" pinned="false" current-in-tab="false">
31 <entry file="file://$PROJECT_DIR$/application/index/controller/Index.php"> 31 <entry file="file://$PROJECT_DIR$/application/index/controller/Index.php">
32 <provider selected="true" editor-type-id="text-editor"> 32 <provider selected="true" editor-type-id="text-editor">
33 - <state relative-caret-position="-406"> 33 + <state relative-caret-position="494">
34 <caret line="42" column="13" lean-forward="false" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" /> 34 <caret line="42" column="13" lean-forward="false" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
35 <folding /> 35 <folding />
36 </state> 36 </state>
@@ -40,8 +40,8 @@ @@ -40,8 +40,8 @@
40 <file leaf-file-name="Base.php" pinned="false" current-in-tab="false"> 40 <file leaf-file-name="Base.php" pinned="false" current-in-tab="false">
41 <entry file="file://$PROJECT_DIR$/application/index/controller/Base.php"> 41 <entry file="file://$PROJECT_DIR$/application/index/controller/Base.php">
42 <provider selected="true" editor-type-id="text-editor"> 42 <provider selected="true" editor-type-id="text-editor">
43 - <state relative-caret-position="100">  
44 - <caret line="61" column="3" lean-forward="false" selection-start-line="61" selection-start-column="3" selection-end-line="61" selection-end-column="23" /> 43 + <state relative-caret-position="625">
  44 + <caret line="37" column="48" lean-forward="false" selection-start-line="37" selection-start-column="48" selection-end-line="37" selection-end-column="48" />
45 <folding /> 45 <folding />
46 </state> 46 </state>
47 </provider> 47 </provider>
@@ -80,8 +80,8 @@ @@ -80,8 +80,8 @@
80 <file leaf-file-name="layout.html" pinned="false" current-in-tab="true"> 80 <file leaf-file-name="layout.html" pinned="false" current-in-tab="true">
81 <entry file="file://$PROJECT_DIR$/application/index/view/layout/layout.html"> 81 <entry file="file://$PROJECT_DIR$/application/index/view/layout/layout.html">
82 <provider selected="true" editor-type-id="text-editor"> 82 <provider selected="true" editor-type-id="text-editor">
83 - <state relative-caret-position="125">  
84 - <caret line="23" column="26" lean-forward="false" selection-start-line="23" selection-start-column="26" selection-end-line="23" selection-end-column="26" /> 83 + <state relative-caret-position="521">
  84 + <caret line="782" column="12" lean-forward="false" selection-start-line="782" selection-start-column="12" selection-end-line="782" selection-end-column="12" />
85 <folding /> 85 <folding />
86 </state> 86 </state>
87 </provider> 87 </provider>
@@ -91,7 +91,6 @@ @@ -91,7 +91,6 @@
91 </component> 91 </component>
92 <component name="FindInProjectRecents"> 92 <component name="FindInProjectRecents">
93 <findStrings> 93 <findStrings>
94 - <find>pic_list</find>  
95 <find>mid_samll_box</find> 94 <find>mid_samll_box</find>
96 <find>code</find> 95 <find>code</find>
97 <find>display: none;</find> 96 <find>display: none;</find>
@@ -116,11 +115,12 @@ @@ -116,11 +115,12 @@
116 <find>swiper-slide</find> 115 <find>swiper-slide</find>
117 <find>change</find> 116 <find>change</find>
118 <find>2018</find> 117 <find>2018</find>
119 - <find>test2</find>  
120 <find>9</find> 118 <find>9</find>
121 <find>pepoleshow</find> 119 <find>pepoleshow</find>
122 <find>Swiper</find> 120 <find>Swiper</find>
123 <find>$(this).attr('class',&quot;color_month&quot;);class=&quot;color_month&quot;</find> 121 <find>$(this).attr('class',&quot;color_month&quot;);class=&quot;color_month&quot;</find>
  122 + <find>dongtai</find>
  123 + <find>test2</find>
124 </findStrings> 124 </findStrings>
125 </component> 125 </component>
126 <component name="Git.Settings"> 126 <component name="Git.Settings">
@@ -167,7 +167,6 @@ @@ -167,7 +167,6 @@
167 <option value="$PROJECT_DIR$/application/index/view/us/aboutUs.html" /> 167 <option value="$PROJECT_DIR$/application/index/view/us/aboutUs.html" />
168 <option value="$PROJECT_DIR$/application/index/controller/Addressus.php" /> 168 <option value="$PROJECT_DIR$/application/index/controller/Addressus.php" />
169 <option value="$PROJECT_DIR$/application/index/view/us/contact.html" /> 169 <option value="$PROJECT_DIR$/application/index/view/us/contact.html" />
170 - <option value="$PROJECT_DIR$/application/index/controller/Base.php" />  
171 <option value="$PROJECT_DIR$/application/index/controller/Themedetail.php" /> 170 <option value="$PROJECT_DIR$/application/index/controller/Themedetail.php" />
172 <option value="$PROJECT_DIR$/application/index/view/detail/theme_detail.html" /> 171 <option value="$PROJECT_DIR$/application/index/view/detail/theme_detail.html" />
173 <option value="$PROJECT_DIR$/application/index/controller/Videodetail.php" /> 172 <option value="$PROJECT_DIR$/application/index/controller/Videodetail.php" />
@@ -179,6 +178,7 @@ @@ -179,6 +178,7 @@
179 <option value="$PROJECT_DIR$/application/api/view/baike/rw.html" /> 178 <option value="$PROJECT_DIR$/application/api/view/baike/rw.html" />
180 <option value="$PROJECT_DIR$/application/index/controller/Index.php" /> 179 <option value="$PROJECT_DIR$/application/index/controller/Index.php" />
181 <option value="$PROJECT_DIR$/application/index/view/index/index.html" /> 180 <option value="$PROJECT_DIR$/application/index/view/index/index.html" />
  181 + <option value="$PROJECT_DIR$/application/index/controller/Base.php" />
182 <option value="$PROJECT_DIR$/application/index/view/layout/layout.html" /> 182 <option value="$PROJECT_DIR$/application/index/view/layout/layout.html" />
183 </list> 183 </list>
184 </option> 184 </option>
@@ -242,6 +242,21 @@ @@ -242,6 +242,21 @@
242 <path> 242 <path>
243 <item name="cepc" type="b2602c69:ProjectViewProjectNode" /> 243 <item name="cepc" type="b2602c69:ProjectViewProjectNode" />
244 <item name="cepc" type="2a2b976b:PhpTreeStructureProvider$1" /> 244 <item name="cepc" type="2a2b976b:PhpTreeStructureProvider$1" />
  245 + <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
  246 + <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
  247 + <item name="view" type="2a2b976b:PhpTreeStructureProvider$1" />
  248 + </path>
  249 + <path>
  250 + <item name="cepc" type="b2602c69:ProjectViewProjectNode" />
  251 + <item name="cepc" type="2a2b976b:PhpTreeStructureProvider$1" />
  252 + <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
  253 + <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
  254 + <item name="view" type="2a2b976b:PhpTreeStructureProvider$1" />
  255 + <item name="layout" type="2a2b976b:PhpTreeStructureProvider$1" />
  256 + </path>
  257 + <path>
  258 + <item name="cepc" type="b2602c69:ProjectViewProjectNode" />
  259 + <item name="cepc" type="2a2b976b:PhpTreeStructureProvider$1" />
245 <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> 260 <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
246 </path> 261 </path>
247 <path> 262 <path>
@@ -328,26 +343,26 @@ @@ -328,26 +343,26 @@
328 <workItem from="1557020533687" duration="18261000" /> 343 <workItem from="1557020533687" duration="18261000" />
329 <workItem from="1557101561902" duration="20546000" /> 344 <workItem from="1557101561902" duration="20546000" />
330 <workItem from="1557133899142" duration="318000" /> 345 <workItem from="1557133899142" duration="318000" />
331 - <workItem from="1557189032099" duration="7808000" /> 346 + <workItem from="1557189032099" duration="11012000" />
332 </task> 347 </task>
333 <servers /> 348 <servers />
334 </component> 349 </component>
335 <component name="TimeTrackingManager"> 350 <component name="TimeTrackingManager">
336 - <option name="totallyTimeSpent" value="300568000" /> 351 + <option name="totallyTimeSpent" value="303772000" />
337 </component> 352 </component>
338 <component name="ToolWindowManager"> 353 <component name="ToolWindowManager">
339 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 354 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
340 <editor active="true" /> 355 <editor active="true" />
341 <layout> 356 <layout>
342 <window_info id="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.1444563" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 357 <window_info id="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.1444563" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
343 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18923241" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 358 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.18923241" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
344 <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" /> 359 <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" />
345 - <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24483134" sideWeight="0.52771854" order="7" side_tool="true" content_ui="tabs" /> 360 + <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.24483134" sideWeight="0.52771854" order="7" side_tool="true" content_ui="tabs" />
346 <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="4" side_tool="false" content_ui="tabs" /> 361 <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="4" side_tool="false" content_ui="tabs" />
347 <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="8" side_tool="false" content_ui="tabs" /> 362 <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="8" side_tool="false" content_ui="tabs" />
348 <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="2" side_tool="false" content_ui="tabs" /> 363 <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="2" side_tool="false" content_ui="tabs" />
349 <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="1" side_tool="false" content_ui="tabs" /> 364 <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="1" side_tool="false" content_ui="tabs" />
350 - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24483134" sideWeight="0.47228146" order="9" side_tool="false" content_ui="tabs" /> 365 + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24483134" sideWeight="0.47228146" order="9" side_tool="false" content_ui="tabs" />
351 <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="2" side_tool="true" content_ui="tabs" /> 366 <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="2" side_tool="true" content_ui="tabs" />
352 <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="3" side_tool="false" content_ui="tabs" /> 367 <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="3" side_tool="false" content_ui="tabs" />
353 <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="4" side_tool="false" content_ui="tabs" /> 368 <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="4" side_tool="false" content_ui="tabs" />
@@ -364,21 +379,21 @@ @@ -364,21 +379,21 @@
364 <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="4" side_tool="false" content_ui="tabs" /> 379 <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="4" side_tool="false" content_ui="tabs" />
365 <window_info id="Message" 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="0" side_tool="false" content_ui="tabs" /> 380 <window_info id="Message" 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="0" side_tool="false" content_ui="tabs" />
366 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> 381 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
367 - <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.33079433" sideWeight="0.5127932" order="7" side_tool="true" content_ui="tabs" /> 382 + <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24483134" sideWeight="0.52771854" order="7" side_tool="true" content_ui="tabs" />
368 <window_info id="Inspection" 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="5" side_tool="false" content_ui="tabs" /> 383 <window_info id="Inspection" 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="5" side_tool="false" content_ui="tabs" />
369 <window_info id="File Transfer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32861805" sideWeight="0.4914712" order="10" side_tool="false" content_ui="tabs" /> 384 <window_info id="File Transfer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32861805" sideWeight="0.4914712" order="10" side_tool="false" content_ui="tabs" />
370 - <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="2" side_tool="false" content_ui="tabs" />  
371 <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="8" side_tool="false" content_ui="tabs" /> 385 <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="8" side_tool="false" content_ui="tabs" />
372 - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.0" sideWeight="0.48720682" order="9" side_tool="false" content_ui="tabs" /> 386 + <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="2" side_tool="false" content_ui="tabs" />
  387 + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24483134" sideWeight="0.47228146" order="9" side_tool="false" content_ui="tabs" />
373 <window_info id="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.1444563" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 388 <window_info id="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.1444563" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
374 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16684435" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 389 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18923241" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
375 <window_info id="Hierarchy" active="false" anchor="right" 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="combo" /> 390 <window_info id="Hierarchy" active="false" anchor="right" 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="combo" />
376 <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="4" side_tool="false" content_ui="tabs" /> 391 <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="4" side_tool="false" content_ui="tabs" />
377 <window_info id="Find" 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" /> 392 <window_info id="Find" 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" />
378 <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="1" side_tool="false" content_ui="tabs" /> 393 <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="1" side_tool="false" content_ui="tabs" />
379 <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 394 <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
380 - <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="3" side_tool="false" content_ui="tabs" />  
381 <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="2" side_tool="true" content_ui="tabs" /> 395 <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="2" side_tool="true" content_ui="tabs" />
  396 + <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="3" side_tool="false" content_ui="tabs" />
382 </layout-to-restore> 397 </layout-to-restore>
383 </component> 398 </component>
384 <component name="TypeScriptGeneratedFilesManager"> 399 <component name="TypeScriptGeneratedFilesManager">
@@ -707,14 +722,6 @@ @@ -707,14 +722,6 @@
707 </state> 722 </state>
708 </provider> 723 </provider>
709 </entry> 724 </entry>
710 - <entry file="file://$PROJECT_DIR$/application/api/view/baike/rwxq.html">  
711 - <provider selected="true" editor-type-id="text-editor">  
712 - <state relative-caret-position="200">  
713 - <caret line="323" column="0" lean-forward="false" selection-start-line="323" selection-start-column="0" selection-end-line="323" selection-end-column="53" />  
714 - <folding />  
715 - </state>  
716 - </provider>  
717 - </entry>  
718 <entry file="file://$PROJECT_DIR$/runtime/temp/966fc82c19649946ad55f2908066557d.php"> 725 <entry file="file://$PROJECT_DIR$/runtime/temp/966fc82c19649946ad55f2908066557d.php">
719 <provider selected="true" editor-type-id="text-editor"> 726 <provider selected="true" editor-type-id="text-editor">
720 <state relative-caret-position="2322"> 727 <state relative-caret-position="2322">
@@ -731,10 +738,18 @@ @@ -731,10 +738,18 @@
731 </state> 738 </state>
732 </provider> 739 </provider>
733 </entry> 740 </entry>
734 - <entry file="file://$PROJECT_DIR$/application/index/controller/Base.php"> 741 + <entry file="file://$PROJECT_DIR$/application/index/controller/Index.php">
735 <provider selected="true" editor-type-id="text-editor"> 742 <provider selected="true" editor-type-id="text-editor">
736 - <state relative-caret-position="100">  
737 - <caret line="61" column="3" lean-forward="false" selection-start-line="61" selection-start-column="3" selection-end-line="61" selection-end-column="23" /> 743 + <state relative-caret-position="494">
  744 + <caret line="42" column="13" lean-forward="false" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
  745 + <folding />
  746 + </state>
  747 + </provider>
  748 + </entry>
  749 + <entry file="file://$PROJECT_DIR$/application/api/view/baike/rwxq.html">
  750 + <provider selected="true" editor-type-id="text-editor">
  751 + <state relative-caret-position="200">
  752 + <caret line="323" column="0" lean-forward="false" selection-start-line="323" selection-start-column="0" selection-end-line="323" selection-end-column="53" />
738 <folding /> 753 <folding />
739 </state> 754 </state>
740 </provider> 755 </provider>
@@ -755,32 +770,32 @@ @@ -755,32 +770,32 @@
755 </state> 770 </state>
756 </provider> 771 </provider>
757 </entry> 772 </entry>
758 - <entry file="file://$PROJECT_DIR$/application/index/controller/Index.php"> 773 + <entry file="file://$PROJECT_DIR$/application/index/controller/Base.php">
759 <provider selected="true" editor-type-id="text-editor"> 774 <provider selected="true" editor-type-id="text-editor">
760 - <state relative-caret-position="-406">  
761 - <caret line="42" column="13" lean-forward="false" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" /> 775 + <state relative-caret-position="625">
  776 + <caret line="37" column="48" lean-forward="false" selection-start-line="37" selection-start-column="48" selection-end-line="37" selection-end-column="48" />
762 <folding /> 777 <folding />
763 </state> 778 </state>
764 </provider> 779 </provider>
765 </entry> 780 </entry>
766 <entry file="file://$PROJECT_DIR$/application/index/view/index/index.html"> 781 <entry file="file://$PROJECT_DIR$/application/index/view/index/index.html">
767 <provider selected="true" editor-type-id="text-editor"> 782 <provider selected="true" editor-type-id="text-editor">
768 - <state relative-caret-position="-99">  
769 - <caret line="384" column="37" lean-forward="false" selection-start-line="384" selection-start-column="37" selection-end-line="384" selection-end-column="37" /> 783 + <state relative-caret-position="-284">
  784 + <caret line="221" column="21" lean-forward="false" selection-start-line="221" selection-start-column="21" selection-end-line="221" selection-end-column="21" />
770 <folding> 785 <folding>
771 - <element signature="e#5756#5821#0" expanded="false" />  
772 - <element signature="e#5852#7987#0" expanded="false" />  
773 - <element signature="e#8100#8171#0" expanded="false" />  
774 - <element signature="e#8204#9864#0" expanded="false" />  
775 - <element signature="e#11441#11514#0" expanded="false" /> 786 + <element signature="e#5767#5832#0" expanded="false" />
  787 + <element signature="e#5863#7998#0" expanded="false" />
  788 + <element signature="e#8111#8182#0" expanded="false" />
  789 + <element signature="e#8215#9875#0" expanded="false" />
  790 + <element signature="e#11452#11525#0" expanded="false" />
776 </folding> 791 </folding>
777 </state> 792 </state>
778 </provider> 793 </provider>
779 </entry> 794 </entry>
780 <entry file="file://$PROJECT_DIR$/application/index/view/layout/layout.html"> 795 <entry file="file://$PROJECT_DIR$/application/index/view/layout/layout.html">
781 <provider selected="true" editor-type-id="text-editor"> 796 <provider selected="true" editor-type-id="text-editor">
782 - <state relative-caret-position="125">  
783 - <caret line="23" column="26" lean-forward="false" selection-start-line="23" selection-start-column="26" selection-end-line="23" selection-end-column="26" /> 797 + <state relative-caret-position="521">
  798 + <caret line="782" column="12" lean-forward="false" selection-start-line="782" selection-start-column="12" selection-end-line="782" selection-end-column="12" />
784 <folding /> 799 <folding />
785 </state> 800 </state>
786 </provider> 801 </provider>
@@ -21,6 +21,13 @@ class Base extends Api @@ -21,6 +21,13 @@ class Base extends Api
21 public function __construct($name = null) 21 public function __construct($name = null)
22 { 22 {
23 parent::__construct($name); 23 parent::__construct($name);
  24 + $controller=Request::instance()->controller();
  25 + $path=Request::instance()->get();
  26 + if(array_key_exists('top',$path)){
  27 + $top=$path['top'];
  28 + }else{
  29 + $top="";
  30 + }
24 if(session("user_id")!=""){ 31 if(session("user_id")!=""){
25 $this->assign("id",session("user_id")); 32 $this->assign("id",session("user_id"));
26 $this->assign("username",session("username")); 33 $this->assign("username",session("username"));
@@ -28,6 +35,8 @@ class Base extends Api @@ -28,6 +35,8 @@ class Base extends Api
28 }else{ 35 }else{
29 $this->assign("id",""); 36 $this->assign("id","");
30 } 37 }
  38 + $this->assign("controller",$controller);
  39 + $this->assign("top",$top);
31 } 40 }
32 41
33 public function validateController($validate="",$style=0){ 42 public function validateController($validate="",$style=0){
@@ -167,7 +167,7 @@ @@ -167,7 +167,7 @@
167 </div> 167 </div>
168 </div> 168 </div>
169 </div> 169 </div>
170 - <div class="Performance"> 170 + <div class="Performance" id="yanchu">
171 <div class="container"> 171 <div class="container">
172 <div class="Performance_main"> 172 <div class="Performance_main">
173 <div class="Performance_title"> 173 <div class="Performance_title">
@@ -220,7 +220,6 @@ @@ -220,7 +220,6 @@
220 </div> 220 </div>
221 {/block} 221 {/block}
222 {block name="script"} 222 {block name="script"}
223 -  
224 <script src="/apistatic/js/laydate.js"> </script> 223 <script src="/apistatic/js/laydate.js"> </script>
225 <script> 224 <script>
226 var themepage=0; 225 var themepage=0;
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 <div class="header_left"> 22 <div class="header_left">
23 <a id="change">中<div class="iconfont icon-arrowdown"></div></a> 23 <a id="change">中<div class="iconfont icon-arrowdown"></div></a>
24 <a href="/" class="active">精选</a> 24 <a href="/" class="active">精选</a>
25 - <a href="">动态</a> 25 + <a href="/?top=yanchu#yanchu" id="dongtai">动态</a>
26 <a href="/index/baike/index">百科</a> 26 <a href="/index/baike/index">百科</a>
27 </div> 27 </div>
28 <!--头中--> 28 <!--头中-->
@@ -769,6 +769,21 @@ @@ -769,6 +769,21 @@
769 <script src="/static/js/jquery.min.js"></script> 769 <script src="/static/js/jquery.min.js"></script>
770 <script type="text/javascript" src="/static/js/language.js"></script> 770 <script type="text/javascript" src="/static/js/language.js"></script>
771 <script> 771 <script>
  772 + var controller='{$controller}';
  773 + var top11='{$top}';
  774 + if(controller=="Baike"){
  775 + $(".header_left a").attr("class","");
  776 + $(".header_left a")[3].setAttribute("class",'active');
  777 + }
  778 + $("#dongtai").on("click",function () {
  779 + $(".header_left a").attr("class","");
  780 + $(this).attr("class",'active');
  781 + $(".header_left a")[1].setAttribute("class",'');
  782 + })
  783 + if(top11=="yanchu"){
  784 + $(".header_left a").attr("class","");
  785 + $(".header_left a")[2].setAttribute("class",'active');
  786 + }
772 $("#change").click(function(){ 787 $("#change").click(function(){
773 translate(); 788 translate();
774 }) 789 })
@@ -979,6 +994,7 @@ @@ -979,6 +994,7 @@
979 }); 994 });
980 </script> 995 </script>
981 <script> 996 <script>
  997 +
982 var user_id; 998 var user_id;
983 $("#registertel").on("click",function () { 999 $("#registertel").on("click",function () {
984 var data=$("#registertelform").serialize(); 1000 var data=$("#registertelform").serialize();
@@ -1125,6 +1141,8 @@ @@ -1125,6 +1141,8 @@
1125 } 1141 }
1126 }); 1142 });
1127 }) 1143 })
  1144 +
  1145 +
1128 </script> 1146 </script>
1129 {block name='script'} 1147 {block name='script'}
1130 {/block} 1148 {/block}
1 -<?php if (!defined('THINK_PATH')) exit(); /*a:2:{s:71:"D:\lfxstore\wamp\cepc\public/../application/index\view\baike\baike.html";i:1557128675;s:63:"D:\lfxstore\wamp\cepc\application\index\view\layout\layout.html";i:1557196279;}*/ ?> 1 +<?php if (!defined('THINK_PATH')) exit(); /*a:2:{s:71:"D:\lfxstore\wamp\cepc\public/../application/index\view\baike\baike.html";i:1557128675;s:63:"D:\lfxstore\wamp\cepc\application\index\view\layout\layout.html";i:1557206872;}*/ ?>
2 <!DOCTYPE html> 2 <!DOCTYPE html>
3 <html lang="en"> 3 <html lang="en">
4 <head> 4 <head>
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 <div class="header_left"> 24 <div class="header_left">
25 <a id="change">中<div class="iconfont icon-arrowdown"></div></a> 25 <a id="change">中<div class="iconfont icon-arrowdown"></div></a>
26 <a href="/" class="active">精选</a> 26 <a href="/" class="active">精选</a>
27 - <a href="">动态</a> 27 + <a href="/?top=yanchu#yanchu" id="dongtai">动态</a>
28 <a href="/index/baike/index">百科</a> 28 <a href="/index/baike/index">百科</a>
29 </div> 29 </div>
30 <!--头中--> 30 <!--头中-->
@@ -819,6 +819,21 @@ @@ -819,6 +819,21 @@
819 <script src="/static/js/jquery.min.js"></script> 819 <script src="/static/js/jquery.min.js"></script>
820 <script type="text/javascript" src="/static/js/language.js"></script> 820 <script type="text/javascript" src="/static/js/language.js"></script>
821 <script> 821 <script>
  822 + var controller='<?php echo $controller; ?>';
  823 + var top11='<?php echo $top; ?>';
  824 + if(controller=="Baike"){
  825 + $(".header_left a").attr("class","");
  826 + $(".header_left a")[3].setAttribute("class",'active');
  827 + }
  828 + $("#dongtai").on("click",function () {
  829 + $(".header_left a").attr("class","");
  830 + $(this).attr("class",'active');
  831 + $(".header_left a")[1].setAttribute("class",'');
  832 + })
  833 + if(top11=="yanchu"){
  834 + $(".header_left a").attr("class","");
  835 + $(".header_left a")[2].setAttribute("class",'active');
  836 + }
822 $("#change").click(function(){ 837 $("#change").click(function(){
823 translate(); 838 translate();
824 }) 839 })
@@ -1029,6 +1044,7 @@ @@ -1029,6 +1044,7 @@
1029 }); 1044 });
1030 </script> 1045 </script>
1031 <script> 1046 <script>
  1047 +
1032 var user_id; 1048 var user_id;
1033 $("#registertel").on("click",function () { 1049 $("#registertel").on("click",function () {
1034 var data=$("#registertelform").serialize(); 1050 var data=$("#registertelform").serialize();
@@ -1175,6 +1191,8 @@ @@ -1175,6 +1191,8 @@
1175 } 1191 }
1176 }); 1192 });
1177 }) 1193 })
  1194 +
  1195 +
1178 </script> 1196 </script>
1179 1197
1180 <script> 1198 <script>
1 -<?php if (!defined('THINK_PATH')) exit(); /*a:2:{s:71:"D:\lfxstore\wamp\cepc\public/../application/index\view\index\index.html";i:1557196011;s:63:"D:\lfxstore\wamp\cepc\application\index\view\layout\layout.html";i:1557196279;}*/ ?> 1 +<?php if (!defined('THINK_PATH')) exit(); /*a:2:{s:71:"D:\lfxstore\wamp\cepc\public/../application/index\view\index\index.html";i:1557200677;s:63:"D:\lfxstore\wamp\cepc\application\index\view\layout\layout.html";i:1557206872;}*/ ?>
2 <!DOCTYPE html> 2 <!DOCTYPE html>
3 <html lang="en"> 3 <html lang="en">
4 <head> 4 <head>
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
41 <div class="header_left"> 41 <div class="header_left">
42 <a id="change">中<div class="iconfont icon-arrowdown"></div></a> 42 <a id="change">中<div class="iconfont icon-arrowdown"></div></a>
43 <a href="/" class="active">精选</a> 43 <a href="/" class="active">精选</a>
44 - <a href="">动态</a> 44 + <a href="/?top=yanchu#yanchu" id="dongtai">动态</a>
45 <a href="/index/baike/index">百科</a> 45 <a href="/index/baike/index">百科</a>
46 </div> 46 </div>
47 <!--头中--> 47 <!--头中-->
@@ -230,7 +230,7 @@ @@ -230,7 +230,7 @@
230 </div> 230 </div>
231 </div> 231 </div>
232 </div> 232 </div>
233 - <div class="Performance"> 233 + <div class="Performance" id="yanchu">
234 <div class="container"> 234 <div class="container">
235 <div class="Performance_main"> 235 <div class="Performance_main">
236 <div class="Performance_title"> 236 <div class="Performance_title">
@@ -983,6 +983,21 @@ @@ -983,6 +983,21 @@
983 <script src="/static/js/jquery.min.js"></script> 983 <script src="/static/js/jquery.min.js"></script>
984 <script type="text/javascript" src="/static/js/language.js"></script> 984 <script type="text/javascript" src="/static/js/language.js"></script>
985 <script> 985 <script>
  986 + var controller='<?php echo $controller; ?>';
  987 + var top11='<?php echo $top; ?>';
  988 + if(controller=="Baike"){
  989 + $(".header_left a").attr("class","");
  990 + $(".header_left a")[3].setAttribute("class",'active');
  991 + }
  992 + $("#dongtai").on("click",function () {
  993 + $(".header_left a").attr("class","");
  994 + $(this).attr("class",'active');
  995 + $(".header_left a")[1].setAttribute("class",'');
  996 + })
  997 + if(top11=="yanchu"){
  998 + $(".header_left a").attr("class","");
  999 + $(".header_left a")[2].setAttribute("class",'active');
  1000 + }
986 $("#change").click(function(){ 1001 $("#change").click(function(){
987 translate(); 1002 translate();
988 }) 1003 })
@@ -1193,6 +1208,7 @@ @@ -1193,6 +1208,7 @@
1193 }); 1208 });
1194 </script> 1209 </script>
1195 <script> 1210 <script>
  1211 +
1196 var user_id; 1212 var user_id;
1197 $("#registertel").on("click",function () { 1213 $("#registertel").on("click",function () {
1198 var data=$("#registertelform").serialize(); 1214 var data=$("#registertelform").serialize();
@@ -1339,9 +1355,10 @@ @@ -1339,9 +1355,10 @@
1339 } 1355 }
1340 }); 1356 });
1341 }) 1357 })
1342 -</script>  
1343 1358
1344 1359
  1360 +</script>
  1361 +
1345 <script src="/apistatic/js/laydate.js"> </script> 1362 <script src="/apistatic/js/laydate.js"> </script>
1346 <script> 1363 <script>
1347 var themepage=0; 1364 var themepage=0;