webfront / shengbao · 提交

转到一个项目

作者 乔爽
提交 5f75b9f0a9d58ebbc108f5c226841d4ddcc9a895 1 个父辈 e33dfffa

update

内嵌 并排对比
正在显示 7 个修改的文件 包含 159 行增加 和 95 行删除
@@ -2,7 +2,13 @@ @@ -2,7 +2,13 @@
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 beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
  6 + <change beforePath="$PROJECT_DIR$/css/gonggao.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/gonggao.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$/gonggao.html" beforeDir="false" afterPath="$PROJECT_DIR$/gonggao.html" afterDir="false" />
5 <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" /> 10 <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
  11 + <change beforePath="$PROJECT_DIR$/last.html" beforeDir="false" afterPath="$PROJECT_DIR$/last.html" afterDir="false" />
6 </list> 12 </list>
7 <ignored path="$PROJECT_DIR$/.tmp/" /> 13 <ignored path="$PROJECT_DIR$/.tmp/" />
8 <ignored path="$PROJECT_DIR$/temp/" /> 14 <ignored path="$PROJECT_DIR$/temp/" />
@@ -51,25 +57,25 @@ @@ -51,25 +57,25 @@
51 <session id="-407721514"> 57 <session id="-407721514">
52 <usages-collector id="statistics.lifecycle.project"> 58 <usages-collector id="statistics.lifecycle.project">
53 <counts> 59 <counts>
54 - <entry key="project.closed" value="6" />  
55 - <entry key="project.open.time.0" value="3" />  
56 - <entry key="project.open.time.1" value="1" /> 60 + <entry key="project.closed" value="9" />
  61 + <entry key="project.open.time.0" value="5" />
  62 + <entry key="project.open.time.1" value="2" />
57 <entry key="project.open.time.14" value="1" /> 63 <entry key="project.open.time.14" value="1" />
58 <entry key="project.open.time.18" value="1" /> 64 <entry key="project.open.time.18" value="1" />
59 <entry key="project.open.time.31" value="1" /> 65 <entry key="project.open.time.31" value="1" />
60 - <entry key="project.opened" value="7" /> 66 + <entry key="project.opened" value="10" />
61 </counts> 67 </counts>
62 </usages-collector> 68 </usages-collector>
63 <usages-collector id="statistics.file.extensions.edit"> 69 <usages-collector id="statistics.file.extensions.edit">
64 <counts> 70 <counts>
65 - <entry key="css" value="3487" />  
66 - <entry key="html" value="2293" /> 71 + <entry key="css" value="3557" />
  72 + <entry key="html" value="2401" />
67 </counts> 73 </counts>
68 </usages-collector> 74 </usages-collector>
69 <usages-collector id="statistics.file.types.edit"> 75 <usages-collector id="statistics.file.types.edit">
70 <counts> 76 <counts>
71 - <entry key="CSS" value="3487" />  
72 - <entry key="HTML" value="2293" /> 77 + <entry key="CSS" value="3557" />
  78 + <entry key="HTML" value="2401" />
73 </counts> 79 </counts>
74 </usages-collector> 80 </usages-collector>
75 <usages-collector id="statistics.file.extensions.open"> 81 <usages-collector id="statistics.file.extensions.open">
@@ -92,11 +98,11 @@ @@ -92,11 +98,11 @@
92 </component> 98 </component>
93 <component name="FileEditorManager"> 99 <component name="FileEditorManager">
94 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 100 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
95 - <file pinned="false" current-in-tab="false"> 101 + <file pinned="false" current-in-tab="true">
96 <entry file="file://$PROJECT_DIR$/gonggao.html"> 102 <entry file="file://$PROJECT_DIR$/gonggao.html">
97 <provider selected="true" editor-type-id="text-editor"> 103 <provider selected="true" editor-type-id="text-editor">
98 - <state relative-caret-position="432">  
99 - <caret line="34" column="40" lean-forward="true" selection-start-line="34" selection-start-column="40" selection-end-line="34" selection-end-column="40" /> 104 + <state relative-caret-position="127">
  105 + <caret line="34" column="41" selection-start-line="34" selection-start-column="41" selection-end-line="34" selection-end-column="41" />
100 </state> 106 </state>
101 </provider> 107 </provider>
102 </entry> 108 </entry>
@@ -104,8 +110,8 @@ @@ -104,8 +110,8 @@
104 <file pinned="false" current-in-tab="false"> 110 <file pinned="false" current-in-tab="false">
105 <entry file="file://$PROJECT_DIR$/css/gonggao.css"> 111 <entry file="file://$PROJECT_DIR$/css/gonggao.css">
106 <provider selected="true" editor-type-id="text-editor"> 112 <provider selected="true" editor-type-id="text-editor">
107 - <state relative-caret-position="243">  
108 - <caret line="21" column="19" lean-forward="true" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" /> 113 + <state relative-caret-position="289">
  114 + <caret line="53" column="12" lean-forward="true" selection-start-line="53" selection-start-column="12" selection-end-line="53" selection-end-column="12" />
109 </state> 115 </state>
110 </provider> 116 </provider>
111 </entry> 117 </entry>
@@ -113,29 +119,28 @@ @@ -113,29 +119,28 @@
113 <file pinned="false" current-in-tab="false"> 119 <file pinned="false" current-in-tab="false">
114 <entry file="file://$PROJECT_DIR$/css/index.css"> 120 <entry file="file://$PROJECT_DIR$/css/index.css">
115 <provider selected="true" editor-type-id="text-editor"> 121 <provider selected="true" editor-type-id="text-editor">
116 - <state relative-caret-position="189">  
117 - <caret line="7" column="11" lean-forward="true" selection-start-line="7" selection-start-column="11" selection-end-line="7" selection-end-column="11" /> 122 + <state relative-caret-position="341">
  123 + <caret line="200" column="24" selection-start-line="200" selection-start-column="24" selection-end-line="200" selection-end-column="24" />
118 </state> 124 </state>
119 </provider> 125 </provider>
120 </entry> 126 </entry>
121 </file> 127 </file>
122 - <file pinned="false" current-in-tab="true"> 128 + <file pinned="false" current-in-tab="false">
123 <entry file="file://$PROJECT_DIR$/index.html"> 129 <entry file="file://$PROJECT_DIR$/index.html">
124 <provider selected="true" editor-type-id="text-editor"> 130 <provider selected="true" editor-type-id="text-editor">
125 - <state relative-caret-position="243">  
126 - <caret line="21" column="47" selection-start-line="21" selection-start-column="47" selection-end-line="21" selection-end-column="47" /> 131 + <state relative-caret-position="185">
  132 + <caret line="117" column="16" selection-start-line="117" selection-start-column="16" selection-end-line="117" selection-end-column="16" />
127 <folding> 133 <folding>
128 <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 134 <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
129 <element signature="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#0;n#div#0;n#body#0;n#html#0;n#!!top" />
130 <element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 136 <element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
131 <element signature="n#div#1;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#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  138 + <element signature="n#div#0;n#div#2;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#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 139 <element signature="n#div#0;n#div#0;n#div#2;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#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 140 <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" />
134 <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" /> 141 <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" />
135 <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" />
136 <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" />
137 - <element signature="n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
138 - <element signature="n#div#0;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
139 <element signature="n#div#0;n#div#0;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 144 <element signature="n#div#0;n#div#0;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
140 <element signature="n#div#2;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 145 <element signature="n#div#2;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
141 <element signature="n#div#0;n#div#2;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 146 <element signature="n#div#0;n#div#2;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
@@ -152,11 +157,11 @@ @@ -152,11 +157,11 @@
152 <file pinned="false" current-in-tab="false"> 157 <file pinned="false" current-in-tab="false">
153 <entry file="file://$PROJECT_DIR$/last.html"> 158 <entry file="file://$PROJECT_DIR$/last.html">
154 <provider selected="true" editor-type-id="text-editor"> 159 <provider selected="true" editor-type-id="text-editor">
155 - <state relative-caret-position="243">  
156 - <caret line="9" column="38" lean-forward="true" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" /> 160 + <state relative-caret-position="77">
  161 + <caret line="18" selection-start-line="18" selection-end-line="18" />
157 <folding> 162 <folding>
158 - <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" />  
159 - <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" /> 163 + <element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  164 + <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
160 <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" /> 165 <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" />
161 <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" /> 166 <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" />
162 <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" /> 167 <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" />
@@ -164,12 +169,10 @@ @@ -164,12 +169,10 @@
164 <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" /> 169 <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" />
165 <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#1;n#div#2;n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
166 <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 171 <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
167 - <element signature="n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
168 <element signature="n#div#0;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" />
169 <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" /> 173 <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" />
170 <element signature="n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 174 <element signature="n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
171 <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" /> 175 <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" />
172 - <element signature="n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
173 </folding> 176 </folding>
174 </state> 177 </state>
175 </provider> 178 </provider>
@@ -193,8 +196,8 @@ @@ -193,8 +196,8 @@
193 <file pinned="false" current-in-tab="false"> 196 <file pinned="false" current-in-tab="false">
194 <entry file="file://$PROJECT_DIR$/css/last.css"> 197 <entry file="file://$PROJECT_DIR$/css/last.css">
195 <provider selected="true" editor-type-id="text-editor"> 198 <provider selected="true" editor-type-id="text-editor">
196 - <state relative-caret-position="162">  
197 - <caret line="6" column="1" lean-forward="true" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" /> 199 + <state relative-caret-position="216">
  200 + <caret line="38" column="1" lean-forward="true" selection-start-line="38" selection-start-column="1" selection-end-line="38" selection-end-column="1" />
198 </state> 201 </state>
199 </provider> 202 </provider>
200 </entry> 203 </entry>
@@ -211,12 +214,6 @@ @@ -211,12 +214,6 @@
211 </component> 214 </component>
212 <component name="FindInProjectRecents"> 215 <component name="FindInProjectRecents">
213 <findStrings> 216 <findStrings>
214 - <find>today</find>  
215 - <find>mid_loans_top</find>  
216 - <find>mid_loans_box_bottom_text</find>  
217 - <find>mid_loans_box_bottom</find>  
218 - <find>mid_loans</find>  
219 - <find>mid_today</find>  
220 <find>box_bottom</find> 217 <find>box_bottom</find>
221 <find>.mid_loans_box</find> 218 <find>.mid_loans_box</find>
222 <find>link</find> 219 <find>link</find>
@@ -241,6 +238,12 @@ @@ -241,6 +238,12 @@
241 <find>select</find> 238 <find>select</find>
242 <find>btn</find> 239 <find>btn</find>
243 <find>dis</find> 240 <find>dis</find>
  241 + <find>toRe</find>
  242 + <find>top</find>
  243 + <find>mid_today_menu_item</find>
  244 + <find>mid_loans_box_top_</find>
  245 + <find>mid_loans_box_top</find>
  246 + <find>mid_loans_box_bottom_text</find>
244 </findStrings> 247 </findStrings>
245 </component> 248 </component>
246 <component name="Git.Settings"> 249 <component name="Git.Settings">
@@ -257,17 +260,17 @@ @@ -257,17 +260,17 @@
257 <option value="$PROJECT_DIR$/html/xyjc.html" /> 260 <option value="$PROJECT_DIR$/html/xyjc.html" />
258 <option value="$PROJECT_DIR$/css/first.css" /> 261 <option value="$PROJECT_DIR$/css/first.css" />
259 <option value="$PROJECT_DIR$/html/first.html" /> 262 <option value="$PROJECT_DIR$/html/first.html" />
260 - <option value="$PROJECT_DIR$/css/last.css" />  
261 <option value="$PROJECT_DIR$/html/last.html" /> 263 <option value="$PROJECT_DIR$/html/last.html" />
262 <option value="$PROJECT_DIR$/html/index.html" /> 264 <option value="$PROJECT_DIR$/html/index.html" />
263 <option value="$PROJECT_DIR$/first.html" /> 265 <option value="$PROJECT_DIR$/first.html" />
264 - <option value="$PROJECT_DIR$/last.html" />  
265 <option value="$PROJECT_DIR$/zhuye.html" /> 266 <option value="$PROJECT_DIR$/zhuye.html" />
266 <option value="$PROJECT_DIR$/css/index2.css" /> 267 <option value="$PROJECT_DIR$/css/index2.css" />
267 - <option value="$PROJECT_DIR$/css/index.css" /> 268 + <option value="$PROJECT_DIR$/last.html" />
268 <option value="$PROJECT_DIR$/css/gonggao.css" /> 269 <option value="$PROJECT_DIR$/css/gonggao.css" />
269 - <option value="$PROJECT_DIR$/gonggao.html" /> 270 + <option value="$PROJECT_DIR$/css/index.css" />
  271 + <option value="$PROJECT_DIR$/css/last.css" />
270 <option value="$PROJECT_DIR$/index.html" /> 272 <option value="$PROJECT_DIR$/index.html" />
  273 + <option value="$PROJECT_DIR$/gonggao.html" />
271 </list> 274 </list>
272 </option> 275 </option>
273 </component> 276 </component>
@@ -278,17 +281,16 @@ @@ -278,17 +281,16 @@
278 <sorting>DEFINITION_ORDER</sorting> 281 <sorting>DEFINITION_ORDER</sorting>
279 </component> 282 </component>
280 <component name="ProjectFrameBounds"> 283 <component name="ProjectFrameBounds">
281 - <option name="x" value="390" />  
282 - <option name="y" value="298" />  
283 - <option name="width" value="1714" />  
284 - <option name="height" value="885" /> 284 + <option name="x" value="404" />
  285 + <option name="y" value="106" />
  286 + <option name="width" value="1394" />
  287 + <option name="height" value="872" />
285 </component> 288 </component>
286 <component name="ProjectView"> 289 <component name="ProjectView">
287 <navigator proportions="" version="1"> 290 <navigator proportions="" version="1">
288 <foldersAlwaysOnTop value="true" /> 291 <foldersAlwaysOnTop value="true" />
289 </navigator> 292 </navigator>
290 <panes> 293 <panes>
291 - <pane id="Scope" />  
292 <pane id="ProjectPane"> 294 <pane id="ProjectPane">
293 <subPane> 295 <subPane>
294 <expand> 296 <expand>
@@ -305,6 +307,7 @@ @@ -305,6 +307,7 @@
305 <select /> 307 <select />
306 </subPane> 308 </subPane>
307 </pane> 309 </pane>
  310 + <pane id="Scope" />
308 </panes> 311 </panes>
309 </component> 312 </component>
310 <component name="PropertiesComponent"> 313 <component name="PropertiesComponent">
@@ -355,12 +358,15 @@ @@ -355,12 +358,15 @@
355 <workItem from="1547857140175" duration="1455000" /> 358 <workItem from="1547857140175" duration="1455000" />
356 <workItem from="1547863520730" duration="3049000" /> 359 <workItem from="1547863520730" duration="3049000" />
357 <workItem from="1547866625675" duration="2102000" /> 360 <workItem from="1547866625675" duration="2102000" />
358 - <workItem from="1547868960136" duration="2258000" /> 361 + <workItem from="1547868960136" duration="2305000" />
  362 + <workItem from="1547887579683" duration="841000" />
  363 + <workItem from="1548030726852" duration="3158000" />
  364 + <workItem from="1548034875420" duration="2699000" />
359 </task> 365 </task>
360 <servers /> 366 <servers />
361 </component> 367 </component>
362 <component name="TimeTrackingManager"> 368 <component name="TimeTrackingManager">
363 - <option name="totallyTimeSpent" value="56805000" /> 369 + <option name="totallyTimeSpent" value="63550000" />
364 </component> 370 </component>
365 <component name="TodoView"> 371 <component name="TodoView">
366 <todo-panel id="selected-file"> 372 <todo-panel id="selected-file">
@@ -372,10 +378,10 @@ @@ -372,10 +378,10 @@
372 </todo-panel> 378 </todo-panel>
373 </component> 379 </component>
374 <component name="ToolWindowManager"> 380 <component name="ToolWindowManager">
375 - <frame x="390" y="298" width="1714" height="885" extended-state="0" /> 381 + <frame x="391" y="87" width="1394" height="879" extended-state="0" />
376 <editor active="true" /> 382 <editor active="true" />
377 <layout> 383 <layout>
378 - <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.12708831" /> 384 + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13716814" />
379 <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> 385 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
380 <window_info id="Favorites" order="2" side_tool="true" /> 386 <window_info id="Favorites" order="2" side_tool="true" />
381 <window_info anchor="bottom" id="Message" order="0" /> 387 <window_info anchor="bottom" id="Message" order="0" />
@@ -387,7 +393,7 @@ @@ -387,7 +393,7 @@
387 <window_info anchor="bottom" id="TODO" order="6" weight="0.32974428" /> 393 <window_info anchor="bottom" id="TODO" order="6" weight="0.32974428" />
388 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> 394 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
389 <window_info anchor="bottom" id="Version Control" order="8" /> 395 <window_info anchor="bottom" id="Version Control" order="8" />
390 - <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.29066667" /> 396 + <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.36021507" />
391 <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" /> 397 <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
392 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> 398 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
393 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> 399 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -422,33 +428,40 @@ @@ -422,33 +428,40 @@
422 <entry file="file://$PROJECT_DIR$/images/bg_1.png"> 428 <entry file="file://$PROJECT_DIR$/images/bg_1.png">
423 <provider selected="true" editor-type-id="images" /> 429 <provider selected="true" editor-type-id="images" />
424 </entry> 430 </entry>
  431 + <entry file="file://$PROJECT_DIR$/images/bg2_2.png">
  432 + <provider selected="true" editor-type-id="images" />
  433 + </entry>
425 <entry file="file://$PROJECT_DIR$/js/base.js"> 434 <entry file="file://$PROJECT_DIR$/js/base.js">
426 <provider selected="true" editor-type-id="text-editor" /> 435 <provider selected="true" editor-type-id="text-editor" />
427 </entry> 436 </entry>
428 - <entry file="file://$PROJECT_DIR$/images/bg2_2.png">  
429 - <provider selected="true" editor-type-id="images" /> 437 + <entry file="file://$PROJECT_DIR$/css/gonggao.css">
  438 + <provider selected="true" editor-type-id="text-editor">
  439 + <state relative-caret-position="289">
  440 + <caret line="53" column="12" lean-forward="true" selection-start-line="53" selection-start-column="12" selection-end-line="53" selection-end-column="12" />
  441 + </state>
  442 + </provider>
430 </entry> 443 </entry>
431 <entry file="file://$PROJECT_DIR$/css/index.css"> 444 <entry file="file://$PROJECT_DIR$/css/index.css">
432 <provider selected="true" editor-type-id="text-editor"> 445 <provider selected="true" editor-type-id="text-editor">
433 - <state relative-caret-position="189">  
434 - <caret line="7" column="11" lean-forward="true" selection-start-line="7" selection-start-column="11" selection-end-line="7" selection-end-column="11" /> 446 + <state relative-caret-position="341">
  447 + <caret line="200" column="24" selection-start-line="200" selection-start-column="24" selection-end-line="200" selection-end-column="24" />
435 </state> 448 </state>
436 </provider> 449 </provider>
437 </entry> 450 </entry>
438 - <entry file="file://$PROJECT_DIR$/css/gonggao.css"> 451 + <entry file="file://$PROJECT_DIR$/css/last.css">
439 <provider selected="true" editor-type-id="text-editor"> 452 <provider selected="true" editor-type-id="text-editor">
440 - <state relative-caret-position="243">  
441 - <caret line="21" column="19" lean-forward="true" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" /> 453 + <state relative-caret-position="216">
  454 + <caret line="38" column="1" lean-forward="true" selection-start-line="38" selection-start-column="1" selection-end-line="38" selection-end-column="1" />
442 </state> 455 </state>
443 </provider> 456 </provider>
444 </entry> 457 </entry>
445 <entry file="file://$PROJECT_DIR$/last.html"> 458 <entry file="file://$PROJECT_DIR$/last.html">
446 <provider selected="true" editor-type-id="text-editor"> 459 <provider selected="true" editor-type-id="text-editor">
447 - <state relative-caret-position="243">  
448 - <caret line="9" column="38" lean-forward="true" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" /> 460 + <state relative-caret-position="77">
  461 + <caret line="18" selection-start-line="18" selection-end-line="18" />
449 <folding> 462 <folding>
450 - <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" />  
451 - <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" /> 463 + <element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  464 + <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
452 <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" /> 465 <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" />
453 <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" /> 466 <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" />
454 <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" /> 467 <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" />
@@ -456,46 +469,29 @@ @@ -456,46 +469,29 @@
456 <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" /> 469 <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" />
457 <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" /> 470 <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" />
458 <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 471 <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
459 - <element signature="n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
460 <element signature="n#div#0;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 472 <element signature="n#div#0;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
461 <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" /> 473 <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" />
462 <element signature="n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 474 <element signature="n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
463 <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" /> 475 <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" />
464 - <element signature="n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
465 </folding> 476 </folding>
466 </state> 477 </state>
467 </provider> 478 </provider>
468 </entry> 479 </entry>
469 - <entry file="file://$PROJECT_DIR$/css/last.css">  
470 - <provider selected="true" editor-type-id="text-editor">  
471 - <state relative-caret-position="162">  
472 - <caret line="6" column="1" lean-forward="true" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />  
473 - </state>  
474 - </provider>  
475 - </entry>  
476 - <entry file="file://$PROJECT_DIR$/gonggao.html">  
477 - <provider selected="true" editor-type-id="text-editor">  
478 - <state relative-caret-position="432">  
479 - <caret line="34" column="40" lean-forward="true" selection-start-line="34" selection-start-column="40" selection-end-line="34" selection-end-column="40" />  
480 - </state>  
481 - </provider>  
482 - </entry>  
483 <entry file="file://$PROJECT_DIR$/index.html"> 480 <entry file="file://$PROJECT_DIR$/index.html">
484 <provider selected="true" editor-type-id="text-editor"> 481 <provider selected="true" editor-type-id="text-editor">
485 - <state relative-caret-position="243">  
486 - <caret line="21" column="47" selection-start-line="21" selection-start-column="47" selection-end-line="21" selection-end-column="47" /> 482 + <state relative-caret-position="185">
  483 + <caret line="117" column="16" selection-start-line="117" selection-start-column="16" selection-end-line="117" selection-end-column="16" />
487 <folding> 484 <folding>
488 <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 485 <element signature="n#div#0;n#div#0;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#body#0;n#html#0;n#!!top" /> 486 <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
490 <element signature="n#div#0;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" />
491 <element signature="n#div#1;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 488 <element signature="n#div#1;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  489 + <element signature="n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
492 <element signature="n#div#0;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 490 <element signature="n#div#0;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
493 <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" /> 491 <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" />
494 <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" /> 492 <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" />
495 <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" /> 493 <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" />
496 <element signature="n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 494 <element signature="n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
497 - <element signature="n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
498 - <element signature="n#div#0;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
499 <element signature="n#div#0;n#div#0;n#div#4;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#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
500 <element signature="n#div#2;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 496 <element signature="n#div#2;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
501 <element signature="n#div#0;n#div#2;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 497 <element signature="n#div#0;n#div#2;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
@@ -503,5 +499,12 @@ @@ -503,5 +499,12 @@
503 </state> 499 </state>
504 </provider> 500 </provider>
505 </entry> 501 </entry>
  502 + <entry file="file://$PROJECT_DIR$/gonggao.html">
  503 + <provider selected="true" editor-type-id="text-editor">
  504 + <state relative-caret-position="127">
  505 + <caret line="34" column="41" selection-start-line="34" selection-start-column="41" selection-end-line="34" selection-end-column="41" />
  506 + </state>
  507 + </provider>
  508 + </entry>
506 </component> 509 </component>
507 </project> 510 </project>
@@ -48,13 +48,12 @@ html{ @@ -48,13 +48,12 @@ html{
48 box-shadow: 0 0.07rem 0.1rem 0.01rem rgba(0,0,0,0.08); 48 box-shadow: 0 0.07rem 0.1rem 0.01rem rgba(0,0,0,0.08);
49 border-radius: 0.16rem; 49 border-radius: 0.16rem;
50 padding-bottom: 0.5rem; 50 padding-bottom: 0.5rem;
51 - /*margin-bottom: 0.3rem;*/  
52 - margin: 0.22rem 0 0.3rem 0; 51 +
  52 + margin: 0.22rem 0 0.8rem 0;
53 } 53 }
54 .bottom_box{ 54 .bottom_box{
55 width: 6.2rem; 55 width: 6.2rem;
56 - /*height: 4.04rem;*/  
57 - /*border: 1px solid red;*/ 56 +
58 margin: 0.42rem 0.44rem ; 57 margin: 0.42rem 0.44rem ;
59 line-height: 0.42rem; 58 line-height: 0.42rem;
60 font-size: 0.28rem; 59 font-size: 0.28rem;
  1 +body{
  2 + overflow-x: hidden;
  3 +}
1 .main , .page { 4 .main , .page {
2 position: absolute; 5 position: absolute;
3 top: 0; 6 top: 0;
@@ -112,11 +115,20 @@ @@ -112,11 +115,20 @@
112 height: 100%; 115 height: 100%;
113 } 116 }
114 .mid_today_menu_item_text{ 117 .mid_today_menu_item_text{
  118 + width: 2rem;
115 margin-top: 0.32rem; 119 margin-top: 0.32rem;
116 font-size: 0.32rem; 120 font-size: 0.32rem;
117 font-weight: 500; 121 font-weight: 500;
118 color: #585858; 122 color: #585858;
119 - line-height: 0.24rem; 123 + /*line-height: 0.24rem;*/
  124 +
  125 + -webkit-box-orient: vertical;
  126 + -webkit-line-clamp: 1;
  127 + overflow: hidden;
  128 + text-overflow: ellipsis;
  129 + white-space: nowrap;
  130 +
  131 +
120 } 132 }
121 .mid_loans{ 133 .mid_loans{
122 margin-top: 0.22rem; 134 margin-top: 0.22rem;
@@ -162,6 +174,10 @@ @@ -162,6 +174,10 @@
162 align-items: center; 174 align-items: center;
163 margin-left: 1rem; 175 margin-left: 1rem;
164 margin-top: 0.15rem; 176 margin-top: 0.15rem;
  177 +
  178 +
  179 +
  180 +
165 } 181 }
166 .mid_loans_box_top_text{ 182 .mid_loans_box_top_text{
167 font-size: 0.28rem; 183 font-size: 0.28rem;
@@ -177,6 +193,12 @@ @@ -177,6 +193,12 @@
177 background: #e2c780; 193 background: #e2c780;
178 text-align: center; 194 text-align: center;
179 line-height: 0.36rem; 195 line-height: 0.36rem;
  196 +
  197 + -webkit-box-orient: vertical;
  198 + -webkit-line-clamp: 1;
  199 + overflow: hidden;
  200 + text-overflow: ellipsis;
  201 + white-space: nowrap;
180 } 202 }
181 .mid_loans_box_line{ 203 .mid_loans_box_line{
182 width: 6.43rem; 204 width: 6.43rem;
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 position: relative; 16 position: relative;
17 } 17 }
18 .top{ 18 .top{
19 - width: 5.31rem; 19 + width: 5.6rem;
20 height: 1.14rem; 20 height: 1.14rem;
21 background-color: #DABA6F; 21 background-color: #DABA6F;
22 box-shadow: 0 0.07rem 0.1rem 0.01rem rgba(0,0,0,0.08); 22 box-shadow: 0 0.07rem 0.1rem 0.01rem rgba(0,0,0,0.08);
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
33 33
34 } 34 }
35 .top_repay{ 35 .top_repay{
36 - margin: 0 0.42rem 0.19rem 0.42rem; 36 + margin: 0 0.2rem 0.19rem 0.42rem;
37 display: flex; 37 display: flex;
38 justify-content: space-between; 38 justify-content: space-between;
39 } 39 }
@@ -223,4 +223,23 @@ input::placeholder{ @@ -223,4 +223,23 @@ input::placeholder{
223 height: 100%; 223 height: 100%;
224 } 224 }
225 225
  226 +/*弹层*/
  227 +.pop_fn{
  228 + position: fixed;
  229 + top: -2rem;
  230 + left: 0;
  231 + right: 0;
  232 + width: 3.74rem;
  233 + height: 0.82rem;
  234 + margin: 0 auto;
  235 + text-align: center;
  236 + line-height: 0.82rem;
  237 + color: #fff;
  238 + font-size: 0.24rem;
  239 + /*background: #352D32;*/
  240 + background:rgba(0,0,0,0.4);
  241 + transition: 1.2s;
  242 + border-radius: 0.36rem;
  243 +}
  244 +
226 245
@@ -32,10 +32,16 @@ @@ -32,10 +32,16 @@
32 <!--底部--> 32 <!--底部-->
33 <div class="bottom"> 33 <div class="bottom">
34 <!--文本框盒--> 34 <!--文本框盒-->
35 - <div class="bottom_box"> 35 + <div class="bottom_box">s
36 1、个人贷款要有明确用途，且应符合法律法规规定和国家有关政策，交易背景真实，不得虚构交易背景和贷款用途;<br> 36 1、个人贷款要有明确用途，且应符合法律法规规定和国家有关政策，交易背景真实，不得虚构交易背景和贷款用途;<br>
37 2、个人贷款的使用应遵循诚信原则，符合借款合同中约定的用途，根据国家现行规定，贷款资金不得违规进入股市、房地产开发等国家明令禁止进入的领域;<br> 37 2、个人贷款的使用应遵循诚信原则，符合借款合同中约定的用途，根据国家现行规定，贷款资金不得违规进入股市、房地产开发等国家明令禁止进入的领域;<br>
38 3、贷款购买住房的，应按照国家规定申请个人住房贷款，根据国家现行规定，消费性贷款禁止用于购买住房。<br> 38 3、贷款购买住房的，应按照国家规定申请个人住房贷款，根据国家现行规定，消费性贷款禁止用于购买住房。<br>
  39 + 1、个人贷款要有明确用途，且应符合法律法规规定和国家有关政策，交易背景真实，不得虚构交易背景和贷款用途;<br>
  40 + 2、个人贷款的使用应遵循诚信原则，符合借款合同中约定的用途，根据国家现行规定，贷款资金不得违规进入股市、房地产开发等国家明令禁止进入的领域;<br>
  41 + 3、贷款购买住房的，应按照国家规定申请个人住房贷款，根据国家现行规定，消费性贷款
  42 + 1、个人贷款要有明确用途，且应符合法律法规规定和国家有关政策，交易背景真实，不得虚构交易背景和贷款用途;<br>
  43 + 2、个人贷款的使用应遵循诚信原则，符合借款合同中约定的用途，根据国家现行规定，贷款资金不得违规进入股市、房地产开发等国家明令禁止进入的领域;<br>
  44 + 3、贷款购买住房的，应按照国家规定申请个人住房贷款，根据国家现行规定，消费性贷款
39 45
40 46
41 47
@@ -47,7 +47,7 @@ @@ -47,7 +47,7 @@
47 </div> 47 </div>
48 <!--文字--> 48 <!--文字-->
49 <div class="mid_today_menu_item_text"> 49 <div class="mid_today_menu_item_text">
50 - 秒贷 50 + 秒贷秒贷秒贷秒贷秒贷秒贷
51 </div> 51 </div>
52 </div> 52 </div>
53 <!--推荐2--> 53 <!--推荐2-->
@@ -96,11 +96,12 @@ @@ -96,11 +96,12 @@
96 <!--头部名字--> 96 <!--头部名字-->
97 <div class="mid_loans_box_top"> 97 <div class="mid_loans_box_top">
98 <div class="mid_loans_box_top_text"> 98 <div class="mid_loans_box_top_text">
99 - 秒贷 99 + 秒贷秒贷
  100 +
100 </div> 101 </div>
101 <!--热门--> 102 <!--热门-->
102 <div class="mid_loans_box_top_hot"> 103 <div class="mid_loans_box_top_hot">
103 - 热门 104 + 热门热门
104 </div> 105 </div>
105 </div> 106 </div>
106 <!--下划虚线--> 107 <!--下划虚线-->
@@ -115,6 +116,7 @@ @@ -115,6 +116,7 @@
115 <div class="mid_loans_box_bottom_text"> 116 <div class="mid_loans_box_bottom_text">
116 <div class="mid_loans_box_bottom_text_title"> 117 <div class="mid_loans_box_bottom_text_title">
117 芝麻粉500+无负面，立马放 118 芝麻粉500+无负面，立马放
  119 + 芝麻粉500+无负面，立马放
118 </div> 120 </div>
119 <div class="mid_loans_box_bottom_text_top"> 121 <div class="mid_loans_box_bottom_text_top">
120 申请人数: <span class="span_color">3658</span>人 122 申请人数: <span class="span_color">3658</span>人
@@ -24,10 +24,10 @@ @@ -24,10 +24,10 @@
24 <!--月还款--> 24 <!--月还款-->
25 <div class="top_repay"> 25 <div class="top_repay">
26 <div class="top_month"> 26 <div class="top_month">
27 - 月还款: <span class="top_repay_month"> 11111</span>元 27 + 月还款: <span class="top_repay_month"> 59999</span>元
28 </div> 28 </div>
29 <div class="top_accrual"> 29 <div class="top_accrual">
30 - 总利息: <span class="top_repay_accrual">1111</span>元 30 + 总利息: <span class="top_repay_accrual">99999.99</span>元
31 </div> 31 </div>
32 </div> 32 </div>
33 </div> 33 </div>
@@ -110,16 +110,29 @@ @@ -110,16 +110,29 @@
110 <input class="apply_name_input" placeholder="请输入您的手机号"> 110 <input class="apply_name_input" placeholder="请输入您的手机号">
111 </div> 111 </div>
112 <!--前往注册--> 112 <!--前往注册-->
113 - <div class="apply_toRegister"> 113 + <div class="apply_toRegister" onclick="btn_sub()">
114 前往注册 114 前往注册
115 115
116 </div> 116 </div>
117 </div> 117 </div>
118 -  
119 </div> 118 </div>
  119 +
120 </div> 120 </div>
121 <!--<script src="../js/jquery.combo.select.js">--> 121 <!--<script src="../js/jquery.combo.select.js">-->
122 <!--</script>--> 122 <!--</script>-->
123 - 123 +<div class="pop_fn">
  124 +</div>
  125 +<script>
  126 + function popup(message) {
  127 + $('.pop_fn').css('top', 3 + 'rem').html(message);
  128 + setTimeout(function() {
  129 + $('.pop_fn').css('top', '-' + 2 + 'rem').html(message);
  130 + }, 1800)
  131 + }
  132 + function btn_sub() {
  133 + // alert("注册成功!");
  134 + popup("注册成功")
  135 + }
  136 +</script>
124 </body> 137 </body>
125 </html> 138 </html>