李涵 / shipin · 提交

转到一个项目

作者 李洪娟
提交 164dc4ae71aeea59a28371db3fd50e1fcbd96a13 2 个父辈 2622bda7 85ac80ed

合并分支 'lihongjuan' 到 'master' 

Lihongjuan



查看合并请求 !6
内嵌 并排对比
正在显示 5 个修改的文件 包含 298 行增加 和 151 行删除
@@ -27,18 +27,18 @@ @@ -27,18 +27,18 @@
27 <file leaf-file-name="index.html" pinned="false" current-in-tab="false"> 27 <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
28 <entry file="file://$PROJECT_DIR$/index.html"> 28 <entry file="file://$PROJECT_DIR$/index.html">
29 <provider selected="true" editor-type-id="text-editor"> 29 <provider selected="true" editor-type-id="text-editor">
30 - <state vertical-scroll-proportion="-6.775862" vertical-offset="6330" max-vertical-offset="9531">  
31 - <caret line="249" column="67" selection-start-line="249" selection-start-column="67" selection-end-line="249" selection-end-column="67" /> 30 + <state vertical-scroll-proportion="-8.892858" vertical-offset="2970" max-vertical-offset="10237">
  31 + <caret line="111" column="51" selection-start-line="111" selection-start-column="51" selection-end-line="111" selection-end-column="51" />
32 <folding /> 32 <folding />
33 </state> 33 </state>
34 </provider> 34 </provider>
35 </entry> 35 </entry>
36 </file> 36 </file>
37 - <file leaf-file-name="index.js" pinned="false" current-in-tab="false">  
38 - <entry file="file://$PROJECT_DIR$/js/index.js"> 37 + <file leaf-file-name="order.js" pinned="false" current-in-tab="true">
  38 + <entry file="file://$PROJECT_DIR$/js/order.js">
39 <provider selected="true" editor-type-id="text-editor"> 39 <provider selected="true" editor-type-id="text-editor">
40 - <state vertical-scroll-proportion="-10.44" vertical-offset="10191" max-vertical-offset="12532">  
41 - <caret line="422" column="12" selection-start-line="422" selection-start-column="8" selection-end-line="422" selection-end-column="12" /> 40 + <state vertical-scroll-proportion="0.6036036" vertical-offset="11784" max-vertical-offset="13152">
  41 + <caret line="385" column="0" selection-start-line="385" selection-start-column="0" selection-end-line="385" selection-end-column="0" />
42 <folding /> 42 <folding />
43 </state> 43 </state>
44 </provider> 44 </provider>
@@ -47,8 +47,8 @@ @@ -47,8 +47,8 @@
47 <file leaf-file-name="shopcar.html" pinned="false" current-in-tab="false"> 47 <file leaf-file-name="shopcar.html" pinned="false" current-in-tab="false">
48 <entry file="file://$PROJECT_DIR$/shopcar.html"> 48 <entry file="file://$PROJECT_DIR$/shopcar.html">
49 <provider selected="true" editor-type-id="text-editor"> 49 <provider selected="true" editor-type-id="text-editor">
50 - <state vertical-scroll-proportion="-14.464286" vertical-offset="1620" max-vertical-offset="4995">  
51 - <caret line="75" column="91" selection-start-line="75" selection-start-column="91" selection-end-line="75" selection-end-column="91" /> 50 + <state vertical-scroll-proportion="-0.0" vertical-offset="266" max-vertical-offset="3515">
  51 + <caret line="14" column="15" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="15" />
52 <folding> 52 <folding>
53 <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> 53 <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
54 </folding> 54 </folding>
@@ -56,11 +56,11 @@ @@ -56,11 +56,11 @@
56 </provider> 56 </provider>
57 </entry> 57 </entry>
58 </file> 58 </file>
59 - <file leaf-file-name="order.html" pinned="false" current-in-tab="true"> 59 + <file leaf-file-name="order.html" pinned="false" current-in-tab="false">
60 <entry file="file://$PROJECT_DIR$/order.html"> 60 <entry file="file://$PROJECT_DIR$/order.html">
61 <provider selected="true" editor-type-id="text-editor"> 61 <provider selected="true" editor-type-id="text-editor">
62 - <state vertical-scroll-proportion="0.39649123" vertical-offset="13161" max-vertical-offset="21033">  
63 - <caret line="500" column="44" selection-start-line="500" selection-start-column="44" selection-end-line="500" selection-end-column="44" /> 62 + <state vertical-scroll-proportion="0.0" vertical-offset="5453" max-vertical-offset="14801">
  63 + <caret line="287" column="35" selection-start-line="287" selection-start-column="35" selection-end-line="287" selection-end-column="35" />
64 <folding> 64 <folding>
65 <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" /> 65 <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" />
66 <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" /> 66 <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" />
@@ -69,10 +69,44 @@ @@ -69,10 +69,44 @@
69 </provider> 69 </provider>
70 </entry> 70 </entry>
71 </file> 71 </file>
  72 + <file leaf-file-name="addressdetails.html" pinned="false" current-in-tab="false">
  73 + <entry file="file://$PROJECT_DIR$/addressdetails.html">
  74 + <provider selected="true" editor-type-id="text-editor">
  75 + <state vertical-scroll-proportion="0.0" vertical-offset="551" max-vertical-offset="1083">
  76 + <caret line="29" column="61" selection-start-line="29" selection-start-column="61" selection-end-line="29" selection-end-column="61" />
  77 + <folding />
  78 + </state>
  79 + </provider>
  80 + </entry>
  81 + </file>
  82 + <file leaf-file-name="jquery-weui.css" pinned="false" current-in-tab="false">
  83 + <entry file="file://$PROJECT_DIR$/css/jquery-weui.css">
  84 + <provider selected="true" editor-type-id="text-editor">
  85 + <state vertical-scroll-proportion="0.0" vertical-offset="37486" max-vertical-offset="44061">
  86 + <caret line="2313" column="0" selection-start-line="2313" selection-start-column="0" selection-end-line="2313" selection-end-column="0" />
  87 + <folding>
  88 + <element signature="e#433#1880#2" expanded="true" />
  89 + <element signature="e#22129#22384#2" expanded="true" />
  90 + <element signature="e#22907#24354#2" expanded="true" />
  91 + <element signature="e#42419#42683#2" expanded="true" />
  92 + <element signature="e#42728#42997#2" expanded="true" />
  93 + <element signature="e#46090#46348#2" expanded="true" />
  94 + <element signature="e#46512#46770#2" expanded="true" />
  95 + <element signature="e#46901#47159#2" expanded="true" />
  96 + <element signature="e#47250#47508#2" expanded="true" />
  97 + <element signature="e#47672#47930#2" expanded="true" />
  98 + <element signature="e#48061#48319#2" expanded="true" />
  99 + <element signature="e#57908#59355#2" expanded="true" />
  100 + <element signature="e#59509#60953#2" expanded="true" />
  101 + </folding>
  102 + </state>
  103 + </provider>
  104 + </entry>
  105 + </file>
72 <file leaf-file-name="index.css" pinned="false" current-in-tab="false"> 106 <file leaf-file-name="index.css" pinned="false" current-in-tab="false">
73 <entry file="file://$PROJECT_DIR$/css/index.css"> 107 <entry file="file://$PROJECT_DIR$/css/index.css">
74 <provider selected="true" editor-type-id="text-editor"> 108 <provider selected="true" editor-type-id="text-editor">
75 - <state vertical-scroll-proportion="0.0" vertical-offset="10746" max-vertical-offset="18225"> 109 + <state vertical-scroll-proportion="0.0" vertical-offset="8398" max-vertical-offset="13851">
76 <caret line="442" column="0" selection-start-line="442" selection-start-column="0" selection-end-line="442" selection-end-column="0" /> 110 <caret line="442" column="0" selection-start-line="442" selection-start-column="0" selection-end-line="442" selection-end-column="0" />
77 <folding /> 111 <folding />
78 </state> 112 </state>
@@ -82,7 +116,7 @@ @@ -82,7 +116,7 @@
82 <file leaf-file-name="PersonCenter.html" pinned="false" current-in-tab="false"> 116 <file leaf-file-name="PersonCenter.html" pinned="false" current-in-tab="false">
83 <entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html"> 117 <entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html">
84 <provider selected="true" editor-type-id="text-editor"> 118 <provider selected="true" editor-type-id="text-editor">
85 - <state vertical-scroll-proportion="-10.607142" vertical-offset="2511" max-vertical-offset="4941"> 119 + <state vertical-scroll-proportion="0.0" vertical-offset="1976" max-vertical-offset="3477">
86 <caret line="104" column="24" selection-start-line="104" selection-start-column="24" selection-end-line="104" selection-end-column="24" /> 120 <caret line="104" column="24" selection-start-line="104" selection-start-column="24" selection-end-line="104" selection-end-column="24" />
87 <folding> 121 <folding>
88 <element signature="n#style#0;n#img#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> 122 <element signature="n#style#0;n#img#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
@@ -95,7 +129,7 @@ @@ -95,7 +129,7 @@
95 <file leaf-file-name="init.css" pinned="false" current-in-tab="false"> 129 <file leaf-file-name="init.css" pinned="false" current-in-tab="false">
96 <entry file="file://$PROJECT_DIR$/css/init.css"> 130 <entry file="file://$PROJECT_DIR$/css/init.css">
97 <provider selected="true" editor-type-id="text-editor"> 131 <provider selected="true" editor-type-id="text-editor">
98 - <state vertical-scroll-proportion="0.0" vertical-offset="639" max-vertical-offset="3575"> 132 + <state vertical-scroll-proportion="0.0" vertical-offset="912" max-vertical-offset="2717">
99 <caret line="48" column="14" selection-start-line="48" selection-start-column="14" selection-end-line="48" selection-end-column="14" /> 133 <caret line="48" column="14" selection-start-line="48" selection-start-column="14" selection-end-line="48" selection-end-column="14" />
100 <folding /> 134 <folding />
101 </state> 135 </state>
@@ -105,33 +139,13 @@ @@ -105,33 +139,13 @@
105 <file leaf-file-name="PersonCenter.css" pinned="false" current-in-tab="false"> 139 <file leaf-file-name="PersonCenter.css" pinned="false" current-in-tab="false">
106 <entry file="file://$PROJECT_DIR$/css/PersonCenter/PersonCenter.css"> 140 <entry file="file://$PROJECT_DIR$/css/PersonCenter/PersonCenter.css">
107 <provider selected="true" editor-type-id="text-editor"> 141 <provider selected="true" editor-type-id="text-editor">
108 - <state vertical-scroll-proportion="0.0" vertical-offset="2100" max-vertical-offset="5934"> 142 + <state vertical-scroll-proportion="0.0" vertical-offset="2223" max-vertical-offset="4902">
109 <caret line="117" column="1" selection-start-line="117" selection-start-column="1" selection-end-line="117" selection-end-column="1" /> 143 <caret line="117" column="1" selection-start-line="117" selection-start-column="1" selection-end-line="117" selection-end-column="1" />
110 <folding /> 144 <folding />
111 </state> 145 </state>
112 </provider> 146 </provider>
113 </entry> 147 </entry>
114 </file> 148 </file>
115 - <file leaf-file-name="personcenter.js" pinned="false" current-in-tab="false">  
116 - <entry file="file://$PROJECT_DIR$/js/personcenter.js">  
117 - <provider selected="true" editor-type-id="text-editor">  
118 - <state vertical-scroll-proportion="-33.44" vertical-offset="1062" max-vertical-offset="2886">  
119 - <caret line="73" column="10" selection-start-line="73" selection-start-column="10" selection-end-line="73" selection-end-column="10" />  
120 - <folding />  
121 - </state>  
122 - </provider>  
123 - </entry>  
124 - </file>  
125 - <file leaf-file-name="takedetails.js" pinned="false" current-in-tab="false">  
126 - <entry file="file://$PROJECT_DIR$/js/takedetails.js">  
127 - <provider selected="true" editor-type-id="text-editor">  
128 - <state vertical-scroll-proportion="-16.2" vertical-offset="81" max-vertical-offset="1458">  
129 - <caret line="18" column="25" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="25" />  
130 - <folding />  
131 - </state>  
132 - </provider>  
133 - </entry>  
134 - </file>  
135 </leaf> 149 </leaf>
136 </component> 150 </component>
137 <component name="IdeDocumentHistory"> 151 <component name="IdeDocumentHistory">
@@ -149,11 +163,13 @@ @@ -149,11 +163,13 @@
149 <option value="$PROJECT_DIR$/js/personcenter.js" /> 163 <option value="$PROJECT_DIR$/js/personcenter.js" />
150 <option value="$PROJECT_DIR$/css/PersonCenter/PersonCenter.css" /> 164 <option value="$PROJECT_DIR$/css/PersonCenter/PersonCenter.css" />
151 <option value="$PROJECT_DIR$/css/index.css" /> 165 <option value="$PROJECT_DIR$/css/index.css" />
152 - <option value="$PROJECT_DIR$/index.html" />  
153 <option value="$PROJECT_DIR$/PersonCenter/PersonCenter.html" /> 166 <option value="$PROJECT_DIR$/PersonCenter/PersonCenter.html" />
154 <option value="$PROJECT_DIR$/css/init.css" /> 167 <option value="$PROJECT_DIR$/css/init.css" />
155 <option value="$PROJECT_DIR$/shopcar.html" /> 168 <option value="$PROJECT_DIR$/shopcar.html" />
  169 + <option value="$PROJECT_DIR$/css/jquery-weui.css" />
156 <option value="$PROJECT_DIR$/order.html" /> 170 <option value="$PROJECT_DIR$/order.html" />
  171 + <option value="$PROJECT_DIR$/index.html" />
  172 + <option value="$PROJECT_DIR$/js/order.js" />
157 </list> 173 </list>
158 </option> 174 </option>
159 </component> 175 </component>
@@ -189,7 +205,6 @@ @@ -189,7 +205,6 @@
189 <sortByType /> 205 <sortByType />
190 </navigator> 206 </navigator>
191 <panes> 207 <panes>
192 - <pane id="Scope" />  
193 <pane id="ProjectPane"> 208 <pane id="ProjectPane">
194 <subPane> 209 <subPane>
195 <PATH> 210 <PATH>
@@ -232,20 +247,6 @@ @@ -232,20 +247,6 @@
232 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 247 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
233 </PATH_ELEMENT> 248 </PATH_ELEMENT>
234 <PATH_ELEMENT> 249 <PATH_ELEMENT>
235 - <option name="myItemId" value="myorder" />  
236 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
237 - </PATH_ELEMENT>  
238 - </PATH>  
239 - <PATH>  
240 - <PATH_ELEMENT>  
241 - <option name="myItemId" value="TakeFood" />  
242 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
243 - </PATH_ELEMENT>  
244 - <PATH_ELEMENT>  
245 - <option name="myItemId" value="shipin" />  
246 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
247 - </PATH_ELEMENT>  
248 - <PATH_ELEMENT>  
249 <option name="myItemId" value="js" /> 250 <option name="myItemId" value="js" />
250 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 251 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
251 </PATH_ELEMENT> 252 </PATH_ELEMENT>
@@ -260,20 +261,6 @@ @@ -260,20 +261,6 @@
260 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 261 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
261 </PATH_ELEMENT> 262 </PATH_ELEMENT>
262 <PATH_ELEMENT> 263 <PATH_ELEMENT>
263 - <option name="myItemId" value="img" />  
264 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
265 - </PATH_ELEMENT>  
266 - </PATH>  
267 - <PATH>  
268 - <PATH_ELEMENT>  
269 - <option name="myItemId" value="TakeFood" />  
270 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
271 - </PATH_ELEMENT>  
272 - <PATH_ELEMENT>  
273 - <option name="myItemId" value="shipin" />  
274 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
275 - </PATH_ELEMENT>  
276 - <PATH_ELEMENT>  
277 <option name="myItemId" value="css" /> 264 <option name="myItemId" value="css" />
278 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 265 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
279 </PATH_ELEMENT> 266 </PATH_ELEMENT>
@@ -298,11 +285,12 @@ @@ -298,11 +285,12 @@
298 </PATH> 285 </PATH>
299 </subPane> 286 </subPane>
300 </pane> 287 </pane>
  288 + <pane id="Scope" />
301 </panes> 289 </panes>
302 </component> 290 </component>
303 <component name="PropertiesComponent"> 291 <component name="PropertiesComponent">
304 <property name="WebServerToolWindowFactoryState" value="false" /> 292 <property name="WebServerToolWindowFactoryState" value="false" />
305 - <property name="last_opened_file_path" value="$USER_HOME$/Desktop/新建文件夹 (4)" /> 293 + <property name="last_opened_file_path" value="$PROJECT_DIR$/../TakeFood" />
306 <property name="HbShouldOpenHtmlAsHb" value="" /> 294 <property name="HbShouldOpenHtmlAsHb" value="" />
307 <property name="JavaScriptLanguageLevel" value="ES6" /> 295 <property name="JavaScriptLanguageLevel" value="ES6" />
308 <property name="JavaScriptPreferStrict" value="false" /> 296 <property name="JavaScriptPreferStrict" value="false" />
@@ -317,10 +305,14 @@ @@ -317,10 +305,14 @@
317 </key> 305 </key>
318 </component> 306 </component>
319 <component name="RunManager"> 307 <component name="RunManager">
  308 + <configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application">
  309 + <method />
  310 + </configuration>
320 <configuration default="true" type="DartUnitRunConfigurationType" factoryName="DartUnit"> 311 <configuration default="true" type="DartUnitRunConfigurationType" factoryName="DartUnit">
321 <method /> 312 <method />
322 </configuration> 313 </configuration>
323 - <configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application"> 314 + <configuration default="true" type="JavaScriptTestRunnerKarma" factoryName="Karma" config-file="">
  315 + <envs />
324 <method /> 316 <method />
325 </configuration> 317 </configuration>
326 <configuration default="true" type="JSTestDriver:ConfigurationType" factoryName="JsTestDriver"> 318 <configuration default="true" type="JSTestDriver:ConfigurationType" factoryName="JsTestDriver">
@@ -330,10 +322,6 @@ @@ -330,10 +322,6 @@
330 <setting name="preferredDebugBrowser" value="Chrome" /> 322 <setting name="preferredDebugBrowser" value="Chrome" />
331 <method /> 323 <method />
332 </configuration> 324 </configuration>
333 - <configuration default="true" type="JavaScriptTestRunnerKarma" factoryName="Karma" config-file="">  
334 - <envs />  
335 - <method />  
336 - </configuration>  
337 <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug"> 325 <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
338 <method /> 326 <method />
339 </configuration> 327 </configuration>
@@ -377,18 +365,18 @@ @@ -377,18 +365,18 @@
377 <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" /> 365 <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" />
378 <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" /> 366 <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" />
379 <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" /> 367 <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" />
380 - <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" />  
381 - <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" />  
382 <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" /> 368 <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" />
383 <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" /> 369 <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" />
384 <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" /> 370 <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" />
385 <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" /> 371 <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" />
386 <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" /> 372 <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" />
387 - <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" />  
388 <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" /> 373 <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" />
  374 + <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" />
  375 + <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" />
389 <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" /> 376 <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" />
390 - <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" /> 377 + <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" />
391 <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" /> 378 <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" />
  379 + <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" />
392 </layout> 380 </layout>
393 </component> 381 </component>
394 <component name="Vcs.Log.UiProperties"> 382 <component name="Vcs.Log.UiProperties">
@@ -414,6 +402,108 @@ @@ -414,6 +402,108 @@
414 <component name="editorHistoryManager"> 402 <component name="editorHistoryManager">
415 <entry file="file://$PROJECT_DIR$/index.html"> 403 <entry file="file://$PROJECT_DIR$/index.html">
416 <provider selected="true" editor-type-id="text-editor"> 404 <provider selected="true" editor-type-id="text-editor">
  405 + <state vertical-scroll-proportion="0.0" vertical-offset="4731" max-vertical-offset="6707">
  406 + <caret line="249" column="67" selection-start-line="249" selection-start-column="67" selection-end-line="249" selection-end-column="67" />
  407 + <folding />
  408 + </state>
  409 + </provider>
  410 + </entry>
  411 + <entry file="file://$PROJECT_DIR$/shopcar.html">
  412 + <provider selected="true" editor-type-id="text-editor">
  413 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3515">
  414 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  415 + <folding>
  416 + <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  417 + </folding>
  418 + </state>
  419 + </provider>
  420 + </entry>
  421 + <entry file="file://$PROJECT_DIR$/order.html">
  422 + <provider selected="true" editor-type-id="text-editor">
  423 + <state vertical-scroll-proportion="0.0" vertical-offset="5453" max-vertical-offset="14801">
  424 + <caret line="287" column="35" selection-start-line="287" selection-start-column="35" selection-end-line="287" selection-end-column="35" />
  425 + <folding>
  426 + <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" />
  427 + <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" />
  428 + </folding>
  429 + </state>
  430 + </provider>
  431 + </entry>
  432 + <entry file="file://$PROJECT_DIR$/addressdetails.html">
  433 + <provider selected="true" editor-type-id="text-editor">
  434 + <state vertical-scroll-proportion="0.0" vertical-offset="551" max-vertical-offset="1083">
  435 + <caret line="29" column="61" selection-start-line="29" selection-start-column="61" selection-end-line="29" selection-end-column="61" />
  436 + <folding />
  437 + </state>
  438 + </provider>
  439 + </entry>
  440 + <entry file="file://$PROJECT_DIR$/css/jquery-weui.css">
  441 + <provider selected="true" editor-type-id="text-editor">
  442 + <state vertical-scroll-proportion="0.0" vertical-offset="37486" max-vertical-offset="44061">
  443 + <caret line="2313" column="0" selection-start-line="2313" selection-start-column="0" selection-end-line="2313" selection-end-column="0" />
  444 + <folding>
  445 + <element signature="e#433#1880#2" expanded="true" />
  446 + <element signature="e#22129#22384#2" expanded="true" />
  447 + <element signature="e#22907#24354#2" expanded="true" />
  448 + <element signature="e#42419#42683#2" expanded="true" />
  449 + <element signature="e#42728#42997#2" expanded="true" />
  450 + <element signature="e#46090#46348#2" expanded="true" />
  451 + <element signature="e#46512#46770#2" expanded="true" />
  452 + <element signature="e#46901#47159#2" expanded="true" />
  453 + <element signature="e#47250#47508#2" expanded="true" />
  454 + <element signature="e#47672#47930#2" expanded="true" />
  455 + <element signature="e#48061#48319#2" expanded="true" />
  456 + <element signature="e#57908#59355#2" expanded="true" />
  457 + <element signature="e#59509#60953#2" expanded="true" />
  458 + </folding>
  459 + </state>
  460 + </provider>
  461 + </entry>
  462 + <entry file="file://$PROJECT_DIR$/css/index.css">
  463 + <provider selected="true" editor-type-id="text-editor">
  464 + <state vertical-scroll-proportion="0.0" vertical-offset="8398" max-vertical-offset="13851">
  465 + <caret line="442" column="0" selection-start-line="442" selection-start-column="0" selection-end-line="442" selection-end-column="0" />
  466 + <folding />
  467 + </state>
  468 + </provider>
  469 + </entry>
  470 + <entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html">
  471 + <provider selected="true" editor-type-id="text-editor">
  472 + <state vertical-scroll-proportion="0.0" vertical-offset="1976" max-vertical-offset="3477">
  473 + <caret line="104" column="24" selection-start-line="104" selection-start-column="24" selection-end-line="104" selection-end-column="24" />
  474 + <folding>
  475 + <element signature="n#style#0;n#img#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  476 + <element signature="n#style#0;n#img#0;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  477 + </folding>
  478 + </state>
  479 + </provider>
  480 + </entry>
  481 + <entry file="file://$PROJECT_DIR$/css/init.css">
  482 + <provider selected="true" editor-type-id="text-editor">
  483 + <state vertical-scroll-proportion="0.0" vertical-offset="912" max-vertical-offset="2717">
  484 + <caret line="48" column="14" selection-start-line="48" selection-start-column="14" selection-end-line="48" selection-end-column="14" />
  485 + <folding />
  486 + </state>
  487 + </provider>
  488 + </entry>
  489 + <entry file="file://$PROJECT_DIR$/css/PersonCenter/PersonCenter.css">
  490 + <provider selected="true" editor-type-id="text-editor">
  491 + <state vertical-scroll-proportion="0.0" vertical-offset="2223" max-vertical-offset="4902">
  492 + <caret line="117" column="1" selection-start-line="117" selection-start-column="1" selection-end-line="117" selection-end-column="1" />
  493 + <folding />
  494 + </state>
  495 + </provider>
  496 + </entry>
  497 + <entry file="file://$PROJECT_DIR$/js/personcenter.js">
  498 + <provider selected="true" editor-type-id="text-editor">
  499 + <state vertical-scroll-proportion="0.0" vertical-offset="1387" max-vertical-offset="2109">
  500 + <caret line="73" column="10" selection-start-line="73" selection-start-column="10" selection-end-line="73" selection-end-column="10" />
  501 + <folding />
  502 + </state>
  503 + </provider>
  504 + </entry>
  505 + <entry file="file://$PROJECT_DIR$/index.html">
  506 + <provider selected="true" editor-type-id="text-editor">
417 <state vertical-scroll-proportion="0.0" vertical-offset="4275" max-vertical-offset="6707"> 507 <state vertical-scroll-proportion="0.0" vertical-offset="4275" max-vertical-offset="6707">
418 <caret line="225" column="8" selection-start-line="225" selection-start-column="8" selection-end-line="225" selection-end-column="8" /> 508 <caret line="225" column="8" selection-start-line="225" selection-start-column="8" selection-end-line="225" selection-end-column="8" />
419 <folding /> 509 <folding />
@@ -432,9 +522,6 @@ @@ -432,9 +522,6 @@
432 <provider selected="true" editor-type-id="text-editor"> 522 <provider selected="true" editor-type-id="text-editor">
433 <state vertical-scroll-proportion="0.0" vertical-offset="2812" max-vertical-offset="5909"> 523 <state vertical-scroll-proportion="0.0" vertical-offset="2812" max-vertical-offset="5909">
434 <caret line="148" column="51" selection-start-line="148" selection-start-column="51" selection-end-line="148" selection-end-column="51" /> 524 <caret line="148" column="51" selection-start-line="148" selection-start-column="51" selection-end-line="148" selection-end-column="51" />
435 - <folding>  
436 - <element signature="n#!!doc" expanded="false" />  
437 - </folding>  
438 </state> 525 </state>
439 </provider> 526 </provider>
440 </entry> 527 </entry>
@@ -442,7 +529,6 @@ @@ -442,7 +529,6 @@
442 <provider selected="true" editor-type-id="text-editor"> 529 <provider selected="true" editor-type-id="text-editor">
443 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4427"> 530 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4427">
444 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 531 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
445 - <folding />  
446 </state> 532 </state>
447 </provider> 533 </provider>
448 </entry> 534 </entry>
@@ -458,7 +544,6 @@ @@ -458,7 +544,6 @@
458 <provider selected="true" editor-type-id="text-editor"> 544 <provider selected="true" editor-type-id="text-editor">
459 <state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="380"> 545 <state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="380">
460 <caret line="14" column="1460" selection-start-line="14" selection-start-column="1460" selection-end-line="14" selection-end-column="1460" /> 546 <caret line="14" column="1460" selection-start-line="14" selection-start-column="1460" selection-end-line="14" selection-end-column="1460" />
461 - <folding />  
462 </state> 547 </state>
463 </provider> 548 </provider>
464 </entry> 549 </entry>
@@ -476,7 +561,10 @@ @@ -476,7 +561,10 @@
476 <provider selected="true" editor-type-id="text-editor"> 561 <provider selected="true" editor-type-id="text-editor">
477 <state vertical-scroll-proportion="0.0" vertical-offset="722" max-vertical-offset="3116"> 562 <state vertical-scroll-proportion="0.0" vertical-offset="722" max-vertical-offset="3116">
478 <caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" /> 563 <caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" />
479 - <folding /> 564 + <folding>
  565 + <element signature="n#style#0;n#img#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  566 + <element signature="n#style#0;n#img#0;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  567 + </folding>
480 </state> 568 </state>
481 </provider> 569 </provider>
482 </entry> 570 </entry>
@@ -526,7 +614,10 @@ @@ -526,7 +614,10 @@
526 <provider selected="true" editor-type-id="text-editor"> 614 <provider selected="true" editor-type-id="text-editor">
527 <state vertical-scroll-proportion="0.0" vertical-offset="722" max-vertical-offset="3116"> 615 <state vertical-scroll-proportion="0.0" vertical-offset="722" max-vertical-offset="3116">
528 <caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" /> 616 <caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" />
529 - <folding /> 617 + <folding>
  618 + <element signature="n#style#0;n#img#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  619 + <element signature="n#style#0;n#img#0;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  620 + </folding>
530 </state> 621 </state>
531 </provider> 622 </provider>
532 </entry> 623 </entry>
@@ -572,7 +663,6 @@ @@ -572,7 +663,6 @@
572 <provider selected="true" editor-type-id="text-editor"> 663 <provider selected="true" editor-type-id="text-editor">
573 <state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="380"> 664 <state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="380">
574 <caret line="14" column="1460" selection-start-line="14" selection-start-column="1460" selection-end-line="14" selection-end-column="1460" /> 665 <caret line="14" column="1460" selection-start-line="14" selection-start-column="1460" selection-end-line="14" selection-end-column="1460" />
575 - <folding />  
576 </state> 666 </state>
577 </provider> 667 </provider>
578 </entry> 668 </entry>
@@ -580,7 +670,6 @@ @@ -580,7 +670,6 @@
580 <provider selected="true" editor-type-id="text-editor"> 670 <provider selected="true" editor-type-id="text-editor">
581 <state vertical-scroll-proportion="-28.785715" vertical-offset="0" max-vertical-offset="6058"> 671 <state vertical-scroll-proportion="-28.785715" vertical-offset="0" max-vertical-offset="6058">
582 <caret line="31" column="21" selection-start-line="31" selection-start-column="21" selection-end-line="31" selection-end-column="21" /> 672 <caret line="31" column="21" selection-start-line="31" selection-start-column="21" selection-end-line="31" selection-end-column="21" />
583 - <folding />  
584 </state> 673 </state>
585 </provider> 674 </provider>
586 </entry> 675 </entry>
@@ -588,9 +677,6 @@ @@ -588,9 +677,6 @@
588 <provider selected="true" editor-type-id="text-editor"> 677 <provider selected="true" editor-type-id="text-editor">
589 <state vertical-scroll-proportion="-16.88" vertical-offset="1003" max-vertical-offset="7775"> 678 <state vertical-scroll-proportion="-16.88" vertical-offset="1003" max-vertical-offset="7775">
590 <caret line="57" column="17" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="17" /> 679 <caret line="57" column="17" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="17" />
591 - <folding>  
592 - <element signature="n#!!doc" expanded="false" />  
593 - </folding>  
594 </state> 680 </state>
595 </provider> 681 </provider>
596 </entry> 682 </entry>
@@ -606,7 +692,6 @@ @@ -606,7 +692,6 @@
606 <provider selected="true" editor-type-id="text-editor"> 692 <provider selected="true" editor-type-id="text-editor">
607 <state vertical-scroll-proportion="-19.464285" vertical-offset="582" max-vertical-offset="2530"> 693 <state vertical-scroll-proportion="-19.464285" vertical-offset="582" max-vertical-offset="2530">
608 <caret line="49" column="26" selection-start-line="49" selection-start-column="26" selection-end-line="49" selection-end-column="26" /> 694 <caret line="49" column="26" selection-start-line="49" selection-start-column="26" selection-end-line="49" selection-end-column="26" />
609 - <folding />  
610 </state> 695 </state>
611 </provider> 696 </provider>
612 </entry> 697 </entry>
@@ -621,14 +706,6 @@ @@ -621,14 +706,6 @@
621 </state> 706 </state>
622 </provider> 707 </provider>
623 </entry> 708 </entry>
624 - <entry file="file://$PROJECT_DIR$/addressdetails.html">  
625 - <provider selected="true" editor-type-id="text-editor">  
626 - <state vertical-scroll-proportion="-15.214286" vertical-offset="6" max-vertical-offset="1539">  
627 - <caret line="16" column="0" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />  
628 - <folding />  
629 - </state>  
630 - </provider>  
631 - </entry>  
632 <entry file="file://$PROJECT_DIR$/js/index.js"> 709 <entry file="file://$PROJECT_DIR$/js/index.js">
633 <provider selected="true" editor-type-id="text-editor"> 710 <provider selected="true" editor-type-id="text-editor">
634 <state vertical-scroll-proportion="-10.44" vertical-offset="10191" max-vertical-offset="12532"> 711 <state vertical-scroll-proportion="-10.44" vertical-offset="10191" max-vertical-offset="12532">
@@ -647,7 +724,7 @@ @@ -647,7 +724,7 @@
647 </entry> 724 </entry>
648 <entry file="file://$PROJECT_DIR$/js/personcenter.js"> 725 <entry file="file://$PROJECT_DIR$/js/personcenter.js">
649 <provider selected="true" editor-type-id="text-editor"> 726 <provider selected="true" editor-type-id="text-editor">
650 - <state vertical-scroll-proportion="-33.44" vertical-offset="1062" max-vertical-offset="2886"> 727 + <state vertical-scroll-proportion="0.0" vertical-offset="1387" max-vertical-offset="2109">
651 <caret line="73" column="10" selection-start-line="73" selection-start-column="10" selection-end-line="73" selection-end-column="10" /> 728 <caret line="73" column="10" selection-start-line="73" selection-start-column="10" selection-end-line="73" selection-end-column="10" />
652 <folding /> 729 <folding />
653 </state> 730 </state>
@@ -669,17 +746,9 @@ @@ -669,17 +746,9 @@
669 </state> 746 </state>
670 </provider> 747 </provider>
671 </entry> 748 </entry>
672 - <entry file="file://$PROJECT_DIR$/index.html">  
673 - <provider selected="true" editor-type-id="text-editor">  
674 - <state vertical-scroll-proportion="-6.775862" vertical-offset="6330" max-vertical-offset="9531">  
675 - <caret line="249" column="67" selection-start-line="249" selection-start-column="67" selection-end-line="249" selection-end-column="67" />  
676 - <folding />  
677 - </state>  
678 - </provider>  
679 - </entry>  
680 <entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html"> 749 <entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html">
681 <provider selected="true" editor-type-id="text-editor"> 750 <provider selected="true" editor-type-id="text-editor">
682 - <state vertical-scroll-proportion="-10.607142" vertical-offset="2511" max-vertical-offset="4941"> 751 + <state vertical-scroll-proportion="0.0" vertical-offset="1976" max-vertical-offset="3477">
683 <caret line="104" column="24" selection-start-line="104" selection-start-column="24" selection-end-line="104" selection-end-column="24" /> 752 <caret line="104" column="24" selection-start-line="104" selection-start-column="24" selection-end-line="104" selection-end-column="24" />
684 <folding> 753 <folding>
685 <element signature="n#style#0;n#img#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> 754 <element signature="n#style#0;n#img#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
@@ -696,20 +765,32 @@ @@ -696,20 +765,32 @@
696 </state> 765 </state>
697 </provider> 766 </provider>
698 </entry> 767 </entry>
699 - <entry file="file://$PROJECT_DIR$/shopcar.html"> 768 + <entry file="file://$PROJECT_DIR$/css/jquery-weui.css">
700 <provider selected="true" editor-type-id="text-editor"> 769 <provider selected="true" editor-type-id="text-editor">
701 - <state vertical-scroll-proportion="-14.464286" vertical-offset="1620" max-vertical-offset="4995">  
702 - <caret line="75" column="91" selection-start-line="75" selection-start-column="91" selection-end-line="75" selection-end-column="91" /> 770 + <state vertical-scroll-proportion="0.0" vertical-offset="37486" max-vertical-offset="44061">
  771 + <caret line="2313" column="0" selection-start-line="2313" selection-start-column="0" selection-end-line="2313" selection-end-column="0" />
703 <folding> 772 <folding>
704 - <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> 773 + <element signature="e#433#1880#2" expanded="true" />
  774 + <element signature="e#22129#22384#2" expanded="true" />
  775 + <element signature="e#22907#24354#2" expanded="true" />
  776 + <element signature="e#42419#42683#2" expanded="true" />
  777 + <element signature="e#42728#42997#2" expanded="true" />
  778 + <element signature="e#46090#46348#2" expanded="true" />
  779 + <element signature="e#46512#46770#2" expanded="true" />
  780 + <element signature="e#46901#47159#2" expanded="true" />
  781 + <element signature="e#47250#47508#2" expanded="true" />
  782 + <element signature="e#47672#47930#2" expanded="true" />
  783 + <element signature="e#48061#48319#2" expanded="true" />
  784 + <element signature="e#57908#59355#2" expanded="true" />
  785 + <element signature="e#59509#60953#2" expanded="true" />
705 </folding> 786 </folding>
706 </state> 787 </state>
707 </provider> 788 </provider>
708 </entry> 789 </entry>
709 <entry file="file://$PROJECT_DIR$/order.html"> 790 <entry file="file://$PROJECT_DIR$/order.html">
710 <provider selected="true" editor-type-id="text-editor"> 791 <provider selected="true" editor-type-id="text-editor">
711 - <state vertical-scroll-proportion="0.39649123" vertical-offset="13161" max-vertical-offset="21033">  
712 - <caret line="500" column="44" selection-start-line="500" selection-start-column="44" selection-end-line="500" selection-end-column="44" /> 792 + <state vertical-scroll-proportion="0.0" vertical-offset="5453" max-vertical-offset="14801">
  793 + <caret line="287" column="35" selection-start-line="287" selection-start-column="35" selection-end-line="287" selection-end-column="35" />
713 <folding> 794 <folding>
714 <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" /> 795 <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" />
715 <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" /> 796 <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" />
@@ -717,5 +798,39 @@ @@ -717,5 +798,39 @@
717 </state> 798 </state>
718 </provider> 799 </provider>
719 </entry> 800 </entry>
  801 + <entry file="file://$PROJECT_DIR$/addressdetails.html">
  802 + <provider selected="true" editor-type-id="text-editor">
  803 + <state vertical-scroll-proportion="0.0" vertical-offset="551" max-vertical-offset="1083">
  804 + <caret line="29" column="61" selection-start-line="29" selection-start-column="61" selection-end-line="29" selection-end-column="61" />
  805 + <folding />
  806 + </state>
  807 + </provider>
  808 + </entry>
  809 + <entry file="file://$PROJECT_DIR$/shopcar.html">
  810 + <provider selected="true" editor-type-id="text-editor">
  811 + <state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="3515">
  812 + <caret line="14" column="15" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="15" />
  813 + <folding>
  814 + <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  815 + </folding>
  816 + </state>
  817 + </provider>
  818 + </entry>
  819 + <entry file="file://$PROJECT_DIR$/index.html">
  820 + <provider selected="true" editor-type-id="text-editor">
  821 + <state vertical-scroll-proportion="-8.892858" vertical-offset="2970" max-vertical-offset="10237">
  822 + <caret line="111" column="51" selection-start-line="111" selection-start-column="51" selection-end-line="111" selection-end-column="51" />
  823 + <folding />
  824 + </state>
  825 + </provider>
  826 + </entry>
  827 + <entry file="file://$PROJECT_DIR$/js/order.js">
  828 + <provider selected="true" editor-type-id="text-editor">
  829 + <state vertical-scroll-proportion="0.6036036" vertical-offset="11784" max-vertical-offset="13152">
  830 + <caret line="385" column="0" selection-start-line="385" selection-start-column="0" selection-end-line="385" selection-end-column="0" />
  831 + <folding />
  832 + </state>
  833 + </provider>
  834 + </entry>
720 </component> 835 </component>
721 </project> 836 </project>
此 diff 太大无法显示。
@@ -307,7 +307,7 @@ @@ -307,7 +307,7 @@
307 active.style.left = 1.8 + 'rem'; 307 active.style.left = 1.8 + 'rem';
308 wrap.style.display = 'block'; 308 wrap.style.display = 'block';
309 eat_popup.style.display = 'block'; 309 eat_popup.style.display = 'block';
310 - container.style.overflowY = 'none'; 310 + container.style.overflowY = 'hidden';
311 311
312 } 312 }
313 head_tab_left.onclick = function() { 313 head_tab_left.onclick = function() {
@@ -315,7 +315,7 @@ @@ -315,7 +315,7 @@
315 active.style.left = 0 + 'rem'; 315 active.style.left = 0 + 'rem';
316 wrap.style.display = 'block'; 316 wrap.style.display = 'block';
317 popup.style.display = 'block'; 317 popup.style.display = 'block';
318 - container.style.overflowY = 'none'; 318 + container.style.overflowY = 'hidden';
319 } 319 }
320 wrap.onclick = function() { 320 wrap.onclick = function() {
321 wrap.style.display = 'none'; 321 wrap.style.display = 'none';
@@ -318,6 +318,41 @@ new Vue({ @@ -318,6 +318,41 @@ new Vue({
318 alert('请输入正确手机号码'); 318 alert('请输入正确手机号码');
319 return false; 319 return false;
320 } 320 }
  321 + var order_note=that.remark;
  322 + var payment=that.payment;
  323 + var discount_coupon_id=that.discount_coupon_id;
  324 + var url = '/Flow/done'
  325 + var params = {
  326 + unique_id: localStorage.getItem('unique_id'),
  327 + consignee:nick_name,
  328 + tel:tel_phone,
  329 + cart_id_str:id,
  330 + order_type:ordertype,
  331 + spot_id:spot_id,
  332 + //store_id:store_id,
  333 + order_notes:order_note,
  334 + payment:payment,
  335 + discount_coupon_id:discount_coupon_id,
  336 + pick_up_time:pick_up_time,
  337 + // printer_id:printer_id,
  338 + from:2
  339 + }
  340 +
  341 +
  342 + ajaxsend(url, params, function(res) {
  343 + /*console.log(JSON.stringify(res))*/
  344 + console.log(res);
  345 + if(res.status==true){
  346 + alert("下单成功");
  347 + window.location.href=linkPath+'/PersonCenter/PersonCenter.html'
  348 + }else if(res.status==false){
  349 + alert(res.msg);
  350 + // alert("下单失败");
  351 + }
  352 +
  353 + })
  354 +
  355 +
321 }else if(ordertype==2){ 356 }else if(ordertype==2){
322 store_id=localStorage.getItem('store_id'); 357 store_id=localStorage.getItem('store_id');
323 358
@@ -326,49 +361,46 @@ new Vue({ @@ -326,49 +361,46 @@ new Vue({
326 alert("请选择打印机"); 361 alert("请选择打印机");
327 return false; 362 return false;
328 } 363 }
329 - }  
330 -  
331 - var order_note=that.remark;  
332 - var payment=that.payment;  
333 - var discount_coupon_id=that.discount_coupon_id;  
334 - var url = '/Flow/done'  
335 - var params = {  
336 - unique_id: localStorage.getItem('unique_id'),  
337 - consignee:nick_name,  
338 - tel:tel_phone,  
339 - cart_id_str:id,  
340 - order_type:ordertype,  
341 - spot_id:spot_id,  
342 - store_id:store_id,  
343 - order_notes:order_note,  
344 - payment:payment,  
345 - discount_coupon_id:discount_coupon_id,  
346 - pick_up_time:pick_up_time,  
347 - printer_id:printer_id,  
348 - from:2  
349 - }  
350 364
351 365
352 - ajaxsend(url, params, function(res) {  
353 - /*console.log(JSON.stringify(res))*/  
354 - console.log(res);  
355 - if(res.status==true){  
356 - alert("下单成功");  
357 - //window.location.reload();  
358 - window.location.href=linkPath+'/PersonCenter/PersonCenter.html'  
359 - }else if(res.status==false){  
360 - alert(res.msg);  
361 - alert("下单失败");  
362 - } 366 + var order_note=that.remark;
  367 + var payment=that.payment;
  368 + var discount_coupon_id=that.discount_coupon_id;
  369 + var url = '/Flow/done'
  370 + var params = {
  371 + unique_id: localStorage.getItem('unique_id'),
  372 + // consignee:nick_name,
  373 + // tel:tel_phone,
  374 + cart_id_str:id,
  375 + order_type:ordertype,
  376 + //spot_id:spot_id,
  377 + store_id:store_id,
  378 + order_notes:order_note,
  379 + payment:payment,
  380 + discount_coupon_id:discount_coupon_id,
  381 + //pick_up_time:pick_up_time,
  382 + printer_id:printer_id,
  383 + from:2
  384 + }
363 385
364 - })  
365 386
366 - } 387 + ajaxsend(url, params, function(res) {
  388 + /*console.log(JSON.stringify(res))*/
  389 + console.log(res);
  390 + if(res.status==true){
  391 + alert("下单成功");
  392 + window.location.href=linkPath+'/PersonCenter/PersonCenter.html'
  393 + }else if(res.status==false){
  394 + alert(res.msg);
  395 + //alert("下单失败");
  396 + }
367 397
368 - 398 + })
  399 + }
  400 +
  401 + }
369 } 402 }
370 403
371 -  
372 }) 404 })
373 405
374 //}); 406 //});
@@ -295,7 +295,7 @@ @@ -295,7 +295,7 @@
295 box-sizing: border-box; 295 box-sizing: border-box;
296 -webkit-transition: 300ms; 296 -webkit-transition: 300ms;
297 transition: 300ms; 297 transition: 300ms;
298 - font-size:0.2rem; 298 + font-size:0.3rem;
299 } 299 }
300 [v-cloak]{ 300 [v-cloak]{
301 display:none; 301 display:none;