webfront / Clime · 提交

转到一个项目

作者 乔爽
提交 28d5179139de54b3f1dad42b339f626ab47eb259 1 个父辈 4960fa43

update

内嵌 并排对比
正在显示 6 个修改的文件 包含 575 行增加 和 132 行删除
@@ -3,7 +3,11 @@ @@ -3,7 +3,11 @@
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" /> 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
  6 + <change beforePath="$PROJECT_DIR$/css/cpzx_2.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/cpzx_2.css" afterDir="false" />
  7 + <change beforePath="$PROJECT_DIR$/css/sckj.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/sckj.css" afterDir="false" />
6 <change beforePath="$PROJECT_DIR$/html/cpzx_2.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/cpzx_2.html" afterDir="false" /> 8 <change beforePath="$PROJECT_DIR$/html/cpzx_2.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/cpzx_2.html" afterDir="false" />
  9 + <change beforePath="$PROJECT_DIR$/html/fwcx_4.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/fwcx_4.html" afterDir="false" />
  10 + <change beforePath="$PROJECT_DIR$/html/sckj.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/sckj.html" afterDir="false" />
7 </list> 11 </list>
8 <ignored path="$PROJECT_DIR$/.tmp/" /> 12 <ignored path="$PROJECT_DIR$/.tmp/" />
9 <ignored path="$PROJECT_DIR$/temp/" /> 13 <ignored path="$PROJECT_DIR$/temp/" />
@@ -126,29 +130,29 @@ @@ -126,29 +130,29 @@
126 </usages-collector> 130 </usages-collector>
127 <usages-collector id="statistics.file.extensions.open"> 131 <usages-collector id="statistics.file.extensions.open">
128 <counts> 132 <counts>
129 - <entry key="css" value="95" />  
130 - <entry key="html" value="165" /> 133 + <entry key="css" value="96" />
  134 + <entry key="html" value="167" />
131 <entry key="js" value="12" /> 135 <entry key="js" value="12" />
132 </counts> 136 </counts>
133 </usages-collector> 137 </usages-collector>
134 <usages-collector id="statistics.file.types.open"> 138 <usages-collector id="statistics.file.types.open">
135 <counts> 139 <counts>
136 - <entry key="CSS" value="95" />  
137 - <entry key="HTML" value="165" /> 140 + <entry key="CSS" value="96" />
  141 + <entry key="HTML" value="167" />
138 <entry key="JavaScript" value="12" /> 142 <entry key="JavaScript" value="12" />
139 </counts> 143 </counts>
140 </usages-collector> 144 </usages-collector>
141 <usages-collector id="statistics.file.extensions.edit"> 145 <usages-collector id="statistics.file.extensions.edit">
142 <counts> 146 <counts>
143 - <entry key="css" value="4480" />  
144 - <entry key="html" value="12282" /> 147 + <entry key="css" value="4657" />
  148 + <entry key="html" value="12722" />
145 <entry key="js" value="73" /> 149 <entry key="js" value="73" />
146 </counts> 150 </counts>
147 </usages-collector> 151 </usages-collector>
148 <usages-collector id="statistics.file.types.edit"> 152 <usages-collector id="statistics.file.types.edit">
149 <counts> 153 <counts>
150 - <entry key="CSS" value="4480" />  
151 - <entry key="HTML" value="12283" /> 154 + <entry key="CSS" value="4657" />
  155 + <entry key="HTML" value="12723" />
152 <entry key="JavaScript" value="72" /> 156 <entry key="JavaScript" value="72" />
153 </counts> 157 </counts>
154 </usages-collector> 158 </usages-collector>
@@ -240,8 +244,8 @@ @@ -240,8 +244,8 @@
240 <file pinned="false" current-in-tab="false"> 244 <file pinned="false" current-in-tab="false">
241 <entry file="file://$PROJECT_DIR$/css/cpzx_2.css"> 245 <entry file="file://$PROJECT_DIR$/css/cpzx_2.css">
242 <provider selected="true" editor-type-id="text-editor"> 246 <provider selected="true" editor-type-id="text-editor">
243 - <state relative-caret-position="-352">  
244 - <caret line="615" column="20" lean-forward="true" selection-start-line="615" selection-start-column="20" selection-end-line="615" selection-end-column="20" /> 247 + <state relative-caret-position="426">
  248 + <caret line="422" column="35" selection-start-line="422" selection-start-column="35" selection-end-line="422" selection-end-column="35" />
245 </state> 249 </state>
246 </provider> 250 </provider>
247 </entry> 251 </entry>
@@ -249,10 +253,14 @@ @@ -249,10 +253,14 @@
249 <file pinned="false" current-in-tab="true"> 253 <file pinned="false" current-in-tab="true">
250 <entry file="file://$PROJECT_DIR$/html/cpzx_2.html"> 254 <entry file="file://$PROJECT_DIR$/html/cpzx_2.html">
251 <provider selected="true" editor-type-id="text-editor"> 255 <provider selected="true" editor-type-id="text-editor">
252 - <state relative-caret-position="1">  
253 - <caret line="365" lean-forward="true" selection-start-line="365" selection-end-line="365" /> 256 + <state relative-caret-position="657">
  257 + <caret line="290" column="22" selection-start-line="290" selection-start-column="22" selection-end-line="290" selection-end-column="22" />
254 <folding> 258 <folding>
255 - <element signature="n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 259 + <element signature="n#div#0;n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  260 + <element signature="n#div#1;n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  261 + <element signature="n#div#2;n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  262 + <element signature="n#div#3;n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  263 + <element signature="n#div#4;n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
256 <element signature="n#div#4;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 264 <element signature="n#div#4;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
257 <element signature="n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 265 <element signature="n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
258 <element signature="n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 266 <element signature="n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
@@ -276,32 +284,16 @@ @@ -276,32 +284,16 @@
276 </entry> 284 </entry>
277 </file> 285 </file>
278 <file pinned="false" current-in-tab="false"> 286 <file pinned="false" current-in-tab="false">
279 - <entry file="file://$PROJECT_DIR$/html/gsjj.html"> 287 + <entry file="file://$PROJECT_DIR$/html/search_2.html">
280 <provider selected="true" editor-type-id="text-editor"> 288 <provider selected="true" editor-type-id="text-editor">
281 - <state relative-caret-position="172">  
282 - <caret line="505" lean-forward="true" selection-start-line="505" selection-end-line="505" /> 289 + <state relative-caret-position="704">
  290 + <caret line="321" column="10" lean-forward="true" selection-start-line="321" selection-start-column="10" selection-end-line="321" selection-end-column="10" />
283 <folding> 291 <folding>
284 - <element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
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" />  
286 - <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
287 - <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
288 - <element signature="n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
289 - <element signature="n#div#0;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
290 - <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" />  
291 - <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" />  
292 - <element signature="n#style#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
293 - <element signature="n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
294 - <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" />  
295 - <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" />  
296 - <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" />  
297 - <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" />  
298 - <element signature="n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
299 - <element signature="n#div#7;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
300 - <element signature="n#div#0;n#div#7;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
301 - <element signature="n#div#1;n#div#7;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
302 - <element signature="n#div#2;n#div#7;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
303 - <element signature="n#div#3;n#div#7;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
304 - <element signature="e#18846#19343#0" /> 292 + <element signature="n#div#4;n#div#0;n#body#0;n#html#0;n#!!top" />
  293 + <element signature="n#div#0;n#div#4;n#div#0;n#body#0;n#html#0;n#!!top" />
  294 + <element signature="n#div#1;n#div#4;n#div#0;n#body#0;n#html#0;n#!!top" />
  295 + <element signature="n#div#2;n#div#4;n#div#0;n#body#0;n#html#0;n#!!top" />
  296 + <element signature="n#div#3;n#div#4;n#div#0;n#body#0;n#html#0;n#!!top" />
305 </folding> 297 </folding>
306 </state> 298 </state>
307 </provider> 299 </provider>
@@ -310,10 +302,17 @@ @@ -310,10 +302,17 @@
310 <file pinned="false" current-in-tab="false"> 302 <file pinned="false" current-in-tab="false">
311 <entry file="file://$PROJECT_DIR$/html/sckj.html"> 303 <entry file="file://$PROJECT_DIR$/html/sckj.html">
312 <provider selected="true" editor-type-id="text-editor"> 304 <provider selected="true" editor-type-id="text-editor">
313 - <state relative-caret-position="217">  
314 - <caret line="201" selection-start-line="201" selection-end-line="202" /> 305 + <state relative-caret-position="521">
  306 + <caret line="226" column="51" lean-forward="true" selection-start-line="226" selection-start-column="36" selection-end-line="226" selection-end-column="51" />
315 <folding> 307 <folding>
316 <element signature="n#div#1;n#div#0;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 308 <element signature="n#div#1;n#div#0;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  309 + <element signature="n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  310 + <element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  311 + <element signature="n#div#1;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  312 + <element signature="n#div#2;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  313 + <element signature="n#div#0;n#div#2;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  314 + <element signature="n#div#1;n#div#2;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  315 + <element signature="n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
317 <element signature="n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 316 <element signature="n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
318 <element signature="n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 317 <element signature="n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
319 <element signature="n#div#1;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 318 <element signature="n#div#1;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
@@ -326,39 +325,75 @@ @@ -326,39 +325,75 @@
326 </entry> 325 </entry>
327 </file> 326 </file>
328 <file pinned="false" current-in-tab="false"> 327 <file pinned="false" current-in-tab="false">
329 - <entry file="file://$PROJECT_DIR$/css/sckj.css">  
330 - <provider selected="true" editor-type-id="text-editor">  
331 - <state relative-caret-position="243">  
332 - <caret line="198" column="25" lean-forward="true" selection-start-line="198" selection-start-column="25" selection-end-line="198" selection-end-column="25" />  
333 - </state>  
334 - </provider>  
335 - </entry>  
336 - </file>  
337 - <file pinned="false" current-in-tab="false">  
338 - <entry file="file://$PROJECT_DIR$/css/index.css"> 328 + <entry file="file://$PROJECT_DIR$/css/fwcx_4.css">
339 <provider selected="true" editor-type-id="text-editor"> 329 <provider selected="true" editor-type-id="text-editor">
340 - <state relative-caret-position="201">  
341 - <caret line="533" column="10" selection-start-line="533" selection-start-column="5" selection-end-line="533" selection-end-column="10" /> 330 + <state relative-caret-position="299">
  331 + <caret line="630" column="18" lean-forward="true" selection-start-line="630" selection-start-column="18" selection-end-line="630" selection-end-column="18" />
342 </state> 332 </state>
343 </provider> 333 </provider>
344 </entry> 334 </entry>
345 </file> 335 </file>
346 <file pinned="false" current-in-tab="false"> 336 <file pinned="false" current-in-tab="false">
347 - <entry file="file://$PROJECT_DIR$/html/lxwm_6.html"> 337 + <entry file="file://$PROJECT_DIR$/html/fwcx_4.html">
348 <provider selected="true" editor-type-id="text-editor"> 338 <provider selected="true" editor-type-id="text-editor">
349 - <state relative-caret-position="10152">  
350 - <caret line="393" column="14" selection-start-line="393" selection-start-column="14" selection-end-line="393" selection-end-column="14" /> 339 + <state relative-caret-position="298">
  340 + <caret line="613" column="15" lean-forward="true" selection-start-line="613" selection-start-column="15" selection-end-line="613" selection-end-column="15" />
351 <folding> 341 <folding>
  342 + <element signature="n#div#12;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  343 + <element signature="n#div#13;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  344 + <element signature="n#div#14;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  345 + <element signature="n#style#0;n#div#15;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  346 + <element signature="n#div#15;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  347 + <element signature="n#div#16;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  348 + <element signature="n#style#0;n#div#17;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  349 + <element signature="n#div#17;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  350 + <element signature="n#div#18;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  351 + <element signature="n#style#0;n#div#19;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  352 + <element signature="n#div#19;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  353 + <element signature="n#div#20;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  354 + <element signature="n#style#0;n#div#21;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  355 + <element signature="n#div#21;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  356 + <element signature="n#div#22;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  357 + <element signature="n#style#0;n#div#23;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  358 + <element signature="n#div#23;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  359 + <element signature="n#div#24;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  360 + <element signature="n#style#0;n#div#25;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  361 + <element signature="n#div#25;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  362 + <element signature="n#div#26;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  363 + <element signature="n#style#0;n#div#27;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  364 + <element signature="n#div#27;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  365 + <element signature="n#div#28;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  366 + <element signature="n#style#0;n#div#29;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  367 + <element signature="n#div#29;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
352 <element signature="n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 368 <element signature="n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
353 <element signature="n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 369 <element signature="n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
354 <element signature="n#div#1;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 370 <element signature="n#div#1;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
355 <element signature="n#div#2;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 371 <element signature="n#div#2;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
356 <element signature="n#div#3;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 372 <element signature="n#div#3;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  373 + <element signature="e#14927#15405#0" />
  374 + <element signature="e#22431#22895#0" />
  375 + <element signature="e#22478#22662#0" />
  376 + <element signature="e#22939#23403#0" />
  377 + <element signature="e#23447#23911#0" />
  378 + <element signature="e#23494#23678#0" />
  379 + <element signature="e#23955#24419#0" />
  380 + <element signature="e#24463#24927#0" />
  381 + <element signature="e#24971#25435#0" />
  382 + <element signature="e#25479#25943#0" />
357 </folding> 383 </folding>
358 </state> 384 </state>
359 </provider> 385 </provider>
360 </entry> 386 </entry>
361 </file> 387 </file>
  388 + <file pinned="false" current-in-tab="false">
  389 + <entry file="file://$PROJECT_DIR$/css/sckj.css">
  390 + <provider selected="true" editor-type-id="text-editor">
  391 + <state relative-caret-position="495">
  392 + <caret line="464" column="21" selection-start-line="464" selection-start-column="21" selection-end-line="464" selection-end-column="21" />
  393 + </state>
  394 + </provider>
  395 + </entry>
  396 + </file>
362 </leaf> 397 </leaf>
363 </component> 398 </component>
364 <component name="FileTemplateManagerImpl"> 399 <component name="FileTemplateManagerImpl">
@@ -371,12 +406,6 @@ @@ -371,12 +406,6 @@
371 </component> 406 </component>
372 <component name="FindInProjectRecents"> 407 <component name="FindInProjectRecents">
373 <findStrings> 408 <findStrings>
374 - <find>最新动态</find>  
375 - <find>select_color</find>  
376 - <find>input</find>  
377 - <find>.mid_opinion_textarea</find>  
378 - <find>iconfont</find>  
379 - <find>.mid_count_number</find>  
380 <find>sanjiaoright</find> 409 <find>sanjiaoright</find>
381 <find>mid_</find> 410 <find>mid_</find>
382 <find>线下门店</find> 411 <find>线下门店</find>
@@ -397,10 +426,16 @@ @@ -397,10 +426,16 @@
397 <find>top_intro</find> 426 <find>top_intro</find>
398 <find>time_color</find> 427 <find>time_color</find>
399 <find>pic_list</find> 428 <find>pic_list</find>
400 - <find>show_pic</find>  
401 <find>加盟流程</find> 429 <find>加盟流程</find>
402 - <find>mid_items</find> 430 + <find>mid_common_item</find>
403 <find>mid_list</find> 431 <find>mid_list</find>
  432 + <find>色彩搭配</find>
  433 + <find>show_pic</find>
  434 + <find>mid_select</find>
  435 + <find>icon-sanjiaoright</find>
  436 + <find>mid_item</find>
  437 + <find>items</find>
  438 + <find>mid_items</find>
404 </findStrings> 439 </findStrings>
405 <replaceStrings> 440 <replaceStrings>
406 <replace>div</replace> 441 <replace>div</replace>
@@ -428,10 +463,8 @@ @@ -428,10 +463,8 @@
428 <option value="$PROJECT_DIR$/css/index.css" /> 463 <option value="$PROJECT_DIR$/css/index.css" />
429 <option value="$PROJECT_DIR$/css/gsjj.css" /> 464 <option value="$PROJECT_DIR$/css/gsjj.css" />
430 <option value="$PROJECT_DIR$/css/jm_3.css" /> 465 <option value="$PROJECT_DIR$/css/jm_3.css" />
431 - <option value="$PROJECT_DIR$/css/cpzx_2.css" />  
432 <option value="$PROJECT_DIR$/html/qqrz.html" /> 466 <option value="$PROJECT_DIR$/html/qqrz.html" />
433 <option value="$PROJECT_DIR$/css/qqrz.css" /> 467 <option value="$PROJECT_DIR$/css/qqrz.css" />
434 - <option value="$PROJECT_DIR$/html/fwcx_4.html" />  
435 <option value="$PROJECT_DIR$/css/fwcx_4.css" /> 468 <option value="$PROJECT_DIR$/css/fwcx_4.css" />
436 <option value="$PROJECT_DIR$/css/fwcx_4_1result.css" /> 469 <option value="$PROJECT_DIR$/css/fwcx_4_1result.css" />
437 <option value="$PROJECT_DIR$/css/fwcx_4_2result.css" /> 470 <option value="$PROJECT_DIR$/css/fwcx_4_2result.css" />
@@ -458,8 +491,10 @@ @@ -458,8 +491,10 @@
458 <option value="$PROJECT_DIR$/html/index.html" /> 491 <option value="$PROJECT_DIR$/html/index.html" />
459 <option value="$PROJECT_DIR$/html/gsjj.html" /> 492 <option value="$PROJECT_DIR$/html/gsjj.html" />
460 <option value="$PROJECT_DIR$/html/jm_3.html" /> 493 <option value="$PROJECT_DIR$/html/jm_3.html" />
  494 + <option value="$PROJECT_DIR$/html/fwcx_4.html" />
461 <option value="$PROJECT_DIR$/html/sckj.html" /> 495 <option value="$PROJECT_DIR$/html/sckj.html" />
462 <option value="$PROJECT_DIR$/css/sckj.css" /> 496 <option value="$PROJECT_DIR$/css/sckj.css" />
  497 + <option value="$PROJECT_DIR$/css/cpzx_2.css" />
463 <option value="$PROJECT_DIR$/html/cpzx_2.html" /> 498 <option value="$PROJECT_DIR$/html/cpzx_2.html" />
464 </list> 499 </list>
465 </option> 500 </option>
@@ -471,10 +506,10 @@ @@ -471,10 +506,10 @@
471 <sorting>DEFINITION_ORDER</sorting> 506 <sorting>DEFINITION_ORDER</sorting>
472 </component> 507 </component>
473 <component name="ProjectFrameBounds"> 508 <component name="ProjectFrameBounds">
474 - <option name="x" value="732" />  
475 - <option name="y" value="64" />  
476 - <option name="width" value="1313" />  
477 - <option name="height" value="1025" /> 509 + <option name="x" value="642" />
  510 + <option name="y" value="24" />
  511 + <option name="width" value="1210" />
  512 + <option name="height" value="1033" />
478 </component> 513 </component>
479 <component name="ProjectView"> 514 <component name="ProjectView">
480 <navigator proportions="" version="1"> 515 <navigator proportions="" version="1">
@@ -590,18 +625,18 @@ @@ -590,18 +625,18 @@
590 <workItem from="1549845206263" duration="18001000" /> 625 <workItem from="1549845206263" duration="18001000" />
591 <workItem from="1549879359285" duration="125000" /> 626 <workItem from="1549879359285" duration="125000" />
592 <workItem from="1549931467183" duration="4792000" /> 627 <workItem from="1549931467183" duration="4792000" />
593 - <workItem from="1549950124825" duration="8321000" /> 628 + <workItem from="1549950124825" duration="11782000" />
594 </task> 629 </task>
595 <servers /> 630 <servers />
596 </component> 631 </component>
597 <component name="TimeTrackingManager"> 632 <component name="TimeTrackingManager">
598 - <option name="totallyTimeSpent" value="361095000" /> 633 + <option name="totallyTimeSpent" value="364556000" />
599 </component> 634 </component>
600 <component name="ToolWindowManager"> 635 <component name="ToolWindowManager">
601 - <frame x="732" y="64" width="1313" height="1025" extended-state="0" /> 636 + <frame x="642" y="24" width="1210" height="1033" extended-state="0" />
602 <editor active="true" /> 637 <editor active="true" />
603 <layout> 638 <layout>
604 - <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4993464" visible="true" weight="0.22039215" /> 639 + <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4993464" visible="true" weight="0.2397611" />
605 <window_info id="Structure" order="1" sideWeight="0.5006536" side_tool="true" weight="0.16211294" /> 640 <window_info id="Structure" order="1" sideWeight="0.5006536" side_tool="true" weight="0.16211294" />
606 <window_info id="Favorites" order="2" side_tool="true" /> 641 <window_info id="Favorites" order="2" side_tool="true" />
607 <window_info anchor="bottom" id="Message" order="0" /> 642 <window_info anchor="bottom" id="Message" order="0" />
@@ -613,7 +648,7 @@ @@ -613,7 +648,7 @@
613 <window_info anchor="bottom" id="TODO" order="6" /> 648 <window_info anchor="bottom" id="TODO" order="6" />
614 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> 649 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
615 <window_info anchor="bottom" id="Version Control" order="8" /> 650 <window_info anchor="bottom" id="Version Control" order="8" />
616 - <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.11910112" /> 651 + <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.11804009" />
617 <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" /> 652 <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
618 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> 653 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
619 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> 654 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -721,13 +756,6 @@ @@ -721,13 +756,6 @@
721 </state> 756 </state>
722 </provider> 757 </provider>
723 </entry> 758 </entry>
724 - <entry file="file://$PROJECT_DIR$/css/fwcx_4.css">  
725 - <provider selected="true" editor-type-id="text-editor">  
726 - <state relative-caret-position="299">  
727 - <caret line="630" column="18" lean-forward="true" selection-start-line="630" selection-start-column="18" selection-end-line="630" selection-end-column="18" />  
728 - </state>  
729 - </provider>  
730 - </entry>  
731 <entry file="file://$PROJECT_DIR$/css/fwcx_4_1result.css"> 759 <entry file="file://$PROJECT_DIR$/css/fwcx_4_1result.css">
732 <provider selected="true" editor-type-id="text-editor"> 760 <provider selected="true" editor-type-id="text-editor">
733 <state relative-caret-position="299"> 761 <state relative-caret-position="299">
@@ -833,13 +861,6 @@ @@ -833,13 +861,6 @@
833 </state> 861 </state>
834 </provider> 862 </provider>
835 </entry> 863 </entry>
836 - <entry file="file://$PROJECT_DIR$/html/fwcx_4.html">  
837 - <provider selected="true" editor-type-id="text-editor">  
838 - <state relative-caret-position="279">  
839 - <caret line="381" column="8" lean-forward="true" selection-start-line="381" selection-start-column="8" selection-end-line="399" selection-end-column="14" />  
840 - </state>  
841 - </provider>  
842 - </entry>  
843 <entry file="file://$PROJECT_DIR$/html/fwcx_4_1result.html"> 864 <entry file="file://$PROJECT_DIR$/html/fwcx_4_1result.html">
844 <provider selected="true" editor-type-id="text-editor"> 865 <provider selected="true" editor-type-id="text-editor">
845 <state relative-caret-position="195"> 866 <state relative-caret-position="195">
@@ -903,20 +924,6 @@ @@ -903,20 +924,6 @@
903 </state> 924 </state>
904 </provider> 925 </provider>
905 </entry> 926 </entry>
906 - <entry file="file://$PROJECT_DIR$/html/search_2.html">  
907 - <provider selected="true" editor-type-id="text-editor">  
908 - <state relative-caret-position="8208">  
909 - <caret line="321" column="10" lean-forward="true" selection-start-line="321" selection-start-column="10" selection-end-line="321" selection-end-column="10" />  
910 - <folding>  
911 - <element signature="n#div#4;n#div#0;n#body#0;n#html#0;n#!!top" />  
912 - <element signature="n#div#0;n#div#4;n#div#0;n#body#0;n#html#0;n#!!top" />  
913 - <element signature="n#div#1;n#div#4;n#div#0;n#body#0;n#html#0;n#!!top" />  
914 - <element signature="n#div#2;n#div#4;n#div#0;n#body#0;n#html#0;n#!!top" />  
915 - <element signature="n#div#3;n#div#4;n#div#0;n#body#0;n#html#0;n#!!top" />  
916 - </folding>  
917 - </state>  
918 - </provider>  
919 - </entry>  
920 <entry file="file://$PROJECT_DIR$/html/search_no_2.html"> 927 <entry file="file://$PROJECT_DIR$/html/search_no_2.html">
921 <provider selected="true" editor-type-id="text-editor"> 928 <provider selected="true" editor-type-id="text-editor">
922 <state relative-caret-position="6156"> 929 <state relative-caret-position="6156">
@@ -1048,13 +1055,6 @@ @@ -1048,13 +1055,6 @@
1048 </state> 1055 </state>
1049 </provider> 1056 </provider>
1050 </entry> 1057 </entry>
1051 - <entry file="file://$PROJECT_DIR$/css/cpzx_2.css">  
1052 - <provider selected="true" editor-type-id="text-editor">  
1053 - <state relative-caret-position="-352">  
1054 - <caret line="615" column="20" lean-forward="true" selection-start-line="615" selection-start-column="20" selection-end-line="615" selection-end-column="20" />  
1055 - </state>  
1056 - </provider>  
1057 - </entry>  
1058 <entry file="file://$PROJECT_DIR$/css/page.css"> 1058 <entry file="file://$PROJECT_DIR$/css/page.css">
1059 <provider selected="true" editor-type-id="text-editor"> 1059 <provider selected="true" editor-type-id="text-editor">
1060 <state relative-caret-position="486"> 1060 <state relative-caret-position="486">
@@ -1062,13 +1062,6 @@ @@ -1062,13 +1062,6 @@
1062 </state> 1062 </state>
1063 </provider> 1063 </provider>
1064 </entry> 1064 </entry>
1065 - <entry file="file://$PROJECT_DIR$/css/sckj.css">  
1066 - <provider selected="true" editor-type-id="text-editor">  
1067 - <state relative-caret-position="243">  
1068 - <caret line="198" column="25" lean-forward="true" selection-start-line="198" selection-start-column="25" selection-end-line="198" selection-end-column="25" />  
1069 - </state>  
1070 - </provider>  
1071 - </entry>  
1072 <entry file="file://$PROJECT_DIR$/html/jm_3.html"> 1065 <entry file="file://$PROJECT_DIR$/html/jm_3.html">
1073 <provider selected="true" editor-type-id="text-editor"> 1066 <provider selected="true" editor-type-id="text-editor">
1074 <state relative-caret-position="257"> 1067 <state relative-caret-position="257">
@@ -1105,12 +1098,40 @@ @@ -1105,12 +1098,40 @@
1105 </state> 1098 </state>
1106 </provider> 1099 </provider>
1107 </entry> 1100 </entry>
  1101 + <entry file="file://$PROJECT_DIR$/css/fwcx_4.css">
  1102 + <provider selected="true" editor-type-id="text-editor">
  1103 + <state relative-caret-position="299">
  1104 + <caret line="630" column="18" lean-forward="true" selection-start-line="630" selection-start-column="18" selection-end-line="630" selection-end-column="18" />
  1105 + </state>
  1106 + </provider>
  1107 + </entry>
  1108 + <entry file="file://$PROJECT_DIR$/html/search_2.html">
  1109 + <provider selected="true" editor-type-id="text-editor">
  1110 + <state relative-caret-position="704">
  1111 + <caret line="321" column="10" lean-forward="true" selection-start-line="321" selection-start-column="10" selection-end-line="321" selection-end-column="10" />
  1112 + <folding>
  1113 + <element signature="n#div#4;n#div#0;n#body#0;n#html#0;n#!!top" />
  1114 + <element signature="n#div#0;n#div#4;n#div#0;n#body#0;n#html#0;n#!!top" />
  1115 + <element signature="n#div#1;n#div#4;n#div#0;n#body#0;n#html#0;n#!!top" />
  1116 + <element signature="n#div#2;n#div#4;n#div#0;n#body#0;n#html#0;n#!!top" />
  1117 + <element signature="n#div#3;n#div#4;n#div#0;n#body#0;n#html#0;n#!!top" />
  1118 + </folding>
  1119 + </state>
  1120 + </provider>
  1121 + </entry>
1108 <entry file="file://$PROJECT_DIR$/html/sckj.html"> 1122 <entry file="file://$PROJECT_DIR$/html/sckj.html">
1109 <provider selected="true" editor-type-id="text-editor"> 1123 <provider selected="true" editor-type-id="text-editor">
1110 - <state relative-caret-position="217">  
1111 - <caret line="201" selection-start-line="201" selection-end-line="202" /> 1124 + <state relative-caret-position="521">
  1125 + <caret line="226" column="51" lean-forward="true" selection-start-line="226" selection-start-column="36" selection-end-line="226" selection-end-column="51" />
1112 <folding> 1126 <folding>
1113 <element signature="n#div#1;n#div#0;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 1127 <element signature="n#div#1;n#div#0;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1128 + <element signature="n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1129 + <element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1130 + <element signature="n#div#1;n#div#1;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1131 + <element signature="n#div#2;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1132 + <element signature="n#div#0;n#div#2;n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1133 + <element signature="n#div#1;n#div#2;n#div#0;n#div#0;n#div#2;n#div#3;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#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
1114 <element signature="n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 1135 <element signature="n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
1115 <element signature="n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 1136 <element signature="n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
1116 <element signature="n#div#1;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 1137 <element signature="n#div#1;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
@@ -1121,12 +1142,80 @@ @@ -1121,12 +1142,80 @@
1121 </state> 1142 </state>
1122 </provider> 1143 </provider>
1123 </entry> 1144 </entry>
  1145 + <entry file="file://$PROJECT_DIR$/css/sckj.css">
  1146 + <provider selected="true" editor-type-id="text-editor">
  1147 + <state relative-caret-position="495">
  1148 + <caret line="464" column="21" selection-start-line="464" selection-start-column="21" selection-end-line="464" selection-end-column="21" />
  1149 + </state>
  1150 + </provider>
  1151 + </entry>
  1152 + <entry file="file://$PROJECT_DIR$/html/fwcx_4.html">
  1153 + <provider selected="true" editor-type-id="text-editor">
  1154 + <state relative-caret-position="298">
  1155 + <caret line="613" column="15" lean-forward="true" selection-start-line="613" selection-start-column="15" selection-end-line="613" selection-end-column="15" />
  1156 + <folding>
  1157 + <element signature="n#div#12;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1158 + <element signature="n#div#13;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1159 + <element signature="n#div#14;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1160 + <element signature="n#style#0;n#div#15;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1161 + <element signature="n#div#15;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1162 + <element signature="n#div#16;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1163 + <element signature="n#style#0;n#div#17;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1164 + <element signature="n#div#17;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1165 + <element signature="n#div#18;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1166 + <element signature="n#style#0;n#div#19;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1167 + <element signature="n#div#19;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1168 + <element signature="n#div#20;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1169 + <element signature="n#style#0;n#div#21;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1170 + <element signature="n#div#21;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1171 + <element signature="n#div#22;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1172 + <element signature="n#style#0;n#div#23;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1173 + <element signature="n#div#23;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1174 + <element signature="n#div#24;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1175 + <element signature="n#style#0;n#div#25;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1176 + <element signature="n#div#25;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1177 + <element signature="n#div#26;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1178 + <element signature="n#style#0;n#div#27;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1179 + <element signature="n#div#27;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1180 + <element signature="n#div#28;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1181 + <element signature="n#style#0;n#div#29;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1182 + <element signature="n#div#29;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1183 + <element signature="n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1184 + <element signature="n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1185 + <element signature="n#div#1;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1186 + <element signature="n#div#2;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1187 + <element signature="n#div#3;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1188 + <element signature="e#14927#15405#0" />
  1189 + <element signature="e#22431#22895#0" />
  1190 + <element signature="e#22478#22662#0" />
  1191 + <element signature="e#22939#23403#0" />
  1192 + <element signature="e#23447#23911#0" />
  1193 + <element signature="e#23494#23678#0" />
  1194 + <element signature="e#23955#24419#0" />
  1195 + <element signature="e#24463#24927#0" />
  1196 + <element signature="e#24971#25435#0" />
  1197 + <element signature="e#25479#25943#0" />
  1198 + </folding>
  1199 + </state>
  1200 + </provider>
  1201 + </entry>
  1202 + <entry file="file://$PROJECT_DIR$/css/cpzx_2.css">
  1203 + <provider selected="true" editor-type-id="text-editor">
  1204 + <state relative-caret-position="426">
  1205 + <caret line="422" column="35" selection-start-line="422" selection-start-column="35" selection-end-line="422" selection-end-column="35" />
  1206 + </state>
  1207 + </provider>
  1208 + </entry>
1124 <entry file="file://$PROJECT_DIR$/html/cpzx_2.html"> 1209 <entry file="file://$PROJECT_DIR$/html/cpzx_2.html">
1125 <provider selected="true" editor-type-id="text-editor"> 1210 <provider selected="true" editor-type-id="text-editor">
1126 - <state relative-caret-position="1">  
1127 - <caret line="365" lean-forward="true" selection-start-line="365" selection-end-line="365" /> 1211 + <state relative-caret-position="657">
  1212 + <caret line="290" column="22" selection-start-line="290" selection-start-column="22" selection-end-line="290" selection-end-column="22" />
1128 <folding> 1213 <folding>
1129 - <element signature="n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 1214 + <element signature="n#div#0;n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1215 + <element signature="n#div#1;n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1216 + <element signature="n#div#2;n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1217 + <element signature="n#div#3;n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1218 + <element signature="n#div#4;n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
1130 <element signature="n#div#4;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 1219 <element signature="n#div#4;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
1131 <element signature="n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 1220 <element signature="n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
1132 <element signature="n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 1221 <element signature="n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
@@ -414,20 +414,21 @@ input::-webkit-input-placeholder{ @@ -414,20 +414,21 @@ input::-webkit-input-placeholder{
414 } 414 }
415 415
416 .mid_items{ 416 .mid_items{
417 - margin-top: 0.19rem; 417 + margin-top: 0.05rem;
418 width: 6.86rem; 418 width: 6.86rem;
419 - height: 11.04rem; 419 + /*height: 11.04rem;*/
420 /*background-color: #50B388;*/ 420 /*background-color: #50B388;*/
421 display: flex; 421 display: flex;
422 flex-wrap: wrap; 422 flex-wrap: wrap;
  423 + justify-content: space-between;
423 } 424 }
424 .mid_item{ 425 .mid_item{
425 width: 3.36rem; 426 width: 3.36rem;
426 height: 5.37rem; 427 height: 5.37rem;
427 - /*background: #666666;*/  
428 background-color: #ffffff; 428 background-color: #ffffff;
429 display: flex; 429 display: flex;
430 flex-flow: column; 430 flex-flow: column;
  431 + margin-top: 0.14rem;
431 } 432 }
432 .mid_item_pic{ 433 .mid_item_pic{
433 width: 3.36rem; 434 width: 3.36rem;
@@ -485,6 +486,7 @@ input::-webkit-input-placeholder{ @@ -485,6 +486,7 @@ input::-webkit-input-placeholder{
485 display: flex; 486 display: flex;
486 align-items: center; 487 align-items: center;
487 justify-content: center; 488 justify-content: center;
  489 + margin-top: 0.14rem;
488 } 490 }
489 .mid_select_box{ 491 .mid_select_box{
490 width: 3.14rem; 492 width: 3.14rem;
@@ -460,3 +460,19 @@ input::-webkit-input-placeholder{ @@ -460,3 +460,19 @@ input::-webkit-input-placeholder{
460 margin-top: 0.38rem; 460 margin-top: 0.38rem;
461 font-size: 0.22rem; 461 font-size: 0.22rem;
462 } 462 }
  463 +.mid_color_items{
  464 + display: flex;
  465 + flex-flow: column;
  466 +}
  467 +.mid_color_content_item{
  468 + display: flex;
  469 +
  470 +}
  471 +.mid_color_content_item_top{
  472 + width: 1.2rem;
  473 + height: 0.6rem;
  474 +}
  475 +.mid_color_content_item_bottom{
  476 + font-size: 0.24rem;
  477 + color: #666666;
  478 +}
@@ -201,7 +201,7 @@ @@ -201,7 +201,7 @@
201 201
202 </div> 202 </div>
203 </div> 203 </div>
204 - <div class="mid_item m_left" > 204 + <div class="mid_item" onclick="btn_cpxq()">
205 <!--顶部图片--> 205 <!--顶部图片-->
206 <div class="mid_item_pic"> 206 <div class="mid_item_pic">
207 <img src="../images/bicon_24@2x.png"> 207 <img src="../images/bicon_24@2x.png">
@@ -223,7 +223,7 @@ @@ -223,7 +223,7 @@
223 223
224 </div> 224 </div>
225 </div> 225 </div>
226 - <div class="mid_item"> 226 + <div class="mid_item" onclick="btn_cpxq()">
227 <!--顶部图片--> 227 <!--顶部图片-->
228 <div class="mid_item_pic"> 228 <div class="mid_item_pic">
229 <img src="../images/bicon_24@2x.png"> 229 <img src="../images/bicon_24@2x.png">
@@ -245,7 +245,7 @@ @@ -245,7 +245,7 @@
245 245
246 </div> 246 </div>
247 </div> 247 </div>
248 - <div class="mid_item m_left"> 248 + <div class="mid_item" onclick="btn_cpxq()">
249 <!--顶部图片--> 249 <!--顶部图片-->
250 <div class="mid_item_pic"> 250 <div class="mid_item_pic">
251 <img src="../images/bicon_24@2x.png"> 251 <img src="../images/bicon_24@2x.png">
@@ -267,6 +267,32 @@ @@ -267,6 +267,32 @@
267 267
268 </div> 268 </div>
269 </div> 269 </div>
  270 + <div class="mid_item" onclick="btn_cpxq()">
  271 + <!--顶部图片-->
  272 + <div class="mid_item_pic">
  273 + <img src="../images/bicon_24@2x.png">
  274 + </div>
  275 + <!--底部文字-->
  276 + <div class="mid_item_text">
  277 + <!--介绍-->
  278 + <div class="mid_item_text_top">
  279 +
  280 + 可丽时净味乳胶漆（B20
  281 + 77 5L）
  282 +
  283 + </div>
  284 + <!--包装与售价-->
  285 + <div class="mid_item_text_bottom">
  286 + <span class="mid_item_text_bottom_cubage">包装: 2.5888888888888L</span>
  287 + <span class="mid_item_text_bottom_sale">全国统一零售价: ￥12251</span>
  288 + </div>
  289 +
  290 + </div>
  291 + </div>
  292 +
  293 +
  294 +
  295 +
270 296
271 </div> 297 </div>
272 <!--选择页--> 298 <!--选择页-->
@@ -303,7 +303,7 @@ @@ -303,7 +303,7 @@
303 COMMON PROBLEM 303 COMMON PROBLEM
304 </div> 304 </div>
305 <!--问题列表--> 305 <!--问题列表-->
306 - <div class="mid_common_item" onclick="btn_answer1()"> 306 + <div class="mid_common_item A_1" onclick="btn_answer1()">
307 <div class="mid_common_item_first"> 307 <div class="mid_common_item_first">
308 Q: 308 Q:
309 </div> 309 </div>
@@ -325,6 +325,169 @@ @@ -325,6 +325,169 @@
325 </div> 325 </div>
326 </div> 326 </div>
327 327
  328 + <!--问题列表-->
  329 + <div class="mid_common_item A_2" onclick="btn_answer2()">
  330 + <div class="mid_common_item_first">
  331 + Q:
  332 + </div>
  333 + <div class="mid_common_item_last">
  334 + 与油性漆相比水性漆的优缺点分别有哪些？
  335 + </div>
  336 + <div class="iconfont icon-sanjiaoright"></div>
  337 + <!--默认隐藏，当点击时触发-->
  338 + <div class="iconfont icon-tubiaozhizuo- xiabiao" style="display: none;"></div>
  339 +
  340 + </div>
  341 + <!--点击下拉功能-->
  342 + <div class="mid_common_item_answer a_2" style="display: none;">
  343 + <div class="mid_common_item_first">
  344 + A:
  345 + </div>
  346 + <div class="mid_common_item_last last_color">
  347 + 与油性漆相比，水性漆的环保性能是其最大优势。水性漆中不含有苯、二甲苯等公认的有毒有害物质，同时在漆膜的柔韧度、耐候性、耐黄变性能、施工性能等方面都要优于油性漆漆，在漆膜硬度和饱满度方面与油性漆相当。水性漆最大的不足在于其不属于溶剂挥发性产品，干燥速度与温度和湿度有极大的关系，因此干燥时间要略长于油性漆。
  348 + </div>
  349 + </div>
  350 +
  351 + <!--问题列表-->
  352 + <div class="mid_common_item A_3" onclick="btn_answer3()">
  353 + <div class="mid_common_item_first">
  354 + Q:
  355 + </div>
  356 + <div class="mid_common_item_last">
  357 + 与油性漆相比水性漆的优缺点分别有哪些？
  358 + </div>
  359 + <div class="iconfont icon-sanjiaoright"></div>
  360 + <!--默认隐藏，当点击时触发-->
  361 + <div class="iconfont icon-tubiaozhizuo- xiabiao" style="display: none;"></div>
  362 +
  363 + </div>
  364 + <!--点击下拉功能-->
  365 + <div class="mid_common_item_answer a_3" style="display: none;">
  366 + <div class="mid_common_item_first">
  367 + A:
  368 + </div>
  369 + <div class="mid_common_item_last last_color">
  370 + 与油性漆相比，水性漆的环保性能是其最大优势。水性漆中不含有苯、二甲苯等公认的有毒有害物质，同时在漆膜的柔韧度、耐候性、耐黄变性能、施工性能等方面都要优于油性漆漆，在漆膜硬度和饱满度方面与油性漆相当。水性漆最大的不足在于其不属于溶剂挥发性产品，干燥速度与温度和湿度有极大的关系，因此干燥时间要略长于油性漆。
  371 + </div>
  372 + </div>
  373 +
  374 + <!--问题列表-->
  375 + <div class="mid_common_item A_4" onclick="btn_answer4()">
  376 + <div class="mid_common_item_first">
  377 + Q:
  378 + </div>
  379 + <div class="mid_common_item_last">
  380 + 与油性漆相比水性漆的优缺点分别有哪些？
  381 + </div>
  382 + <div class="iconfont icon-sanjiaoright"></div>
  383 + <!--默认隐藏，当点击时触发-->
  384 + <div class="iconfont icon-tubiaozhizuo- xiabiao" style="display: none;"></div>
  385 +
  386 + </div>
  387 + <!--点击下拉功能-->
  388 + <div class="mid_common_item_answer a_4" style="display: none;">
  389 + <div class="mid_common_item_first">
  390 + A:
  391 + </div>
  392 + <div class="mid_common_item_last last_color">
  393 + 与油性漆相比，水性漆的环保性能是其最大优势。水性漆中不含有苯、二甲苯等公认的有毒有害物质，同时在漆膜的柔韧度、耐候性、耐黄变性能、施工性能等方面都要优于油性漆漆，在漆膜硬度和饱满度方面与油性漆相当。水性漆最大的不足在于其不属于溶剂挥发性产品，干燥速度与温度和湿度有极大的关系，因此干燥时间要略长于油性漆。
  394 + </div>
  395 + </div>
  396 +
  397 + <!--问题列表-->
  398 + <div class="mid_common_item A_5" onclick="btn_answer5()">
  399 + <div class="mid_common_item_first">
  400 + Q:
  401 + </div>
  402 + <div class="mid_common_item_last">
  403 + 与油性漆相比水性漆的优缺点分别有哪些？
  404 + </div>
  405 + <div class="iconfont icon-sanjiaoright"></div>
  406 + <!--默认隐藏，当点击时触发-->
  407 + <div class="iconfont icon-tubiaozhizuo- xiabiao" style="display: none;"></div>
  408 +
  409 + </div>
  410 + <!--点击下拉功能-->
  411 + <div class="mid_common_item_answer a_5" style="display: none;">
  412 + <div class="mid_common_item_first">
  413 + A:
  414 + </div>
  415 + <div class="mid_common_item_last last_color">
  416 + 与油性漆相比，水性漆的环保性能是其最大优势。水性漆中不含有苯、二甲苯等公认的有毒有害物质，同时在漆膜的柔韧度、耐候性、耐黄变性能、施工性能等方面都要优于油性漆漆，在漆膜硬度和饱满度方面与油性漆相当。水性漆最大的不足在于其不属于溶剂挥发性产品，干燥速度与温度和湿度有极大的关系，因此干燥时间要略长于油性漆。
  417 + </div>
  418 + </div>
  419 +
  420 + <!--问题列表-->
  421 + <div class="mid_common_item A_6" onclick="btn_answer6()">
  422 + <div class="mid_common_item_first">
  423 + Q:
  424 + </div>
  425 + <div class="mid_common_item_last">
  426 + 与油性漆相比水性漆的优缺点分别有哪些？
  427 + </div>
  428 + <div class="iconfont icon-sanjiaoright"></div>
  429 + <!--默认隐藏，当点击时触发-->
  430 + <div class="iconfont icon-tubiaozhizuo- xiabiao" style="display: none;"></div>
  431 +
  432 + </div>
  433 + <!--点击下拉功能-->
  434 + <div class="mid_common_item_answer a_6" style="display: none;">
  435 + <div class="mid_common_item_first">
  436 + A:
  437 + </div>
  438 + <div class="mid_common_item_last last_color">
  439 + 与油性漆相比，水性漆的环保性能是其最大优势。水性漆中不含有苯、二甲苯等公认的有毒有害物质，同时在漆膜的柔韧度、耐候性、耐黄变性能、施工性能等方面都要优于油性漆漆，在漆膜硬度和饱满度方面与油性漆相当。水性漆最大的不足在于其不属于溶剂挥发性产品，干燥速度与温度和湿度有极大的关系，因此干燥时间要略长于油性漆。
  440 + </div>
  441 + </div>
  442 +
  443 + <!--问题列表-->
  444 + <div class="mid_common_item A_7" onclick="btn_answer7()">
  445 + <div class="mid_common_item_first">
  446 + Q:
  447 + </div>
  448 + <div class="mid_common_item_last">
  449 + 与油性漆相比水性漆的优缺点分别有哪些？
  450 + </div>
  451 + <div class="iconfont icon-sanjiaoright"></div>
  452 + <!--默认隐藏，当点击时触发-->
  453 + <div class="iconfont icon-tubiaozhizuo- xiabiao" style="display: none;"></div>
  454 +
  455 + </div>
  456 + <!--点击下拉功能-->
  457 + <div class="mid_common_item_answer a_7" style="display: none;">
  458 + <div class="mid_common_item_first">
  459 + A:
  460 + </div>
  461 + <div class="mid_common_item_last last_color">
  462 + 与油性漆相比，水性漆的环保性能是其最大优势。水性漆中不含有苯、二甲苯等公认的有毒有害物质，同时在漆膜的柔韧度、耐候性、耐黄变性能、施工性能等方面都要优于油性漆漆，在漆膜硬度和饱满度方面与油性漆相当。水性漆最大的不足在于其不属于溶剂挥发性产品，干燥速度与温度和湿度有极大的关系，因此干燥时间要略长于油性漆。
  463 + </div>
  464 + </div>
  465 +
  466 + <!--问题列表-->
  467 + <div class="mid_common_item A_8" onclick="btn_answer8()">
  468 + <div class="mid_common_item_first">
  469 + Q:
  470 + </div>
  471 + <div class="mid_common_item_last">
  472 + 与油性漆相比水性漆的优缺点分别有哪些？
  473 + </div>
  474 + <div class="iconfont icon-sanjiaoright"></div>
  475 + <!--默认隐藏，当点击时触发-->
  476 + <div class="iconfont icon-tubiaozhizuo- xiabiao" style="display: none;"></div>
  477 +
  478 + </div>
  479 + <!--点击下拉功能-->
  480 + <div class="mid_common_item_answer a_8" style="display: none;">
  481 + <div class="mid_common_item_first">
  482 + A:
  483 + </div>
  484 + <div class="mid_common_item_last last_color">
  485 + 与油性漆相比，水性漆的环保性能是其最大优势。水性漆中不含有苯、二甲苯等公认的有毒有害物质，同时在漆膜的柔韧度、耐候性、耐黄变性能、施工性能等方面都要优于油性漆漆，在漆膜硬度和饱满度方面与油性漆相当。水性漆最大的不足在于其不属于溶剂挥发性产品，干燥速度与温度和湿度有极大的关系，因此干燥时间要略长于油性漆。
  486 + </div>
  487 + </div>
  488 +
  489 +
  490 +
328 491
329 492
330 <!--&lt;!&ndash;问题列表&ndash;&gt;--> 493 <!--&lt;!&ndash;问题列表&ndash;&gt;-->
@@ -438,16 +601,120 @@ @@ -438,16 +601,120 @@
438 601
439 if($(".a_1").css('display')=='none'){ 602 if($(".a_1").css('display')=='none'){
440 $('.a_1').css('display','flex'); 603 $('.a_1').css('display','flex');
441 - $('.icon-sanjiaoright').css('display','none')  
442 - $('.mid_common_item>.icon-tubiaozhizuo-').css('display','block') 604 + $('.A_1>.icon-sanjiaoright').css('display','none')
  605 + $('.A_1>.icon-tubiaozhizuo-').css('display','block')
443 }else{ 606 }else{
444 $('.a_1').css('display','none'); 607 $('.a_1').css('display','none');
445 - $('.icon-sanjiaoright').css('display','block')  
446 - $('.mid_common_item>.icon-tubiaozhizuo-').css('display','none') 608 + $('.A_1>.icon-sanjiaoright').css('display','block')
  609 + $('.A_1>.icon-tubiaozhizuo-').css('display','none')
  610 + }
  611 + console.log("if-else语句执行中...")
  612 + }
  613 +
  614 + //常见问题触发事件2
  615 + function btn_answer2(){
  616 +
  617 + if($(".a_2").css('display')=='none'){
  618 + $('.a_2').css('display','flex');
  619 + $('.A_2>.icon-sanjiaoright').css('display','none')
  620 + $('.A_2>.icon-tubiaozhizuo-').css('display','block')
  621 + }else{
  622 + $('.a_2').css('display','none');
  623 + $('.A_2>.icon-sanjiaoright').css('display','block')
  624 + $('.A_2>.icon-tubiaozhizuo-').css('display','none')
  625 + }
  626 + console.log("if-else语句执行中...")
  627 + }
  628 +
  629 + //常见问题触发事件3
  630 + function btn_answer3(){
  631 +
  632 + if($(".a_3").css('display')=='none'){
  633 + $('.a_3').css('display','flex');
  634 + $('.A_3>.icon-sanjiaoright').css('display','none')
  635 + $('.A_3>.icon-tubiaozhizuo-').css('display','block')
  636 + }else{
  637 + $('.a_3').css('display','none');
  638 + $('.A_3>.icon-sanjiaoright').css('display','block')
  639 + $('.A_3>.icon-tubiaozhizuo-').css('display','none')
  640 + }
  641 + console.log("if-else语句执行中...")
  642 + }
  643 +
  644 + //常见问题触发事件4
  645 + function btn_answer4(){
  646 +
  647 + if($(".a_4").css('display')=='none'){
  648 + $('.a_4').css('display','flex');
  649 + $('.A_4>.icon-sanjiaoright').css('display','none')
  650 + $('.A_4>.icon-tubiaozhizuo-').css('display','block')
  651 + }else{
  652 + $('.a_4').css('display','none');
  653 + $('.A_4>.icon-sanjiaoright').css('display','block')
  654 + $('.A_4>.icon-tubiaozhizuo-').css('display','none')
447 } 655 }
448 console.log("if-else语句执行中...") 656 console.log("if-else语句执行中...")
449 } 657 }
450 658
  659 + //常见问题触发事件5
  660 + function btn_answer5(){
  661 +
  662 + if($(".a_5").css('display')=='none'){
  663 + $('.a_5').css('display','flex');
  664 + $('.A_5>.icon-sanjiaoright').css('display','none')
  665 + $('.A_5>.icon-tubiaozhizuo-').css('display','block')
  666 + }else{
  667 + $('.a_5').css('display','none');
  668 + $('.A_5>.icon-sanjiaoright').css('display','block')
  669 + $('.A_5>.icon-tubiaozhizuo-').css('display','none')
  670 + }
  671 + console.log("if-else语句执行中...")
  672 + }
  673 +
  674 + //常见问题触发事件6
  675 + function btn_answer6(){
  676 +
  677 + if($(".a_6").css('display')=='none'){
  678 + $('.a_6').css('display','flex');
  679 + $('.A_6>.icon-sanjiaoright').css('display','none')
  680 + $('.A_6>.icon-tubiaozhizuo-').css('display','block')
  681 + }else{
  682 + $('.a_6').css('display','none');
  683 + $('.A_6>.icon-sanjiaoright').css('display','block')
  684 + $('.A_6>.icon-tubiaozhizuo-').css('display','none')
  685 + }
  686 + console.log("if-else语句执行中...")
  687 + }
  688 +
  689 + //常见问题触发事件7
  690 + function btn_answer7(){
  691 +
  692 + if($(".a_7").css('display')=='none'){
  693 + $('.a_7').css('display','flex');
  694 + $('.A_7>.icon-sanjiaoright').css('display','none')
  695 + $('.A_7>.icon-tubiaozhizuo-').css('display','block')
  696 + }else{
  697 + $('.a_7').css('display','none');
  698 + $('.A_7>.icon-sanjiaoright').css('display','block')
  699 + $('.A_7>.icon-tubiaozhizuo-').css('display','none')
  700 + }
  701 + console.log("if-else语句执行中...")
  702 + }
  703 +
  704 + //常见问题触发事件8
  705 + function btn_answer8(){
  706 +
  707 + if($(".a_8").css('display')=='none'){
  708 + $('.a_8').css('display','flex');
  709 + $('.A_8>.icon-sanjiaoright').css('display','none')
  710 + $('.A_8>.icon-tubiaozhizuo-').css('display','block')
  711 + }else{
  712 + $('.a_8').css('display','none');
  713 + $('.A_8>.icon-sanjiaoright').css('display','block')
  714 + $('.A_8>.icon-tubiaozhizuo-').css('display','none')
  715 + }
  716 + console.log("if-else语句执行中...")
  717 + }
451 718
452 //常见问题触发事件2 719 //常见问题触发事件2
453 // function btn_answer2(){ 720 // function btn_answer2(){
@@ -216,10 +216,51 @@ @@ -216,10 +216,51 @@
216 216
217 </div> 217 </div>
218 218
  219 + <!--色彩搭配模块2-->
  220 + <div class="mid_color_box_big">
  221 + <div class="mid_color_box">
  222 + <div class="mid_color_box_left">
  223 + <div class="mid_color_big">
  224 + 搭配色块
  225 + </div>
  226 + <!--颜色简称-->
  227 + <div class="mid_color_items">
  228 + <div class="mid_color_content_item">
  229 + <!--颜色盒-->
  230 + <div class="mid_color_content_item_top center_color_1">
  231 +
  232 + </div>
  233 + <!--介绍字体-->
  234 + <div class="mid_color_content_item_bottom">
  235 + BN7007-4
  236 + </div>
  237 +
  238 + </div>
  239 +
  240 + <div class="mid_color_content_item">
  241 + <!--颜色盒-->
  242 + <div class="mid_color_content_item_top center_color_1">
  243 +
  244 + </div>
  245 + <!--介绍字体-->
  246 + <div class="mid_color_content_item_bottom">
  247 + BN7007-4
  248 + </div>
  249 +
  250 + </div>
  251 + </div>
  252 +
  253 +
  254 + </div>
  255 + <div class="mid_color_box_right">
  256 + <img src="../images/bicon_43@2x.png">
  257 + </div>
  258 + </div>
  259 + </div>
219 <!--色彩搭配--> 260 <!--色彩搭配-->
220 <p class="mid_big_text"> 色彩搭配 </p> 261 <p class="mid_big_text"> 色彩搭配 </p>
221 <p class="mid_small_text"> COLOR MATCHING </p> 262 <p class="mid_small_text"> COLOR MATCHING </p>
222 - <!--色彩搭配模块--> 263 + <!--色彩搭配模块1-->
223 <div class="mid_color_box_big"> 264 <div class="mid_color_box_big">
224 <div class="mid_color_box"> 265 <div class="mid_color_box">
225 <div class="mid_color_box_left"> 266 <div class="mid_color_box_left">
@@ -259,6 +300,8 @@ @@ -259,6 +300,8 @@
259 </div> 300 </div>
260 301
261 302
  303 +
  304 +
262 <!--加载更多--> 305 <!--加载更多-->
263 <!--<div class="mid_load">--> 306 <!--<div class="mid_load">-->
264 <!--加载更多--> 307 <!--加载更多-->