webfront / shengbao · 提交

转到一个项目

作者 乔爽
提交 88b44951853ddf576603726ca7d2a1b978c704b5 1 个父辈 9174c06a

update

内嵌 并排对比
正在显示 4 个修改的文件 包含 193 行增加 和 84 行删除
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
... ...
<?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 afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/dkxq.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/dkxq.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/dkxq.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/dkxq.html" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
<ignored path="$PROJECT_DIR$/tmp/" />
... ... @@ -46,14 +51,34 @@
</counts>
</usages-collector>
</session>
<session id="-407721514">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.open.time.0" value="1" />
<entry key="project.opened" value="1" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="css" value="727" />
<entry key="html" value="342" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="727" />
<entry key="HTML" value="342" />
</counts>
</usages-collector>
</session>
</component>
<component name="FileEditorManager">
<leaf>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/xyjc.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="277">
<caret line="16" column="32" lean-forward="true" selection-start-line="16" selection-start-column="32" selection-end-line="16" selection-end-column="32" />
<state relative-caret-position="196">
<caret line="13" column="22" lean-forward="true" selection-start-line="13" selection-start-column="22" selection-end-line="13" selection-end-column="22" />
<folding>
<element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
</folding>
... ... @@ -64,8 +89,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/xyjc.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162">
<caret line="12" column="18" lean-forward="true" selection-end-line="58" />
<state relative-caret-position="324">
<caret line="12" column="18" selection-end-line="58" />
</state>
</provider>
</entry>
... ... @@ -82,8 +107,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/dksm.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="27">
<caret line="13" column="18" lean-forward="true" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="18" />
<state relative-caret-position="162">
<caret line="18" column="14" lean-forward="true" selection-start-line="18" selection-start-column="14" selection-end-line="18" selection-end-column="14" />
<folding>
<element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
</folding>
... ... @@ -94,15 +119,14 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162">
<caret line="71" column="18" lean-forward="true" selection-end-line="106" />
<state relative-caret-position="81">
<caret line="30" column="26" lean-forward="true" selection-start-line="30" selection-start-column="26" selection-end-line="30" selection-end-column="26" />
<folding>
<element signature="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#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#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="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" />
<element signature="n#div#2;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#2;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -116,8 +140,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="162">
<caret line="180" column="24" lean-forward="true" selection-start-line="180" selection-start-column="24" selection-end-line="180" selection-end-column="24" />
<state relative-caret-position="-59">
<caret line="180" column="24" selection-start-line="180" selection-start-column="24" selection-end-line="180" selection-end-column="24" />
</state>
</provider>
</entry>
... ... @@ -125,11 +149,14 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/html/dkxq.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459">
<caret line="33" column="37" selection-start-line="33" selection-start-column="37" selection-end-line="33" selection-end-column="37" />
<state relative-caret-position="396">
<caret line="60" column="14" lean-forward="true" selection-start-line="60" selection-start-column="14" selection-end-line="60" selection-end-column="14" />
<folding>
<element signature="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#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#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" />
</folding>
</state>
</provider>
... ... @@ -138,8 +165,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/dkxq.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="104">
<caret line="44" column="11" lean-forward="true" selection-start-line="44" selection-start-column="11" selection-end-line="44" selection-end-column="11" />
<state relative-caret-position="225">
<caret line="104" column="18" lean-forward="true" selection-start-line="104" selection-start-column="18" selection-end-line="104" selection-end-column="18" />
</state>
</provider>
</entry>
... ... @@ -147,8 +174,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/jquery.min.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216">
<caret line="128" column="26" lean-forward="true" selection-start-line="128" selection-start-column="26" selection-end-line="128" selection-end-column="26" />
<state relative-caret-position="3456">
<caret line="128" column="26" selection-start-line="128" selection-start-column="26" selection-end-line="128" selection-end-column="26" />
</state>
</provider>
</entry>
... ... @@ -171,8 +198,12 @@
<component name="FindInProjectRecents">
<findStrings>
<find>mid_today</find>
<find>limit_box</find>
</findStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
... ... @@ -194,10 +225,10 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="995" />
<option name="y" value="161" />
<option name="width" value="1032" />
<option name="height" value="805" />
<option name="x" value="954" />
<option name="y" value="173" />
<option name="width" value="1154" />
<option name="height" value="819" />
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
... ... @@ -208,24 +239,19 @@
<subPane>
<expand>
<path>
<item name="盛宝财富贷款平台" type="b2602c69:ProjectViewProjectNode" />
<item name="盛宝财富贷款平台" type="462c0819:PsiDirectoryNode" />
<item name="shengbao" type="b2602c69:ProjectViewProjectNode" />
<item name="shengbao" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="盛宝财富贷款平台" type="b2602c69:ProjectViewProjectNode" />
<item name="盛宝财富贷款平台" type="462c0819:PsiDirectoryNode" />
<item name="shengbao" type="b2602c69:ProjectViewProjectNode" />
<item name="shengbao" type="462c0819:PsiDirectoryNode" />
<item name="css" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="盛宝财富贷款平台" type="b2602c69:ProjectViewProjectNode" />
<item name="盛宝财富贷款平台" type="462c0819:PsiDirectoryNode" />
<item name="shengbao" type="b2602c69:ProjectViewProjectNode" />
<item name="shengbao" type="462c0819:PsiDirectoryNode" />
<item name="html" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="盛宝财富贷款平台" type="b2602c69:ProjectViewProjectNode" />
<item name="盛宝财富贷款平台" type="462c0819:PsiDirectoryNode" />
<item name="js" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
... ... @@ -236,7 +262,7 @@
<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$/../../企业微信/Wechat_project_1" />
<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" />
... ... @@ -270,23 +296,20 @@
<option name="presentableId" value="Default" />
<updated>1547702487075</updated>
<workItem from="1547702489388" duration="15192000" />
<workItem from="1547718617124" duration="4238000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="15192000" />
<option name="totallyTimeSpent" value="19430000" />
</component>
<component name="ToolWindowManager">
<frame x="995" y="161" width="1032" height="805" extended-state="0" />
<frame x="954" y="173" width="1154" height="819" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Favorites" side_tool="true" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27565393" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.16487455" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Docker" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
<window_info anchor="bottom" id="Terminal" />
<window_info anchor="bottom" id="Event Log" side_tool="true" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" />
... ... @@ -294,6 +317,10 @@
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<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" />
<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" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
... ... @@ -306,20 +333,10 @@
<option name="myLimit" value="2678400000" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/js/jquery.min.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216">
<caret line="128" column="26" lean-forward="true" selection-start-line="128" selection-start-column="26" selection-end-line="128" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/base.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/css/xyjc.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162">
<caret line="12" column="18" lean-forward="true" selection-end-line="58" />
<state relative-caret-position="324">
<caret line="12" column="18" selection-end-line="58" />
</state>
</provider>
</entry>
... ... @@ -330,10 +347,20 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/jquery.min.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3456">
<caret line="128" column="26" selection-start-line="128" selection-start-column="26" selection-end-line="128" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/base.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/html/xyjc.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="277">
<caret line="16" column="32" lean-forward="true" selection-start-line="16" selection-start-column="32" selection-end-line="16" selection-end-column="32" />
<state relative-caret-position="196">
<caret line="13" column="22" lean-forward="true" selection-start-line="13" selection-start-column="22" selection-end-line="13" selection-end-column="22" />
<folding>
<element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
</folding>
... ... @@ -342,8 +369,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/html/dksm.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="27">
<caret line="13" column="18" lean-forward="true" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="18" />
<state relative-caret-position="162">
<caret line="18" column="14" lean-forward="true" selection-start-line="18" selection-start-column="14" selection-end-line="18" selection-end-column="14" />
<folding>
<element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
</folding>
... ... @@ -352,15 +379,14 @@
</entry>
<entry file="file://$PROJECT_DIR$/html/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162">
<caret line="71" column="18" lean-forward="true" selection-end-line="106" />
<state relative-caret-position="81">
<caret line="30" column="26" lean-forward="true" selection-start-line="30" selection-start-column="26" selection-end-line="30" selection-end-column="26" />
<folding>
<element signature="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#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#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="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" />
<element signature="n#div#2;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#2;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -372,25 +398,28 @@
</entry>
<entry file="file://$PROJECT_DIR$/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162">
<caret line="180" column="24" lean-forward="true" selection-start-line="180" selection-start-column="24" selection-end-line="180" selection-end-column="24" />
<state relative-caret-position="-59">
<caret line="180" column="24" selection-start-line="180" selection-start-column="24" selection-end-line="180" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/dkxq.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="104">
<caret line="44" column="11" lean-forward="true" selection-start-line="44" selection-start-column="11" selection-end-line="44" selection-end-column="11" />
<state relative-caret-position="225">
<caret line="104" column="18" lean-forward="true" selection-start-line="104" selection-start-column="18" selection-end-line="104" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/dkxq.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459">
<caret line="33" column="37" selection-start-line="33" selection-start-column="37" selection-end-line="33" selection-end-column="37" />
<state relative-caret-position="396">
<caret line="60" column="14" lean-forward="true" selection-start-line="60" selection-start-column="14" selection-end-line="60" selection-end-column="14" />
<folding>
<element signature="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#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#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" />
</folding>
</state>
</provider>
... ...
... ... @@ -50,13 +50,66 @@
border: 0.01rem solid red ;
margin: 0.85rem 1.1rem;
}
.limit_box_item{
font-size: 0.3rem;
color: #5A441A;
.apply{
margin-top: 0.14rem;
width: 6.97rem;
height: 1rem;
box-shadow: 0 0.07rem 0.1rem 0.01rem rgba(0,0,0,0.08);
border-radius: 0.16rem;
background-color: #ffffff;
font-size: 0.34rem;
font-weight: bold;
color: #585858;
text-align: center;
line-height: 1rem;
}
.apply_box{
margin-top: 0.22rem;
width: 6.97rem;
height: 3.56rem;
background-color: #ffffff;
box-shadow: 0 0.07rem 0.1rem 0.01rem rgba(0,0,0,0.08);
border-radius: 0.16rem;
display: flex;
width: 0.8rem;
justify-content: center;
}
.apply_name{
margin-top: 0.48rem;
width: 5rem;
height: 0.64rem;
border: 0.02rem solid #CCCCCC;
border-radius: 0.1rem;
display: flex;
}
.apply_name_bg{
width: 0.86rem;
height: 0.65rem;
background-color: red;
/*background: url("../images/dsfs6@2x.png");*/
background-size: cover;
display: flex;
align-items: center;
}
.apply_name_bg_pic{
width: 0.38rem;
height: 0.44rem;
display: flex;
margin-left: 0.16rem;
}
.apply_name_bg_pic img{
width: 100%;
height: 100%;
}
.apply_name_input{
width: 3.92rem;
margin: 0 0.11rem;
border: none;
outline: none;
}
select{
width: 3rem;
height: 0.8rem;
.m_top{
margin-top: 0.16rem;
}
... ...
... ... @@ -26,18 +26,39 @@
<!--额度信息-->
<div class="limit">
<div class="limit_box">
<div class="limit_box_item">
<div>额度</div>
<select>
<option>5000</option>
<option>10000</option>
<option>50000</option>
</select>
</div>
</div>
</div>
<!--申请人信息标题-->
<div class="apply">
申请人信息
</div>
<!--申请人信息-->
<div class="apply_box">
<!--姓名-->
<div class="apply_name">
<!--图片-->
<div class="apply_name_bg">
<div class="apply_name_bg_pic">
<img src="../images/dfgdf@2x.png">
</div>
</div>
<!--输入框-->
<input class="apply_name_input" placeholder="请输入您的真实姓名">
</div>
<!--手机号-->
<!--<div class="apply_name m_top">-->
<!--&lt;!&ndash;图片&ndash;&gt;-->
<!--<div class="apply_name_bg">-->
<!--<div class="apply_name_bg_pic">-->
<!--<img src="../images/dfgdf@2x.png">-->
<!--</div>-->
<!--</div>-->
<!--&lt;!&ndash;输入框&ndash;&gt;-->
<!--<input class="apply_name_input" placeholder="请输入您的真实姓名">-->
<!--</div>-->
</div>
</div>
</div>
... ...