作者 李洪娟

合并分支 'lihongjuan' 到 'master'

Lihongjuan



查看合并请求 !6
... ... @@ -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
... ...
... ... @@ -21,18 +21,18 @@
background-position: 50%;
background-size: 100%;
}
@-webkit-keyframes preloader-spin {
100% {
-webkit-transform: rotate(360deg);
transform: rotate(360deg);
}
}
@keyframes preloader-spin {
100% {
-webkit-transform: rotate(360deg);
transform: rotate(360deg);
}
}
/*@-webkit-keyframes preloader-spin {*/
/*100% {*/
/*-webkit-transform: rotate(360deg);*/
/*transform: rotate(360deg);*/
/*}*/
/*}*/
/*@keyframes preloader-spin {*/
/*100% {*/
/*-webkit-transform: rotate(360deg);*/
/*transform: rotate(360deg);*/
/*}*/
/*}*/
/*
.hairline(@position, @color) when (@position = top) {
border-top: 1px solid @color;
... ... @@ -76,21 +76,21 @@ html {
body {
font-size: 16px;
}
@media only screen and (min-width: 400px) {
html {
font-size: 21.33333333px !important;
}
}
@media only screen and (min-width: 414px) {
html {
font-size: 22.08px !important;
}
}
@media only screen and (min-width: 480px) {
html {
font-size: 25.6px !important;
}
}
/*@media only screen and (min-width: 400px) {*/
/*html {*/
/*font-size: 21.33333333px !important;*/
/*}*/
/*}*/
/*@media only screen and (min-width: 414px) {*/
/*html {*/
/*font-size: 22.08px !important;*/
/*}*/
/*}*/
/*@media only screen and (min-width: 480px) {*/
/*html {*/
/*font-size: 25.6px !important;*/
/*}*/
/*}*/
.weui_navbar {
z-index: 10;
}
... ... @@ -370,255 +370,255 @@ body {
.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(15) ~ .weui-col-auto {
width: 6.66666667%;
}
@media all and (min-width: 768px) {
.row .tablet-100 {
width: 100%;
width: calc((100% - 15px*0) / 1);
}
.row.no-gutter .tablet-100 {
/*@media all and (min-width: 768px) {*/
/*.row .tablet-100 {*/
/*width: 100%;*/
/*width: calc((100% - 15px*0) / 1);*/
/*}*/
.row.no-gutter .tablet-100 {
width: 100%;
}
.row .tablet-95 {
}
.row .tablet-95 {
width: 95%;
width: calc((100% - 15px*0.05263157894736836) / 1.0526315789473684);
}
.row.no-gutter .tablet-95 {
}
.row.no-gutter .tablet-95 {
width: 95%;
}
.row .tablet-90 {
}
.row .tablet-90 {
width: 90%;
width: calc((100% - 15px*0.11111111111111116) / 1.1111111111111112);
}
.row.no-gutter .tablet-90 {
}
.row.no-gutter .tablet-90 {
width: 90%;
}
.row .tablet-85 {
}
.row .tablet-85 {
width: 85%;
width: calc((100% - 15px*0.17647058823529416) / 1.1764705882352942);
}
.row.no-gutter .tablet-85 {
}
.row.no-gutter .tablet-85 {
width: 85%;
}
.row .tablet-80 {
}
.row .tablet-80 {
width: 80%;
width: calc((100% - 15px*0.25) / 1.25);
}
.row.no-gutter .tablet-80 {
}
.row.no-gutter .tablet-80 {
width: 80%;
}
.row .tablet-75 {
}
.row .tablet-75 {
width: 75%;
width: calc((100% - 15px*0.33333333333333326) / 1.3333333333333333);
}
.row.no-gutter .tablet-75 {
}
.row.no-gutter .tablet-75 {
width: 75%;
}
.row .tablet-66 {
}
.row .tablet-66 {
width: 66.66666666666666%;
width: calc((100% - 15px*0.5000000000000002) / 1.5000000000000002);
}
.row.no-gutter .tablet-66 {
}
.row.no-gutter .tablet-66 {
width: 66.66666666666666%;
}
.row .tablet-60 {
}
.row .tablet-60 {
width: 60%;
width: calc((100% - 15px*0.6666666666666667) / 1.6666666666666667);
}
.row.no-gutter .tablet-60 {
}
.row.no-gutter .tablet-60 {
width: 60%;
}
.row .tablet-50 {
}
.row .tablet-50 {
width: 50%;
width: calc((100% - 15px*1) / 2);
}
.row.no-gutter .tablet-50 {
}
.row.no-gutter .tablet-50 {
width: 50%;
}
.row .tablet-40 {
}
.row .tablet-40 {
width: 40%;
width: calc((100% - 15px*1.5) / 2.5);
}
.row.no-gutter .tablet-40 {
}
.row.no-gutter .tablet-40 {
width: 40%;
}
.row .tablet-33 {
}
.row .tablet-33 {
width: 33.333333333333336%;
width: calc((100% - 15px*2) / 3);
}
.row.no-gutter .tablet-33 {
}
.row.no-gutter .tablet-33 {
width: 33.333333333333336%;
}
.row .tablet-25 {
}
.row .tablet-25 {
width: 25%;
width: calc((100% - 15px*3) / 4);
}
.row.no-gutter .tablet-25 {
}
.row.no-gutter .tablet-25 {
width: 25%;
}
.row .tablet-20 {
}
.row .tablet-20 {
width: 20%;
width: calc((100% - 15px*4) / 5);
}
.row.no-gutter .tablet-20 {
}
.row.no-gutter .tablet-20 {
width: 20%;
}
.row .tablet-15 {
}
.row .tablet-15 {
width: 15%;
width: calc((100% - 15px*5.666666666666667) / 6.666666666666667);
}
.row.no-gutter .tablet-15 {
}
.row.no-gutter .tablet-15 {
width: 15%;
}
.row .tablet-10 {
}
.row .tablet-10 {
width: 10%;
width: calc((100% - 15px*9) / 10);
}
.row.no-gutter .tablet-10 {
}
.row.no-gutter .tablet-10 {
width: 10%;
}
.row .tablet-5 {
}
.row .tablet-5 {
width: 5%;
width: calc((100% - 15px*19) / 20);
}
.row.no-gutter .tablet-5 {
}
.row.no-gutter .tablet-5 {
width: 5%;
}
.row .tablet-auto:nth-last-child(1),
.row .tablet-auto:nth-last-child(1) ~ .col-auto {
}
.row .tablet-auto:nth-last-child(1),
.row .tablet-auto:nth-last-child(1) ~ .col-auto {
width: 100%;
width: calc((100% - 15px*0) / 1);
}
.row.no-gutter .tablet-auto:nth-last-child(1),
.row.no-gutter .tablet-auto:nth-last-child(1) ~ .tablet-auto {
}
.row.no-gutter .tablet-auto:nth-last-child(1),
.row.no-gutter .tablet-auto:nth-last-child(1) ~ .tablet-auto {
width: 100%;
}
.row .tablet-auto:nth-last-child(2),
.row .tablet-auto:nth-last-child(2) ~ .col-auto {
}
.row .tablet-auto:nth-last-child(2),
.row .tablet-auto:nth-last-child(2) ~ .col-auto {
width: 50%;
width: calc((100% - 15px*1) / 2);
}
.row.no-gutter .tablet-auto:nth-last-child(2),
.row.no-gutter .tablet-auto:nth-last-child(2) ~ .tablet-auto {
}
.row.no-gutter .tablet-auto:nth-last-child(2),
.row.no-gutter .tablet-auto:nth-last-child(2) ~ .tablet-auto {
width: 50%;
}
.row .tablet-auto:nth-last-child(3),
.row .tablet-auto:nth-last-child(3) ~ .col-auto {
}
.row .tablet-auto:nth-last-child(3),
.row .tablet-auto:nth-last-child(3) ~ .col-auto {
width: 33.33333333%;
width: calc((100% - 15px*2) / 3);
}
.row.no-gutter .tablet-auto:nth-last-child(3),
.row.no-gutter .tablet-auto:nth-last-child(3) ~ .tablet-auto {
}
.row.no-gutter .tablet-auto:nth-last-child(3),
.row.no-gutter .tablet-auto:nth-last-child(3) ~ .tablet-auto {
width: 33.33333333%;
}
.row .tablet-auto:nth-last-child(4),
.row .tablet-auto:nth-last-child(4) ~ .col-auto {
}
.row .tablet-auto:nth-last-child(4),
.row .tablet-auto:nth-last-child(4) ~ .col-auto {
width: 25%;
width: calc((100% - 15px*3) / 4);
}
.row.no-gutter .tablet-auto:nth-last-child(4),
.row.no-gutter .tablet-auto:nth-last-child(4) ~ .tablet-auto {
}
.row.no-gutter .tablet-auto:nth-last-child(4),
.row.no-gutter .tablet-auto:nth-last-child(4) ~ .tablet-auto {
width: 25%;
}
.row .tablet-auto:nth-last-child(5),
.row .tablet-auto:nth-last-child(5) ~ .col-auto {
}
.row .tablet-auto:nth-last-child(5),
.row .tablet-auto:nth-last-child(5) ~ .col-auto {
width: 20%;
width: calc((100% - 15px*4) / 5);
}
.row.no-gutter .tablet-auto:nth-last-child(5),
.row.no-gutter .tablet-auto:nth-last-child(5) ~ .tablet-auto {
}
.row.no-gutter .tablet-auto:nth-last-child(5),
.row.no-gutter .tablet-auto:nth-last-child(5) ~ .tablet-auto {
width: 20%;
}
.row .tablet-auto:nth-last-child(6),
.row .tablet-auto:nth-last-child(6) ~ .col-auto {
}
.row .tablet-auto:nth-last-child(6),
.row .tablet-auto:nth-last-child(6) ~ .col-auto {
width: 16.66666667%;
width: calc((100% - 15px*5) / 6);
}
.row.no-gutter .tablet-auto:nth-last-child(6),
.row.no-gutter .tablet-auto:nth-last-child(6) ~ .tablet-auto {
}
.row.no-gutter .tablet-auto:nth-last-child(6),
.row.no-gutter .tablet-auto:nth-last-child(6) ~ .tablet-auto {
width: 16.66666667%;
}
.row .tablet-auto:nth-last-child(7),
.row .tablet-auto:nth-last-child(7) ~ .col-auto {
}
.row .tablet-auto:nth-last-child(7),
.row .tablet-auto:nth-last-child(7) ~ .col-auto {
width: 14.28571429%;
width: calc((100% - 15px*6) / 7);
}
.row.no-gutter .tablet-auto:nth-last-child(7),
.row.no-gutter .tablet-auto:nth-last-child(7) ~ .tablet-auto {
}
.row.no-gutter .tablet-auto:nth-last-child(7),
.row.no-gutter .tablet-auto:nth-last-child(7) ~ .tablet-auto {
width: 14.28571429%;
}
.row .tablet-auto:nth-last-child(8),
.row .tablet-auto:nth-last-child(8) ~ .col-auto {
}
.row .tablet-auto:nth-last-child(8),
.row .tablet-auto:nth-last-child(8) ~ .col-auto {
width: 12.5%;
width: calc((100% - 15px*7) / 8);
}
.row.no-gutter .tablet-auto:nth-last-child(8),
.row.no-gutter .tablet-auto:nth-last-child(8) ~ .tablet-auto {
}
.row.no-gutter .tablet-auto:nth-last-child(8),
.row.no-gutter .tablet-auto:nth-last-child(8) ~ .tablet-auto {
width: 12.5%;
}
.row .tablet-auto:nth-last-child(9),
.row .tablet-auto:nth-last-child(9) ~ .col-auto {
}
.row .tablet-auto:nth-last-child(9),
.row .tablet-auto:nth-last-child(9) ~ .col-auto {
width: 11.11111111%;
width: calc((100% - 15px*8) / 9);
}
.row.no-gutter .tablet-auto:nth-last-child(9),
.row.no-gutter .tablet-auto:nth-last-child(9) ~ .tablet-auto {
}
.row.no-gutter .tablet-auto:nth-last-child(9),
.row.no-gutter .tablet-auto:nth-last-child(9) ~ .tablet-auto {
width: 11.11111111%;
}
.row .tablet-auto:nth-last-child(10),
.row .tablet-auto:nth-last-child(10) ~ .col-auto {
}
.row .tablet-auto:nth-last-child(10),
.row .tablet-auto:nth-last-child(10) ~ .col-auto {
width: 10%;
width: calc((100% - 15px*9) / 10);
}
.row.no-gutter .tablet-auto:nth-last-child(10),
.row.no-gutter .tablet-auto:nth-last-child(10) ~ .tablet-auto {
}
.row.no-gutter .tablet-auto:nth-last-child(10),
.row.no-gutter .tablet-auto:nth-last-child(10) ~ .tablet-auto {
width: 10%;
}
.row .tablet-auto:nth-last-child(11),
.row .tablet-auto:nth-last-child(11) ~ .col-auto {
}
.row .tablet-auto:nth-last-child(11),
.row .tablet-auto:nth-last-child(11) ~ .col-auto {
width: 9.09090909%;
width: calc((100% - 15px*10) / 11);
}
.row.no-gutter .tablet-auto:nth-last-child(11),
.row.no-gutter .tablet-auto:nth-last-child(11) ~ .tablet-auto {
}
.row.no-gutter .tablet-auto:nth-last-child(11),
.row.no-gutter .tablet-auto:nth-last-child(11) ~ .tablet-auto {
width: 9.09090909%;
}
.row .tablet-auto:nth-last-child(12),
.row .tablet-auto:nth-last-child(12) ~ .col-auto {
}
.row .tablet-auto:nth-last-child(12),
.row .tablet-auto:nth-last-child(12) ~ .col-auto {
width: 8.33333333%;
width: calc((100% - 15px*11) / 12);
}
.row.no-gutter .tablet-auto:nth-last-child(12),
.row.no-gutter .tablet-auto:nth-last-child(12) ~ .tablet-auto {
}
.row.no-gutter .tablet-auto:nth-last-child(12),
.row.no-gutter .tablet-auto:nth-last-child(12) ~ .tablet-auto {
width: 8.33333333%;
}
.row .tablet-auto:nth-last-child(13),
.row .tablet-auto:nth-last-child(13) ~ .col-auto {
}
.row .tablet-auto:nth-last-child(13),
.row .tablet-auto:nth-last-child(13) ~ .col-auto {
width: 7.69230769%;
width: calc((100% - 15px*12) / 13);
}
.row.no-gutter .tablet-auto:nth-last-child(13),
.row.no-gutter .tablet-auto:nth-last-child(13) ~ .tablet-auto {
}
.row.no-gutter .tablet-auto:nth-last-child(13),
.row.no-gutter .tablet-auto:nth-last-child(13) ~ .tablet-auto {
width: 7.69230769%;
}
.row .tablet-auto:nth-last-child(14),
.row .tablet-auto:nth-last-child(14) ~ .col-auto {
}
.row .tablet-auto:nth-last-child(14),
.row .tablet-auto:nth-last-child(14) ~ .col-auto {
width: 7.14285714%;
width: calc((100% - 15px*13) / 14);
}
.row.no-gutter .tablet-auto:nth-last-child(14),
.row.no-gutter .tablet-auto:nth-last-child(14) ~ .tablet-auto {
}
.row.no-gutter .tablet-auto:nth-last-child(14),
.row.no-gutter .tablet-auto:nth-last-child(14) ~ .tablet-auto {
width: 7.14285714%;
}
.row .tablet-auto:nth-last-child(15),
.row .tablet-auto:nth-last-child(15) ~ .col-auto {
}
.row .tablet-auto:nth-last-child(15),
.row .tablet-auto:nth-last-child(15) ~ .col-auto {
width: 6.66666667%;
width: calc((100% - 15px*14) / 15);
}
.row.no-gutter .tablet-auto:nth-last-child(15),
.row.no-gutter .tablet-auto:nth-last-child(15) ~ .tablet-auto {
}
.row.no-gutter .tablet-auto:nth-last-child(15),
.row.no-gutter .tablet-auto:nth-last-child(15) ~ .tablet-auto {
width: 6.66666667%;
}
}
.weui-cell__hd img {
display: block;
margin-right: 5px;
... ... @@ -817,12 +817,12 @@ body {
.refreshing .weui-pull-to-refresh__layer .refresh {
display: inline-block;
}
@keyframes preloader-spin {
100% {
-webkit-transform: rotate(360deg);
transform: rotate(360deg);
}
}
/*@keyframes preloader-spin {*/
/*100% {*/
/*-webkit-transform: rotate(360deg);*/
/*transform: rotate(360deg);*/
/*}*/
/*}*/
.weui-tab__bd-item.weui-pull-to-refresh {
position: absolute;
top: 50px;
... ... @@ -878,18 +878,18 @@ body {
-webkit-transform-origin: 50% 0%;
transform-origin: 50% 0%;
}
@media only screen and (-webkit-min-device-pixel-ratio: 2) {
.toolbar:before {
-webkit-transform: scaleY(0.5);
transform: scaleY(0.5);
}
}
@media only screen and (-webkit-min-device-pixel-ratio: 3) {
.toolbar:before {
-webkit-transform: scaleY(0.33);
transform: scaleY(0.33);
}
}
/*@media only screen and (-webkit-min-device-pixel-ratio: 2) {*/
/*.toolbar:before {*/
/*-webkit-transform: scaleY(0.5);*/
/*transform: scaleY(0.5);*/
/*}*/
/*}*/
/*@media only screen and (-webkit-min-device-pixel-ratio: 3) {*/
/*.toolbar:before {*/
/*-webkit-transform: scaleY(0.33);*/
/*transform: scaleY(0.33);*/
/*}*/
/*}*/
.toolbar .toolbar-inner {
height: 2.2rem;
display: -webkit-box;
... ... @@ -970,11 +970,11 @@ body {
.popover .weui-picker-modal .picker-columns {
height: 10rem;
}
@media (orientation: landscape) and (max-height: 415px) {
.weui-picker-modal .picker-columns:not(.picker-modal-inline) {
height: 10rem;
}
}
/*@media (orientation: landscape) and (max-height: 415px) {*/
/*.weui-picker-modal .picker-columns:not(.picker-modal-inline) {*/
/*height: 10rem;*/
/*}*/
/*}*/
.weui-picker-modal .popover.popover-picker-columns {
width: 14rem;
}
... ... @@ -1079,18 +1079,18 @@ body {
-webkit-transform-origin: 50% 0%;
transform-origin: 50% 0%;
}
@media only screen and (-webkit-min-device-pixel-ratio: 2) {
.weui-picker-modal .picker-center-highlight:before {
-webkit-transform: scaleY(0.5);
transform: scaleY(0.5);
}
}
@media only screen and (-webkit-min-device-pixel-ratio: 3) {
.weui-picker-modal .picker-center-highlight:before {
-webkit-transform: scaleY(0.33);
transform: scaleY(0.33);
}
}
/*@media only screen and (-webkit-min-device-pixel-ratio: 2) {*/
/*.weui-picker-modal .picker-center-highlight:before {*/
/*-webkit-transform: scaleY(0.5);*/
/*transform: scaleY(0.5);*/
/*}*/
/*}*/
/*@media only screen and (-webkit-min-device-pixel-ratio: 3) {*/
/*.weui-picker-modal .picker-center-highlight:before {*/
/*-webkit-transform: scaleY(0.33);*/
/*transform: scaleY(0.33);*/
/*}*/
/*}*/
.weui-picker-modal .picker-center-highlight:after {
content: '';
position: absolute;
... ... @@ -1106,18 +1106,18 @@ body {
-webkit-transform-origin: 50% 100%;
transform-origin: 50% 100%;
}
@media only screen and (-webkit-min-device-pixel-ratio: 2) {
.weui-picker-modal .picker-center-highlight:after {
-webkit-transform: scaleY(0.5);
transform: scaleY(0.5);
}
}
@media only screen and (-webkit-min-device-pixel-ratio: 3) {
.weui-picker-modal .picker-center-highlight:after {
-webkit-transform: scaleY(0.33);
transform: scaleY(0.33);
}
}
/*@media only screen and (-webkit-min-device-pixel-ratio: 2) {*/
/*.weui-picker-modal .picker-center-highlight:after {*/
/*-webkit-transform: scaleY(0.5);*/
/*transform: scaleY(0.5);*/
/*}*/
/*}*/
/*@media only screen and (-webkit-min-device-pixel-ratio: 3) {*/
/*.weui-picker-modal .picker-center-highlight:after {*/
/*-webkit-transform: scaleY(0.33);*/
/*transform: scaleY(0.33);*/
/*}*/
/*}*/
.weui-picker-modal .picker-3d .picker-items {
overflow: hidden;
-webkit-perspective: 1200px;
... ... @@ -1212,18 +1212,18 @@ body {
-webkit-transform-origin: 50% 100%;
transform-origin: 50% 100%;
}
@media only screen and (-webkit-min-device-pixel-ratio: 2) {
.picker-calendar-week-days:after {
-webkit-transform: scaleY(0.5);
transform: scaleY(0.5);
}
}
@media only screen and (-webkit-min-device-pixel-ratio: 3) {
.picker-calendar-week-days:after {
-webkit-transform: scaleY(0.33);
transform: scaleY(0.33);
}
}
/*@media only screen and (-webkit-min-device-pixel-ratio: 2) {*/
/*.picker-calendar-week-days:after {*/
/*-webkit-transform: scaleY(0.5);*/
/*transform: scaleY(0.5);*/
/*}*/
/*}*/
/*@media only screen and (-webkit-min-device-pixel-ratio: 3) {*/
/*.picker-calendar-week-days:after {*/
/*-webkit-transform: scaleY(0.33);*/
/*transform: scaleY(0.33);*/
/*}*/
/*}*/
.picker-calendar-week-days .picker-calendar-week-day {
-webkit-flex-shrink: 1;
-ms-flex: 0 1 auto;
... ... @@ -1291,18 +1291,18 @@ body {
-webkit-transform-origin: 50% 100%;
transform-origin: 50% 100%;
}
@media only screen and (-webkit-min-device-pixel-ratio: 2) {
.picker-calendar-row:after {
-webkit-transform: scaleY(0.5);
transform: scaleY(0.5);
}
}
@media only screen and (-webkit-min-device-pixel-ratio: 3) {
.picker-calendar-row:after {
-webkit-transform: scaleY(0.33);
transform: scaleY(0.33);
}
}
/*@media only screen and (-webkit-min-device-pixel-ratio: 2) {*/
/*.picker-calendar-row:after {*/
/*-webkit-transform: scaleY(0.5);*/
/*transform: scaleY(0.5);*/
/*}*/
/*}*/
/*@media only screen and (-webkit-min-device-pixel-ratio: 3) {*/
/*.picker-calendar-row:after {*/
/*-webkit-transform: scaleY(0.33);*/
/*transform: scaleY(0.33);*/
/*}*/
/*}*/
.weui-picker-modal .picker-calendar-row:last-child:after {
display: none;
}
... ... @@ -1416,24 +1416,24 @@ body {
-webkit-transform-origin: 50% 0%;
transform-origin: 50% 0%;
}
@media only screen and (-webkit-min-device-pixel-ratio: 2) {
.popover .picker-calendar .toolbar ~ .picker-modal-inner .picker-calendar-months:before,
.picker-calendar.picker-modal-inline .toolbar ~ .picker-modal-inner .picker-calendar-months:before,
.popover .picker-calendar .picker-calendar-week-days ~ .picker-calendar-months:before,
.picker-calendar.picker-modal-inline .picker-calendar-week-days ~ .picker-calendar-months:before {
-webkit-transform: scaleY(0.5);
transform: scaleY(0.5);
}
}
@media only screen and (-webkit-min-device-pixel-ratio: 3) {
.popover .picker-calendar .toolbar ~ .picker-modal-inner .picker-calendar-months:before,
.picker-calendar.picker-modal-inline .toolbar ~ .picker-modal-inner .picker-calendar-months:before,
.popover .picker-calendar .picker-calendar-week-days ~ .picker-calendar-months:before,
.picker-calendar.picker-modal-inline .picker-calendar-week-days ~ .picker-calendar-months:before {
-webkit-transform: scaleY(0.33);
transform: scaleY(0.33);
}
}
/*@media only screen and (-webkit-min-device-pixel-ratio: 2) {*/
/*.popover .picker-calendar .toolbar ~ .picker-modal-inner .picker-calendar-months:before,*/
/*.picker-calendar.picker-modal-inline .toolbar ~ .picker-modal-inner .picker-calendar-months:before,*/
/*.popover .picker-calendar .picker-calendar-week-days ~ .picker-calendar-months:before,*/
/*.picker-calendar.picker-modal-inline .picker-calendar-week-days ~ .picker-calendar-months:before {*/
/*-webkit-transform: scaleY(0.5);*/
/*transform: scaleY(0.5);*/
/*}*/
/*}*/
/*@media only screen and (-webkit-min-device-pixel-ratio: 3) {*/
/*.popover .picker-calendar .toolbar ~ .picker-modal-inner .picker-calendar-months:before,*/
/*.picker-calendar.picker-modal-inline .toolbar ~ .picker-modal-inner .picker-calendar-months:before,*/
/*.popover .picker-calendar .picker-calendar-week-days ~ .picker-calendar-months:before,*/
/*.picker-calendar.picker-modal-inline .picker-calendar-week-days ~ .picker-calendar-months:before {*/
/*-webkit-transform: scaleY(0.33);*/
/*transform: scaleY(0.33);*/
/*}*/
/*}*/
.picker-calendar-month-picker,
.picker-calendar-year-picker {
display: block;
... ... @@ -1956,17 +1956,17 @@ button.swiper-pagination-bullet {
.swiper-lazy-preloader-white:after {
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox%3D'0%200%20120%20120'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20xmlns%3Axlink%3D'http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink'%3E%3Cdefs%3E%3Cline%20id%3D'l'%20x1%3D'60'%20x2%3D'60'%20y1%3D'7'%20y2%3D'27'%20stroke%3D'%23fff'%20stroke-width%3D'11'%20stroke-linecap%3D'round'%2F%3E%3C%2Fdefs%3E%3Cg%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(30%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(60%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(90%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(120%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(150%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.37'%20transform%3D'rotate(180%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.46'%20transform%3D'rotate(210%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.56'%20transform%3D'rotate(240%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.66'%20transform%3D'rotate(270%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.75'%20transform%3D'rotate(300%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.85'%20transform%3D'rotate(330%2060%2C60)'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
}
@-webkit-keyframes swiper-preloader-spin {
100% {
-webkit-transform: rotate(360deg);
}
}
@keyframes swiper-preloader-spin {
100% {
-webkit-transform: rotate(360deg);
transform: rotate(360deg);
}
}
/*@-webkit-keyframes swiper-preloader-spin {*/
/*100% {*/
/*-webkit-transform: rotate(360deg);*/
/*}*/
/*}*/
/*@keyframes swiper-preloader-spin {*/
/*100% {*/
/*-webkit-transform: rotate(360deg);*/
/*transform: rotate(360deg);*/
/*}*/
/*}*/
.weui-actionsheet {
z-index: 10000;
}
... ...
... ... @@ -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,7 +361,7 @@ new Vue({
alert("请选择打印机");
return false;
}
}
var order_note=that.remark;
var payment=that.payment;
... ... @@ -334,16 +369,16 @@ new Vue({
var url = '/Flow/done'
var params = {
unique_id: localStorage.getItem('unique_id'),
consignee:nick_name,
tel:tel_phone,
// consignee:nick_name,
// tel:tel_phone,
cart_id_str:id,
order_type:ordertype,
spot_id:spot_id,
//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,
//pick_up_time:pick_up_time,
printer_id:printer_id,
from:2
}
... ... @@ -354,20 +389,17 @@ new Vue({
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("下单失败");
//alert("下单失败");
}
})
}
}
}
})
... ...
... ... @@ -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;
... ...