webfront / shengbao · 提交

转到一个项目

作者 乔爽
提交 9ffaf9870ebe6e767669b682f8f32b53bbad8708 1 个父辈 3a8bf927

update

内嵌 并排对比
正在显示 4 个修改的文件 包含 73 行增加 和 72 行删除
... ... @@ -2,7 +2,9 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="1ae5f9a6-acdc-475d-863d-ce05e13f7b72" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/images/backg_1.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/new_2.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/new_2.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/new_2.html" beforeDir="false" afterPath="$PROJECT_DIR$/new_2.html" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
... ... @@ -95,49 +97,49 @@
<session id="-988677624">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.closed" value="17" />
<entry key="project.open.time.0" value="15" />
<entry key="project.closed" value="20" />
<entry key="project.open.time.0" value="17" />
<entry key="project.open.time.1" value="1" />
<entry key="project.open.time.2" value="1" />
<entry key="project.open.time.26" value="1" />
<entry key="project.opened" value="18" />
<entry key="project.opened" value="20" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="css" value="7" />
<entry key="html" value="13" />
<entry key="html" value="15" />
<entry key="png" value="13" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="CSS" value="7" />
<entry key="HTML" value="13" />
<entry key="HTML" value="15" />
<entry key="Image" value="13" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="css" value="166" />
<entry key="html" value="223" />
<entry key="css" value="170" />
<entry key="html" value="227" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="166" />
<entry key="HTML" value="223" />
<entry key="CSS" value="170" />
<entry key="HTML" value="227" />
</counts>
</usages-collector>
</session>
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<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="200">
<caret line="230" column="27" selection-start-line="230" selection-start-column="27" selection-end-line="230" selection-end-column="27" />
<state relative-caret-position="1674">
<caret line="62" selection-start-line="62" selection-end-line="62" />
<folding>
<element signature="e#8941#14339#0" />
</folding>
... ... @@ -146,18 +148,9 @@
</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="54">
<caret line="2" column="4" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="39" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/new.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="169">
<state relative-caret-position="3078">
<caret line="114" column="22" lean-forward="true" selection-start-line="114" selection-start-column="22" selection-end-line="114" selection-end-column="22" />
<folding>
<element signature="e#5844#6026#0" />
... ... @@ -167,11 +160,20 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/last.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="243">
<caret line="106" column="26" lean-forward="true" selection-end-line="148" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/new_2.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="227">
<caret line="110" column="24" selection-start-line="110" selection-start-column="24" selection-end-line="110" selection-end-column="24" />
<state relative-caret-position="648">
<caret line="24" column="40" selection-start-line="24" selection-start-column="40" selection-end-line="24" selection-end-column="40" />
</state>
</provider>
</entry>
... ... @@ -179,8 +181,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/new_2.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2349">
<caret line="87" column="18" lean-forward="true" selection-start-line="87" selection-start-column="18" selection-end-line="87" selection-end-column="18" />
<state relative-caret-position="213">
<caret line="345" column="32" lean-forward="true" selection-start-line="345" selection-start-column="32" selection-end-line="345" selection-end-column="32" />
</state>
</provider>
</entry>
... ... @@ -222,8 +224,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>apply_toRegister</find>
<find>main</find>
<find>container</find>
<find>mid_top</find>
<find>name_bg</find>
... ... @@ -252,6 +252,8 @@
<find>m_top</find>
<find>apply_box</find>
<find>Regis</find>
<find>head</find>
<find>img</find>
</findStrings>
</component>
<component name="Git.Settings">
... ... @@ -285,8 +287,8 @@
<option value="$PROJECT_DIR$/css/last_2.css" />
<option value="$PROJECT_DIR$/last_2.html" />
<option value="$PROJECT_DIR$/css/gonggao.css" />
<option value="$PROJECT_DIR$/css/new_2.css" />
<option value="$PROJECT_DIR$/new_2.html" />
<option value="$PROJECT_DIR$/css/new_2.css" />
</list>
</option>
</component>
... ... @@ -297,9 +299,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="822" />
<option name="y" value="38" />
<option name="width" value="965" />
<option name="x" value="523" />
<option name="y" value="77" />
<option name="width" value="1320" />
<option name="height" value="990" />
</component>
<component name="ProjectView">
... ... @@ -307,7 +309,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -334,6 +335,7 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
... ... @@ -345,6 +347,9 @@
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="F:\ljh项目\盛宝财富贷款平台\shengbao" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="F:\ljhWeb项目（重要）\盛宝财富贷款平台\shengbao\images" />
<recent name="F:\ljh项目\盛宝财富贷款平台\shengbao\js" />
... ... @@ -352,9 +357,6 @@
<recent name="F:\ljh项目\盛宝财富贷款平台\images" />
<recent name="F:\ljh项目\盛宝财富贷款平台\js" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="F:\ljh项目\盛宝财富贷款平台\shengbao" />
</key>
</component>
<component name="RunDashboard">
<option name="ruleStates">
... ... @@ -417,12 +419,14 @@
<workItem from="1550648232798" duration="2342000" />
<workItem from="1550651732023" duration="965000" />
<workItem from="1550653402477" duration="697000" />
<workItem from="1550656239990" duration="832000" />
<workItem from="1550656239990" duration="986000" />
<workItem from="1550657429574" duration="749000" />
<workItem from="1550659894127" duration="51000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="129719000" />
<option name="totallyTimeSpent" value="130673000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -434,10 +438,10 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="822" y="38" width="965" height="990" extended-state="0" />
<frame x="482" y="264" width="1320" height="990" extended-state="0" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2437972" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17628706" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
... ... @@ -490,13 +494,6 @@
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/last_new.html" />
<entry file="file://$PROJECT_DIR$/last.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="243">
<caret line="106" column="26" lean-forward="true" selection-end-line="148" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/last.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
... ... @@ -525,9 +522,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459">
<caret line="26" column="21" selection-start-line="26" selection-start-column="21" selection-end-line="26" selection-end-column="21" />
<folding>
<element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
</folding>
</state>
</provider>
</entry>
... ... @@ -558,10 +552,21 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/new_2.css">
<entry file="file://$PROJECT_DIR$/new.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2349">
<caret line="87" column="18" lean-forward="true" selection-start-line="87" selection-start-column="18" selection-end-line="87" selection-end-column="18" />
<state relative-caret-position="3078">
<caret line="114" column="22" lean-forward="true" selection-start-line="114" selection-start-column="22" selection-end-line="114" selection-end-column="22" />
<folding>
<element signature="e#5844#6026#0" />
<element signature="e#6050#6305#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/new_2.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="648">
<caret line="24" column="40" selection-start-line="24" selection-start-column="40" selection-end-line="24" selection-end-column="40" />
</state>
</provider>
</entry>
... ... @@ -580,31 +585,27 @@
<entry file="file://$PROJECT_DIR$/images/ZCxzas4@2x.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<entry file="file://$PROJECT_DIR$/css/new_2.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="230" column="27" selection-start-line="230" selection-start-column="27" selection-end-line="230" selection-end-column="27" />
<folding>
<element signature="e#8941#14339#0" />
</folding>
<state relative-caret-position="213">
<caret line="345" column="32" lean-forward="true" selection-start-line="345" selection-start-column="32" selection-end-line="345" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/new.html">
<entry file="file://$PROJECT_DIR$/last.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="169">
<caret line="114" column="22" lean-forward="true" selection-start-line="114" selection-start-column="22" selection-end-line="114" selection-end-column="22" />
<folding>
<element signature="e#5844#6026#0" />
<element signature="e#6050#6305#0" />
</folding>
<state relative-caret-position="243">
<caret line="106" column="26" lean-forward="true" selection-end-line="148" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/new_2.html">
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="227">
<caret line="110" column="24" selection-start-line="110" selection-start-column="24" selection-end-line="110" selection-end-column="24" />
<state relative-caret-position="1674">
<caret line="62" selection-start-line="62" selection-end-line="62" />
<folding>
<element signature="e#8941#14339#0" />
</folding>
</state>
</provider>
</entry>
... ...
... ... @@ -343,7 +343,7 @@ input::placeholder{
width: 6.97rem;
height: 5.03rem;
border-radius: 0.16rem;
background-color: green;
/*background-color: green;*/
margin-top: 0.14rem;
position: relative;
}
... ...
... ... @@ -17,7 +17,7 @@
<div class="container">
<!--头部图片-->
<div class="header" onclick="btn_next()">
<img src="images/xzACsa@2x.png">
<img src="images/backg_1.png">
<!--链接-->
<!--<div class="link_left">-->
<!--<img src="images/lianjie.png">-->
... ...