李涵 / shipin · 提交

转到一个项目

作者 李洪娟
提交 39644f5e5a0450357577383f55dbc7646d0158ac 2 个父辈 09a3ae78 2f8e0a50

合并分支 'lihongjuan' 到 'master' 

修改



查看合并请求 !8
内嵌 并排对比
正在显示 17 个修改的文件 包含 607 行增加 和 135 行删除
... ... @@ -27,100 +27,125 @@
<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="-16.678572" vertical-offset="4984" max-vertical-offset="8119">
<caret line="237" column="52" selection-start-line="237" selection-start-column="52" selection-end-line="237" selection-end-column="52" />
<folding />
<state vertical-scroll-proportion="10.642858" vertical-offset="4798" max-vertical-offset="8925">
<caret line="180" column="17" selection-start-line="180" selection-start-column="17" selection-end-line="180" selection-end-column="17" />
<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="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="false">
<entry file="file://$PROJECT_DIR$/js/order.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-29.16" vertical-offset="5589" max-vertical-offset="12532">
<caret line="263" column="17" selection-start-line="263" selection-start-column="17" selection-end-line="263" selection-end-column="17" />
<state vertical-scroll-proportion="-23.64" vertical-offset="4653" max-vertical-offset="10672">
<caret line="228" column="31" selection-start-line="228" selection-start-column="31" selection-end-line="228" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="shopcar.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/shopcar.js">
<file leaf-file-name="jquery-weui.css" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/css/jquery-weui.css">
<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" />
<state vertical-scroll-proportion="0.0011111111" vertical-offset="37372" max-vertical-offset="44061">
<caret line="1967" column="9" selection-start-line="1967" selection-start-column="9" selection-end-line="1967" selection-end-column="9" />
<folding>
<element signature="n#!!doc" expanded="true" />
<element signature="e#433#1880#2" expanded="true" />
<element signature="e#23094#23349#2" expanded="true" />
<element signature="e#23872#25319#2" expanded="true" />
<element signature="e#43380#43644#2" expanded="true" />
<element signature="e#43689#43958#2" expanded="true" />
<element signature="e#47051#47309#2" expanded="true" />
<element signature="e#47473#47731#2" expanded="true" />
<element signature="e#47862#48120#2" expanded="true" />
<element signature="e#48211#48469#2" expanded="true" />
<element signature="e#48633#48891#2" expanded="true" />
<element signature="e#49022#49280#2" expanded="true" />
<element signature="e#58869#60316#2" expanded="true" />
<element signature="e#60470#61914#2" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="myorder.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/myorder/myorder.html">
<file leaf-file-name="hopeaddress.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/hopeaddress.js">
<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" />
<state vertical-scroll-proportion="-24.08" vertical-offset="3376" max-vertical-offset="6032">
<caret line="153" column="49" selection-start-line="147" selection-start-column="23" selection-end-line="153" selection-end-column="49" />
<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">
<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="5928" max-vertical-offset="13832">
<caret line="312" column="24" selection-start-line="312" selection-start-column="24" selection-end-line="312" selection-end-column="24" />
<state vertical-scroll-proportion="-29.785715" vertical-offset="2018" max-vertical-offset="4255">
<caret line="124" column="18" selection-start-line="124" selection-start-column="18" selection-end-line="124" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="swiper-3.4.2.min.css" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/swiper-3.4.2.min.css">
<file leaf-file-name="research.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/research.js">
<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" />
<state vertical-scroll-proportion="-17.0" vertical-offset="7825" max-vertical-offset="13000">
<caret line="330" column="44" selection-start-line="330" selection-start-column="44" selection-end-line="330" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="shopcar.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/shopcar.html">
<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="-0.14350283" vertical-offset="2260" max-vertical-offset="4941">
<caret line="79" column="18" selection-start-line="79" selection-start-column="18" selection-end-line="79" selection-end-column="18" />
<state vertical-scroll-proportion="-17.535715" vertical-offset="1863" max-vertical-offset="4180">
<caret line="107" column="75" selection-start-line="107" selection-start-column="75" selection-end-line="107" selection-end-column="75" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PersonCenter.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html">
<file leaf-file-name="research.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/research.html">
<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 />
<state vertical-scroll-proportion="-14.285714" vertical-offset="2525" max-vertical-offset="5250">
<caret line="117" column="59" selection-start-line="117" selection-start-column="59" selection-end-line="117" selection-end-column="59" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#select#0;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#option#0;n#select#0;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#select#1;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#option#0;n#select#1;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#select#2;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#option#0;n#select#2;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</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">
<file leaf-file-name="evalute.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/evalute.js">
<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 vertical-scroll-proportion="-24.04" vertical-offset="5449" max-vertical-offset="6850">
<caret line="242" column="5" selection-start-line="242" selection-start-column="5" selection-end-line="242" selection-end-column="5" />
<folding>
<marker date="1534760479292" expanded="true" signature="2037:2047" placeholder="..." />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="cookie.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/cookie.js">
<file leaf-file-name="research.css" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/research.css">
<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" />
<state vertical-scroll-proportion="0.0" vertical-offset="4641" max-vertical-offset="6164">
<caret line="223" column="25" selection-start-line="223" selection-start-column="25" selection-end-line="223" selection-end-column="25" />
<folding />
</state>
</provider>
... ... @@ -132,16 +157,25 @@
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/js/base.js" />
<option value="$PROJECT_DIR$/PersonCenter/PersonCenter.html" />
<option value="$PROJECT_DIR$/js/cookie.js" />
<option value="$PROJECT_DIR$/js/personcenter.js" />
<option value="$PROJECT_DIR$/css/swiper-3.4.2.min.css" />
<option value="$PROJECT_DIR$/css/index.css" />
<option value="$PROJECT_DIR$/myorder/myorder.html" />
<option value="$PROJECT_DIR$/js/index.js" />
<option value="$PROJECT_DIR$/js/shopcar.js" />
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/js/personcenter.js" />
<option value="$PROJECT_DIR$/order.html" />
<option value="$PROJECT_DIR$/hopeaddress.html" />
<option value="$PROJECT_DIR$/js/hopeaddress.js" />
<option value="$PROJECT_DIR$/js/research.js" />
<option value="$PROJECT_DIR$/css/research.css" />
<option value="$PROJECT_DIR$/research.html" />
<option value="$PROJECT_DIR$/js/evalute.js" />
<option value="$PROJECT_DIR$/shopcar.html" />
<option value="$PROJECT_DIR$/PersonCenter/PersonCenter.html" />
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/js/order.js" />
<option value="$PROJECT_DIR$/css/jquery-weui.css" />
</list>
</option>
</component>
... ... @@ -177,7 +211,6 @@
<sortByType />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<PATH>
... ... @@ -206,6 +239,20 @@
<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>
<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="myorder" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
... ... @@ -220,17 +267,32 @@
<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>
</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="G:/project" />
<property name="HbShouldOpenHtmlAsHb" value="" />
<property name="JavaScriptLanguageLevel" value="ES6" />
<property name="JavaScriptPreferStrict" value="false" />
... ... @@ -239,11 +301,20 @@
<property name="options.splitter.main.proportions" value="0.3" />
<property name="options.splitter.details.proportions" value="0.2" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\项目\shipin\img" />
</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">
... ... @@ -253,10 +324,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>
... ... @@ -292,7 +359,7 @@
</component>
<component name="ToolWindowManager">
<frame x="-7" y="2" width="1932" height="1051" extended-state="1" />
<editor active="true" />
<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" />
... ... @@ -300,18 +367,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="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="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="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="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="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="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">
... ... @@ -337,9 +404,102 @@
<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="4503" max-vertical-offset="6688">
<caret line="237" column="52" selection-start-line="237" selection-start-column="52" selection-end-line="237" selection-end-column="52" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#style#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#div#6;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="4617" max-vertical-offset="9158">
<caret line="263" column="17" selection-start-line="263" selection-start-column="17" selection-end-line="263" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/shopcar.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1083" max-vertical-offset="5909">
<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>
<entry file="file://$PROJECT_DIR$/myorder/myorder.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="589" max-vertical-offset="4541">
<caret line="31" column="0" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" />
<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="5928" max-vertical-offset="13832">
<caret line="312" column="24" selection-start-line="312" selection-start-column="24" selection-end-line="312" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/swiper-3.4.2.min.css">
<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>
<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="3477">
<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>
<entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="722" max-vertical-offset="3211">
<caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" />
<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="false" />
<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="false" />
</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="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>
<entry file="file://$PROJECT_DIR$/js/cookie.js">
<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>
<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 />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#style#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#div#6;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -356,7 +516,7 @@
<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="true" />
<element signature="n#!!doc" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -397,7 +557,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="false" />
<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="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -421,7 +584,11 @@
<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#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#style#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#div#6;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -445,7 +612,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="false" />
<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="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -487,22 +657,6 @@
</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="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>
<entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html">
<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 />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/swiper-3.4.2.min.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="380">
... ... @@ -521,15 +675,15 @@
</entry>
<entry file="file://$PROJECT_DIR$/myorder/myorder.html">
<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" />
<state vertical-scroll-proportion="0.0" vertical-offset="589" max-vertical-offset="4541">
<caret line="31" column="0" selection-start-line="31" selection-start-column="0" selection-end-line="31" 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="-29.16" vertical-offset="5589" max-vertical-offset="12532">
<state vertical-scroll-proportion="0.0" vertical-offset="4617" max-vertical-offset="9158">
<caret line="263" column="17" selection-start-line="263" selection-start-column="17" selection-end-line="263" selection-end-column="17" />
<folding />
</state>
... ... @@ -537,29 +691,160 @@
</entry>
<entry file="file://$PROJECT_DIR$/js/shopcar.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-16.88" vertical-offset="1003" max-vertical-offset="7775">
<state vertical-scroll-proportion="0.0" vertical-offset="1083" max-vertical-offset="5909">
<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="true" />
<element signature="n#!!doc" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<entry file="file://$PROJECT_DIR$/js/personcenter.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-16.678572" vertical-offset="4984" max-vertical-offset="8119">
<caret line="237" column="52" selection-start-line="237" selection-start-column="52" selection-end-line="237" selection-end-column="52" />
<state vertical-scroll-proportion="-18.8" vertical-offset="718" max-vertical-offset="2398">
<caret line="54" column="29" selection-start-line="54" selection-start-column="29" selection-end-line="54" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/order.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-15.785714" vertical-offset="7748" max-vertical-offset="20306">
<caret line="315" column="17" selection-start-line="315" selection-start-column="17" selection-end-line="315" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/hopeaddress.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-14.25" vertical-offset="843" max-vertical-offset="2457">
<caret line="46" column="11" selection-start-line="46" selection-start-column="11" selection-end-line="46" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/share.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-23.0" vertical-offset="207" max-vertical-offset="1219">
<caret line="37" column="13" selection-start-line="37" selection-start-column="13" selection-end-line="37" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/about.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-16.964285" vertical-offset="150" max-vertical-offset="1325">
<caret line="25" column="47" selection-start-line="25" selection-start-column="47" selection-end-line="25" selection-end-column="47" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/hopeaddress.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-24.08" vertical-offset="3376" max-vertical-offset="6032">
<caret line="153" column="49" selection-start-line="147" selection-start-column="23" selection-end-line="153" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/research.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-17.0" vertical-offset="7825" max-vertical-offset="13000">
<caret line="330" column="44" selection-start-line="330" selection-start-column="44" selection-end-line="330" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/research.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="4641" max-vertical-offset="6164">
<caret line="223" column="25" selection-start-line="223" selection-start-column="25" selection-end-line="223" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/research.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-14.285714" vertical-offset="2525" max-vertical-offset="5250">
<caret line="117" column="59" selection-start-line="117" selection-start-column="59" selection-end-line="117" selection-end-column="59" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#select#0;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#option#0;n#select#0;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#select#1;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#option#0;n#select#1;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#select#2;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#option#0;n#select#2;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/evalute.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-24.04" vertical-offset="5449" max-vertical-offset="6850">
<caret line="242" column="5" selection-start-line="242" selection-start-column="5" selection-end-line="242" selection-end-column="5" />
<folding>
<marker date="1534760479292" expanded="true" signature="2037:2047" placeholder="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-17.535715" vertical-offset="1863" max-vertical-offset="4180">
<caret line="107" column="75" selection-start-line="107" selection-start-column="75" selection-end-line="107" selection-end-column="75" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/shopcar.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-0.14350283" vertical-offset="2260" max-vertical-offset="4941">
<caret line="79" column="18" selection-start-line="79" selection-start-column="18" selection-end-line="79" selection-end-column="18" />
<state vertical-scroll-proportion="-29.785715" vertical-offset="2018" max-vertical-offset="4255">
<caret line="124" column="18" selection-start-line="124" selection-start-column="18" selection-end-line="124" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="10.642858" vertical-offset="4798" max-vertical-offset="8925">
<caret line="180" column="17" selection-start-line="180" selection-start-column="17" selection-end-line="180" selection-end-column="17" />
<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>
<entry file="file://$PROJECT_DIR$/js/order.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-23.64" vertical-offset="4653" max-vertical-offset="10672">
<caret line="228" column="31" selection-start-line="228" selection-start-column="31" selection-end-line="228" selection-end-column="31" />
<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.0011111111" vertical-offset="37372" max-vertical-offset="44061">
<caret line="1967" column="9" selection-start-line="1967" selection-start-column="9" selection-end-line="1967" selection-end-column="9" />
<folding>
<element signature="e#433#1880#2" expanded="true" />
<element signature="e#23094#23349#2" expanded="true" />
<element signature="e#23872#25319#2" expanded="true" />
<element signature="e#43380#43644#2" expanded="true" />
<element signature="e#43689#43958#2" expanded="true" />
<element signature="e#47051#47309#2" expanded="true" />
<element signature="e#47473#47731#2" expanded="true" />
<element signature="e#47862#48120#2" expanded="true" />
<element signature="e#48211#48469#2" expanded="true" />
<element signature="e#48633#48891#2" expanded="true" />
<element signature="e#49022#49280#2" expanded="true" />
<element signature="e#58869#60316#2" expanded="true" />
<element signature="e#60470#61914#2" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -31,6 +31,27 @@
</div>
</div>
<!--个人中心分享页面-->
<div class="sharewrap" v-if="shareimg" @click="sharewrap()">
<!--弹层-->
<div class="sharepopup">
<img src="../img/share.png" alt="" style="width:100%"/>
</div>
<div class="sharetext">
<img src="../img/sharetext.png" alt=""/>
</div>
<div class="sharecontent" @click="righnow()">立即邀请</div>
</div>
<div class="rowwrap" v-if="rowshare">
<!--弹层-->
<div class="rowpopup" @click="shareorner()" >
<img src="../img/bg.png" alt="" style="width:100%"/>
</div>
</div>
<!--个人信息-->
<div class="person">
<div class="person_info">
... ... @@ -84,7 +105,7 @@
<a href="{:U('Template/shopcar')}"><img src="/themes/simplebootx/Portal/Template/img/9拷贝@2x.png" />
<span>购物车</span>
</a>
<span class="foot_cartnum" v-if="cartnum>0">{{cartnum}}</span>
<p class="foot_cartnum" v-if="cartnum>0">{{cartnum}}</p>
</div>
<div class="footer_item footer_active">
<a href="{:U('Template/PersonCenter')}"><img src="/themes/simplebootx/Portal/Template/img/menu_icon3_select@2x_57.png" /><span>我的</span></a>
... ...
... ... @@ -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;
}
... ...
.container{
font-family: font-family:PingFangSC-Regular;;
/*font-family: font-family:PingFangSC-Regular;;*/
}
/*遮罩*/
.wrap{
... ... @@ -214,14 +214,15 @@
}
/*第四问*/
.question_item_home{
display: flex;
/*display: flex;*/
line-height: 0.64rem;
}
.question_item_home_text{
font-size: 0.26rem;
color: #1A1A1A;
margin-right: 0.2rem;
white-space: nowrap;
display:inline-block;
/*white-space: nowrap;*/
}
.favorite_food{
display: flex;
... ...
... ... @@ -39,12 +39,15 @@
padding:10px;
font-family:inherit;
}
[v-cloak]{
display:none
}
</style>
<link rel="stylesheet" href="css/pickout.css"/>
</head>
<body>
<div class="container" id="hopeaddress">
<div class="container" id="hopeaddress" v-cloak>
<div class="question_item">
<div class="question_tit">
</div>
... ...

30.2 KB
... ... @@ -98,6 +98,9 @@
color: #FFFFFF;
font-size: 0.2rem;
}
body{
-webkit-overflow-scrolling:touch;
}
</style>
</head>
... ... @@ -168,9 +171,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-->
... ... @@ -247,7 +252,7 @@
<a href="{:U('Template/shopcar')}"><img src="/themes/simplebootx/Portal/Template/img/9拷贝@2x.png" />
<span>购物车</span>
</a>
<span class="foot_cartnum" v-if="cartnum>0">{{cartnum}}</span>
<p class="foot_cartnum" v-if="cartnum>0">{{cartnum}}</p>
</div>
<div class="footer_item">
<a href="{:U('Template/PersonCenter')}"><img src="/themes/simplebootx/Portal/Template/img/menu_icon3_select@2x.png" /><span>我的</span></a>
... ... @@ -307,7 +312,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 +320,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';
... ...
... ... @@ -241,10 +241,10 @@ $(".footer").click(function() {
alert("请填写评价内容");
return false;
}
if(imgurl == '') {
alert("请选择图片");
return false;
}
//if(imgurl == '') {
// alert("请选择图片");
// return false;
//}
console.log(imgurl.join(','));
// var img = JSON.stringify(imgurl);
... ...
... ... @@ -64,15 +64,13 @@ new Vue({
/*console.log(JSON.stringify(res))*/
console.log(res);
var data=res.data;
that.province=data;
var ob={
province_id:'000',
province_name:'省'
}
that.province.push(ob);
console.log(that.province);
that.proce=that.province[31];
data.unshift(ob);
that.province=data;
that.proce=that.province[0];
})
},
//选择城市
... ... @@ -97,7 +95,13 @@ new Vue({
ajaxsend(url, params, function(res) {
/*console.log(JSON.stringify(res))*/
console.log(res);
var obcity={
province_id:'000',
city_name:'市'
};
res.data.unshift(obcity)
that.city=res.data;
that.ci=that.city[0];
})
},
... ... @@ -116,7 +120,13 @@ new Vue({
ajaxsend(url, params, function(res) {
/*console.log(JSON.stringify(res))*/
console.log(res);
var obscounty={
county_id:'000',
county_name:'区'
};
res.data.unshift( obscounty);
that.county=res.data;
that.coun=that.county[0];
})
},
selectstreet:function(res){
... ... @@ -135,7 +145,13 @@ new Vue({
ajaxsend(url, params, function(res) {
/*console.log(JSON.stringify(res))*/
console.log(res);
var obstreet={
town_id:'000',
town_name:'街道'
};
res.data.unshift(obstreet);
that.street=res.data;
that.stre=that.street[0];
})
},
//街道
... ... @@ -188,7 +204,7 @@ new Vue({
city_id:city_id,
town:town,
town_id:town_id,
detailaddress:that.detailaddress,
address:that.detailaddress,
unique_id: localStorage.getItem('unique_id')
}
ajaxsend(url, params, function(res) {
... ...
... ... @@ -188,6 +188,26 @@ new Vue({
var data=res.data;
var selfarea=data.area;
that.selfarea=selfarea;
that.ads();
})
},
ads(){
var that=this;
console.log(that.selfarea[0]);
var areaid=that.selfarea[0].area_id;
var url = '/Spot/index';
var params = {
area_id: areaid,
unique_id: localStorage.getItem('unique_id')
}
ajaxsend(url, params, function(res) {
/*console.log(JSON.stringify(res))*/
console.log(res);
var data=res.data;
var spot=data.spot;
that.spot=spot;
})
},
//每个区域的自提点
... ... @@ -318,6 +338,40 @@ 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,
order_notes:order_note,
payment:payment,
discount_coupon_id:discount_coupon_id,
pick_up_time:pick_up_time,
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("下单失败");
}
})
}else if(ordertype==2){
store_id=localStorage.getItem('store_id');
... ... @@ -326,7 +380,6 @@ new Vue({
alert("请选择打印机");
return false;
}
}
var order_note=that.remark;
var payment=that.payment;
... ... @@ -334,16 +387,12 @@ new Vue({
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
}
... ... @@ -362,6 +411,42 @@ new Vue({
}
})
}
//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("下单失败");
// }
//
//})
}
... ...
... ... @@ -47,6 +47,29 @@ new Vue({
console.log(that.cartnum);
})
},
//分享页面
share:function(){
var that=this;
that.shareimg=true;
},
sharewrap:function(){
var that=this;
that.shareimg=false;
},
//立即邀请
righnow:function(){
var that=this;
that.shareimg=false;
that.rowshare=true;
},
shareorner:function(){
var that=this;
that.rowshare=false;
},
//关于我们
aboutus:function(){
window.location.href="/index.php?g=&m=template&a=about";
... ...
... ... @@ -167,9 +167,10 @@ new Vue({
province_id:'000',
province_name:'省'
}
that.province.push(ob);
data.unshift(ob);
that.province=data;
console.log(that.province);
that.proce=that.province[31];
that.proce=that.province[0];
})
},
... ... @@ -190,8 +191,14 @@ new Vue({
ajaxsend(url, params, function(res) {
/*console.log(JSON.stringify(res))*/
console.log(res);
var obcity={
province_id:'000',
city_name:'市'
};
res.data.unshift(obcity);
that.city=res.data;
console.log(res.data[0]);
that.ci=that.city[0];
})
},
... ... @@ -210,7 +217,13 @@ new Vue({
ajaxsend(url, params, function(res) {
/*console.log(JSON.stringify(res))*/
console.log(res);
var obscounty={
county_id:'000',
county_name:'区'
};
res.data.unshift( obscounty);
that.county=res.data;
that.coun=that.county[0];
})
... ... @@ -230,7 +243,13 @@ new Vue({
ajaxsend(url, params, function(res) {
/*console.log(JSON.stringify(res))*/
console.log(res);
var obstreet={
town_id:'000',
town_name:'街道'
};
res.data.unshift(obstreet);
that.street=res.data;
that.stre=that.street[0];
})
},
//街道
... ... @@ -303,8 +322,13 @@ new Vue({
ajaxsend(url, params, function(res) {
/*console.log(JSON.stringify(res))*/
console.log(res);
var obcity={
province_id:'000',
city_name:'市'
};
res.data.unshift(obcity)
that.selfcity=res.data;
console.log(that.selfcity);
that.selfc=that.selfcity[0];
})
},
... ... @@ -391,7 +415,7 @@ new Vue({
city_id:city_id,
town:town,
town_id:town_id,
detailaddress:that.detailaddress,
address:that.detailaddress,
f_city:f_city,
f_province:f_province,
taste:that.answer1,
... ... @@ -409,7 +433,6 @@ new Vue({
that.success=false;
alert(res.msg)
}
//
})
},
... ...
... ... @@ -314,6 +314,10 @@
/*-webkit-transition: 300ms;*/
/*transition: 300ms;*/
/*}*/
body{
-webkit-overflow-scrolling:touch;
}
</style>
</head>
... ...
... ... @@ -84,6 +84,7 @@
<select class="question_answer_item" v-on:change="selectcity($event.target)" style="font-size:0.26rem;border:none;outline:none;width:1.6rem;" v-model="proce">
<!--<option value="" style="font-size:0.26rem">省</option>-->
<!--<option disabled value="">请选择</option>-->
<option value="" style="font-size:0.26rem" v-for="item in province" :value="item">{{item.province_name}}</option>
</select>
... ... @@ -106,7 +107,7 @@
<!--第二问-->
<div class="question_item">
<div class="question_tit">
<span class="question_num">2</span><span class="question_tit_text">{{question3.title}}</span>
<span class="question_num">4</span><span class="question_tit_text">{{question3.title}}</span>
</div>
<div class="question_item_wrap">
<div class="question_item_home">
... ... @@ -114,6 +115,7 @@
<!--<span class="question_answer_street"><p>省市</p> &gt;</span>
<span class="question_answer_item">市 &gt;<span></span></span>
<span class="question_answer_street"><p>区县</p> &gt;</span>-->
<div style="height:1.2rem">
<select class="question_answer_item" style="font-size:0.26rem;border:none;outline:none;width:1.2rem;margin-right: 0;" v-on:change="selfprove($event.target)" v-model="selfpro" >
<!--<option value="" style="font-size:0.26rem" >省</option>-->
<option value="" style="font-size:0.26rem" :value="item" v-for="item in selfprovince">{{item.province_name}}</option>
... ... @@ -128,6 +130,8 @@
</select>
<span class="question_item_home_text" style="margin-left: 0.2px;">{{question3_title2}}</span>
</div>
</div>
<div class="favorite_food">
<span>{{question3_title3}}</span><input type="textbox" v-model="food"/>
</div>
... ...
... ... @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
<link rel="stylesheet" type="text/css" href="/themes/simplebootx/Portal/Template/css/swiper-3.4.2.min.css" />
<link rel="stylesheet" type="text/css" href="/themes/simplebootx/Portal/Template/css/init.css" />
<link rel="stylesheet" type="text/css" href="http://at.alicdn.com/t/font_647640_to180rktm1butyb9.css" />
<link rel="stylesheet" type="text/css" href="https://at.alicdn.com/t/font_647640_to180rktm1butyb9.css" />
<link rel="stylesheet" type="text/css" href="/themes/simplebootx/Portal/Template/css/weui.css" />
<link rel="stylesheet" type="text/css" href="/themes/simplebootx/Portal/Template/css/example.css" />
<link rel="stylesheet" type="text/css" href="/themes/simplebootx/Portal/Template/css/shopcar.css" />
... ... @@ -55,7 +55,9 @@
text-align: center;
line-height: 0.36rem;
}
body{
-webkit-overflow-scrolling:touch;
}
</style>
</head>
... ... @@ -115,7 +117,7 @@
<a href="{:U('Template/shopcar')}"><img src="/themes/simplebootx/Portal/Template/img/9拷贝@2x_55.png" />
<span>购物车</span>
</a>
<span class="foot_cartnum" v-if="cartnum>0">{{cartnum}}</span>
<p class="foot_cartnum" v-if="cartnum>0">{{cartnum}}</p>
</div>
<div class="footer_item">
<a href="{:U('Template/PersonCenter')}"><img src="/themes/simplebootx/Portal/Template/img/menu_icon3_select@2x.png" /><span>我的</span></a>
... ...