张亚鹏 / Wechat_project_1 · 提交

转到一个项目

作者 乔爽
提交 55bf4a65b55f8ab5561a582895403fb862d4511c 1 个父辈 36cc4a22

update

内嵌 并排对比
正在显示 3 个修改的文件 包含 31 行增加 和 23 行删除
... ... @@ -2,11 +2,6 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="140167ac-33fb-4284-bf2f-897ad51069a4" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/iconfont/iconfont.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/cpgg.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/cpgg.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/cplb.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/cplb.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/cpxq.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/cpxq.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/gift.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/gift.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gift.html" beforeDir="false" afterPath="$PROJECT_DIR$/gift.html" afterDir="false" />
</list>
... ... @@ -70,14 +65,14 @@
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="css" value="931" />
<entry key="html" value="781" />
<entry key="css" value="1001" />
<entry key="html" value="796" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="932" />
<entry key="HTML" value="780" />
<entry key="CSS" value="1002" />
<entry key="HTML" value="795" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
... ... @@ -118,9 +113,12 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/gift.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="172" lean-forward="true" selection-start-line="172" selection-end-line="172" />
<state relative-caret-position="324">
<caret line="12" column="7" lean-forward="true" selection-start-line="12" selection-start-column="7" selection-end-line="12" selection-end-column="7" />
<folding>
<element signature="n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#0;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -167,8 +165,8 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/css/gift.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="292">
<caret line="96" column="18" lean-forward="true" selection-start-line="96" selection-start-column="18" selection-end-line="96" selection-end-column="18" />
<state relative-caret-position="256">
<caret line="60" column="44" selection-start-line="60" selection-start-column="44" selection-end-line="60" selection-end-column="44" />
</state>
</provider>
</entry>
... ... @@ -267,8 +265,8 @@
<find>icon-s</find>
<find>icon-shangjiantou</find>
<find>icon</find>
<find>menu_sor</find>
<find>menu_so</find>
<find>menu_sor</find>
</findStrings>
<dirStrings>
<dir>F:\ljh\上传资料企业微信\images</dir>
... ... @@ -327,7 +325,7 @@
<detection-done>true</detection-done>
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds" extendedState="1">
<component name="ProjectFrameBounds">
<option name="x" value="555" />
<option name="y" value="153" />
<option name="width" value="1323" />
... ... @@ -416,12 +414,12 @@
<workItem from="1546669460405" duration="32000" />
<workItem from="1546674819919" duration="1468000" />
<workItem from="1546822545566" duration="373000" />
<workItem from="1546827109123" duration="18205000" />
<workItem from="1546827109123" duration="20696000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="130045000" />
<option name="totallyTimeSpent" value="132536000" />
</component>
<component name="ToolWindowManager">
<frame x="555" y="153" width="1323" height="869" extended-state="0" />
... ... @@ -664,9 +662,12 @@
</entry>
<entry file="file://$PROJECT_DIR$/gift.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="172" lean-forward="true" selection-start-line="172" selection-end-line="172" />
<state relative-caret-position="324">
<caret line="12" column="7" lean-forward="true" selection-start-line="12" selection-start-column="7" selection-end-line="12" selection-end-column="7" />
<folding>
<element signature="n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#0;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -684,8 +685,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/css/gift.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="292">
<caret line="96" column="18" lean-forward="true" selection-start-line="96" selection-start-column="18" selection-end-line="96" selection-end-column="18" />
<state relative-caret-position="256">
<caret line="60" column="44" selection-start-line="60" selection-start-column="44" selection-end-line="60" selection-end-column="44" />
</state>
</provider>
</entry>
... ...
... ... @@ -57,7 +57,8 @@
align-items: center;
/*padding-bottom: 0.2rem;*/
position: relative;
height: 1.06rem;
height: 0.8rem;
border-bottom:0.04rem solid transparent;
}
.menu_price{
... ... @@ -73,8 +74,11 @@
.menu_sort{
border-bottom: 0.04rem solid #C0394B;
color: #C0394B;
height:0.8rem;
border-bottom: 0.04rem solid #C0394B;
/*height:1.02rem*/
}
/*.menu_sort:before{*/
/*color: #C0394B;*/
... ...
... ... @@ -12,6 +12,7 @@
<script src="js/jquery.min.js"></script>
</head>
<body>
<div class="container">
<div class="home_container">
<!--头部-->
... ... @@ -148,6 +149,8 @@
// $(this).addClass("menu_sort");
// $(this).siblings(".menu_item").removeClass("menu_sort")
})
// 价格以及库存按钮角标变色
$(".btn_top").click(function () {
$(".icon-shang").css("display","block")
... ...