webfront / Clime · 提交

转到一个项目

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

update

内嵌 并排对比
正在显示 2 个修改的文件 包含 45 行增加 和 45 行删除
... ... @@ -4,8 +4,6 @@
<list default="true" id="45116894-83a8-452c-8a78-cd7bfbe48655" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/cpzx_2.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/cpzx_2.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/jm_3.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/jm_3.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/sckj.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/sckj.html" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
... ... @@ -143,14 +141,14 @@
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="css" value="4480" />
<entry key="html" value="12250" />
<entry key="html" value="12282" />
<entry key="js" value="73" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="4480" />
<entry key="HTML" value="12251" />
<entry key="HTML" value="12283" />
<entry key="JavaScript" value="72" />
</counts>
</usages-collector>
... ... @@ -251,9 +249,11 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/html/cpzx_2.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="384">
<caret line="365" column="43" lean-forward="true" selection-start-line="365" selection-start-column="43" selection-end-line="365" selection-end-column="43" />
<state relative-caret-position="1">
<caret line="365" lean-forward="true" selection-start-line="365" selection-end-line="365" />
<folding>
<element signature="n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#4;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<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 @@
<entry file="file://$PROJECT_DIR$/html/sckj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="217">
<caret line="201" lean-forward="true" selection-start-line="201" selection-end-line="201" />
<caret line="201" selection-start-line="201" selection-end-line="202" />
<folding>
<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" />
<element signature="n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -371,7 +371,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>pic1_mid_time</find>
<find>最新动态</find>
<find>select_color</find>
<find>input</find>
... ... @@ -398,9 +397,10 @@
<find>top_intro</find>
<find>time_color</find>
<find>pic_list</find>
<find>mid_list</find>
<find>show_pic</find>
<find>加盟流程</find>
<find>mid_items</find>
<find>mid_list</find>
</findStrings>
<replaceStrings>
<replace>div</replace>
... ... @@ -471,8 +471,8 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="778" />
<option name="y" value="58" />
<option name="x" value="732" />
<option name="y" value="64" />
<option name="width" value="1313" />
<option name="height" value="1025" />
</component>
... ... @@ -590,15 +590,15 @@
<workItem from="1549845206263" duration="18001000" />
<workItem from="1549879359285" duration="125000" />
<workItem from="1549931467183" duration="4792000" />
<workItem from="1549950124825" duration="7909000" />
<workItem from="1549950124825" duration="8321000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="360683000" />
<option name="totallyTimeSpent" value="361095000" />
</component>
<component name="ToolWindowManager">
<frame x="778" y="58" width="1313" height="1025" extended-state="0" />
<frame x="732" y="64" width="1313" height="1025" extended-state="0" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4993464" visible="true" weight="0.22039215" />
... ... @@ -1062,22 +1062,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/sckj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="217">
<caret line="201" lean-forward="true" selection-start-line="201" selection-end-line="201" />
<folding>
<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" />
<element signature="n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#3;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="e#13259#19414#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/sckj.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="243">
... ... @@ -1121,11 +1105,29 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/sckj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="217">
<caret line="201" selection-start-line="201" selection-end-line="202" />
<folding>
<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" />
<element signature="n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#3;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="e#13259#19414#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/cpzx_2.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="384">
<caret line="365" column="43" lean-forward="true" selection-start-line="365" selection-start-column="43" selection-end-line="365" selection-end-column="43" />
<state relative-caret-position="1">
<caret line="365" lean-forward="true" selection-start-line="365" selection-end-line="365" />
<folding>
<element signature="n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#4;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<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 @@
$(this).addClass('item_color').siblings('.mid_menu_item').removeClass('item_color')
})
})
//内容切换
$(".mid_menu_item").click(function () {
$(".mid_menu_item").eq($(".box>.mid").index()).addClass("on").siblings().removeClass("on");
$(".box>.mid").hide().eq($(this).index()).show();
})
//内容切换
$(".top_item").click(function () {
$(".top_item").eq($(".box>.mid").index()).addClass("on").siblings().removeClass("on");
$(".box>.mid").hide().eq($(this).index()).show();
})
$(document).ready(function () {
... ... @@ -392,10 +381,19 @@
})
// 分页效果
// $('#box').paging({
// initPageNo: 1, // 初始页码
// totalPages: 20, //总页数
// slideSpeed: 600, // 缓动速度。单位毫秒
// jump: true, //是否支持跳转
// callback: function(page) { // 回调函数
// console.log(page);
// }
// })
$('.pageTest').page({
leng: 10,//分页总数
leng: 20,//分页总数
activeClass: 'activP' , //active 类样式定义
clickBack:function(page){
console.log(page)
... ...