webfront / shengbao · 提交

转到一个项目

作者 乔爽
提交 b18256943d8f545af6c8069acfdadf857e56151a 1 个父辈 2103588d

update

内嵌 并排对比
正在显示 3 个修改的文件 包含 88 行增加 和 78 行删除
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="1ae5f9a6-acdc-475d-863d-ce05e13f7b72" name="Default Changelist" comment="" />
<list default="true" id="1ae5f9a6-acdc-475d-863d-ce05e13f7b72" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/gonggao.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/gonggao.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gonggao.html" beforeDir="false" afterPath="$PROJECT_DIR$/gonggao.html" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
<ignored path="$PROJECT_DIR$/tmp/" />
... ... @@ -49,25 +53,25 @@
<session id="-407721514">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.closed" value="5" />
<entry key="project.open.time.0" value="2" />
<entry key="project.closed" value="6" />
<entry key="project.open.time.0" value="3" />
<entry key="project.open.time.1" value="1" />
<entry key="project.open.time.14" value="1" />
<entry key="project.open.time.18" value="1" />
<entry key="project.open.time.31" value="1" />
<entry key="project.opened" value="6" />
<entry key="project.opened" value="7" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="css" value="3402" />
<entry key="html" value="2202" />
<entry key="css" value="3487" />
<entry key="html" value="2214" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="3402" />
<entry key="HTML" value="2202" />
<entry key="CSS" value="3487" />
<entry key="HTML" value="2214" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
... ... @@ -93,17 +97,17 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/gonggao.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="217">
<caret line="50" column="43" lean-forward="true" selection-start-line="50" selection-start-column="43" selection-end-line="50" selection-end-column="43" />
<state relative-caret-position="108">
<caret line="34" column="40" lean-forward="true" selection-start-line="34" selection-start-column="40" selection-end-line="34" selection-end-column="40" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/css/gonggao.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216">
<caret line="8" column="16" selection-start-line="8" selection-start-column="16" selection-end-line="8" selection-end-column="16" />
<caret line="20" column="8" lean-forward="true" selection-start-line="20" selection-start-column="8" selection-end-line="20" selection-end-column="8" />
</state>
</provider>
</entry>
... ... @@ -120,8 +124,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="189">
<caret line="41" column="30" lean-forward="true" selection-start-line="41" selection-start-column="30" selection-end-line="41" selection-end-column="30" />
<state relative-caret-position="54">
<caret line="27" column="23" lean-forward="true" selection-start-line="27" selection-start-column="23" selection-end-line="27" selection-end-column="23" />
<folding>
<element signature="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#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -151,7 +155,7 @@
<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="27">
<state relative-caret-position="405">
<caret line="15" selection-start-line="15" selection-end-line="16" />
<folding>
<element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -179,7 +183,7 @@
<provider selected="true" editor-type-id="images" />
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/images/bg2_2.png">
<provider selected="true" editor-type-id="images" />
</entry>
... ... @@ -192,7 +196,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/last.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195">
<state relative-caret-position="3753">
<caret line="139" column="24" lean-forward="true" selection-start-line="139" selection-start-column="24" selection-end-line="139" selection-end-column="24" />
</state>
</provider>
... ... @@ -239,6 +243,7 @@
<find>mid_loans_box</find>
<find>select</find>
<find>btn</find>
<find>dis</find>
</findStrings>
</component>
<component name="Git.Settings">
... ... @@ -264,6 +269,7 @@
<option value="$PROJECT_DIR$/css/index2.css" />
<option value="$PROJECT_DIR$/css/index.css" />
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/css/gonggao.css" />
<option value="$PROJECT_DIR$/gonggao.html" />
</list>
</option>
... ... @@ -275,9 +281,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="854" />
<option name="y" value="114" />
<option name="width" value="1354" />
<option name="x" value="399" />
<option name="y" value="134" />
<option name="width" value="1714" />
<option name="height" value="873" />
</component>
<component name="ProjectView">
... ... @@ -285,6 +291,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -297,22 +304,16 @@
<item name="shengbao" type="462c0819:PsiDirectoryNode" />
<item name="css" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="shengbao" type="b2602c69:ProjectViewProjectNode" />
<item name="shengbao" type="462c0819:PsiDirectoryNode" />
<item name="images" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<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$/../../可耐美手机端/clime" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<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" />
... ... @@ -356,12 +357,13 @@
<workItem from="1547799045567" duration="6022000" />
<workItem from="1547857140175" duration="1455000" />
<workItem from="1547863520730" duration="3049000" />
<workItem from="1547866625675" duration="1925000" />
<workItem from="1547866625675" duration="2102000" />
<workItem from="1547868960136" duration="801000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="54370000" />
<option name="totallyTimeSpent" value="55348000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -373,10 +375,10 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="446" y="129" width="1354" height="847" extended-state="0" />
<frame x="507" y="176" width="1714" height="873" extended-state="0" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1618541" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.12708831" />
<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" />
... ... @@ -388,7 +390,7 @@
<window_info anchor="bottom" id="TODO" order="6" weight="0.32974428" />
<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.30758426" />
<window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.29674795" />
<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" />
... ... @@ -420,37 +422,50 @@
<entry file="file://$PROJECT_DIR$/css/dropload.css">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/js/base.js">
<provider selected="true" editor-type-id="text-editor" />
<entry file="file://$PROJECT_DIR$/last.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="405">
<caret line="15" selection-start-line="15" selection-end-line="16" />
<folding>
<element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#1;n#div#0;n#div#0;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#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;n#div#0;n#div#1;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#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#select#0;n#div#1;n#div#0;n#div#0;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#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#2;n#div#0;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#3;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#0;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="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#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" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/images/bg_1.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/css/gonggao.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216">
<caret line="8" column="16" selection-start-line="8" selection-start-column="16" selection-end-line="8" selection-end-column="16" />
</state>
</provider>
<entry file="file://$PROJECT_DIR$/js/base.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/css/last.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195">
<state relative-caret-position="3753">
<caret line="139" column="24" lean-forward="true" selection-start-line="139" selection-start-column="24" selection-end-line="139" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="189">
<caret line="7" column="11" lean-forward="true" selection-start-line="7" selection-start-column="11" selection-end-line="7" selection-end-column="11" />
</state>
</provider>
<entry file="file://$PROJECT_DIR$/images/bg2_2.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="189">
<caret line="41" column="30" lean-forward="true" selection-start-line="41" selection-start-column="30" selection-end-line="41" selection-end-column="30" />
<state relative-caret-position="54">
<caret line="27" column="23" lean-forward="true" selection-start-line="27" selection-start-column="23" selection-end-line="27" selection-end-column="23" />
<folding>
<element signature="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#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -471,39 +486,26 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/last.html">
<entry file="file://$PROJECT_DIR$/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="27">
<caret line="15" selection-start-line="15" selection-end-line="16" />
<folding>
<element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#1;n#div#0;n#div#0;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#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;n#div#0;n#div#1;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#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#select#0;n#div#1;n#div#0;n#div#0;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#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#2;n#div#0;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#3;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#0;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="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#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" />
</folding>
<state relative-caret-position="189">
<caret line="7" column="11" lean-forward="true" selection-start-line="7" selection-start-column="11" selection-end-line="7" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gonggao.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="217">
<caret line="50" column="43" lean-forward="true" selection-start-line="50" selection-start-column="43" selection-end-line="50" selection-end-column="43" />
<state relative-caret-position="108">
<caret line="34" column="40" lean-forward="true" selection-start-line="34" selection-start-column="40" selection-end-line="34" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/images/bg2_2.png">
<provider selected="true" editor-type-id="images" />
<entry file="file://$PROJECT_DIR$/css/gonggao.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216">
<caret line="20" column="8" lean-forward="true" selection-start-line="20" selection-start-column="8" selection-end-line="20" selection-end-column="8" />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
html{
height: 100%;
background-color: #f9f9f9;
}
.main , .page {
position: absolute;
top: 0;
... ... @@ -12,7 +16,7 @@
display: flex;
flex-flow: column;
align-items: center;
background: #F9F9F9;
/*background: #F9F9F9;*/
}
.header{
width: 6.97rem;
... ... @@ -35,15 +39,17 @@
/*bottom: 0;*/
/*}*/
.bottom{
margin-top: 0.22rem;
/*margin-top: 0.22rem;*/
width: 6.97rem;
/*height: 5.4rem;*/
display: flex;
/*display: flex;*/
background: rgba(255,255,255,1);
box-shadow: 0 0.07rem 0.1rem 0.01rem rgba(0,0,0,0.08);
border-radius: 0.16rem;
padding-bottom: 0.5rem;
/*margin-bottom: 0.3rem;*/
margin: 0.22rem 0 0.3rem 0;
}
.bottom_box{
width: 6.2rem;
... ...
... ... @@ -34,8 +34,10 @@
<!--文本框盒-->
<div class="bottom_box">
1、个人贷款要有明确用途，且应符合法律法规规定和国家有关政策，交易背景真实，不得虚构交易背景和贷款用途;<br>
2、个人贷款的使用应遵循诚信原则，符合借款合同中约定的用途，根据国家现行规定，贷款资金不得违规进入股市、房地产开发等国家明令禁止进入的领域;<br>
3、贷款购买住房的，应按照国家规定申请个人住房贷款，根据国家现行规定，消费性贷款禁止用于购买住房。<br>
2、个人贷款的使用应遵循诚信原则，符合借款合同中约定的用途，根据国家现行规定，贷款资金不得违规进入股市、房地产开发等国家明令禁止进入的领域;<br>
3、贷款购买住房的，应按照国家规定申请个人住房贷款，根据国家现行规定，消费性贷款禁止用于购买住房。<br>
</div>
... ...