webfront / Clime · 提交

转到一个项目

作者 乔爽
提交 ef9db508b5e3f4a9999c97b78de6d5840c4f6336 1 个父辈 93404eec

update

内嵌 并排对比
正在显示 4 个修改的文件 包含 183 行增加 和 108 行删除
@@ -2,7 +2,10 @@ @@ -2,7 +2,10 @@
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/sckj.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/sckj.css" afterDir="false" />
5 <change beforePath="$PROJECT_DIR$/html/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/index.html" afterDir="false" /> 7 <change beforePath="$PROJECT_DIR$/html/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/index.html" afterDir="false" />
  8 + <change beforePath="$PROJECT_DIR$/html/sckj.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/sckj.html" afterDir="false" />
6 </list> 9 </list>
7 <ignored path="$PROJECT_DIR$/.tmp/" /> 10 <ignored path="$PROJECT_DIR$/.tmp/" />
8 <ignored path="$PROJECT_DIR$/temp/" /> 11 <ignored path="$PROJECT_DIR$/temp/" />
@@ -125,28 +128,28 @@ @@ -125,28 +128,28 @@
125 <usages-collector id="statistics.file.extensions.open"> 128 <usages-collector id="statistics.file.extensions.open">
126 <counts> 129 <counts>
127 <entry key="css" value="71" /> 130 <entry key="css" value="71" />
128 - <entry key="html" value="125" /> 131 + <entry key="html" value="127" />
129 <entry key="js" value="12" /> 132 <entry key="js" value="12" />
130 </counts> 133 </counts>
131 </usages-collector> 134 </usages-collector>
132 <usages-collector id="statistics.file.types.open"> 135 <usages-collector id="statistics.file.types.open">
133 <counts> 136 <counts>
134 <entry key="CSS" value="71" /> 137 <entry key="CSS" value="71" />
135 - <entry key="HTML" value="125" /> 138 + <entry key="HTML" value="127" />
136 <entry key="JavaScript" value="12" /> 139 <entry key="JavaScript" value="12" />
137 </counts> 140 </counts>
138 </usages-collector> 141 </usages-collector>
139 <usages-collector id="statistics.file.extensions.edit"> 142 <usages-collector id="statistics.file.extensions.edit">
140 <counts> 143 <counts>
141 - <entry key="css" value="4268" />  
142 - <entry key="html" value="11064" /> 144 + <entry key="css" value="4468" />
  145 + <entry key="html" value="11543" />
143 <entry key="js" value="73" /> 146 <entry key="js" value="73" />
144 </counts> 147 </counts>
145 </usages-collector> 148 </usages-collector>
146 <usages-collector id="statistics.file.types.edit"> 149 <usages-collector id="statistics.file.types.edit">
147 <counts> 150 <counts>
148 - <entry key="CSS" value="4268" />  
149 - <entry key="HTML" value="11065" /> 151 + <entry key="CSS" value="4468" />
  152 + <entry key="HTML" value="11544" />
150 <entry key="JavaScript" value="72" /> 153 <entry key="JavaScript" value="72" />
151 </counts> 154 </counts>
152 </usages-collector> 155 </usages-collector>
@@ -154,11 +157,11 @@ @@ -154,11 +157,11 @@
154 </component> 157 </component>
155 <component name="FileEditorManager"> 158 <component name="FileEditorManager">
156 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 159 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
157 - <file pinned="false" current-in-tab="true"> 160 + <file pinned="false" current-in-tab="false">
158 <entry file="file://$PROJECT_DIR$/html/index.html"> 161 <entry file="file://$PROJECT_DIR$/html/index.html">
159 <provider selected="true" editor-type-id="text-editor"> 162 <provider selected="true" editor-type-id="text-editor">
160 - <state relative-caret-position="351">  
161 - <caret line="211" column="25" selection-start-line="211" selection-start-column="25" selection-end-line="211" selection-end-column="25" /> 163 + <state relative-caret-position="418">
  164 + <caret line="668" lean-forward="true" selection-start-line="668" selection-end-line="668" />
162 <folding> 165 <folding>
163 <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> 166 <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
164 <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 167 <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
@@ -193,10 +196,43 @@ @@ -193,10 +196,43 @@
193 </entry> 196 </entry>
194 </file> 197 </file>
195 <file pinned="false" current-in-tab="false"> 198 <file pinned="false" current-in-tab="false">
  199 + <entry file="file://$PROJECT_DIR$/html/qqrz.html">
  200 + <provider selected="true" editor-type-id="text-editor">
  201 + <state relative-caret-position="459">
  202 + <caret line="53" column="9" selection-start-line="53" selection-start-column="9" selection-end-line="53" selection-end-column="9" />
  203 + </state>
  204 + </provider>
  205 + </entry>
  206 + </file>
  207 + <file pinned="false" current-in-tab="false">
  208 + <entry file="file://$PROJECT_DIR$/html/gsjj.html">
  209 + <provider selected="true" editor-type-id="text-editor">
  210 + <state relative-caret-position="948">
  211 + <caret line="507" column="13" lean-forward="true" selection-start-line="507" selection-start-column="13" selection-end-line="507" selection-end-column="13" />
  212 + <folding>
  213 + <element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  214 + <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  215 + <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  216 + <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  217 + <element signature="n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  218 + <element signature="n#div#0;n#div#5;n#div#1;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  219 + <element signature="n#div#1;n#div#5;n#div#1;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  220 + <element signature="n#style#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  221 + <element signature="n#div#0;n#div#2;n#div#5;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  222 + <element signature="n#div#1;n#div#2;n#div#5;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  223 + <element signature="n#div#0;n#div#2;n#div#6;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  224 + <element signature="n#div#1;n#div#2;n#div#6;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  225 + <element signature="n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  226 + </folding>
  227 + </state>
  228 + </provider>
  229 + </entry>
  230 + </file>
  231 + <file pinned="false" current-in-tab="false">
196 <entry file="file://$PROJECT_DIR$/css/sckj.css"> 232 <entry file="file://$PROJECT_DIR$/css/sckj.css">
197 <provider selected="true" editor-type-id="text-editor"> 233 <provider selected="true" editor-type-id="text-editor">
198 - <state relative-caret-position="522">  
199 - <caret line="195" column="23" lean-forward="true" selection-start-line="195" selection-start-column="23" selection-end-line="195" selection-end-column="23" /> 234 + <state relative-caret-position="235">
  235 + <caret line="461" lean-forward="true" selection-start-line="461" selection-end-line="461" />
200 </state> 236 </state>
201 </provider> 237 </provider>
202 </entry> 238 </entry>
@@ -210,11 +246,11 @@ @@ -210,11 +246,11 @@
210 </provider> 246 </provider>
211 </entry> 247 </entry>
212 </file> 248 </file>
213 - <file pinned="false" current-in-tab="false"> 249 + <file pinned="false" current-in-tab="true">
214 <entry file="file://$PROJECT_DIR$/html/sckj.html"> 250 <entry file="file://$PROJECT_DIR$/html/sckj.html">
215 <provider selected="true" editor-type-id="text-editor"> 251 <provider selected="true" editor-type-id="text-editor">
216 - <state relative-caret-position="-883">  
217 - <caret line="188" column="33" lean-forward="true" selection-start-line="188" selection-start-column="33" selection-end-line="188" selection-end-column="33" /> 252 + <state relative-caret-position="194">
  253 + <caret line="184" column="20" lean-forward="true" selection-start-line="184" selection-start-column="24" selection-end-line="207" selection-end-column="30" />
218 <folding> 254 <folding>
219 <element signature="n#div#0;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 255 <element signature="n#div#0;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
220 <element signature="n#div#0;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 256 <element signature="n#div#0;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
@@ -224,6 +260,9 @@ @@ -224,6 +260,9 @@
224 <element signature="n#div#4;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 260 <element signature="n#div#4;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
225 <element signature="n#div#5;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 261 <element signature="n#div#5;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
226 <element signature="n#div#6;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 262 <element signature="n#div#6;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  263 + <element signature="e#10730#11072#0" />
  264 + <element signature="e#11906#18061#0" />
  265 + <element signature="e#12593#18053#0" />
227 </folding> 266 </folding>
228 </state> 267 </state>
229 </provider> 268 </provider>
@@ -239,31 +278,6 @@ @@ -239,31 +278,6 @@
239 </entry> 278 </entry>
240 </file> 279 </file>
241 <file pinned="false" current-in-tab="false"> 280 <file pinned="false" current-in-tab="false">
242 - <entry file="file://$PROJECT_DIR$/html/fwcx_4.html">  
243 - <provider selected="true" editor-type-id="text-editor">  
244 - <state relative-caret-position="10962">  
245 - <caret line="428" column="68" lean-forward="true" selection-start-line="428" selection-start-column="68" selection-end-line="428" selection-end-column="68" />  
246 - <folding>  
247 - <element signature="n#div#12;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
248 - <element signature="n#div#13;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
249 - <element signature="n#div#14;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
250 - <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" />  
251 - <element signature="n#div#15;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
252 - </folding>  
253 - </state>  
254 - </provider>  
255 - </entry>  
256 - </file>  
257 - <file pinned="false" current-in-tab="false">  
258 - <entry file="file://$PROJECT_DIR$/css/gsjj.css">  
259 - <provider selected="true" editor-type-id="text-editor">  
260 - <state relative-caret-position="9936">  
261 - <caret line="368" column="27" lean-forward="true" selection-start-line="368" selection-start-column="27" selection-end-line="368" selection-end-column="27" />  
262 - </state>  
263 - </provider>  
264 - </entry>  
265 - </file>  
266 - <file pinned="false" current-in-tab="false">  
267 <entry file="file://$PROJECT_DIR$/html/search_2.html"> 281 <entry file="file://$PROJECT_DIR$/html/search_2.html">
268 <provider selected="true" editor-type-id="text-editor"> 282 <provider selected="true" editor-type-id="text-editor">
269 <state relative-caret-position="1431"> 283 <state relative-caret-position="1431">
@@ -309,11 +323,6 @@ @@ -309,11 +323,6 @@
309 </component> 323 </component>
310 <component name="FindInProjectRecents"> 324 <component name="FindInProjectRecents">
311 <findStrings> 325 <findStrings>
312 - <find>swiper-slide-active</find>  
313 - <find>pic4_banner</find>  
314 - <find>icon-caidan</find>  
315 - <find>banner</find>  
316 - <find>item</find>  
317 <find>data-id</find> 326 <find>data-id</find>
318 <find>mid_company_banner_mid</find> 327 <find>mid_company_banner_mid</find>
319 <find>slide</find> 328 <find>slide</find>
@@ -337,8 +346,13 @@ @@ -337,8 +346,13 @@
337 <find>pic_item_box_top</find> 346 <find>pic_item_box_top</find>
338 <find>btn_loca</find> 347 <find>btn_loca</find>
339 <find>year</find> 348 <find>year</find>
340 - <find>mid_list</find>  
341 <find>bottom</find> 349 <find>bottom</find>
  350 + <find>pic_size</find>
  351 + <find>mid_list</find>
  352 + <find>mid_lis</find>
  353 + <find>pic_list</find>
  354 + <find>show_pic</find>
  355 + <find>pic1_mid_bottom</find>
342 </findStrings> 356 </findStrings>
343 <replaceStrings> 357 <replaceStrings>
344 <replace>div</replace> 358 <replace>div</replace>
@@ -375,7 +389,6 @@ @@ -375,7 +389,6 @@
375 <option value="$PROJECT_DIR$/css/search_2.css" /> 389 <option value="$PROJECT_DIR$/css/search_2.css" />
376 <option value="$PROJECT_DIR$/css/common.css" /> 390 <option value="$PROJECT_DIR$/css/common.css" />
377 <option value="$PROJECT_DIR$/css/lxwm_6.css" /> 391 <option value="$PROJECT_DIR$/css/lxwm_6.css" />
378 - <option value="$PROJECT_DIR$/css/sckj.css" />  
379 <option value="$PROJECT_DIR$/css/gsjj.css" /> 392 <option value="$PROJECT_DIR$/css/gsjj.css" />
380 <option value="$PROJECT_DIR$/html/alxq.html" /> 393 <option value="$PROJECT_DIR$/html/alxq.html" />
381 <option value="$PROJECT_DIR$/html/cpzx_2.html" /> 394 <option value="$PROJECT_DIR$/html/cpzx_2.html" />
@@ -396,9 +409,10 @@ @@ -396,9 +409,10 @@
396 <option value="$PROJECT_DIR$/css/fwcx_4.css" /> 409 <option value="$PROJECT_DIR$/css/fwcx_4.css" />
397 <option value="$PROJECT_DIR$/html/cpxq_2.html" /> 410 <option value="$PROJECT_DIR$/html/cpxq_2.html" />
398 <option value="$PROJECT_DIR$/html/fwcx_4.html" /> 411 <option value="$PROJECT_DIR$/html/fwcx_4.html" />
399 - <option value="$PROJECT_DIR$/html/sckj.html" />  
400 <option value="$PROJECT_DIR$/css/index.css" /> 412 <option value="$PROJECT_DIR$/css/index.css" />
401 <option value="$PROJECT_DIR$/html/index.html" /> 413 <option value="$PROJECT_DIR$/html/index.html" />
  414 + <option value="$PROJECT_DIR$/css/sckj.css" />
  415 + <option value="$PROJECT_DIR$/html/sckj.html" />
402 </list> 416 </list>
403 </option> 417 </option>
404 </component> 418 </component>
@@ -409,10 +423,10 @@ @@ -409,10 +423,10 @@
409 <sorting>DEFINITION_ORDER</sorting> 423 <sorting>DEFINITION_ORDER</sorting>
410 </component> 424 </component>
411 <component name="ProjectFrameBounds"> 425 <component name="ProjectFrameBounds">
412 - <option name="x" value="347" />  
413 - <option name="y" value="40" />  
414 - <option name="width" value="1553" />  
415 - <option name="height" value="975" /> 426 + <option name="x" value="728" />
  427 + <option name="y" value="111" />
  428 + <option name="width" value="1415" />
  429 + <option name="height" value="976" />
416 </component> 430 </component>
417 <component name="ProjectView"> 431 <component name="ProjectView">
418 <navigator proportions="" version="1"> 432 <navigator proportions="" version="1">
@@ -525,18 +539,18 @@ @@ -525,18 +539,18 @@
525 <workItem from="1548894777879" duration="7107000" /> 539 <workItem from="1548894777879" duration="7107000" />
526 <workItem from="1548985599234" duration="16586000" /> 540 <workItem from="1548985599234" duration="16586000" />
527 <workItem from="1549074255207" duration="6285000" /> 541 <workItem from="1549074255207" duration="6285000" />
528 - <workItem from="1549845206263" duration="6542000" /> 542 + <workItem from="1549845206263" duration="17876000" />
529 </task> 543 </task>
530 <servers /> 544 <servers />
531 </component> 545 </component>
532 <component name="TimeTrackingManager"> 546 <component name="TimeTrackingManager">
533 - <option name="totallyTimeSpent" value="336398000" /> 547 + <option name="totallyTimeSpent" value="347732000" />
534 </component> 548 </component>
535 <component name="ToolWindowManager"> 549 <component name="ToolWindowManager">
536 - <frame x="347" y="40" width="1553" height="975" extended-state="0" /> 550 + <frame x="728" y="111" width="1415" height="976" extended-state="0" />
537 <editor active="true" /> 551 <editor active="true" />
538 <layout> 552 <layout>
539 - <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4993464" visible="true" weight="0.15511551" /> 553 + <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4993464" visible="true" weight="0.20188816" />
540 <window_info id="Structure" order="1" sideWeight="0.5006536" side_tool="true" weight="0.16211294" /> 554 <window_info id="Structure" order="1" sideWeight="0.5006536" side_tool="true" weight="0.16211294" />
541 <window_info id="Favorites" order="2" side_tool="true" /> 555 <window_info id="Favorites" order="2" side_tool="true" />
542 <window_info anchor="bottom" id="Message" order="0" /> 556 <window_info anchor="bottom" id="Message" order="0" />
@@ -548,7 +562,7 @@ @@ -548,7 +562,7 @@
548 <window_info anchor="bottom" id="TODO" order="6" /> 562 <window_info anchor="bottom" id="TODO" order="6" />
549 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> 563 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
550 <window_info anchor="bottom" id="Version Control" order="8" /> 564 <window_info anchor="bottom" id="Version Control" order="8" />
551 - <window_info active="true" anchor="bottom" id="Terminal" order="9" visible="true" weight="0.3892857" /> 565 + <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.25802615" />
552 <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" /> 566 <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
553 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> 567 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
554 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> 568 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -799,20 +813,6 @@ @@ -799,20 +813,6 @@
799 </state> 813 </state>
800 </provider> 814 </provider>
801 </entry> 815 </entry>
802 - <entry file="file://$PROJECT_DIR$/html/qqrz.html">  
803 - <provider selected="true" editor-type-id="text-editor">  
804 - <state relative-caret-position="459">  
805 - <caret line="53" column="9" selection-start-line="53" selection-start-column="9" selection-end-line="53" selection-end-column="9" />  
806 - </state>  
807 - </provider>  
808 - </entry>  
809 - <entry file="file://$PROJECT_DIR$/html/gsjj.html">  
810 - <provider selected="true" editor-type-id="text-editor">  
811 - <state relative-caret-position="7749">  
812 - <caret line="385" column="47" selection-start-line="385" selection-start-column="47" selection-end-line="385" selection-end-column="47" />  
813 - </state>  
814 - </provider>  
815 - </entry>  
816 <entry file="file://$PROJECT_DIR$/css/fwcx_4.css"> 816 <entry file="file://$PROJECT_DIR$/css/fwcx_4.css">
817 <provider selected="true" editor-type-id="text-editor"> 817 <provider selected="true" editor-type-id="text-editor">
818 <state relative-caret-position="10233"> 818 <state relative-caret-position="10233">
@@ -897,13 +897,6 @@ @@ -897,13 +897,6 @@
897 </state> 897 </state>
898 </provider> 898 </provider>
899 </entry> 899 </entry>
900 - <entry file="file://$PROJECT_DIR$/css/sckj.css">  
901 - <provider selected="true" editor-type-id="text-editor">  
902 - <state relative-caret-position="522">  
903 - <caret line="195" column="23" lean-forward="true" selection-start-line="195" selection-start-column="23" selection-end-line="195" selection-end-column="23" />  
904 - </state>  
905 - </provider>  
906 - </entry>  
907 <entry file="file://$PROJECT_DIR$/css/index.css"> 900 <entry file="file://$PROJECT_DIR$/css/index.css">
908 <provider selected="true" editor-type-id="text-editor"> 901 <provider selected="true" editor-type-id="text-editor">
909 <state relative-caret-position="202"> 902 <state relative-caret-position="202">
@@ -911,27 +904,46 @@ @@ -911,27 +904,46 @@
911 </state> 904 </state>
912 </provider> 905 </provider>
913 </entry> 906 </entry>
914 - <entry file="file://$PROJECT_DIR$/html/sckj.html"> 907 + <entry file="file://$PROJECT_DIR$/html/gsjj.html">
915 <provider selected="true" editor-type-id="text-editor"> 908 <provider selected="true" editor-type-id="text-editor">
916 - <state relative-caret-position="-883">  
917 - <caret line="188" column="33" lean-forward="true" selection-start-line="188" selection-start-column="33" selection-end-line="188" selection-end-column="33" /> 909 + <state relative-caret-position="948">
  910 + <caret line="507" column="13" lean-forward="true" selection-start-line="507" selection-start-column="13" selection-end-line="507" selection-end-column="13" />
918 <folding> 911 <folding>
919 - <element signature="n#div#0;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
920 - <element signature="n#div#0;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
921 - <element signature="n#div#1;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
922 - <element signature="n#div#2;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
923 - <element signature="n#div#3;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
924 - <element signature="n#div#4;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
925 - <element signature="n#div#5;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
926 - <element signature="n#div#6;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 912 + <element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  913 + <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  914 + <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  915 + <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  916 + <element signature="n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  917 + <element signature="n#div#0;n#div#5;n#div#1;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  918 + <element signature="n#div#1;n#div#5;n#div#1;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  919 + <element signature="n#style#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  920 + <element signature="n#div#0;n#div#2;n#div#5;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  921 + <element signature="n#div#1;n#div#2;n#div#5;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  922 + <element signature="n#div#0;n#div#2;n#div#6;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  923 + <element signature="n#div#1;n#div#2;n#div#6;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  924 + <element signature="n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
927 </folding> 925 </folding>
928 </state> 926 </state>
929 </provider> 927 </provider>
930 </entry> 928 </entry>
  929 + <entry file="file://$PROJECT_DIR$/html/qqrz.html">
  930 + <provider selected="true" editor-type-id="text-editor">
  931 + <state relative-caret-position="459">
  932 + <caret line="53" column="9" selection-start-line="53" selection-start-column="9" selection-end-line="53" selection-end-column="9" />
  933 + </state>
  934 + </provider>
  935 + </entry>
  936 + <entry file="file://$PROJECT_DIR$/css/sckj.css">
  937 + <provider selected="true" editor-type-id="text-editor">
  938 + <state relative-caret-position="235">
  939 + <caret line="461" lean-forward="true" selection-start-line="461" selection-end-line="461" />
  940 + </state>
  941 + </provider>
  942 + </entry>
931 <entry file="file://$PROJECT_DIR$/html/index.html"> 943 <entry file="file://$PROJECT_DIR$/html/index.html">
932 <provider selected="true" editor-type-id="text-editor"> 944 <provider selected="true" editor-type-id="text-editor">
933 - <state relative-caret-position="351">  
934 - <caret line="211" column="25" selection-start-line="211" selection-start-column="25" selection-end-line="211" selection-end-column="25" /> 945 + <state relative-caret-position="418">
  946 + <caret line="668" lean-forward="true" selection-start-line="668" selection-end-line="668" />
935 <folding> 947 <folding>
936 <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> 948 <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
937 <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 949 <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
@@ -964,5 +976,25 @@ @@ -964,5 +976,25 @@
964 </state> 976 </state>
965 </provider> 977 </provider>
966 </entry> 978 </entry>
  979 + <entry file="file://$PROJECT_DIR$/html/sckj.html">
  980 + <provider selected="true" editor-type-id="text-editor">
  981 + <state relative-caret-position="194">
  982 + <caret line="184" column="20" lean-forward="true" selection-start-line="184" selection-start-column="24" selection-end-line="207" selection-end-column="30" />
  983 + <folding>
  984 + <element signature="n#div#0;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  985 + <element signature="n#div#0;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  986 + <element signature="n#div#1;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  987 + <element signature="n#div#2;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  988 + <element signature="n#div#3;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  989 + <element signature="n#div#4;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  990 + <element signature="n#div#5;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  991 + <element signature="n#div#6;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  992 + <element signature="e#10730#11072#0" />
  993 + <element signature="e#11906#18061#0" />
  994 + <element signature="e#12593#18053#0" />
  995 + </folding>
  996 + </state>
  997 + </provider>
  998 + </entry>
967 </component> 999 </component>
968 </project> 1000 </project>
@@ -185,15 +185,17 @@ input::-webkit-input-placeholder{ @@ -185,15 +185,17 @@ input::-webkit-input-placeholder{
185 width: 6.57rem; 185 width: 6.57rem;
186 display: flex; 186 display: flex;
187 flex-wrap: wrap; 187 flex-wrap: wrap;
188 - justify-content: space-between; 188 + /*justify-content: space-between;*/
189 margin-top: 0.16rem; 189 margin-top: 0.16rem;
190 position: relative; 190 position: relative;
191 } 191 }
192 .pic_list{ 192 .pic_list{
  193 + margin-top: 0.16rem;
193 width: 0.8rem; 194 width: 0.8rem;
194 height: 0.8rem; 195 height: 0.8rem;
195 border-radius: 0.06rem; 196 border-radius: 0.06rem;
196 position: relative; 197 position: relative;
  198 + margin-left: 0.12rem;
197 } 199 }
198 .color_list_1{ 200 .color_list_1{
199 background-color: #E5E0D2; 201 background-color: #E5E0D2;
@@ -282,18 +284,32 @@ input::-webkit-input-placeholder{ @@ -282,18 +284,32 @@ input::-webkit-input-placeholder{
282 display: flex; 284 display: flex;
283 justify-content: center; 285 justify-content: center;
284 align-items: center; 286 align-items: center;
285 - position: absolute;  
286 - top: 0.8rem; 287 + /*position: absolute;*/
  288 + /*top: 0.84rem;*/
287 } 289 }
288 .pic_size{ 290 .pic_size{
289 width: 6.36rem; 291 width: 6.36rem;
290 height: 3.96rem; 292 height: 3.96rem;
291 display: flex; 293 display: flex;
  294 + position: relative;
292 } 295 }
293 .pic_size img{ 296 .pic_size img{
294 width: 100%; 297 width: 100%;
295 height: 100%; 298 height: 100%;
296 } 299 }
  300 +.pic_text{
  301 + width: 1.5rem;
  302 + height: 0.52rem;
  303 + line-height: 0.52rem;
  304 + background:rgba(255,255,255,1);
  305 + border-radius: 0.26rem;
  306 + position: absolute;
  307 + text-align: center;
  308 +
  309 + font-size: 0.26rem;
  310 + color: #666666;
  311 +}
  312 +
297 /*设置角标*/ 313 /*设置角标*/
298 .icon_bicon{ 314 .icon_bicon{
299 width: 0.39rem; 315 width: 0.39rem;
@@ -649,7 +649,7 @@ @@ -649,7 +649,7 @@
649 // prevEl: '.arrow-left', 649 // prevEl: '.arrow-left',
650 // }, 650 // },
651 }); 651 });
652 - 652 + //颜色切换
653 $('.pic_time_box').on('click','.year',function () { 653 $('.pic_time_box').on('click','.year',function () {
654 var t = $(this) 654 var t = $(this)
655 if (t.hasClass('year')){ 655 if (t.hasClass('year')){
@@ -659,17 +659,14 @@ @@ -659,17 +659,14 @@
659 t.removeClass('time_color') 659 t.removeClass('time_color')
660 } 660 }
661 }) 661 })
  662 + //通过颜色切换调用内容切换
  663 + $('.pic_item_box_top>p').click(function () {
  664 + console.log(11)
  665 + $('.pic_item_box_top>p').eq($('.pic1_mid_bottom>p').index()).addClass('on').siblings().removeClass('on');
  666 + $('.pic1_mid_bottom>p').hide().eq($(this).index()).show();
  667 + })
662 668
663 - // $('.pic_time_box').on('click','.year',function () {  
664 - // $(this).eq($('.year').index()).addClass('time_color').siblings().removeClass('time_color');  
665 - // console.log('aaa')  
666 - // })  
667 669
668 - $('.pic_item_box_top>p').click(function () {  
669 - console.log(11)  
670 - $('.pic_item_box_top>p').eq($('.pic1_mid_bottom>p').index()).addClass('on').siblings().removeClass('on');  
671 - $('.pic1_mid_bottom>p').hide().eq($(this).index()).show();  
672 - })  
673 670
674 </script> 671 </script>
675 </html> 672 </html>
@@ -182,20 +182,46 @@ @@ -182,20 +182,46 @@
182 182
183 </div> 183 </div>
184 184
185 -  
186 -  
187 - 185 + <!--<div class="pic_list color_list_1">-->
  186 + <!--<div class="iconfont"></div>-->
  187 + <!--</div>-->
  188 + <!--<div class="pic_list color_list_2">-->
  189 + <!--<div class="iconfont"></div>-->
  190 + <!--</div>-->
  191 + <!--<div class="pic_list color_list_3">-->
  192 + <!--<div class="iconfont"></div>-->
  193 + <!--</div>-->
  194 + <!--<div class="pic_list color_list_4">-->
  195 + <!--<div class="iconfont"></div>-->
  196 + <!--</div>-->
  197 + <!--<div class="pic_list color_list_5">-->
  198 + <!--<div class="iconfont"></div>-->
  199 + <!--</div>-->
  200 + <!--<div class="pic_list color_list_6">-->
  201 + <!--<div class="iconfont"></div>-->
  202 + <!--</div>-->
  203 + <!--<div class="pic_list color_list_7 ">-->
  204 + <!--<div class="iconfont ">-->
  205 +
  206 + <!--</div>-->
  207 +
  208 + <!--</div>-->
188 209
189 <!--出现图片样式--> 210 <!--出现图片样式-->
190 <div class="show_pic" > 211 <div class="show_pic" >
191 <div class="pic_size"> 212 <div class="pic_size">
192 <img src="../images/bicon_39@2x.png"> 213 <img src="../images/bicon_39@2x.png">
193 </div> 214 </div>
  215 + <div class="pic_text">
  216 + 查看详情>
  217 + </div>
194 </div> 218 </div>
195 </div> 219 </div>
196 220
197 221
198 222
  223 +
  224 +
199 </div> 225 </div>
200 226
201 <!--色彩搭配--> 227 <!--色彩搭配-->
@@ -335,7 +361,12 @@ @@ -335,7 +361,12 @@
335 $('.show_pic').css("display","none") 361 $('.show_pic').css("display","none")
336 }else{ 362 }else{
337 b.addClass('icon-shangjiantou').parents(".pic_list").siblings().children(".iconfont").removeClass('icon-shangjiantou') 363 b.addClass('icon-shangjiantou').parents(".pic_list").siblings().children(".iconfont").removeClass('icon-shangjiantou')
338 - $('.show_pic').css("display","flex") 364 + // $('.show_pic').css("display","flex")
  365 + $('.show_pic').css({
  366 + display:'flex',
  367 + position:'absolute',
  368 + top:'1rem',
  369 + })
339 370
340 } 371 }
341 }) 372 })
@@ -352,7 +383,6 @@ @@ -352,7 +383,6 @@
352 383
353 384
354 385
355 -  
356 $(document).ready(function () { 386 $(document).ready(function () {
357 $(".icon-caidan").click(function () { 387 $(".icon-caidan").click(function () {
358 $(".menu_default").slideToggle(); 388 $(".menu_default").slideToggle();