webfront / shengbao · 提交

转到一个项目

作者 乔爽
提交 bd91b5ea2cfe41f1256b51edbd918963e4f3771d 1 个父辈 94110838

update

内嵌 并排对比
正在显示 5 个修改的文件 包含 136 行增加 和 97 行删除
@@ -3,12 +3,10 @@ @@ -3,12 +3,10 @@
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 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" />
6 - <change beforePath="$PROJECT_DIR$/css/dkxq.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/last.css" afterDir="false" />  
7 - <change beforePath="$PROJECT_DIR$/css/xyjc.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/first.css" afterDir="false" />  
8 - <change beforePath="$PROJECT_DIR$/html/dksm.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/dksm.html" afterDir="false" />  
9 - <change beforePath="$PROJECT_DIR$/html/dkxq.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/last.html" afterDir="false" />  
10 - <change beforePath="$PROJECT_DIR$/html/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/index.html" afterDir="false" />  
11 - <change beforePath="$PROJECT_DIR$/html/xyjc.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/first.html" afterDir="false" /> 6 + <change beforePath="$PROJECT_DIR$/css/first.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/first.css" afterDir="false" />
  7 + <change beforePath="$PROJECT_DIR$/css/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/index.css" afterDir="false" />
  8 + <change beforePath="$PROJECT_DIR$/css/last.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/last.css" afterDir="false" />
  9 + <change beforePath="$PROJECT_DIR$/html/last.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/last.html" afterDir="false" />
12 </list> 10 </list>
13 <ignored path="$PROJECT_DIR$/.tmp/" /> 11 <ignored path="$PROJECT_DIR$/.tmp/" />
14 <ignored path="$PROJECT_DIR$/temp/" /> 12 <ignored path="$PROJECT_DIR$/temp/" />
@@ -57,34 +55,35 @@ @@ -57,34 +55,35 @@
57 <session id="-407721514"> 55 <session id="-407721514">
58 <usages-collector id="statistics.lifecycle.project"> 56 <usages-collector id="statistics.lifecycle.project">
59 <counts> 57 <counts>
60 - <entry key="project.closed" value="2" /> 58 + <entry key="project.closed" value="3" />
61 <entry key="project.open.time.0" value="1" /> 59 <entry key="project.open.time.0" value="1" />
62 <entry key="project.open.time.14" value="1" /> 60 <entry key="project.open.time.14" value="1" />
63 <entry key="project.open.time.18" value="1" /> 61 <entry key="project.open.time.18" value="1" />
64 - <entry key="project.opened" value="3" /> 62 + <entry key="project.open.time.31" value="1" />
  63 + <entry key="project.opened" value="4" />
65 </counts> 64 </counts>
66 </usages-collector> 65 </usages-collector>
67 <usages-collector id="statistics.file.extensions.edit"> 66 <usages-collector id="statistics.file.extensions.edit">
68 <counts> 67 <counts>
69 - <entry key="css" value="3215" />  
70 - <entry key="html" value="1853" /> 68 + <entry key="css" value="3402" />
  69 + <entry key="html" value="2063" />
71 </counts> 70 </counts>
72 </usages-collector> 71 </usages-collector>
73 <usages-collector id="statistics.file.types.edit"> 72 <usages-collector id="statistics.file.types.edit">
74 <counts> 73 <counts>
75 - <entry key="CSS" value="3215" />  
76 - <entry key="HTML" value="1853" /> 74 + <entry key="CSS" value="3402" />
  75 + <entry key="HTML" value="2063" />
77 </counts> 76 </counts>
78 </usages-collector> 77 </usages-collector>
79 <usages-collector id="statistics.file.extensions.open"> 78 <usages-collector id="statistics.file.extensions.open">
80 <counts> 79 <counts>
81 - <entry key="css" value="1" /> 80 + <entry key="css" value="2" />
82 <entry key="js" value="1" /> 81 <entry key="js" value="1" />
83 </counts> 82 </counts>
84 </usages-collector> 83 </usages-collector>
85 <usages-collector id="statistics.file.types.open"> 84 <usages-collector id="statistics.file.types.open">
86 <counts> 85 <counts>
87 - <entry key="CSS" value="1" /> 86 + <entry key="CSS" value="2" />
88 <entry key="JavaScript" value="1" /> 87 <entry key="JavaScript" value="1" />
89 </counts> 88 </counts>
90 </usages-collector> 89 </usages-collector>
@@ -95,11 +94,17 @@ @@ -95,11 +94,17 @@
95 <file pinned="false" current-in-tab="false"> 94 <file pinned="false" current-in-tab="false">
96 <entry file="file://$PROJECT_DIR$/html/first.html"> 95 <entry file="file://$PROJECT_DIR$/html/first.html">
97 <provider selected="true" editor-type-id="text-editor"> 96 <provider selected="true" editor-type-id="text-editor">
98 - <state relative-caret-position="81">  
99 - <caret line="3" column="26" lean-forward="true" selection-start-line="3" selection-start-column="26" selection-end-line="3" selection-end-column="26" />  
100 - <folding>  
101 - <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
102 - </folding> 97 + <state relative-caret-position="309">
  98 + <caret line="12" column="6" lean-forward="true" selection-start-line="12" selection-start-column="6" selection-end-line="12" selection-end-column="6" />
  99 + </state>
  100 + </provider>
  101 + </entry>
  102 + </file>
  103 + <file pinned="false" current-in-tab="false">
  104 + <entry file="file://$PROJECT_DIR$/css/first.css">
  105 + <provider selected="true" editor-type-id="text-editor">
  106 + <state relative-caret-position="1107">
  107 + <caret line="41" column="18" selection-start-line="41" selection-start-column="18" selection-end-line="41" selection-end-column="18" />
103 </state> 108 </state>
104 </provider> 109 </provider>
105 </entry> 110 </entry>
@@ -116,23 +121,23 @@ @@ -116,23 +121,23 @@
116 <file pinned="false" current-in-tab="false"> 121 <file pinned="false" current-in-tab="false">
117 <entry file="file://$PROJECT_DIR$/html/dksm.html"> 122 <entry file="file://$PROJECT_DIR$/html/dksm.html">
118 <provider selected="true" editor-type-id="text-editor"> 123 <provider selected="true" editor-type-id="text-editor">
119 - <state relative-caret-position="621"> 124 + <state relative-caret-position="515">
120 <caret line="23" column="49" lean-forward="true" selection-start-line="23" selection-start-column="49" selection-end-line="23" selection-end-column="49" /> 125 <caret line="23" column="49" lean-forward="true" selection-start-line="23" selection-start-column="49" selection-end-line="23" selection-end-column="49" />
121 </state> 126 </state>
122 </provider> 127 </provider>
123 </entry> 128 </entry>
124 </file> 129 </file>
125 - <file pinned="false" current-in-tab="true"> 130 + <file pinned="false" current-in-tab="false">
126 <entry file="file://$PROJECT_DIR$/html/index.html"> 131 <entry file="file://$PROJECT_DIR$/html/index.html">
127 <provider selected="true" editor-type-id="text-editor"> 132 <provider selected="true" editor-type-id="text-editor">
128 - <state relative-caret-position="164">  
129 - <caret line="210" column="36" selection-start-line="210" selection-start-column="36" selection-end-line="210" selection-end-column="36" /> 133 + <state relative-caret-position="162">
  134 + <caret line="6" column="41" selection-start-line="6" selection-start-column="41" selection-end-line="6" selection-end-column="41" />
130 <folding> 135 <folding>
131 - <element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
132 <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 136 <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
133 <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 137 <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
134 <element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 138 <element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
135 <element signature="n#div#1;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 139 <element signature="n#div#1;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  140 + <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
136 <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" /> 141 <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" />
137 <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" /> 142 <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" />
138 <element signature="n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 143 <element signature="n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
@@ -153,20 +158,24 @@ @@ -153,20 +158,24 @@
153 <file pinned="false" current-in-tab="false"> 158 <file pinned="false" current-in-tab="false">
154 <entry file="file://$PROJECT_DIR$/css/index.css"> 159 <entry file="file://$PROJECT_DIR$/css/index.css">
155 <provider selected="true" editor-type-id="text-editor"> 160 <provider selected="true" editor-type-id="text-editor">
156 - <state relative-caret-position="3807">  
157 - <caret line="141" column="42" lean-forward="true" selection-start-line="141" selection-start-column="42" selection-end-line="141" selection-end-column="42" /> 161 + <state relative-caret-position="6318">
  162 + <caret line="234" column="23" lean-forward="true" selection-start-line="234" selection-start-column="23" selection-end-line="234" selection-end-column="23" />
158 </state> 163 </state>
159 </provider> 164 </provider>
160 </entry> 165 </entry>
161 </file> 166 </file>
162 - <file pinned="false" current-in-tab="false"> 167 + <file pinned="false" current-in-tab="true">
163 <entry file="file://$PROJECT_DIR$/html/last.html"> 168 <entry file="file://$PROJECT_DIR$/html/last.html">
164 <provider selected="true" editor-type-id="text-editor"> 169 <provider selected="true" editor-type-id="text-editor">
165 <state relative-caret-position="189"> 170 <state relative-caret-position="189">
166 - <caret line="64" column="22" lean-forward="true" selection-start-line="64" selection-start-column="22" selection-end-line="64" selection-end-column="22" /> 171 + <caret line="7" column="39" selection-start-line="7" selection-start-column="39" selection-end-line="7" selection-end-column="39" />
167 <folding> 172 <folding>
168 - <element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
169 - <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 173 + <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  174 + <element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  175 + <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" />
  176 + <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" />
  177 + <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" />
  178 + <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" />
170 <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 179 <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
171 <element signature="n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 180 <element signature="n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
172 <element signature="n#div#0;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 181 <element signature="n#div#0;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
@@ -187,8 +196,8 @@ @@ -187,8 +196,8 @@
187 <file pinned="false" current-in-tab="false"> 196 <file pinned="false" current-in-tab="false">
188 <entry file="file://$PROJECT_DIR$/css/last.css"> 197 <entry file="file://$PROJECT_DIR$/css/last.css">
189 <provider selected="true" editor-type-id="text-editor"> 198 <provider selected="true" editor-type-id="text-editor">
190 - <state relative-caret-position="2187">  
191 - <caret line="81" column="4" selection-start-line="81" selection-start-column="4" selection-end-line="83" selection-end-column="21" /> 199 + <state relative-caret-position="125">
  200 + <caret line="148" column="18" lean-forward="true" selection-start-line="148" selection-start-column="18" selection-end-line="148" selection-end-column="18" />
192 </state> 201 </state>
193 </provider> 202 </provider>
194 </entry> 203 </entry>
@@ -230,6 +239,13 @@ @@ -230,6 +239,13 @@
230 <find>limit_box_top</find> 239 <find>limit_box_top</find>
231 <find>bottom_box</find> 240 <find>bottom_box</find>
232 <find>mid_</find> 241 <find>mid_</find>
  242 + <find>apply_name_in</find>
  243 + <find>input</find>
  244 + <find>text_bottom</find>
  245 + <find>top_rate</find>
  246 + <find>top_repay</find>
  247 + <find>accr</find>
  248 + <find>apply_name_bg</find>
233 </findStrings> 249 </findStrings>
234 </component> 250 </component>
235 <component name="Git.Settings"> 251 <component name="Git.Settings">
@@ -239,16 +255,17 @@ @@ -239,16 +255,17 @@
239 <option name="CHANGED_PATHS"> 255 <option name="CHANGED_PATHS">
240 <list> 256 <list>
241 <option value="$PROJECT_DIR$/css/dksm.css" /> 257 <option value="$PROJECT_DIR$/css/dksm.css" />
242 - <option value="$PROJECT_DIR$/css/index.css" />  
243 <option value="$PROJECT_DIR$/html/dksm.html" /> 258 <option value="$PROJECT_DIR$/html/dksm.html" />
244 <option value="$PROJECT_DIR$/html/dkxq.html" /> 259 <option value="$PROJECT_DIR$/html/dkxq.html" />
245 <option value="$PROJECT_DIR$/css/dkxq.css" /> 260 <option value="$PROJECT_DIR$/css/dkxq.css" />
246 <option value="$PROJECT_DIR$/css/xyjc.css" /> 261 <option value="$PROJECT_DIR$/css/xyjc.css" />
247 <option value="$PROJECT_DIR$/html/xyjc.html" /> 262 <option value="$PROJECT_DIR$/html/xyjc.html" />
  263 + <option value="$PROJECT_DIR$/html/index.html" />
248 <option value="$PROJECT_DIR$/css/first.css" /> 264 <option value="$PROJECT_DIR$/css/first.css" />
249 <option value="$PROJECT_DIR$/html/first.html" /> 265 <option value="$PROJECT_DIR$/html/first.html" />
  266 + <option value="$PROJECT_DIR$/css/index.css" />
  267 + <option value="$PROJECT_DIR$/css/last.css" />
250 <option value="$PROJECT_DIR$/html/last.html" /> 268 <option value="$PROJECT_DIR$/html/last.html" />
251 - <option value="$PROJECT_DIR$/html/index.html" />  
252 </list> 269 </list>
253 </option> 270 </option>
254 </component> 271 </component>
@@ -258,11 +275,11 @@ @@ -258,11 +275,11 @@
258 <detection-done>true</detection-done> 275 <detection-done>true</detection-done>
259 <sorting>DEFINITION_ORDER</sorting> 276 <sorting>DEFINITION_ORDER</sorting>
260 </component> 277 </component>
261 - <component name="ProjectFrameBounds" extendedState="1">  
262 - <option name="x" value="235" />  
263 - <option name="y" value="85" /> 278 + <component name="ProjectFrameBounds">
  279 + <option name="x" value="497" />
  280 + <option name="y" value="62" />
264 <option name="width" value="1354" /> 281 <option name="width" value="1354" />
265 - <option name="height" value="878" /> 282 + <option name="height" value="999" />
266 </component> 283 </component>
267 <component name="ProjectView"> 284 <component name="ProjectView">
268 <navigator proportions="" version="1"> 285 <navigator proportions="" version="1">
@@ -296,7 +313,7 @@ @@ -296,7 +313,7 @@
296 <component name="PropertiesComponent"> 313 <component name="PropertiesComponent">
297 <property name="DefaultHtmlFileTemplate" value="HTML File" /> 314 <property name="DefaultHtmlFileTemplate" value="HTML File" />
298 <property name="WebServerToolWindowFactoryState" value="false" /> 315 <property name="WebServerToolWindowFactoryState" value="false" />
299 - <property name="last_opened_file_path" value="$PROJECT_DIR$/../../企业微信/Wechat_project_1" /> 316 + <property name="last_opened_file_path" value="$PROJECT_DIR$/../../可耐美手机端/clime" />
300 <property name="list.type.of.created.stylesheet" value="CSS" /> 317 <property name="list.type.of.created.stylesheet" value="CSS" />
301 <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> 318 <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
302 <property name="nodejs_npm_path_reset_for_default_project" value="true" /> 319 <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -333,12 +350,13 @@ @@ -333,12 +350,13 @@
333 <workItem from="1547702489388" duration="15192000" /> 350 <workItem from="1547702489388" duration="15192000" />
334 <workItem from="1547718617124" duration="4272000" /> 351 <workItem from="1547718617124" duration="4272000" />
335 <workItem from="1547771777103" duration="22455000" /> 352 <workItem from="1547771777103" duration="22455000" />
336 - <workItem from="1547799045567" duration="191000" /> 353 + <workItem from="1547799045567" duration="6022000" />
  354 + <workItem from="1547857140175" duration="1165000" />
337 </task> 355 </task>
338 <servers /> 356 <servers />
339 </component> 357 </component>
340 <component name="TimeTrackingManager"> 358 <component name="TimeTrackingManager">
341 - <option name="totallyTimeSpent" value="42110000" /> 359 + <option name="totallyTimeSpent" value="49106000" />
342 </component> 360 </component>
343 <component name="TodoView"> 361 <component name="TodoView">
344 <todo-panel id="selected-file"> 362 <todo-panel id="selected-file">
@@ -350,7 +368,7 @@ @@ -350,7 +368,7 @@
350 </todo-panel> 368 </todo-panel>
351 </component> 369 </component>
352 <component name="ToolWindowManager"> 370 <component name="ToolWindowManager">
353 - <frame x="235" y="85" width="1354" height="878" extended-state="0" /> 371 + <frame x="497" y="62" width="1354" height="999" extended-state="0" />
354 <editor active="true" /> 372 <editor active="true" />
355 <layout> 373 <layout>
356 <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1618541" /> 374 <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1618541" />
@@ -365,7 +383,7 @@ @@ -365,7 +383,7 @@
365 <window_info anchor="bottom" id="TODO" order="6" weight="0.32974428" /> 383 <window_info anchor="bottom" id="TODO" order="6" weight="0.32974428" />
366 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> 384 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
367 <window_info anchor="bottom" id="Version Control" order="8" /> 385 <window_info anchor="bottom" id="Version Control" order="8" />
368 - <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.32974428" /> 386 + <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.2835648" />
369 <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" /> 387 <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
370 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> 388 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
371 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> 389 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -388,8 +406,8 @@ @@ -388,8 +406,8 @@
388 </entry> 406 </entry>
389 <entry file="file://$PROJECT_DIR$/css/first.css"> 407 <entry file="file://$PROJECT_DIR$/css/first.css">
390 <provider selected="true" editor-type-id="text-editor"> 408 <provider selected="true" editor-type-id="text-editor">
391 - <state relative-caret-position="1377">  
392 - <caret line="51" column="28" selection-start-line="51" selection-start-column="28" selection-end-line="51" selection-end-column="28" /> 409 + <state relative-caret-position="1107">
  410 + <caret line="41" column="18" selection-start-line="41" selection-start-column="18" selection-end-line="41" selection-end-column="18" />
393 </state> 411 </state>
394 </provider> 412 </provider>
395 </entry> 413 </entry>
@@ -400,74 +418,36 @@ @@ -400,74 +418,36 @@
400 </state> 418 </state>
401 </provider> 419 </provider>
402 </entry> 420 </entry>
403 - <entry file="file://$PROJECT_DIR$/html/dksm.html">  
404 - <provider selected="true" editor-type-id="text-editor">  
405 - <state relative-caret-position="621">  
406 - <caret line="23" column="49" lean-forward="true" selection-start-line="23" selection-start-column="49" selection-end-line="23" selection-end-column="49" />  
407 - </state>  
408 - </provider>  
409 - </entry>  
410 <entry file="file://$PROJECT_DIR$/css/index.css"> 421 <entry file="file://$PROJECT_DIR$/css/index.css">
411 <provider selected="true" editor-type-id="text-editor"> 422 <provider selected="true" editor-type-id="text-editor">
412 - <state relative-caret-position="3807">  
413 - <caret line="141" column="42" lean-forward="true" selection-start-line="141" selection-start-column="42" selection-end-line="141" selection-end-column="42" /> 423 + <state relative-caret-position="6318">
  424 + <caret line="234" column="23" lean-forward="true" selection-start-line="234" selection-start-column="23" selection-end-line="234" selection-end-column="23" />
414 </state> 425 </state>
415 </provider> 426 </provider>
416 </entry> 427 </entry>
417 <entry file="file://$PROJECT_DIR$/js/jquery.combo.select.js"> 428 <entry file="file://$PROJECT_DIR$/js/jquery.combo.select.js">
418 <provider selected="true" editor-type-id="text-editor" /> 429 <provider selected="true" editor-type-id="text-editor" />
419 </entry> 430 </entry>
420 - <entry file="file://$PROJECT_DIR$/css/last.css">  
421 - <provider selected="true" editor-type-id="text-editor">  
422 - <state relative-caret-position="2187">  
423 - <caret line="81" column="4" selection-start-line="81" selection-start-column="4" selection-end-line="83" selection-end-column="21" />  
424 - </state>  
425 - </provider>  
426 - </entry>  
427 <entry file="file://$PROJECT_DIR$/js/base.js"> 431 <entry file="file://$PROJECT_DIR$/js/base.js">
428 <provider selected="true" editor-type-id="text-editor" /> 432 <provider selected="true" editor-type-id="text-editor" />
429 </entry> 433 </entry>
430 - <entry file="file://$PROJECT_DIR$/css/first.css">  
431 - <provider selected="true" editor-type-id="text-editor" />  
432 - </entry>  
433 - <entry file="file://$PROJECT_DIR$/html/first.html">  
434 - <provider selected="true" editor-type-id="text-editor">  
435 - <state relative-caret-position="81">  
436 - <caret line="3" column="26" lean-forward="true" selection-start-line="3" selection-start-column="26" selection-end-line="3" selection-end-column="26" />  
437 - <folding>  
438 - <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
439 - </folding>  
440 - </state>  
441 - </provider>  
442 - </entry>  
443 - <entry file="file://$PROJECT_DIR$/html/last.html"> 434 + <entry file="file://$PROJECT_DIR$/css/last.css">
444 <provider selected="true" editor-type-id="text-editor"> 435 <provider selected="true" editor-type-id="text-editor">
445 - <state relative-caret-position="189">  
446 - <caret line="64" column="22" lean-forward="true" selection-start-line="64" selection-start-column="22" selection-end-line="64" selection-end-column="22" />  
447 - <folding>  
448 - <element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
449 - <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
450 - <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
451 - <element signature="n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
452 - <element signature="n#div#0;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
453 - <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" />  
454 - <element signature="n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
455 - <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" />  
456 - <element signature="n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
457 - </folding> 436 + <state relative-caret-position="125">
  437 + <caret line="148" column="18" lean-forward="true" selection-start-line="148" selection-start-column="18" selection-end-line="148" selection-end-column="18" />
458 </state> 438 </state>
459 </provider> 439 </provider>
460 </entry> 440 </entry>
461 <entry file="file://$PROJECT_DIR$/html/index.html"> 441 <entry file="file://$PROJECT_DIR$/html/index.html">
462 <provider selected="true" editor-type-id="text-editor"> 442 <provider selected="true" editor-type-id="text-editor">
463 - <state relative-caret-position="164">  
464 - <caret line="210" column="36" selection-start-line="210" selection-start-column="36" selection-end-line="210" selection-end-column="36" /> 443 + <state relative-caret-position="162">
  444 + <caret line="6" column="41" selection-start-line="6" selection-start-column="41" selection-end-line="6" selection-end-column="41" />
465 <folding> 445 <folding>
466 - <element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
467 <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 446 <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
468 <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 447 <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
469 <element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 448 <element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
470 <element signature="n#div#1;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 449 <element signature="n#div#1;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  450 + <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
471 <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" /> 451 <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" />
472 <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" /> 452 <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" />
473 <element signature="n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 453 <element signature="n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
@@ -484,5 +464,41 @@ @@ -484,5 +464,41 @@
484 </state> 464 </state>
485 </provider> 465 </provider>
486 </entry> 466 </entry>
  467 + <entry file="file://$PROJECT_DIR$/html/first.html">
  468 + <provider selected="true" editor-type-id="text-editor">
  469 + <state relative-caret-position="309">
  470 + <caret line="12" column="6" lean-forward="true" selection-start-line="12" selection-start-column="6" selection-end-line="12" selection-end-column="6" />
  471 + </state>
  472 + </provider>
  473 + </entry>
  474 + <entry file="file://$PROJECT_DIR$/html/dksm.html">
  475 + <provider selected="true" editor-type-id="text-editor">
  476 + <state relative-caret-position="515">
  477 + <caret line="23" column="49" lean-forward="true" selection-start-line="23" selection-start-column="49" selection-end-line="23" selection-end-column="49" />
  478 + </state>
  479 + </provider>
  480 + </entry>
  481 + <entry file="file://$PROJECT_DIR$/html/last.html">
  482 + <provider selected="true" editor-type-id="text-editor">
  483 + <state relative-caret-position="189">
  484 + <caret line="7" column="39" selection-start-line="7" selection-start-column="39" selection-end-line="7" selection-end-column="39" />
  485 + <folding>
  486 + <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  487 + <element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  488 + <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" />
  489 + <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" />
  490 + <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" />
  491 + <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" />
  492 + <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  493 + <element signature="n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  494 + <element signature="n#div#0;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  495 + <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" />
  496 + <element signature="n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  497 + <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" />
  498 + <element signature="n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  499 + </folding>
  500 + </state>
  501 + </provider>
  502 + </entry>
487 </component> 503 </component>
488 </project> 504 </project>
@@ -38,12 +38,13 @@ @@ -38,12 +38,13 @@
38 .bottom{ 38 .bottom{
39 margin-top: 0.22rem; 39 margin-top: 0.22rem;
40 width: 6.97rem; 40 width: 6.97rem;
41 - height: 5.4rem; 41 + /*height: 5.4rem;*/
42 display: flex; 42 display: flex;
43 43
44 background: rgba(255,255,255,1); 44 background: rgba(255,255,255,1);
45 box-shadow: 0 0.07rem 0.1rem 0.01rem rgba(0,0,0,0.08); 45 box-shadow: 0 0.07rem 0.1rem 0.01rem rgba(0,0,0,0.08);
46 border-radius: 0.16rem; 46 border-radius: 0.16rem;
  47 + padding-bottom: 0.5rem;
47 } 48 }
48 .bottom_box{ 49 .bottom_box{
49 width: 6.2rem; 50 width: 6.2rem;
@@ -236,7 +236,7 @@ @@ -236,7 +236,7 @@
236 height: 0.36rem; 236 height: 0.36rem;
237 line-height: 0.36rem; 237 line-height: 0.36rem;
238 border-radius: 0.04rem; 238 border-radius: 0.04rem;
239 - font-size: 0.2rem; 239 + font-size: 0.22rem;
240 background-color: #DCBE75; 240 background-color: #DCBE75;
241 text-align: center; 241 text-align: center;
242 color: #000000; 242 color: #000000;
@@ -30,9 +30,22 @@ @@ -30,9 +30,22 @@
30 } 30 }
31 .top_rate{ 31 .top_rate{
32 margin: 0.22rem 0.42rem 0.14rem 0.42rem; 32 margin: 0.22rem 0.42rem 0.14rem 0.42rem;
  33 +
33 } 34 }
34 .top_repay{ 35 .top_repay{
35 margin: 0 0.42rem 0.19rem 0.42rem; 36 margin: 0 0.42rem 0.19rem 0.42rem;
  37 + display: flex;
  38 + justify-content: space-between;
  39 +}
  40 +/*月还款*/
  41 +.top_repay_month{
  42 + /*border: 1px solid red;*/
  43 + width: 1rem;
  44 +}
  45 +/*总利息*/
  46 +.top_repay_accrual{
  47 + /*border: 1px solid red;*/
  48 + width: 1rem;
36 } 49 }
37 .limit{ 50 .limit{
38 margin-top: 0.69rem; 51 margin-top: 0.69rem;
@@ -136,8 +149,8 @@ select::-ms-expand{ @@ -136,8 +149,8 @@ select::-ms-expand{
136 display: flex; 149 display: flex;
137 } 150 }
138 .apply_name_bg{ 151 .apply_name_bg{
139 - width: 0.86rem;  
140 - height: 0.65rem; 152 + width: 0.88rem;
  153 + /*height: 0.65rem;*/
141 /*background-color: red;*/ 154 /*background-color: red;*/
142 background: url("../images/bg2_2.png"); 155 background: url("../images/bg2_2.png");
143 background-size: cover; 156 background-size: cover;
@@ -159,6 +172,10 @@ select::-ms-expand{ @@ -159,6 +172,10 @@ select::-ms-expand{
159 margin: 0 0.11rem; 172 margin: 0 0.11rem;
160 border: none; 173 border: none;
161 outline: none; 174 outline: none;
  175 + font-size: 0.3rem;
  176 +}
  177 +input::placeholder{
  178 + color: #cccccc;
162 } 179 }
163 .m_top{ 180 .m_top{
164 margin-top: 0.16rem; 181 margin-top: 0.16rem;
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 <title>盛宝财富</title> 5 <title>盛宝财富</title>
6 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> 6 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
7 <meta name="viewport" content="maximum-scale=1.0, minimum-scale=1.0, user-scalable=0, initial-scale=1.0, width=device-width" /> 7 <meta name="viewport" content="maximum-scale=1.0, minimum-scale=1.0, user-scalable=0, initial-scale=1.0, width=device-width" />
8 - <link rel="stylesheet" href="//at.alicdn.com/t/font_1022306_gfurfu6tnqq.css"> 8 + <link rel="stylesheet" href="https://at.alicdn.com/t/font_1022306_gfurfu6tnqq.css">
9 <link rel="stylesheet" type="text/css" href="../css/last.css"> 9 <link rel="stylesheet" type="text/css" href="../css/last.css">
10 <script src="../js/base.js"></script> 10 <script src="../js/base.js"></script>
11 <script src="../js/jquery.min.js"></script> 11 <script src="../js/jquery.min.js"></script>
@@ -23,7 +23,12 @@ @@ -23,7 +23,12 @@
23 </div> 23 </div>
24 <!--月还款--> 24 <!--月还款-->
25 <div class="top_repay"> 25 <div class="top_repay">
26 - 月还款: 元 总利息: 元 26 + <div class="top_month">
  27 + 月还款: <span class="top_repay_month"> 11111</span>元
  28 + </div>
  29 + <div class="top_accrual">
  30 + 总利息: <span class="top_repay_accrual">1111</span>元
  31 + </div>
27 </div> 32 </div>
28 </div> 33 </div>
29 <!--额度信息--> 34 <!--额度信息-->