webfront / Clime · 提交

转到一个项目

作者 乔爽
提交 93404eec48869f9f911130084d5cfadee852aaa9 1 个父辈 d2608617

update

内嵌 并排对比
正在显示 2 个修改的文件 包含 64 行增加 和 35 行删除
... ... @@ -2,10 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<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$/css/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/index.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/index.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/" />
... ... @@ -142,14 +139,14 @@
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="css" value="4268" />
<entry key="html" value="10739" />
<entry key="html" value="11064" />
<entry key="js" value="73" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="4268" />
<entry key="HTML" value="10740" />
<entry key="HTML" value="11065" />
<entry key="JavaScript" value="72" />
</counts>
</usages-collector>
... ... @@ -160,15 +157,19 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/html/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="61">
<caret line="637" column="32" lean-forward="true" selection-start-line="637" selection-start-column="32" selection-end-line="637" selection-end-column="32" />
<state relative-caret-position="351">
<caret line="211" column="25" selection-start-line="211" selection-start-column="25" selection-end-line="211" selection-end-column="25" />
<folding>
<element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<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#style#0;n#p#1;n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#p#2;n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#p#3;n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#p#4;n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<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#5;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#1;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#2;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -212,8 +213,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/sckj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="359">
<caret line="192" column="30" lean-forward="true" selection-start-line="192" selection-start-column="30" selection-end-line="192" selection-end-column="30" />
<state relative-caret-position="-883">
<caret line="188" column="33" lean-forward="true" selection-start-line="188" selection-start-column="33" selection-end-line="188" selection-end-column="33" />
<folding>
<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" />
<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" />
... ... @@ -308,7 +309,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>swiper-wrapper</find>
<find>swiper-slide-active</find>
<find>pic4_banner</find>
<find>icon-caidan</find>
... ... @@ -336,8 +336,9 @@
<find>&lt;p</find>
<find>pic_item_box_top</find>
<find>btn_loca</find>
<find>mid_list</find>
<find>year</find>
<find>mid_list</find>
<find>bottom</find>
</findStrings>
<replaceStrings>
<replace>div</replace>
... ... @@ -408,10 +409,10 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="891" />
<option name="y" value="404" />
<option name="width" value="1324" />
<option name="height" value="976" />
<option name="x" value="347" />
<option name="y" value="40" />
<option name="width" value="1553" />
<option name="height" value="975" />
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
... ... @@ -461,7 +462,7 @@
<property name="DefaultHtmlFileTemplate" value="HTML File" />
<property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://F:/ljh项目/可耐美手机端/clime/html/cpxq_2.html" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="last_opened_file_path" value="F:/案例项目/kenaimei" />
<property name="list.type.of.created.stylesheet" value="CSS" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
... ... @@ -524,18 +525,18 @@
<workItem from="1548894777879" duration="7107000" />
<workItem from="1548985599234" duration="16586000" />
<workItem from="1549074255207" duration="6285000" />
<workItem from="1549845206263" duration="5082000" />
<workItem from="1549845206263" duration="6542000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="334938000" />
<option name="totallyTimeSpent" value="336398000" />
</component>
<component name="ToolWindowManager">
<frame x="570" y="38" width="1324" height="976" extended-state="0" />
<frame x="347" y="40" width="1553" height="975" extended-state="0" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.4993464" visible="true" weight="0.18273717" />
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.4993464" visible="true" weight="0.15511551" />
<window_info id="Structure" order="1" sideWeight="0.5006536" side_tool="true" weight="0.16211294" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
... ... @@ -547,7 +548,7 @@
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="8" />
<window_info active="true" anchor="bottom" id="Terminal" order="9" visible="true" weight="0.38882282" />
<window_info active="true" anchor="bottom" id="Terminal" order="9" visible="true" weight="0.3892857" />
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
... ... @@ -903,10 +904,17 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="202">
<caret line="444" column="1" lean-forward="true" selection-start-line="444" selection-start-column="1" selection-end-line="444" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/sckj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="359">
<caret line="192" column="30" lean-forward="true" selection-start-line="192" selection-start-column="30" selection-end-line="192" selection-end-column="30" />
<state relative-caret-position="-883">
<caret line="188" column="33" lean-forward="true" selection-start-line="188" selection-start-column="33" selection-end-line="188" selection-end-column="33" />
<folding>
<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" />
<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" />
... ... @@ -920,24 +928,21 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="202">
<caret line="444" column="1" lean-forward="true" selection-start-line="444" selection-start-column="1" selection-end-line="444" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="61">
<caret line="637" column="32" lean-forward="true" selection-start-line="637" selection-start-column="32" selection-end-line="637" selection-end-column="32" />
<state relative-caret-position="351">
<caret line="211" column="25" selection-start-line="211" selection-start-column="25" selection-end-line="211" selection-end-column="25" />
<folding>
<element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<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#style#0;n#p#1;n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#p#2;n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#p#3;n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#p#4;n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<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#5;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#1;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#2;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ...
... ... @@ -102,6 +102,9 @@
.time_2018{
margin-left: 2.3rem;
}
.on{
display: block;
}
</style>
</head>
... ... @@ -193,7 +196,21 @@
</div>
<div class="pic1_mid_bottom">
可耐美由两位经济学家和一位化学家组建，基于全球环境恶化、变暖寻求解决方案而成立。德国总部设在德国杜塞尔多夫（Düsseldorf），“创新+整合”是我们的核心竞争力可耐美由两位经济学家和一位化学家组建。
<p class="text_show">可耐美由两位经济学家和一位化学家组建，基于全球环境恶化、变暖寻求解决方案而成立。
德国总部设在德国杜塞尔多夫（Düsseldorf），“创新+整合”是我们的核心竞争力可耐美由两位经济学家和一位化学家组建。
</p>
<p style="display: none;">
1
</p>
<p style="display: none;">
2
</p>
<p style="display: none;">
3
</p>
<p style="display: none;">
4
</p>
</div>
<!--图标-->
<div class="pic1_mid_icon">
... ... @@ -647,5 +664,12 @@
// $(this).eq($('.year').index()).addClass('time_color').siblings().removeClass('time_color');
// console.log('aaa')
// })
$('.pic_item_box_top>p').click(function () {
console.log(11)
$('.pic_item_box_top>p').eq($('.pic1_mid_bottom>p').index()).addClass('on').siblings().removeClass('on');
$('.pic1_mid_bottom>p').hide().eq($(this).index()).show();
})
</script>
</html>
... ...