webfront / shengbao · 提交

转到一个项目

作者 乔爽
提交 da550bf74191883f806365e8107a8155ac95b416 1 个父辈 97ef70c3

update

内嵌 并排对比
正在显示 6 个修改的文件 包含 730 行增加 和 207 行删除
@@ -2,13 +2,12 @@ @@ -2,13 +2,12 @@
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.css" afterDir="false" />  
6 - <change afterPath="$PROJECT_DIR$/new.html" afterDir="false" /> 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" /> 7 <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" /> 8 <change beforePath="$PROJECT_DIR$/css/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/index.css" afterDir="false" />
9 - <change beforePath="$PROJECT_DIR$/gonggao.html" beforeDir="false" afterPath="$PROJECT_DIR$/gonggao.html" 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" /> 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" />  
12 </list> 11 </list>
13 <ignored path="$PROJECT_DIR$/.tmp/" /> 12 <ignored path="$PROJECT_DIR$/.tmp/" />
14 <ignored path="$PROJECT_DIR$/temp/" /> 13 <ignored path="$PROJECT_DIR$/temp/" />
@@ -57,7 +56,7 @@ @@ -57,7 +56,7 @@
57 <session id="-407721514"> 56 <session id="-407721514">
58 <usages-collector id="statistics.lifecycle.project"> 57 <usages-collector id="statistics.lifecycle.project">
59 <counts> 58 <counts>
60 - <entry key="project.closed" value="20" /> 59 + <entry key="project.closed" value="21" />
61 <entry key="project.open.time.0" value="14" /> 60 <entry key="project.open.time.0" value="14" />
62 <entry key="project.open.time.1" value="2" /> 61 <entry key="project.open.time.1" value="2" />
63 <entry key="project.open.time.14" value="1" /> 62 <entry key="project.open.time.14" value="1" />
@@ -97,138 +96,109 @@ @@ -97,138 +96,109 @@
97 </counts> 96 </counts>
98 </usages-collector> 97 </usages-collector>
99 </session> 98 </session>
  99 + <session id="-988677624">
  100 + <usages-collector id="statistics.lifecycle.project">
  101 + <counts>
  102 + <entry key="project.closed" value="16" />
  103 + <entry key="project.open.time.0" value="14" />
  104 + <entry key="project.open.time.1" value="1" />
  105 + <entry key="project.open.time.2" value="1" />
  106 + <entry key="project.open.time.26" value="1" />
  107 + <entry key="project.opened" value="17" />
  108 + </counts>
  109 + </usages-collector>
  110 + <usages-collector id="statistics.file.extensions.open">
  111 + <counts>
  112 + <entry key="css" value="7" />
  113 + <entry key="html" value="12" />
  114 + <entry key="png" value="13" />
  115 + </counts>
  116 + </usages-collector>
  117 + <usages-collector id="statistics.file.types.open">
  118 + <counts>
  119 + <entry key="CSS" value="7" />
  120 + <entry key="HTML" value="12" />
  121 + <entry key="Image" value="13" />
  122 + </counts>
  123 + </usages-collector>
  124 + <usages-collector id="statistics.file.extensions.edit">
  125 + <counts>
  126 + <entry key="css" value="166" />
  127 + <entry key="html" value="218" />
  128 + </counts>
  129 + </usages-collector>
  130 + <usages-collector id="statistics.file.types.edit">
  131 + <counts>
  132 + <entry key="CSS" value="166" />
  133 + <entry key="HTML" value="218" />
  134 + </counts>
  135 + </usages-collector>
  136 + </session>
100 </component> 137 </component>
101 <component name="FileEditorManager"> 138 <component name="FileEditorManager">
102 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 139 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
103 <file pinned="false" current-in-tab="false"> 140 <file pinned="false" current-in-tab="false">
104 - <entry file="file://$PROJECT_DIR$/css/gonggao.css">  
105 - <provider selected="true" editor-type-id="text-editor">  
106 - <state relative-caret-position="1431">  
107 - <caret line="53" column="12" selection-start-line="53" selection-start-column="12" selection-end-line="53" selection-end-column="12" />  
108 - </state>  
109 - </provider>  
110 - </entry>  
111 - </file>  
112 - <file pinned="false" current-in-tab="false">  
113 <entry file="file://$PROJECT_DIR$/index.html"> 141 <entry file="file://$PROJECT_DIR$/index.html">
114 <provider selected="true" editor-type-id="text-editor"> 142 <provider selected="true" editor-type-id="text-editor">
115 - <state relative-caret-position="1323">  
116 - <caret line="227" selection-start-line="227" selection-end-line="227" /> 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" />
117 <folding> 145 <folding>
118 - <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
119 - <element signature="n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
120 - <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
121 - <element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
122 - <element signature="n#div#1;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
123 - <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
124 - <element signature="n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
125 - <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" />  
126 - <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" />  
127 - <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" />  
128 - <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" />  
129 - <element signature="n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
130 - <element signature="n#div#0;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
131 - <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" />  
132 - <element signature="n#div#2;n#div#0;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
133 - <element signature="n#div#1;n#div#2;n#div#0;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
134 - <element signature="n#div#1;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
135 - <element signature="n#div#2;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
136 - <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="e#8941#14339#0" />
137 </folding> 147 </folding>
138 </state> 148 </state>
139 </provider> 149 </provider>
140 </entry> 150 </entry>
141 </file> 151 </file>
142 - <file pinned="false" current-in-tab="true">  
143 - <entry file="file://$PROJECT_DIR$/new.html"> 152 + <file pinned="false" current-in-tab="false">
  153 + <entry file="file://$PROJECT_DIR$/css/index.css">
144 <provider selected="true" editor-type-id="text-editor"> 154 <provider selected="true" editor-type-id="text-editor">
145 - <state relative-caret-position="378">  
146 - <caret line="173" column="25" lean-forward="true" selection-start-line="173" selection-start-column="25" selection-end-line="173" selection-end-column="25" />  
147 - <folding>  
148 - <element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
149 - <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
150 - <element signature="n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
151 - <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
152 - <element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
153 - <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" />  
154 - <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
155 - <element signature="n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
156 - <element signature="n#div#0;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
157 - <element signature="n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
158 - <element signature="n#div#0;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
159 - <element signature="n#div#0;n#div#1;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
160 - <element signature="n#div#1;n#body#0;n#html#0;n#!!top" />  
161 - </folding> 155 + <state relative-caret-position="54">
  156 + <caret line="2" column="4" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="39" />
162 </state> 157 </state>
163 </provider> 158 </provider>
164 </entry> 159 </entry>
165 </file> 160 </file>
166 - <file pinned="false" current-in-tab="false">  
167 - <entry file="file://$PROJECT_DIR$/css/dropload.css"> 161 + <file pinned="false" current-in-tab="true">
  162 + <entry file="file://$PROJECT_DIR$/new_2.html">
168 <provider selected="true" editor-type-id="text-editor"> 163 <provider selected="true" editor-type-id="text-editor">
169 - <state relative-caret-position="243">  
170 - <caret line="9" column="15" lean-forward="true" selection-start-line="9" selection-start-column="15" selection-end-line="9" selection-end-column="15" /> 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" />
171 </state> 166 </state>
172 </provider> 167 </provider>
173 </entry> 168 </entry>
174 </file> 169 </file>
175 <file pinned="false" current-in-tab="false"> 170 <file pinned="false" current-in-tab="false">
176 - <entry file="file://$PROJECT_DIR$/css/new.css"> 171 + <entry file="file://$PROJECT_DIR$/css/new_2.css">
177 <provider selected="true" editor-type-id="text-editor"> 172 <provider selected="true" editor-type-id="text-editor">
178 - <state relative-caret-position="277">  
179 - <caret line="399" selection-start-line="399" selection-end-line="417" selection-end-column="1" /> 173 + <state relative-caret-position="307">
  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" />
180 </state> 175 </state>
181 </provider> 176 </provider>
182 </entry> 177 </entry>
183 </file> 178 </file>
184 <file pinned="false" current-in-tab="false"> 179 <file pinned="false" current-in-tab="false">
185 - <entry file="file://$PROJECT_DIR$/last.html">  
186 - <provider selected="true" editor-type-id="text-editor">  
187 - <state relative-caret-position="1998">  
188 - <caret line="135" column="37" lean-forward="true" selection-start-line="135" selection-start-column="37" selection-end-line="135" selection-end-column="37" />  
189 - <folding>  
190 - <element signature="n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
191 - <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
192 - <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" />  
193 - <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" />  
194 - <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" />  
195 - <element signature="n#select#0;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" />  
196 - <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" />  
197 - <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" />  
198 - <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
199 - <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" />  
200 - </folding>  
201 - </state>  
202 - </provider> 180 + <entry file="file://$PROJECT_DIR$/images/bg2_2.png">
  181 + <provider selected="true" editor-type-id="images" />
203 </entry> 182 </entry>
204 </file> 183 </file>
205 <file pinned="false" current-in-tab="false"> 184 <file pinned="false" current-in-tab="false">
206 - <entry file="file://$PROJECT_DIR$/images/bg_1.png"> 185 + <entry file="file://$PROJECT_DIR$/images/dfgdf@2x.png">
207 <provider selected="true" editor-type-id="images" /> 186 <provider selected="true" editor-type-id="images" />
208 </entry> 187 </entry>
209 </file> 188 </file>
210 <file pinned="false" current-in-tab="false"> 189 <file pinned="false" current-in-tab="false">
211 - <entry file="file://$PROJECT_DIR$/images/bg2_2.png"> 190 + <entry file="file://$PROJECT_DIR$/images/sdfsfesw@2x.png">
212 <provider selected="true" editor-type-id="images" /> 191 <provider selected="true" editor-type-id="images" />
213 </entry> 192 </entry>
214 </file> 193 </file>
215 <file pinned="false" current-in-tab="false"> 194 <file pinned="false" current-in-tab="false">
216 - <entry file="file://$PROJECT_DIR$/js/base.js">  
217 - <provider selected="true" editor-type-id="text-editor" /> 195 + <entry file="file://$PROJECT_DIR$/images/xzACsa@2x.png">
  196 + <provider selected="true" editor-type-id="images" />
218 </entry> 197 </entry>
219 </file> 198 </file>
220 <file pinned="false" current-in-tab="false"> 199 <file pinned="false" current-in-tab="false">
221 - <entry file="file://$PROJECT_DIR$/css/last.css">  
222 - <provider selected="true" editor-type-id="text-editor">  
223 - <state relative-caret-position="162">  
224 - <caret line="6" column="1" lean-forward="true" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />  
225 - <folding>  
226 - <element signature="e#649#745#0" />  
227 - <element signature="e#770#821#0" />  
228 - <element signature="e#848#899#0" />  
229 - </folding>  
230 - </state>  
231 - </provider> 200 + <entry file="file://$PROJECT_DIR$/images/ZCxzas4@2x.png">
  201 + <provider selected="true" editor-type-id="images" />
232 </entry> 202 </entry>
233 </file> 203 </file>
234 </leaf> 204 </leaf>
@@ -243,16 +213,6 @@ @@ -243,16 +213,6 @@
243 </component> 213 </component>
244 <component name="FindInProjectRecents"> 214 <component name="FindInProjectRecents">
245 <findStrings> 215 <findStrings>
246 - <find>mid_today_menu_item_pic</find>  
247 - <find>bottom_text</find>  
248 - <find>芝麻粉</find>  
249 - <find>bottom_text_title</find>  
250 - <find>.mid_loans_box_bottom_text</find>  
251 - <find>mid_loans_box_bottom_text</find>  
252 - <find>mid_top_item</find>  
253 - <find>loans_box_bottom</find>  
254 - <find>mid_loans_box_bottom</find>  
255 - <find>top_re</find>  
256 <find>apply_name_input</find> 216 <find>apply_name_input</find>
257 <find>apply_toRegister</find> 217 <find>apply_toRegister</find>
258 <find>main</find> 218 <find>main</find>
@@ -269,10 +229,20 @@ @@ -269,10 +229,20 @@
269 <find>popup</find> 229 <find>popup</find>
270 <find>apply_name</find> 230 <find>apply_name</find>
271 <find>input</find> 231 <find>input</find>
272 - <find>apply_box</find>  
273 <find>border</find> 232 <find>border</find>
274 <find>btn_sub</find> 233 <find>btn_sub</find>
275 <find>box</find> 234 <find>box</find>
  235 + <find>top_text</find>
  236 + <find>p</find>
  237 + <find>bottom</find>
  238 + <find>text_bottom</find>
  239 + <find>content</find>
  240 + <find>.pop_fn</find>
  241 + <find>NAME</find>
  242 + <find>请输入您的</find>
  243 + <find>limit</find>
  244 + <find>m_top</find>
  245 + <find>apply_box</find>
276 </findStrings> 246 </findStrings>
277 </component> 247 </component>
278 <component name="Git.Settings"> 248 <component name="Git.Settings">
@@ -294,15 +264,20 @@ @@ -294,15 +264,20 @@
294 <option value="$PROJECT_DIR$/first.html" /> 264 <option value="$PROJECT_DIR$/first.html" />
295 <option value="$PROJECT_DIR$/zhuye.html" /> 265 <option value="$PROJECT_DIR$/zhuye.html" />
296 <option value="$PROJECT_DIR$/css/index2.css" /> 266 <option value="$PROJECT_DIR$/css/index2.css" />
297 - <option value="$PROJECT_DIR$/css/gonggao.css" />  
298 <option value="$PROJECT_DIR$/css/last.css" /> 267 <option value="$PROJECT_DIR$/css/last.css" />
299 <option value="$PROJECT_DIR$/gonggao.html" /> 268 <option value="$PROJECT_DIR$/gonggao.html" />
300 <option value="$PROJECT_DIR$/css/new.html" /> 269 <option value="$PROJECT_DIR$/css/new.html" />
301 - <option value="$PROJECT_DIR$/css/index.css" />  
302 - <option value="$PROJECT_DIR$/index.html" />  
303 <option value="$PROJECT_DIR$/last.html" /> 270 <option value="$PROJECT_DIR$/last.html" />
304 - <option value="$PROJECT_DIR$/css/new.css" />  
305 <option value="$PROJECT_DIR$/new.html" /> 271 <option value="$PROJECT_DIR$/new.html" />
  272 + <option value="$PROJECT_DIR$/css/index.css" />
  273 + <option value="$PROJECT_DIR$/css/new.css" />
  274 + <option value="$PROJECT_DIR$/index.html" />
  275 + <option value="$PROJECT_DIR$/last_new.html" />
  276 + <option value="$PROJECT_DIR$/css/last_2.css" />
  277 + <option value="$PROJECT_DIR$/last_2.html" />
  278 + <option value="$PROJECT_DIR$/css/gonggao.css" />
  279 + <option value="$PROJECT_DIR$/css/new_2.css" />
  280 + <option value="$PROJECT_DIR$/new_2.html" />
306 </list> 281 </list>
307 </option> 282 </option>
308 </component> 283 </component>
@@ -312,11 +287,11 @@ @@ -312,11 +287,11 @@
312 <detection-done>true</detection-done> 287 <detection-done>true</detection-done>
313 <sorting>DEFINITION_ORDER</sorting> 288 <sorting>DEFINITION_ORDER</sorting>
314 </component> 289 </component>
315 - <component name="ProjectFrameBounds" extendedState="1">  
316 - <option name="x" value="135" />  
317 - <option name="y" value="234" />  
318 - <option name="width" value="1389" />  
319 - <option name="height" value="1035" /> 290 + <component name="ProjectFrameBounds">
  291 + <option name="x" value="363" />
  292 + <option name="y" value="197" />
  293 + <option name="width" value="1661" />
  294 + <option name="height" value="990" />
320 </component> 295 </component>
321 <component name="ProjectView"> 296 <component name="ProjectView">
322 <navigator proportions="" version="1"> 297 <navigator proportions="" version="1">
@@ -362,6 +337,7 @@ @@ -362,6 +337,7 @@
362 </component> 337 </component>
363 <component name="RecentsManager"> 338 <component name="RecentsManager">
364 <key name="CopyFile.RECENT_KEYS"> 339 <key name="CopyFile.RECENT_KEYS">
  340 + <recent name="F:\ljhWeb项目（重要）\盛宝财富贷款平台\shengbao\images" />
365 <recent name="F:\ljh项目\盛宝财富贷款平台\shengbao\js" /> 341 <recent name="F:\ljh项目\盛宝财富贷款平台\shengbao\js" />
366 <recent name="F:\ljh项目\盛宝财富贷款平台\shengbao\css" /> 342 <recent name="F:\ljh项目\盛宝财富贷款平台\shengbao\css" />
367 <recent name="F:\ljh项目\盛宝财富贷款平台\images" /> 343 <recent name="F:\ljh项目\盛宝财富贷款平台\images" />
@@ -415,11 +391,28 @@ @@ -415,11 +391,28 @@
415 <workItem from="1548212429640" duration="929000" /> 391 <workItem from="1548212429640" duration="929000" />
416 <workItem from="1548215571708" duration="2430000" /> 392 <workItem from="1548215571708" duration="2430000" />
417 <workItem from="1548228437126" duration="2264000" /> 393 <workItem from="1548228437126" duration="2264000" />
  394 + <workItem from="1548236579607" duration="1103000" />
  395 + <workItem from="1548290089783" duration="1322000" />
  396 + <workItem from="1548292151831" duration="2744000" />
  397 + <workItem from="1548312369238" duration="1655000" />
  398 + <workItem from="1548318142141" duration="521000" />
  399 + <workItem from="1548388411120" duration="1366000" />
  400 + <workItem from="1548396250245" duration="606000" />
  401 + <workItem from="1548750208065" duration="841000" />
  402 + <workItem from="1549873560043" duration="19000" />
  403 + <workItem from="1549874727162" duration="745000" />
  404 + <workItem from="1549931422841" duration="657000" />
  405 + <workItem from="1550046999936" duration="654000" />
  406 + <workItem from="1550555335015" duration="102000" />
  407 + <workItem from="1550625938942" duration="1152000" />
  408 + <workItem from="1550648232798" duration="2342000" />
  409 + <workItem from="1550651732023" duration="965000" />
  410 + <workItem from="1550653402477" duration="482000" />
418 </task> 411 </task>
419 <servers /> 412 <servers />
420 </component> 413 </component>
421 <component name="TimeTrackingManager"> 414 <component name="TimeTrackingManager">
422 - <option name="totallyTimeSpent" value="111396000" /> 415 + <option name="totallyTimeSpent" value="128672000" />
423 </component> 416 </component>
424 <component name="TodoView"> 417 <component name="TodoView">
425 <todo-panel id="selected-file"> 418 <todo-panel id="selected-file">
@@ -431,10 +424,10 @@ @@ -431,10 +424,10 @@
431 </todo-panel> 424 </todo-panel>
432 </component> 425 </component>
433 <component name="ToolWindowManager"> 426 <component name="ToolWindowManager">
434 - <frame x="135" y="234" width="1389" height="1035" extended-state="1" /> 427 + <frame x="363" y="197" width="1661" height="990" extended-state="0" />
435 <editor active="true" /> 428 <editor active="true" />
436 <layout> 429 <layout>
437 - <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.16728349" /> 430 + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13924831" />
438 <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> 431 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
439 <window_info id="Favorites" order="2" side_tool="true" /> 432 <window_info id="Favorites" order="2" side_tool="true" />
440 <window_info anchor="bottom" id="Message" order="0" /> 433 <window_info anchor="bottom" id="Message" order="0" />
@@ -446,7 +439,7 @@ @@ -446,7 +439,7 @@
446 <window_info anchor="bottom" id="TODO" order="6" weight="0.32974428" /> 439 <window_info anchor="bottom" id="TODO" order="6" weight="0.32974428" />
447 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> 440 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
448 <window_info anchor="bottom" id="Version Control" order="8" /> 441 <window_info anchor="bottom" id="Version Control" order="8" />
449 - <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.33222222" /> 442 + <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.20350876" />
450 <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" /> 443 <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
451 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> 444 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
452 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> 445 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -472,132 +465,136 @@ @@ -472,132 +465,136 @@
472 <provider selected="true" editor-type-id="text-editor" /> 465 <provider selected="true" editor-type-id="text-editor" />
473 </entry> 466 </entry>
474 <entry file="file://$PROJECT_DIR$/html/dksm.html" /> 467 <entry file="file://$PROJECT_DIR$/html/dksm.html" />
475 - <entry file="file://$PROJECT_DIR$/gonggao.html"> 468 + <entry file="file://$PROJECT_DIR$/css/new.html" />
  469 + <entry file="file://$PROJECT_DIR$/js/dropload.min.js">
  470 + <provider selected="true" editor-type-id="text-editor" />
  471 + </entry>
  472 + <entry file="file://$PROJECT_DIR$/css/dropload.css">
476 <provider selected="true" editor-type-id="text-editor"> 473 <provider selected="true" editor-type-id="text-editor">
477 - <state relative-caret-position="702">  
478 - <caret line="26" column="21" selection-start-line="26" selection-start-column="21" selection-end-line="26" selection-end-column="21" /> 474 + <state relative-caret-position="243">
  475 + <caret line="9" column="15" selection-start-line="9" selection-start-column="15" selection-end-line="9" selection-end-column="15" />
479 </state> 476 </state>
480 </provider> 477 </provider>
481 </entry> 478 </entry>
482 - <entry file="file://$PROJECT_DIR$/css/new.html" />  
483 - <entry file="file://$PROJECT_DIR$/js/dropload.min.js"> 479 + <entry file="file://$PROJECT_DIR$/js/base.js">
484 <provider selected="true" editor-type-id="text-editor" /> 480 <provider selected="true" editor-type-id="text-editor" />
485 </entry> 481 </entry>
486 - <entry file="file://$PROJECT_DIR$/css/index.css"> 482 + <entry file="file://$PROJECT_DIR$/last_new.html" />
  483 + <entry file="file://$PROJECT_DIR$/last.html">
487 <provider selected="true" editor-type-id="text-editor"> 484 <provider selected="true" editor-type-id="text-editor">
488 - <state relative-caret-position="3753">  
489 - <caret line="139" column="22" selection-start-line="139" selection-start-column="22" selection-end-line="139" selection-end-column="22" /> 485 + <state relative-caret-position="243">
  486 + <caret line="106" column="26" lean-forward="true" selection-end-line="148" />
490 </state> 487 </state>
491 </provider> 488 </provider>
492 </entry> 489 </entry>
493 - <entry file="file://$PROJECT_DIR$/css/gonggao.css"> 490 + <entry file="file://$PROJECT_DIR$/css/last.css">
494 <provider selected="true" editor-type-id="text-editor"> 491 <provider selected="true" editor-type-id="text-editor">
495 - <state relative-caret-position="1431">  
496 - <caret line="53" column="12" selection-start-line="53" selection-start-column="12" selection-end-line="53" selection-end-column="12" /> 492 + <state relative-caret-position="135">
  493 + <caret line="5" column="12" lean-forward="true" selection-end-line="245" />
497 </state> 494 </state>
498 </provider> 495 </provider>
499 </entry> 496 </entry>
500 - <entry file="file://$PROJECT_DIR$/index.html"> 497 + <entry file="file://$PROJECT_DIR$/css/last_2.css" />
  498 + <entry file="file://$PROJECT_DIR$/images/dfsfds@2x.png">
  499 + <provider selected="true" editor-type-id="images" />
  500 + </entry>
  501 + <entry file="file://$PROJECT_DIR$/images/dsfds4@2x.png">
  502 + <provider selected="true" editor-type-id="images" />
  503 + </entry>
  504 + <entry file="file://$PROJECT_DIR$/images/dsfs3@2x.png">
  505 + <provider selected="true" editor-type-id="images" />
  506 + </entry>
  507 + <entry file="file://$PROJECT_DIR$/images/dsfs6@2x.png">
  508 + <provider selected="true" editor-type-id="images" />
  509 + </entry>
  510 + <entry file="file://$PROJECT_DIR$/last_2.html" />
  511 + <entry file="file://$PROJECT_DIR$/images/dsvgfds1@2x.png">
  512 + <provider selected="true" editor-type-id="images" />
  513 + </entry>
  514 + <entry file="file://$PROJECT_DIR$/gonggao.html">
501 <provider selected="true" editor-type-id="text-editor"> 515 <provider selected="true" editor-type-id="text-editor">
502 - <state relative-caret-position="1323">  
503 - <caret line="227" selection-start-line="227" selection-end-line="227" /> 516 + <state relative-caret-position="459">
  517 + <caret line="26" column="21" selection-start-line="26" selection-start-column="21" selection-end-line="26" selection-end-column="21" />
504 <folding> 518 <folding>
505 - <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
506 - <element signature="n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
507 - <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
508 - <element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
509 - <element signature="n#div#1;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
510 - <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
511 - <element signature="n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
512 - <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" />  
513 - <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" />  
514 - <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" />  
515 - <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" />  
516 - <element signature="n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
517 - <element signature="n#div#0;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
518 - <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" />  
519 - <element signature="n#div#2;n#div#0;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
520 - <element signature="n#div#1;n#div#2;n#div#0;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
521 - <element signature="n#div#1;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
522 - <element signature="n#div#2;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
523 - <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" /> 519 + <element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
524 </folding> 520 </folding>
525 </state> 521 </state>
526 </provider> 522 </provider>
527 </entry> 523 </entry>
528 - <entry file="file://$PROJECT_DIR$/last.html"> 524 + <entry file="file://$PROJECT_DIR$/css/new.css">
  525 + <provider selected="true" editor-type-id="text-editor">
  526 + <state relative-caret-position="3267">
  527 + <caret line="121" column="21" selection-end-line="420" />
  528 + </state>
  529 + </provider>
  530 + </entry>
  531 + <entry file="file://$PROJECT_DIR$/new.html">
529 <provider selected="true" editor-type-id="text-editor"> 532 <provider selected="true" editor-type-id="text-editor">
530 - <state relative-caret-position="1998">  
531 - <caret line="135" column="37" lean-forward="true" selection-start-line="135" selection-start-column="37" selection-end-line="135" selection-end-column="37" /> 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" />
532 <folding> 535 <folding>
533 - <element signature="n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
534 - <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
535 - <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" />  
536 - <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" />  
537 - <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" />  
538 - <element signature="n#select#0;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" />  
539 - <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" />  
540 - <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" />  
541 - <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
542 - <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" /> 536 + <element signature="e#5844#6026#0" />
  537 + <element signature="e#6050#6305#0" />
543 </folding> 538 </folding>
544 </state> 539 </state>
545 </provider> 540 </provider>
546 </entry> 541 </entry>
547 - <entry file="file://$PROJECT_DIR$/images/bg_1.png"> 542 + <entry file="file://$PROJECT_DIR$/css/gonggao.css">
  543 + <provider selected="true" editor-type-id="text-editor">
  544 + <state relative-caret-position="540">
  545 + <caret line="20" selection-start-line="20" selection-end-line="31" selection-end-column="1" />
  546 + </state>
  547 + </provider>
  548 + </entry>
  549 + <entry file="file://$PROJECT_DIR$/images/lianjie.png">
548 <provider selected="true" editor-type-id="images" /> 550 <provider selected="true" editor-type-id="images" />
549 </entry> 551 </entry>
550 - <entry file="file://$PROJECT_DIR$/images/bg2_2.png"> 552 + <entry file="file://$PROJECT_DIR$/images/sdfsfesw@2x.png">
551 <provider selected="true" editor-type-id="images" /> 553 <provider selected="true" editor-type-id="images" />
552 </entry> 554 </entry>
553 - <entry file="file://$PROJECT_DIR$/js/base.js">  
554 - <provider selected="true" editor-type-id="text-editor" /> 555 + <entry file="file://$PROJECT_DIR$/images/xzACsa@2x.png">
  556 + <provider selected="true" editor-type-id="images" />
555 </entry> 557 </entry>
556 - <entry file="file://$PROJECT_DIR$/css/last.css"> 558 + <entry file="file://$PROJECT_DIR$/images/ZCxzas4@2x.png">
  559 + <provider selected="true" editor-type-id="images" />
  560 + </entry>
  561 + <entry file="file://$PROJECT_DIR$/css/new_2.css">
557 <provider selected="true" editor-type-id="text-editor"> 562 <provider selected="true" editor-type-id="text-editor">
558 - <state relative-caret-position="162">  
559 - <caret line="6" column="1" lean-forward="true" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />  
560 - <folding>  
561 - <element signature="e#649#745#0" />  
562 - <element signature="e#770#821#0" />  
563 - <element signature="e#848#899#0" />  
564 - </folding> 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" />
565 </state> 565 </state>
566 </provider> 566 </provider>
567 </entry> 567 </entry>
568 - <entry file="file://$PROJECT_DIR$/css/dropload.css"> 568 + <entry file="file://$PROJECT_DIR$/css/index.css">
569 <provider selected="true" editor-type-id="text-editor"> 569 <provider selected="true" editor-type-id="text-editor">
570 - <state relative-caret-position="243">  
571 - <caret line="9" column="15" lean-forward="true" selection-start-line="9" selection-start-column="15" selection-end-line="9" selection-end-column="15" /> 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" />
572 </state> 572 </state>
573 </provider> 573 </provider>
574 </entry> 574 </entry>
575 - <entry file="file://$PROJECT_DIR$/css/new.css"> 575 + <entry file="file://$PROJECT_DIR$/images/dfgdf@2x.png">
  576 + <provider selected="true" editor-type-id="images" />
  577 + </entry>
  578 + <entry file="file://$PROJECT_DIR$/images/bg_1.png">
  579 + <provider selected="true" editor-type-id="images" />
  580 + </entry>
  581 + <entry file="file://$PROJECT_DIR$/images/bg2_2.png">
  582 + <provider selected="true" editor-type-id="images" />
  583 + </entry>
  584 + <entry file="file://$PROJECT_DIR$/index.html">
576 <provider selected="true" editor-type-id="text-editor"> 585 <provider selected="true" editor-type-id="text-editor">
577 - <state relative-caret-position="277">  
578 - <caret line="399" selection-start-line="399" selection-end-line="417" selection-end-column="1" /> 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" />
  588 + <folding>
  589 + <element signature="e#8941#14339#0" />
  590 + </folding>
579 </state> 591 </state>
580 </provider> 592 </provider>
581 </entry> 593 </entry>
582 - <entry file="file://$PROJECT_DIR$/new.html"> 594 + <entry file="file://$PROJECT_DIR$/new_2.html">
583 <provider selected="true" editor-type-id="text-editor"> 595 <provider selected="true" editor-type-id="text-editor">
584 - <state relative-caret-position="378">  
585 - <caret line="173" column="25" lean-forward="true" selection-start-line="173" selection-start-column="25" selection-end-line="173" selection-end-column="25" />  
586 - <folding>  
587 - <element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
588 - <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
589 - <element signature="n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
590 - <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
591 - <element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
592 - <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" />  
593 - <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
594 - <element signature="n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
595 - <element signature="n#div#0;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
596 - <element signature="n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
597 - <element signature="n#div#0;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
598 - <element signature="n#div#0;n#div#1;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
599 - <element signature="n#div#1;n#body#0;n#html#0;n#!!top" />  
600 - </folding> 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" />
601 </state> 598 </state>
602 </provider> 599 </provider>
603 </entry> 600 </entry>
@@ -50,7 +50,7 @@ body{ @@ -50,7 +50,7 @@ body{
50 } 50 }
51 .top_text{ 51 .top_text{
52 margin: 0.69rem 0.26rem ; 52 margin: 0.69rem 0.26rem ;
53 - width: 6.97rem; 53 + width: 6.96rem;
54 height: 1.74rem; 54 height: 1.74rem;
55 background:rgba(255,255,255,1); 55 background:rgba(255,255,255,1);
56 box-shadow: 0 0.07rem 0.1rem 0.01rem rgba(0, 0, 0, 0.08); 56 box-shadow: 0 0.07rem 0.1rem 0.01rem rgba(0, 0, 0, 0.08);
@@ -65,7 +65,8 @@ body{ @@ -65,7 +65,8 @@ body{
65 } 65 }
66 .top_text p{ 66 .top_text p{
67 margin-top: 0.5rem; 67 margin-top: 0.5rem;
68 - width: 4.48rem; 68 + width: 6.1rem;
  69 + /*width: 90%;*/
69 line-height: 0.5rem; 70 line-height: 0.5rem;
70 71
71 text-overflow: ellipsis; 72 text-overflow: ellipsis;
@@ -198,7 +199,7 @@ body{ @@ -198,7 +199,7 @@ body{
198 width: 1rem; 199 width: 1rem;
199 height: 0.36rem; 200 height: 0.36rem;
200 border-radius: 0.04rem; 201 border-radius: 0.04rem;
201 - font-size: 0.2rem; 202 + font-size: 0.25rem;
202 color: #000000; 203 color: #000000;
203 background: #e2c780; 204 background: #e2c780;
204 text-align: center; 205 text-align: center;
@@ -281,7 +282,7 @@ body{ @@ -281,7 +282,7 @@ body{
281 height: 0.36rem; 282 height: 0.36rem;
282 line-height: 0.36rem; 283 line-height: 0.36rem;
283 border-radius: 0.04rem; 284 border-radius: 0.04rem;
284 - font-size: 0.22rem; 285 + font-size: 0.24rem;
285 background-color: #DCBE75; 286 background-color: #DCBE75;
286 text-align: center; 287 text-align: center;
287 color: #000000; 288 color: #000000;
@@ -139,7 +139,7 @@ body,html{ @@ -139,7 +139,7 @@ body,html{
139 height: 0.36rem; 139 height: 0.36rem;
140 line-height: 0.36rem; 140 line-height: 0.36rem;
141 border-radius: 0.04rem; 141 border-radius: 0.04rem;
142 - font-size: 0.22rem; 142 + font-size: 0.24rem;
143 background-color: #DCBE75; 143 background-color: #DCBE75;
144 text-align: center; 144 text-align: center;
145 color: #000000; 145 color: #000000;
  1 +body,html{
  2 + width: 100%;
  3 + height: 100%;
  4 + overflow: hidden;
  5 + position: relative;
  6 + background-color: #f9f9f9;
  7 + -webkit-overflow-scrolling:touch;
  8 + padding: 0;
  9 + margin: 0;
  10 +
  11 +
  12 +
  13 +}
  14 +
  15 +.main , .page {
  16 + /*position: absolute;*/
  17 + /*top: 0;*/
  18 + /*right: 0;*/
  19 + /*bottom: 0;*/
  20 + /*left: 0;*/
  21 + height:100%;display: flex;display:-ms-flex;display:-webkit-flex; flex-direction: column;
  22 +
  23 +}
  24 +.container {
  25 + width: 7.5rem;
  26 + position: absolute;
  27 + overflow-y: scroll;
  28 + -webkit-overflow-scrolling: touch;
  29 + top: 0;
  30 + left: 50%;
  31 + transform: translate(-50%,0);
  32 + -webkit-transform: translate(-50%,0);
  33 + bottom: 0;
  34 + right: 0;
  35 + height: 100%;
  36 + z-index: 5;
  37 +
  38 + display: flex;
  39 + flex-flow: column;
  40 + align-items: center;
  41 +}
  42 +/*.container{*/
  43 +/*width: 100%;*/
  44 +/*height: 100%;*/
  45 +/*line-height: 1;*/
  46 +/*!*display: flex;*!*/
  47 +/*flex-flow: column;*/
  48 +/*align-items: center;*/
  49 +/*background-color: #f9f9f9;*/
  50 +/*!*position: relative;*!*/
  51 +/*flex:1;-ms-flex:1;-webkit-flex:1*/
  52 +/*}*/
  53 +/*-----mid-----*/
  54 +.mid_top{
  55 +
  56 + width: 6.97rem;
  57 + height: 0.8rem;
  58 + box-shadow: 0 0.07rem 0.1rem 0.01rem rgba(0,0,0,0.08);
  59 + border-radius: 0.16rem;
  60 + background-color: #ffffff;
  61 +
  62 + font-size: 0.34rem;
  63 + font-weight: bold;
  64 + color: #585858;
  65 + text-align: center;
  66 + line-height: 0.8rem;
  67 + position: relative;
  68 + margin: 0.14rem auto;
  69 +}
  70 +/**/
  71 +.mid_top_item{
  72 +
  73 + width: 6.97rem;
  74 + height: 2.2rem;
  75 + background-color: #FFFFFF;
  76 + border-radius: 0.16rem;
  77 + box-shadow: 0 0.07rem 0.1rem 0.01rem rgba(0,0,0,0.08);
  78 + display: flex;
  79 + justify-content: center;
  80 + align-items: center;
  81 + margin: 0.22rem auto;
  82 +}
  83 +/*盒子内容*/
  84 +.mid_loans_box_bottom{
  85 + /*margin-top: 0.21rem;*/
  86 + width: 5.9rem;
  87 + height: 1.6rem;
  88 + display: flex;
  89 + /*border: 1px solid red;*/
  90 +}
  91 +.mid_loans_box_bottom_pic{
  92 + width: 1.6rem;
  93 + height: 1.6rem;
  94 + display: flex;
  95 +}
  96 +.mid_loans_box_bottom_pic img{
  97 + width: 100%;
  98 + height: 100%;
  99 +}
  100 +.mid_loans_box_bottom_text{
  101 + flex: 1;
  102 + display: flex;
  103 + flex-flow: column;
  104 + align-items: flex-start;
  105 + margin-left: 0.53rem;
  106 +}
  107 +.mid_loans_box_bottom_text_title{
  108 + height: 0.4rem;
  109 + line-height: 0.4rem;
  110 + font-size: 0.28rem;
  111 + box-sizing: border-box;
  112 + text-overflow: ellipsis;
  113 + display: -webkit-box;
  114 + -webkit-box-orient: vertical;
  115 + -webkit-line-clamp:1;
  116 + overflow: hidden;
  117 +
  118 +
  119 +}
  120 +.mid_loans_box_bottom_text_top{
  121 + height: 0.4rem;
  122 + line-height: 0.4rem;
  123 + font-size: 0.28rem;
  124 + box-sizing: border-box;
  125 + text-overflow: ellipsis;
  126 + display: -webkit-box;
  127 + -webkit-box-orient: vertical;
  128 + -webkit-line-clamp:1;
  129 + overflow: hidden;
  130 +}
  131 +.mid_loans_box_bottom_text_mid{
  132 + height: 0.4rem;
  133 + line-height: 0.4rem;
  134 + font-size: 0.28rem;
  135 + box-sizing: border-box;
  136 + text-overflow: ellipsis;
  137 + display: -webkit-box;
  138 + -webkit-box-orient: vertical;
  139 + -webkit-line-clamp:1;
  140 + overflow: hidden;
  141 +}
  142 +.mid_loans_box_bottom_text_bottom{
  143 +
  144 + /*margin-top: 0.13rem;*/
  145 + /*width: 3.24rem;*/
  146 + height: 0.36rem;
  147 + line-height: 0.36rem;
  148 + border-radius: 0.04rem;
  149 + font-size: 0.24rem;
  150 + background-color: #DCBE75;
  151 + text-align: center;
  152 + color: #000000;
  153 + /*overflow: hidden;*/
  154 + /*text-overflow: ellipsis;*/
  155 + /*white-space: nowrap;*/
  156 + box-sizing: border-box;
  157 + text-overflow: ellipsis;
  158 + display: -webkit-box;
  159 + -webkit-box-orient: vertical;
  160 + -webkit-line-clamp:1;
  161 + overflow: hidden;
  162 +}
  163 +.span_color{
  164 + color: #F5C32D;
  165 +}
  166 +
  167 +
  168 +
  169 +.top{
  170 + width: 5.6rem;
  171 + height: 1.14rem;
  172 + background-color: #DABA6F;
  173 + box-shadow: 0 0.07rem 0.1rem 0.01rem rgba(0,0,0,0.08);
  174 + border-radius: 0.16rem;
  175 + display: flex;
  176 + flex-flow: column;
  177 + font-size: 0.3rem;
  178 + color: #000000;
  179 + position: absolute;
  180 + top: 0.14rem;
  181 +}
  182 +
  183 +
  184 +
  185 +
  186 +
  187 +
  188 +
  189 +
  190 +
  191 +.apply{
  192 + width: 6.97rem;
  193 + height: 0.8rem;
  194 + box-shadow: 0 0.07rem 0.1rem 0.01rem rgba(0,0,0,0.08);
  195 + border-radius: 0.16rem;
  196 + background-color: #ffffff;
  197 +
  198 + font-size: 0.34rem;
  199 + font-weight: bold;
  200 + color: #585858;
  201 + text-align: center;
  202 + line-height: 0.8rem;
  203 + position: relative;
  204 + margin: 0.14rem auto;
  205 +
  206 +}
  207 +.apply_box{
  208 +
  209 + width: 6.97rem;
  210 + height: 2.2rem;
  211 + background-color: #ffffff;
  212 + box-shadow: 0 0.07rem 0.1rem 0.01rem rgba(0,0,0,0.08);
  213 + border-radius: 0.16rem;
  214 + display: flex;
  215 + flex-flow: column;
  216 + align-items: center;
  217 + justify-content: center;
  218 + display: -webkit-flex;
  219 + flex-direction: column;
  220 + margin: 0.2rem auto;
  221 +
  222 +}
  223 +.apply_name{
  224 + /*margin-top: 0.48rem;*/
  225 + /*width: 5rem;*/
  226 + height: 0.64rem;
  227 + border: 0.02rem solid #CCCCCC;
  228 + border-radius: 0.1rem;
  229 + display: flex;
  230 +}
  231 +.apply_name_bg{
  232 + width: 0.9rem;
  233 + /*height: 0.65rem;*/
  234 + /*background-color: red;*/
  235 + background: url("../images/bg2_2.png");
  236 + background-size: cover;
  237 + display: flex;
  238 + align-items: center;
  239 + border-bottom-left-radius: 0.1rem;
  240 + border-top-left-radius: 0.1rem;
  241 +}
  242 +.apply_name_bg_pic{
  243 + width: 0.38rem;
  244 + height: 0.44rem;
  245 + display: flex;
  246 + margin-left: 0.16rem;
  247 +}
  248 +.apply_name_bg_pic img{
  249 + width: 100%;
  250 + height: 100%;
  251 +}
  252 +.apply_name_input{
  253 + /*width: 3.9rem;*/
  254 + margin: 0 0.1rem;
  255 + /*padding: 0 0.11rem;*/
  256 + border: none;
  257 + outline: none;
  258 + font-size: 0.28rem;
  259 + -moz-flex: 1;
  260 + -ms-flex: 1;
  261 + flex: 1;
  262 + -webkit-flex: 1;
  263 + /*padding: 0;*/
  264 +}
  265 +.apply_name_input input{
  266 + font-size: 0.28rem;
  267 +}
  268 +input::placeholder{
  269 + color: #cccccc;
  270 +}
  271 +
  272 +.apply_toRegister{
  273 + margin-top: 0.28rem;
  274 + width: 3.8rem;
  275 + height: 0.68rem;
  276 + /*display: flex;*/
  277 + background: url("../images/ZCxzas4@2x.png");
  278 + background-size: cover;
  279 +
  280 + font-size: 0.31rem;
  281 + font-weight: bold;
  282 + color: #FFFFFF;
  283 + text-align: center;
  284 + line-height: 0.68rem;
  285 +
  286 +}
  287 +
  288 +
  289 +
  290 +/*链接图标*/
  291 +.link_left{
  292 + width: 0.18rem;
  293 + height: 0.66rem;
  294 + display: flex;
  295 + position: absolute;
  296 + bottom: -0.45rem;
  297 + left: 0.29rem;
  298 +}
  299 +.link_left img{
  300 + width: 100%;
  301 + height: 100%;
  302 +}
  303 +.link_right{
  304 + width: 0.18rem;
  305 + height: 0.66rem;
  306 + display: flex;
  307 + position: absolute;
  308 + bottom: -0.45rem;
  309 + right: 0.29rem;
  310 +}
  311 +.link_right img{
  312 + width: 100%;
  313 + height: 100%;
  314 +}
  315 +
  316 +
  317 +
  318 +/*弹层*/
  319 +.pop_fn{
  320 + position: fixed;
  321 + top: -2rem;
  322 + left: 0;
  323 + right: 0;
  324 + width: 3.74rem;
  325 + height: 0.82rem;
  326 + margin: 0 auto;
  327 + text-align: center;
  328 + line-height: 0.82rem;
  329 + color: #fff;
  330 + font-size: 0.24rem;
  331 + /*background: #352D32;*/
  332 + background:rgba(0,0,0,0.4);
  333 + transition: 1.2s;
  334 + border-radius: 0.36rem;
  335 + z-index: 999;
  336 +}
  337 +/*中部盒子*/
  338 +.mid_box{
  339 + /*margin-top: 5rem;*/
  340 +}
  341 +/*头部图片*/
  342 +.header{
  343 + width: 6.97rem;
  344 + height: 5.03rem;
  345 + border-radius: 0.16rem;
  346 + background-color: green;
  347 + margin-top: 0.14rem;
  348 + position: relative;
  349 +}
  350 +.header img{
  351 + width: 100%;
  352 + height: 100%;
  353 +}
  354 +
@@ -19,8 +19,8 @@ @@ -19,8 +19,8 @@
19 最新公告 19 最新公告
20 </div> 20 </div>
21 <div class="top_text" onclick="btn_gonggao()"> 21 <div class="top_text" onclick="btn_gonggao()">
22 - <p>通知通知通知通知通知通知通通知通知通知通知通知通知通  
23 - 通知通知通知通知通知通知通通知通知通知通知通知通知通 22 + <p>
  23 + 通知盛宝，通知盛宝，通知盛宝，通知盛宝，通知盛宝，通知盛宝，通知盛宝，通知盛宝，
24 </p> 24 </p>
25 25
26 </div> 26 </div>
@@ -218,6 +218,15 @@ @@ -218,6 +218,15 @@
218 <script src="js/jquery.min.js"></script> 218 <script src="js/jquery.min.js"></script>
219 <script src="js/dropload.min.js"></script> 219 <script src="js/dropload.min.js"></script>
220 <script> 220 <script>
  221 + var html=$(".top_text p").html();
  222 + console.log(html)
  223 + //html=html.substring(0,2);
  224 + html=html.substring(0,20)
  225 + console.log(html);
  226 +
  227 + //$(".top_text p").html(text)
  228 +
  229 +
221 function btn_next() { 230 function btn_next() {
222 window.location.href = "new.html" 231 window.location.href = "new.html"
223 } 232 }
  1 +<!DOCTYPE html>
  2 +<html lang="en">
  3 +<head>
  4 + <meta charset="UTF-8">
  5 + <title>盛宝财富</title>
  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" />
  8 + <link rel="stylesheet" href="https://at.alicdn.com/t/font_1022306_gfurfu6tnqq.css">
  9 + <link rel="stylesheet" type="text/css" href="css/new_2.css">
  10 + <script src="js/base.js"></script>
  11 + <script src="js/jquery.min.js"></script>
  12 + <script src="js/jquery.combo.select.js"></script>
  13 +
  14 +</head>
  15 +<body>
  16 +<div class="main">
  17 + <div class="container">
  18 + <!--头部图片-->
  19 + <div class="header" onclick="btn_next()">
  20 + <img src="images/xzACsa@2x.png">
  21 + <!--链接-->
  22 + <!--<div class="link_left">-->
  23 + <!--<img src="images/lianjie.png">-->
  24 + <!--</div>-->
  25 + <!--<div class="link_right">-->
  26 + <!--<img src="images/lianjie.png">-->
  27 + <!--</div>-->
  28 + </div>
  29 +
  30 + <div class="mid_box">
  31 + <!--今享花-->
  32 + <div class="mid_top">
  33 + 今享花
  34 + <div class="link_left">
  35 + <img src="images/lianjie.png">
  36 + </div>
  37 + <div class="link_right">
  38 + <img src="images/lianjie.png">
  39 + </div>
  40 + </div>
  41 + <!--今享花菜单-->
  42 + <div class="mid_top_item">
  43 + <div class="mid_loans_box_bottom">
  44 + <!--左边图片-->
  45 + <div class="mid_loans_box_bottom_pic">
  46 + <img src="images/dsfds4@2x.png">
  47 + </div>
  48 + <!--右边文字-->
  49 + <div class="mid_loans_box_bottom_text">
  50 + <div class="mid_loans_box_bottom_text_title">
  51 + 芝麻粉500+无负面，立马放
  52 + 芝麻粉500+无负面，立马放
  53 + </div>
  54 + <div class="mid_loans_box_bottom_text_top">
  55 + 申请人数: <span class="span_color">3658</span>人
  56 + 申请人数: <span class="span_color">3658</span>人
  57 + 申请人数: <span class="span_color">3658</span>人
  58 + </div>
  59 + <div class="mid_loans_box_bottom_text_mid">
  60 + 月利率: <span class="span_color">0.3%-0.5%</span>
  61 + 月利率: <span class="span_color">0.3%-0.5%</span>
  62 + 月利率: <span class="span_color">0.3%-0.5%</span>
  63 + </div>
  64 + <div class="mid_loans_box_bottom_text_bottom">
  65 + 3分钟申请，30分钟审核，秒下款
  66 + 3分钟申请，30分钟审核，秒下款
  67 + 3分钟申请，30分钟审核，秒下款
  68 + <!--3分钟申请，30分钟审核，秒下款-->
  69 + </div>
  70 + </div>
  71 + </div>
  72 + </div>
  73 +
  74 + <!--申请人信息标题-->
  75 + <div class="apply">
  76 + 申请人信息
  77 + <!--链接-->
  78 + <div class="link_left">
  79 + <img src="images/lianjie.png">
  80 + </div>
  81 + <div class="link_right">
  82 + <img src="images/lianjie.png">
  83 + </div>
  84 + </div>
  85 + <!--申请人信息-->
  86 + <div class="apply_box">
  87 + <!--姓名-->
  88 + <!--<div class="apply_name">-->
  89 + <!--&lt;!&ndash;图片&ndash;&gt;-->
  90 + <!--<div class="apply_name_bg">-->
  91 + <!--<div class="apply_name_bg_pic">-->
  92 + <!--<img src="images/dfgdf@2x.png">-->
  93 + <!--</div>-->
  94 + <!--</div>-->
  95 + <!--&lt;!&ndash;输入框&ndash;&gt;-->
  96 + <!--<input class="apply_name_input" placeholder="请输入您的真实姓名" id="name">-->
  97 + <!--</div>-->
  98 + <!--手机号-->
  99 + <div class="apply_name ">
  100 + <!--图片-->
  101 + <div class="apply_name_bg">
  102 + <div class="apply_name_bg_pic">
  103 + <img src="images/ZxzxZ@2x.png">
  104 + </div>
  105 + </div>
  106 + <!--输入框-->
  107 + <input class="apply_name_input" placeholder="请输入您的手机号" id="phone">
  108 + </div>
  109 + <!--前往注册-->
  110 + <div class="apply_toRegister" onclick="btn_sub()">
  111 + 前往注册
  112 + </div>
  113 + </div>
  114 + </div>
  115 +
  116 +
  117 + </div>
  118 +
  119 +</div>
  120 +
  121 +<div class="pop_fn">
  122 +</div>
  123 +<script>
  124 + function popup(message) {
  125 + $('.pop_fn').css('top', 3 + 'rem').html(message);
  126 + setTimeout(function() {
  127 + $('.pop_fn').css('top', '-' + 2 + 'rem').html(message);
  128 + }, 1800)
  129 + }
  130 + function btn_sub() {
  131 + var myreg=/^[1][3,4,5,6,7,8,9][0-9]{9}$/;
  132 + var newname=$("#phone").val();
  133 + if(!myreg.test(newname)){
  134 + popup("请输入正确的手机号")
  135 + }else {
  136 + popup("注册成功")
  137 + }
  138 +
  139 + }
  140 + //苹果input自动下滑兼容
  141 + $("input").blur(function(){
  142 + setTimeout(function() {
  143 + var scrollHeight = document.documentElement.scrollTop || document.body.scrollTop || 0;
  144 + window.scrollTo(0, Math.max(scrollHeight - 1, 0));
  145 + }, 300);
  146 + })
  147 + //聚焦监听
  148 + $('input').focus(function() {
  149 + if((/Android/gi).test(navigator.userAgent)) {
  150 + window.addEventListener('resize', function() {
  151 + if(document.activeElement.tagName == 'INPUT' ||
  152 + document.activeElement.tagName == 'TEXTAREA') {
  153 + window.setTimeout(function() {
  154 + document.activeElement.scrollIntoViewIfNeeded();
  155 + }, 0);
  156 + }
  157 + });
  158 + }
  159 + })
  160 +</script>
  161 +</body>
  162 +</html>