李涵 / shipin · 提交

转到一个项目

作者 lihan
提交 a6fb634a65151eda3e753d858667dda6c5ba79b7 2 个父辈 36bb003b 3fa5ab5c

Merge branch 'master' of http://114.215.101.231:8099/lihan/shipin

内嵌 并排对比
正在显示 11 个修改的文件 包含 36 行增加 和 896 行删除
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<module type="WEB_MODULE" version="4">  
3 - <component name="NewModuleRootManager">  
4 - <content url="file://$MODULE_DIR$" />  
5 - <orderEntry type="inheritedJdk" />  
6 - <orderEntry type="sourceFolder" forTests="false" />  
7 - </component>  
8 -</module>  
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<project version="4">  
3 - <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />  
4 -</project>  
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<project version="4">  
3 - <component name="ProjectRootManager" version="2" />  
4 -</project>  
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<project version="4">  
3 - <component name="ProjectModuleManager">  
4 - <modules>  
5 - <module fileurl="file://$PROJECT_DIR$/.idea/TakeFood.iml" filepath="$PROJECT_DIR$/.idea/TakeFood.iml" />  
6 - </modules>  
7 - </component>  
8 -</project>  
1 -<component name="DependencyValidationManager">  
2 - <state>  
3 - <option name="SKIP_IMPORT_STATEMENTS" value="false" />  
4 - </state>  
5 -</component>  
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<project version="4">  
3 - <component name="VcsDirectoryMappings">  
4 - <mapping directory="" vcs="" />  
5 - </component>  
6 -</project>  
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<project version="4">  
3 - <component name="ChangeListManager">  
4 - <list default="true" id="fa02e569-d97b-4d43-97d6-86449a25fb56" name="Default" comment="" />  
5 - <ignored path="TakeFood.iws" />  
6 - <ignored path=".idea/workspace.xml" />  
7 - <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />  
8 - <option name="TRACKING_ENABLED" value="true" />  
9 - <option name="SHOW_DIALOG" value="false" />  
10 - <option name="HIGHLIGHT_CONFLICTS" value="true" />  
11 - <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />  
12 - <option name="LAST_RESOLUTION" value="IGNORE" />  
13 - </component>  
14 - <component name="ChangesViewManager" flattened_view="true" show_ignored="false" />  
15 - <component name="CreatePatchCommitExecutor">  
16 - <option name="PATCH_PATH" value="" />  
17 - </component>  
18 - <component name="DaemonCodeAnalyzer">  
19 - <disable_hints />  
20 - </component>  
21 - <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />  
22 - <component name="FavoritesManager">  
23 - <favorites_list name="TakeFood" />  
24 - </component>  
25 - <component name="FileEditorManager">  
26 - <leaf>  
27 - <file leaf-file-name="index.html" pinned="false" current-in-tab="false">  
28 - <entry file="file://$PROJECT_DIR$/index.html">  
29 - <provider selected="true" editor-type-id="text-editor">  
30 - <state vertical-scroll-proportion="0.0" vertical-offset="3420" max-vertical-offset="6783">  
31 - <caret line="180" column="17" selection-start-line="180" selection-start-column="17" selection-end-line="180" selection-end-column="17" />  
32 - <folding>  
33 - <element signature="n#style#0;n#ul#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
34 - </folding>  
35 - </state>  
36 - </provider>  
37 - </entry>  
38 - </file>  
39 - <file leaf-file-name="order.js" pinned="false" current-in-tab="false">  
40 - <entry file="file://$PROJECT_DIR$/js/order.js">  
41 - <provider selected="true" editor-type-id="text-editor">  
42 - <state vertical-scroll-proportion="0.0" vertical-offset="4332" max-vertical-offset="8816">  
43 - <caret line="228" column="31" selection-start-line="228" selection-start-column="31" selection-end-line="228" selection-end-column="31" />  
44 - <folding />  
45 - </state>  
46 - </provider>  
47 - </entry>  
48 - </file>  
49 - <file leaf-file-name="jquery-weui.css" pinned="false" current-in-tab="false">  
50 - <entry file="file://$PROJECT_DIR$/css/jquery-weui.css">  
51 - <provider selected="true" editor-type-id="text-editor">  
52 - <state vertical-scroll-proportion="0.0" vertical-offset="37372" max-vertical-offset="44061">  
53 - <caret line="1978" column="14" selection-start-line="1978" selection-start-column="14" selection-end-line="1978" selection-end-column="14" />  
54 - <folding>  
55 - <element signature="e#433#1880#2" expanded="true" />  
56 - <element signature="e#23094#23349#2" expanded="true" />  
57 - <element signature="e#23872#25319#2" expanded="true" />  
58 - <element signature="e#43380#43644#2" expanded="true" />  
59 - <element signature="e#43689#43958#2" expanded="true" />  
60 - <element signature="e#47051#47309#2" expanded="true" />  
61 - <element signature="e#47473#47731#2" expanded="true" />  
62 - <element signature="e#47862#48120#2" expanded="true" />  
63 - <element signature="e#48211#48469#2" expanded="true" />  
64 - <element signature="e#48633#48891#2" expanded="true" />  
65 - <element signature="e#49022#49280#2" expanded="true" />  
66 - <element signature="e#58869#60316#2" expanded="true" />  
67 - <element signature="e#60470#61914#2" expanded="true" />  
68 - </folding>  
69 - </state>  
70 - </provider>  
71 - </entry>  
72 - </file>  
73 - <file leaf-file-name="jquery-weui.js" pinned="false" current-in-tab="false">  
74 - <entry file="file://$PROJECT_DIR$/js/jquery-weui.js">  
75 - <provider selected="true" editor-type-id="text-editor">  
76 - <state vertical-scroll-proportion="82.76363" vertical-offset="163798" max-vertical-offset="175230">  
77 - <caret line="5898" column="26" selection-start-line="5898" selection-start-column="26" selection-end-line="5898" selection-end-column="26" />  
78 - <folding>  
79 - <element signature="n#!!doc" expanded="true" />  
80 - </folding>  
81 - </state>  
82 - </provider>  
83 - </entry>  
84 - </file>  
85 - <file leaf-file-name="order.html" pinned="false" current-in-tab="true">  
86 - <entry file="file://$PROJECT_DIR$/order.html">  
87 - <provider selected="true" editor-type-id="text-editor">  
88 - <state vertical-scroll-proportion="0.522807" vertical-offset="13512" max-vertical-offset="21087">  
89 - <caret line="517" column="54" selection-start-line="517" selection-start-column="54" selection-end-line="517" selection-end-column="54" />  
90 - <folding>  
91 - <element signature="n#style#0;n#label#0;n#div#0;n#div#2;n#div#4;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
92 - <element signature="n#style#0;n#div#1;n#div#2;n#div#4;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
93 - </folding>  
94 - </state>  
95 - </provider>  
96 - </entry>  
97 - </file>  
98 - <file leaf-file-name="shopcar.html" pinned="false" current-in-tab="false">  
99 - <entry file="file://$PROJECT_DIR$/shopcar.html">  
100 - <provider selected="true" editor-type-id="text-editor">  
101 - <state vertical-scroll-proportion="0.0" vertical-offset="2356" max-vertical-offset="3515">  
102 - <caret line="124" column="18" selection-start-line="124" selection-start-column="18" selection-end-line="124" selection-end-column="18" />  
103 - <folding />  
104 - </state>  
105 - </provider>  
106 - </entry>  
107 - </file>  
108 - <file leaf-file-name="PersonCenter.html" pinned="false" current-in-tab="false">  
109 - <entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html">  
110 - <provider selected="true" editor-type-id="text-editor">  
111 - <state vertical-scroll-proportion="0.0" vertical-offset="2033" max-vertical-offset="3610">  
112 - <caret line="107" column="75" selection-start-line="107" selection-start-column="75" selection-end-line="107" selection-end-column="75" />  
113 - <folding />  
114 - </state>  
115 - </provider>  
116 - </entry>  
117 - </file>  
118 - <file leaf-file-name="research.html" pinned="false" current-in-tab="false">  
119 - <entry file="file://$PROJECT_DIR$/research.html">  
120 - <provider selected="true" editor-type-id="text-editor">  
121 - <state vertical-scroll-proportion="0.0" vertical-offset="2223" max-vertical-offset="3990">  
122 - <caret line="117" column="59" selection-start-line="117" selection-start-column="59" selection-end-line="117" selection-end-column="59" />  
123 - <folding>  
124 - <element signature="n#style#0;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
125 - <element signature="n#style#0;n#select#0;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
126 - <element signature="n#style#0;n#option#0;n#select#0;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
127 - <element signature="n#style#0;n#select#1;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
128 - <element signature="n#style#0;n#option#0;n#select#1;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
129 - <element signature="n#style#0;n#select#2;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
130 - <element signature="n#style#0;n#option#0;n#select#2;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
131 - <element signature="n#style#0;n#span#0;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
132 - </folding>  
133 - </state>  
134 - </provider>  
135 - </entry>  
136 - </file>  
137 - <file leaf-file-name="evalute.js" pinned="false" current-in-tab="false">  
138 - <entry file="file://$PROJECT_DIR$/js/evalute.js">  
139 - <provider selected="true" editor-type-id="text-editor">  
140 - <state vertical-scroll-proportion="0.0" vertical-offset="4598" max-vertical-offset="5206">  
141 - <caret line="242" column="5" selection-start-line="242" selection-start-column="5" selection-end-line="242" selection-end-column="5" />  
142 - <folding>  
143 - <marker date="1534760479292" expanded="true" signature="2037:2047" placeholder="..." />  
144 - </folding>  
145 - </state>  
146 - </provider>  
147 - </entry>  
148 - </file>  
149 - <file leaf-file-name="research.css" pinned="false" current-in-tab="false">  
150 - <entry file="file://$PROJECT_DIR$/css/research.css">  
151 - <provider selected="true" editor-type-id="text-editor">  
152 - <state vertical-scroll-proportion="0.0" vertical-offset="4237" max-vertical-offset="5092">  
153 - <caret line="223" column="25" selection-start-line="223" selection-start-column="25" selection-end-line="223" selection-end-column="25" />  
154 - <folding />  
155 - </state>  
156 - </provider>  
157 - </entry>  
158 - </file>  
159 - </leaf>  
160 - </component>  
161 - <component name="IdeDocumentHistory">  
162 - <option name="CHANGED_PATHS">  
163 - <list>  
164 - <option value="$PROJECT_DIR$/js/base.js" />  
165 - <option value="$PROJECT_DIR$/js/cookie.js" />  
166 - <option value="$PROJECT_DIR$/css/swiper-3.4.2.min.css" />  
167 - <option value="$PROJECT_DIR$/css/index.css" />  
168 - <option value="$PROJECT_DIR$/myorder/myorder.html" />  
169 - <option value="$PROJECT_DIR$/js/index.js" />  
170 - <option value="$PROJECT_DIR$/js/shopcar.js" />  
171 - <option value="$PROJECT_DIR$/js/personcenter.js" />  
172 - <option value="$PROJECT_DIR$/hopeaddress.html" />  
173 - <option value="$PROJECT_DIR$/js/hopeaddress.js" />  
174 - <option value="$PROJECT_DIR$/js/research.js" />  
175 - <option value="$PROJECT_DIR$/css/research.css" />  
176 - <option value="$PROJECT_DIR$/research.html" />  
177 - <option value="$PROJECT_DIR$/js/evalute.js" />  
178 - <option value="$PROJECT_DIR$/shopcar.html" />  
179 - <option value="$PROJECT_DIR$/PersonCenter/PersonCenter.html" />  
180 - <option value="$PROJECT_DIR$/index.html" />  
181 - <option value="$PROJECT_DIR$/js/order.js" />  
182 - <option value="$PROJECT_DIR$/css/jquery-weui.css" />  
183 - <option value="$PROJECT_DIR$/js/jquery-weui.js" />  
184 - <option value="$PROJECT_DIR$/order.html" />  
185 - </list>  
186 - </option>  
187 - </component>  
188 - <component name="JsGulpfileManager">  
189 - <detection-done>true</detection-done>  
190 - </component>  
191 - <component name="ProjectFrameBounds">  
192 - <option name="x" value="-7" />  
193 - <option name="y" value="2" />  
194 - <option name="width" value="1932" />  
195 - <option name="height" value="1051" />  
196 - </component>  
197 - <component name="ProjectLevelVcsManager" settingsEditedManually="false">  
198 - <OptionsSetting value="true" id="Add" />  
199 - <OptionsSetting value="true" id="Remove" />  
200 - <OptionsSetting value="true" id="Checkout" />  
201 - <OptionsSetting value="true" id="Update" />  
202 - <OptionsSetting value="true" id="Status" />  
203 - <OptionsSetting value="true" id="Edit" />  
204 - <ConfirmationsSetting value="0" id="Add" />  
205 - <ConfirmationsSetting value="0" id="Remove" />  
206 - </component>  
207 - <component name="ProjectView">  
208 - <navigator currentView="ProjectPane" proportions="" version="1">  
209 - <flattenPackages />  
210 - <showMembers />  
211 - <showModules />  
212 - <showLibraryContents />  
213 - <hideEmptyPackages />  
214 - <abbreviatePackageNames />  
215 - <autoscrollToSource />  
216 - <autoscrollFromSource />  
217 - <sortByType />  
218 - </navigator>  
219 - <panes>  
220 - <pane id="ProjectPane">  
221 - <subPane>  
222 - <PATH>  
223 - <PATH_ELEMENT>  
224 - <option name="myItemId" value="TakeFood" />  
225 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
226 - </PATH_ELEMENT>  
227 - </PATH>  
228 - <PATH>  
229 - <PATH_ELEMENT>  
230 - <option name="myItemId" value="TakeFood" />  
231 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
232 - </PATH_ELEMENT>  
233 - <PATH_ELEMENT>  
234 - <option name="myItemId" value="shipin" />  
235 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
236 - </PATH_ELEMENT>  
237 - </PATH>  
238 - <PATH>  
239 - <PATH_ELEMENT>  
240 - <option name="myItemId" value="TakeFood" />  
241 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
242 - </PATH_ELEMENT>  
243 - <PATH_ELEMENT>  
244 - <option name="myItemId" value="shipin" />  
245 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
246 - </PATH_ELEMENT>  
247 - <PATH_ELEMENT>  
248 - <option name="myItemId" value="PersonCenter" />  
249 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
250 - </PATH_ELEMENT>  
251 - </PATH>  
252 - <PATH>  
253 - <PATH_ELEMENT>  
254 - <option name="myItemId" value="TakeFood" />  
255 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
256 - </PATH_ELEMENT>  
257 - <PATH_ELEMENT>  
258 - <option name="myItemId" value="shipin" />  
259 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
260 - </PATH_ELEMENT>  
261 - <PATH_ELEMENT>  
262 - <option name="myItemId" value="myorder" />  
263 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
264 - </PATH_ELEMENT>  
265 - </PATH>  
266 - <PATH>  
267 - <PATH_ELEMENT>  
268 - <option name="myItemId" value="TakeFood" />  
269 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
270 - </PATH_ELEMENT>  
271 - <PATH_ELEMENT>  
272 - <option name="myItemId" value="shipin" />  
273 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
274 - </PATH_ELEMENT>  
275 - <PATH_ELEMENT>  
276 - <option name="myItemId" value="js" />  
277 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
278 - </PATH_ELEMENT>  
279 - </PATH>  
280 - <PATH>  
281 - <PATH_ELEMENT>  
282 - <option name="myItemId" value="TakeFood" />  
283 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
284 - </PATH_ELEMENT>  
285 - <PATH_ELEMENT>  
286 - <option name="myItemId" value="shipin" />  
287 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
288 - </PATH_ELEMENT>  
289 - <PATH_ELEMENT>  
290 - <option name="myItemId" value="css" />  
291 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
292 - </PATH_ELEMENT>  
293 - </PATH>  
294 - </subPane>  
295 - </pane>  
296 - <pane id="Scope" />  
297 - </panes>  
298 - </component>  
299 - <component name="PropertiesComponent">  
300 - <property name="WebServerToolWindowFactoryState" value="false" />  
301 - <property name="last_opened_file_path" value="$PROJECT_DIR$" />  
302 - <property name="HbShouldOpenHtmlAsHb" value="" />  
303 - <property name="JavaScriptLanguageLevel" value="ES6" />  
304 - <property name="JavaScriptPreferStrict" value="false" />  
305 - <property name="JavaScriptWeakerCompletionTypeGuess" value="true" />  
306 - <property name="options.lastSelected" value="Settings.JavaScript" />  
307 - <property name="options.splitter.main.proportions" value="0.3" />  
308 - <property name="options.splitter.details.proportions" value="0.2" />  
309 - </component>  
310 - <component name="RecentsManager">  
311 - <key name="CopyFile.RECENT_KEYS">  
312 - <recent name="D:\项目\shipin\img" />  
313 - </key>  
314 - </component>  
315 - <component name="RunManager">  
316 - <configuration default="true" type="DartUnitRunConfigurationType" factoryName="DartUnit">  
317 - <method />  
318 - </configuration>  
319 - <configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application">  
320 - <method />  
321 - </configuration>  
322 - <configuration default="true" type="JSTestDriver:ConfigurationType" factoryName="JsTestDriver">  
323 - <setting name="configLocationType" value="CONFIG_FILE" />  
324 - <setting name="settingsFile" value="" />  
325 - <setting name="serverType" value="INTERNAL" />  
326 - <setting name="preferredDebugBrowser" value="Chrome" />  
327 - <method />  
328 - </configuration>  
329 - <configuration default="true" type="JavaScriptTestRunnerKarma" factoryName="Karma" config-file="">  
330 - <envs />  
331 - <method />  
332 - </configuration>  
333 - <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">  
334 - <method />  
335 - </configuration>  
336 - <configuration default="true" type="NodeJSConfigurationType" factoryName="Node.js" working-dir="">  
337 - <method />  
338 - </configuration>  
339 - <configuration default="true" type="cucumber.js" factoryName="Cucumber.js">  
340 - <option name="cucumberJsArguments" value="" />  
341 - <option name="executablePath" />  
342 - <option name="filePath" />  
343 - <method />  
344 - </configuration>  
345 - <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">  
346 - <node-options />  
347 - <gulpfile />  
348 - <tasks />  
349 - <arguments />  
350 - <pass-parent-envs>true</pass-parent-envs>  
351 - <envs />  
352 - <method />  
353 - </configuration>  
354 - <list size="0" />  
355 - </component>  
356 - <component name="ShelveChangesManager" show_recycled="false" />  
357 - <component name="TaskManager">  
358 - <task active="true" id="Default" summary="Default task">  
359 - <changelist id="fa02e569-d97b-4d43-97d6-86449a25fb56" name="Default" comment="" />  
360 - <created>1534217475979</created>  
361 - <option name="number" value="Default" />  
362 - <updated>1534217475979</updated>  
363 - </task>  
364 - <servers />  
365 - </component>  
366 - <component name="ToolWindowManager">  
367 - <frame x="-7" y="2" width="1932" height="1051" extended-state="0" />  
368 - <editor active="true" />  
369 - <layout>  
370 - <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />  
371 - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />  
372 - <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />  
373 - <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />  
374 - <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />  
375 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.107515655" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />  
376 - <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />  
377 - <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />  
378 - <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />  
379 - <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />  
380 - <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />  
381 - <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />  
382 - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />  
383 - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />  
384 - <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />  
385 - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />  
386 - <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />  
387 - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />  
388 - </layout>  
389 - </component>  
390 - <component name="Vcs.Log.UiProperties">  
391 - <option name="RECENTLY_FILTERED_USER_GROUPS">  
392 - <collection />  
393 - </option>  
394 - <option name="RECENTLY_FILTERED_BRANCH_GROUPS">  
395 - <collection />  
396 - </option>  
397 - </component>  
398 - <component name="VcsContentAnnotationSettings">  
399 - <option name="myLimit" value="2678400000" />  
400 - </component>  
401 - <component name="VcsManagerConfiguration">  
402 - <option name="myTodoPanelSettings">  
403 - <TodoPanelSettings />  
404 - </option>  
405 - </component>  
406 - <component name="XDebuggerManager">  
407 - <breakpoint-manager />  
408 - <watches-manager />  
409 - </component>  
410 - <component name="editorHistoryManager">  
411 - <entry file="file://$PROJECT_DIR$/css/research.css">  
412 - <provider selected="true" editor-type-id="text-editor">  
413 - <state vertical-scroll-proportion="0.0" vertical-offset="4237" max-vertical-offset="5092">  
414 - <caret line="223" column="25" selection-start-line="223" selection-start-column="25" selection-end-line="223" selection-end-column="25" />  
415 - <folding />  
416 - </state>  
417 - </provider>  
418 - </entry>  
419 - <entry file="file://$PROJECT_DIR$/index.html">  
420 - <provider selected="true" editor-type-id="text-editor">  
421 - <state vertical-scroll-proportion="0.0" vertical-offset="4503" max-vertical-offset="6688">  
422 - <caret line="237" column="52" selection-start-line="237" selection-start-column="52" selection-end-line="237" selection-end-column="52" />  
423 - <folding>  
424 - <element signature="n#style#0;n#ul#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
425 - </folding>  
426 - </state>  
427 - </provider>  
428 - </entry>  
429 - <entry file="file://$PROJECT_DIR$/js/index.js">  
430 - <provider selected="true" editor-type-id="text-editor">  
431 - <state vertical-scroll-proportion="0.0" vertical-offset="4617" max-vertical-offset="9158">  
432 - <caret line="263" column="17" selection-start-line="263" selection-start-column="17" selection-end-line="263" selection-end-column="17" />  
433 - <folding />  
434 - </state>  
435 - </provider>  
436 - </entry>  
437 - <entry file="file://$PROJECT_DIR$/js/shopcar.js">  
438 - <provider selected="true" editor-type-id="text-editor">  
439 - <state vertical-scroll-proportion="0.0" vertical-offset="1083" max-vertical-offset="5909">  
440 - <caret line="57" column="17" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="17" />  
441 - </state>  
442 - </provider>  
443 - </entry>  
444 - <entry file="file://$PROJECT_DIR$/myorder/myorder.html">  
445 - <provider selected="true" editor-type-id="text-editor">  
446 - <state vertical-scroll-proportion="0.0" vertical-offset="589" max-vertical-offset="4541">  
447 - <caret line="31" column="0" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" />  
448 - </state>  
449 - </provider>  
450 - </entry>  
451 - <entry file="file://$PROJECT_DIR$/css/index.css">  
452 - <provider selected="true" editor-type-id="text-editor">  
453 - <state vertical-scroll-proportion="0.0" vertical-offset="5928" max-vertical-offset="13832">  
454 - <caret line="312" column="24" selection-start-line="312" selection-start-column="24" selection-end-line="312" selection-end-column="24" />  
455 - </state>  
456 - </provider>  
457 - </entry>  
458 - <entry file="file://$PROJECT_DIR$/css/swiper-3.4.2.min.css">  
459 - <provider selected="true" editor-type-id="text-editor">  
460 - <state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="380">  
461 - <caret line="14" column="1460" selection-start-line="14" selection-start-column="1460" selection-end-line="14" selection-end-column="1460" />  
462 - </state>  
463 - </provider>  
464 - </entry>  
465 - <entry file="file://$PROJECT_DIR$/shopcar.html">  
466 - <provider selected="true" editor-type-id="text-editor">  
467 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3477">  
468 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
469 - <folding />  
470 - </state>  
471 - </provider>  
472 - </entry>  
473 - <entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html">  
474 - <provider selected="true" editor-type-id="text-editor">  
475 - <state vertical-scroll-proportion="0.0" vertical-offset="722" max-vertical-offset="3211">  
476 - <caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" />  
477 - <folding />  
478 - </state>  
479 - </provider>  
480 - </entry>  
481 - <entry file="file://$PROJECT_DIR$/js/personcenter.js">  
482 - <provider selected="true" editor-type-id="text-editor">  
483 - <state vertical-scroll-proportion="0.0" vertical-offset="437" max-vertical-offset="1634">  
484 - <caret line="23" column="52" selection-start-line="23" selection-start-column="52" selection-end-line="23" selection-end-column="52" />  
485 - </state>  
486 - </provider>  
487 - </entry>  
488 - <entry file="file://$PROJECT_DIR$/js/cookie.js">  
489 - <provider selected="true" editor-type-id="text-editor">  
490 - <state vertical-scroll-proportion="0.0" vertical-offset="247" max-vertical-offset="779">  
491 - <caret line="13" column="44" selection-start-line="13" selection-start-column="44" selection-end-line="13" selection-end-column="44" />  
492 - </state>  
493 - </provider>  
494 - </entry>  
495 - <entry file="file://$PROJECT_DIR$/index.html">  
496 - <provider selected="true" editor-type-id="text-editor">  
497 - <state vertical-scroll-proportion="0.0" vertical-offset="4275" max-vertical-offset="6707">  
498 - <caret line="225" column="8" selection-start-line="225" selection-start-column="8" selection-end-line="225" selection-end-column="8" />  
499 - <folding>  
500 - <element signature="n#style#0;n#ul#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
501 - </folding>  
502 - </state>  
503 - </provider>  
504 - </entry>  
505 - <entry file="file://$PROJECT_DIR$/js/index.js">  
506 - <provider selected="true" editor-type-id="text-editor">  
507 - <state vertical-scroll-proportion="0.0" vertical-offset="6061" max-vertical-offset="9158">  
508 - <caret line="339" column="33" selection-start-line="339" selection-start-column="23" selection-end-line="339" selection-end-column="33" />  
509 - <folding />  
510 - </state>  
511 - </provider>  
512 - </entry>  
513 - <entry file="file://$PROJECT_DIR$/js/shopcar.js">  
514 - <provider selected="true" editor-type-id="text-editor">  
515 - <state vertical-scroll-proportion="0.0" vertical-offset="2812" max-vertical-offset="5909">  
516 - <caret line="148" column="51" selection-start-line="148" selection-start-column="51" selection-end-line="148" selection-end-column="51" />  
517 - </state>  
518 - </provider>  
519 - </entry>  
520 - <entry file="file://$PROJECT_DIR$/myorder/myorder.html">  
521 - <provider selected="true" editor-type-id="text-editor">  
522 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4427">  
523 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
524 - </state>  
525 - </provider>  
526 - </entry>  
527 - <entry file="file://$PROJECT_DIR$/css/index.css">  
528 - <provider selected="true" editor-type-id="text-editor">  
529 - <state vertical-scroll-proportion="0.0" vertical-offset="5928" max-vertical-offset="13832">  
530 - <caret line="312" column="24" selection-start-line="312" selection-start-column="24" selection-end-line="312" selection-end-column="24" />  
531 - </state>  
532 - </provider>  
533 - </entry>  
534 - <entry file="file://$PROJECT_DIR$/css/swiper-3.4.2.min.css">  
535 - <provider selected="true" editor-type-id="text-editor">  
536 - <state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="380">  
537 - <caret line="14" column="1460" selection-start-line="14" selection-start-column="1460" selection-end-line="14" selection-end-column="1460" />  
538 - </state>  
539 - </provider>  
540 - </entry>  
541 - <entry file="file://$PROJECT_DIR$/shopcar.html">  
542 - <provider selected="true" editor-type-id="text-editor">  
543 - <state vertical-scroll-proportion="0.0" vertical-offset="2584" max-vertical-offset="3477">  
544 - <caret line="136" column="43" selection-start-line="136" selection-start-column="43" selection-end-line="136" selection-end-column="43" />  
545 - <folding />  
546 - </state>  
547 - </provider>  
548 - </entry>  
549 - <entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html">  
550 - <provider selected="true" editor-type-id="text-editor">  
551 - <state vertical-scroll-proportion="0.0" vertical-offset="722" max-vertical-offset="3116">  
552 - <caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" />  
553 - <folding />  
554 - </state>  
555 - </provider>  
556 - </entry>  
557 - <entry file="file://$PROJECT_DIR$/js/personcenter.js">  
558 - <provider selected="true" editor-type-id="text-editor">  
559 - <state vertical-scroll-proportion="0.0" vertical-offset="437" max-vertical-offset="1634">  
560 - <caret line="23" column="52" selection-start-line="23" selection-start-column="52" selection-end-line="23" selection-end-column="52" />  
561 - </state>  
562 - </provider>  
563 - </entry>  
564 - <entry file="file://$PROJECT_DIR$/js/cookie.js">  
565 - <provider selected="true" editor-type-id="text-editor">  
566 - <state vertical-scroll-proportion="0.0" vertical-offset="247" max-vertical-offset="779">  
567 - <caret line="13" column="44" selection-start-line="13" selection-start-column="44" selection-end-line="13" selection-end-column="44" />  
568 - </state>  
569 - </provider>  
570 - </entry>  
571 - <entry file="file://$PROJECT_DIR$/index.html">  
572 - <provider selected="true" editor-type-id="text-editor">  
573 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="6707">  
574 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
575 - <folding>  
576 - <element signature="n#style#0;n#ul#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
577 - </folding>  
578 - </state>  
579 - </provider>  
580 - </entry>  
581 - <entry file="file://$PROJECT_DIR$/css/index.css">  
582 - <provider selected="true" editor-type-id="text-editor">  
583 - <state vertical-scroll-proportion="0.0" vertical-offset="4408" max-vertical-offset="13870">  
584 - <caret line="232" column="23" selection-start-line="232" selection-start-column="23" selection-end-line="232" selection-end-column="23" />  
585 - </state>  
586 - </provider>  
587 - </entry>  
588 - <entry file="file://$PROJECT_DIR$/shopcar.html">  
589 - <provider selected="true" editor-type-id="text-editor">  
590 - <state vertical-scroll-proportion="0.0" vertical-offset="2584" max-vertical-offset="3477">  
591 - <caret line="136" column="43" selection-start-line="136" selection-start-column="43" selection-end-line="136" selection-end-column="43" />  
592 - <folding />  
593 - </state>  
594 - </provider>  
595 - </entry>  
596 - <entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html">  
597 - <provider selected="true" editor-type-id="text-editor">  
598 - <state vertical-scroll-proportion="0.0" vertical-offset="722" max-vertical-offset="3116">  
599 - <caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" />  
600 - <folding />  
601 - </state>  
602 - </provider>  
603 - </entry>  
604 - <entry file="file://$PROJECT_DIR$/js/personcenter.js">  
605 - <provider selected="true" editor-type-id="text-editor">  
606 - <state vertical-scroll-proportion="0.0" vertical-offset="437" max-vertical-offset="1634">  
607 - <caret line="23" column="52" selection-start-line="23" selection-start-column="52" selection-end-line="23" selection-end-column="52" />  
608 - </state>  
609 - </provider>  
610 - </entry>  
611 - <entry file="file://$PROJECT_DIR$/js/base.js">  
612 - <provider selected="true" editor-type-id="text-editor">  
613 - <state vertical-scroll-proportion="0.0" vertical-offset="817" max-vertical-offset="1197">  
614 - <caret line="43" column="0" selection-start-line="43" selection-start-column="0" selection-end-line="43" selection-end-column="0" />  
615 - </state>  
616 - </provider>  
617 - </entry>  
618 - <entry file="file://$PROJECT_DIR$/js/cookie.js">  
619 - <provider selected="true" editor-type-id="text-editor">  
620 - <state vertical-scroll-proportion="0.0" vertical-offset="247" max-vertical-offset="779">  
621 - <caret line="13" column="44" selection-start-line="13" selection-start-column="44" selection-end-line="13" selection-end-column="44" />  
622 - </state>  
623 - </provider>  
624 - </entry>  
625 - <entry file="file://$PROJECT_DIR$/js/base.js">  
626 - <provider selected="true" editor-type-id="text-editor">  
627 - <state vertical-scroll-proportion="0.0" vertical-offset="662" max-vertical-offset="1575">  
628 - <caret line="43" column="0" selection-start-line="43" selection-start-column="0" selection-end-line="43" selection-end-column="0" />  
629 - </state>  
630 - </provider>  
631 - </entry>  
632 - <entry file="file://$PROJECT_DIR$/js/cookie.js">  
633 - <provider selected="true" editor-type-id="text-editor">  
634 - <state vertical-scroll-proportion="0.0" vertical-offset="276" max-vertical-offset="1189">  
635 - <caret line="13" column="44" selection-start-line="13" selection-start-column="44" selection-end-line="13" selection-end-column="44" />  
636 - </state>  
637 - </provider>  
638 - </entry>  
639 - <entry file="file://$PROJECT_DIR$/css/swiper-3.4.2.min.css">  
640 - <provider selected="true" editor-type-id="text-editor">  
641 - <state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="380">  
642 - <caret line="14" column="1460" selection-start-line="14" selection-start-column="1460" selection-end-line="14" selection-end-column="1460" />  
643 - </state>  
644 - </provider>  
645 - </entry>  
646 - <entry file="file://$PROJECT_DIR$/css/index.css">  
647 - <provider selected="true" editor-type-id="text-editor">  
648 - <state vertical-scroll-proportion="0.0" vertical-offset="8906" max-vertical-offset="21840">  
649 - <caret line="312" column="24" selection-start-line="312" selection-start-column="24" selection-end-line="312" selection-end-column="24" />  
650 - </state>  
651 - </provider>  
652 - </entry>  
653 - <entry file="file://$PROJECT_DIR$/myorder/myorder.html">  
654 - <provider selected="true" editor-type-id="text-editor">  
655 - <state vertical-scroll-proportion="0.0" vertical-offset="589" max-vertical-offset="4541">  
656 - <caret line="31" column="0" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" />  
657 - </state>  
658 - </provider>  
659 - </entry>  
660 - <entry file="file://$PROJECT_DIR$/js/index.js">  
661 - <provider selected="true" editor-type-id="text-editor">  
662 - <state vertical-scroll-proportion="0.0" vertical-offset="4617" max-vertical-offset="9158">  
663 - <caret line="263" column="17" selection-start-line="263" selection-start-column="17" selection-end-line="263" selection-end-column="17" />  
664 - <folding />  
665 - </state>  
666 - </provider>  
667 - </entry>  
668 - <entry file="file://$PROJECT_DIR$/js/shopcar.js">  
669 - <provider selected="true" editor-type-id="text-editor">  
670 - <state vertical-scroll-proportion="0.0" vertical-offset="1083" max-vertical-offset="5909">  
671 - <caret line="57" column="17" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="17" />  
672 - </state>  
673 - </provider>  
674 - </entry>  
675 - <entry file="file://$PROJECT_DIR$/js/personcenter.js">  
676 - <provider selected="true" editor-type-id="text-editor">  
677 - <state vertical-scroll-proportion="-18.8" vertical-offset="718" max-vertical-offset="2398">  
678 - <caret line="54" column="29" selection-start-line="54" selection-start-column="29" selection-end-line="54" selection-end-column="29" />  
679 - </state>  
680 - </provider>  
681 - </entry>  
682 - <entry file="file://$PROJECT_DIR$/hopeaddress.html">  
683 - <provider selected="true" editor-type-id="text-editor">  
684 - <state vertical-scroll-proportion="-14.25" vertical-offset="843" max-vertical-offset="2457">  
685 - <caret line="46" column="11" selection-start-line="46" selection-start-column="11" selection-end-line="46" selection-end-column="11" />  
686 - </state>  
687 - </provider>  
688 - </entry>  
689 - <entry file="file://$PROJECT_DIR$/share.html">  
690 - <provider selected="true" editor-type-id="text-editor">  
691 - <state vertical-scroll-proportion="-23.0" vertical-offset="207" max-vertical-offset="1219">  
692 - <caret line="37" column="13" selection-start-line="37" selection-start-column="13" selection-end-line="37" selection-end-column="13" />  
693 - </state>  
694 - </provider>  
695 - </entry>  
696 - <entry file="file://$PROJECT_DIR$/about.html">  
697 - <provider selected="true" editor-type-id="text-editor">  
698 - <state vertical-scroll-proportion="-16.964285" vertical-offset="150" max-vertical-offset="1325">  
699 - <caret line="25" column="47" selection-start-line="25" selection-start-column="47" selection-end-line="25" selection-end-column="47" />  
700 - </state>  
701 - </provider>  
702 - </entry>  
703 - <entry file="file://$PROJECT_DIR$/js/hopeaddress.js">  
704 - <provider selected="true" editor-type-id="text-editor">  
705 - <state vertical-scroll-proportion="0.0" vertical-offset="2907" max-vertical-offset="4408">  
706 - <caret line="153" column="49" selection-start-line="147" selection-start-column="23" selection-end-line="153" selection-end-column="49" />  
707 - <folding />  
708 - </state>  
709 - </provider>  
710 - </entry>  
711 - <entry file="file://$PROJECT_DIR$/js/research.js">  
712 - <provider selected="true" editor-type-id="text-editor">  
713 - <state vertical-scroll-proportion="0.0" vertical-offset="6270" max-vertical-offset="9880">  
714 - <caret line="330" column="44" selection-start-line="330" selection-start-column="44" selection-end-line="330" selection-end-column="44" />  
715 - <folding />  
716 - </state>  
717 - </provider>  
718 - </entry>  
719 - <entry file="file://$PROJECT_DIR$/css/research.css">  
720 - <provider selected="true" editor-type-id="text-editor">  
721 - <state vertical-scroll-proportion="0.0" vertical-offset="4641" max-vertical-offset="6164">  
722 - <caret line="223" column="25" selection-start-line="223" selection-start-column="25" selection-end-line="223" selection-end-column="25" />  
723 - <folding />  
724 - </state>  
725 - </provider>  
726 - </entry>  
727 - <entry file="file://$PROJECT_DIR$/research.html">  
728 - <provider selected="true" editor-type-id="text-editor">  
729 - <state vertical-scroll-proportion="0.0" vertical-offset="2223" max-vertical-offset="3990">  
730 - <caret line="117" column="59" selection-start-line="117" selection-start-column="59" selection-end-line="117" selection-end-column="59" />  
731 - <folding>  
732 - <element signature="n#style#0;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
733 - <element signature="n#style#0;n#select#0;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
734 - <element signature="n#style#0;n#option#0;n#select#0;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
735 - <element signature="n#style#0;n#select#1;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
736 - <element signature="n#style#0;n#option#0;n#select#1;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
737 - <element signature="n#style#0;n#select#2;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
738 - <element signature="n#style#0;n#option#0;n#select#2;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
739 - <element signature="n#style#0;n#span#0;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
740 - </folding>  
741 - </state>  
742 - </provider>  
743 - </entry>  
744 - <entry file="file://$PROJECT_DIR$/js/evalute.js">  
745 - <provider selected="true" editor-type-id="text-editor">  
746 - <state vertical-scroll-proportion="0.0" vertical-offset="4598" max-vertical-offset="5206">  
747 - <caret line="242" column="5" selection-start-line="242" selection-start-column="5" selection-end-line="242" selection-end-column="5" />  
748 - <folding>  
749 - <marker date="1534760479292" expanded="true" signature="2037:2047" placeholder="..." />  
750 - </folding>  
751 - </state>  
752 - </provider>  
753 - </entry>  
754 - <entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html">  
755 - <provider selected="true" editor-type-id="text-editor">  
756 - <state vertical-scroll-proportion="0.0" vertical-offset="2033" max-vertical-offset="3610">  
757 - <caret line="107" column="75" selection-start-line="107" selection-start-column="75" selection-end-line="107" selection-end-column="75" />  
758 - <folding />  
759 - </state>  
760 - </provider>  
761 - </entry>  
762 - <entry file="file://$PROJECT_DIR$/shopcar.html">  
763 - <provider selected="true" editor-type-id="text-editor">  
764 - <state vertical-scroll-proportion="0.0" vertical-offset="2356" max-vertical-offset="3515">  
765 - <caret line="124" column="18" selection-start-line="124" selection-start-column="18" selection-end-line="124" selection-end-column="18" />  
766 - <folding />  
767 - </state>  
768 - </provider>  
769 - </entry>  
770 - <entry file="file://$PROJECT_DIR$/index.html">  
771 - <provider selected="true" editor-type-id="text-editor">  
772 - <state vertical-scroll-proportion="0.0" vertical-offset="3420" max-vertical-offset="6783">  
773 - <caret line="180" column="17" selection-start-line="180" selection-start-column="17" selection-end-line="180" selection-end-column="17" />  
774 - <folding>  
775 - <element signature="n#style#0;n#ul#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
776 - </folding>  
777 - </state>  
778 - </provider>  
779 - </entry>  
780 - <entry file="file://$PROJECT_DIR$/js/order.js">  
781 - <provider selected="true" editor-type-id="text-editor">  
782 - <state vertical-scroll-proportion="0.0" vertical-offset="4332" max-vertical-offset="8816">  
783 - <caret line="228" column="31" selection-start-line="228" selection-start-column="31" selection-end-line="228" selection-end-column="31" />  
784 - <folding />  
785 - </state>  
786 - </provider>  
787 - </entry>  
788 - <entry file="file://$PROJECT_DIR$/css/jquery-weui.css">  
789 - <provider selected="true" editor-type-id="text-editor">  
790 - <state vertical-scroll-proportion="0.0" vertical-offset="37372" max-vertical-offset="44061">  
791 - <caret line="1978" column="14" selection-start-line="1978" selection-start-column="14" selection-end-line="1978" selection-end-column="14" />  
792 - <folding>  
793 - <element signature="e#433#1880#2" expanded="true" />  
794 - <element signature="e#23094#23349#2" expanded="true" />  
795 - <element signature="e#23872#25319#2" expanded="true" />  
796 - <element signature="e#43380#43644#2" expanded="true" />  
797 - <element signature="e#43689#43958#2" expanded="true" />  
798 - <element signature="e#47051#47309#2" expanded="true" />  
799 - <element signature="e#47473#47731#2" expanded="true" />  
800 - <element signature="e#47862#48120#2" expanded="true" />  
801 - <element signature="e#48211#48469#2" expanded="true" />  
802 - <element signature="e#48633#48891#2" expanded="true" />  
803 - <element signature="e#49022#49280#2" expanded="true" />  
804 - <element signature="e#58869#60316#2" expanded="true" />  
805 - <element signature="e#60470#61914#2" expanded="true" />  
806 - </folding>  
807 - </state>  
808 - </provider>  
809 - </entry>  
810 - <entry file="file://$PROJECT_DIR$/js/jquery-weui.js">  
811 - <provider selected="true" editor-type-id="text-editor">  
812 - <state vertical-scroll-proportion="82.76363" vertical-offset="163798" max-vertical-offset="175230">  
813 - <caret line="5898" column="26" selection-start-line="5898" selection-start-column="26" selection-end-line="5898" selection-end-column="26" />  
814 - <folding>  
815 - <element signature="n#!!doc" expanded="true" />  
816 - </folding>  
817 - </state>  
818 - </provider>  
819 - </entry>  
820 - <entry file="file://$PROJECT_DIR$/order.html">  
821 - <provider selected="true" editor-type-id="text-editor">  
822 - <state vertical-scroll-proportion="0.522807" vertical-offset="13512" max-vertical-offset="21087">  
823 - <caret line="517" column="54" selection-start-line="517" selection-start-column="54" selection-end-line="517" selection-end-column="54" />  
824 - <folding>  
825 - <element signature="n#style#0;n#label#0;n#div#0;n#div#2;n#div#4;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
826 - <element signature="n#style#0;n#div#1;n#div#2;n#div#4;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
827 - </folding>  
828 - </state>  
829 - </provider>  
830 - </entry>  
831 - </component>  
832 -</project>  
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 position: fixed; 11 position: fixed;
12 z-index: 2; 12 z-index: 2;
13 margin-left: -0.38rem; 13 margin-left: -0.38rem;
14 - display: none; 14 +
15 } 15 }
16 /*弹层*/ 16 /*弹层*/
17 .popup,.order_pay_popup{ 17 .popup,.order_pay_popup{
@@ -67,7 +67,9 @@ new Vue({ @@ -67,7 +67,9 @@ new Vue({
67 //打印机id 67 //打印机id
68 printer_id:'', 68 printer_id:'',
69 //定制时间 69 //定制时间
70 - time_zone:'' 70 + time_zone:'',
  71 + //期望地址遮罩层
  72 + hopedress:false
71 73
72 }, 74 },
73 created: function() { 75 created: function() {
@@ -134,6 +136,11 @@ new Vue({ @@ -134,6 +136,11 @@ new Vue({
134 that.selectstore=true; 136 that.selectstore=true;
135 that.order_type=2; 137 that.order_type=2;
136 }, 138 },
  139 + //期望地址
  140 + hope:function(){
  141 + var that=this;
  142 + that.hopedress=true;
  143 + },
137 //选择打印机 144 //选择打印机
138 selectprinter:function(obj,event){ 145 selectprinter:function(obj,event){
139 var that=this; 146 var that=this;
@@ -412,7 +419,6 @@ new Vue({ @@ -412,7 +419,6 @@ new Vue({
412 alert(res.msg); 419 alert(res.msg);
413 alert("下单失败"); 420 alert("下单失败");
414 } 421 }
415 -  
416 }) 422 })
417 } 423 }
418 } 424 }
@@ -239,7 +239,7 @@ @@ -239,7 +239,7 @@
239 color: #3d4145; 239 color: #3d4145;
240 -webkit-transition-duration: .3s; 240 -webkit-transition-duration: .3s;
241 transition-duration: .3s; 241 transition-duration: .3s;
242 - height:12rem; 242 + height:8rem;
243 background: #EFEFF4; 243 background: #EFEFF4;
244 -webkit-transform: translate3d(0, 100%, 0); 244 -webkit-transform: translate3d(0, 100%, 0);
245 transform: translate3d(0, 100%, 0); 245 transform: translate3d(0, 100%, 0);
@@ -424,31 +424,33 @@ @@ -424,31 +424,33 @@
424 <div class="container" v-cloak> 424 <div class="container" v-cloak>
425 425
426 <!--遮罩--> 426 <!--遮罩-->
427 - <div class="wrap" style="display: none;">  
428 - <!--弹层-->  
429 - <div class="popup_wrap" style="display:none;">  
430 - <div class="popup">  
431 - <span class="choose">选择您期望的地址</span>  
432 - <span class="text">为了后期更好的为您服务</span>  
433 - <div class="btn" @click="hopeaddress()">  
434 - 确定 427 + <div class="wrap" v-if="hopedress" @click="hidewrap()">
  428 + <!--遮罩-->
  429 + <div class="wrap" v-if="hopedress">
  430 + <!--弹层-->
  431 + <div class="popup_wrap" >
  432 + <div class="popup">
  433 + <span class="choose">选择您期望的地址</span>
  434 + <span class="text">为了后期更好的为您服务</span>
  435 + <div class="btn" @click="hopeaddress()">
  436 + 确定
  437 + </div>
435 </div> 438 </div>
436 </div> 439 </div>
437 - </div>  
438 - <!--付款弹层-->  
439 - <div class="order_pay_popup_wrap" style="display: none;">  
440 - <div class="order_pay_popup">  
441 - <div class="pay_details" @click="remain()">  
442 - <i class="iconfont icon-balance" style="color: #FFA200;"></i>  
443 - <p>余额支付</p>  
444 - </div>  
445 - <div class="pay_details" style="border-top: 1px solid #E4E4E4;" @click="wexinpay()">  
446 - <i class="iconfont icon-weixinzhifu" style="color: #24BB1E;"></i>  
447 - <p>微信支付</p> 440 + <!--付款弹层-->
  441 + <div class="order_pay_popup_wrap" style="display: none;">
  442 + <div class="order_pay_popup">
  443 + <div class="pay_details" @click="remain()">
  444 + <i class="iconfont icon-balance" style="color: #FFA200;"></i>
  445 + <p>余额支付</p>
  446 + </div>
  447 + <div class="pay_details" style="border-top: 1px solid #E4E4E4;" @click="wexinpay()">
  448 + <i class="iconfont icon-weixinzhifu" style="color: #24BB1E;"></i>
  449 + <p>微信支付</p>
  450 + </div>
448 </div> 451 </div>
449 </div> 452 </div>
450 </div> 453 </div>
451 - </div>  
452 454
453 455
454 456
@@ -460,19 +462,19 @@ @@ -460,19 +462,19 @@
460 </div> 462 </div>
461 </div> 463 </div>
462 <!--订单地址--> 464 <!--订单地址-->
463 - <div class="take_address" v-if="selectstop" v-cloak> 465 + <div class="take_address" v-show="selectstop" v-cloak>
464 <div class="take_address_wrap"> 466 <div class="take_address_wrap">
465 <div class="address_details"> 467 <div class="address_details">
466 <p class="address_text">取货地址：{{address}}{{distance}}</p> 468 <p class="address_text">取货地址：{{address}}{{distance}}</p>
467 </div> 469 </div>
468 <div class="take_address_btn"> 470 <div class="take_address_btn">
469 <span class="address_reset resetspot" @click="resetspot()"><i class="iconfont icon-icon-test2"></i>地址重置</span> 471 <span class="address_reset resetspot" @click="resetspot()"><i class="iconfont icon-icon-test2"></i>地址重置</span>
470 - <span class="hope_address">期望自取地址</span> 472 + <span class="hope_address" @click="hope()>期望自取地址</span>
471 </div> 473 </div>
472 <i class="iconfont icon-icon-test3" @click="spotdetail()"></i> 474 <i class="iconfont icon-icon-test3" @click="spotdetail()"></i>
473 </div> 475 </div>
474 </div> 476 </div>
475 - <div class="take_address" v-if="selectstore" v-cloak> 477 + <div class="take_address" v-show="selectstore" v-cloak>
476 <div class="take_address_wrap"> 478 <div class="take_address_wrap">
477 <div class="address_details"> 479 <div class="address_details">
478 <p class="address_text">取货地址：{{storeaddress}}{{storedistance}}</p> 480 <p class="address_text">取货地址：{{storeaddress}}{{storedistance}}</p>
@@ -485,7 +487,7 @@ @@ -485,7 +487,7 @@
485 </div> 487 </div>
486 </div> 488 </div>
487 <!--输入--> 489 <!--输入-->
488 - <div class="input_box" v-if="selectstop"> 490 + <div class="input_box" v-show="selectstop">
489 <!--姓名--> 491 <!--姓名-->
490 <div class="input_box_name"> 492 <div class="input_box_name">
491 <p class="name" style="margin-top: 15px;">姓名</p> 493 <p class="name" style="margin-top: 15px;">姓名</p>