webfront / shengbao · 提交

转到一个项目

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

update

内嵌 并排对比
正在显示 2 个修改的文件 包含 67 行增加 和 57 行删除
@@ -2,12 +2,8 @@ @@ -2,12 +2,8 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="1ae5f9a6-acdc-475d-863d-ce05e13f7b72" name="Default Changelist" comment=""> 4 <list default="true" id="1ae5f9a6-acdc-475d-863d-ce05e13f7b72" name="Default Changelist" comment="">
5 - <change afterPath="$PROJECT_DIR$/css/new_2.css" afterDir="false" />  
6 - <change afterPath="$PROJECT_DIR$/new_2.html" afterDir="false" />  
7 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
8 - <change beforePath="$PROJECT_DIR$/css/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/index.css" afterDir="false" />  
9 - <change beforePath="$PROJECT_DIR$/css/new.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/new.css" afterDir="false" />  
10 - <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" /> 6 + <change beforePath="$PROJECT_DIR$/new_2.html" beforeDir="false" afterPath="$PROJECT_DIR$/new_2.html" afterDir="false" />
11 </list> 7 </list>
12 <ignored path="$PROJECT_DIR$/.tmp/" /> 8 <ignored path="$PROJECT_DIR$/.tmp/" />
13 <ignored path="$PROJECT_DIR$/temp/" /> 9 <ignored path="$PROJECT_DIR$/temp/" />
@@ -99,38 +95,38 @@ @@ -99,38 +95,38 @@
99 <session id="-988677624"> 95 <session id="-988677624">
100 <usages-collector id="statistics.lifecycle.project"> 96 <usages-collector id="statistics.lifecycle.project">
101 <counts> 97 <counts>
102 - <entry key="project.closed" value="16" />  
103 - <entry key="project.open.time.0" value="14" /> 98 + <entry key="project.closed" value="17" />
  99 + <entry key="project.open.time.0" value="15" />
104 <entry key="project.open.time.1" value="1" /> 100 <entry key="project.open.time.1" value="1" />
105 <entry key="project.open.time.2" value="1" /> 101 <entry key="project.open.time.2" value="1" />
106 <entry key="project.open.time.26" value="1" /> 102 <entry key="project.open.time.26" value="1" />
107 - <entry key="project.opened" value="17" /> 103 + <entry key="project.opened" value="18" />
108 </counts> 104 </counts>
109 </usages-collector> 105 </usages-collector>
110 <usages-collector id="statistics.file.extensions.open"> 106 <usages-collector id="statistics.file.extensions.open">
111 <counts> 107 <counts>
112 <entry key="css" value="7" /> 108 <entry key="css" value="7" />
113 - <entry key="html" value="12" /> 109 + <entry key="html" value="13" />
114 <entry key="png" value="13" /> 110 <entry key="png" value="13" />
115 </counts> 111 </counts>
116 </usages-collector> 112 </usages-collector>
117 <usages-collector id="statistics.file.types.open"> 113 <usages-collector id="statistics.file.types.open">
118 <counts> 114 <counts>
119 <entry key="CSS" value="7" /> 115 <entry key="CSS" value="7" />
120 - <entry key="HTML" value="12" /> 116 + <entry key="HTML" value="13" />
121 <entry key="Image" value="13" /> 117 <entry key="Image" value="13" />
122 </counts> 118 </counts>
123 </usages-collector> 119 </usages-collector>
124 <usages-collector id="statistics.file.extensions.edit"> 120 <usages-collector id="statistics.file.extensions.edit">
125 <counts> 121 <counts>
126 <entry key="css" value="166" /> 122 <entry key="css" value="166" />
127 - <entry key="html" value="218" /> 123 + <entry key="html" value="223" />
128 </counts> 124 </counts>
129 </usages-collector> 125 </usages-collector>
130 <usages-collector id="statistics.file.types.edit"> 126 <usages-collector id="statistics.file.types.edit">
131 <counts> 127 <counts>
132 <entry key="CSS" value="166" /> 128 <entry key="CSS" value="166" />
133 - <entry key="HTML" value="218" /> 129 + <entry key="HTML" value="223" />
134 </counts> 130 </counts>
135 </usages-collector> 131 </usages-collector>
136 </session> 132 </session>
@@ -140,8 +136,8 @@ @@ -140,8 +136,8 @@
140 <file pinned="false" current-in-tab="false"> 136 <file pinned="false" current-in-tab="false">
141 <entry file="file://$PROJECT_DIR$/index.html"> 137 <entry file="file://$PROJECT_DIR$/index.html">
142 <provider selected="true" editor-type-id="text-editor"> 138 <provider selected="true" editor-type-id="text-editor">
143 - <state relative-caret-position="351">  
144 - <caret line="13" column="31" lean-forward="true" selection-start-line="13" selection-start-column="31" selection-end-line="13" selection-end-column="31" /> 139 + <state relative-caret-position="200">
  140 + <caret line="230" column="27" selection-start-line="230" selection-start-column="27" selection-end-line="230" selection-end-column="27" />
145 <folding> 141 <folding>
146 <element signature="e#8941#14339#0" /> 142 <element signature="e#8941#14339#0" />
147 </folding> 143 </folding>
@@ -158,11 +154,24 @@ @@ -158,11 +154,24 @@
158 </provider> 154 </provider>
159 </entry> 155 </entry>
160 </file> 156 </file>
  157 + <file pinned="false" current-in-tab="false">
  158 + <entry file="file://$PROJECT_DIR$/new.html">
  159 + <provider selected="true" editor-type-id="text-editor">
  160 + <state relative-caret-position="169">
  161 + <caret line="114" column="22" lean-forward="true" selection-start-line="114" selection-start-column="22" selection-end-line="114" selection-end-column="22" />
  162 + <folding>
  163 + <element signature="e#5844#6026#0" />
  164 + <element signature="e#6050#6305#0" />
  165 + </folding>
  166 + </state>
  167 + </provider>
  168 + </entry>
  169 + </file>
161 <file pinned="false" current-in-tab="true"> 170 <file pinned="false" current-in-tab="true">
162 <entry file="file://$PROJECT_DIR$/new_2.html"> 171 <entry file="file://$PROJECT_DIR$/new_2.html">
163 <provider selected="true" editor-type-id="text-editor"> 172 <provider selected="true" editor-type-id="text-editor">
164 - <state relative-caret-position="266">  
165 - <caret line="131" column="29" selection-start-line="131" selection-start-column="29" selection-end-line="131" selection-end-column="29" /> 173 + <state relative-caret-position="227">
  174 + <caret line="110" column="24" selection-start-line="110" selection-start-column="24" selection-end-line="110" selection-end-column="24" />
166 </state> 175 </state>
167 </provider> 176 </provider>
168 </entry> 177 </entry>
@@ -170,7 +179,7 @@ @@ -170,7 +179,7 @@
170 <file pinned="false" current-in-tab="false"> 179 <file pinned="false" current-in-tab="false">
171 <entry file="file://$PROJECT_DIR$/css/new_2.css"> 180 <entry file="file://$PROJECT_DIR$/css/new_2.css">
172 <provider selected="true" editor-type-id="text-editor"> 181 <provider selected="true" editor-type-id="text-editor">
173 - <state relative-caret-position="307"> 182 + <state relative-caret-position="2349">
174 <caret line="87" column="18" lean-forward="true" selection-start-line="87" selection-start-column="18" selection-end-line="87" selection-end-column="18" /> 183 <caret line="87" column="18" lean-forward="true" selection-start-line="87" selection-start-column="18" selection-end-line="87" selection-end-column="18" />
175 </state> 184 </state>
176 </provider> 185 </provider>
@@ -213,7 +222,6 @@ @@ -213,7 +222,6 @@
213 </component> 222 </component>
214 <component name="FindInProjectRecents"> 223 <component name="FindInProjectRecents">
215 <findStrings> 224 <findStrings>
216 - <find>apply_name_input</find>  
217 <find>apply_toRegister</find> 225 <find>apply_toRegister</find>
218 <find>main</find> 226 <find>main</find>
219 <find>container</find> 227 <find>container</find>
@@ -243,6 +251,7 @@ @@ -243,6 +251,7 @@
243 <find>limit</find> 251 <find>limit</find>
244 <find>m_top</find> 252 <find>m_top</find>
245 <find>apply_box</find> 253 <find>apply_box</find>
  254 + <find>Regis</find>
246 </findStrings> 255 </findStrings>
247 </component> 256 </component>
248 <component name="Git.Settings"> 257 <component name="Git.Settings">
@@ -288,9 +297,9 @@ @@ -288,9 +297,9 @@
288 <sorting>DEFINITION_ORDER</sorting> 297 <sorting>DEFINITION_ORDER</sorting>
289 </component> 298 </component>
290 <component name="ProjectFrameBounds"> 299 <component name="ProjectFrameBounds">
291 - <option name="x" value="363" />  
292 - <option name="y" value="197" />  
293 - <option name="width" value="1661" /> 300 + <option name="x" value="822" />
  301 + <option name="y" value="38" />
  302 + <option name="width" value="965" />
294 <option name="height" value="990" /> 303 <option name="height" value="990" />
295 </component> 304 </component>
296 <component name="ProjectView"> 305 <component name="ProjectView">
@@ -407,12 +416,13 @@ @@ -407,12 +416,13 @@
407 <workItem from="1550625938942" duration="1152000" /> 416 <workItem from="1550625938942" duration="1152000" />
408 <workItem from="1550648232798" duration="2342000" /> 417 <workItem from="1550648232798" duration="2342000" />
409 <workItem from="1550651732023" duration="965000" /> 418 <workItem from="1550651732023" duration="965000" />
410 - <workItem from="1550653402477" duration="482000" /> 419 + <workItem from="1550653402477" duration="697000" />
  420 + <workItem from="1550656239990" duration="832000" />
411 </task> 421 </task>
412 <servers /> 422 <servers />
413 </component> 423 </component>
414 <component name="TimeTrackingManager"> 424 <component name="TimeTrackingManager">
415 - <option name="totallyTimeSpent" value="128672000" /> 425 + <option name="totallyTimeSpent" value="129719000" />
416 </component> 426 </component>
417 <component name="TodoView"> 427 <component name="TodoView">
418 <todo-panel id="selected-file"> 428 <todo-panel id="selected-file">
@@ -424,10 +434,10 @@ @@ -424,10 +434,10 @@
424 </todo-panel> 434 </todo-panel>
425 </component> 435 </component>
426 <component name="ToolWindowManager"> 436 <component name="ToolWindowManager">
427 - <frame x="363" y="197" width="1661" height="990" extended-state="0" /> 437 + <frame x="822" y="38" width="965" height="990" extended-state="0" />
428 <editor active="true" /> 438 <editor active="true" />
429 <layout> 439 <layout>
430 - <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13924831" /> 440 + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2437972" />
431 <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> 441 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
432 <window_info id="Favorites" order="2" side_tool="true" /> 442 <window_info id="Favorites" order="2" side_tool="true" />
433 <window_info anchor="bottom" id="Message" order="0" /> 443 <window_info anchor="bottom" id="Message" order="0" />
@@ -528,17 +538,6 @@ @@ -528,17 +538,6 @@
528 </state> 538 </state>
529 </provider> 539 </provider>
530 </entry> 540 </entry>
531 - <entry file="file://$PROJECT_DIR$/new.html">  
532 - <provider selected="true" editor-type-id="text-editor">  
533 - <state relative-caret-position="3510">  
534 - <caret line="130" column="43" selection-start-line="130" selection-start-column="43" selection-end-line="130" selection-end-column="43" />  
535 - <folding>  
536 - <element signature="e#5844#6026#0" />  
537 - <element signature="e#6050#6305#0" />  
538 - </folding>  
539 - </state>  
540 - </provider>  
541 - </entry>  
542 <entry file="file://$PROJECT_DIR$/css/gonggao.css"> 541 <entry file="file://$PROJECT_DIR$/css/gonggao.css">
543 <provider selected="true" editor-type-id="text-editor"> 542 <provider selected="true" editor-type-id="text-editor">
544 <state relative-caret-position="540"> 543 <state relative-caret-position="540">
@@ -549,52 +548,63 @@ @@ -549,52 +548,63 @@
549 <entry file="file://$PROJECT_DIR$/images/lianjie.png"> 548 <entry file="file://$PROJECT_DIR$/images/lianjie.png">
550 <provider selected="true" editor-type-id="images" /> 549 <provider selected="true" editor-type-id="images" />
551 </entry> 550 </entry>
552 - <entry file="file://$PROJECT_DIR$/images/sdfsfesw@2x.png">  
553 - <provider selected="true" editor-type-id="images" />  
554 - </entry>  
555 - <entry file="file://$PROJECT_DIR$/images/xzACsa@2x.png">  
556 - <provider selected="true" editor-type-id="images" />  
557 - </entry>  
558 - <entry file="file://$PROJECT_DIR$/images/ZCxzas4@2x.png"> 551 + <entry file="file://$PROJECT_DIR$/images/bg_1.png">
559 <provider selected="true" editor-type-id="images" /> 552 <provider selected="true" editor-type-id="images" />
560 </entry> 553 </entry>
561 - <entry file="file://$PROJECT_DIR$/css/new_2.css"> 554 + <entry file="file://$PROJECT_DIR$/css/index.css">
562 <provider selected="true" editor-type-id="text-editor"> 555 <provider selected="true" editor-type-id="text-editor">
563 - <state relative-caret-position="307">  
564 - <caret line="87" column="18" lean-forward="true" selection-start-line="87" selection-start-column="18" selection-end-line="87" selection-end-column="18" /> 556 + <state relative-caret-position="54">
  557 + <caret line="2" column="4" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="39" />
565 </state> 558 </state>
566 </provider> 559 </provider>
567 </entry> 560 </entry>
568 - <entry file="file://$PROJECT_DIR$/css/index.css"> 561 + <entry file="file://$PROJECT_DIR$/css/new_2.css">
569 <provider selected="true" editor-type-id="text-editor"> 562 <provider selected="true" editor-type-id="text-editor">
570 - <state relative-caret-position="54">  
571 - <caret line="2" column="4" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="39" /> 563 + <state relative-caret-position="2349">
  564 + <caret line="87" column="18" lean-forward="true" selection-start-line="87" selection-start-column="18" selection-end-line="87" selection-end-column="18" />
572 </state> 565 </state>
573 </provider> 566 </provider>
574 </entry> 567 </entry>
  568 + <entry file="file://$PROJECT_DIR$/images/bg2_2.png">
  569 + <provider selected="true" editor-type-id="images" />
  570 + </entry>
575 <entry file="file://$PROJECT_DIR$/images/dfgdf@2x.png"> 571 <entry file="file://$PROJECT_DIR$/images/dfgdf@2x.png">
576 <provider selected="true" editor-type-id="images" /> 572 <provider selected="true" editor-type-id="images" />
577 </entry> 573 </entry>
578 - <entry file="file://$PROJECT_DIR$/images/bg_1.png"> 574 + <entry file="file://$PROJECT_DIR$/images/sdfsfesw@2x.png">
579 <provider selected="true" editor-type-id="images" /> 575 <provider selected="true" editor-type-id="images" />
580 </entry> 576 </entry>
581 - <entry file="file://$PROJECT_DIR$/images/bg2_2.png"> 577 + <entry file="file://$PROJECT_DIR$/images/xzACsa@2x.png">
  578 + <provider selected="true" editor-type-id="images" />
  579 + </entry>
  580 + <entry file="file://$PROJECT_DIR$/images/ZCxzas4@2x.png">
582 <provider selected="true" editor-type-id="images" /> 581 <provider selected="true" editor-type-id="images" />
583 </entry> 582 </entry>
584 <entry file="file://$PROJECT_DIR$/index.html"> 583 <entry file="file://$PROJECT_DIR$/index.html">
585 <provider selected="true" editor-type-id="text-editor"> 584 <provider selected="true" editor-type-id="text-editor">
586 - <state relative-caret-position="351">  
587 - <caret line="13" column="31" lean-forward="true" selection-start-line="13" selection-start-column="31" selection-end-line="13" selection-end-column="31" /> 585 + <state relative-caret-position="200">
  586 + <caret line="230" column="27" selection-start-line="230" selection-start-column="27" selection-end-line="230" selection-end-column="27" />
588 <folding> 587 <folding>
589 <element signature="e#8941#14339#0" /> 588 <element signature="e#8941#14339#0" />
590 </folding> 589 </folding>
591 </state> 590 </state>
592 </provider> 591 </provider>
593 </entry> 592 </entry>
  593 + <entry file="file://$PROJECT_DIR$/new.html">
  594 + <provider selected="true" editor-type-id="text-editor">
  595 + <state relative-caret-position="169">
  596 + <caret line="114" column="22" lean-forward="true" selection-start-line="114" selection-start-column="22" selection-end-line="114" selection-end-column="22" />
  597 + <folding>
  598 + <element signature="e#5844#6026#0" />
  599 + <element signature="e#6050#6305#0" />
  600 + </folding>
  601 + </state>
  602 + </provider>
  603 + </entry>
594 <entry file="file://$PROJECT_DIR$/new_2.html"> 604 <entry file="file://$PROJECT_DIR$/new_2.html">
595 <provider selected="true" editor-type-id="text-editor"> 605 <provider selected="true" editor-type-id="text-editor">
596 - <state relative-caret-position="266">  
597 - <caret line="131" column="29" selection-start-line="131" selection-start-column="29" selection-end-line="131" selection-end-column="29" /> 606 + <state relative-caret-position="227">
  607 + <caret line="110" column="24" selection-start-line="110" selection-start-column="24" selection-end-line="110" selection-end-column="24" />
598 </state> 608 </state>
599 </provider> 609 </provider>
600 </entry> 610 </entry>
@@ -108,7 +108,7 @@ @@ -108,7 +108,7 @@
108 </div> 108 </div>
109 <!--前往注册--> 109 <!--前往注册-->
110 <div class="apply_toRegister" onclick="btn_sub()"> 110 <div class="apply_toRegister" onclick="btn_sub()">
111 - 前往注册 111 + 立即借钱
112 </div> 112 </div>
113 </div> 113 </div>
114 </div> 114 </div>
@@ -133,7 +133,7 @@ @@ -133,7 +133,7 @@
133 if(!myreg.test(newname)){ 133 if(!myreg.test(newname)){
134 popup("请输入正确的手机号") 134 popup("请输入正确的手机号")
135 }else { 135 }else {
136 - popup("注册成功") 136 + popup("注册成功 ")
137 } 137 }
138 138
139 } 139 }