李涵 / shipin · 提交

转到一个项目

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

合并分支 'lihongjuan' 到 'master' 

Lihongjuan



查看合并请求 !6
内嵌 并排对比
正在显示 5 个修改的文件 包含 298 行增加 和 151 行删除
... ... @@ -27,18 +27,18 @@
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-6.775862" vertical-offset="6330" max-vertical-offset="9531">
<caret line="249" column="67" selection-start-line="249" selection-start-column="67" selection-end-line="249" selection-end-column="67" />
<state vertical-scroll-proportion="-8.892858" vertical-offset="2970" max-vertical-offset="10237">
<caret line="111" column="51" selection-start-line="111" selection-start-column="51" selection-end-line="111" selection-end-column="51" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/index.js">
<file leaf-file-name="order.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/js/order.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-10.44" vertical-offset="10191" max-vertical-offset="12532">
<caret line="422" column="12" selection-start-line="422" selection-start-column="8" selection-end-line="422" selection-end-column="12" />
<state vertical-scroll-proportion="0.6036036" vertical-offset="11784" max-vertical-offset="13152">
<caret line="385" column="0" selection-start-line="385" selection-start-column="0" selection-end-line="385" selection-end-column="0" />
<folding />
</state>
</provider>
... ... @@ -47,8 +47,8 @@
<file leaf-file-name="shopcar.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/shopcar.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-14.464286" vertical-offset="1620" max-vertical-offset="4995">
<caret line="75" column="91" selection-start-line="75" selection-start-column="91" selection-end-line="75" selection-end-column="91" />
<state vertical-scroll-proportion="-0.0" vertical-offset="266" max-vertical-offset="3515">
<caret line="14" column="15" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="15" />
<folding>
<element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
... ... @@ -56,11 +56,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="order.html" pinned="false" current-in-tab="true">
<file leaf-file-name="order.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/order.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.39649123" vertical-offset="13161" max-vertical-offset="21033">
<caret line="500" column="44" selection-start-line="500" selection-start-column="44" selection-end-line="500" selection-end-column="44" />
<state vertical-scroll-proportion="0.0" vertical-offset="5453" max-vertical-offset="14801">
<caret line="287" column="35" selection-start-line="287" selection-start-column="35" selection-end-line="287" selection-end-column="35" />
<folding>
<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" />
<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 @@
</provider>
</entry>
</file>
<file leaf-file-name="addressdetails.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/addressdetails.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="551" max-vertical-offset="1083">
<caret line="29" column="61" selection-start-line="29" selection-start-column="61" selection-end-line="29" selection-end-column="61" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="jquery-weui.css" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/jquery-weui.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="37486" max-vertical-offset="44061">
<caret line="2313" column="0" selection-start-line="2313" selection-start-column="0" selection-end-line="2313" selection-end-column="0" />
<folding>
<element signature="e#433#1880#2" expanded="true" />
<element signature="e#22129#22384#2" expanded="true" />
<element signature="e#22907#24354#2" expanded="true" />
<element signature="e#42419#42683#2" expanded="true" />
<element signature="e#42728#42997#2" expanded="true" />
<element signature="e#46090#46348#2" expanded="true" />
<element signature="e#46512#46770#2" expanded="true" />
<element signature="e#46901#47159#2" expanded="true" />
<element signature="e#47250#47508#2" expanded="true" />
<element signature="e#47672#47930#2" expanded="true" />
<element signature="e#48061#48319#2" expanded="true" />
<element signature="e#57908#59355#2" expanded="true" />
<element signature="e#59509#60953#2" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.css" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="10746" max-vertical-offset="18225">
<state vertical-scroll-proportion="0.0" vertical-offset="8398" max-vertical-offset="13851">
<caret line="442" column="0" selection-start-line="442" selection-start-column="0" selection-end-line="442" selection-end-column="0" />
<folding />
</state>
... ... @@ -82,7 +116,7 @@
<file leaf-file-name="PersonCenter.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-10.607142" vertical-offset="2511" max-vertical-offset="4941">
<state vertical-scroll-proportion="0.0" vertical-offset="1976" max-vertical-offset="3477">
<caret line="104" column="24" selection-start-line="104" selection-start-column="24" selection-end-line="104" selection-end-column="24" />
<folding>
<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 @@
<file leaf-file-name="init.css" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/init.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="639" max-vertical-offset="3575">
<state vertical-scroll-proportion="0.0" vertical-offset="912" max-vertical-offset="2717">
<caret line="48" column="14" selection-start-line="48" selection-start-column="14" selection-end-line="48" selection-end-column="14" />
<folding />
</state>
... ... @@ -105,33 +139,13 @@
<file leaf-file-name="PersonCenter.css" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/PersonCenter/PersonCenter.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2100" max-vertical-offset="5934">
<state vertical-scroll-proportion="0.0" vertical-offset="2223" max-vertical-offset="4902">
<caret line="117" column="1" selection-start-line="117" selection-start-column="1" selection-end-line="117" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="personcenter.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/personcenter.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-33.44" vertical-offset="1062" max-vertical-offset="2886">
<caret line="73" column="10" selection-start-line="73" selection-start-column="10" selection-end-line="73" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="takedetails.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/takedetails.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-16.2" vertical-offset="81" max-vertical-offset="1458">
<caret line="18" column="25" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="IdeDocumentHistory">
... ... @@ -149,11 +163,13 @@
<option value="$PROJECT_DIR$/js/personcenter.js" />
<option value="$PROJECT_DIR$/css/PersonCenter/PersonCenter.css" />
<option value="$PROJECT_DIR$/css/index.css" />
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/PersonCenter/PersonCenter.html" />
<option value="$PROJECT_DIR$/css/init.css" />
<option value="$PROJECT_DIR$/shopcar.html" />
<option value="$PROJECT_DIR$/css/jquery-weui.css" />
<option value="$PROJECT_DIR$/order.html" />
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/js/order.js" />
</list>
</option>
</component>
... ... @@ -189,7 +205,6 @@
<sortByType />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<PATH>
... ... @@ -232,20 +247,6 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="myorder" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="TakeFood" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="shipin" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="js" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
... ... @@ -260,20 +261,6 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="img" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="TakeFood" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="shipin" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="css" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
... ... @@ -298,11 +285,12 @@
</PATH>
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$USER_HOME$/Desktop/新建文件夹 (4)" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../TakeFood" />
<property name="HbShouldOpenHtmlAsHb" value="" />
<property name="JavaScriptLanguageLevel" value="ES6" />
<property name="JavaScriptPreferStrict" value="false" />
... ... @@ -317,10 +305,14 @@
</key>
</component>
<component name="RunManager">
<configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application">
<method />
</configuration>
<configuration default="true" type="DartUnitRunConfigurationType" factoryName="DartUnit">
<method />
</configuration>
<configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application">
<configuration default="true" type="JavaScriptTestRunnerKarma" factoryName="Karma" config-file="">
<envs />
<method />
</configuration>
<configuration default="true" type="JSTestDriver:ConfigurationType" factoryName="JsTestDriver">
... ... @@ -330,10 +322,6 @@
<setting name="preferredDebugBrowser" value="Chrome" />
<method />
</configuration>
<configuration default="true" type="JavaScriptTestRunnerKarma" factoryName="Karma" config-file="">
<envs />
<method />
</configuration>
<configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
<method />
</configuration>
... ... @@ -377,18 +365,18 @@
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
</layout>
</component>
<component name="Vcs.Log.UiProperties">
... ... @@ -414,6 +402,108 @@
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="4731" max-vertical-offset="6707">
<caret line="249" column="67" selection-start-line="249" selection-start-column="67" selection-end-line="249" selection-end-column="67" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/shopcar.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3515">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/order.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="5453" max-vertical-offset="14801">
<caret line="287" column="35" selection-start-line="287" selection-start-column="35" selection-end-line="287" selection-end-column="35" />
<folding>
<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" />
<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" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/addressdetails.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="551" max-vertical-offset="1083">
<caret line="29" column="61" selection-start-line="29" selection-start-column="61" selection-end-line="29" selection-end-column="61" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/jquery-weui.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="37486" max-vertical-offset="44061">
<caret line="2313" column="0" selection-start-line="2313" selection-start-column="0" selection-end-line="2313" selection-end-column="0" />
<folding>
<element signature="e#433#1880#2" expanded="true" />
<element signature="e#22129#22384#2" expanded="true" />
<element signature="e#22907#24354#2" expanded="true" />
<element signature="e#42419#42683#2" expanded="true" />
<element signature="e#42728#42997#2" expanded="true" />
<element signature="e#46090#46348#2" expanded="true" />
<element signature="e#46512#46770#2" expanded="true" />
<element signature="e#46901#47159#2" expanded="true" />
<element signature="e#47250#47508#2" expanded="true" />
<element signature="e#47672#47930#2" expanded="true" />
<element signature="e#48061#48319#2" expanded="true" />
<element signature="e#57908#59355#2" expanded="true" />
<element signature="e#59509#60953#2" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="8398" max-vertical-offset="13851">
<caret line="442" column="0" selection-start-line="442" selection-start-column="0" selection-end-line="442" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1976" max-vertical-offset="3477">
<caret line="104" column="24" selection-start-line="104" selection-start-column="24" selection-end-line="104" selection-end-column="24" />
<folding>
<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" />
<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" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/init.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="912" max-vertical-offset="2717">
<caret line="48" column="14" selection-start-line="48" selection-start-column="14" selection-end-line="48" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/PersonCenter/PersonCenter.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2223" max-vertical-offset="4902">
<caret line="117" column="1" selection-start-line="117" selection-start-column="1" selection-end-line="117" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/personcenter.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1387" max-vertical-offset="2109">
<caret line="73" column="10" selection-start-line="73" selection-start-column="10" selection-end-line="73" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="4275" max-vertical-offset="6707">
<caret line="225" column="8" selection-start-line="225" selection-start-column="8" selection-end-line="225" selection-end-column="8" />
<folding />
... ... @@ -432,9 +522,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2812" max-vertical-offset="5909">
<caret line="148" column="51" selection-start-line="148" selection-start-column="51" selection-end-line="148" selection-end-column="51" />
<folding>
<element signature="n#!!doc" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -442,7 +529,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4427">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -458,7 +544,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="380">
<caret line="14" column="1460" selection-start-line="14" selection-start-column="1460" selection-end-line="14" selection-end-column="1460" />
<folding />
</state>
</provider>
</entry>
... ... @@ -476,7 +561,10 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="722" max-vertical-offset="3116">
<caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" />
<folding />
<folding>
<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" />
<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" />
</folding>
</state>
</provider>
</entry>
... ... @@ -526,7 +614,10 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="722" max-vertical-offset="3116">
<caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" />
<folding />
<folding>
<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" />
<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" />
</folding>
</state>
</provider>
</entry>
... ... @@ -572,7 +663,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="380">
<caret line="14" column="1460" selection-start-line="14" selection-start-column="1460" selection-end-line="14" selection-end-column="1460" />
<folding />
</state>
</provider>
</entry>
... ... @@ -580,7 +670,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-28.785715" vertical-offset="0" max-vertical-offset="6058">
<caret line="31" column="21" selection-start-line="31" selection-start-column="21" selection-end-line="31" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
... ... @@ -588,9 +677,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-16.88" vertical-offset="1003" max-vertical-offset="7775">
<caret line="57" column="17" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="17" />
<folding>
<element signature="n#!!doc" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -606,7 +692,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-19.464285" vertical-offset="582" max-vertical-offset="2530">
<caret line="49" column="26" selection-start-line="49" selection-start-column="26" selection-end-line="49" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
... ... @@ -621,14 +706,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/addressdetails.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-15.214286" vertical-offset="6" max-vertical-offset="1539">
<caret line="16" column="0" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-10.44" vertical-offset="10191" max-vertical-offset="12532">
... ... @@ -647,7 +724,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/js/personcenter.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-33.44" vertical-offset="1062" max-vertical-offset="2886">
<state vertical-scroll-proportion="0.0" vertical-offset="1387" max-vertical-offset="2109">
<caret line="73" column="10" selection-start-line="73" selection-start-column="10" selection-end-line="73" selection-end-column="10" />
<folding />
</state>
... ... @@ -669,17 +746,9 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-6.775862" vertical-offset="6330" max-vertical-offset="9531">
<caret line="249" column="67" selection-start-line="249" selection-start-column="67" selection-end-line="249" selection-end-column="67" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-10.607142" vertical-offset="2511" max-vertical-offset="4941">
<state vertical-scroll-proportion="0.0" vertical-offset="1976" max-vertical-offset="3477">
<caret line="104" column="24" selection-start-line="104" selection-start-column="24" selection-end-line="104" selection-end-column="24" />
<folding>
<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 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/shopcar.html">
<entry file="file://$PROJECT_DIR$/css/jquery-weui.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-14.464286" vertical-offset="1620" max-vertical-offset="4995">
<caret line="75" column="91" selection-start-line="75" selection-start-column="91" selection-end-line="75" selection-end-column="91" />
<state vertical-scroll-proportion="0.0" vertical-offset="37486" max-vertical-offset="44061">
<caret line="2313" column="0" selection-start-line="2313" selection-start-column="0" selection-end-line="2313" selection-end-column="0" />
<folding>
<element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="e#433#1880#2" expanded="true" />
<element signature="e#22129#22384#2" expanded="true" />
<element signature="e#22907#24354#2" expanded="true" />
<element signature="e#42419#42683#2" expanded="true" />
<element signature="e#42728#42997#2" expanded="true" />
<element signature="e#46090#46348#2" expanded="true" />
<element signature="e#46512#46770#2" expanded="true" />
<element signature="e#46901#47159#2" expanded="true" />
<element signature="e#47250#47508#2" expanded="true" />
<element signature="e#47672#47930#2" expanded="true" />
<element signature="e#48061#48319#2" expanded="true" />
<element signature="e#57908#59355#2" expanded="true" />
<element signature="e#59509#60953#2" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/order.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.39649123" vertical-offset="13161" max-vertical-offset="21033">
<caret line="500" column="44" selection-start-line="500" selection-start-column="44" selection-end-line="500" selection-end-column="44" />
<state vertical-scroll-proportion="0.0" vertical-offset="5453" max-vertical-offset="14801">
<caret line="287" column="35" selection-start-line="287" selection-start-column="35" selection-end-line="287" selection-end-column="35" />
<folding>
<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" />
<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 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/addressdetails.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="551" max-vertical-offset="1083">
<caret line="29" column="61" selection-start-line="29" selection-start-column="61" selection-end-line="29" selection-end-column="61" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/shopcar.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="3515">
<caret line="14" column="15" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="15" />
<folding>
<element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-8.892858" vertical-offset="2970" max-vertical-offset="10237">
<caret line="111" column="51" selection-start-line="111" selection-start-column="51" selection-end-line="111" selection-end-column="51" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/order.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.6036036" vertical-offset="11784" max-vertical-offset="13152">
<caret line="385" column="0" selection-start-line="385" selection-start-column="0" selection-end-line="385" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
此 diff 太大无法显示。
... ... @@ -307,7 +307,7 @@
active.style.left = 1.8 + 'rem';
wrap.style.display = 'block';
eat_popup.style.display = 'block';
container.style.overflowY = 'none';
container.style.overflowY = 'hidden';
}
head_tab_left.onclick = function() {
... ... @@ -315,7 +315,7 @@
active.style.left = 0 + 'rem';
wrap.style.display = 'block';
popup.style.display = 'block';
container.style.overflowY = 'none';
container.style.overflowY = 'hidden';
}
wrap.onclick = function() {
wrap.style.display = 'none';
... ...
... ... @@ -318,6 +318,41 @@ new Vue({
alert('请输入正确手机号码');
return false;
}
var order_note=that.remark;
var payment=that.payment;
var discount_coupon_id=that.discount_coupon_id;
var url = '/Flow/done'
var params = {
unique_id: localStorage.getItem('unique_id'),
consignee:nick_name,
tel:tel_phone,
cart_id_str:id,
order_type:ordertype,
spot_id:spot_id,
//store_id:store_id,
order_notes:order_note,
payment:payment,
discount_coupon_id:discount_coupon_id,
pick_up_time:pick_up_time,
// printer_id:printer_id,
from:2
}
ajaxsend(url, params, function(res) {
/*console.log(JSON.stringify(res))*/
console.log(res);
if(res.status==true){
alert("下单成功");
window.location.href=linkPath+'/PersonCenter/PersonCenter.html'
}else if(res.status==false){
alert(res.msg);
// alert("下单失败");
}
})
}else if(ordertype==2){
store_id=localStorage.getItem('store_id');
... ... @@ -326,49 +361,46 @@ new Vue({
alert("请选择打印机");
return false;
}
}
var order_note=that.remark;
var payment=that.payment;
var discount_coupon_id=that.discount_coupon_id;
var url = '/Flow/done'
var params = {
unique_id: localStorage.getItem('unique_id'),
consignee:nick_name,
tel:tel_phone,
cart_id_str:id,
order_type:ordertype,
spot_id:spot_id,
store_id:store_id,
order_notes:order_note,
payment:payment,
discount_coupon_id:discount_coupon_id,
pick_up_time:pick_up_time,
printer_id:printer_id,
from:2
}
ajaxsend(url, params, function(res) {
/*console.log(JSON.stringify(res))*/
console.log(res);
if(res.status==true){
alert("下单成功");
//window.location.reload();
window.location.href=linkPath+'/PersonCenter/PersonCenter.html'
}else if(res.status==false){
alert(res.msg);
alert("下单失败");
}
var order_note=that.remark;
var payment=that.payment;
var discount_coupon_id=that.discount_coupon_id;
var url = '/Flow/done'
var params = {
unique_id: localStorage.getItem('unique_id'),
// consignee:nick_name,
// tel:tel_phone,
cart_id_str:id,
order_type:ordertype,
//spot_id:spot_id,
store_id:store_id,
order_notes:order_note,
payment:payment,
discount_coupon_id:discount_coupon_id,
//pick_up_time:pick_up_time,
printer_id:printer_id,
from:2
}
})
}
ajaxsend(url, params, function(res) {
/*console.log(JSON.stringify(res))*/
console.log(res);
if(res.status==true){
alert("下单成功");
window.location.href=linkPath+'/PersonCenter/PersonCenter.html'
}else if(res.status==false){
alert(res.msg);
//alert("下单失败");
}
})
}
}
}
})
//});
\ No newline at end of file
... ...
... ... @@ -295,7 +295,7 @@
box-sizing: border-box;
-webkit-transition: 300ms;
transition: 300ms;
font-size:0.2rem;
font-size:0.3rem;
}
[v-cloak]{
display:none;
... ...