webfront / shengbao · 提交

转到一个项目

作者 乔爽
提交 3a8bf927d5d3d69e735daf35719544bc7ee9a2cd 1 个父辈 da550bf7

update

内嵌 并排对比
正在显示 2 个修改的文件 包含 67 行增加 和 57 行删除
... ... @@ -2,12 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="1ae5f9a6-acdc-475d-863d-ce05e13f7b72" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/css/new_2.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/new_2.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/index.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/new.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/new.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" 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/" />
<ignored path="$PROJECT_DIR$/temp/" />
... ... @@ -99,38 +95,38 @@
<session id="-988677624">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.closed" value="16" />
<entry key="project.open.time.0" value="14" />
<entry key="project.closed" value="17" />
<entry key="project.open.time.0" value="15" />
<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="17" />
<entry key="project.opened" value="18" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="css" value="7" />
<entry key="html" value="12" />
<entry key="html" value="13" />
<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="12" />
<entry key="HTML" value="13" />
<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="218" />
<entry key="html" value="223" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="166" />
<entry key="HTML" value="218" />
<entry key="HTML" value="223" />
</counts>
</usages-collector>
</session>
... ... @@ -140,8 +136,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="351">
<caret line="13" column="31" lean-forward="true" selection-start-line="13" selection-start-column="31" selection-end-line="13" selection-end-column="31" />
<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>
... ... @@ -158,11 +154,24 @@
</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">
<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>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/new_2.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266">
<caret line="131" column="29" selection-start-line="131" selection-start-column="29" selection-end-line="131" selection-end-column="29" />
<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>
</provider>
</entry>
... ... @@ -170,7 +179,7 @@
<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="307">
<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>
</provider>
... ... @@ -213,7 +222,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>apply_name_input</find>
<find>apply_toRegister</find>
<find>main</find>
<find>container</find>
... ... @@ -243,6 +251,7 @@
<find>limit</find>
<find>m_top</find>
<find>apply_box</find>
<find>Regis</find>
</findStrings>
</component>
<component name="Git.Settings">
... ... @@ -288,9 +297,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="363" />
<option name="y" value="197" />
<option name="width" value="1661" />
<option name="x" value="822" />
<option name="y" value="38" />
<option name="width" value="965" />
<option name="height" value="990" />
</component>
<component name="ProjectView">
... ... @@ -407,12 +416,13 @@
<workItem from="1550625938942" duration="1152000" />
<workItem from="1550648232798" duration="2342000" />
<workItem from="1550651732023" duration="965000" />
<workItem from="1550653402477" duration="482000" />
<workItem from="1550653402477" duration="697000" />
<workItem from="1550656239990" duration="832000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="128672000" />
<option name="totallyTimeSpent" value="129719000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -424,10 +434,10 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="363" y="197" width="1661" height="990" extended-state="0" />
<frame x="822" y="38" width="965" height="990" extended-state="0" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13924831" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2437972" />
<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" />
... ... @@ -528,17 +538,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/new.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3510">
<caret line="130" column="43" selection-start-line="130" selection-start-column="43" selection-end-line="130" selection-end-column="43" />
<folding>
<element signature="e#5844#6026#0" />
<element signature="e#6050#6305#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/gonggao.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="540">
... ... @@ -549,52 +548,63 @@
<entry file="file://$PROJECT_DIR$/images/lianjie.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/images/sdfsfesw@2x.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/images/xzACsa@2x.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/images/ZCxzas4@2x.png">
<entry file="file://$PROJECT_DIR$/images/bg_1.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/css/new_2.css">
<entry file="file://$PROJECT_DIR$/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="307">
<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="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>
<entry file="file://$PROJECT_DIR$/css/index.css">
<entry file="file://$PROJECT_DIR$/css/new_2.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 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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/images/bg2_2.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/images/dfgdf@2x.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/images/bg_1.png">
<entry file="file://$PROJECT_DIR$/images/sdfsfesw@2x.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/images/bg2_2.png">
<entry file="file://$PROJECT_DIR$/images/xzACsa@2x.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/images/ZCxzas4@2x.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="351">
<caret line="13" column="31" lean-forward="true" selection-start-line="13" selection-start-column="31" selection-end-line="13" selection-end-column="31" />
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/new.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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/new_2.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266">
<caret line="131" column="29" selection-start-line="131" selection-start-column="29" selection-end-line="131" selection-end-column="29" />
<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>
</provider>
</entry>
... ...
... ... @@ -108,7 +108,7 @@
</div>
<!--前往注册-->
<div class="apply_toRegister" onclick="btn_sub()">
前往注册
立即借钱
</div>
</div>
</div>
... ... @@ -133,7 +133,7 @@
if(!myreg.test(newname)){
popup("请输入正确的手机号")
}else {
popup("注册成功")
popup("注册成功 ")
}
}
... ...