webfront / Clime · 提交

转到一个项目

作者 乔爽
提交 e96e5747cd6a5c85d76bc8034ff22e254269ad49 1 个父辈 9280486a

update

内嵌 并排对比
正在显示 3 个修改的文件 包含 65 行增加 和 50 行删除
... ... @@ -2,6 +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$/css/fwcx_4.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/fwcx_4.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/fwcx_4.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/fwcx_4.html" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
... ... @@ -138,15 +139,15 @@
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="css" value="4234" />
<entry key="html" value="9456" />
<entry key="css" value="4250" />
<entry key="html" value="9555" />
<entry key="js" value="73" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="4234" />
<entry key="HTML" value="9457" />
<entry key="CSS" value="4250" />
<entry key="HTML" value="9556" />
<entry key="JavaScript" value="72" />
</counts>
</usages-collector>
... ... @@ -226,11 +227,14 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/html/fwcx_4.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="206">
<caret line="421" column="12" selection-start-line="421" selection-start-column="12" selection-end-line="421" selection-end-column="12" />
<state relative-caret-position="318">
<caret line="327" column="10" selection-start-line="327" selection-start-column="10" selection-end-line="327" selection-end-column="10" />
<folding>
<element signature="n#div#12;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#13;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#14;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<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" />
<element signature="n#style#0;n#div#3;n#div#16;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#div#15;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="e#13943#14499#0" />
<element signature="e#14537#14689#0" />
</folding>
... ... @@ -241,8 +245,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/fwcx_4.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207">
<caret line="371" column="4" selection-start-line="371" selection-start-column="4" selection-end-line="371" selection-end-column="4" />
<state relative-caret-position="283">
<caret line="379" column="30" lean-forward="true" selection-start-line="379" selection-start-column="30" selection-end-line="379" selection-end-column="30" />
</state>
</provider>
</entry>
... ... @@ -311,7 +315,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>margin</find>
<find>margin-left</find>
<find>pic4_banner_mid</find>
<find>swiper</find>
... ... @@ -341,6 +344,7 @@
<find>iconfont</find>
<find>.mid_count_number</find>
<find>sanjiaoright</find>
<find>mid_</find>
</findStrings>
<replaceStrings>
<replace>div</replace>
... ... @@ -396,8 +400,8 @@
<option value="$PROJECT_DIR$/html/index.html" />
<option value="$PROJECT_DIR$/css/index.css" />
<option value="$PROJECT_DIR$/html/gsjj.html" />
<option value="$PROJECT_DIR$/css/fwcx_4.css" />
<option value="$PROJECT_DIR$/css/lxwm_5.css" />
<option value="$PROJECT_DIR$/css/fwcx_4.css" />
<option value="$PROJECT_DIR$/html/fwcx_4.html" />
</list>
</option>
... ... @@ -409,8 +413,8 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="779" />
<option name="y" value="31" />
<option name="x" value="781" />
<option name="y" value="95" />
<option name="width" value="1348" />
<option name="height" value="941" />
</component>
... ... @@ -523,15 +527,15 @@
<workItem from="1548748173198" duration="12444000" />
<workItem from="1548807911154" duration="1663000" />
<workItem from="1548894777879" duration="7107000" />
<workItem from="1548985599234" duration="14995000" />
<workItem from="1548985599234" duration="15987000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="321980000" />
<option name="totallyTimeSpent" value="322972000" />
</component>
<component name="ToolWindowManager">
<frame x="779" y="31" width="1348" height="941" extended-state="0" />
<frame x="781" y="95" width="1348" height="941" 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.17938931" />
... ... @@ -959,18 +963,21 @@
</entry>
<entry file="file://$PROJECT_DIR$/css/fwcx_4.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207">
<caret line="371" column="4" selection-start-line="371" selection-start-column="4" selection-end-line="371" selection-end-column="4" />
<state relative-caret-position="283">
<caret line="379" column="30" lean-forward="true" selection-start-line="379" selection-start-column="30" selection-end-line="379" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/fwcx_4.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="206">
<caret line="421" column="12" selection-start-line="421" selection-start-column="12" selection-end-line="421" selection-end-column="12" />
<state relative-caret-position="318">
<caret line="327" column="10" selection-start-line="327" selection-start-column="10" selection-end-line="327" selection-end-column="10" />
<folding>
<element signature="n#div#12;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#13;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#14;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<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" />
<element signature="n#style#0;n#div#3;n#div#16;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#div#15;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="e#13943#14499#0" />
<element signature="e#14537#14689#0" />
</folding>
... ...
... ... @@ -378,6 +378,7 @@
width: 6.86rem;
display: flex;
background-color: #ffffff;
padding: 0.2rem 0;
}
.mid_common_item_first{
... ...
... ... @@ -325,28 +325,30 @@
</div>
</div>
<!--问题列表-->
<div class="mid_common_item" onclick="btn_answer2()">
<div class="mid_common_item_first">
Q:
</div>
<div class="mid_common_item_last">
与油性漆相比水性漆的优缺点分别有哪些？
</div>
<div class="iconfont icon-sanjiaoright"></div>
<!--默认隐藏，当点击时触发-->
<div class="iconfont icon-tubiaozhizuo- xiabiao" style="display: none;"></div>
</div>
<!--点击下拉功能-->
<div class="mid_common_item_answer a_2" style="display: none;">
<div class="mid_common_item_first">
A:
</div>
<div class="mid_common_item_last last_color">
与油性漆相比，水性漆的环保性能是其最大优势。水性漆中不含有苯、二甲苯等公认的有毒有害物质，同时在漆膜的柔韧度、耐候性、耐黄变性能、施工性能等方面都要优于油性漆漆，在漆膜硬度和饱满度方面与油性漆相当。水性漆最大的不足在于其不属于溶剂挥发性产品，干燥速度与温度和湿度有极大的关系，因此干燥时间要略长于油性漆。
</div>
</div>
<!--&lt;!&ndash;问题列表&ndash;&gt;-->
<!--<div class="mid_common_item" onclick="btn_answer2()">-->
<!--<div class="mid_common_item_first">-->
<!--Q:-->
<!--</div>-->
<!--<div class="mid_common_item_last">-->
<!--与油性漆相比水性漆的优缺点分别有哪些？-->
<!--</div>-->
<!--<div class="iconfont icon-sanjiaoright"></div>-->
<!--&lt;!&ndash;默认隐藏，当点击时触发&ndash;&gt;-->
<!--<div class="iconfont icon-tubiaozhizuo- xiabiao" style="display: none;"></div>-->
<!--</div>-->
<!--&lt;!&ndash;点击下拉功能&ndash;&gt;-->
<!--<div class="mid_common_item_answer a_2" style="display: none;">-->
<!--<div class="mid_common_item_first">-->
<!--A:-->
<!--</div>-->
<!--<div class="mid_common_item_last last_color">-->
<!--与油性漆相比，水性漆的环保性能是其最大优势。水性漆中不含有苯、二甲苯等公认的有毒有害物质，同时在漆膜的柔韧度、耐候性、耐黄变性能、施工性能等方面都要优于油性漆漆，在漆膜硬度和饱满度方面与油性漆相当。水性漆最大的不足在于其不属于溶剂挥发性产品，干燥速度与温度和湿度有极大的关系，因此干燥时间要略长于油性漆。-->
<!--</div>-->
<!--</div>-->
... ... @@ -419,19 +421,24 @@
if($(".a_1").css('display')=='none'){
$('.a_1').css('display','flex');
$('.icon-sanjiaoright').css('display','none')
$('.icon-tubiaozhizuo-').css('display','block')
}else{
$('.a_1').css('display','none');
$('.icon-sanjiaoright').css('display','block')
$('.icon-tubiaozhizuo-').css('display','none')
}
console.log("if-else语句执行中...")
}
//常见问题触发事件2
function btn_answer2(){
var a = {}
a.display = $('.a_2').css('display') == 'none' ? 'flex' : 'none';
$('.a_2').css(a)
console.log("三元运算符执行中...")
}
// function btn_answer2(){
// var a = {}
// a.display = $('.a_2').css('display') == 'none' ? 'flex' : 'none';
// $('.a_2').css(a)
// console.log("三元运算符执行中...")
// }
//菜单功能
... ...