webfront / Clime · 提交

转到一个项目

作者 乔爽
提交 4960fa43c43144b5c93e7780cb66656adca7bba2 1 个父辈 b955aece

update

内嵌 并排对比
正在显示 2 个修改的文件 包含 45 行增加 和 45 行删除
@@ -4,8 +4,6 @@ @@ -4,8 +4,6 @@
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$/html/cpzx_2.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/cpzx_2.html" afterDir="false" /> 6 <change beforePath="$PROJECT_DIR$/html/cpzx_2.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/cpzx_2.html" afterDir="false" />
7 - <change beforePath="$PROJECT_DIR$/html/jm_3.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/jm_3.html" afterDir="false" />  
8 - <change beforePath="$PROJECT_DIR$/html/sckj.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/sckj.html" afterDir="false" />  
9 </list> 7 </list>
10 <ignored path="$PROJECT_DIR$/.tmp/" /> 8 <ignored path="$PROJECT_DIR$/.tmp/" />
11 <ignored path="$PROJECT_DIR$/temp/" /> 9 <ignored path="$PROJECT_DIR$/temp/" />
@@ -143,14 +141,14 @@ @@ -143,14 +141,14 @@
143 <usages-collector id="statistics.file.extensions.edit"> 141 <usages-collector id="statistics.file.extensions.edit">
144 <counts> 142 <counts>
145 <entry key="css" value="4480" /> 143 <entry key="css" value="4480" />
146 - <entry key="html" value="12250" /> 144 + <entry key="html" value="12282" />
147 <entry key="js" value="73" /> 145 <entry key="js" value="73" />
148 </counts> 146 </counts>
149 </usages-collector> 147 </usages-collector>
150 <usages-collector id="statistics.file.types.edit"> 148 <usages-collector id="statistics.file.types.edit">
151 <counts> 149 <counts>
152 <entry key="CSS" value="4480" /> 150 <entry key="CSS" value="4480" />
153 - <entry key="HTML" value="12251" /> 151 + <entry key="HTML" value="12283" />
154 <entry key="JavaScript" value="72" /> 152 <entry key="JavaScript" value="72" />
155 </counts> 153 </counts>
156 </usages-collector> 154 </usages-collector>
@@ -251,9 +249,11 @@ @@ -251,9 +249,11 @@
251 <file pinned="false" current-in-tab="true"> 249 <file pinned="false" current-in-tab="true">
252 <entry file="file://$PROJECT_DIR$/html/cpzx_2.html"> 250 <entry file="file://$PROJECT_DIR$/html/cpzx_2.html">
253 <provider selected="true" editor-type-id="text-editor"> 251 <provider selected="true" editor-type-id="text-editor">
254 - <state relative-caret-position="384">  
255 - <caret line="365" column="43" lean-forward="true" selection-start-line="365" selection-start-column="43" selection-end-line="365" selection-end-column="43" /> 252 + <state relative-caret-position="1">
  253 + <caret line="365" lean-forward="true" selection-start-line="365" selection-end-line="365" />
256 <folding> 254 <folding>
  255 + <element signature="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" />
257 <element signature="n#div#4;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" />
258 <element signature="n#div#5;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" />
259 <element signature="n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 259 <element signature="n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
@@ -311,7 +311,7 @@ @@ -311,7 +311,7 @@
311 <entry file="file://$PROJECT_DIR$/html/sckj.html"> 311 <entry file="file://$PROJECT_DIR$/html/sckj.html">
312 <provider selected="true" editor-type-id="text-editor"> 312 <provider selected="true" editor-type-id="text-editor">
313 <state relative-caret-position="217"> 313 <state relative-caret-position="217">
314 - <caret line="201" lean-forward="true" selection-start-line="201" selection-end-line="201" /> 314 + <caret line="201" selection-start-line="201" selection-end-line="202" />
315 <folding> 315 <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" /> 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" />
317 <element signature="n#div#5;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" />
@@ -371,7 +371,6 @@ @@ -371,7 +371,6 @@
371 </component> 371 </component>
372 <component name="FindInProjectRecents"> 372 <component name="FindInProjectRecents">
373 <findStrings> 373 <findStrings>
374 - <find>pic1_mid_time</find>  
375 <find>最新动态</find> 374 <find>最新动态</find>
376 <find>select_color</find> 375 <find>select_color</find>
377 <find>input</find> 376 <find>input</find>
@@ -398,9 +397,10 @@ @@ -398,9 +397,10 @@
398 <find>top_intro</find> 397 <find>top_intro</find>
399 <find>time_color</find> 398 <find>time_color</find>
400 <find>pic_list</find> 399 <find>pic_list</find>
401 - <find>mid_list</find>  
402 <find>show_pic</find> 400 <find>show_pic</find>
403 <find>加盟流程</find> 401 <find>加盟流程</find>
  402 + <find>mid_items</find>
  403 + <find>mid_list</find>
404 </findStrings> 404 </findStrings>
405 <replaceStrings> 405 <replaceStrings>
406 <replace>div</replace> 406 <replace>div</replace>
@@ -471,8 +471,8 @@ @@ -471,8 +471,8 @@
471 <sorting>DEFINITION_ORDER</sorting> 471 <sorting>DEFINITION_ORDER</sorting>
472 </component> 472 </component>
473 <component name="ProjectFrameBounds"> 473 <component name="ProjectFrameBounds">
474 - <option name="x" value="778" />  
475 - <option name="y" value="58" /> 474 + <option name="x" value="732" />
  475 + <option name="y" value="64" />
476 <option name="width" value="1313" /> 476 <option name="width" value="1313" />
477 <option name="height" value="1025" /> 477 <option name="height" value="1025" />
478 </component> 478 </component>
@@ -590,15 +590,15 @@ @@ -590,15 +590,15 @@
590 <workItem from="1549845206263" duration="18001000" /> 590 <workItem from="1549845206263" duration="18001000" />
591 <workItem from="1549879359285" duration="125000" /> 591 <workItem from="1549879359285" duration="125000" />
592 <workItem from="1549931467183" duration="4792000" /> 592 <workItem from="1549931467183" duration="4792000" />
593 - <workItem from="1549950124825" duration="7909000" /> 593 + <workItem from="1549950124825" duration="8321000" />
594 </task> 594 </task>
595 <servers /> 595 <servers />
596 </component> 596 </component>
597 <component name="TimeTrackingManager"> 597 <component name="TimeTrackingManager">
598 - <option name="totallyTimeSpent" value="360683000" /> 598 + <option name="totallyTimeSpent" value="361095000" />
599 </component> 599 </component>
600 <component name="ToolWindowManager"> 600 <component name="ToolWindowManager">
601 - <frame x="778" y="58" width="1313" height="1025" extended-state="0" /> 601 + <frame x="732" y="64" width="1313" height="1025" extended-state="0" />
602 <editor active="true" /> 602 <editor active="true" />
603 <layout> 603 <layout>
604 <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4993464" visible="true" weight="0.22039215" /> 604 <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4993464" visible="true" weight="0.22039215" />
@@ -1062,22 +1062,6 @@ @@ -1062,22 +1062,6 @@
1062 </state> 1062 </state>
1063 </provider> 1063 </provider>
1064 </entry> 1064 </entry>
1065 - <entry file="file://$PROJECT_DIR$/html/sckj.html">  
1066 - <provider selected="true" editor-type-id="text-editor">  
1067 - <state relative-caret-position="217">  
1068 - <caret line="201" lean-forward="true" selection-start-line="201" selection-end-line="201" />  
1069 - <folding>  
1070 - <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" />  
1071 - <element signature="n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
1072 - <element signature="n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
1073 - <element signature="n#div#1;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
1074 - <element signature="n#div#2;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
1075 - <element signature="n#div#3;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
1076 - <element signature="e#13259#19414#0" />  
1077 - </folding>  
1078 - </state>  
1079 - </provider>  
1080 - </entry>  
1081 <entry file="file://$PROJECT_DIR$/css/sckj.css"> 1065 <entry file="file://$PROJECT_DIR$/css/sckj.css">
1082 <provider selected="true" editor-type-id="text-editor"> 1066 <provider selected="true" editor-type-id="text-editor">
1083 <state relative-caret-position="243"> 1067 <state relative-caret-position="243">
@@ -1121,11 +1105,29 @@ @@ -1121,11 +1105,29 @@
1121 </state> 1105 </state>
1122 </provider> 1106 </provider>
1123 </entry> 1107 </entry>
  1108 + <entry file="file://$PROJECT_DIR$/html/sckj.html">
  1109 + <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" />
  1112 + <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" />
  1114 + <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" />
  1116 + <element signature="n#div#1;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1117 + <element signature="n#div#2;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1118 + <element signature="n#div#3;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1119 + <element signature="e#13259#19414#0" />
  1120 + </folding>
  1121 + </state>
  1122 + </provider>
  1123 + </entry>
1124 <entry file="file://$PROJECT_DIR$/html/cpzx_2.html"> 1124 <entry file="file://$PROJECT_DIR$/html/cpzx_2.html">
1125 <provider selected="true" editor-type-id="text-editor"> 1125 <provider selected="true" editor-type-id="text-editor">
1126 - <state relative-caret-position="384">  
1127 - <caret line="365" column="43" lean-forward="true" selection-start-line="365" selection-start-column="43" selection-end-line="365" selection-end-column="43" /> 1126 + <state relative-caret-position="1">
  1127 + <caret line="365" lean-forward="true" selection-start-line="365" selection-end-line="365" />
1128 <folding> 1128 <folding>
  1129 + <element signature="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" />
1129 <element signature="n#div#4;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" />
1130 <element signature="n#div#5;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" />
1131 <element signature="n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 1133 <element signature="n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
@@ -362,17 +362,6 @@ @@ -362,17 +362,6 @@
362 $(this).addClass('item_color').siblings('.mid_menu_item').removeClass('item_color') 362 $(this).addClass('item_color').siblings('.mid_menu_item').removeClass('item_color')
363 }) 363 })
364 }) 364 })
365 - //内容切换  
366 - $(".mid_menu_item").click(function () {  
367 - $(".mid_menu_item").eq($(".box>.mid").index()).addClass("on").siblings().removeClass("on");  
368 - $(".box>.mid").hide().eq($(this).index()).show();  
369 - })  
370 -  
371 - //内容切换  
372 - $(".top_item").click(function () {  
373 - $(".top_item").eq($(".box>.mid").index()).addClass("on").siblings().removeClass("on");  
374 - $(".box>.mid").hide().eq($(this).index()).show();  
375 - })  
376 365
377 366
378 $(document).ready(function () { 367 $(document).ready(function () {
@@ -392,10 +381,19 @@ @@ -392,10 +381,19 @@
392 381
393 }) 382 })
394 383
395 - 384 + // 分页效果
  385 + // $('#box').paging({
  386 + // initPageNo: 1, // 初始页码
  387 + // totalPages: 20, //总页数
  388 + // slideSpeed: 600, // 缓动速度。单位毫秒
  389 + // jump: true, //是否支持跳转
  390 + // callback: function(page) { // 回调函数
  391 + // console.log(page);
  392 + // }
  393 + // })
396 394
397 $('.pageTest').page({ 395 $('.pageTest').page({
398 - leng: 10,//分页总数 396 + leng: 20,//分页总数
399 activeClass: 'activP' , //active 类样式定义 397 activeClass: 'activP' , //active 类样式定义
400 clickBack:function(page){ 398 clickBack:function(page){
401 console.log(page) 399 console.log(page)