webfront / Clime · 提交

转到一个项目

作者 乔爽
提交 96c51570352046994b599f6770a7ab860e586827 1 个父辈 3a5235ac

update

内嵌 并排对比
正在显示 4 个修改的文件 包含 145 行增加 和 110 行删除
@@ -2,12 +2,9 @@ @@ -2,12 +2,9 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="45116894-83a8-452c-8a78-cd7bfbe48655" name="Default Changelist" comment=""> 4 <list default="true" id="45116894-83a8-452c-8a78-cd7bfbe48655" name="Default Changelist" comment="">
5 - <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />  
6 - <change beforePath="$PROJECT_DIR$/css/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/index.css" afterDir="false" />  
7 - <change beforePath="$PROJECT_DIR$/html/gsjj.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/gsjj.html" afterDir="false" /> 5 + <change beforePath="$PROJECT_DIR$/css/common.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/common.css" afterDir="false" />
8 <change beforePath="$PROJECT_DIR$/html/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/index.html" afterDir="false" /> 6 <change beforePath="$PROJECT_DIR$/html/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/index.html" afterDir="false" />
9 - <change beforePath="$PROJECT_DIR$/html/lxwm_5.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/lxwm_5.html" afterDir="false" />  
10 - <change beforePath="$PROJECT_DIR$/html/sckj.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/sckj.html" afterDir="false" /> 7 + <change beforePath="$PROJECT_DIR$/html/jm_3.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/jm_3.html" afterDir="false" />
11 </list> 8 </list>
12 <ignored path="$PROJECT_DIR$/.tmp/" /> 9 <ignored path="$PROJECT_DIR$/.tmp/" />
13 <ignored path="$PROJECT_DIR$/temp/" /> 10 <ignored path="$PROJECT_DIR$/temp/" />
@@ -128,29 +125,29 @@ @@ -128,29 +125,29 @@
128 </usages-collector> 125 </usages-collector>
129 <usages-collector id="statistics.file.extensions.open"> 126 <usages-collector id="statistics.file.extensions.open">
130 <counts> 127 <counts>
131 - <entry key="css" value="55" />  
132 - <entry key="html" value="92" /> 128 + <entry key="css" value="56" />
  129 + <entry key="html" value="93" />
133 <entry key="js" value="7" /> 130 <entry key="js" value="7" />
134 </counts> 131 </counts>
135 </usages-collector> 132 </usages-collector>
136 <usages-collector id="statistics.file.types.open"> 133 <usages-collector id="statistics.file.types.open">
137 <counts> 134 <counts>
138 - <entry key="CSS" value="55" />  
139 - <entry key="HTML" value="92" /> 135 + <entry key="CSS" value="56" />
  136 + <entry key="HTML" value="93" />
140 <entry key="JavaScript" value="7" /> 137 <entry key="JavaScript" value="7" />
141 </counts> 138 </counts>
142 </usages-collector> 139 </usages-collector>
143 <usages-collector id="statistics.file.extensions.edit"> 140 <usages-collector id="statistics.file.extensions.edit">
144 <counts> 141 <counts>
145 - <entry key="css" value="3433" />  
146 - <entry key="html" value="7000" /> 142 + <entry key="css" value="3445" />
  143 + <entry key="html" value="7061" />
147 <entry key="js" value="73" /> 144 <entry key="js" value="73" />
148 </counts> 145 </counts>
149 </usages-collector> 146 </usages-collector>
150 <usages-collector id="statistics.file.types.edit"> 147 <usages-collector id="statistics.file.types.edit">
151 <counts> 148 <counts>
152 - <entry key="CSS" value="3433" />  
153 - <entry key="HTML" value="7001" /> 149 + <entry key="CSS" value="3445" />
  150 + <entry key="HTML" value="7062" />
154 <entry key="JavaScript" value="72" /> 151 <entry key="JavaScript" value="72" />
155 </counts> 152 </counts>
156 </usages-collector> 153 </usages-collector>
@@ -193,11 +190,11 @@ @@ -193,11 +190,11 @@
193 </provider> 190 </provider>
194 </entry> 191 </entry>
195 </file> 192 </file>
196 - <file pinned="false" current-in-tab="false"> 193 + <file pinned="false" current-in-tab="true">
197 <entry file="file://$PROJECT_DIR$/html/index.html"> 194 <entry file="file://$PROJECT_DIR$/html/index.html">
198 <provider selected="true" editor-type-id="text-editor"> 195 <provider selected="true" editor-type-id="text-editor">
199 - <state relative-caret-position="189">  
200 - <caret line="297" column="50" lean-forward="true" selection-start-line="297" selection-start-column="50" selection-end-line="297" selection-end-column="50" /> 196 + <state relative-caret-position="264">
  197 + <caret line="286" column="23" lean-forward="true" selection-start-line="286" selection-start-column="23" selection-end-line="286" selection-end-column="23" />
201 <folding> 198 <folding>
202 <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> 199 <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
203 <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 200 <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
@@ -215,6 +212,7 @@ @@ -215,6 +212,7 @@
215 <element signature="n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 212 <element signature="n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
216 <element signature="n#div#1;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 213 <element signature="n#div#1;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
217 <element signature="n#div#2;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 214 <element signature="n#div#2;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  215 + <element signature="n#div#3;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
218 <element signature="n#div#7;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 216 <element signature="n#div#7;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
219 <element signature="n#div#8;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 217 <element signature="n#div#8;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
220 </folding> 218 </folding>
@@ -278,11 +276,11 @@ @@ -278,11 +276,11 @@
278 </provider> 276 </provider>
279 </entry> 277 </entry>
280 </file> 278 </file>
281 - <file pinned="false" current-in-tab="true"> 279 + <file pinned="false" current-in-tab="false">
282 <entry file="file://$PROJECT_DIR$/html/lxwm_5.html"> 280 <entry file="file://$PROJECT_DIR$/html/lxwm_5.html">
283 <provider selected="true" editor-type-id="text-editor"> 281 <provider selected="true" editor-type-id="text-editor">
284 - <state relative-caret-position="474">  
285 - <caret line="518" column="15" selection-start-line="518" selection-start-column="15" selection-end-line="518" selection-end-column="15" /> 282 + <state relative-caret-position="247">
  283 + <caret line="448" lean-forward="true" selection-start-line="441" selection-start-column="4" selection-end-line="482" selection-end-column="6" />
286 <folding> 284 <folding>
287 <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> 285 <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
288 <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 286 <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
@@ -333,39 +331,44 @@ @@ -333,39 +331,44 @@
333 </entry> 331 </entry>
334 </file> 332 </file>
335 <file pinned="false" current-in-tab="false"> 333 <file pinned="false" current-in-tab="false">
336 - <entry file="file://$PROJECT_DIR$/css/sckj.css"> 334 + <entry file="file://$PROJECT_DIR$/html/jm_3.html">
337 <provider selected="true" editor-type-id="text-editor"> 335 <provider selected="true" editor-type-id="text-editor">
338 - <state relative-caret-position="-1067">  
339 - <caret line="166" column="1" lean-forward="true" selection-start-line="166" selection-start-column="1" selection-end-line="166" selection-end-column="1" /> 336 + <state relative-caret-position="665">
  337 + <caret line="325" selection-start-line="325" selection-end-line="325" />
  338 + <folding>
  339 + <element signature="n#style#0;n#head#0;n#html#0;n#!!top" />
  340 + <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  341 + <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  342 + <element signature="n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" />
  343 + <element signature="n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" />
  344 + <element signature="n#div#0;n#div#2;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" />
  345 + <element signature="n#div#1;n#div#2;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" />
  346 + <element signature="n#div#2;n#div#2;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" />
  347 + <element signature="n#div#3;n#div#2;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" />
  348 + <element signature="n#div#4;n#div#2;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" />
  349 + <element signature="n#div#5;n#div#2;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" />
  350 + <element signature="n#div#5;n#div#0;n#body#0;n#html#0;n#!!top" />
  351 + <element signature="e#9435#9653#0" />
  352 + <element signature="e#9954#10401#0" />
  353 + </folding>
340 </state> 354 </state>
341 </provider> 355 </provider>
342 </entry> 356 </entry>
343 </file> 357 </file>
344 <file pinned="false" current-in-tab="false"> 358 <file pinned="false" current-in-tab="false">
345 - <entry file="file://$PROJECT_DIR$/html/fwcx_4_2result.html"> 359 + <entry file="file://$PROJECT_DIR$/css/common.css">
346 <provider selected="true" editor-type-id="text-editor"> 360 <provider selected="true" editor-type-id="text-editor">
347 - <state relative-caret-position="345">  
348 - <caret line="192" column="5" lean-forward="true" selection-start-line="192" selection-start-column="5" selection-end-line="192" selection-end-column="5" />  
349 - <folding>  
350 - <element signature="n#style#0;n#head#0;n#html#0;n#!!top" />  
351 - <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
352 - <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
353 - </folding> 361 + <state relative-caret-position="189">
  362 + <caret line="7" column="29" selection-start-line="7" selection-start-column="29" selection-end-line="7" selection-end-column="29" />
354 </state> 363 </state>
355 </provider> 364 </provider>
356 </entry> 365 </entry>
357 </file> 366 </file>
358 <file pinned="false" current-in-tab="false"> 367 <file pinned="false" current-in-tab="false">
359 - <entry file="file://$PROJECT_DIR$/html/fwxc_4_3result_none.html"> 368 + <entry file="file://$PROJECT_DIR$/css/sckj.css">
360 <provider selected="true" editor-type-id="text-editor"> 369 <provider selected="true" editor-type-id="text-editor">
361 - <state relative-caret-position="27">  
362 - <caret line="184" column="64" lean-forward="true" selection-start-line="184" selection-start-column="64" selection-end-line="184" selection-end-column="64" />  
363 - <folding>  
364 - <element signature="n#style#0;n#head#0;n#html#0;n#!!top" />  
365 - <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
366 - <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
367 - <element signature="n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
368 - </folding> 370 + <state relative-caret-position="-1067">
  371 + <caret line="166" column="1" lean-forward="true" selection-start-line="166" selection-start-column="1" selection-end-line="166" selection-end-column="1" />
369 </state> 372 </state>
370 </provider> 373 </provider>
371 </entry> 374 </entry>
@@ -382,7 +385,6 @@ @@ -382,7 +385,6 @@
382 </component> 385 </component>
383 <component name="FindInProjectRecents"> 386 <component name="FindInProjectRecents">
384 <findStrings> 387 <findStrings>
385 - <find>left</find>  
386 <find>leng</find> 388 <find>leng</find>
387 <find>pic4_sub</find> 389 <find>pic4_sub</find>
388 <find>mid_remark</find> 390 <find>mid_remark</find>
@@ -412,6 +414,7 @@ @@ -412,6 +414,7 @@
412 <find>mid_lis</find> 414 <find>mid_lis</find>
413 <find>allmap</find> 415 <find>allmap</find>
414 <find>btn_location</find> 416 <find>btn_location</find>
  417 + <find>产品中心</find>
415 </findStrings> 418 </findStrings>
416 <replaceStrings> 419 <replaceStrings>
417 <replace>div</replace> 420 <replace>div</replace>
@@ -447,7 +450,6 @@ @@ -447,7 +450,6 @@
447 <option value="$PROJECT_DIR$/css/page.css" /> 450 <option value="$PROJECT_DIR$/css/page.css" />
448 <option value="$PROJECT_DIR$/css/lxwm_5.css" /> 451 <option value="$PROJECT_DIR$/css/lxwm_5.css" />
449 <option value="$PROJECT_DIR$/html/cpzx_2.html" /> 452 <option value="$PROJECT_DIR$/html/cpzx_2.html" />
450 - <option value="$PROJECT_DIR$/html/jm_3.html" />  
451 <option value="$PROJECT_DIR$/css/fwcx_4_1result.css" /> 453 <option value="$PROJECT_DIR$/css/fwcx_4_1result.css" />
452 <option value="$PROJECT_DIR$/html/fwcx_4_1result.html" /> 454 <option value="$PROJECT_DIR$/html/fwcx_4_1result.html" />
453 <option value="$PROJECT_DIR$/css/fwcx_4_2result.css" /> 455 <option value="$PROJECT_DIR$/css/fwcx_4_2result.css" />
@@ -458,16 +460,17 @@ @@ -458,16 +460,17 @@
458 <option value="$PROJECT_DIR$/html/search_no_2.html" /> 460 <option value="$PROJECT_DIR$/html/search_no_2.html" />
459 <option value="$PROJECT_DIR$/css/search_no_2.css" /> 461 <option value="$PROJECT_DIR$/css/search_no_2.css" />
460 <option value="$PROJECT_DIR$/html/search_2.html" /> 462 <option value="$PROJECT_DIR$/html/search_2.html" />
461 - <option value="$PROJECT_DIR$/css/common.css" />  
462 <option value="$PROJECT_DIR$/css/search_2.css" /> 463 <option value="$PROJECT_DIR$/css/search_2.css" />
463 <option value="$PROJECT_DIR$/css/fwcx_4.css" /> 464 <option value="$PROJECT_DIR$/css/fwcx_4.css" />
464 <option value="$PROJECT_DIR$/html/fwcx_4.html" /> 465 <option value="$PROJECT_DIR$/html/fwcx_4.html" />
465 <option value="$PROJECT_DIR$/html/gsjj.html" /> 466 <option value="$PROJECT_DIR$/html/gsjj.html" />
466 <option value="$PROJECT_DIR$/css/index.css" /> 467 <option value="$PROJECT_DIR$/css/index.css" />
467 - <option value="$PROJECT_DIR$/html/index.html" />  
468 <option value="$PROJECT_DIR$/css/sckj.css" /> 468 <option value="$PROJECT_DIR$/css/sckj.css" />
469 <option value="$PROJECT_DIR$/html/sckj.html" /> 469 <option value="$PROJECT_DIR$/html/sckj.html" />
470 <option value="$PROJECT_DIR$/html/lxwm_5.html" /> 470 <option value="$PROJECT_DIR$/html/lxwm_5.html" />
  471 + <option value="$PROJECT_DIR$/css/common.css" />
  472 + <option value="$PROJECT_DIR$/html/jm_3.html" />
  473 + <option value="$PROJECT_DIR$/html/index.html" />
471 </list> 474 </list>
472 </option> 475 </option>
473 </component> 476 </component>
@@ -587,18 +590,18 @@ @@ -587,18 +590,18 @@
587 <workItem from="1548236542901" duration="5554000" /> 590 <workItem from="1548236542901" duration="5554000" />
588 <workItem from="1548289565644" duration="30059000" /> 591 <workItem from="1548289565644" duration="30059000" />
589 <workItem from="1548376254799" duration="35479000" /> 592 <workItem from="1548376254799" duration="35479000" />
590 - <workItem from="1548635475488" duration="29255000" /> 593 + <workItem from="1548635475488" duration="30185000" />
591 </task> 594 </task>
592 <servers /> 595 <servers />
593 </component> 596 </component>
594 <component name="TimeTrackingManager"> 597 <component name="TimeTrackingManager">
595 - <option name="totallyTimeSpent" value="264202000" /> 598 + <option name="totallyTimeSpent" value="265132000" />
596 </component> 599 </component>
597 <component name="ToolWindowManager"> 600 <component name="ToolWindowManager">
598 - <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 601 + <frame x="232" y="69" width="1849" height="943" extended-state="0" />
599 <editor active="true" /> 602 <editor active="true" />
600 <layout> 603 <layout>
601 - <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4993464" visible="true" weight="0.14605543" /> 604 + <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4993464" visible="true" weight="0.15315819" />
602 <window_info id="Structure" order="1" sideWeight="0.5006536" side_tool="true" weight="0.16211294" /> 605 <window_info id="Structure" order="1" sideWeight="0.5006536" side_tool="true" weight="0.16211294" />
603 <window_info id="Favorites" order="2" side_tool="true" /> 606 <window_info id="Favorites" order="2" side_tool="true" />
604 <window_info anchor="bottom" id="Message" order="0" /> 607 <window_info anchor="bottom" id="Message" order="0" />
@@ -610,11 +613,11 @@ @@ -610,11 +613,11 @@
610 <window_info anchor="bottom" id="TODO" order="6" /> 613 <window_info anchor="bottom" id="TODO" order="6" />
611 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> 614 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
612 <window_info anchor="bottom" id="Version Control" order="8" /> 615 <window_info anchor="bottom" id="Version Control" order="8" />
613 - <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.042345278" /> 616 + <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.048267327" />
614 <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" /> 617 <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
615 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> 618 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
616 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> 619 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
617 - <window_info active="true" anchor="right" content_ui="combo" id="Hierarchy" order="2" visible="true" weight="0.07835821" /> 620 + <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" visible="true" weight="0.08216881" />
618 </layout> 621 </layout>
619 </component> 622 </component>
620 <component name="TypeScriptGeneratedFilesManager"> 623 <component name="TypeScriptGeneratedFilesManager">
@@ -814,27 +817,6 @@ @@ -814,27 +817,6 @@
814 </state> 817 </state>
815 </provider> 818 </provider>
816 </entry> 819 </entry>
817 - <entry file="file://$PROJECT_DIR$/html/jm_3.html">  
818 - <provider selected="true" editor-type-id="text-editor">  
819 - <state relative-caret-position="378">  
820 - <caret line="14" column="36" selection-start-line="14" selection-start-column="36" selection-end-line="14" selection-end-column="36" />  
821 - <folding>  
822 - <element signature="n#style#0;n#head#0;n#html#0;n#!!top" />  
823 - <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
824 - <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
825 - <element signature="n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" />  
826 - <element signature="n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" />  
827 - <element signature="n#div#0;n#div#2;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" />  
828 - <element signature="n#div#1;n#div#2;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" />  
829 - <element signature="n#div#2;n#div#2;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" />  
830 - <element signature="n#div#3;n#div#2;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" />  
831 - <element signature="n#div#4;n#div#2;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" />  
832 - <element signature="n#div#5;n#div#2;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" />  
833 - <element signature="n#div#5;n#div#0;n#body#0;n#html#0;n#!!top" />  
834 - </folding>  
835 - </state>  
836 - </provider>  
837 - </entry>  
838 <entry file="file://$PROJECT_DIR$/html/jpal.html"> 820 <entry file="file://$PROJECT_DIR$/html/jpal.html">
839 <provider selected="true" editor-type-id="text-editor"> 821 <provider selected="true" editor-type-id="text-editor">
840 <state relative-caret-position="405"> 822 <state relative-caret-position="405">
@@ -935,13 +917,6 @@ @@ -935,13 +917,6 @@
935 </state> 917 </state>
936 </provider> 918 </provider>
937 </entry> 919 </entry>
938 - <entry file="file://$PROJECT_DIR$/css/common.css">  
939 - <provider selected="true" editor-type-id="text-editor">  
940 - <state relative-caret-position="135">  
941 - <caret line="5" column="2" selection-start-line="5" selection-start-column="2" selection-end-line="5" selection-end-column="2" />  
942 - </state>  
943 - </provider>  
944 - </entry>  
945 <entry file="file://$PROJECT_DIR$/css/search_2.css"> 920 <entry file="file://$PROJECT_DIR$/css/search_2.css">
946 <provider selected="true" editor-type-id="text-editor"> 921 <provider selected="true" editor-type-id="text-editor">
947 <state relative-caret-position="347"> 922 <state relative-caret-position="347">
@@ -1123,33 +1098,6 @@ @@ -1123,33 +1098,6 @@
1123 </state> 1098 </state>
1124 </provider> 1099 </provider>
1125 </entry> 1100 </entry>
1126 - <entry file="file://$PROJECT_DIR$/html/index.html">  
1127 - <provider selected="true" editor-type-id="text-editor">  
1128 - <state relative-caret-position="189">  
1129 - <caret line="297" column="50" lean-forward="true" selection-start-line="297" selection-start-column="50" selection-end-line="297" selection-end-column="50" />  
1130 - <folding>  
1131 - <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
1132 - <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
1133 - <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
1134 - <element signature="n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
1135 - <element signature="n#div#0;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
1136 - <element signature="n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
1137 - <element signature="n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
1138 - <element signature="n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
1139 - <element signature="n#div#1;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
1140 - <element signature="n#div#0;n#div#2;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
1141 - <element signature="n#div#1;n#div#0;n#div#2;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
1142 - <element signature="n#div#1;n#div#2;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
1143 - <element signature="n#div#1;n#div#1;n#div#2;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
1144 - <element signature="n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
1145 - <element signature="n#div#1;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
1146 - <element signature="n#div#2;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
1147 - <element signature="n#div#7;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
1148 - <element signature="n#div#8;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
1149 - </folding>  
1150 - </state>  
1151 - </provider>  
1152 - </entry>  
1153 <entry file="file://$PROJECT_DIR$/css/sckj.css"> 1101 <entry file="file://$PROJECT_DIR$/css/sckj.css">
1154 <provider selected="true" editor-type-id="text-editor"> 1102 <provider selected="true" editor-type-id="text-editor">
1155 <state relative-caret-position="-1067"> 1103 <state relative-caret-position="-1067">
@@ -1185,10 +1133,17 @@ @@ -1185,10 +1133,17 @@
1185 </state> 1133 </state>
1186 </provider> 1134 </provider>
1187 </entry> 1135 </entry>
  1136 + <entry file="file://$PROJECT_DIR$/css/common.css">
  1137 + <provider selected="true" editor-type-id="text-editor">
  1138 + <state relative-caret-position="189">
  1139 + <caret line="7" column="29" selection-start-line="7" selection-start-column="29" selection-end-line="7" selection-end-column="29" />
  1140 + </state>
  1141 + </provider>
  1142 + </entry>
1188 <entry file="file://$PROJECT_DIR$/html/lxwm_5.html"> 1143 <entry file="file://$PROJECT_DIR$/html/lxwm_5.html">
1189 <provider selected="true" editor-type-id="text-editor"> 1144 <provider selected="true" editor-type-id="text-editor">
1190 - <state relative-caret-position="474">  
1191 - <caret line="518" column="15" selection-start-line="518" selection-start-column="15" selection-end-line="518" selection-end-column="15" /> 1145 + <state relative-caret-position="247">
  1146 + <caret line="448" lean-forward="true" selection-start-line="441" selection-start-column="4" selection-end-line="482" selection-end-column="6" />
1192 <folding> 1147 <folding>
1193 <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> 1148 <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
1194 <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 1149 <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
@@ -1237,5 +1192,56 @@ @@ -1237,5 +1192,56 @@
1237 </state> 1192 </state>
1238 </provider> 1193 </provider>
1239 </entry> 1194 </entry>
  1195 + <entry file="file://$PROJECT_DIR$/html/jm_3.html">
  1196 + <provider selected="true" editor-type-id="text-editor">
  1197 + <state relative-caret-position="665">
  1198 + <caret line="325" selection-start-line="325" selection-end-line="325" />
  1199 + <folding>
  1200 + <element signature="n#style#0;n#head#0;n#html#0;n#!!top" />
  1201 + <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1202 + <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1203 + <element signature="n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" />
  1204 + <element signature="n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" />
  1205 + <element signature="n#div#0;n#div#2;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" />
  1206 + <element signature="n#div#1;n#div#2;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" />
  1207 + <element signature="n#div#2;n#div#2;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" />
  1208 + <element signature="n#div#3;n#div#2;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" />
  1209 + <element signature="n#div#4;n#div#2;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" />
  1210 + <element signature="n#div#5;n#div#2;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" />
  1211 + <element signature="n#div#5;n#div#0;n#body#0;n#html#0;n#!!top" />
  1212 + <element signature="e#9435#9653#0" />
  1213 + <element signature="e#9954#10401#0" />
  1214 + </folding>
  1215 + </state>
  1216 + </provider>
  1217 + </entry>
  1218 + <entry file="file://$PROJECT_DIR$/html/index.html">
  1219 + <provider selected="true" editor-type-id="text-editor">
  1220 + <state relative-caret-position="264">
  1221 + <caret line="286" column="23" lean-forward="true" selection-start-line="286" selection-start-column="23" selection-end-line="286" selection-end-column="23" />
  1222 + <folding>
  1223 + <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1224 + <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1225 + <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1226 + <element signature="n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1227 + <element signature="n#div#0;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1228 + <element signature="n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1229 + <element signature="n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1230 + <element signature="n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1231 + <element signature="n#div#1;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1232 + <element signature="n#div#0;n#div#2;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1233 + <element signature="n#div#1;n#div#0;n#div#2;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1234 + <element signature="n#div#1;n#div#2;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1235 + <element signature="n#div#1;n#div#1;n#div#2;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1236 + <element signature="n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1237 + <element signature="n#div#1;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1238 + <element signature="n#div#2;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1239 + <element signature="n#div#3;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1240 + <element signature="n#div#7;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1241 + <element signature="n#div#8;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1242 + </folding>
  1243 + </state>
  1244 + </provider>
  1245 + </entry>
1240 </component> 1246 </component>
1241 </project> 1247 </project>
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
5 } 5 }
6 body{ 6 body{
7 -webkit-overflow-scrolling : touch; 7 -webkit-overflow-scrolling : touch;
  8 + background-color: #e6e6e6;
8 } 9 }
9 a{ 10 a{
10 text-decoration: none; 11 text-decoration: none;
@@ -199,7 +199,7 @@ @@ -199,7 +199,7 @@
199 进入某个空间，我们最先被触发得感知是—色彩 199 进入某个空间，我们最先被触发得感知是—色彩
200 </div> 200 </div>
201 <!--查看更多--> 201 <!--查看更多-->
202 - <div class="pic3_viewMore"> 202 + <div class="pic3_viewMore" onclick="btn_sckj()">
203 查看更多 203 查看更多
204 </div> 204 </div>
205 205
@@ -227,7 +227,7 @@ @@ -227,7 +227,7 @@
227 227
228 </div> 228 </div>
229 <!--查看更多--> 229 <!--查看更多-->
230 - <div class="pic3_viewMore"> 230 + <div class="pic3_viewMore" onclick="btn_cpzx()">
231 查看更多 231 查看更多
232 </div> 232 </div>
233 233
@@ -252,7 +252,7 @@ @@ -252,7 +252,7 @@
252 加盟可耐美,0元加盟费 252 加盟可耐美,0元加盟费
253 </div> 253 </div>
254 <!--查看更多--> 254 <!--查看更多-->
255 - <div class="pic3_viewMore"> 255 + <div class="pic3_viewMore" onclick="btn_jm()">
256 查看更多 256 查看更多
257 </div> 257 </div>
258 258
@@ -277,7 +277,7 @@ @@ -277,7 +277,7 @@
277 为消费者权利保驾护航 277 为消费者权利保驾护航
278 </div> 278 </div>
279 <!--查看更多--> 279 <!--查看更多-->
280 - <div class="pic3_viewMore"> 280 + <div class="pic3_viewMore" onclick="btn_khfw()">
281 查看更多 281 查看更多
282 </div> 282 </div>
283 283
@@ -296,6 +296,34 @@ @@ -296,6 +296,34 @@
296 $(".top").eq(index).show().siblings("item").hide() 296 $(".top").eq(index).show().siblings("item").hide()
297 }) 297 })
298 }) 298 })
  299 +
  300 +
  301 + // 点击时自动下拉
  302 + $("input").blur(function(){
  303 + setTimeout(function() {
  304 + var scrollHeight = document.documentElement.scrollTop || document.body.scrollTop || 0;
  305 + window.scrollTo(0, Math.max(scrollHeight - 1, 0));
  306 + }, 300);
  307 + })
  308 +
  309 +
  310 +
  311 +
  312 + //聚焦监听
  313 + $('input').focus(function() {
  314 + if((/Android/gi).test(navigator.userAgent)) {
  315 + window.addEventListener('resize', function() {
  316 + if(document.activeElement.tagName == 'INPUT' ||
  317 + document.activeElement.tagName == 'TEXTAREA') {
  318 + window.setTimeout(function() {
  319 + document.activeElement.scrollIntoViewIfNeeded();
  320 + }, 0);
  321 + }
  322 + });
  323 + }
  324 + })
  325 +
  326 +
299 </script> 327 </script>
300 328
301 </html> 329 </html>