webfront / Clime · 提交

转到一个项目

作者 乔爽
提交 ccb11a0d3b0eab3ec30b9ce692754aacbe8f9284 1 个父辈 b32f624c

update

内嵌 并排对比
正在显示 5 个修改的文件 包含 130 行增加 和 137 行删除
... ... @@ -2,9 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="45116894-83a8-452c-8a78-cd7bfbe48655" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/css/swiper-3.4.2.min.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/js/swiper-3.4.2.jquery.min.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/gsjj.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/gsjj.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/index.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/gsjj.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/gsjj.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/index.html" afterDir="false" />
... ... @@ -128,29 +126,29 @@
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="css" value="63" />
<entry key="css" value="64" />
<entry key="html" value="98" />
<entry key="js" value="10" />
<entry key="js" value="11" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="CSS" value="63" />
<entry key="CSS" value="64" />
<entry key="HTML" value="98" />
<entry key="JavaScript" value="10" />
<entry key="JavaScript" value="11" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="css" value="3842" />
<entry key="html" value="8786" />
<entry key="css" value="3848" />
<entry key="html" value="9019" />
<entry key="js" value="73" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="3842" />
<entry key="HTML" value="8787" />
<entry key="CSS" value="3848" />
<entry key="HTML" value="9020" />
<entry key="JavaScript" value="72" />
</counts>
</usages-collector>
... ... @@ -161,8 +159,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/gsjj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="324">
<caret line="254" lean-forward="true" selection-start-line="254" selection-end-line="254" />
<state relative-caret-position="340">
<caret line="418" lean-forward="true" selection-start-line="418" selection-end-line="418" />
<folding>
<element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
... ... @@ -184,7 +182,6 @@
<element signature="e#16087#16184#0" />
<element signature="e#16250#16290#0" />
<element signature="e#18959#19012#0" />
<element signature="e#23297#24149#0" />
</folding>
</state>
</provider>
... ... @@ -201,14 +198,18 @@
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/swiper-3.4.2.jquery.min.js">
<provider selected="true" editor-type-id="text-editor" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="244">
<caret line="11" column="52114" selection-start-line="11" selection-start-column="52095" selection-end-line="11" selection-end-column="52114" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="156">
<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 relative-caret-position="519">
<caret line="439" column="18" lean-forward="true" selection-start-line="439" selection-start-column="18" selection-end-line="439" selection-end-column="18" />
</state>
</provider>
</entry>
... ... @@ -217,7 +218,16 @@
<entry file="file://$PROJECT_DIR$/css/swiper-3.4.2.min.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297">
<caret line="11" column="4133" selection-start-line="11" selection-start-column="4117" selection-end-line="11" selection-end-column="4133" />
<caret line="11" column="144" selection-start-line="11" selection-start-column="144" selection-end-line="11" selection-end-column="144" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/swiper.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183">
<caret line="163" column="9" selection-start-line="163" selection-start-column="9" selection-end-line="163" selection-end-column="9" />
</state>
</provider>
</entry>
... ... @@ -225,8 +235,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/gsjj.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="243">
<caret line="292" column="24" selection-start-line="292" selection-start-column="1" selection-end-line="292" selection-end-column="24" />
<state relative-caret-position="-31">
<caret line="304" column="19" lean-forward="true" selection-start-line="304" selection-start-column="19" selection-end-line="304" selection-end-column="19" />
</state>
</provider>
</entry>
... ... @@ -234,8 +244,8 @@
<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="279">
<caret line="76" column="9" lean-forward="true" selection-start-line="76" selection-start-column="9" selection-end-line="76" selection-end-column="9" />
<state relative-caret-position="432">
<caret line="82" column="32" lean-forward="true" selection-start-line="82" selection-start-column="32" selection-end-line="82" selection-end-column="32" />
<folding>
<element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
... ... @@ -269,43 +279,19 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/sckj.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="189">
<caret line="195" column="23" lean-forward="true" selection-start-line="195" selection-start-column="23" selection-end-line="195" selection-end-column="23" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/sckj.html">
<entry file="file://$PROJECT_DIR$/js/swiper.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="568">
<caret line="182" column="26" lean-forward="true" selection-start-line="182" selection-start-column="26" selection-end-line="182" selection-end-column="26" />
<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#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" />
<element signature="n#div#1;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#1;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#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#4;n#div#1;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#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#6;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;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" />
</folding>
<state relative-caret-position="239">
<caret line="1210" column="5" lean-forward="true" selection-start-line="1210" selection-start-column="5" selection-end-line="1210" selection-end-column="5" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/lxwm_5.css">
<entry file="file://$PROJECT_DIR$/css/sckj.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="11367">
<caret line="421" column="18" selection-start-line="421" selection-start-column="18" selection-end-line="421" selection-end-column="18" />
<state relative-caret-position="189">
<caret line="195" column="23" lean-forward="true" selection-start-line="195" selection-start-column="23" selection-end-line="195" selection-end-column="23" />
</state>
</provider>
</entry>
... ... @@ -322,10 +308,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>pic4_banner_lef</find>
<find>pic4_banner_left</find>
<find>pic3_</find>
<find>pic1_mid</find>
<find>pic1_mid_bottom</find>
<find>mid_top_item</find>
<find>btn_location</find>
... ... @@ -338,7 +320,6 @@
<find>mid_company_banner</find>
<find>mid_company_a</find>
<find>查看更多</find>
<find>pic4_banner</find>
<find>pic4</find>
<find>mid_lis</find>
<find>pic_list</find>
... ... @@ -347,11 +328,16 @@
<find>swiper-slide</find>
<find>margin</find>
<find>margin-left</find>
<find>margin-right</find>
<find>pic4_banner_mid</find>
<find>swiper</find>
<find>swiper-wrapper</find>
<find>swiper-container</find>
<find>margin-right</find>
<find>swiper-slider</find>
<find>swiper-slide mid_company_banner_mid swiper-slide-duplicate-next</find>
<find>swiper-wrapper</find>
<find>swiper-slide-active</find>
<find>mid_company_banner_mid</find>
<find>pic4_banner</find>
</findStrings>
<replaceStrings>
<replace>div</replace>
... ... @@ -404,10 +390,10 @@
<option value="$PROJECT_DIR$/css/lxwm_6.css" />
<option value="$PROJECT_DIR$/css/lxwm_5.css" />
<option value="$PROJECT_DIR$/html/lxwm_5.html" />
<option value="$PROJECT_DIR$/css/gsjj.css" />
<option value="$PROJECT_DIR$/html/sckj.html" />
<option value="$PROJECT_DIR$/css/sckj.css" />
<option value="$PROJECT_DIR$/css/index.css" />
<option value="$PROJECT_DIR$/css/gsjj.css" />
<option value="$PROJECT_DIR$/html/gsjj.html" />
<option value="$PROJECT_DIR$/html/index.html" />
</list>
... ... @@ -420,8 +406,8 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="136" />
<option name="y" value="123" />
<option name="x" value="660" />
<option name="y" value="109" />
<option name="width" value="1630" />
<option name="height" value="1100" />
</component>
... ... @@ -531,15 +517,15 @@
<workItem from="1548376254799" duration="35479000" />
<workItem from="1548635475488" duration="30286000" />
<workItem from="1548722046541" duration="20538000" />
<workItem from="1548748173198" duration="6406000" />
<workItem from="1548748173198" duration="12326000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="292177000" />
<option name="totallyTimeSpent" value="298097000" />
</component>
<component name="ToolWindowManager">
<frame x="136" y="123" width="1630" height="1100" extended-state="0" />
<frame x="366" y="31" width="1630" height="1100" 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.13756281" />
... ... @@ -554,7 +540,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 anchor="bottom" id="Terminal" order="9" visible="true" weight="0.34715027" />
<window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.12642486" />
<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" />
... ... @@ -785,13 +771,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/swiper.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1458">
<caret line="54" column="22" lean-forward="true" selection-start-line="54" selection-start-column="22" selection-end-line="54" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/zxdt.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297">
... ... @@ -821,13 +800,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/swiper.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="189">
<caret line="1207" column="20" selection-start-line="1207" selection-start-column="14" selection-end-line="1207" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/fwcx_4.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="625">
... ... @@ -978,27 +950,38 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/gsjj.css">
<entry file="file://$PROJECT_DIR$/js/jquery.min.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="243">
<caret line="292" column="24" selection-start-line="292" selection-start-column="1" selection-end-line="292" selection-end-column="24" />
<state relative-caret-position="193">
<caret line="11" selection-start-line="11" selection-end-line="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/swiper-3.4.2.jquery.min.js">
<provider selected="true" editor-type-id="text-editor" />
<entry file="file://$PROJECT_DIR$/css/swiper.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183">
<caret line="163" column="9" selection-start-line="163" selection-start-column="9" selection-end-line="163" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/index.css">
<entry file="file://$PROJECT_DIR$/css/swiper-3.4.2.min.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="156">
<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 relative-caret-position="297">
<caret line="11" column="144" selection-start-line="11" selection-start-column="144" selection-end-line="11" selection-end-column="144" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/swiper.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="239">
<caret line="1210" column="5" lean-forward="true" selection-start-line="1210" selection-start-column="5" selection-end-line="1210" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/gsjj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="324">
<caret line="254" lean-forward="true" selection-start-line="254" selection-end-line="254" />
<state relative-caret-position="340">
<caret line="418" lean-forward="true" selection-start-line="418" selection-end-line="418" />
<folding>
<element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
... ... @@ -1020,29 +1003,35 @@
<element signature="e#16087#16184#0" />
<element signature="e#16250#16290#0" />
<element signature="e#18959#19012#0" />
<element signature="e#23297#24149#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/jquery.min.js">
<entry file="file://$PROJECT_DIR$/js/swiper-3.4.2.jquery.min.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="193">
<caret line="11" selection-start-line="11" selection-end-line="11" />
<state relative-caret-position="244">
<caret line="11" column="52114" selection-start-line="11" selection-start-column="52095" selection-end-line="11" selection-end-column="52114" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/swiper-3.4.2.min.css">
<entry file="file://$PROJECT_DIR$/css/gsjj.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297">
<caret line="11" column="4133" selection-start-line="11" selection-start-column="4117" selection-end-line="11" selection-end-column="4133" />
<state relative-caret-position="-31">
<caret line="304" column="19" lean-forward="true" selection-start-line="304" selection-start-column="19" selection-end-line="304" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="519">
<caret line="439" column="18" lean-forward="true" selection-start-line="439" selection-start-column="18" selection-end-line="439" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="279">
<caret line="76" column="9" lean-forward="true" selection-start-line="76" selection-start-column="9" selection-end-line="76" selection-end-column="9" />
<state relative-caret-position="432">
<caret line="82" column="32" lean-forward="true" selection-start-line="82" selection-start-column="32" selection-end-line="82" selection-end-column="32" />
<folding>
<element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
... ...
... ... @@ -301,8 +301,8 @@
height: 100%;
}
.mid_company_banner_mid{
width: 3.1rem;
height: 4.2rem;
width: 2.8rem;
height: 3.1rem;
display: flex;
background-color: green;
}
... ...
... ... @@ -436,7 +436,7 @@
margin-bottom: 0.13rem;
}
.pic4_banner{
width: 100%;
/*width: 100%;*/
height: 4.2rem;
display: flex;
align-items: center;
... ...
... ... @@ -83,6 +83,14 @@
/*max-width: 100%;*/
/*}*/
.swiper-slide-active{
width: 3.1rem;
height: 4.2rem;
}
.swiper-wrapper{
display: flex;
align-items: center;
}
</style>
</head>
... ... @@ -428,6 +436,7 @@
</div>
</div>
<script src="../js/jquery.min.js"></script>
<script src="../js/swiper-3.4.2.jquery.min.js"></script>
<script>
function btn_index() {
... ... @@ -637,18 +646,18 @@
//swiper功能
var swiper = new Swiper('#d_slider',{
autoplay: {
delay: 3000,
disableOnInteraction: false,
},
// autoplay: {
// delay: 1000,
// disableOnInteraction: false,
// },
allowTouchMove: true,
lazy: {
loadPrevNext: true,
loadPrevNextAmount: 3,
},
centeredSlides: true,
spaceBetween : 50,
slidesOffsetBefore: 40,
spaceBetween : 40,
slidesOffsetBefore: 0,
loop: true,
slidesPerView : 'auto',
on: {},
... ...
... ... @@ -65,15 +65,22 @@
align-items: center;
}
.pic4_banner_mid{
width: 3.1rem;
height: 4.2rem;
width: 2.28rem;
height: 3.1rem;
display: flex;
margin-left: 0.06rem;
margin:0 0.3rem;
}
.pic4_banner_mid img{
width: 100%;
height: 100%;
}
.swiper-slide-active{
width: 3.1rem;
height: 100%;
}
.swiper-wrapper{
display: flex;
align-items: center;
}
</style>
</head>
... ... @@ -350,35 +357,21 @@
<div class="swiper-container2" id="d_slider">
<div class="swiper-wrapper ">
<div class="swiper-slide pic4_banner_mid ">
<img src="../images/bicon_09@2x.png" alt="">
<img src="../images/bicon_08@2x.png" alt="">
</div>
<div class="swiper-slide pic4_banner_mid">
<img src="../images/bicon_08@2x.png" alt="">
</div>
<div class="swiper-slide pic4_banner_mid">
<img src="../images/bicon_09@2x.png" alt="">
<img src="../images/bicon_08@2x.png" alt="">
</div>
</div>
<!-- Add Pagination -->
<!--<img src="./images/03pc-second/pic (7).png" class="arrow-left" alt="">-->
<!--<div class="swiper-pagination"></div>-->
<!--<img src="./images/03pc-second/pic (8).png" class="arrow-right" alt="">-->
</div>
<!--<div class="pic4_banner_left">-->
<!--<img src="../images/bicon_09@2x.png">-->
<!--</div>-->
<!--<div class="pic4_banner_mid">-->
<!--<img src="../images/bicon_08@2x.png">-->
<!--</div>-->
<!--<div class="pic4_banner_right">-->
<!--<img src="../images/bicon_09@2x.png">-->
<!--</div>-->
</div>
<!--查看更多-->
... ... @@ -427,7 +420,7 @@
</body>
<!-- Swiper JS -->
<!--<script src="../js/swiper.min.js"></script>-->
<script src="../js/jquery.min.js"></script>
<script src="../js/swiper-3.4.2.jquery.min.js"></script>
<script>
function btn_index() {
... ... @@ -570,20 +563,22 @@
},false)
}
//swiper功能
var swiper2 = new Swiper('#d_slider',{
autoplay: {
delay: 3000,
disableOnInteraction: false,
},
// autoplay: {
// delay: 1000,
// disableOnInteraction: false,
// },
allowTouchMove: true,
lazy: {
loadPrevNext: true,
loadPrevNextAmount: 3,
},
centeredSlides: true,
spaceBetween : 50,
slidesOffsetBefore: 40,
// spaceBetween : 20,
// slidesOffsetBefore: 0,
loop: true,
slidesPerView : 'auto',
on: {},
... ...