webfront / Clime · 提交

转到一个项目

作者 乔爽
提交 9280486a72530abba756c84d9f76c9caf8aa03c2 1 个父辈 4d024201

update

内嵌 并排对比
正在显示 2 个修改的文件 包含 53 行增加 和 53 行删除
@@ -2,30 +2,7 @@ @@ -2,30 +2,7 @@
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/fwcx_4.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/fwcx_4.css" afterDir="false" />  
7 - <change beforePath="$PROJECT_DIR$/css/gsjj.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/gsjj.css" afterDir="false" />  
8 - <change beforePath="$PROJECT_DIR$/css/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/index.css" afterDir="false" />  
9 - <change beforePath="$PROJECT_DIR$/css/lxwm_5.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/lxwm_5.css" afterDir="false" />  
10 - <change beforePath="$PROJECT_DIR$/html/alxq.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/alxq.html" afterDir="false" />  
11 - <change beforePath="$PROJECT_DIR$/html/cpxq_2.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/cpxq_2.html" afterDir="false" />  
12 - <change beforePath="$PROJECT_DIR$/html/cpzx_2.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/cpzx_2.html" afterDir="false" />  
13 - <change beforePath="$PROJECT_DIR$/html/dtxq.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/dtxq.html" afterDir="false" />  
14 <change beforePath="$PROJECT_DIR$/html/fwcx_4.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/fwcx_4.html" afterDir="false" /> 5 <change beforePath="$PROJECT_DIR$/html/fwcx_4.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/fwcx_4.html" afterDir="false" />
15 - <change beforePath="$PROJECT_DIR$/html/fwcx_4_1result.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/fwcx_4_1result.html" afterDir="false" />  
16 - <change beforePath="$PROJECT_DIR$/html/fwcx_4_2result.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/fwcx_4_2result.html" afterDir="false" />  
17 - <change beforePath="$PROJECT_DIR$/html/fwxc_4_3result_none.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/fwxc_4_3result_none.html" afterDir="false" />  
18 - <change beforePath="$PROJECT_DIR$/html/gsjj.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/gsjj.html" afterDir="false" />  
19 - <change beforePath="$PROJECT_DIR$/html/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/index.html" afterDir="false" />  
20 - <change beforePath="$PROJECT_DIR$/html/jm_3.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/jm_3.html" afterDir="false" />  
21 - <change beforePath="$PROJECT_DIR$/html/jpal.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/jpal.html" afterDir="false" />  
22 - <change beforePath="$PROJECT_DIR$/html/lxwm_5.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/lxwm_5.html" afterDir="false" />  
23 - <change beforePath="$PROJECT_DIR$/html/lxwm_6.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/lxwm_6.html" afterDir="false" />  
24 - <change beforePath="$PROJECT_DIR$/html/qqrz.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/qqrz.html" afterDir="false" />  
25 - <change beforePath="$PROJECT_DIR$/html/sckj.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/sckj.html" afterDir="false" />  
26 - <change beforePath="$PROJECT_DIR$/html/search_2.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/search_2.html" afterDir="false" />  
27 - <change beforePath="$PROJECT_DIR$/html/search_no_2.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/search_no_2.html" afterDir="false" />  
28 - <change beforePath="$PROJECT_DIR$/html/zxdt.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/zxdt.html" afterDir="false" />  
29 </list> 6 </list>
30 <ignored path="$PROJECT_DIR$/.tmp/" /> 7 <ignored path="$PROJECT_DIR$/.tmp/" />
31 <ignored path="$PROJECT_DIR$/temp/" /> 8 <ignored path="$PROJECT_DIR$/temp/" />
@@ -162,14 +139,14 @@ @@ -162,14 +139,14 @@
162 <usages-collector id="statistics.file.extensions.edit"> 139 <usages-collector id="statistics.file.extensions.edit">
163 <counts> 140 <counts>
164 <entry key="css" value="4234" /> 141 <entry key="css" value="4234" />
165 - <entry key="html" value="9385" /> 142 + <entry key="html" value="9456" />
166 <entry key="js" value="73" /> 143 <entry key="js" value="73" />
167 </counts> 144 </counts>
168 </usages-collector> 145 </usages-collector>
169 <usages-collector id="statistics.file.types.edit"> 146 <usages-collector id="statistics.file.types.edit">
170 <counts> 147 <counts>
171 <entry key="CSS" value="4234" /> 148 <entry key="CSS" value="4234" />
172 - <entry key="HTML" value="9386" /> 149 + <entry key="HTML" value="9457" />
173 <entry key="JavaScript" value="72" /> 150 <entry key="JavaScript" value="72" />
174 </counts> 151 </counts>
175 </usages-collector> 152 </usages-collector>
@@ -246,11 +223,17 @@ @@ -246,11 +223,17 @@
246 </provider> 223 </provider>
247 </entry> 224 </entry>
248 </file> 225 </file>
249 - <file pinned="false" current-in-tab="false"> 226 + <file pinned="false" current-in-tab="true">
250 <entry file="file://$PROJECT_DIR$/html/fwcx_4.html"> 227 <entry file="file://$PROJECT_DIR$/html/fwcx_4.html">
251 <provider selected="true" editor-type-id="text-editor"> 228 <provider selected="true" editor-type-id="text-editor">
252 - <state relative-caret-position="176">  
253 - <caret line="241" column="42" lean-forward="true" selection-start-line="241" selection-start-column="42" selection-end-line="241" selection-end-column="42" /> 229 + <state relative-caret-position="206">
  230 + <caret line="421" column="12" selection-start-line="421" selection-start-column="12" selection-end-line="421" selection-end-column="12" />
  231 + <folding>
  232 + <element signature="n#style#0;n#div#3;n#div#14;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  233 + <element signature="n#style#0;n#div#3;n#div#16;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  234 + <element signature="e#13943#14499#0" />
  235 + <element signature="e#14537#14689#0" />
  236 + </folding>
254 </state> 237 </state>
255 </provider> 238 </provider>
256 </entry> 239 </entry>
@@ -258,17 +241,17 @@ @@ -258,17 +241,17 @@
258 <file pinned="false" current-in-tab="false"> 241 <file pinned="false" current-in-tab="false">
259 <entry file="file://$PROJECT_DIR$/css/fwcx_4.css"> 242 <entry file="file://$PROJECT_DIR$/css/fwcx_4.css">
260 <provider selected="true" editor-type-id="text-editor"> 243 <provider selected="true" editor-type-id="text-editor">
261 - <state relative-caret-position="203">  
262 - <caret line="305" column="18" selection-start-line="305" selection-start-column="18" selection-end-line="305" selection-end-column="18" /> 244 + <state relative-caret-position="207">
  245 + <caret line="371" column="4" selection-start-line="371" selection-start-column="4" selection-end-line="371" selection-end-column="4" />
263 </state> 246 </state>
264 </provider> 247 </provider>
265 </entry> 248 </entry>
266 </file> 249 </file>
267 - <file pinned="false" current-in-tab="true"> 250 + <file pinned="false" current-in-tab="false">
268 <entry file="file://$PROJECT_DIR$/css/lxwm_5.css"> 251 <entry file="file://$PROJECT_DIR$/css/lxwm_5.css">
269 <provider selected="true" editor-type-id="text-editor"> 252 <provider selected="true" editor-type-id="text-editor">
270 - <state relative-caret-position="420">  
271 - <caret line="344" column="25" lean-forward="true" selection-start-line="344" selection-start-column="25" selection-end-line="344" selection-end-column="25" /> 253 + <state relative-caret-position="123">
  254 + <caret line="333" column="17" lean-forward="true" selection-start-line="333" selection-start-column="17" selection-end-line="333" selection-end-column="17" />
272 </state> 255 </state>
273 </provider> 256 </provider>
274 </entry> 257 </entry>
@@ -328,9 +311,6 @@ @@ -328,9 +311,6 @@
328 </component> 311 </component>
329 <component name="FindInProjectRecents"> 312 <component name="FindInProjectRecents">
330 <findStrings> 313 <findStrings>
331 - <find>mid_</find>  
332 - <find>mid_company_banner_left</find>  
333 - <find>swiper-slide</find>  
334 <find>margin</find> 314 <find>margin</find>
335 <find>margin-left</find> 315 <find>margin-left</find>
336 <find>pic4_banner_mid</find> 316 <find>pic4_banner_mid</find>
@@ -357,7 +337,10 @@ @@ -357,7 +337,10 @@
357 <find>最新动态</find> 337 <find>最新动态</find>
358 <find>select_color</find> 338 <find>select_color</find>
359 <find>input</find> 339 <find>input</find>
  340 + <find>.mid_opinion_textarea</find>
  341 + <find>iconfont</find>
360 <find>.mid_count_number</find> 342 <find>.mid_count_number</find>
  343 + <find>sanjiaoright</find>
361 </findStrings> 344 </findStrings>
362 <replaceStrings> 345 <replaceStrings>
363 <replace>div</replace> 346 <replace>div</replace>
@@ -413,9 +396,9 @@ @@ -413,9 +396,9 @@
413 <option value="$PROJECT_DIR$/html/index.html" /> 396 <option value="$PROJECT_DIR$/html/index.html" />
414 <option value="$PROJECT_DIR$/css/index.css" /> 397 <option value="$PROJECT_DIR$/css/index.css" />
415 <option value="$PROJECT_DIR$/html/gsjj.html" /> 398 <option value="$PROJECT_DIR$/html/gsjj.html" />
416 - <option value="$PROJECT_DIR$/html/fwcx_4.html" />  
417 <option value="$PROJECT_DIR$/css/fwcx_4.css" /> 399 <option value="$PROJECT_DIR$/css/fwcx_4.css" />
418 <option value="$PROJECT_DIR$/css/lxwm_5.css" /> 400 <option value="$PROJECT_DIR$/css/lxwm_5.css" />
  401 + <option value="$PROJECT_DIR$/html/fwcx_4.html" />
419 </list> 402 </list>
420 </option> 403 </option>
421 </component> 404 </component>
@@ -426,9 +409,10 @@ @@ -426,9 +409,10 @@
426 <sorting>DEFINITION_ORDER</sorting> 409 <sorting>DEFINITION_ORDER</sorting>
427 </component> 410 </component>
428 <component name="ProjectFrameBounds"> 411 <component name="ProjectFrameBounds">
429 - <option name="x" value="1033" />  
430 - <option name="width" value="904" />  
431 - <option name="height" value="1047" /> 412 + <option name="x" value="779" />
  413 + <option name="y" value="31" />
  414 + <option name="width" value="1348" />
  415 + <option name="height" value="941" />
432 </component> 416 </component>
433 <component name="ProjectView"> 417 <component name="ProjectView">
434 <navigator proportions="" version="1"> 418 <navigator proportions="" version="1">
@@ -539,18 +523,18 @@ @@ -539,18 +523,18 @@
539 <workItem from="1548748173198" duration="12444000" /> 523 <workItem from="1548748173198" duration="12444000" />
540 <workItem from="1548807911154" duration="1663000" /> 524 <workItem from="1548807911154" duration="1663000" />
541 <workItem from="1548894777879" duration="7107000" /> 525 <workItem from="1548894777879" duration="7107000" />
542 - <workItem from="1548985599234" duration="14321000" /> 526 + <workItem from="1548985599234" duration="14995000" />
543 </task> 527 </task>
544 <servers /> 528 <servers />
545 </component> 529 </component>
546 <component name="TimeTrackingManager"> 530 <component name="TimeTrackingManager">
547 - <option name="totallyTimeSpent" value="321306000" /> 531 + <option name="totallyTimeSpent" value="321980000" />
548 </component> 532 </component>
549 <component name="ToolWindowManager"> 533 <component name="ToolWindowManager">
550 - <frame x="830" y="0" width="1107" height="1047" extended-state="0" /> 534 + <frame x="779" y="31" width="1348" height="941" extended-state="0" />
551 <editor active="true" /> 535 <editor active="true" />
552 <layout> 536 <layout>
553 - <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4993464" visible="true" weight="0.21983162" /> 537 + <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4993464" visible="true" weight="0.17938931" />
554 <window_info id="Structure" order="1" sideWeight="0.5006536" side_tool="true" weight="0.16211294" /> 538 <window_info id="Structure" order="1" sideWeight="0.5006536" side_tool="true" weight="0.16211294" />
555 <window_info id="Favorites" order="2" side_tool="true" /> 539 <window_info id="Favorites" order="2" side_tool="true" />
556 <window_info anchor="bottom" id="Message" order="0" /> 540 <window_info anchor="bottom" id="Message" order="0" />
@@ -562,7 +546,7 @@ @@ -562,7 +546,7 @@
562 <window_info anchor="bottom" id="TODO" order="6" /> 546 <window_info anchor="bottom" id="TODO" order="6" />
563 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> 547 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
564 <window_info anchor="bottom" id="Version Control" order="8" /> 548 <window_info anchor="bottom" id="Version Control" order="8" />
565 - <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.3223684" /> 549 + <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.14640199" />
566 <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" /> 550 <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
567 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> 551 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
568 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> 552 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -966,24 +950,30 @@ @@ -966,24 +950,30 @@
966 </state> 950 </state>
967 </provider> 951 </provider>
968 </entry> 952 </entry>
969 - <entry file="file://$PROJECT_DIR$/html/fwcx_4.html"> 953 + <entry file="file://$PROJECT_DIR$/css/lxwm_5.css">
970 <provider selected="true" editor-type-id="text-editor"> 954 <provider selected="true" editor-type-id="text-editor">
971 - <state relative-caret-position="176">  
972 - <caret line="241" column="42" lean-forward="true" selection-start-line="241" selection-start-column="42" selection-end-line="241" selection-end-column="42" /> 955 + <state relative-caret-position="123">
  956 + <caret line="333" column="17" lean-forward="true" selection-start-line="333" selection-start-column="17" selection-end-line="333" selection-end-column="17" />
973 </state> 957 </state>
974 </provider> 958 </provider>
975 </entry> 959 </entry>
976 <entry file="file://$PROJECT_DIR$/css/fwcx_4.css"> 960 <entry file="file://$PROJECT_DIR$/css/fwcx_4.css">
977 <provider selected="true" editor-type-id="text-editor"> 961 <provider selected="true" editor-type-id="text-editor">
978 - <state relative-caret-position="203">  
979 - <caret line="305" column="18" selection-start-line="305" selection-start-column="18" selection-end-line="305" selection-end-column="18" /> 962 + <state relative-caret-position="207">
  963 + <caret line="371" column="4" selection-start-line="371" selection-start-column="4" selection-end-line="371" selection-end-column="4" />
980 </state> 964 </state>
981 </provider> 965 </provider>
982 </entry> 966 </entry>
983 - <entry file="file://$PROJECT_DIR$/css/lxwm_5.css"> 967 + <entry file="file://$PROJECT_DIR$/html/fwcx_4.html">
984 <provider selected="true" editor-type-id="text-editor"> 968 <provider selected="true" editor-type-id="text-editor">
985 - <state relative-caret-position="420">  
986 - <caret line="344" column="25" lean-forward="true" selection-start-line="344" selection-start-column="25" selection-end-line="344" selection-end-column="25" /> 969 + <state relative-caret-position="206">
  970 + <caret line="421" column="12" selection-start-line="421" selection-start-column="12" selection-end-line="421" selection-end-column="12" />
  971 + <folding>
  972 + <element signature="n#style#0;n#div#3;n#div#14;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  973 + <element signature="n#style#0;n#div#3;n#div#16;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  974 + <element signature="e#13943#14499#0" />
  975 + <element signature="e#14537#14689#0" />
  976 + </folding>
987 </state> 977 </state>
988 </provider> 978 </provider>
989 </entry> 979 </entry>
@@ -53,6 +53,11 @@ @@ -53,6 +53,11 @@
53 .select_color{ 53 .select_color{
54 color: #666666; 54 color: #666666;
55 } 55 }
  56 + .xiabiao{
  57 + color: #999999;
  58 + position: absolute;
  59 + right: 0.2rem;
  60 + }
56 </style> 61 </style>
57 </head> 62 </head>
58 <body> 63 <body>
@@ -306,6 +311,8 @@ @@ -306,6 +311,8 @@
306 与油性漆相比水性漆的优缺点分别有哪些？ 311 与油性漆相比水性漆的优缺点分别有哪些？
307 </div> 312 </div>
308 <div class="iconfont icon-sanjiaoright"></div> 313 <div class="iconfont icon-sanjiaoright"></div>
  314 + <!--默认隐藏，当点击时触发-->
  315 + <div class="iconfont icon-tubiaozhizuo- xiabiao" style="display: none;"></div>
309 316
310 </div> 317 </div>
311 <!--点击下拉功能--> 318 <!--点击下拉功能-->
@@ -327,6 +334,8 @@ @@ -327,6 +334,8 @@
327 与油性漆相比水性漆的优缺点分别有哪些？ 334 与油性漆相比水性漆的优缺点分别有哪些？
328 </div> 335 </div>
329 <div class="iconfont icon-sanjiaoright"></div> 336 <div class="iconfont icon-sanjiaoright"></div>
  337 + <!--默认隐藏，当点击时触发-->
  338 + <div class="iconfont icon-tubiaozhizuo- xiabiao" style="display: none;"></div>
330 339
331 </div> 340 </div>
332 <!--点击下拉功能--> 341 <!--点击下拉功能-->
@@ -410,6 +419,7 @@ @@ -410,6 +419,7 @@
410 419
411 if($(".a_1").css('display')=='none'){ 420 if($(".a_1").css('display')=='none'){
412 $('.a_1').css('display','flex'); 421 $('.a_1').css('display','flex');
  422 +
413 }else{ 423 }else{
414 $('.a_1').css('display','none'); 424 $('.a_1').css('display','none');
415 } 425 }