李涵 / shipin · 提交

转到一个项目

作者 李洪娟
提交 2ff59b1e8338bf4065e61fbf33466862cf5a8f51 2 个父辈 164dc4ae 3d708da8

合并分支 'lihongjuan' 到 'master' 

Lihongjuan



查看合并请求 !7
内嵌 并排对比
正在显示 5 个修改的文件 包含 112 行增加 和 109 行删除
... ... @@ -27,18 +27,20 @@
<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="-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 vertical-scroll-proportion="-21.214285" vertical-offset="1881" max-vertical-offset="8900">
<caret line="99" column="9" selection-start-line="99" selection-start-column="9" selection-end-line="99" selection-end-column="9" />
<folding>
<element signature="n#style#0;n#ul#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="order.js" pinned="false" current-in-tab="true">
<file leaf-file-name="order.js" pinned="false" current-in-tab="false">
<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" />
<state vertical-scroll-proportion="0.0" vertical-offset="7258" max-vertical-offset="7809">
<caret line="382" column="26" selection-start-line="382" selection-start-column="26" selection-end-line="382" selection-end-column="26" />
<folding />
</state>
</provider>
... ... @@ -47,8 +49,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="-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" />
<state vertical-scroll-proportion="-14.25" vertical-offset="684" max-vertical-offset="3534">
<caret line="57" column="20" selection-start-line="57" selection-start-column="20" selection-end-line="57" selection-end-column="20" />
<folding>
<element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
... ... @@ -56,11 +58,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="order.html" pinned="false" current-in-tab="false">
<file leaf-file-name="order.html" pinned="false" current-in-tab="true">
<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" />
<state vertical-scroll-proportion="0.27909604" vertical-offset="5453" max-vertical-offset="14820">
<caret line="300" column="29" selection-start-line="300" selection-start-column="29" selection-end-line="300" selection-end-column="29" />
<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" />
... ... @@ -106,8 +108,8 @@
<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="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" />
<state vertical-scroll-proportion="0.0" vertical-offset="7895" max-vertical-offset="19136">
<caret line="313" column="9" selection-start-line="313" selection-start-column="9" selection-end-line="313" selection-end-column="9" />
<folding />
</state>
</provider>
... ... @@ -162,14 +164,14 @@
<option value="$PROJECT_DIR$/addressdetails.html" />
<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$/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" />
<option value="$PROJECT_DIR$/css/index.css" />
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/shopcar.html" />
<option value="$PROJECT_DIR$/order.html" />
</list>
</option>
</component>
... ... @@ -247,41 +249,9 @@
<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>
</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>
</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>
<PATH_ELEMENT>
<option name="myItemId" value="PersonCenter" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
... ... @@ -290,7 +260,7 @@
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../TakeFood" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="HbShouldOpenHtmlAsHb" value="" />
<property name="JavaScriptLanguageLevel" value="ES6" />
<property name="JavaScriptPreferStrict" value="false" />
... ... @@ -356,18 +326,19 @@
<servers />
</component>
<component name="ToolWindowManager">
<frame x="-7" y="2" width="1932" height="1051" extended-state="0" />
<editor active="true" />
<frame x="-7" y="2" width="1932" height="1051" extended-state="1" />
<editor active="false" />
<layout>
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.09498956" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<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="File Transfer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1910828" 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="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" />
... ... @@ -400,11 +371,40 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<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$/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 />
<folding>
<element signature="n#style#0;n#ul#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
... ... @@ -498,7 +498,6 @@
<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>
... ... @@ -506,7 +505,9 @@
<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 />
<folding>
<element signature="n#style#0;n#ul#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
... ... @@ -514,7 +515,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="6061" max-vertical-offset="9158">
<caret line="339" column="33" selection-start-line="339" selection-start-column="23" selection-end-line="339" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
... ... @@ -572,7 +572,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="437" max-vertical-offset="1634">
<caret line="23" column="52" selection-start-line="23" selection-start-column="52" selection-end-line="23" selection-end-column="52" />
<folding />
</state>
</provider>
</entry>
... ... @@ -580,7 +579,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="247" max-vertical-offset="779">
<caret line="13" column="44" selection-start-line="13" selection-start-column="44" selection-end-line="13" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
... ... @@ -588,7 +586,9 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="6707">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
<folding>
<element signature="n#style#0;n#ul#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
... ... @@ -625,7 +625,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="437" max-vertical-offset="1634">
<caret line="23" column="52" selection-start-line="23" selection-start-column="52" selection-end-line="23" selection-end-column="52" />
<folding />
</state>
</provider>
</entry>
... ... @@ -640,7 +639,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="247" max-vertical-offset="779">
<caret line="13" column="44" selection-start-line="13" selection-start-column="44" selection-end-line="13" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
... ... @@ -655,7 +653,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="276" max-vertical-offset="1189">
<caret line="13" column="44" selection-start-line="13" selection-start-column="44" selection-end-line="13" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
... ... @@ -684,7 +681,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="2.08" vertical-offset="546" max-vertical-offset="3718">
<caret line="19" column="12" selection-start-line="19" selection-start-column="12" selection-end-line="19" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
... ... @@ -699,10 +695,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-17.607143" vertical-offset="0" max-vertical-offset="1421">
<caret line="17" column="16" selection-start-line="12" selection-start-column="7" selection-end-line="17" selection-end-column="16" />
<folding>
<element signature="n#style#0;n#p#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#p#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -710,7 +702,6 @@
<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" />
<folding />
</state>
</provider>
</entry>
... ... @@ -718,7 +709,6 @@
<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>
... ... @@ -726,7 +716,6 @@
<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>
... ... @@ -738,14 +727,6 @@
</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="10746" max-vertical-offset="18225">
<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">
... ... @@ -787,48 +768,58 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/order.html">
<entry file="file://$PROJECT_DIR$/addressdetails.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 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$/addressdetails.html">
<entry file="file://$PROJECT_DIR$/js/order.js">
<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" />
<state vertical-scroll-proportion="0.0" vertical-offset="10194" max-vertical-offset="11919">
<caret line="382" column="26" selection-start-line="382" selection-start-column="26" selection-end-line="382" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/shopcar.html">
<entry file="file://$PROJECT_DIR$/css/index.css">
<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" />
<state vertical-scroll-proportion="0.0" vertical-offset="7895" max-vertical-offset="19136">
<caret line="313" column="9" selection-start-line="313" selection-start-column="9" selection-end-line="313" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-21.214285" vertical-offset="1881" max-vertical-offset="8900">
<caret line="99" column="9" selection-start-line="99" selection-start-column="9" selection-end-line="99" selection-end-column="9" />
<folding>
<element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#ul#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$/index.html">
<entry file="file://$PROJECT_DIR$/shopcar.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 vertical-scroll-proportion="-14.25" vertical-offset="684" max-vertical-offset="3534">
<caret line="57" column="20" selection-start-line="57" selection-start-column="20" selection-end-line="57" selection-end-column="20" />
<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$/js/order.js">
<entry file="file://$PROJECT_DIR$/order.html">
<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 vertical-scroll-proportion="0.27909604" vertical-offset="5453" max-vertical-offset="14820">
<caret line="300" column="29" selection-start-line="300" selection-start-column="29" selection-end-line="300" selection-end-column="29" />
<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>
... ...
... ... @@ -282,7 +282,7 @@
display: flex;
font-size: 0.28rem;
line-height: 0.3rem;
justify-content: center;
/*justify-content: center;*/
margin-top: 0.38rem;
}
... ... @@ -293,14 +293,21 @@
}
.nav_list li {
margin-right: 0.6rem;
padding-bottom: 0.16rem;
width:auto;
text-align: center;
padding: 0 0.2rem 0.16rem 0.2rem;
white-space:nowrap;
}
.nav_list li:last-child {
margin-right: 0;
padding: 0 0 0.16rem 0.12rem;
}
.nav_list li:first-child{
padding: 0 0.12rem 0.16rem 0.12rem;
margin-left: 0.14rem;
}
/*swiper*/
... ...
... ... @@ -98,6 +98,7 @@
color: #FFFFFF;
font-size: 0.2rem;
}
body{ -webkit-overflow-scrolling:touch;}
</style>
</head>
... ... @@ -168,9 +169,11 @@
</div>
<!--导航列表-->
<div class="nav">
<ul class="nav_list">
<li class="nav_list_item active" @click="allfood()">全部美食</li>
<li v-for="(item,index) in type" @click="find(item.t_id,index)" :class="{active:index===current}" v-bind:id="item.t_id" >{{item.type_name}}</li>
<ul class="nav_list" style="overflow-x: scroll">
<li class="nav_list_item active" @click="allfood()" :style="{'width':'auto'}">全部美食</li>
<li v-for="(item,index) in type" @click="find(item.t_id,index)" :class="{active:index===current}" v-bind:id="item.t_id" :style="{'width':'auto'}" v-if="item.type_name.length>3">{{item.type_name}}</li>
<li v-for="(item,index) in type" @click="find(item.t_id,index)" :class="{active:index===current}" v-bind:id="item.t_id" :style="{'width':2+'rem'}" v-if="item.type_name.length<=3">{{item.type_name}}</li>
</ul>
</div>
<!--swiper-->
... ...
... ... @@ -300,6 +300,7 @@
[v-cloak]{
display:none;
}
body{ -webkit-overflow-scrolling:touch;}
/*.weui-picker-modal .picker-item {*/
/*height: 12px;*/
/*line-height: 12px;*/
... ...
... ... @@ -58,6 +58,7 @@
#unstock{
line-height: 2rem;
}
body{ -webkit-overflow-scrolling:touch;}
</style>
</head>
... ... @@ -105,7 +106,7 @@
</div>
</div>
<div class="nodata" v-if="carlist.length==0">
您还没有下单哦，快去下单吧
您还没有下单哦，快去下单吧!
</div>
<!--footer-->
... ...