webfront / videoWeb · 提交

转到一个项目

作者 Lijianheng
提交 c82db58d2e16a19c15660693dc4ef68370ebabb2 1 个父辈 54cc89bb

更新菜单功能

内嵌 并排对比
正在显示 5 个修改的文件 包含 139 行增加 和 84 行删除
... ... @@ -3,14 +3,7 @@
<component name="ChangeListManager">
<list default="true" id="4b1522a3-ff5f-4552-aa4b-3123e2f51376" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/css/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/index.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/index_2.css" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/css/rwxq.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/rwxq.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/spxq.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/spxq.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/ztxq.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/ztxq.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/index_2.html" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/rwxq.html" beforeDir="false" afterPath="$PROJECT_DIR$/rwxq.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/spxq.html" beforeDir="false" afterPath="$PROJECT_DIR$/spxq.html" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
... ... @@ -30,7 +23,7 @@
<entry key="project.open.time.1" value="9" />
<entry key="project.open.time.16" value="1" />
<entry key="project.open.time.19" value="1" />
<entry key="project.open.time.2" value="2" />
<entry key="project.open.time.2" value="3" />
<entry key="project.open.time.21" value="1" />
<entry key="project.open.time.23" value="2" />
<entry key="project.open.time.25" value="1" />
... ... @@ -40,7 +33,7 @@
<entry key="project.open.time.32" value="1" />
<entry key="project.open.time.7" value="2" />
<entry key="project.open.time.8" value="1" />
<entry key="project.opened" value="33" />
<entry key="project.opened" value="34" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
... ... @@ -61,14 +54,14 @@
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="css" value="23009" />
<entry key="html" value="23053" />
<entry key="css" value="23199" />
<entry key="html" value="23238" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="23009" />
<entry key="HTML" value="23053" />
<entry key="CSS" value="23199" />
<entry key="HTML" value="23238" />
</counts>
</usages-collector>
</session>
... ... @@ -78,11 +71,14 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="27">
<caret line="293" column="10" selection-start-line="293" selection-start-column="10" selection-end-line="293" selection-end-column="10" />
<state relative-caret-position="232">
<caret line="421" column="28" lean-forward="true" selection-start-line="421" selection-start-column="28" selection-end-line="421" selection-end-column="28" />
<folding>
<element signature="n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#div#0;n#div#0;n#div#1;n#div#0;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#1;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#3;n#div#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -165,7 +161,7 @@
<entry file="file://$PROJECT_DIR$/ztxq.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3564">
<caret line="132" column="26" lean-forward="true" selection-start-line="132" selection-start-column="26" selection-end-line="132" selection-end-column="26" />
<caret line="132" column="26" selection-start-line="132" selection-start-column="26" selection-end-line="132" selection-end-column="26" />
</state>
</provider>
</entry>
... ... @@ -174,7 +170,7 @@
<entry file="file://$PROJECT_DIR$/css/rw.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5022">
<caret line="186" column="28" lean-forward="true" selection-start-line="186" selection-start-column="28" selection-end-line="186" selection-end-column="28" />
<caret line="186" column="28" selection-start-line="186" selection-start-column="28" selection-end-line="186" selection-end-column="28" />
</state>
</provider>
</entry>
... ... @@ -183,7 +179,7 @@
<entry file="file://$PROJECT_DIR$/css/rwxq.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="10179">
<caret line="377" column="28" lean-forward="true" selection-start-line="377" selection-start-column="28" selection-end-line="377" selection-end-column="28" />
<caret line="377" column="28" selection-start-line="377" selection-start-column="28" selection-end-line="377" selection-end-column="28" />
</state>
</provider>
</entry>
... ... @@ -191,8 +187,8 @@
<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="9909">
<caret line="367" column="29" lean-forward="true" selection-start-line="367" selection-start-column="29" selection-end-line="367" selection-end-column="29" />
<state relative-caret-position="320">
<caret line="476" column="23" selection-start-line="476" selection-start-column="23" selection-end-line="476" selection-end-column="23" />
</state>
</provider>
</entry>
... ... @@ -201,7 +197,7 @@
<entry file="file://$PROJECT_DIR$/css/spxq.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="13662">
<caret line="506" column="1" lean-forward="true" selection-start-line="506" selection-start-column="1" selection-end-line="506" selection-end-column="1" />
<caret line="506" column="1" selection-start-line="506" selection-start-column="1" selection-end-line="506" selection-end-column="1" />
</state>
</provider>
</entry>
... ... @@ -218,11 +214,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>设置邮箱</find>
<find>大势</find>
<find>border_no</find>
<find>最新</find>
<find>guanbi</find>
<find>shangsanjiao</find>
<find>主页</find>
<find>new_video</find>
... ... @@ -248,6 +239,11 @@
<find>share_f</find>
<find>删除</find>
<find>swiper</find>
<find>index_jump</find>
<find>menu_item_</find>
<find>item_p</find>
<find>grzy_jump</find>
<find>menu_item p</find>
</findStrings>
</component>
<component name="Git.Settings">
... ... @@ -284,12 +280,12 @@
<option value="$PROJECT_DIR$/zhsz.html" />
<option value="$PROJECT_DIR$/css/index_2.css" />
<option value="$PROJECT_DIR$/index_2.html" />
<option value="$PROJECT_DIR$/css/index.css" />
<option value="$PROJECT_DIR$/css/rwxq.css" />
<option value="$PROJECT_DIR$/rwxq.html" />
<option value="$PROJECT_DIR$/css/ztxq.css" />
<option value="$PROJECT_DIR$/css/spxq.css" />
<option value="$PROJECT_DIR$/spxq.html" />
<option value="$PROJECT_DIR$/css/index.css" />
<option value="$PROJECT_DIR$/index.html" />
</list>
</option>
... ... @@ -301,10 +297,10 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="251" />
<option name="y" value="59" />
<option name="width" value="1410" />
<option name="height" value="962" />
<option name="x" value="381" />
<option name="y" value="80" />
<option name="width" value="1181" />
<option name="height" value="914" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
... ... @@ -312,7 +308,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -334,12 +329,13 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="DefaultHtmlFileTemplate" value="HTML File" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../企业微信/Wechat_project_1" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../可耐美手机端/clime" />
<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" />
... ... @@ -417,19 +413,21 @@
<workItem from="1553475579529" duration="612000" />
<workItem from="1554184116026" duration="769000" />
<workItem from="1554197195488" duration="105000" />
<workItem from="1554707946355" duration="2519000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="201862000" />
<option name="totallyTimeSpent" value="204381000" />
</component>
<component name="ToolWindowManager">
<frame x="251" y="59" width="1410" height="962" extended-state="0" />
<frame x="31" y="73" width="1181" height="914" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Favorites" order="0" side_tool="true" />
<window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.13119534" />
<window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.15748031" />
<window_info id="Structure" order="2" side_tool="true" weight="0.25" />
<window_info active="true" anchor="bottom" id="Terminal" order="0" visible="true" weight="0.19588876" />
<window_info anchor="bottom" id="Terminal" order="0" visible="true" weight="0.20795892" />
<window_info anchor="bottom" id="Event Log" order="1" side_tool="true" />
<window_info anchor="bottom" id="Version Control" order="2" />
<window_info anchor="bottom" id="Docker" order="3" show_stripe_button="false" />
... ... @@ -626,33 +624,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="27">
<caret line="293" column="10" selection-start-line="293" selection-start-column="10" selection-end-line="293" selection-end-column="10" />
<folding>
<element signature="n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#2;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;n#div#2;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#2;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#2;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#2;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#4;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#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#2;n#div#4;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#5;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#5;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#5;n#div#0;n#body#0;n#html#0;n#!!top" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/swiper.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216">
... ... @@ -705,35 +676,65 @@
<entry file="file://$PROJECT_DIR$/ztxq.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3564">
<caret line="132" column="26" lean-forward="true" selection-start-line="132" selection-start-column="26" selection-end-line="132" selection-end-column="26" />
<caret line="132" column="26" selection-start-line="132" selection-start-column="26" selection-end-line="132" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/rw.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5022">
<caret line="186" column="28" lean-forward="true" selection-start-line="186" selection-start-column="28" selection-end-line="186" selection-end-column="28" />
<caret line="186" column="28" selection-start-line="186" selection-start-column="28" selection-end-line="186" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/rwxq.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="10179">
<caret line="377" column="28" lean-forward="true" selection-start-line="377" selection-start-column="28" selection-end-line="377" selection-end-column="28" />
<caret line="377" column="28" selection-start-line="377" selection-start-column="28" selection-end-line="377" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/spxq.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="13662">
<caret line="506" column="1" selection-start-line="506" selection-start-column="1" selection-end-line="506" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="9909">
<caret line="367" column="29" lean-forward="true" selection-start-line="367" selection-start-column="29" selection-end-line="367" selection-end-column="29" />
<state relative-caret-position="320">
<caret line="476" column="23" selection-start-line="476" selection-start-column="23" selection-end-line="476" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/spxq.css">
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="13662">
<caret line="506" column="1" lean-forward="true" selection-start-line="506" selection-start-column="1" selection-end-line="506" selection-end-column="1" />
<state relative-caret-position="232">
<caret line="421" column="28" lean-forward="true" selection-start-line="421" selection-start-column="28" selection-end-line="421" selection-end-column="28" />
<folding>
<element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#div#0;n#div#0;n#div#1;n#div#0;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#1;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#3;n#div#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#2;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;n#div#2;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#2;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#2;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#2;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#4;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#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#2;n#div#4;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#5;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#5;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#5;n#div#0;n#body#0;n#html#0;n#!!top" />
</folding>
</state>
</provider>
</entry>
... ...
... ... @@ -428,21 +428,23 @@
}
/*菜单*/
.menu_item{
width: 1.8rem;
width: 7.5rem;
display: flex;
flex-flow: column;
font-size: 0.24rem;
font-weight: bold;
background-color: orangered;
background-color: #F7F7F7;
position: absolute;
left: 0;
bottom: 0;
top: 0.8rem;
z-index: 999;
}
.menu_item p{
position: relative;
line-height: 0.5rem;
line-height: 1rem;
text-align: center;
border-bottom: 1px solid #F7F7F7;
border-bottom: 1px solid #EBEBEB;
margin: 0 0.2rem;
}
.year_pic{
... ... @@ -468,3 +470,21 @@
display: flex;
justify-content: space-between;
}
.menu_item_a{
display: flex;
align-items: center;
justify-content: space-between;
position: relative;
padding: 0.38rem 0;
border-bottom: 1px solid #EBEBEB;
margin: 0 0.2rem;
}
.menu_item_a_pic{
width: 0.08rem;
height: 0.16rem;
display: flex;
}
.menu_item_a_pic img{
width: 100%;
height: 100%;
}
... ...
... ... @@ -94,12 +94,36 @@
<!--菜单列表-->
<div class="menu_item" style="display: none;">
<p class="index_jump">主页
<span class="iconfont icon-shangsanjiao"></span>
</p >
<p class="rwxq_jump">人物详情</p>
<p class="grzy_jump">个人主页</p>
<p class="spxq_jump">视频详情</p>
<!--<p class="index_jump">主页</p >-->
<!--<p class="rwxq_jump">人物详情</p>-->
<!--<p class="grzy_jump">个人主页</p>-->
<!--<p class="spxq_jump">视频详情</p>-->
<div class="menu_item_a">
<div>首页</div>
<div class="menu_item_a_pic">
<img src="images/you@2x.png">
</div>
</div>
<div class="menu_item_a">
<div>精选</div>
<div class="menu_item_a_pic">
<img src="images/you@2x.png">
</div>
</div>
<div class="menu_item_a">
<div>动态</div>
<div class="menu_item_a_pic">
<img src="images/you@2x.png">
</div>
</div>
<div class="menu_item_a">
<div>百科</div>
<div class="menu_item_a_pic">
<img src="images/you@2x.png">
</div>
</div>
</div>
</div>
</div>
... ... @@ -395,7 +419,17 @@
//点击打开菜单
$('.icon-caidan').click(function () {
console.log(11)
$('.menu_item').slideToggle();
// 关闭图片功能 2019.4.8
// $('.menu_item').slideToggle();
// if($(this).hasClass("icon-caidan")){
// $(this).addClass("icon-guanbi");
// $(this).removeClass("icon-caidan");
// $("body").css("overflow","hidden");
// }else{
// $(this).removeClass("icon-guanbi");
// $(this).addClass("icon-caidan");
// $("body").css("overflow","auto");
// }
})
//地址跳转
... ...