正在显示
8 个修改的文件
包含
547 行增加
和
319 行删除
@@ -3,34 +3,11 @@ | @@ -3,34 +3,11 @@ | ||
3 | <component name="ChangeListManager"> | 3 | <component name="ChangeListManager"> |
4 | <list default="true" id="45116894-83a8-452c-8a78-cd7bfbe48655" name="Default Changelist" comment=""> | 4 | <list default="true" id="45116894-83a8-452c-8a78-cd7bfbe48655" name="Default Changelist" comment=""> |
5 | <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> | 5 | <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> |
6 | - <change beforePath="$PROJECT_DIR$/css/common.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/common.css" afterDir="false" /> | ||
7 | - <change beforePath="$PROJECT_DIR$/css/cpxq_2.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/cpxq_2.css" afterDir="false" /> | ||
8 | - <change beforePath="$PROJECT_DIR$/css/cpzx_2.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/cpzx_2.css" afterDir="false" /> | ||
9 | - <change beforePath="$PROJECT_DIR$/css/fwcx_4.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/fwcx_4.css" afterDir="false" /> | ||
10 | - <change beforePath="$PROJECT_DIR$/css/fwcx_4_1result.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/fwcx_4_1result.css" afterDir="false" /> | ||
11 | - <change beforePath="$PROJECT_DIR$/css/fwcx_4_2result.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/fwcx_4_2result.css" afterDir="false" /> | ||
12 | - <change beforePath="$PROJECT_DIR$/css/fwxc_4_3result_none.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/fwxc_4_3result_none.css" afterDir="false" /> | ||
13 | - <change beforePath="$PROJECT_DIR$/css/gsjj.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/gsjj.css" afterDir="false" /> | ||
14 | <change beforePath="$PROJECT_DIR$/css/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/index.css" afterDir="false" /> | 6 | <change beforePath="$PROJECT_DIR$/css/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/index.css" afterDir="false" /> |
15 | - <change beforePath="$PROJECT_DIR$/css/lxwm_5.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/lxwm_5.css" afterDir="false" /> | ||
16 | - <change beforePath="$PROJECT_DIR$/css/page.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/page.css" afterDir="false" /> | ||
17 | - <change beforePath="$PROJECT_DIR$/css/paging.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/paging.css" afterDir="false" /> | ||
18 | - <change beforePath="$PROJECT_DIR$/css/sckj.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/sckj.css" afterDir="false" /> | ||
19 | - <change beforePath="$PROJECT_DIR$/css/search_2.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/search_2.css" afterDir="false" /> | ||
20 | - <change beforePath="$PROJECT_DIR$/css/search_no_2.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/search_no_2.css" afterDir="false" /> | ||
21 | - <change beforePath="$PROJECT_DIR$/html/cpzx_2.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/cpzx_2.html" afterDir="false" /> | ||
22 | - <change beforePath="$PROJECT_DIR$/html/fwcx_4.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/fwcx_4.html" afterDir="false" /> | ||
23 | - <change beforePath="$PROJECT_DIR$/html/fwcx_4_1result.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/fwcx_4_1result.html" afterDir="false" /> | ||
24 | - <change beforePath="$PROJECT_DIR$/html/fwcx_4_2result.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/fwcx_4_2result.html" afterDir="false" /> | ||
25 | - <change beforePath="$PROJECT_DIR$/html/fwxc_4_3result_none.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/fwxc_4_3result_none.html" afterDir="false" /> | 7 | + <change beforePath="$PROJECT_DIR$/html/gsjj.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/gsjj.html" afterDir="false" /> |
26 | <change beforePath="$PROJECT_DIR$/html/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/index.html" afterDir="false" /> | 8 | <change beforePath="$PROJECT_DIR$/html/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/index.html" afterDir="false" /> |
27 | - <change beforePath="$PROJECT_DIR$/html/jm_3.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/jm_3.html" afterDir="false" /> | ||
28 | <change beforePath="$PROJECT_DIR$/html/lxwm_5.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/lxwm_5.html" afterDir="false" /> | 9 | <change beforePath="$PROJECT_DIR$/html/lxwm_5.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/lxwm_5.html" afterDir="false" /> |
29 | <change beforePath="$PROJECT_DIR$/html/sckj.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/sckj.html" afterDir="false" /> | 10 | <change beforePath="$PROJECT_DIR$/html/sckj.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/sckj.html" afterDir="false" /> |
30 | - <change beforePath="$PROJECT_DIR$/html/search_2.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/search_2.html" afterDir="false" /> | ||
31 | - <change beforePath="$PROJECT_DIR$/html/search_no_2.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/search_no_2.html" afterDir="false" /> | ||
32 | - <change beforePath="$PROJECT_DIR$/js/jquery-2.1.0.js" beforeDir="false" /> | ||
33 | - <change beforePath="$PROJECT_DIR$/js/page.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/page.js" afterDir="false" /> | ||
34 | </list> | 11 | </list> |
35 | <ignored path="$PROJECT_DIR$/.tmp/" /> | 12 | <ignored path="$PROJECT_DIR$/.tmp/" /> |
36 | <ignored path="$PROJECT_DIR$/temp/" /> | 13 | <ignored path="$PROJECT_DIR$/temp/" /> |
@@ -151,29 +128,29 @@ | @@ -151,29 +128,29 @@ | ||
151 | </usages-collector> | 128 | </usages-collector> |
152 | <usages-collector id="statistics.file.extensions.open"> | 129 | <usages-collector id="statistics.file.extensions.open"> |
153 | <counts> | 130 | <counts> |
154 | - <entry key="css" value="52" /> | ||
155 | - <entry key="html" value="88" /> | 131 | + <entry key="css" value="55" /> |
132 | + <entry key="html" value="92" /> | ||
156 | <entry key="js" value="7" /> | 133 | <entry key="js" value="7" /> |
157 | </counts> | 134 | </counts> |
158 | </usages-collector> | 135 | </usages-collector> |
159 | <usages-collector id="statistics.file.types.open"> | 136 | <usages-collector id="statistics.file.types.open"> |
160 | <counts> | 137 | <counts> |
161 | - <entry key="CSS" value="52" /> | ||
162 | - <entry key="HTML" value="88" /> | 138 | + <entry key="CSS" value="55" /> |
139 | + <entry key="HTML" value="92" /> | ||
163 | <entry key="JavaScript" value="7" /> | 140 | <entry key="JavaScript" value="7" /> |
164 | </counts> | 141 | </counts> |
165 | </usages-collector> | 142 | </usages-collector> |
166 | <usages-collector id="statistics.file.extensions.edit"> | 143 | <usages-collector id="statistics.file.extensions.edit"> |
167 | <counts> | 144 | <counts> |
168 | - <entry key="css" value="3084" /> | ||
169 | - <entry key="html" value="6596" /> | 145 | + <entry key="css" value="3433" /> |
146 | + <entry key="html" value="7000" /> | ||
170 | <entry key="js" value="73" /> | 147 | <entry key="js" value="73" /> |
171 | </counts> | 148 | </counts> |
172 | </usages-collector> | 149 | </usages-collector> |
173 | <usages-collector id="statistics.file.types.edit"> | 150 | <usages-collector id="statistics.file.types.edit"> |
174 | <counts> | 151 | <counts> |
175 | - <entry key="CSS" value="3084" /> | ||
176 | - <entry key="HTML" value="6597" /> | 152 | + <entry key="CSS" value="3433" /> |
153 | + <entry key="HTML" value="7001" /> | ||
177 | <entry key="JavaScript" value="72" /> | 154 | <entry key="JavaScript" value="72" /> |
178 | </counts> | 155 | </counts> |
179 | </usages-collector> | 156 | </usages-collector> |
@@ -182,29 +159,54 @@ | @@ -182,29 +159,54 @@ | ||
182 | <component name="FileEditorManager"> | 159 | <component name="FileEditorManager"> |
183 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> | 160 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> |
184 | <file pinned="false" current-in-tab="false"> | 161 | <file pinned="false" current-in-tab="false"> |
185 | - <entry file="file://$PROJECT_DIR$/html/search_no_2.html"> | 162 | + <entry file="file://$PROJECT_DIR$/html/gsjj.html"> |
186 | <provider selected="true" editor-type-id="text-editor"> | 163 | <provider selected="true" editor-type-id="text-editor"> |
187 | - <state relative-caret-position="352"> | ||
188 | - <caret line="250" column="43" lean-forward="true" selection-start-line="250" selection-start-column="43" selection-end-line="250" selection-end-column="43" /> | 164 | + <state relative-caret-position="258"> |
165 | + <caret line="420" column="18" lean-forward="true" selection-start-line="420" selection-start-column="18" selection-end-line="420" selection-end-column="18" /> | ||
189 | <folding> | 166 | <folding> |
190 | <element signature="n#style#0;n#head#0;n#html#0;n#!!top" /> | 167 | <element signature="n#style#0;n#head#0;n#html#0;n#!!top" /> |
168 | + <element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
191 | <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | 169 | <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> |
192 | <element signature="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#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" /> | ||
172 | + <element signature="n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
173 | + <element signature="n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
174 | + <element signature="n#style#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
175 | + <element signature="n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
176 | + <element signature="n#div#1;n#div#5;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
177 | + <element signature="n#div#0;n#div#2;n#div#5;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
178 | + <element signature="n#div#1;n#div#2;n#div#5;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
179 | + <element signature="n#div#0;n#div#2;n#div#6;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
180 | + <element signature="n#div#1;n#div#2;n#div#6;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
181 | + <element signature="n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
193 | </folding> | 182 | </folding> |
194 | </state> | 183 | </state> |
195 | </provider> | 184 | </provider> |
196 | </entry> | 185 | </entry> |
197 | </file> | 186 | </file> |
198 | - <file pinned="false" current-in-tab="true"> | 187 | + <file pinned="false" current-in-tab="false"> |
188 | + <entry file="file://$PROJECT_DIR$/css/index.css"> | ||
189 | + <provider selected="true" editor-type-id="text-editor"> | ||
190 | + <state relative-caret-position="634"> | ||
191 | + <caret line="432" column="25" selection-start-line="432" selection-start-column="25" selection-end-line="432" selection-end-column="25" /> | ||
192 | + </state> | ||
193 | + </provider> | ||
194 | + </entry> | ||
195 | + </file> | ||
196 | + <file pinned="false" current-in-tab="false"> | ||
199 | <entry file="file://$PROJECT_DIR$/html/index.html"> | 197 | <entry file="file://$PROJECT_DIR$/html/index.html"> |
200 | <provider selected="true" editor-type-id="text-editor"> | 198 | <provider selected="true" editor-type-id="text-editor"> |
201 | - <state relative-caret-position="54"> | ||
202 | - <caret line="2" column="6" lean-forward="true" selection-start-line="2" selection-start-column="6" selection-end-line="2" selection-end-column="6" /> | 199 | + <state relative-caret-position="189"> |
200 | + <caret line="297" column="50" lean-forward="true" selection-start-line="297" selection-start-column="50" selection-end-line="297" selection-end-column="50" /> | ||
203 | <folding> | 201 | <folding> |
204 | <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | 202 | <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> |
205 | <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | 203 | <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> |
206 | <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | 204 | <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> |
207 | - <element signature="n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | 205 | + <element signature="n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> |
206 | + <element signature="n#div#0;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
207 | + <element signature="n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
208 | + <element signature="n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
209 | + <element signature="n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
208 | <element signature="n#div#1;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | 210 | <element signature="n#div#1;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> |
209 | <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" /> | 211 | <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" /> |
210 | <element signature="n#div#1;n#div#0;n#div#2;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | 212 | <element signature="n#div#1;n#div#0;n#div#2;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> |
@@ -221,69 +223,120 @@ | @@ -221,69 +223,120 @@ | ||
221 | </entry> | 223 | </entry> |
222 | </file> | 224 | </file> |
223 | <file pinned="false" current-in-tab="false"> | 225 | <file pinned="false" current-in-tab="false"> |
224 | - <entry file="file://$PROJECT_DIR$/css/search_2.css"> | 226 | + <entry file="file://$PROJECT_DIR$/css/swiper.css"> |
225 | <provider selected="true" editor-type-id="text-editor"> | 227 | <provider selected="true" editor-type-id="text-editor"> |
226 | - <state relative-caret-position="347"> | ||
227 | - <caret line="302" column="18" lean-forward="true" selection-start-line="302" selection-start-column="18" selection-end-line="302" selection-end-column="18" /> | 228 | + <state relative-caret-position="162"> |
229 | + <caret line="54" column="22" lean-forward="true" selection-start-line="54" selection-start-column="22" selection-end-line="54" selection-end-column="22" /> | ||
228 | </state> | 230 | </state> |
229 | </provider> | 231 | </provider> |
230 | </entry> | 232 | </entry> |
231 | </file> | 233 | </file> |
232 | <file pinned="false" current-in-tab="false"> | 234 | <file pinned="false" current-in-tab="false"> |
233 | - <entry file="file://$PROJECT_DIR$/html/search_2.html"> | 235 | + <entry file="file://$PROJECT_DIR$/html/zxdt.html"> |
234 | <provider selected="true" editor-type-id="text-editor"> | 236 | <provider selected="true" editor-type-id="text-editor"> |
235 | - <state relative-caret-position="317"> | ||
236 | - <caret line="328" column="27" lean-forward="true" selection-start-line="328" selection-start-column="27" selection-end-line="328" selection-end-column="27" /> | 237 | + <state relative-caret-position="297"> |
238 | + <caret line="11" column="4" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="70" /> | ||
237 | <folding> | 239 | <folding> |
238 | <element signature="n#style#0;n#head#0;n#html#0;n#!!top" /> | 240 | <element signature="n#style#0;n#head#0;n#html#0;n#!!top" /> |
241 | + <element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
239 | <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | 242 | <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> |
240 | <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | 243 | <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> |
244 | + <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" /> | ||
245 | + <element signature="e#6671#10447#0" /> | ||
241 | </folding> | 246 | </folding> |
242 | </state> | 247 | </state> |
243 | </provider> | 248 | </provider> |
244 | </entry> | 249 | </entry> |
245 | </file> | 250 | </file> |
246 | <file pinned="false" current-in-tab="false"> | 251 | <file pinned="false" current-in-tab="false"> |
247 | - <entry file="file://$PROJECT_DIR$/css/common.css"> | 252 | + <entry file="file://$PROJECT_DIR$/html/sckj.html"> |
248 | <provider selected="true" editor-type-id="text-editor"> | 253 | <provider selected="true" editor-type-id="text-editor"> |
249 | - <state relative-caret-position="135"> | ||
250 | - <caret line="5" column="2" selection-start-line="5" selection-start-column="2" selection-end-line="5" selection-end-column="2" /> | 254 | + <state relative-caret-position="489"> |
255 | + <caret line="430" column="6" lean-forward="true" selection-start-line="430" selection-start-column="6" selection-end-line="430" selection-end-column="6" /> | ||
256 | + <folding> | ||
257 | + <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
258 | + <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
259 | + <element signature="n#div#0;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
260 | + <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" /> | ||
261 | + <element signature="n#div#7;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
262 | + <element signature="n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
263 | + <element signature="n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
264 | + <element signature="n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
265 | + <element signature="e#10557#10608#0" /> | ||
266 | + <element signature="e#10635#10685#0" /> | ||
267 | + <element signature="e#10707#10757#0" /> | ||
268 | + <element signature="e#10781#10833#0" /> | ||
269 | + <element signature="e#10857#10907#0" /> | ||
270 | + <element signature="e#10931#10981#0" /> | ||
271 | + <element signature="e#11005#11057#0" /> | ||
272 | + <element signature="e#11081#11133#0" /> | ||
273 | + <element signature="e#11208#11550#0" /> | ||
274 | + <element signature="e#10805#15478#0" /> | ||
275 | + <element signature="e#11900#12399#0" /> | ||
276 | + </folding> | ||
251 | </state> | 277 | </state> |
252 | </provider> | 278 | </provider> |
253 | </entry> | 279 | </entry> |
254 | </file> | 280 | </file> |
255 | - <file pinned="false" current-in-tab="false"> | ||
256 | - <entry file="file://$PROJECT_DIR$/css/fwcx_4.css"> | 281 | + <file pinned="false" current-in-tab="true"> |
282 | + <entry file="file://$PROJECT_DIR$/html/lxwm_5.html"> | ||
257 | <provider selected="true" editor-type-id="text-editor"> | 283 | <provider selected="true" editor-type-id="text-editor"> |
258 | - <state relative-caret-position="374"> | ||
259 | - <caret line="301" column="23" lean-forward="true" selection-start-line="301" selection-start-column="23" selection-end-line="301" selection-end-column="23" /> | 284 | + <state relative-caret-position="474"> |
285 | + <caret line="518" column="15" selection-start-line="518" selection-start-column="15" selection-end-line="518" selection-end-column="15" /> | ||
260 | <folding> | 286 | <folding> |
261 | - <element signature="e#14#95#0" /> | ||
262 | - <element signature="e#106#188#0" /> | 287 | + <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> |
288 | + <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
289 | + <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
290 | + <element signature="n#div#0;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
291 | + <element signature="n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
292 | + <element signature="n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
293 | + <element signature="n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
294 | + <element signature="n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
295 | + <element signature="n#div#1;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
296 | + <element signature="n#div#1;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
297 | + <element signature="n#div#2;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
298 | + <element signature="n#div#3;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
299 | + <element signature="n#div#0;n#div#3;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
300 | + <element signature="n#div#1;n#div#3;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
301 | + <element signature="n#div#3;n#div#3;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
302 | + <element signature="n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
303 | + <element signature="n#div#4;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
304 | + <element signature="n#div#0;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
305 | + <element signature="n#div#0;n#div#1;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
306 | + <element signature="n#select#0;n#div#0;n#div#1;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
307 | + <element signature="n#div#1;n#div#1;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
308 | + <element signature="n#div#3;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
309 | + <element signature="n#div#4;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
310 | + <element signature="n#div#0;n#div#6;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
311 | + <element signature="n#div#1;n#div#6;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
312 | + <element signature="n#div#2;n#div#6;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
313 | + <element signature="n#div#3;n#div#6;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
314 | + <element signature="n#div#4;n#div#6;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
315 | + <element signature="n#div#5;n#div#6;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
316 | + <element signature="n#div#7;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
317 | + <element signature="n#div#8;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
318 | + <element signature="n#div#10;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
319 | + <element signature="n#div#11;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
320 | + <element signature="n#div#12;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
321 | + <element signature="n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
322 | + <element signature="e#14357#14910#0" /> | ||
323 | + <element signature="e#14958#15176#0" /> | ||
324 | + <element signature="e#15212#15430#0" /> | ||
325 | + <element signature="e#15477#15924#0" /> | ||
326 | + <element signature="e#15962#16409#0" /> | ||
327 | + <element signature="e#17134#17193#0" /> | ||
328 | + <element signature="e#17530#17670#0" /> | ||
329 | + <element signature="e#17748#17827#0" /> | ||
263 | </folding> | 330 | </folding> |
264 | </state> | 331 | </state> |
265 | </provider> | 332 | </provider> |
266 | </entry> | 333 | </entry> |
267 | </file> | 334 | </file> |
268 | <file pinned="false" current-in-tab="false"> | 335 | <file pinned="false" current-in-tab="false"> |
269 | - <entry file="file://$PROJECT_DIR$/html/fwcx_4_1result.html"> | 336 | + <entry file="file://$PROJECT_DIR$/css/sckj.css"> |
270 | <provider selected="true" editor-type-id="text-editor"> | 337 | <provider selected="true" editor-type-id="text-editor"> |
271 | - <state relative-caret-position="108"> | ||
272 | - <caret line="65" column="6" lean-forward="true" selection-start-line="65" selection-start-column="6" selection-end-line="65" selection-end-column="6" /> | ||
273 | - <folding> | ||
274 | - <element signature="n#style#0;n#head#0;n#html#0;n#!!top" /> | ||
275 | - <element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
276 | - <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
277 | - <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
278 | - <element signature="e#6307#6358#0" /> | ||
279 | - <element signature="e#6385#6435#0" /> | ||
280 | - <element signature="e#6457#6507#0" /> | ||
281 | - <element signature="e#6531#6583#0" /> | ||
282 | - <element signature="e#6607#6657#0" /> | ||
283 | - <element signature="e#6681#6731#0" /> | ||
284 | - <element signature="e#6755#6807#0" /> | ||
285 | - <element signature="e#6831#6883#0" /> | ||
286 | - </folding> | 338 | + <state relative-caret-position="-1067"> |
339 | + <caret line="166" column="1" lean-forward="true" selection-start-line="166" selection-start-column="1" selection-end-line="166" selection-end-column="1" /> | ||
287 | </state> | 340 | </state> |
288 | </provider> | 341 | </provider> |
289 | </entry> | 342 | </entry> |
@@ -317,48 +370,6 @@ | @@ -317,48 +370,6 @@ | ||
317 | </provider> | 370 | </provider> |
318 | </entry> | 371 | </entry> |
319 | </file> | 372 | </file> |
320 | - <file pinned="false" current-in-tab="false"> | ||
321 | - <entry file="file://$PROJECT_DIR$/html/fwcx_4.html"> | ||
322 | - <provider selected="true" editor-type-id="text-editor"> | ||
323 | - <state relative-caret-position="220"> | ||
324 | - <caret line="394" column="5" lean-forward="true" selection-start-line="394" selection-start-column="5" selection-end-line="394" selection-end-column="5" /> | ||
325 | - <folding> | ||
326 | - <element signature="n#style#0;n#head#0;n#html#0;n#!!top" /> | ||
327 | - <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
328 | - <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
329 | - <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
330 | - <element signature="n#div#0;n#div#0;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
331 | - <element signature="n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
332 | - <element signature="n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
333 | - <element signature="n#div#4;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
334 | - <element signature="n#div#0;n#div#4;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
335 | - <element signature="n#div#1;n#div#4;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
336 | - <element signature="n#div#5;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
337 | - <element signature="n#div#7;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
338 | - <element signature="n#div#8;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
339 | - <element signature="n#div#1;n#div#8;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
340 | - <element signature="n#div#9;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
341 | - <element signature="n#div#10;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
342 | - <element signature="n#div#0;n#div#11;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
343 | - <element signature="n#div#2;n#div#11;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
344 | - <element signature="n#div#3;n#div#11;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
345 | - <element signature="n#div#6;n#div#11;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
346 | - <element signature="n#div#14;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
347 | - <element signature="n#div#0;n#div#14;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
348 | - <element signature="n#div#1;n#div#14;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
349 | - <element signature="n#style#0;n#div#15;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
350 | - <element signature="n#div#15;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
351 | - <element signature="n#div#16;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
352 | - <element signature="n#div#0;n#div#16;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
353 | - <element signature="n#div#1;n#div#16;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
354 | - <element signature="n#style#0;n#div#17;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
355 | - <element signature="n#div#17;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
356 | - <element signature="n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
357 | - </folding> | ||
358 | - </state> | ||
359 | - </provider> | ||
360 | - </entry> | ||
361 | - </file> | ||
362 | </leaf> | 373 | </leaf> |
363 | </component> | 374 | </component> |
364 | <component name="FileTemplateManagerImpl"> | 375 | <component name="FileTemplateManagerImpl"> |
@@ -371,21 +382,8 @@ | @@ -371,21 +382,8 @@ | ||
371 | </component> | 382 | </component> |
372 | <component name="FindInProjectRecents"> | 383 | <component name="FindInProjectRecents"> |
373 | <findStrings> | 384 | <findStrings> |
374 | - <find>item_big_text</find> | ||
375 | - <find>item_a</find> | ||
376 | - <find>pic2_box</find> | ||
377 | - <find>mid_new_box</find> | ||
378 | - <find>pic2_big_box</find> | ||
379 | - <find>查看更多</find> | ||
380 | - <find>bottom_view</find> | ||
381 | - <find>top</find> | ||
382 | - <find>pic1_mid</find> | ||
383 | - <find>search</find> | ||
384 | - <find>box</find> | ||
385 | - <find>下一页</find> | ||
386 | <find>left</find> | 385 | <find>left</find> |
387 | <find>leng</find> | 386 | <find>leng</find> |
388 | - <find>pic4_banner</find> | ||
389 | <find>pic4_sub</find> | 387 | <find>pic4_sub</find> |
390 | <find>mid_remark</find> | 388 | <find>mid_remark</find> |
391 | <find>备注</find> | 389 | <find>备注</find> |
@@ -393,7 +391,6 @@ | @@ -393,7 +391,6 @@ | ||
393 | <find>mid_selec</find> | 391 | <find>mid_selec</find> |
394 | <find>mid</find> | 392 | <find>mid</find> |
395 | <find>footer_menu</find> | 393 | <find>footer_menu</find> |
396 | - <find>banner</find> | ||
397 | <find>bottom</find> | 394 | <find>bottom</find> |
398 | <find>footer</find> | 395 | <find>footer</find> |
399 | <find>mid_items</find> | 396 | <find>mid_items</find> |
@@ -401,6 +398,20 @@ | @@ -401,6 +398,20 @@ | ||
401 | <find>.mid_count</find> | 398 | <find>.mid_count</find> |
402 | <find>.mid_count_number</find> | 399 | <find>.mid_count_number</find> |
403 | <find>btn_search()</find> | 400 | <find>btn_search()</find> |
401 | + <find>mid_color</find> | ||
402 | + <find>mid_color_box</find> | ||
403 | + <find>mid_box</find> | ||
404 | + <find>pic4_banner_lef</find> | ||
405 | + <find>pic4_banner_left</find> | ||
406 | + <find>pic3_</find> | ||
407 | + <find>pic4_banner</find> | ||
408 | + <find>pic1_mid</find> | ||
409 | + <find>banner</find> | ||
410 | + <find>pic1_mid_bottom</find> | ||
411 | + <find>mid_top_item</find> | ||
412 | + <find>mid_lis</find> | ||
413 | + <find>allmap</find> | ||
414 | + <find>btn_location</find> | ||
404 | </findStrings> | 415 | </findStrings> |
405 | <replaceStrings> | 416 | <replaceStrings> |
406 | <replace>div</replace> | 417 | <replace>div</replace> |
@@ -429,26 +440,20 @@ | @@ -429,26 +440,20 @@ | ||
429 | <option value="$PROJECT_DIR$/html/dtxq.html" /> | 440 | <option value="$PROJECT_DIR$/html/dtxq.html" /> |
430 | <option value="$PROJECT_DIR$/js/paging.js" /> | 441 | <option value="$PROJECT_DIR$/js/paging.js" /> |
431 | <option value="$PROJECT_DIR$/html/cpxq_2.html" /> | 442 | <option value="$PROJECT_DIR$/html/cpxq_2.html" /> |
432 | - <option value="$PROJECT_DIR$/html/gsjj.html" /> | ||
433 | <option value="$PROJECT_DIR$/css/gsjj.css" /> | 443 | <option value="$PROJECT_DIR$/css/gsjj.css" /> |
434 | <option value="$PROJECT_DIR$/css/cpzx_2.css" /> | 444 | <option value="$PROJECT_DIR$/css/cpzx_2.css" /> |
435 | <option value="$PROJECT_DIR$/css/paging.css" /> | 445 | <option value="$PROJECT_DIR$/css/paging.css" /> |
436 | <option value="$PROJECT_DIR$/js/page.js" /> | 446 | <option value="$PROJECT_DIR$/js/page.js" /> |
437 | <option value="$PROJECT_DIR$/css/page.css" /> | 447 | <option value="$PROJECT_DIR$/css/page.css" /> |
438 | <option value="$PROJECT_DIR$/css/lxwm_5.css" /> | 448 | <option value="$PROJECT_DIR$/css/lxwm_5.css" /> |
439 | - <option value="$PROJECT_DIR$/css/index.css" /> | ||
440 | <option value="$PROJECT_DIR$/html/cpzx_2.html" /> | 449 | <option value="$PROJECT_DIR$/html/cpzx_2.html" /> |
441 | - <option value="$PROJECT_DIR$/html/index.html" /> | ||
442 | <option value="$PROJECT_DIR$/html/jm_3.html" /> | 450 | <option value="$PROJECT_DIR$/html/jm_3.html" /> |
443 | - <option value="$PROJECT_DIR$/html/lxwm_5.html" /> | ||
444 | <option value="$PROJECT_DIR$/css/fwcx_4_1result.css" /> | 451 | <option value="$PROJECT_DIR$/css/fwcx_4_1result.css" /> |
445 | <option value="$PROJECT_DIR$/html/fwcx_4_1result.html" /> | 452 | <option value="$PROJECT_DIR$/html/fwcx_4_1result.html" /> |
446 | <option value="$PROJECT_DIR$/css/fwcx_4_2result.css" /> | 453 | <option value="$PROJECT_DIR$/css/fwcx_4_2result.css" /> |
447 | <option value="$PROJECT_DIR$/html/fwcx_4_2result.html" /> | 454 | <option value="$PROJECT_DIR$/html/fwcx_4_2result.html" /> |
448 | <option value="$PROJECT_DIR$/css/fwxc_4_3result_none.css" /> | 455 | <option value="$PROJECT_DIR$/css/fwxc_4_3result_none.css" /> |
449 | <option value="$PROJECT_DIR$/html/fwxc_4_3result_none.html" /> | 456 | <option value="$PROJECT_DIR$/html/fwxc_4_3result_none.html" /> |
450 | - <option value="$PROJECT_DIR$/html/sckj.html" /> | ||
451 | - <option value="$PROJECT_DIR$/css/sckj.css" /> | ||
452 | <option value="$PROJECT_DIR$/css/cpxq_2.css" /> | 457 | <option value="$PROJECT_DIR$/css/cpxq_2.css" /> |
453 | <option value="$PROJECT_DIR$/html/search_no_2.html" /> | 458 | <option value="$PROJECT_DIR$/html/search_no_2.html" /> |
454 | <option value="$PROJECT_DIR$/css/search_no_2.css" /> | 459 | <option value="$PROJECT_DIR$/css/search_no_2.css" /> |
@@ -457,6 +462,12 @@ | @@ -457,6 +462,12 @@ | ||
457 | <option value="$PROJECT_DIR$/css/search_2.css" /> | 462 | <option value="$PROJECT_DIR$/css/search_2.css" /> |
458 | <option value="$PROJECT_DIR$/css/fwcx_4.css" /> | 463 | <option value="$PROJECT_DIR$/css/fwcx_4.css" /> |
459 | <option value="$PROJECT_DIR$/html/fwcx_4.html" /> | 464 | <option value="$PROJECT_DIR$/html/fwcx_4.html" /> |
465 | + <option value="$PROJECT_DIR$/html/gsjj.html" /> | ||
466 | + <option value="$PROJECT_DIR$/css/index.css" /> | ||
467 | + <option value="$PROJECT_DIR$/html/index.html" /> | ||
468 | + <option value="$PROJECT_DIR$/css/sckj.css" /> | ||
469 | + <option value="$PROJECT_DIR$/html/sckj.html" /> | ||
470 | + <option value="$PROJECT_DIR$/html/lxwm_5.html" /> | ||
460 | </list> | 471 | </list> |
461 | </option> | 472 | </option> |
462 | </component> | 473 | </component> |
@@ -467,10 +478,10 @@ | @@ -467,10 +478,10 @@ | ||
467 | <sorting>DEFINITION_ORDER</sorting> | 478 | <sorting>DEFINITION_ORDER</sorting> |
468 | </component> | 479 | </component> |
469 | <component name="ProjectFrameBounds"> | 480 | <component name="ProjectFrameBounds"> |
470 | - <option name="x" value="94" /> | ||
471 | - <option name="y" value="84" /> | ||
472 | - <option name="width" value="1650" /> | ||
473 | - <option name="height" value="999" /> | 481 | + <option name="x" value="232" /> |
482 | + <option name="y" value="69" /> | ||
483 | + <option name="width" value="1849" /> | ||
484 | + <option name="height" value="943" /> | ||
474 | </component> | 485 | </component> |
475 | <component name="ProjectView"> | 486 | <component name="ProjectView"> |
476 | <navigator proportions="" version="1"> | 487 | <navigator proportions="" version="1"> |
@@ -520,7 +531,7 @@ | @@ -520,7 +531,7 @@ | ||
520 | <property name="DefaultHtmlFileTemplate" value="HTML File" /> | 531 | <property name="DefaultHtmlFileTemplate" value="HTML File" /> |
521 | <property name="SearchEverywhereHistoryKey" value="	FILE	file://F:/ljh项目/可耐美手机端/clime/html/cpxq_2.html" /> | 532 | <property name="SearchEverywhereHistoryKey" value="	FILE	file://F:/ljh项目/可耐美手机端/clime/html/cpxq_2.html" /> |
522 | <property name="WebServerToolWindowFactoryState" value="false" /> | 533 | <property name="WebServerToolWindowFactoryState" value="false" /> |
523 | - <property name="last_opened_file_path" value="$PROJECT_DIR$/../../企业微信/Wechat_project_1" /> | 534 | + <property name="last_opened_file_path" value="F:/案例项目/kenaimei" /> |
524 | <property name="list.type.of.created.stylesheet" value="CSS" /> | 535 | <property name="list.type.of.created.stylesheet" value="CSS" /> |
525 | <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> | 536 | <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> |
526 | <property name="nodejs_npm_path_reset_for_default_project" value="true" /> | 537 | <property name="nodejs_npm_path_reset_for_default_project" value="true" /> |
@@ -576,18 +587,18 @@ | @@ -576,18 +587,18 @@ | ||
576 | <workItem from="1548236542901" duration="5554000" /> | 587 | <workItem from="1548236542901" duration="5554000" /> |
577 | <workItem from="1548289565644" duration="30059000" /> | 588 | <workItem from="1548289565644" duration="30059000" /> |
578 | <workItem from="1548376254799" duration="35479000" /> | 589 | <workItem from="1548376254799" duration="35479000" /> |
579 | - <workItem from="1548635475488" duration="21773000" /> | 590 | + <workItem from="1548635475488" duration="29255000" /> |
580 | </task> | 591 | </task> |
581 | <servers /> | 592 | <servers /> |
582 | </component> | 593 | </component> |
583 | <component name="TimeTrackingManager"> | 594 | <component name="TimeTrackingManager"> |
584 | - <option name="totallyTimeSpent" value="256720000" /> | 595 | + <option name="totallyTimeSpent" value="264202000" /> |
585 | </component> | 596 | </component> |
586 | <component name="ToolWindowManager"> | 597 | <component name="ToolWindowManager"> |
587 | - <frame x="94" y="84" width="1650" height="999" extended-state="0" /> | 598 | + <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> |
588 | <editor active="true" /> | 599 | <editor active="true" /> |
589 | <layout> | 600 | <layout> |
590 | - <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4993464" visible="true" weight="0.16997519" /> | 601 | + <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4993464" visible="true" weight="0.14605543" /> |
591 | <window_info id="Structure" order="1" sideWeight="0.5006536" side_tool="true" weight="0.16211294" /> | 602 | <window_info id="Structure" order="1" sideWeight="0.5006536" side_tool="true" weight="0.16211294" /> |
592 | <window_info id="Favorites" order="2" side_tool="true" /> | 603 | <window_info id="Favorites" order="2" side_tool="true" /> |
593 | <window_info anchor="bottom" id="Message" order="0" /> | 604 | <window_info anchor="bottom" id="Message" order="0" /> |
@@ -599,11 +610,11 @@ | @@ -599,11 +610,11 @@ | ||
599 | <window_info anchor="bottom" id="TODO" order="6" /> | 610 | <window_info anchor="bottom" id="TODO" order="6" /> |
600 | <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> | 611 | <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> |
601 | <window_info anchor="bottom" id="Version Control" order="8" /> | 612 | <window_info anchor="bottom" id="Version Control" order="8" /> |
602 | - <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.1400463" /> | 613 | + <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.042345278" /> |
603 | <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" /> | 614 | <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" /> |
604 | <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> | 615 | <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> |
605 | <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> | 616 | <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> |
606 | - <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> | 617 | + <window_info active="true" anchor="right" content_ui="combo" id="Hierarchy" order="2" visible="true" weight="0.07835821" /> |
607 | </layout> | 618 | </layout> |
608 | </component> | 619 | </component> |
609 | <component name="TypeScriptGeneratedFilesManager"> | 620 | <component name="TypeScriptGeneratedFilesManager"> |
@@ -671,9 +682,6 @@ | @@ -671,9 +682,6 @@ | ||
671 | </state> | 682 | </state> |
672 | </provider> | 683 | </provider> |
673 | </entry> | 684 | </entry> |
674 | - <entry file="file://$PROJECT_DIR$/css/swiper.css"> | ||
675 | - <provider selected="true" editor-type-id="text-editor" /> | ||
676 | - </entry> | ||
677 | <entry file="file://$PROJECT_DIR$/css/jpal.css"> | 685 | <entry file="file://$PROJECT_DIR$/css/jpal.css"> |
678 | <provider selected="true" editor-type-id="text-editor"> | 686 | <provider selected="true" editor-type-id="text-editor"> |
679 | <state relative-caret-position="-342"> | 687 | <state relative-caret-position="-342"> |
@@ -752,13 +760,6 @@ | @@ -752,13 +760,6 @@ | ||
752 | </state> | 760 | </state> |
753 | </provider> | 761 | </provider> |
754 | </entry> | 762 | </entry> |
755 | - <entry file="file://$PROJECT_DIR$/css/index.css"> | ||
756 | - <provider selected="true" editor-type-id="text-editor"> | ||
757 | - <state relative-caret-position="252"> | ||
758 | - <caret line="377" column="18" selection-start-line="377" selection-start-column="18" selection-end-line="377" selection-end-column="18" /> | ||
759 | - </state> | ||
760 | - </provider> | ||
761 | - </entry> | ||
762 | <entry file="file://$PROJECT_DIR$/html/alxq.html"> | 763 | <entry file="file://$PROJECT_DIR$/html/alxq.html"> |
763 | <provider selected="true" editor-type-id="text-editor"> | 764 | <provider selected="true" editor-type-id="text-editor"> |
764 | <state relative-caret-position="378"> | 765 | <state relative-caret-position="378"> |
@@ -813,30 +814,6 @@ | @@ -813,30 +814,6 @@ | ||
813 | </state> | 814 | </state> |
814 | </provider> | 815 | </provider> |
815 | </entry> | 816 | </entry> |
816 | - <entry file="file://$PROJECT_DIR$/html/gsjj.html"> | ||
817 | - <provider selected="true" editor-type-id="text-editor"> | ||
818 | - <state relative-caret-position="1296"> | ||
819 | - <caret line="357" column="8" selection-start-line="357" selection-start-column="8" selection-end-line="357" selection-end-column="8" /> | ||
820 | - <folding> | ||
821 | - <element signature="n#style#0;n#head#0;n#html#0;n#!!top" /> | ||
822 | - <element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
823 | - <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
824 | - <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
825 | - <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
826 | - <element signature="n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
827 | - <element signature="n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
828 | - <element signature="n#style#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
829 | - <element signature="n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
830 | - <element signature="n#div#1;n#div#5;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
831 | - <element signature="n#div#0;n#div#2;n#div#5;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
832 | - <element signature="n#div#1;n#div#2;n#div#5;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
833 | - <element signature="n#div#0;n#div#2;n#div#6;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
834 | - <element signature="n#div#1;n#div#2;n#div#6;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
835 | - <element signature="n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
836 | - </folding> | ||
837 | - </state> | ||
838 | - </provider> | ||
839 | - </entry> | ||
840 | <entry file="file://$PROJECT_DIR$/html/jm_3.html"> | 817 | <entry file="file://$PROJECT_DIR$/html/jm_3.html"> |
841 | <provider selected="true" editor-type-id="text-editor"> | 818 | <provider selected="true" editor-type-id="text-editor"> |
842 | <state relative-caret-position="378"> | 819 | <state relative-caret-position="378"> |
@@ -890,19 +867,6 @@ | @@ -890,19 +867,6 @@ | ||
890 | </state> | 867 | </state> |
891 | </provider> | 868 | </provider> |
892 | </entry> | 869 | </entry> |
893 | - <entry file="file://$PROJECT_DIR$/html/zxdt.html"> | ||
894 | - <provider selected="true" editor-type-id="text-editor"> | ||
895 | - <state relative-caret-position="324"> | ||
896 | - <caret line="12" selection-start-line="12" selection-end-line="12" /> | ||
897 | - <folding> | ||
898 | - <element signature="n#style#0;n#head#0;n#html#0;n#!!top" /> | ||
899 | - <element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
900 | - <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
901 | - <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
902 | - </folding> | ||
903 | - </state> | ||
904 | - </provider> | ||
905 | - </entry> | ||
906 | <entry file="file://$PROJECT_DIR$/css/fwcx_4_1result.css"> | 870 | <entry file="file://$PROJECT_DIR$/css/fwcx_4_1result.css"> |
907 | <provider selected="true" editor-type-id="text-editor"> | 871 | <provider selected="true" editor-type-id="text-editor"> |
908 | <state relative-caret-position="1998"> | 872 | <state relative-caret-position="1998"> |
@@ -924,74 +888,6 @@ | @@ -924,74 +888,6 @@ | ||
924 | </state> | 888 | </state> |
925 | </provider> | 889 | </provider> |
926 | </entry> | 890 | </entry> |
927 | - <entry file="file://$PROJECT_DIR$/html/lxwm_5.html"> | ||
928 | - <provider selected="true" editor-type-id="text-editor"> | ||
929 | - <state relative-caret-position="243"> | ||
930 | - <caret line="442" column="58" lean-forward="true" selection-start-line="442" selection-start-column="58" selection-end-line="442" selection-end-column="58" /> | ||
931 | - <folding> | ||
932 | - <element signature="n#style#0;n#head#0;n#html#0;n#!!top" /> | ||
933 | - <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
934 | - <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
935 | - <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
936 | - <element signature="n#div#0;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
937 | - <element signature="n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
938 | - <element signature="n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
939 | - <element signature="n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
940 | - <element signature="n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
941 | - <element signature="n#div#1;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
942 | - <element signature="n#div#1;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
943 | - <element signature="n#div#2;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
944 | - <element signature="n#div#3;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
945 | - <element signature="n#div#0;n#div#3;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
946 | - <element signature="n#div#1;n#div#3;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
947 | - <element signature="n#div#3;n#div#3;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
948 | - <element signature="n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
949 | - <element signature="n#div#4;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
950 | - <element signature="n#div#0;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
951 | - <element signature="n#div#0;n#div#1;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
952 | - <element signature="n#select#0;n#div#0;n#div#1;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
953 | - <element signature="n#div#1;n#div#1;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
954 | - <element signature="n#div#2;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
955 | - <element signature="n#div#3;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
956 | - <element signature="n#div#4;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
957 | - <element signature="n#div#0;n#div#6;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
958 | - <element signature="n#div#1;n#div#6;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
959 | - <element signature="n#div#2;n#div#6;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
960 | - <element signature="n#div#3;n#div#6;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
961 | - <element signature="n#div#4;n#div#6;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
962 | - <element signature="n#div#5;n#div#6;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
963 | - <element signature="n#div#7;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
964 | - <element signature="n#div#8;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
965 | - <element signature="n#div#10;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
966 | - <element signature="n#div#11;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
967 | - <element signature="n#div#12;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
968 | - <element signature="n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
969 | - </folding> | ||
970 | - </state> | ||
971 | - </provider> | ||
972 | - </entry> | ||
973 | - <entry file="file://$PROJECT_DIR$/html/sckj.html"> | ||
974 | - <provider selected="true" editor-type-id="text-editor"> | ||
975 | - <state relative-caret-position="212"> | ||
976 | - <caret line="296" column="18" lean-forward="true" selection-start-line="279" selection-start-column="12" selection-end-line="296" selection-end-column="18" /> | ||
977 | - <folding> | ||
978 | - <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
979 | - <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
980 | - <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" /> | ||
981 | - <element signature="n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
982 | - <element signature="n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
983 | - <element signature="n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
984 | - </folding> | ||
985 | - </state> | ||
986 | - </provider> | ||
987 | - </entry> | ||
988 | - <entry file="file://$PROJECT_DIR$/css/sckj.css"> | ||
989 | - <provider selected="true" editor-type-id="text-editor"> | ||
990 | - <state relative-caret-position="131"> | ||
991 | - <caret line="419" column="18" lean-forward="true" selection-start-line="419" selection-start-column="18" selection-end-line="419" selection-end-column="18" /> | ||
992 | - </state> | ||
993 | - </provider> | ||
994 | - </entry> | ||
995 | <entry file="file://$PROJECT_DIR$/html/cpzx_2.html"> | 891 | <entry file="file://$PROJECT_DIR$/html/cpzx_2.html"> |
996 | <provider selected="true" editor-type-id="text-editor"> | 892 | <provider selected="true" editor-type-id="text-editor"> |
997 | <state relative-caret-position="231"> | 893 | <state relative-caret-position="231"> |
@@ -1174,15 +1070,72 @@ | @@ -1174,15 +1070,72 @@ | ||
1174 | </state> | 1070 | </state> |
1175 | </provider> | 1071 | </provider> |
1176 | </entry> | 1072 | </entry> |
1177 | - <entry file="file://$PROJECT_DIR$/html/index.html"> | 1073 | + <entry file="file://$PROJECT_DIR$/html/gsjj.html"> |
1178 | <provider selected="true" editor-type-id="text-editor"> | 1074 | <provider selected="true" editor-type-id="text-editor"> |
1179 | - <state relative-caret-position="54"> | ||
1180 | - <caret line="2" column="6" lean-forward="true" selection-start-line="2" selection-start-column="6" selection-end-line="2" selection-end-column="6" /> | 1075 | + <state relative-caret-position="258"> |
1076 | + <caret line="420" column="18" lean-forward="true" selection-start-line="420" selection-start-column="18" selection-end-line="420" selection-end-column="18" /> | ||
1181 | <folding> | 1077 | <folding> |
1078 | + <element signature="n#style#0;n#head#0;n#html#0;n#!!top" /> | ||
1079 | + <element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1182 | <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | 1080 | <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> |
1183 | <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | 1081 | <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> |
1184 | <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | 1082 | <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> |
1185 | <element signature="n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | 1083 | <element signature="n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> |
1084 | + <element signature="n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1085 | + <element signature="n#style#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
1086 | + <element signature="n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1087 | + <element signature="n#div#1;n#div#5;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1088 | + <element signature="n#div#0;n#div#2;n#div#5;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1089 | + <element signature="n#div#1;n#div#2;n#div#5;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1090 | + <element signature="n#div#0;n#div#2;n#div#6;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1091 | + <element signature="n#div#1;n#div#2;n#div#6;n#div#0;n#div#5;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1092 | + <element signature="n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1093 | + </folding> | ||
1094 | + </state> | ||
1095 | + </provider> | ||
1096 | + </entry> | ||
1097 | + <entry file="file://$PROJECT_DIR$/html/zxdt.html"> | ||
1098 | + <provider selected="true" editor-type-id="text-editor"> | ||
1099 | + <state relative-caret-position="297"> | ||
1100 | + <caret line="11" column="4" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="70" /> | ||
1101 | + <folding> | ||
1102 | + <element signature="n#style#0;n#head#0;n#html#0;n#!!top" /> | ||
1103 | + <element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1104 | + <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
1105 | + <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1106 | + <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" /> | ||
1107 | + <element signature="e#6671#10447#0" /> | ||
1108 | + </folding> | ||
1109 | + </state> | ||
1110 | + </provider> | ||
1111 | + </entry> | ||
1112 | + <entry file="file://$PROJECT_DIR$/css/index.css"> | ||
1113 | + <provider selected="true" editor-type-id="text-editor"> | ||
1114 | + <state relative-caret-position="634"> | ||
1115 | + <caret line="432" column="25" selection-start-line="432" selection-start-column="25" selection-end-line="432" selection-end-column="25" /> | ||
1116 | + </state> | ||
1117 | + </provider> | ||
1118 | + </entry> | ||
1119 | + <entry file="file://$PROJECT_DIR$/css/swiper.css"> | ||
1120 | + <provider selected="true" editor-type-id="text-editor"> | ||
1121 | + <state relative-caret-position="162"> | ||
1122 | + <caret line="54" column="22" lean-forward="true" selection-start-line="54" selection-start-column="22" selection-end-line="54" selection-end-column="22" /> | ||
1123 | + </state> | ||
1124 | + </provider> | ||
1125 | + </entry> | ||
1126 | + <entry file="file://$PROJECT_DIR$/html/index.html"> | ||
1127 | + <provider selected="true" editor-type-id="text-editor"> | ||
1128 | + <state relative-caret-position="189"> | ||
1129 | + <caret line="297" column="50" lean-forward="true" selection-start-line="297" selection-start-column="50" selection-end-line="297" selection-end-column="50" /> | ||
1130 | + <folding> | ||
1131 | + <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
1132 | + <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1133 | + <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1134 | + <element signature="n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1135 | + <element signature="n#div#0;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1136 | + <element signature="n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1137 | + <element signature="n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1138 | + <element signature="n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1186 | <element signature="n#div#1;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | 1139 | <element signature="n#div#1;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> |
1187 | <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" /> | 1140 | <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" /> |
1188 | <element signature="n#div#1;n#div#0;n#div#2;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | 1141 | <element signature="n#div#1;n#div#0;n#div#2;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> |
@@ -1197,5 +1150,92 @@ | @@ -1197,5 +1150,92 @@ | ||
1197 | </state> | 1150 | </state> |
1198 | </provider> | 1151 | </provider> |
1199 | </entry> | 1152 | </entry> |
1153 | + <entry file="file://$PROJECT_DIR$/css/sckj.css"> | ||
1154 | + <provider selected="true" editor-type-id="text-editor"> | ||
1155 | + <state relative-caret-position="-1067"> | ||
1156 | + <caret line="166" column="1" lean-forward="true" selection-start-line="166" selection-start-column="1" selection-end-line="166" selection-end-column="1" /> | ||
1157 | + </state> | ||
1158 | + </provider> | ||
1159 | + </entry> | ||
1160 | + <entry file="file://$PROJECT_DIR$/html/sckj.html"> | ||
1161 | + <provider selected="true" editor-type-id="text-editor"> | ||
1162 | + <state relative-caret-position="489"> | ||
1163 | + <caret line="430" column="6" lean-forward="true" selection-start-line="430" selection-start-column="6" selection-end-line="430" selection-end-column="6" /> | ||
1164 | + <folding> | ||
1165 | + <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
1166 | + <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1167 | + <element signature="n#div#0;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1168 | + <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" /> | ||
1169 | + <element signature="n#div#7;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1170 | + <element signature="n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1171 | + <element signature="n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1172 | + <element signature="n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1173 | + <element signature="e#10557#10608#0" /> | ||
1174 | + <element signature="e#10635#10685#0" /> | ||
1175 | + <element signature="e#10707#10757#0" /> | ||
1176 | + <element signature="e#10781#10833#0" /> | ||
1177 | + <element signature="e#10857#10907#0" /> | ||
1178 | + <element signature="e#10931#10981#0" /> | ||
1179 | + <element signature="e#11005#11057#0" /> | ||
1180 | + <element signature="e#11081#11133#0" /> | ||
1181 | + <element signature="e#11208#11550#0" /> | ||
1182 | + <element signature="e#10805#15478#0" /> | ||
1183 | + <element signature="e#11900#12399#0" /> | ||
1184 | + </folding> | ||
1185 | + </state> | ||
1186 | + </provider> | ||
1187 | + </entry> | ||
1188 | + <entry file="file://$PROJECT_DIR$/html/lxwm_5.html"> | ||
1189 | + <provider selected="true" editor-type-id="text-editor"> | ||
1190 | + <state relative-caret-position="474"> | ||
1191 | + <caret line="518" column="15" selection-start-line="518" selection-start-column="15" selection-end-line="518" selection-end-column="15" /> | ||
1192 | + <folding> | ||
1193 | + <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
1194 | + <element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1195 | + <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1196 | + <element signature="n#div#0;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1197 | + <element signature="n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1198 | + <element signature="n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1199 | + <element signature="n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1200 | + <element signature="n#div#0;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1201 | + <element signature="n#div#1;n#div#0;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1202 | + <element signature="n#div#1;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1203 | + <element signature="n#div#2;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1204 | + <element signature="n#div#3;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1205 | + <element signature="n#div#0;n#div#3;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1206 | + <element signature="n#div#1;n#div#3;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1207 | + <element signature="n#div#3;n#div#3;n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1208 | + <element signature="n#div#3;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1209 | + <element signature="n#div#4;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1210 | + <element signature="n#div#0;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1211 | + <element signature="n#div#0;n#div#1;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1212 | + <element signature="n#select#0;n#div#0;n#div#1;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1213 | + <element signature="n#div#1;n#div#1;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1214 | + <element signature="n#div#3;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1215 | + <element signature="n#div#4;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1216 | + <element signature="n#div#0;n#div#6;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1217 | + <element signature="n#div#1;n#div#6;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1218 | + <element signature="n#div#2;n#div#6;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1219 | + <element signature="n#div#3;n#div#6;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1220 | + <element signature="n#div#4;n#div#6;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1221 | + <element signature="n#div#5;n#div#6;n#div#6;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1222 | + <element signature="n#div#7;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1223 | + <element signature="n#div#8;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1224 | + <element signature="n#div#10;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1225 | + <element signature="n#div#11;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1226 | + <element signature="n#div#12;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1227 | + <element signature="n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> | ||
1228 | + <element signature="e#14357#14910#0" /> | ||
1229 | + <element signature="e#14958#15176#0" /> | ||
1230 | + <element signature="e#15212#15430#0" /> | ||
1231 | + <element signature="e#15477#15924#0" /> | ||
1232 | + <element signature="e#15962#16409#0" /> | ||
1233 | + <element signature="e#17134#17193#0" /> | ||
1234 | + <element signature="e#17530#17670#0" /> | ||
1235 | + <element signature="e#17748#17827#0" /> | ||
1236 | + </folding> | ||
1237 | + </state> | ||
1238 | + </provider> | ||
1239 | + </entry> | ||
1200 | </component> | 1240 | </component> |
1201 | </project> | 1241 | </project> |
@@ -112,6 +112,7 @@ | @@ -112,6 +112,7 @@ | ||
112 | height: 6.64rem; | 112 | height: 6.64rem; |
113 | background: url("../images/bicon_02@2x.png"); | 113 | background: url("../images/bicon_02@2x.png"); |
114 | background-size: cover; | 114 | background-size: cover; |
115 | + position: relative; | ||
115 | } | 116 | } |
116 | .pic1_dynamic{ | 117 | .pic1_dynamic{ |
117 | font-size: 0.4rem; | 118 | font-size: 0.4rem; |
@@ -137,16 +138,47 @@ | @@ -137,16 +138,47 @@ | ||
137 | align-items: center; | 138 | align-items: center; |
138 | position: relative; | 139 | position: relative; |
139 | } | 140 | } |
141 | +.pic1_mid:before{ | ||
142 | + content: ""; | ||
143 | + opacity: 0.2; | ||
144 | +} | ||
140 | .pic1_mid_bottom{ | 145 | .pic1_mid_bottom{ |
141 | width: 5.5rem; | 146 | width: 5.5rem; |
142 | height: 1.7rem; | 147 | height: 1.7rem; |
143 | font-size: 0.26rem; | 148 | font-size: 0.26rem; |
144 | - border: 1px solid red; | 149 | + /*border: 1px solid red;*/ |
145 | position: absolute; | 150 | position: absolute; |
146 | - bottom: 0.3rem; | ||
147 | - /*color: #ffffff;*/ | 151 | + bottom: 1rem; |
152 | + color: #ffffff; | ||
148 | line-height: 0.36rem; | 153 | line-height: 0.36rem; |
149 | } | 154 | } |
155 | +.pic1_mid_icon{ | ||
156 | + width: 6.4rem; | ||
157 | + display: flex; | ||
158 | + justify-content: space-between; | ||
159 | + position: absolute; | ||
160 | + /*border: 1px solid red;*/ | ||
161 | + top: 3.8rem; | ||
162 | +} | ||
163 | +.pic1_mid_icon_left{ | ||
164 | + width: 0.28rem; | ||
165 | + height: 0.31rem; | ||
166 | + display: flex; | ||
167 | +} | ||
168 | +.pic1_mid_icon_left img{ | ||
169 | + width: 100%; | ||
170 | + height: 100%; | ||
171 | +} | ||
172 | +.pic1_mid_icon_right{ | ||
173 | + width: 0.28rem; | ||
174 | + height: 0.31rem; | ||
175 | + display: flex; | ||
176 | +} | ||
177 | +.pic1_mid_icon_right img{ | ||
178 | + width: 100%; | ||
179 | + height: 100%; | ||
180 | +} | ||
181 | + | ||
150 | .pic2{ | 182 | .pic2{ |
151 | display: flex; | 183 | display: flex; |
152 | flex-flow: column; | 184 | flex-flow: column; |
@@ -404,9 +436,8 @@ | @@ -404,9 +436,8 @@ | ||
404 | } | 436 | } |
405 | .pic4_banner{ | 437 | .pic4_banner{ |
406 | width: 7.5rem; | 438 | width: 7.5rem; |
407 | - /*height: 4.2rem;*/ | ||
408 | display: flex; | 439 | display: flex; |
409 | - /*margin-top: 0.33rem;*/ | 440 | + justify-content: space-between; |
410 | } | 441 | } |
411 | .pic4_banner_mid{ | 442 | .pic4_banner_mid{ |
412 | width: 3.1rem; | 443 | width: 3.1rem; |
@@ -420,10 +451,20 @@ | @@ -420,10 +451,20 @@ | ||
420 | .pic4_banner_left{ | 451 | .pic4_banner_left{ |
421 | width: 1.6rem; | 452 | width: 1.6rem; |
422 | height: 3.1rem; | 453 | height: 3.1rem; |
454 | + display: flex; | ||
455 | +} | ||
456 | +.pic4_banner_left img{ | ||
457 | + width: 100%; | ||
458 | + height: 100%; | ||
423 | } | 459 | } |
424 | .pic4_banner_right{ | 460 | .pic4_banner_right{ |
425 | width: 1.6rem; | 461 | width: 1.6rem; |
426 | height: 3.1rem; | 462 | height: 3.1rem; |
463 | + display: flex; | ||
464 | +} | ||
465 | +.pic4_banner_right img{ | ||
466 | + width: 100%; | ||
467 | + height: 100%; | ||
427 | } | 468 | } |
428 | .pic4_viewMore{ | 469 | .pic4_viewMore{ |
429 | margin-top: 0.24rem; | 470 | margin-top: 0.24rem; |
@@ -110,9 +110,19 @@ | @@ -110,9 +110,19 @@ | ||
110 | FORM GERMANY | 110 | FORM GERMANY |
111 | </div> | 111 | </div> |
112 | <div class="pic1_mid"> | 112 | <div class="pic1_mid"> |
113 | + | ||
114 | + </div> | ||
113 | <div class="pic1_mid_bottom"> | 115 | <div class="pic1_mid_bottom"> |
114 | 可耐美由两位经济学家和一位化学家组建,基于全球环境恶化、变暖寻求解决方案而成立。德国总部设在德国杜塞尔多夫(Düsseldorf),“创新+整合”是我们的核心竞争力可耐美由两位经济学家和一位化学家组建。 | 116 | 可耐美由两位经济学家和一位化学家组建,基于全球环境恶化、变暖寻求解决方案而成立。德国总部设在德国杜塞尔多夫(Düsseldorf),“创新+整合”是我们的核心竞争力可耐美由两位经济学家和一位化学家组建。 |
115 | </div> | 117 | </div> |
118 | + <!--图标--> | ||
119 | + <div class="pic1_mid_icon"> | ||
120 | + <div class="pic1_mid_icon_left"> | ||
121 | + <img src="../images/aicon_08.png"> | ||
122 | + </div> | ||
123 | + <div class="pic1_mid_icon_right"> | ||
124 | + <img src="../images/aicon_07.png"> | ||
125 | + </div> | ||
116 | </div> | 126 | </div> |
117 | </div> | 127 | </div> |
118 | <!--最新动态--> | 128 | <!--最新动态--> |
@@ -207,11 +217,14 @@ | @@ -207,11 +217,14 @@ | ||
207 | </div> | 217 | </div> |
208 | <!--大标题--> | 218 | <!--大标题--> |
209 | <div class="pic3_big_text"> | 219 | <div class="pic3_big_text"> |
210 | - 在线选色 | 220 | + 产品中心 |
211 | </div> | 221 | </div> |
212 | <!--小标题--> | 222 | <!--小标题--> |
213 | <div class="pic3_small_text"> | 223 | <div class="pic3_small_text"> |
214 | - 进入某个空间,我们最先被触发得感知是—色彩 | 224 | + |
225 | + 德国原装进口,施工完无味, | ||
226 | + 健康安全 | ||
227 | + | ||
215 | </div> | 228 | </div> |
216 | <!--查看更多--> | 229 | <!--查看更多--> |
217 | <div class="pic3_viewMore"> | 230 | <div class="pic3_viewMore"> |
@@ -232,11 +245,11 @@ | @@ -232,11 +245,11 @@ | ||
232 | </div> | 245 | </div> |
233 | <!--大标题--> | 246 | <!--大标题--> |
234 | <div class="pic3_big_text"> | 247 | <div class="pic3_big_text"> |
235 | - 在线选色 | 248 | + 加盟可耐美 |
236 | </div> | 249 | </div> |
237 | <!--小标题--> | 250 | <!--小标题--> |
238 | <div class="pic3_small_text"> | 251 | <div class="pic3_small_text"> |
239 | - 进入某个空间,我们最先被触发得感知是—色彩 | 252 | + 加盟可耐美,0元加盟费 |
240 | </div> | 253 | </div> |
241 | <!--查看更多--> | 254 | <!--查看更多--> |
242 | <div class="pic3_viewMore"> | 255 | <div class="pic3_viewMore"> |
@@ -257,11 +270,11 @@ | @@ -257,11 +270,11 @@ | ||
257 | </div> | 270 | </div> |
258 | <!--大标题--> | 271 | <!--大标题--> |
259 | <div class="pic3_big_text"> | 272 | <div class="pic3_big_text"> |
260 | - 在线选色 | 273 | + 防伪查询 |
261 | </div> | 274 | </div> |
262 | <!--小标题--> | 275 | <!--小标题--> |
263 | <div class="pic3_small_text"> | 276 | <div class="pic3_small_text"> |
264 | - 进入某个空间,我们最先被触发得感知是—色彩 | 277 | + 为消费者权利保驾护航 |
265 | </div> | 278 | </div> |
266 | <!--查看更多--> | 279 | <!--查看更多--> |
267 | <div class="pic3_viewMore"> | 280 | <div class="pic3_viewMore"> |
@@ -281,14 +294,15 @@ | @@ -281,14 +294,15 @@ | ||
281 | </div> | 294 | </div> |
282 | <!--图片轮播--> | 295 | <!--图片轮播--> |
283 | <div class="pic4_banner"> | 296 | <div class="pic4_banner"> |
297 | + | ||
298 | + <div class="pic4_banner_left"> | ||
299 | + <img src="../images/bicon_09@2x.png"> | ||
300 | + </div> | ||
284 | <div class="pic4_banner_mid"> | 301 | <div class="pic4_banner_mid"> |
285 | <img src="../images/bicon_08@2x.png"> | 302 | <img src="../images/bicon_08@2x.png"> |
286 | </div> | 303 | </div> |
287 | - <div class="pic4_banner_left"> | ||
288 | - <!--<img src="../images/bicon_09@2x.png">--> | ||
289 | - </div> | ||
290 | <div class="pic4_banner_right"> | 304 | <div class="pic4_banner_right"> |
291 | - | 305 | + <img src="../images/bicon_09@2x.png"> |
292 | </div> | 306 | </div> |
293 | 307 | ||
294 | </div> | 308 | </div> |
@@ -10,6 +10,7 @@ | @@ -10,6 +10,7 @@ | ||
10 | <link rel="stylesheet" type="text/css" href="../css/common.css"> | 10 | <link rel="stylesheet" type="text/css" href="../css/common.css"> |
11 | <link rel="stylesheet" type="text/css" href="../icon/iconfont.css"> | 11 | <link rel="stylesheet" type="text/css" href="../icon/iconfont.css"> |
12 | <link rel="stylesheet" type="text/css" href="../css/lxwm_5.css"> | 12 | <link rel="stylesheet" type="text/css" href="../css/lxwm_5.css"> |
13 | + <link rel="stylesheet" type="text/css" href="http://api.map.baidu.com/res/13/bmap.css"> | ||
13 | 14 | ||
14 | 15 | ||
15 | <script src="../js/base.js"></script> | 16 | <script src="../js/base.js"></script> |
@@ -52,6 +53,20 @@ | @@ -52,6 +53,20 @@ | ||
52 | font-size: 0.6rem; | 53 | font-size: 0.6rem; |
53 | margin-left: 0.3rem; | 54 | margin-left: 0.3rem; |
54 | } | 55 | } |
56 | + /*引入百度地图*/ | ||
57 | + #allmap { | ||
58 | + height: 100%; | ||
59 | + width: 100%; | ||
60 | + overflow: hidden; | ||
61 | + } | ||
62 | + | ||
63 | + #r-result { | ||
64 | + width: 100%; | ||
65 | + font-size: 14px; | ||
66 | + position: absolute; | ||
67 | + top: 10px; | ||
68 | + left: 200px | ||
69 | + } | ||
55 | </style> | 70 | </style> |
56 | </head> | 71 | </head> |
57 | <body> | 72 | <body> |
@@ -189,7 +204,7 @@ | @@ -189,7 +204,7 @@ | ||
189 | </div> | 204 | </div> |
190 | <!--地图--> | 205 | <!--地图--> |
191 | <div class="mid_map"> | 206 | <div class="mid_map"> |
192 | - | 207 | + <div id="allmap"></div> |
193 | </div> | 208 | </div> |
194 | <!--城市选择--> | 209 | <!--城市选择--> |
195 | <div class="mid_city"> | 210 | <div class="mid_city"> |
@@ -230,7 +245,7 @@ | @@ -230,7 +245,7 @@ | ||
230 | </div> | 245 | </div> |
231 | </div> | 246 | </div> |
232 | <!--查询按钮--> | 247 | <!--查询按钮--> |
233 | - <div class="mid_inquire"> | 248 | + <div class="mid_inquire" onclick="btn_location()"> |
234 | 查询 | 249 | 查询 |
235 | </div> | 250 | </div> |
236 | <!--定位到当前位置--> | 251 | <!--定位到当前位置--> |
@@ -377,6 +392,9 @@ | @@ -377,6 +392,9 @@ | ||
377 | <!--</div>--> | 392 | <!--</div>--> |
378 | </div> | 393 | </div> |
379 | </div> | 394 | </div> |
395 | +<script src="http://api.map.baidu.com/api?v=2.0&ak=EZPCgQ6zGu6hZSmXlRrUMTpr"></script> | ||
396 | +<script type="text/javascript" src="http://api.map.baidu.com/getscript?v=1.3&ak=&services=true&t=20181212032835"></script> | ||
397 | + | ||
380 | <script> | 398 | <script> |
381 | function btn_index() { | 399 | function btn_index() { |
382 | window.location.href = "index.html" | 400 | window.location.href = "index.html" |
@@ -464,6 +482,50 @@ | @@ -464,6 +482,50 @@ | ||
464 | } | 482 | } |
465 | }) | 483 | }) |
466 | 484 | ||
485 | + | ||
486 | + // 在指定容器创建地图实例并设置最大最小缩放级别 | ||
487 | + var map = new BMap.Map("allmap", { | ||
488 | + minZoom: 5, | ||
489 | + maxZoom: 19 | ||
490 | + }); | ||
491 | + | ||
492 | + // 初始化地图,设置中心点和显示级别 | ||
493 | + map.centerAndZoom(new BMap.Point(121.36564, 31.22611), 19); | ||
494 | + | ||
495 | + // 开启鼠标滚轮缩放功能,仅对PC上有效 | ||
496 | + map.enableScrollWheelZoom(true); | ||
497 | + | ||
498 | + // 将控件(平移缩放控件)添加到地图上 | ||
499 | + map.addControl(new BMap.NavigationControl()); | ||
500 | + | ||
501 | + // 为地图增加点击事件,为input赋值 | ||
502 | + map.addEventListener("click", function(e) { | ||
503 | + document.getElementById('lat').value = e.point.lat; | ||
504 | + document.getElementById('lng').value = e.point.lng; | ||
505 | + | ||
506 | + }); | ||
507 | + | ||
508 | + // 创建位置检索、周边检索和范围检索 | ||
509 | + var local = new BMap.LocalSearch(map, { | ||
510 | + renderOptions: { | ||
511 | + map: map | ||
512 | + } | ||
513 | + }); | ||
514 | + var province = $("#province2 option:selected").text(); | ||
515 | + var city = $("#city2 option:selected").text(); | ||
516 | + var district = $("#district2 option:selected").text(); | ||
517 | + // 发起检索 | ||
518 | + function btn_location() { | ||
519 | + alert(1) | ||
520 | + var city = $("#province2 option:selected").text() + $("#city2 option:selected").text() + $("#district2 option:selected").text() + '可耐美'; | ||
521 | + if (city != "") { | ||
522 | + local.search(city); | ||
523 | + | ||
524 | + } | ||
525 | + | ||
526 | + }; | ||
527 | + var city = $("#province2 option:selected").text() + $("#city2 option:selected").text() + $("#district2 option:selected").text() + '可耐美'; | ||
528 | + console.log(city); | ||
467 | </script> | 529 | </script> |
468 | 530 | ||
469 | </body> | 531 | </body> |
@@ -9,6 +9,7 @@ | @@ -9,6 +9,7 @@ | ||
9 | <link rel="stylesheet" type="text/css" href="https://at.alicdn.com/t/font_1011505_pn90aqkgbhr.css"> | 9 | <link rel="stylesheet" type="text/css" href="https://at.alicdn.com/t/font_1011505_pn90aqkgbhr.css"> |
10 | <link rel="stylesheet" type="text/css" href="../icon/iconfont.css"> | 10 | <link rel="stylesheet" type="text/css" href="../icon/iconfont.css"> |
11 | <link rel="stylesheet" type="text/css" href="../css/sckj.css"> | 11 | <link rel="stylesheet" type="text/css" href="../css/sckj.css"> |
12 | + <link rel="stylesheet" type="text/css" href="../css/dropload.css"> | ||
12 | 13 | ||
13 | 14 | ||
14 | <script src="../js/base.js"></script> | 15 | <script src="../js/base.js"></script> |
@@ -174,13 +175,13 @@ | @@ -174,13 +175,13 @@ | ||
174 | </div> | 175 | </div> |
175 | </div> | 176 | </div> |
176 | 177 | ||
177 | - | ||
178 | </div> | 178 | </div> |
179 | 179 | ||
180 | <!--色彩搭配--> | 180 | <!--色彩搭配--> |
181 | <p class="mid_big_text"> 色彩搭配 </p> | 181 | <p class="mid_big_text"> 色彩搭配 </p> |
182 | <p class="mid_small_text"> COLOR MATCHING </p> | 182 | <p class="mid_small_text"> COLOR MATCHING </p> |
183 | <!--色彩搭配模块--> | 183 | <!--色彩搭配模块--> |
184 | + <div class="mid_color_box_big"> | ||
184 | <div class="mid_color_box"> | 185 | <div class="mid_color_box"> |
185 | <div class="mid_color_box_left"> | 186 | <div class="mid_color_box_left"> |
186 | <div class="mid_color_big"> | 187 | <div class="mid_color_big"> |
@@ -216,47 +217,13 @@ | @@ -216,47 +217,13 @@ | ||
216 | <img src="../images/bicon_43@2x.png"> | 217 | <img src="../images/bicon_43@2x.png"> |
217 | </div> | 218 | </div> |
218 | </div> | 219 | </div> |
219 | - <!--色彩搭配模块2--> | ||
220 | - <div class="mid_color_box"> | ||
221 | - <div class="mid_color_box_left"> | ||
222 | - <div class="mid_color_big"> | ||
223 | - 搭配色块 | ||
224 | </div> | 220 | </div> |
225 | - <!--颜色简称--> | ||
226 | - <div class="mid_center"> | ||
227 | - <div class="center_left"> | ||
228 | - BN7007-4 | ||
229 | - </div> | ||
230 | - <div class="center_right center_color_1"> | ||
231 | 221 | ||
232 | - </div> | ||
233 | - </div> | ||
234 | - <div class="mid_center"> | ||
235 | - <div class="center_left"> | ||
236 | - BN7007-4 | ||
237 | - </div> | ||
238 | - <div class="center_right center_color_2"> | ||
239 | - | ||
240 | - </div> | ||
241 | - </div> | ||
242 | - <div class="mid_center"> | ||
243 | - <div class="center_left"> | ||
244 | - BN7007-4 | ||
245 | - </div> | ||
246 | - <div class="center_right center_color_3"> | ||
247 | - | ||
248 | - </div> | ||
249 | - </div> | ||
250 | - </div> | ||
251 | - <div class="mid_color_box_right"> | ||
252 | - <img src="../images/bicon_43@2x.png"> | ||
253 | - </div> | ||
254 | - </div> | ||
255 | 222 | ||
256 | <!--加载更多--> | 223 | <!--加载更多--> |
257 | - <div class="mid_load"> | ||
258 | - 加载更多 | ||
259 | - </div> | 224 | + <!--<div class="mid_load">--> |
225 | + <!--加载更多--> | ||
226 | + <!--</div>--> | ||
260 | </div> | 227 | </div> |
261 | 228 | ||
262 | 229 | ||
@@ -297,6 +264,7 @@ | @@ -297,6 +264,7 @@ | ||
297 | <!--</div>--> | 264 | <!--</div>--> |
298 | </div> | 265 | </div> |
299 | </div> | 266 | </div> |
267 | +<script src="../js/dropload.min.js"></script> | ||
300 | <script> | 268 | <script> |
301 | function btn_index() { | 269 | function btn_index() { |
302 | window.location.href = "index.html" | 270 | window.location.href = "index.html" |
@@ -324,6 +292,7 @@ | @@ -324,6 +292,7 @@ | ||
324 | } | 292 | } |
325 | 293 | ||
326 | 294 | ||
295 | + | ||
327 | //点击色彩变大功能 | 296 | //点击色彩变大功能 |
328 | $('.mid_top').on('click','.mid_top_item',function () { | 297 | $('.mid_top').on('click','.mid_top_item',function () { |
329 | var a = $(this); | 298 | var a = $(this); |
@@ -337,7 +306,7 @@ | @@ -337,7 +306,7 @@ | ||
337 | 306 | ||
338 | //选择时出现图片 | 307 | //选择时出现图片 |
339 | $('.mid_list').on('click','.pic_list',function () { | 308 | $('.mid_list').on('click','.pic_list',function () { |
340 | - alert(999) | 309 | + // alert(999) |
341 | var b = $(this); | 310 | var b = $(this); |
342 | $(this).children(".iconfont").addClass('icon-shangjiantou').siblings(".pic_list").children(".iconfont").removeClass('icon-shangjiantou') | 311 | $(this).children(".iconfont").addClass('icon-shangjiantou').siblings(".pic_list").children(".iconfont").removeClass('icon-shangjiantou') |
343 | }) | 312 | }) |
@@ -357,6 +326,108 @@ | @@ -357,6 +326,108 @@ | ||
357 | // $(".icon-guanbi").css("display","none"); | 326 | // $(".icon-guanbi").css("display","none"); |
358 | }) | 327 | }) |
359 | 328 | ||
329 | + | ||
330 | + //下拉循环 | ||
331 | + // 页数 | ||
332 | + var page = 0; | ||
333 | + // 每页展示10个 | ||
334 | + var size = 3; | ||
335 | + $('.mid').dropload({ | ||
336 | + scrollArea : window, | ||
337 | + domUp : { | ||
338 | + domClass : 'dropload-up', | ||
339 | + domRefresh : '<div class="dropload-refresh">↓下拉刷新</div>', | ||
340 | + domUpdate : '<div class="dropload-update">↑释放更新</div>', | ||
341 | + domLoad : '<div class="dropload-load"><span class="loading"></span>加载中...</div>' | ||
342 | + }, | ||
343 | + domDown : { | ||
344 | + domClass : 'dropload-down', | ||
345 | + domRefresh : '<div class="dropload-refresh">↑上拉加载更多</div>', | ||
346 | + domLoad : '<div class="dropload-load"><span class="loading"></span>加载中...</div>', | ||
347 | + domNoData : '<div class="dropload-noData">暂无数据</div>' | ||
348 | + }, | ||
349 | + loadDownFn : function(me){ | ||
350 | + page++; | ||
351 | + // 拼接HTML | ||
352 | + var result = ''; | ||
353 | + var s = ""; | ||
354 | + var show=""; | ||
355 | + var list_compressor=""; | ||
356 | + var list_answer=""; | ||
357 | + $.ajax({ | ||
358 | + type: 'GET', | ||
359 | + url: 'http://ons.me/tools/dropload/json.php?page='+page+'&size='+size, | ||
360 | + dataType: 'json', | ||
361 | + success: function(data){ | ||
362 | + console.log(data); | ||
363 | + var arrLen = data.length; | ||
364 | + if(arrLen > 0){ | ||
365 | + for(var i=0; i<arrLen; i++){ | ||
366 | + result +='<div class="mid_color_box">\n' + | ||
367 | + ' <div class="mid_color_box_left">\n' + | ||
368 | + ' <div class="mid_color_big">\n' + | ||
369 | + ' 搭配色块\n' + | ||
370 | + ' </div>\n' + | ||
371 | + ' <!--颜色简称-->\n' + | ||
372 | + ' <div class="mid_center">\n' + | ||
373 | + ' <div class="center_left">\n' + | ||
374 | + ' BN7007-4\n' + | ||
375 | + ' </div>\n' + | ||
376 | + ' <div class="center_right center_color_1">\n' + | ||
377 | + '\n' + | ||
378 | + ' </div>\n' + | ||
379 | + ' </div>\n' + | ||
380 | + ' <div class="mid_center">\n' + | ||
381 | + ' <div class="center_left">\n' + | ||
382 | + ' BN7007-4\n' + | ||
383 | + ' </div>\n' + | ||
384 | + ' <div class="center_right center_color_2">\n' + | ||
385 | + '\n' + | ||
386 | + ' </div>\n' + | ||
387 | + ' </div>\n' + | ||
388 | + ' <div class="mid_center">\n' + | ||
389 | + ' <div class="center_left">\n' + | ||
390 | + ' BN7007-4\n' + | ||
391 | + ' </div>\n' + | ||
392 | + ' <div class="center_right center_color_3">\n' + | ||
393 | + '\n' + | ||
394 | + ' </div>\n' + | ||
395 | + ' </div>\n' + | ||
396 | + ' </div>\n' + | ||
397 | + ' <div class="mid_color_box_right">\n' + | ||
398 | + ' <img src="../images/bicon_43@2x.png">\n' + | ||
399 | + ' </div>\n' + | ||
400 | + ' </div>' | ||
401 | + | ||
402 | + } | ||
403 | + // 如果没有数据 | ||
404 | + }else{ | ||
405 | + // 锁定 | ||
406 | + me.lock(); | ||
407 | + // 无数据 | ||
408 | + me.noData(); | ||
409 | + } | ||
410 | + // 为了测试,延迟1秒加载 | ||
411 | + setTimeout(function(){ | ||
412 | + // 插入数据到页面,放到最后面 | ||
413 | + $('.mid_color_box_big').append(result); | ||
414 | + // 每次数据插入,必须重置 | ||
415 | + me.resetload(); | ||
416 | + },500); | ||
417 | + }, | ||
418 | + error: function(xhr, type){ | ||
419 | + alert('Ajax error!'); | ||
420 | + // 即使加载出错,也得重置 | ||
421 | + me.resetload(); | ||
422 | + } | ||
423 | + }); | ||
424 | + }, | ||
425 | + threshold : 50 | ||
426 | + }); | ||
427 | + | ||
428 | + | ||
429 | + | ||
430 | + | ||
360 | }) | 431 | }) |
361 | </script> | 432 | </script> |
362 | 433 |
images/aicon_07.png
0 → 100644
1.3 KB
images/aicon_08.png
0 → 100644
1.3 KB
-
请 注册 或 登录 后发表评论